Add new version with fixed patch to avoid file collision when using xmms. Bug #120799.

(Portage version: 2.1_pre4-r1)

5 files changed, 48 insertions, 8 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 0378d710ea55..3709d2ee4384 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,13 @@
 # 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.62 2006/01/28 18:24:38 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.63 2006/02/05 23:30:46 flameeyes Exp $
+
+*faad2-2.0-r11 (05 Feb 2006)
+
+  05 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> -faad2-2.0-r10.ebuild,
+  +faad2-2.0-r11.ebuild:
+  Add new version with fixed patch to avoid file collision when using xmms.
+  Bug #120799.
 
   28 Jan 2006; Simon Stelling <blubb@gentoo.org>
   +files/faad2-gcc4-warnings-and-errors.patch,
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index ec9829b6a5bc..705fe5b0ea18 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,15 +1,45 @@
 MD5 652b208bb6598b403fe506486cd0c9e8 ChangeLog 8820
-MD5 8822829781eb944ed840124f915a2c0b faad2-2.0-r10.ebuild 1481
+RMD160 d1428c95684fb73be3d44a491ccca9c3464cdd0a ChangeLog 8820
+SHA256 3bfecdd721266c4208e37ac70dbc146db3251e3c33d691168ee17d1e7da2141f ChangeLog 8820
+MD5 8c9e89a3e4fa9b45de0197470a5f6dcd faad2-2.0-r11.ebuild 1464
+RMD160 8d36edbac54bf10a1795312c42e813ec9a204239 faad2-2.0-r11.ebuild 1464
+SHA256 6c46cfa6c90d1fd415696a47682b207daac0dfc253535878faa910f091b4bf39 faad2-2.0-r11.ebuild 1464
 MD5 9167396e4beb71ea1c2f38c0933e2241 faad2-2.0-r3.ebuild 2091
+RMD160 e8b7d7c8468da5d6ef0d7bd62ce43ec309b3c9ed faad2-2.0-r3.ebuild 2091
+SHA256 19facd2979c64c8d4174abcb7fe779202474849613c64fdeadcd9cc207d92496 faad2-2.0-r3.ebuild 2091
 MD5 3b8536be60c586dc67be2f19cb5bdf4a faad2-2.0-r7.ebuild 2134
-MD5 de6aa302f0d9b074fc8da5b2c43f4583 files/digest-faad2-2.0-r10 127
+RMD160 a65ed01c8e0cd8c1c85c2eb3dcd852f8b4f824a0 faad2-2.0-r7.ebuild 2134
+SHA256 6a63f00773ea6abb4e7620d2e604836b4787498e158a7a72901402aebce390ed faad2-2.0-r7.ebuild 2134
+MD5 9640728e8e4b1d1726f7189f13f7b390 files/digest-faad2-2.0-r11 473
+RMD160 ae418ef22cbda30819261428f50fc487cf0b040c files/digest-faad2-2.0-r11 473
+SHA256 9c8116b90e712da479a939c9ceff861534435b08f59136e0cce99eb2b5f3ccc2 files/digest-faad2-2.0-r11 473
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r3 61
+RMD160 7162b78df6dc3964c0acdd7c3fa350232640a54a files/digest-faad2-2.0-r3 61
+SHA256 5428e4d2d093b83761f063726657fdf33fa682c13d6058d5ee0e13bf3d7cde75 files/digest-faad2-2.0-r3 61
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r7 61
+RMD160 7162b78df6dc3964c0acdd7c3fa350232640a54a files/digest-faad2-2.0-r7 61
+SHA256 5428e4d2d093b83761f063726657fdf33fa682c13d6058d5ee0e13bf3d7cde75 files/digest-faad2-2.0-r7 61
 MD5 edab653b8b9960b0ea4a04a745786c5f files/faad2-2.0-amd64.patch 9564
+RMD160 77e3072b171be3a47768a3bdc272a3d88566ab3a files/faad2-2.0-amd64.patch 9564
+SHA256 bfa66e643345e204eb9647883bb724814f487c79f336a26bae9a0d0429dbcc84 files/faad2-2.0-amd64.patch 9564
 MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416
+RMD160 7c0941c5c76ff8befb5ac2567053c8edb117ec92 files/faad2-2.0-configure-mpeg4ip.patch 416
+SHA256 42b177730204ea88a6b682a52b2ea27e8e3de88b0a733cf7b758281b059cce8d files/faad2-2.0-configure-mpeg4ip.patch 416
 MD5 c7b0b0563f7c682ecd92ef4c32ceef60 files/faad2-2.0-gcc34.patch 296
