now using make instead of emake to fix xmms compilation problem. Also "doexe" to install xmms plugins because they don't get installed on a clean install \(just an upgrade\)... this isn't an optimal solution, but it's a quick fix... now using make DESTDIR=${D} install. Closes bug #38001.

3 files changed, 26 insertions, 24 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index f2d9e1ebd71c..7c3cf16e3e8e 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2004/02/01 05:16:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.14 2004/02/02 08:17:22 eradicator Exp $
+
+  02 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  faad2-2.0_rc3-r1.ebuild:
+  now using make instead of emake to fix xmms compilation problem. Also "doexe"
+  to install xmms plugins because they dont get installed on a clean install
+  (just an upgrade)... this isnt an optimal solution, but its a quick fix... now
+  using make DESTDIR=${D} install. Closes bug #38001 (again).
 
 *faad2-2.0_rc3-r1 (31 Jan 2004)
 
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 1385e4f90951..3d554b098a3f 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,8 +1,8 @@
-MD5 15ab85590dcad4d8012ca6e2496d02c8 faad2-2.0_rc3-r1.ebuild 2223
+MD5 621df3f6d6afcd253663f22821a1bd55 faad2-2.0_rc3-r1.ebuild 1614
 MD5 bee842eaa79e76a1be4f8380779b9512 faad2-2.0_rc1.ebuild 1688
 MD5 6b83d28f546c8d7fa22753b6591f8745 faad2-2.0_rc3.ebuild 1262
 MD5 5957ea55f1b2f774c2118054f8d68944 faad2-1.1.ebuild 1007
-MD5 10dce9bd1ccd05f726350bc035c5f1d8 ChangeLog 1899
+MD5 83d9e05ad3c3325b9173290785ebdde7 ChangeLog 2284
 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
index 03510f68f4cf..3172668bcc12 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.1 2004/02/01 05:16:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0_rc3-r1.ebuild,v 1.2 2004/02/02 08:17:22 eradicator Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -17,11 +17,14 @@ 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_compile() {
 	# see #34392
 	filter-flags -mfpmath=sse
@@ -37,31 +40,23 @@ src_compile() {
 		`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
+	# emake causes xmms plugin building to fail
+	make || die
 }
 
 src_install() {
-	einstall || die
+	# Copy over the xmms plugins first.  make install will not install these unless this is an upgrade.  See bug #38001
+	if use xmms; then
+		exeinto `xmms-config --input-plugin-dir`
+		doexe ${S}/plugins/xmmsmp4/src/.libs/libmp4.so
+		doexe ${S}/plugins/xmms/src/.libs/libaac.so
+	fi
+
+	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
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README README.linux TODO
 }