[patch] conky-1.7.1.1.diff

conky-1.7.1.1.diff (text/plain), 4.84 KB, created by Daniel Pielmeier on 2009-07-10 18:00:54 UTC

--- conky-1.7.0_rc1.ebuild	2009-06-19 22:03:56.000000000 +0200
+++ conky-1.7.1.1.ebuild	2009-06-20 17:02:03.000000000 +0200
@@ -4,9 +4,6 @@
 
 EAPI="2"
 
-inherit eutils
-# used for epause
-
 DESCRIPTION="An advanced, highly configurable system monitor for X"
 HOMEPAGE="http://conky.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -14,85 +11,75 @@
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="audacious bmpx debug hddtemp ibm ipv6 moc mpd nano-syntax nvidia rss truetype vim-syntax wifi X"
+IUSE="alsa apcupsd audacious bmpx debug hddtemp imlib lua math moc mpd nano-syntax nvidia openmp +portmon rss thinkpad truetype vim-syntax wifi X"
 
 DEPEND_COMMON="
 	X? (
-		x11-libs/libICE
-		x11-libs/libXext
 		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libXrender
 		x11-libs/libXdamage
-		x11-libs/libXft
-		truetype? ( >=media-libs/freetype-2 )
-		audacious? ( >=media-sound/audacious-1.5 )
-		bmpx? ( media-sound/bmpx
-				>=sys-apps/dbus-0.35
-			)
+		x11-libs/libXext
+		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+		imlib? ( media-libs/imlib2 )
+		nvidia? ( media-video/nvidia-settings )
 	)
-	rss? ( dev-libs/libxml2
-			net-misc/curl
-			)
+	alsa? ( media-libs/alsa-lib )
+	audacious? ( >=media-sound/audacious-1.5 )
+	bmpx? ( media-sound/bmpx >=sys-apps/dbus-0.35 )
+	portmon? ( dev-libs/glib )
+	lua? ( >=dev-lang/lua-5.1 )
+	openmp? ( >=sys-devel/gcc-4.3[openmp] )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
 	wifi? ( net-wireless/wireless-tools )
-	nvidia? ( media-video/nvidia-settings )
-	!ipv6? ( >=dev-libs/glib-2.0 )"
-RDEPEND="${DEPEND_COMMON}
+	"
+RDEPEND="
+	${DEPEND_COMMON}
+	apcupsd? ( sys-power/apcupsd )
 	hddtemp? ( app-admin/hddtemp )
-	vim-syntax? ( || ( app-editors/vim
-	app-editors/gvim ) )
-	nano-syntax? ( app-editors/nano )"
+	moc? ( media-sound/moc )
+	mpd? ( media-sound/mpd )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
 DEPEND="
 	${DEPEND_COMMON}
 	dev-util/pkgconfig
-	X? (
-		x11-libs/libXt
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
+	"
 
 src_configure() {
 	local myconf
-	myconf="--enable-proc-uptime"
-	if useq X; then
-		myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage --enable-own-window"
-		myconf="${myconf} $(use_enable truetype xft)"
+	if use X; then
+		myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
+		myconf="${myconf} --enable-own-window $(use_enable truetype xft)"
 	else
-		myconf="${myconf} --disable-x11 --disable-double-buffer --disable-xdamage --disable-own-window"
-		myconf="${myconf} --disable-xft"
+		myconf="--disable-x11 --disable-own-window"
 	fi
+
 	econf \
 		${myconf} \
+		$(use_enable alsa) \
+		$(use_enable apcupsd) \
 		$(use_enable audacious) \
 		$(use_enable bmpx) \
 		$(use_enable debug) \
-		$(use_enable hddtemp ) \
-		$(use_enable ibm) \
+		$(use_enable hddtemp) \
+		$(use_enable imlib imlib2) \
+		$(use_enable lua) \
+		$(use_enable thinkpad ibm) \
+		$(use_enable math) \
 		$(use_enable moc) \
 		$(use_enable mpd) \
 		$(use_enable nvidia) \
+		$(use_enable openmp) \
 		$(use_enable rss) \
 		$(use_enable wifi wlan) \
-		$(use_enable !ipv6 portmon) || die "econf failed"
-}
-
-src_compile() {
-	local mymake
-	if useq ipv6 ; then
-		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
-
-	emake ${mymake} || die "emake failed"
+		$(use_enable portmon)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog AUTHORS README || die
-	dohtml doc/docs.html doc/config_settings.html doc/variables.html || die
+	dodoc ChangeLog AUTHORS TODO || die "dodoc failed"
+	dohtml doc/docs.html doc/config_settings.html doc/variables.html \
+		|| die "dohtml failed"
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/ftdetect
@@ -109,17 +96,14 @@
 }
 
 pkg_postinst() {
-	elog "You can find the sample configuration file at"
-	elog "/etc/conky/conky.conf.  To customize it, copy"
-	elog "/etc/conky/conky.conf to ~/.conkyrc and edit"
-	elog "it to your liking."
+	elog "You can find a sample configuration file at"
+	elog "${ROOT%/}/etc/conky/conky.conf. To customize, copy"
+	elog "it to ~/.conkyrc and edit it to your liking."
 	elog
-	elog "For more info on Conky's new features,"
-	elog "please look at the README and ChangeLog:"
-	elog "/usr/share/doc/${PF}/README.bz2"
-	elog "/usr/share/doc/${PF}/ChangeLog.bz2"
+	elog "For more info on Conky's new features please look at"
+	elog "the Changelog in ${ROOT%/}/usr/share/doc/${PF}"
 	elog "There are also pretty html docs available"
-	elog "on Conky's site or in /usr/share/doc/${PF}"
+	elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html"
 	elog
 	elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
 	elog