Marking 2.0-r2 stable on x86 and sparc. Removing old ebuilds. Blocking if media-video/mpeg4ip is installed per bug #54311.

9 files changed, 23 insertions, 139 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 7babf331e453..1e59107d4569 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/faad2
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.30 2004/06/14 23:43:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.31 2004/06/22 22:48:32 eradicator Exp $
+
+  22 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> -faad2-2.0.ebuild:
+  Marking 2.0-r2 stable on x86 and sparc. Removing old ebuilds. Blocking if
+  media-video/mpeg4ip is installed per bug #54311.
 
 *faad2-2.0-r2 (14 Jun 2004)
 
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index facf704403c8..2695126a7a42 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,14 +1,10 @@
-MD5 7665cb536b760b7ef43690da9a0924b7 ChangeLog 4340
-MD5 4fadc59b550271cb2f97819c835f3857 faad2-1.1.ebuild 1041
-MD5 674b7b996c92b052446a47af6854e639 faad2-2.0.ebuild 1610
-MD5 fafd6f76401f3b1a58ddc4b89a84daba faad2-2.0_rc3-r1.ebuild 1626
-MD5 bcf5996ab3877b4784bc0225c880d924 faad2-2.0_rc3.ebuild 1256
+MD5 dbab84080a0e5181ae3b52eb01d2daa0 ChangeLog 4544
+MD5 7ec1cd0f19475da04c369d025743acd8 faad2-1.1.ebuild 1090
+MD5 212da1d9417e3d648f392b860a9b54dd faad2-2.0_rc3-r1.ebuild 1652
 MD5 8b5320d3c7b57d34bbd12f34eaaabc08 metadata.xml 304
-MD5 48d83b69a3a468ae8d651d4f96830a80 faad2-2.0-r2.ebuild 1713
+MD5 2f996807d14676845ec4d33500374037 faad2-2.0-r2.ebuild 1733
 MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62
-MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0 61
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r2 61
-MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3 65
 MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3-r1 65
 MD5 ae1e030d365422623250d1fa71e2fe72 files/faad2-1.1-gentoo.diff 440
 MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416
diff --git a/media-libs/faad2/faad2-1.1.ebuild b/media-libs/faad2/faad2-1.1.ebuild
index d58aa97c3990..ab120a9eae57 100644
--- a/media-libs/faad2/faad2-1.1.ebuild
+++ b/media-libs/faad2/faad2-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-1.1.ebuild,v 1.11 2004/04/26 02:41:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-1.1.ebuild,v 1.12 2004/06/22 22:48:32 eradicator Exp $
 
 inherit eutils
 
@@ -11,10 +11,14 @@ DESCRIPTION="FAAD2 is the fastest ISO AAC audio decoder available. FAAD2 correct
 S="${WORKDIR}/${PN}"
 IUSE=""
 KEYWORDS="x86 ppc ~sparc amd64"
-DEPEND=">=media-libs/libsndfile-1.0.1
-	>=sys-devel/libtool-1.4.1-r10
+RDEPEND=">=media-libs/libsndfile-1.0.1
+	 >=sys-devel/libtool-1.4.1-r10
+	 !media-video/mpeg4ip"
+
+DEPEND="${RDEPEND}
 	sys-devel/automake
 	sys-devel/autoconf"
