Remove xmms useflag, always disable, and remove the trackpos patch.

Package-Manager: portage-2.1.2_rc1-r6

4 files changed, 18 insertions, 27 deletions

diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index c637d6b719d0..fc5451f59142 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/xosd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.56 2006/07/15 13:52:38 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.57 2006/11/13 14:35:35 flameeyes Exp $
+
+  13 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/2.2.8-xmms-trackpos.patch, xosd-2.2.8-r1.ebuild,
+  xosd-2.2.10-r1.ebuild, xosd-2.2.14-r1.ebuild:
+  Remove xmms useflag, always disable, and remove the trackpos patch.
 
   15 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove lanius from metadata.xml as he's retired.
diff --git a/x11-libs/xosd/xosd-2.2.10-r1.ebuild b/x11-libs/xosd/xosd-2.2.10-r1.ebuild
index 4187a41d964c..bdd0171e31fd 100644
--- a/x11-libs/xosd/xosd-2.2.10-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.10-r1.ebuild,v 1.1 2006/06/11 20:04:36 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.10-r1.ebuild,v 1.2 2006/11/13 14:35:35 flameeyes Exp $
 
 inherit eutils
 
-IUSE="xinerama xmms"
+IUSE="xinerama"
 
 DESCRIPTION="Library for overlaying text/glyphs in X-Windows X-On-Screen-Display plus binary for sending text from command line"
 HOMEPAGE="http://www.ignavus.net/"
@@ -20,21 +20,14 @@ DEPEND="|| ( (
 	x11-proto/xextproto
 	x11-proto/xineramaproto
 	x11-proto/xproto )
-	virtual/x11 )
-	xmms? ( media-sound/xmms >=media-libs/gdk-pixbuf-0.22.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/2.2.8-xmms-trackpos.patch
-}
+	virtual/x11 )"
 
 src_compile() {
 	local myconf=""
 
 	use xinerama || myconf="${myconf} --disable-xinerama"
 
-	use xmms || myconf="${myconf} --disable-new-plugin"
+	myconf="${myconf} --disable-new-plugin"
 
 	econf ${myconf} || die
 
diff --git a/x11-libs/xosd/xosd-2.2.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
index d81687c0c0c8..8005e7746e00 100644
--- a/x11-libs/xosd/xosd-2.2.14-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14-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/x11-libs/xosd/xosd-2.2.14-r1.ebuild,v 1.2 2006/06/12 19:06:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14-r1.ebuild,v 1.3 2006/11/13 14:35:35 flameeyes Exp $
 
 inherit eutils
 
@@ -13,15 +13,11 @@ SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="xinerama xmms"
+IUSE="xinerama"
 
 RDEPEND="|| ( ( x11-libs/libX11
 	x11-libs/libXext )
-	virtual/x11 )
-	xmms? (
-		media-sound/xmms
-		>=media-libs/gdk-pixbuf-0.22.0
-	)"
+	virtual/x11 )"
 
 DEPEND="|| ( (
 	x11-libs/libX11
@@ -40,7 +36,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/2.2.8-xmms-trackpos.patch
 	epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
 
 	export WANT_AUTOMAKE=1.8
@@ -54,7 +49,7 @@ src_unpack() {
 src_compile() {
 	econf \
 		`use_enable xinerama` \
-		`use_enable xmms new-xmms` \
+		--disable-new-xmms \
 	emake || die "emake failed"
 }
 
diff --git a/x11-libs/xosd/xosd-2.2.8-r1.ebuild b/x11-libs/xosd/xosd-2.2.8-r1.ebuild
index 568fdfdac17e..29a2f708459e 100644
--- a/x11-libs/xosd/xosd-2.2.8-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.8-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.8-r1.ebuild,v 1.10 2006/06/22 21:49:56 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.8-r1.ebuild,v 1.11 2006/11/13 14:35:35 flameeyes Exp $
 
 inherit eutils
 
-IUSE="xinerama xmms"
+IUSE="xinerama"
 
 DESCRIPTION="Library for overlaying text/glyphs in X-Windows X-On-Screen-Display plus binary for sending text from command line"
 HOMEPAGE="http://www.ignavus.net/"
@@ -20,13 +20,11 @@ DEPEND="|| ( (
 	x11-proto/xextproto
 	x11-proto/xineramaproto
 	x11-proto/xproto )
-	virtual/x11 )
-	xmms? ( media-sound/xmms >=media-libs/gdk-pixbuf-0.22.0 )"
+	virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch "${FILESDIR}"/${PV}-xmms-trackpos.patch
 	epatch "${FILESDIR}"/${P}-libxosd.patch
 }
 
@@ -35,7 +33,7 @@ src_compile() {
 
 	use xinerama || myconf="${myconf} --disable-xinerama"
 
-	use xmms || myconf="${myconf} --disable-new-plugin"
+	myconf="${myconf} --disable-new-plugin"
 
 	econf ${myconf} || die