QA: Remove BMPX support. It's not even in tree anymore.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 9 insertions, 14 deletions

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 9bdc32f1a751..e207bf572325 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -4,8 +4,8 @@ AUX conky_no_x11.conf 1848 RMD160 33ffedf5ebdeb521e6cf7d42c2b349d24d732549 SHA1
 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_rc2.tar.bz2 585521 RMD160 bbf81d74208ad154433b2a1aea5c73a6bbf58422 SHA1 d2e4153e679e83d84e302de6f2bca9921701cf20 SHA256 638a8314950d2efd37fb05c5a4c0a486323be0f785e757e0471d80252866e9ec
-EBUILD conky-1.6.1.ebuild 3567 RMD160 e203f8f415052f043ede24e6b9d7e9880fe43be3 SHA1 503d487ef4e2d14533121088081f234735f4b143 SHA256 2d0f4b19c8627ed501488d1605c62105004f37a10b584ff6337bc983ef4eba96
-EBUILD conky-1.7.1.1-r2.ebuild 3457 RMD160 15adb0ce39bd24d286fa6b33913edd3639e34cd4 SHA1 307376cca4fd5546cedf62ac732b0d106be7f3cc SHA256 72bb650c0f354e9d85b73cd77e3f52739a3d87e92f4325f5f6ac683ff2c49b8e
+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_rc2.ebuild 3678 RMD160 2173f0220e04d24ffe17763b760441e0bfb83cfe SHA1 58995dc86fad65275d2fa1ef5f2f32b57ff38728 SHA256 d33470ffc56f6f30f2352b9d84b8830472728eded6233b41ca4da800b6150db0
 MISC ChangeLog 17941 RMD160 5004d342cd9619962a06dd1ed4c6751cc9f2255b SHA1 a6fba95a81d1597c7175b245e8037b13f9a496fa SHA256 0486f401e1018cf5efbe02d3cb43bfa1b3252058ba00f2ec250c52e55d975ef4
-MISC metadata.xml 2296 RMD160 33d76049b3c07fe80317cff96b38166203396f23 SHA1 f25afa589ae2b89afc0b57889613b6422e7ba3ca SHA256 9dbe8eb95c246dc5d8e2eae9028fb95a2e29d2d020cf96eb51a660fa661a02e6
+MISC metadata.xml 2204 RMD160 10f16d02cc003972f92928ddfa138bd491c52ae5 SHA1 3587a19ed8f840b46d0e47511f3c119803bed5a1 SHA256 b656e1f71e44f9f0620e55a1fb041b64bcde396a4924923ac2a0b787e52fc08c
diff --git a/app-admin/conky/conky-1.6.1.ebuild b/app-admin/conky/conky-1.6.1.ebuild
index 35f572f7b2e0..79db63b430d3 100644
--- a/app-admin/conky/conky-1.6.1.ebuild
+++ b/app-admin/conky/conky-1.6.1.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.6.1.ebuild,v 1.13 2009/06/06 19:45:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.1.ebuild,v 1.14 2009/07/31 15:58:19 ssuominen Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="audacious bmpx debug hddtemp ipv6 mpd nano-syntax nvidia rss truetype vim-syntax smapi wifi X"
+IUSE="audacious debug hddtemp ipv6 mpd nano-syntax nvidia rss truetype vim-syntax smapi wifi X"
 
 DEPEND_COMMON="
 	X? (
@@ -32,9 +32,6 @@ DEPEND_COMMON="
 				=media-sound/audacious-1.4*[dbus]
 			)
 		)
-		bmpx? ( media-sound/bmpx
-				>=sys-apps/dbus-0.35
-			)
 	)
 	rss? ( dev-libs/libxml2
 			net-misc/curl
@@ -73,7 +70,7 @@ src_configure() {
 	econf \
 		${myconf} \
 		$(use_enable audacious) \
-		$(use_enable bmpx) \
+		--disable-bmpx \
 		$(use_enable debug) \
 		$(use_enable hddtemp ) \
 		$(use_enable mpd) \
diff --git a/app-admin/conky/conky-1.7.1.1-r2.ebuild b/app-admin/conky/conky-1.7.1.1-r2.ebuild
index 25683f995d29..60a9f40ac4ef 100644
--- a/app-admin/conky/conky-1.7.1.1-r2.ebuild
+++ b/app-admin/conky/conky-1.7.1.1-r2.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.1.1-r2.ebuild,v 1.1 2009/07/30 20:50:37 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.1.1-r2.ebuild,v 1.2 2009/07/31 15:58:19 ssuominen Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="alsa apcupsd audacious bmpx debug hddtemp imlib lua math moc mpd nano-syntax nvidia +portmon rss thinkpad truetype vim-syntax wifi X"
+IUSE="alsa apcupsd audacious debug hddtemp imlib lua math moc mpd nano-syntax nvidia +portmon rss thinkpad truetype vim-syntax wifi X"
 # currently removed openmp
 
 DEPEND_COMMON="
@@ -27,7 +27,6 @@ DEPEND_COMMON="
 	)
 	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 )
 	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
@@ -66,7 +65,7 @@ src_configure() {
 		$(use_enable alsa) \
 		$(use_enable apcupsd) \
 		$(use_enable audacious) \
-		$(use_enable bmpx) \
+		--disable-bmpx \
 		$(use_enable debug) \
 		$(use_enable hddtemp) \
 		$(use_enable imlib imlib2) \
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 1a56115987ba..189e28ae528e 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -23,7 +23,6 @@
 	<use>
 		<flag name='apcupsd'>enable support for <pkg>sys-power/apcupsd</pkg></flag>
 		<flag name='audacious'>enable monitoring of music played by <pkg>media-sound/audacious</pkg></flag>
-		<flag name='bmpx'>enable monitoring of music played by <pkg>media-sound/bmpx</pkg></flag>
 		<flag name='ipv6'>disable support for tcp (ip4) port monitoring</flag>
 		<flag name='iostats'>enable support for per-task I/O statistics</flag>
 		<flag name='lua'>enable if you want Lua scripting support</flag>