xmms plugin re-enabled thanks to Douglas Pollock <douglas.pollock@magma.ca> providing us with a patch so it doesn't violate sandbox in bug #38001.

3 files changed, 70 insertions, 2 deletions

diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 0942d200e134..1385e4f90951 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,8 +1,8 @@
-MD5 1b438435495eb22f608beacc9b967436 faad2-2.0_rc3-r1.ebuild 2116
+MD5 15ab85590dcad4d8012ca6e2496d02c8 faad2-2.0_rc3-r1.ebuild 2223
 MD5 bee842eaa79e76a1be4f8380779b9512 faad2-2.0_rc1.ebuild 1688
 MD5 6b83d28f546c8d7fa22753b6591f8745 faad2-2.0_rc3.ebuild 1262
 MD5 5957ea55f1b2f774c2118054f8d68944 faad2-1.1.ebuild 1007
-MD5 053b2b0f43ad3629619ecc73e51ce407 ChangeLog 1625
+MD5 10dce9bd1ccd05f726350bc035c5f1d8 ChangeLog 1899
 MD5 8b5320d3c7b57d34bbd12f34eaaabc08 metadata.xml 304
 MD5 2603753c0def47977fce3b5d494b8f65 files/digest-faad2-2.0_rc1 65
 MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3 65
diff --git a/media-libs/faad2/faad2-2.0_rc3-r1.ebuild b/media-libs/faad2/faad2-2.0_rc3-r1.ebuild
new file mode 100644
index 000000000000..03510f68f4cf
--- /dev/null
+++ b/media-libs/faad2/faad2-2.0_rc3-r1.ebuild
@@ -0,0 +1,67 @@
+# 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.1 2004/02/01 05:16:09 eradicator 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"
+IUSE="xmms"
+
+RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
+	media-libs/id3lib )"
+
+DEPEND="${RDEPEND}
+	sys-devel/automake
+	sys-devel/autoconf"
+
+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
+
+	econf \
+		--with-mp4v2 \
+		--with-drm \
+		`use_with xmms` \
+		|| die
+
+	#######################################################################
+	# BEGIN PATCH to fix Makefile so that it doesn't violate the sandbox.
+	OLD_XMMS_MAKEFILE=${S}/plugins/xmms/src/Makefile.old
+	NEW_XMMS_MAKEFILE=${S}/plugins/xmms/src/Makefile
+	cp ${NEW_XMMS_MAKEFILE} ${OLD_XMMS_MAKEFILE}
+	sed 's/^libdir = `xmms\-config \-\-input\-plugin\-dir`/xmmslibdir = `xmms\-config \-\-input\-plugin\-dir`/' ${OLD_XMMS_MAKEFILE} > ${NEW_XMMS_MAKEFILE}
+	echo "libdir = \${D}\${xmmslibdir}" >> ${NEW_XMMS_MAKEFILE}
+
+	OLD_XMMSMP4_MAKEFILE=${S}/plugins/xmmsmp4/src/Makefile.old
+	NEW_XMMSMP4_MAKEFILE=${S}/plugins/xmmsmp4/src/Makefile
+	cp ${NEW_XMMSMP4_MAKEFILE} ${OLD_XMMSMP4_MAKEFILE}
+	sed 's/^libdir = `xmms\-config \-\-input\-plugin\-dir`/xmmslibdir = `xmms\-config \-\-input\-plugin\-dir`/' ${OLD_XMMSMP4_MAKEFILE} > ${NEW_XMMSMP4_MAKEFILE}
+	echo "libdir = \${D}\${xmmslibdir}" >> ${NEW_XMMSMP4_MAKEFILE}
+	# END PATCH
+	#######################################################################
+
+	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_rc3-r1 b/media-libs/faad2/files/digest-faad2-2.0_rc3-r1
new file mode 100644
index 000000000000..ed3436fcdb47
--- /dev/null
+++ b/media-libs/faad2/files/digest-faad2-2.0_rc3-r1
@@ -0,0 +1 @@
+MD5 0080076438655ed7facf1089a9805aff faad2-2.0-rc3.tar.gz 704005