+
 SLOT="0"
 
 src_unpack() {
diff --git a/media-libs/faad2/faad2-2.0-r2.ebuild b/media-libs/faad2/faad2-2.0-r2.ebuild
index 4904b8dde1c4..93810beeb962 100644
--- a/media-libs/faad2/faad2-2.0-r2.ebuild
+++ b/media-libs/faad2/faad2-2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r2.ebuild,v 1.1 2004/06/14 23:43:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r2.ebuild,v 1.2 2004/06/22 22:48:32 eradicator Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -10,11 +10,12 @@ SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc amd64 ~alpha ~ia64 ~hppa ~mips"
+KEYWORDS="x86 ~ppc sparc amd64 ~alpha ~ia64 ~hppa ~mips"
 IUSE="xmms"
 
 RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
-	media-libs/id3lib )"
+	media-libs/id3lib )
+	!media-video/mpeg4ip"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4.0.7
diff --git a/media-libs/faad2/faad2-2.0.ebuild b/media-libs/faad2/faad2-2.0.ebuild
deleted file mode 100644
index f06962dca8cd..000000000000
--- a/media-libs/faad2/faad2-2.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0.ebuild,v 1.4 2004/04/20 04:47:48 lv Exp $
-
-inherit eutils libtool flag-o-matic
-
-DESCRIPTION="The fastest ISO AAC audio decoder available, correctly decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC files"
-HOMEPAGE="http://faac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc amd64 ~alpha ~ia64 ~hppa ~mips"
-IUSE="xmms"
-
-RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
-	media-libs/id3lib )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0.7
-	sys-devel/automake
-	sys-devel/autoconf"
-
-S=${WORKDIR}/${PN}
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README README.linux TODO"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/faad2-2.0-makefile-space.patch
-	epatch ${FILESDIR}/faad2-2.0-configure-mpeg4ip.patch
-
-	cd ${S}/common/mp4v2
-	epatch ${FILESDIR}/mp4atom-sliver.patch
-
-	# Get the xmms plugin to behave
-	cd ${S}
-	elibtoolize
-}
-
-src_compile() {
-	# see #34392
-	filter-flags -mfpmath=sse
-
-	WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.7 sh ./bootstrap
-
-	# mp4v2 needed for rhythmbox
-	# drm needed for nothing but doesn't hurt
-
-	econf \
-		--with-mp4v2 \
-		--with-drm \
-		`use_with xmms` \
-		|| die
-
-	# emake causes xmms plugin building to fail
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc ${DOCS}
-
-	# unneeded include, breaks building of apps
-	# <foser@gentoo.org>
-	dosed "s:#include <systems.h>::" /usr/include/mpeg4ip.h
-}
diff --git a/media-libs/faad2/faad2-2.0_rc3-r1.ebuild b/media-libs/faad2/faad2-2.0_rc3-r1.ebuild
index ff53d94095e8..31decddbe76a 100644
--- a/media-libs/faad2/faad2-2.0_rc3-r1.ebuild
+++ b/media-libs/faad2/faad2-2.0_rc3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0_rc3-r1.ebuild,v 1.5 2004/02/26 18:29:47 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0_rc3-r1.ebuild,v 1.6 2004/06/22 22:48:32 eradicator Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -14,7 +14,8 @@ KEYWORDS="~x86 ~ppc ~sparc ~amd64 alpha ia64 ~hppa"
 IUSE="xmms"
 
 RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
-	media-libs/id3lib )"
+	media-libs/id3lib )
+	!media-video/mpeg4ip"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4.0.7
diff --git a/media-libs/faad2/faad2-2.0_rc3.ebuild b/media-libs/faad2/faad2-2.0_rc3.ebuild
deleted file mode 100644
index dc440f3398ab..000000000000
--- a/media-libs/faad2/faad2-2.0_rc3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0_rc3.ebuild,v 1.7 2004/04/29 01:07:26 avenj Exp $
-
-inherit eutils libtool flag-o-matic
-
-DESCRIPTION="The fastest ISO AAC audio decoder available, correctly decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC files"
-HOMEPAGE="http://faac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc amd64"
-
-DEPEND="sys-devel/automake
-	>=sys-devel/autoconf-2.58"
-#	xmms? ( >=media-sound/xmms-1.2.7
-#		media-libs/id3lib )"
-
-RDEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	# see #34392
-	filter-flags -mfpmath=sse
-
-	WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.7 sh ./bootstrap
-
-	# mp4v2 needed for rhythmbox
-	# drm needed for nothing but doesn't hurt
-	# xmms disabled, needs some makefile fixing
-	econf \
-		--with-mp4v2 \
-		--with-drm \
-		--without-xmms \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	# unneeded include, breaks building of apps
-	# <foser@gentoo.org>
-	dosed "s:#include <systems.h>::" /usr/include/mpeg4ip.h
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README README.linux TODO
-}
diff --git a/media-libs/faad2/files/digest-faad2-2.0 b/media-libs/faad2/files/digest-faad2-2.0
deleted file mode 100644
index 38c97b9bd3b4..000000000000
--- a/media-libs/faad2/files/digest-faad2-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660
diff --git a/media-libs/faad2/files/digest-faad2-2.0_rc3 b/media-libs/faad2/files/digest-faad2-2.0_rc3
deleted file mode 100644
index ed3436fcdb47..000000000000
--- a/media-libs/faad2/files/digest-faad2-2.0_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0080076438655ed7facf1089a9805aff faad2-2.0-rc3.tar.gz 704005