5 files changed, 94 insertions, 5 deletions
diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index f6e1ff28bcb5..5043a5f23992 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/faad2
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.91 2007/05/21 21:03:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.92 2007/11/20 18:46:24 aballier Exp $
+
+*faad2-2.6.1 (20 Nov 2007)
+
+  20 Nov 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/faad2-2.6.1-abi_has_changed.patch, +faad2-2.6.1.ebuild:
+  bump it now that the license issues are resolved, force abi number to be
+  bumped because all symbols have been renamed, upstream has been informed but
+  not very responsive which kinda sucks
 
   21 May 2007; Raúl Porcel <armin76@gentoo.org> faad2-2.0-r13.ebuild:
   alpha stable wrt #161390
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 49c809440b4a..db378f9b49f5 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,4 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX faad2-2.6.1-abi_has_changed.patch 496 RMD160 a5f11c7934f0fd0ebf4c4b361cf78fac82d8ebd2 SHA1 f7e9d89fc551e0b61a7b7555749ed7a3129a4ce8 SHA256 0ca18d9149cf4336cb43aa9ee1e32d44c61cb5e8728dd50425c52d0c80e558d3
+MD5 06e83633c609d20436794b62a382b3dc files/faad2-2.6.1-abi_has_changed.patch 496
+RMD160 a5f11c7934f0fd0ebf4c4b361cf78fac82d8ebd2 files/faad2-2.6.1-abi_has_changed.patch 496
+SHA256 0ca18d9149cf4336cb43aa9ee1e32d44c61cb5e8728dd50425c52d0c80e558d3 files/faad2-2.6.1-abi_has_changed.patch 496
 DIST faad2-2.0.tar.gz 766660 RMD160 e1e4d7c96cbc3db2b9e67385062ccf5decb61f90 SHA1 fc9f8d0812a9f46bbd851880045131e0e4ab08b8 SHA256 a62a4622862252e53e0dd58c3b0307a138f5100304e07bf50c8aee31a68ab861
+DIST faad2-2.6.1.tar.gz 839410 RMD160 ad559933dad6a65576a9947819190f04cb3b1c16 SHA1 b4ad33d3c4dfa6dbf3011a3da34c631926cabfad SHA256 8ad2c2e0c09b787a943e2ef831c1c84534e3a8726cc1eb1abc4da9eb3038285c
 DIST faad2-patches-5.tar.bz2 8667 RMD160 daf1faab7af84cd6991ee34cfc0492faf07055fa SHA1 1470d2ee2ea5acf667db6b01c259b94e746f9dba SHA256 1aec9612878dae292b8152f79bcf8fedfefbd7aadaac89f4e6c00f942d4fc1f4
 EBUILD faad2-2.0-r11.ebuild 1510 RMD160 1426a445ab0495c5aab60573d52850bf0f5d3dff SHA1 aa2173125d46a81d6c6762fde42eba87c2ebecb2 SHA256 f573ceab63bee725f45ed3d5e3db579e945dd30db5d74769f762307ae6833e61
 MD5 91733c78bb5623c00a8068863d1c04ad faad2-2.0-r11.ebuild 1510
@@ -8,10 +16,14 @@ EBUILD faad2-2.0-r13.ebuild 1515 RMD160 05c0fdffa53f588f4903d83261334000f525469b
 MD5 fbe54dd0ca3367995597c9945d0853da faad2-2.0-r13.ebuild 1515
 RMD160 05c0fdffa53f588f4903d83261334000f525469b faad2-2.0-r13.ebuild 1515
 SHA256 8858e27ab7da4b9eb302dc76f11af16695953bac57be075cb1270287cccb6a6c faad2-2.0-r13.ebuild 1515
