dep fix

5 files changed, 14 insertions, 77 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 32cec7d31138..099afa1011ad 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,9 @@
 # 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.20 2004/03/17 00:37:16 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.21 2004/03/19 13:16:01 foser Exp $
+
+  19 Mar 2004; foser <foser@gentoo.org> faad2-1.1.ebuild :
+  Fix libtool dep (#45110)
 
   16 Mar 2004; Jason Wever <weeve@gentoo.org> faad2-2.0_rc3.ebuild:
   Marked stable on sparc.
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index d36c68b3d568..07828d4371a1 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,16 +1,14 @@
-MD5 3663257ba3b78dd2361b327b93174d15 ChangeLog 3063
-MD5 5957ea55f1b2f774c2118054f8d68944 faad2-1.1.ebuild 1007
-MD5 bee842eaa79e76a1be4f8380779b9512 faad2-2.0_rc1.ebuild 1688
-MD5 08b4c5ec4b5bd331adf26f265dd15f8f faad2-2.0_rc3.ebuild 1258
-MD5 8b5320d3c7b57d34bbd12f34eaaabc08 metadata.xml 304
 MD5 9dacb8ea7625e127d600b96f11f5b175 faad2-2.0_rc3-r1.ebuild 1627
 MD5 a902ca5a230fd2d3dcba5f5b0b7dcbd2 faad2-2.0.ebuild 1838
-MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62
-MD5 2603753c0def47977fce3b5d494b8f65 files/digest-faad2-2.0_rc1 65
+MD5 08b4c5ec4b5bd331adf26f265dd15f8f faad2-2.0_rc3.ebuild 1258
+MD5 f1a3955e38e1fbd5220743bccfb4df43 faad2-1.1.ebuild 1017
+MD5 0c6e913718cff1e232558b770cdc994c ChangeLog 3150
+MD5 8b5320d3c7b57d34bbd12f34eaaabc08 metadata.xml 304
+MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
 MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3 65
-MD5 ae1e030d365422623250d1fa71e2fe72 files/faad2-1.1-gentoo.diff 440
-MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3-r1 65
+MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0 61
 MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416
+MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3-r1 65
 MD5 f597fe37924ee807ccafd546e2662513 files/faad2-2.0-makefile-space.patch 326
-MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
+MD5 ae1e030d365422623250d1fa71e2fe72 files/faad2-1.1-gentoo.diff 440
diff --git a/media-libs/faad2/faad2-1.1.ebuild b/media-libs/faad2/faad2-1.1.ebuild
index 6df4ba7c3a3c..0289707e02b1 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.9 2004/01/26 00:33:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-1.1.ebuild,v 1.10 2004/03/19 13:16:01 foser Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 IUSE=""
 KEYWORDS="x86 ppc ~sparc amd64"
 DEPEND=">=media-libs/libsndfile-1.0.1
-	>=libtool-1.4.1-r10
+	>=sys-devel/libtool-1.4.1-r10
 	sys-devel/automake
 	sys-devel/autoconf"
 SLOT="0"
diff --git a/media-libs/faad2/faad2-2.0_rc1.ebuild b/media-libs/faad2/faad2-2.0_rc1.ebuild
deleted file mode 100644
index 108f5c3ac6c4..000000000000
--- a/media-libs/faad2/faad2-2.0_rc1.ebuild
+++ /dev/null
@@ -1,63 +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_rc1.ebuild,v 1.4 2004/01/26 00:33:21 vapier Exp $
-
-inherit eutils libtool
-
-HOMEPAGE="http://faac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/faac/${PN}_${PV}.tar.gz"
-LICENSE="GPL-2"
-DESCRIPTION="FAAD2 is the fastest ISO AAC audio decoder available. FAAD2 correctly decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC files."
-S="${WORKDIR}"
-IUSE="xmms"
-KEYWORDS="~x86 ~ppc ~sparc amd64"
-DEPEND=">=media-libs/libsndfile-1.0.1
-	>=libtool-1.4.1-r10
-	sys-devel/automake
-	sys-devel/autoconf
-	xmms? ( >=media-sound/xmms-1.2.7
-			media-libs/id3lib )"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	sh ./bootstrap
-	elibtoolize
-	if [ ! "`use xmms`" ]
-	then
-		rm -rf ${S}/plugins/xmms/*
-	fi
-	econf
-	if [ "`use xmms`" ]
-	then
-		cd ${S}/plugins/xmms
-		elibtoolize
-		econf
-		sed -e "s:CFLAGS =:CFLAGS = -I ../../../include:" \
-		-e "s:libdir = \`xmms-config --input-plugin-dir\`:libdir = ${D}/\`xmms-config --input-plugin-dir\`:" \
-		${S}/plugins/xmms/src/Makefile > Makefile.new
-		mv Makefile.new ${S}/plugins/xmms/src/Makefile
-	else
-		sed -e "s:plugins::g" Makefile > Makefile.new
-		mv Makefile.new Makefile
-	fi
-	cd ${S}/frontend
-	cp Makefile Makefile.orig
-	sed -e "s:CCLD = \$(CC):CCLD = \$(CXX):" Makefile.orig > Makefile
-	cd ${S}
-
-	emake || die
-}
-
-src_install() {
-	cd ${S}/plugins/xmms/src/
-	sed -e "s:@inst_prefix_dir@:-L${D}/usr/lib:" libaac.la > libaac.la.new
-	mv libaac.la.new libaac.la
-	cd ${S}
-	einstall
-	dodoc AUTHORS ChangeLog INSTALL NEWS README README.linux TODO
-}
diff --git a/media-libs/faad2/files/digest-faad2-2.0_rc1 b/media-libs/faad2/files/digest-faad2-2.0_rc1
deleted file mode 100644
index 4809ee087f33..000000000000
--- a/media-libs/faad2/files/digest-faad2-2.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 102be2681834f9f0351a885eb7eb5c99 faad2_2.0_rc1.tar.gz 662359