disable bmpx dependancy as it is masked

(Portage version: 2.1_pre5)

5 files changed, 14 insertions, 15 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index bcc3f7c0e571..2453a5248617 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.20 2006/02/18 23:07:32 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.21 2006/03/01 21:30:07 dragonheart Exp $
+
+*conky-1.4.0-r1 (01 Mar 2006)
+*conky-1.3.5-r1 (01 Mar 2006)
+
+  01 Mar 2006; Daniel Black <dragonheart@gentoo.org> -conky-1.3.5.ebuild,
+  +conky-1.3.5-r1.ebuild, -conky-1.4.0.ebuild, +conky-1.4.0-r1.ebuild:
+  remove bmpx dependancy as it is masked
 
   18 Feb 2006; Daniel Black <dragonheart@gentoo.org> conky-1.4.0.ebuild:
   media-sound/beep-media-player masked pending removed - removed optional
diff --git a/app-admin/conky/conky-1.3.5.ebuild b/app-admin/conky/conky-1.3.5-r1.ebuild
index ae94849cc023..83ba8e294517 100644
--- a/app-admin/conky/conky-1.3.5.ebuild
+++ b/app-admin/conky/conky-1.3.5-r1.ebuild
@@ -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.3.5.ebuild,v 1.2 2006/01/06 20:31:59 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.3.5-r1.ebuild,v 1.1 2006/03/01 21:30:07 dragonheart Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype X ipv6 bmpx"
+IUSE="truetype X ipv6"
 
 DEPEND_COMMON="
 	virtual/libc
@@ -26,9 +26,6 @@ DEPEND_COMMON="
 				virtual/x11
 		)
 		truetype? ( >=media-libs/freetype-2 )
-		bmpx? ( media-sound/bmpx
-				>=sys-apps/dbus-0.35
-			)
 	)"
 
 RDEPEND="${DEPEND_COMMON}"
@@ -61,12 +58,11 @@ src_compile() {
 	fi
 	local myconf
 	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime \
-		--enable-mpd --enable-mldonkey"
+		--enable-mpd --enable-mldonkey --disable-bmpx"
 	econf \
 		${myconf} \
 		$(use_enable truetype xft) \
 		$(use_enable X x11) \
-		$(use_enable bmpx) \
 		$(use_enable !ipv6 portmon) || die "econf failed"
 	emake ${mymake} || die "compile failed"
 }
diff --git a/app-admin/conky/conky-1.4.0.ebuild b/app-admin/conky/conky-1.4.0-r1.ebuild
index 237bfe6eedc1..4075d4f452f2 100644
--- a/app-admin/conky/conky-1.4.0.ebuild
+++ b/app-admin/conky/conky-1.4.0-r1.ebuild
@@ -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.0.ebuild,v 1.2 2006/02/18 23:07:32 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.0-r1.ebuild,v 1.1 2006/03/01 21:30:07 dragonheart Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype X ipv6 bmpx xmms infopipe audacious"
+IUSE="truetype X ipv6 xmms infopipe audacious"
 
 DEPEND_COMMON="
 	virtual/libc
@@ -26,9 +26,6 @@ DEPEND_COMMON="
 				virtual/x11
 		)
 		truetype? ( >=media-libs/freetype-2 )
-		bmpx? ( media-sound/bmpx
-				>=sys-apps/dbus-0.35
-		)
 		audacious? ( media-sound/audacious )
 		infopipe? ( || ( media-plugins/bmp-infopipe media-plugins/xmms-infopipe ) )
 		xmms? ( media-sound/xmms )
@@ -69,12 +66,11 @@ src_compile() {
 	fi
 	local myconf
 	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime \
-		--enable-mpd --enable-mldonkey"
+		--enable-mpd --enable-mldonkey --disable-bmpx"
 	econf \
 		${myconf} \
 		$(use_enable truetype xft) \
 		$(use_enable X x11) \
-		$(use_enable bmpx) \
 		$(use_enable xmms) \
 		$(use_enable audacious) \
 		$(use_enable infopipe) \
diff --git a/app-admin/conky/files/digest-conky-1.3.5 b/app-admin/conky/files/digest-conky-1.3.5-r1
index 4c00f75d609b..4c00f75d609b 100644
--- a/app-admin/conky/files/digest-conky-1.3.5
+++ b/app-admin/conky/files/digest-conky-1.3.5-r1
diff --git a/app-admin/conky/files/digest-conky-1.4.0 b/app-admin/conky/files/digest-conky-1.4.0-r1
index daf49f2cff1c..daf49f2cff1c 100644
--- a/app-admin/conky/files/digest-conky-1.4.0
+++ b/app-admin/conky/files/digest-conky-1.4.0-r1