+RMD160 8b992a907b90bb7becb0457945adf0cfef2907cc files/faad2-2.0-gcc34.patch 296
+SHA256 34c65024c78b385a42bd2a245559d92b52b422a2ab50d62cc8c47125960fbe58 files/faad2-2.0-gcc34.patch 296
 MD5 f597fe37924ee807ccafd546e2662513 files/faad2-2.0-makefile-space.patch 326
+RMD160 df335a6b9de3d9f9c1e3a1aa26542878c5a6883b files/faad2-2.0-makefile-space.patch 326
+SHA256 da086ad6ede60f6a78bc74ac859676cdc4b5d3e7ae3aa5da617565506133d708 files/faad2-2.0-makefile-space.patch 326
 MD5 1ceab8b26925d147b1e0a359ce23d56e files/faad2-2.0-noext.patch 856
+RMD160 4b4117fc2fd244fa20c501d1c71adf2877a0bbcf files/faad2-2.0-noext.patch 856
+SHA256 f3a0ccd0c5c47274165203c11489a55685891a1eb5c5f6de7b0a018a7900d384 files/faad2-2.0-noext.patch 856
 MD5 9fcaf9f55fd1f37b129ce5457b50e40d files/faad2-gcc4-warnings-and-errors.patch 12071
+RMD160 fdbce480063a4d5a4de63f589b251ef69ada6067 files/faad2-gcc4-warnings-and-errors.patch 12071
+SHA256 60ecc66631fd202dde63f4b43dc6a88008d14f22a916902652561cb81e523c14 files/faad2-gcc4-warnings-and-errors.patch 12071
 MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
+RMD160 08e3104023bc9288d83f450d1b4442e41e8ac271 files/mp4atom-sliver.patch 659
+SHA256 8f37bd575870e33001d05bd60a8a9d1fc353e8cf6f25bce835478ee6ce37d88a files/mp4atom-sliver.patch 659
 MD5 fa11072383948db52dccac007cc2c73d metadata.xml 387
+RMD160 891f0392b255f261ca75a0e8541d453579313ace metadata.xml 387
+SHA256 b96036a098648c1ad5fb2105bd2997bed79a5df723389e892627ae2523aae356 metadata.xml 387
diff --git a/media-libs/faad2/faad2-2.0-r10.ebuild b/media-libs/faad2/faad2-2.0-r11.ebuild
index 6adb62de81ac..2f821b9bfb16 100644
--- a/media-libs/faad2/faad2-2.0-r10.ebuild
+++ b/media-libs/faad2/faad2-2.0-r11.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/media-libs/faad2/faad2-2.0-r10.ebuild,v 1.1 2006/01/15 17:52:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r11.ebuild,v 1.1 2006/02/05 23:30:46 flameeyes Exp $
 
 inherit eutils libtool flag-o-matic autotools
 
-PATCHLEVEL="4"
+PATCHLEVEL="5"
 
 DESCRIPTION="AAC audio decoding library"
 HOMEPAGE="http://www.audiocoding.com/"
@@ -37,7 +37,6 @@ src_compile() {
 	# mp4v2 needed for rhythmbox
 	# drm needed for nothing but doesn't hurt
 	econf \
-		--with-mp4v2 \
 		--with-drm \
 		$(use_with xmms) \
 
diff --git a/media-libs/faad2/files/digest-faad2-2.0-r10 b/media-libs/faad2/files/digest-faad2-2.0-r10
deleted file mode 100644
index 1b27e6a49402..000000000000
--- a/media-libs/faad2/files/digest-faad2-2.0-r10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660
-MD5 5754a2951a7da57e05d1fa18036c0a64 faad2-patches-4.tar.bz2 8128
diff --git a/media-libs/faad2/files/digest-faad2-2.0-r11 b/media-libs/faad2/files/digest-faad2-2.0-r11
new file mode 100644
index 000000000000..cb21f92dfbf2
--- /dev/null
+++ b/media-libs/faad2/files/digest-faad2-2.0-r11
@@ -0,0 +1,6 @@
+MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660
+RMD160 e1e4d7c96cbc3db2b9e67385062ccf5decb61f90 faad2-2.0.tar.gz 766660
+SHA256 a62a4622862252e53e0dd58c3b0307a138f5100304e07bf50c8aee31a68ab861 faad2-2.0.tar.gz 766660
+MD5 51a371fb21fcbf77e27ed82d63273a95 faad2-patches-5.tar.bz2 8667
+RMD160 daf1faab7af84cd6991ee34cfc0492faf07055fa faad2-patches-5.tar.bz2 8667
+SHA256 1aec9612878dae292b8152f79bcf8fedfefbd7aadaac89f4e6c00f942d4fc1f4 faad2-patches-5.tar.bz2 8667