--- /usr/portage/app-admin/conky/conky-1.4.2.ebuild	2006-06-11 16:38:08.000000000 -0400
+++ ./conky-1.4.3.ebuild	2006-11-10 23:40:36.000000000 -0500
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.2.ebuild,v 1.3 2006/06/11 20:23:09 chainsaw Exp $
+# $Header $
 
 inherit eutils
 
@@ -11,7 +11,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype X ipv6 bmpx xmms infopipe audacious"
+IUSE="truetype X ipv6 audacious bmpx hddtemp mpd"
 
 DEPEND_COMMON="
 	virtual/libc
@@ -21,20 +21,21 @@
 				x11-libs/libX11
 				x11-libs/libSM
 				x11-libs/libXrender
+				x11-libs/libXdamage
 				x11-libs/libXft
 				)
 				virtual/x11
 		)
 		truetype? ( >=media-libs/freetype-2 )
+		audacious? ( >=media-sound/audacious-0.1 )
 		bmpx? ( media-sound/bmpx
 				>=sys-apps/dbus-0.35
 			)
-		audacious? ( media-sound/audacious )
-		infopipe? ( media-plugins/xmms-infopipe )
-		xmms? ( media-sound/xmms )
 	)"
 
-RDEPEND="${DEPEND_COMMON}"
+RDEPEND="${DEPEND_COMMON}
+	hddtemp? ( app-admin/hddtemp )
+	mpd? ( media-sound/mpd )"
 
 DEPEND="
 	${DEPEND_COMMON}
@@ -53,38 +54,35 @@
 	local mymake
 	if useq ipv6 ; then
 		ewarn
-		ewarn "You have the ipv6 USE flag enabled.  Please note that"
-		ewarn "using the ipv6 USE flag with Conky disables the port"
-		ewarn "monitor."
-		ewarn
+		ewarn "You have the ipv6 USE flag enabled.  Please note that using"
+		ewarn "the ipv6 USE flag with Conky disables the port monitor."
 		epause
 	else
 		mymake="MPD_NO_IPV6=noipv6"
 	fi
 	local myconf
-	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime \
-		--enable-mpd --enable-mldonkey"
+	myconf="--enable-own-window --enable-proc-uptime"
+	use X && myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage"
 	econf \
 		${myconf} \
 		$(use_enable truetype xft) \
-		$(use_enable X x11) \
-		$(use_enable bmpx) \
-		$(use_enable xmms) \
 		$(use_enable audacious) \
-		$(use_enable infopipe) \
+		$(use_enable bmpx) \
+		$(use_enable hddtemp ) \
+		$(use_enable mpd) \
 		$(use_enable !ipv6 portmon) || die "econf failed"
 	emake ${mymake} || die "compile failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR=${D} install || die "make install failed"
 	dodoc ChangeLog AUTHORS README doc/conkyrc.sample
 	dohtml doc/docs.html doc/config_settings.html doc/variables.html
 }
 
 pkg_postinst() {
 	einfo 'Default configuration file is "~/.conkyrc"'
-	einfo "you can find a sample configuration file in"
+	einfo "You can find a sample configuration file in"
 	einfo "/usr/share/doc/${PF}/conkyrc.sample.gz"
 	einfo
 	einfo "For more info on Conky's new features,"