Revision bump. Add curl use flag, thanks to jlec for pointing this out on IRC. Rework configure. Remove old.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 22 insertions, 146 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 603698077ad5..e5d0dbca21ca 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.118 2009/08/28 22:55:38 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.119 2009/09/08 16:29:26 billie Exp $
+
+*conky-1.7.2-r1 (08 Sep 2009)
+
+  08 Sep 2009; Pielmeier Daniel <billie@gentoo.org> -conky-1.7.2_rc2.ebuild,
+  -conky-1.7.2_rc3.ebuild, +conky-1.7.2-r1.ebuild:
+  Revision bump. Add curl use flag, thanks to jlec for pointing this out on
+  IRC. Rework configure. Remove old.
 
 *conky-1.7.2 (28 Aug 2009)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 274dc3f46b12..e68cd0f33e68 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,25 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX conky-1.6.1-stdio.patch 299 RMD160 d4c5358424bb937deb60273738f20716fe4bd2a6 SHA1 cb9d97f56d150462628f1a5530d8c90a0ba0d01c SHA256 45dc2a627aa4ee0f41d467b666987bb33b58c3a7eed93fa5ab71e8cc23e7c299
 AUX conky-1.7.1.1-comment.patch 296 RMD160 79252610420abda967587eae39e79f20d167793b SHA1 1505289ca142d44146f20d7585e61a2d2419b1c4 SHA256 c263cb4a412a81e1544b9063cd6e9714e19a889eeffebf8a24900a02a38968b2
 AUX conky_no_x11.conf 1848 RMD160 33ffedf5ebdeb521e6cf7d42c2b349d24d732549 SHA1 0f4c2e5c171c026c51872509554d94c0b65cc16a SHA256 e67c0916aa123722ca38a5e2215e72d5506334eb5fcc6352368c3517aa804157
 DIST conky-1.6.1.tar.bz2 442180 RMD160 db9ed1cddd03711358f707f16f27d459a3b9387b SHA1 1f10d7b96f61636ffc14d2b9962c6d70aaf1c1f8 SHA256 e4acdd61e6971b7bf194c673828ef6de09f82abb95d3ece6e37e7eafab23b063
 DIST conky-1.7.1.1.tar.bz2 512566 RMD160 b3c52919bcb035a0c065b30345d2a02ed208a766 SHA1 e8a5a814c156b17aa32614e77a25389e00f1cf02 SHA256 aa7277c01dc5da407f12b27ae4d6b6ab72f24667d60818e9be28e7bdf26cd3ca
 DIST conky-1.7.2.tar.bz2 585099 RMD160 6d419c7bdeded5890c4c99cdef884bc0a79a50cb SHA1 3f4e5cc13651fbf94892b079d447a8549818809e SHA256 b3c0a1b0ff90579d48df542a6070adbe67d3926d6d0c66ee12b52b2d5a2c675c
-DIST conky-1.7.2_rc2.tar.bz2 585521 RMD160 bbf81d74208ad154433b2a1aea5c73a6bbf58422 SHA1 d2e4153e679e83d84e302de6f2bca9921701cf20 SHA256 638a8314950d2efd37fb05c5a4c0a486323be0f785e757e0471d80252866e9ec
-DIST conky-1.7.2_rc3.tar.bz2 555583 RMD160 35edbd5727e68e8023bea0b23c019b4d8a6c98df SHA1 4ce133bdd587a965e715f873cc4f13d727928207 SHA256 7f91f7f625442c277471df935f5344a707a53078846aeff55e69446ebd540921
 EBUILD conky-1.6.1.ebuild 3501 RMD160 d986c7c4430e32f56d9dc942397935b7004a805a SHA1 d059af46e282ba29dc1fa52cce8221a89eeb0d84 SHA256 9e6a893e1c38167b7fe25b2909b494d226a44c2c005d3eb87b719229d05c5ade
 EBUILD conky-1.7.1.1-r2.ebuild 3402 RMD160 7f4148b3709eebb2d71eef41ff9467791e9d4233 SHA1 e9b4cf8bb7b1327ecc1e0ac38ba3da42b4b7aec3 SHA256 6c6972a0743e2c186938dcc27da7b069e0bd0acf858c5df840b68ca6137ef30d
