Remove xmms useflag, remove older redundant version, remove noext patch (only needed for xmms).

Package-Manager: portage-2.1.2_rc1-r6

5 files changed, 26 insertions, 30 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index a2ea81297a7d..d9870c883933 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/faad2
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.79 2006/09/24 22:02:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.80 2006/11/13 15:33:36 flameeyes Exp $
+
+  13 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/faad2-2.0-noext.patch, -faad2-2.0-r3.ebuild, faad2-2.0-r7.ebuild,
+  faad2-2.0-r11.ebuild, faad2-2.0-r12.ebuild, faad2-2.0-r13.ebuild:
+  Remove xmms useflag, remove older redundant version, remove noext patch
+  (only needed for xmms).
 
   24 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> faad2-2.0-r11.ebuild:
   Stable on ia64.
diff --git a/media-libs/faad2/faad2-2.0-r11.ebuild b/media-libs/faad2/faad2-2.0-r11.ebuild
index 1bcbbae91db4..e0ba3d08dc45 100644
--- a/media-libs/faad2/faad2-2.0-r11.ebuild
+++ b/media-libs/faad2/faad2-2.0-r11.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/media-libs/faad2/faad2-2.0-r11.ebuild,v 1.14 2006/11/12 03:31:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r11.ebuild,v 1.15 2006/11/13 15:33:36 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -17,11 +17,9 @@ SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="xmms"
+IUSE=""
 
-RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
-		media-libs/id3lib )
-	media-libs/libmp4v2"
+RDEPEND="media-libs/libmp4v2"
 
 DEPEND="${RDEPEND}"
 
@@ -43,7 +41,8 @@ src_compile() {
 	# drm needed for nothing but doesn't hurt
 	econf \
 		--with-drm \
-		$(use_with xmms) \
+		--without-xmms \
+		|| die "econf failed"
 
 	emake || die
 }
diff --git a/media-libs/faad2/faad2-2.0-r12.ebuild b/media-libs/faad2/faad2-2.0-r12.ebuild
index 649f64c84554..6d7e526456f8 100644
--- a/media-libs/faad2/faad2-2.0-r12.ebuild
+++ b/media-libs/faad2/faad2-2.0-r12.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/media-libs/faad2/faad2-2.0-r12.ebuild,v 1.5 2006/11/12 03:31:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r12.ebuild,v 1.6 2006/11/13 15:33:36 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -17,11 +17,9 @@ SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="xmms"
+IUSE=""
 
-RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
-		media-libs/id3lib )
-	media-libs/libmp4v2"
+RDEPEND="media-libs/libmp4v2"
 
 DEPEND="${RDEPEND}"
 
@@ -32,7 +30,6 @@ src_unpack() {
 	cd ${S}
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/faad-2.0-xmms.patch"
 	eautoreconf
 }
 
@@ -44,7 +41,8 @@ src_compile() {
 	# drm needed for nothing but doesn't hurt
 	econf \
 		--with-drm \
-		$(use_with xmms) \
+		--without-xmms \
+		|| die "econf failed"
 
 	emake || die
 }
diff --git a/media-libs/faad2/faad2-2.0-r13.ebuild b/media-libs/faad2/faad2-2.0-r13.ebuild
index 7b79098d4c04..6ab7ab12bb33 100644
--- a/media-libs/faad2/faad2-2.0-r13.ebuild
+++ b/media-libs/faad2/faad2-2.0-r13.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/media-libs/faad2/faad2-2.0-r13.ebuild,v 1.3 2006/11/12 03:31:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r13.ebuild,v 1.4 2006/11/13 15:33:36 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -17,10 +17,9 @@ SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="xmms"
+IUSE=""
 
-RDEPEND="xmms? ( >=media-sound/xmms-1.2.7 media-libs/id3lib )
-	media-libs/libmp4v2"
+RDEPEND="media-libs/libmp4v2"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}
@@ -30,7 +29,6 @@ src_unpack() {
 	cd ${S}
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/faad-2.0-xmms.patch"
 	eautoreconf
 }
 
@@ -44,7 +42,8 @@ src_compile() {
 	# drm needed for nothing but doesn't hurt
 	econf \
 		--with-drm \
-		$(use_with xmms) \
+		--without-xmms \
+		|| die "econf failed"
 
 	emake || die
 }
diff --git a/media-libs/faad2/faad2-2.0-r7.ebuild b/media-libs/faad2/faad2-2.0-r7.ebuild
index 7f0fd997d8ca..23ed4b871738 100644
--- a/media-libs/faad2/faad2-2.0-r7.ebuild
+++ b/media-libs/faad2/faad2-2.0-r7.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/media-libs/faad2/faad2-2.0-r7.ebuild,v 1.10 2006/11/04 11:24:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r7.ebuild,v 1.11 2006/11/13 15:33:36 flameeyes Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -11,11 +11,9 @@ SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86"
-IUSE="xmms"
+IUSE=""
 
-RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
-		media-libs/id3lib )
-	!media-video/mpeg4ip"
+RDEPEND="!media-video/mpeg4ip"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4.0.7
@@ -38,9 +36,6 @@ src_unpack() {
 	cd ${S}/common/mp4v2
 	epatch ${FILESDIR}/mp4atom-sliver.patch
 
-	cd ${S}/plugins/xmms/src
-	epatch ${FILESDIR}/${P}-noext.patch
-
 	cd ${S}
 	epatch ${FILESDIR}/${P}-amd64.patch
 }
@@ -64,10 +59,9 @@ src_compile() {
 	econf \
 		--with-mp4v2 \
 		--with-drm \
-		`use_with xmms` \
+		--without-xmms \
 		|| die
 
-	# emake causes xmms plugin building to fail
 	emake || die
 
 }