-MISC ChangeLog 12937 RMD160 a893f864b20202964ad4dd2836e2516c2176eb68 SHA1 c8c4954963911016b643c53f102e483e4e7536cf SHA256 44f72474f519c46521624d372abca813ffb1c95413c3fc1075fad8393ea4c02a
-MD5 fe5cf367809665776f9cf329cfbaa5bb ChangeLog 12937
-RMD160 a893f864b20202964ad4dd2836e2516c2176eb68 ChangeLog 12937
-SHA256 44f72474f519c46521624d372abca813ffb1c95413c3fc1075fad8393ea4c02a ChangeLog 12937
+EBUILD faad2-2.6.1.ebuild 856 RMD160 e93efbb6d8084d64a9ac651bfc11f00bcbce7659 SHA1 e6276426e5791963e77abcc1f1437d86a8656240 SHA256 35d97956fcc09ec205cc6eb706d6c453c0ea73d6d0c4556923e952a95d937a0d
+MD5 13febddc8475b52ed386f3ce8975b919 faad2-2.6.1.ebuild 856
+RMD160 e93efbb6d8084d64a9ac651bfc11f00bcbce7659 faad2-2.6.1.ebuild 856
+SHA256 35d97956fcc09ec205cc6eb706d6c453c0ea73d6d0c4556923e952a95d937a0d faad2-2.6.1.ebuild 856
+MISC ChangeLog 13278 RMD160 dc92d685fb2e443403b50f1f63cacef5ec6c5bc6 SHA1 1efffc40ede5c55ba73688ed9f0b5030e396a329 SHA256 b631021f73fb9b30fc64ac83f98803b43e19f8a8c239ce920f6282940504abff
+MD5 66a0011565970d3d1c48f753a4ac4044 ChangeLog 13278
+RMD160 dc92d685fb2e443403b50f1f63cacef5ec6c5bc6 ChangeLog 13278
+SHA256 b631021f73fb9b30fc64ac83f98803b43e19f8a8c239ce920f6282940504abff ChangeLog 13278
 MISC metadata.xml 387 RMD160 891f0392b255f261ca75a0e8541d453579313ace SHA1 f013305de22423b585f4138b1a5e9d67ca45c17f SHA256 b96036a098648c1ad5fb2105bd2997bed79a5df723389e892627ae2523aae356
 MD5 fa11072383948db52dccac007cc2c73d metadata.xml 387
 RMD160 891f0392b255f261ca75a0e8541d453579313ace metadata.xml 387
@@ -22,3 +34,13 @@ SHA256 fb76d0987ca664ad08d88c5a97f79328d83357088d9d75db4b5bc3d2dc04b4b1 files/di
 MD5 9640728e8e4b1d1726f7189f13f7b390 files/digest-faad2-2.0-r13 473
 RMD160 ae418ef22cbda30819261428f50fc487cf0b040c files/digest-faad2-2.0-r13 473
 SHA256 9c8116b90e712da479a939c9ceff861534435b08f59136e0cce99eb2b5f3ccc2 files/digest-faad2-2.0-r13 473
+MD5 3b913b48c46c57fac92d3009078b4760 files/digest-faad2-2.6.1 235
+RMD160 b712ff5cfd63a2c0b6863afe6ff668729e2739f9 files/digest-faad2-2.6.1 235
+SHA256 e7e81e983cab7dfe656c0e7beda10700c5050b2fcc864048fe9f0621ece6477d files/digest-faad2-2.6.1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHQyuLvFcC4BYPU0oRAkGMAJ0dMhR2B96HgiIa2sZqJETjEPfUcwCfQbSF
+3ga6xXeqW9Oc2iA2oQeAELs=
+=VOnu
+-----END PGP SIGNATURE-----
diff --git a/media-libs/faad2/faad2-2.6.1.ebuild b/media-libs/faad2/faad2-2.6.1.ebuild
new file mode 100644
index 000000000000..a681c0a61161
--- /dev/null
+++ b/media-libs/faad2/faad2-2.6.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.6.1.ebuild,v 1.1 2007/11/20 18:46:24 aballier Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="http://www.audiocoding.com/"
+SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-abi_has_changed.patch"
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--with-drm \
+		--without-xmms \
+		|| die "econf failed"
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README README.linux TODO
+}
diff --git a/media-libs/faad2/files/digest-faad2-2.6.1 b/media-libs/faad2/files/digest-faad2-2.6.1
new file mode 100644
index 000000000000..1bf209d064a0
--- /dev/null
+++ b/media-libs/faad2/files/digest-faad2-2.6.1
@@ -0,0 +1,3 @@
+MD5 74e92df40c270f216a8305fc87603c8a faad2-2.6.1.tar.gz 839410
+RMD160 ad559933dad6a65576a9947819190f04cb3b1c16 faad2-2.6.1.tar.gz 839410
+SHA256 8ad2c2e0c09b787a943e2ef831c1c84534e3a8726cc1eb1abc4da9eb3038285c faad2-2.6.1.tar.gz 839410
diff --git a/media-libs/faad2/files/faad2-2.6.1-abi_has_changed.patch b/media-libs/faad2/files/faad2-2.6.1-abi_has_changed.patch
new file mode 100644
index 000000000000..7206e3803bc5
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.6.1-abi_has_changed.patch
@@ -0,0 +1,14 @@
+Index: faad2/libfaad/Makefile.am
+===================================================================
+--- faad2.orig/libfaad/Makefile.am
++++ faad2/libfaad/Makefile.am
+@@ -3,7 +3,8 @@ lib_LTLIBRARIES = libfaad.la
+ include_HEADERS = $(top_srcdir)/include/faad.h \
+                   $(top_srcdir)/include/neaacdec.h
+ 
+-libfaad_la_LDFLAGS = -lm
++libfaad_la_LDFLAGS = -version-info 1:0:0
++libfaad_la_LIBADD = -lm
+ 
+ libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
+ drm_dec.c error.c filtbank.c \