+EBUILD conky-1.7.2-r1.ebuild 3977 RMD160 878b4f38b04e0e7a78cc5ba8a30832ec58ec90fd SHA1 36de6bb74003db8c6d934c28873696f3ab63d179 SHA256 c0d25565c8c942869327d4ca0e4926637ddecb746abc8091b1d415b46d44bbcd
 EBUILD conky-1.7.2.ebuild 3671 RMD160 d05819917eb1a5edb067aeabee227f4f981f67b8 SHA1 b7da65765acd1d615a0c20daad8faf739b0cbdc0 SHA256 0ae2b24a793e8d29e480c448750fdb3214f32422c5e925e1f2777ed907f68449
-EBUILD conky-1.7.2_rc2.ebuild 3678 RMD160 2173f0220e04d24ffe17763b760441e0bfb83cfe SHA1 58995dc86fad65275d2fa1ef5f2f32b57ff38728 SHA256 d33470ffc56f6f30f2352b9d84b8830472728eded6233b41ca4da800b6150db0
-EBUILD conky-1.7.2_rc3.ebuild 3675 RMD160 2c60d53677bb2131de13d544e387c6982daf68dc SHA1 56f1f4124140cb74541d8d10925fd4c9cf85f6fc SHA256 66e283e6825bd0f565ffc1cbc3be56f8b368efeb39811b0c0d8750b7c2c79ed7
-MISC ChangeLog 18142 RMD160 066588466ffea32f3f76dc6330268623a951547b SHA1 bd5d97e3108eb9e14c82f8e0842e4faea7a8ab8c SHA256 97b80a2426e8127852f7f12b57633abec2f5e99fadd8c0acb41862744f833fc3
+MISC ChangeLog 18418 RMD160 dbb6cd91428857cdd13d63716a7224a175689e8c SHA1 466c513bae22b1ab69ec86ef26b81f35dbfc0485 SHA256 5de0ad8594593e1c444e9e86fe7bc0083e574192682702449da73dd1bff93c9d
 MISC metadata.xml 2204 RMD160 10f16d02cc003972f92928ddfa138bd491c52ae5 SHA1 3587a19ed8f840b46d0e47511f3c119803bed5a1 SHA256 b656e1f71e44f9f0620e55a1fb041b64bcde396a4924923ac2a0b787e52fc08c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqYYHsACgkQvSApE0uP4UthQwCePmhsNsW1O+/OycESwNcVSl/T
-IZkAni+d9iY1TbPN/kmGGkJsck2gC6j7
-=/0y6
------END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.7.2_rc2.ebuild b/app-admin/conky/conky-1.7.2-r1.ebuild
index 90770ad1d8d2..6d68b01f0519 100644
--- a/app-admin/conky/conky-1.7.2_rc2.ebuild
+++ b/app-admin/conky/conky-1.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.2_rc2.ebuild,v 1.1 2009/07/30 20:50:37 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.2-r1.ebuild,v 1.1 2009/09/08 16:29:26 billie Exp $
 
 EAPI="2"
 
@@ -13,8 +13,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa apcupsd audacious debug hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X"
-# currently removed openmp
+IUSE="alsa apcupsd audacious curl debug hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X"
+# currently removed openmp, see
+# http://git.omp.am/?p=conky.git;a=commit;h=670e9a0eb15ed3bc384ae0154d3c09de691e390c
 
 DEPEND_COMMON="
 	X? (
@@ -29,6 +30,7 @@ DEPEND_COMMON="
 	)
 	alsa? ( media-libs/alsa-lib )
 	audacious? ( >=media-sound/audacious-1.5 )
+	curl? ( net-misc/curl )
 	portmon? ( dev-libs/glib )
 	lua? ( >=dev-lang/lua-5.1 )
 	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
@@ -54,9 +56,14 @@ src_configure() {
 	local myconf
 	if use X; then
 		myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
-		myconf="${myconf} --enable-own-window $(use_enable truetype xft)"
+		myconf="${myconf} --enable-own-window"
+		myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)"
+		myconf="${myconf} $(use_enable lua-imlib lua-imlib2)"
+		myconf="${myconf}  $(use_enable nvidia) $(use_enable truetype xft)"
 	else
 		myconf="--disable-x11 --disable-own-window"
+		myconf="--disable-imlib --disable-lua-cairo --disable-lua-imlib"
+		myconf="--disable-nvidia --disable-xft"
 	fi
 
 	econf \
@@ -64,18 +71,15 @@ src_configure() {
 		$(use_enable alsa) \
 		$(use_enable apcupsd) \
 		$(use_enable audacious) \
+		$(use_enable curl) \
 		$(use_enable debug) \
 		$(use_enable hddtemp) \
-		$(use_enable imlib imlib2) \
 		$(use_enable iostats) \
 		$(use_enable lua) \
-		$(use_enable lua-cairo) \
-		$(use_enable lua-imlib lua-imlib2) \
 		$(use_enable thinkpad ibm) \
 		$(use_enable math) \
 		$(use_enable moc) \
 		$(use_enable mpd) \
-		$(use_enable nvidia) \
 		$(use_enable portmon) \
 		$(use_enable rss) \
 		$(use_enable weather-metar) \
diff --git a/app-admin/conky/conky-1.7.2_rc3.ebuild b/app-admin/conky/conky-1.7.2_rc3.ebuild
deleted file mode 100644
index 6abe12438e6e..000000000000
--- a/app-admin/conky/conky-1.7.2_rc3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.2_rc3.ebuild,v 1.1 2009/08/13 16:06:51 omp Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa apcupsd audacious debug hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X"
-# currently removed openmp
-
-DEPEND_COMMON="
-	X? (
-		imlib? ( media-libs/imlib2 )
-		lua-cairo? ( >=dev-lang/toluapp-1.0.93 x11-libs/cairo[X] )
-		lua-imlib? ( >=dev-lang/toluapp-1.0.93 media-libs/imlib2 )
-		nvidia? ( media-video/nvidia-settings )
-		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXext
-	)
-	alsa? ( media-libs/alsa-lib )
-	audacious? ( >=media-sound/audacious-1.5 )
-	portmon? ( dev-libs/glib )
-	lua? ( >=dev-lang/lua-5.1 )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
-	wifi? ( net-wireless/wireless-tools )
-	weather-metar? ( net-misc/curl )
-	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
-	"
-#	openmp? ( >=sys-devel/gcc-4.3[openmp] )
-RDEPEND="
-	${DEPEND_COMMON}
-	apcupsd? ( sys-power/apcupsd )
-	hddtemp? ( app-admin/hddtemp )
-	moc? ( media-sound/moc )
-	nano-syntax? ( app-editors/nano )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	"
-DEPEND="
-	${DEPEND_COMMON}
-	dev-util/pkgconfig
-	"
-
-src_configure() {
-	local myconf
-	if use X; then
-		myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
-		myconf="${myconf} --enable-own-window $(use_enable truetype xft)"
-	else
-		myconf="--disable-x11 --disable-own-window"
-	fi
-
-	econf \
-		${myconf} \
-		$(use_enable alsa) \
-		$(use_enable apcupsd) \
-		$(use_enable audacious) \
-		$(use_enable debug) \
-		$(use_enable hddtemp) \
-		$(use_enable imlib imlib2) \
-		$(use_enable iostats) \
-		$(use_enable lua) \
-		$(use_enable lua-cairo) \
-		$(use_enable lua-imlib lua-imlib2) \
-		$(use_enable thinkpad ibm) \
-		$(use_enable math) \
-		$(use_enable moc) \
-		$(use_enable mpd) \
-		$(use_enable nvidia) \
-		$(use_enable portmon) \
-		$(use_enable rss) \
-		$(use_enable weather-metar) \
-		$(use_enable weather-xoap) \
-		$(use_enable wifi wlan)
-#		$(use_enable openmp) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	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
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die "doins failed"
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim|| die "doins failed"
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano/
-		doins "${S}"/extras/nano/conky.nanorc|| die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	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 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 ${ROOT%/}/usr/share/doc/${PF}/html"
-	elog
-	elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
-	elog
-	elog "Vim syntax highlighting for conkyrc now enabled with"
-	elog "USE=vim-syntax, for Nano with USE=nano-syntax"
-	elog
-}