multilib fixes

4 files changed, 39 insertions, 11 deletions

diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog
index b4b59c2c62d7..aedd3d922319 100644
--- a/media-libs/libmpeg3/ChangeLog
+++ b/media-libs/libmpeg3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmpeg3
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.28 2004/10/07 02:59:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.29 2004/10/08 09:36:14 eradicator Exp $
+
+  08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/1.5.2-gentoo-multilib.patch, libmpeg3-1.5.2.ebuild:
+  multilib fixes
 
   06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   libmpeg3-1.5.2.ebuild:
diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 1ba225af3c54..816bbc9fb7c8 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -3,8 +3,8 @@ Hash: SHA1
 
 MD5 e76a83a10bc9f809a7e1da2212554f78 libmpeg3-1.5-r1.ebuild 1417
 MD5 f1a2d80d7720b1fb586d7b1d3eb452bd libmpeg3-1.5.1.ebuild 1497
-MD5 5a407f36a17c2fbbef1ef65bc51a6a17 libmpeg3-1.5.2.ebuild 1984
-MD5 96f336a5e63dd8cae194af344417ab8b ChangeLog 4370
+MD5 f5156b767622b6d281aada7655afa1ec libmpeg3-1.5.2.ebuild 2132
+MD5 3273729d7acb4924e9ff1b720a951423 ChangeLog 4506
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 d3a05866020d3e1f064974f5363c6c53 files/1.5.1-gentoo-mpeg3split.patch 2315
 MD5 8c1c4667609bae1089a66ea6c8ee1f28 files/1.5.1-gentoo-p1.patch 1376
@@ -25,10 +25,11 @@ MD5 13a083a65d008679db7c396ceafa31f0 files/digest-libmpeg3-1.5.1 71
 MD5 81b6cc87dac447d9be64d2327bd6193c files/digest-libmpeg3-1.5.2 71
 MD5 793abbb0f0a5b2d5593ffc4be358bd80 files/libmpeg3-gentoo-patch-part1 1358
 MD5 d350249b0ff07ff5969ce4368d5ebbe5 files/libmpeg3-gentoo-patch-part2 4180
+MD5 c132ad46a3ae646bb3cb0f2f283db3ca files/1.5.2-gentoo-multilib.patch 877
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBZLEsArHZZzCEUG0RAgNjAJ4oVka8ggDG81fZ8QgTE+klKqifCgCfQcpi
-Eva0c5u945YFLLorn53iv6A=
-=q6oi
+iD8DBQFBZl+YArHZZzCEUG0RAvr8AJ9DHON+OvVZTgwGz/KpecKZQRBdxQCfaEd2
+wfYLhNLO1eUlMZ62iWDUujA=
+=r7+o
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmpeg3/files/1.5.2-gentoo-multilib.patch b/media-libs/libmpeg3/files/1.5.2-gentoo-multilib.patch
new file mode 100644
index 000000000000..795e1ac7bea5
--- /dev/null
+++ b/media-libs/libmpeg3/files/1.5.2-gentoo-multilib.patch
@@ -0,0 +1,20 @@
+diff -Naur libmpeg3-1.5.2.orig/Makefile libmpeg3-1.5.2/Makefile
+--- libmpeg3-1.5.2.orig/Makefile	2004-10-08 02:31:11.839597000 -0700
++++ libmpeg3-1.5.2/Makefile	2004-10-08 02:33:42.627740299 -0700
+@@ -212,13 +212,13 @@
+ 	install -d $(DESTDIR)/include/libmpeg3
+ 	install -d $(DESTDIR)/include/libmpeg3/audio
+ 	install -d $(DESTDIR)/include/libmpeg3/video
+-	install -d $(DESTDIR)/lib
++	install -d $(DESTDIR)/$(LIBDIR)
+ 	install $(UTILS) $(DESTDIR)/bin
+ 	install -m 644 $(INSTALL_HEADERS) $(DESTDIR)/include/libmpeg3
+ 	install -m 644 $(INSTALL_AHEADERS) $(DESTDIR)/include/libmpeg3/audio
+ 	install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)/include/libmpeg3/video
+-	install -m 644 $(OUTPUT) $(DESTDIR)/lib
+-	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/lib
++	install -m 644 $(OUTPUT) $(DESTDIR)/$(LIBDIR)
++	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/$(LIBDIR)
+ 
+ clean:
+ 	rm -rf $(OBJDIR)
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild
index 53bea330b431..d623d9bfda5a 100644
--- a/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild,v 1.14 2004/10/07 02:59:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild,v 1.15 2004/10/08 09:36:14 eradicator Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -32,6 +32,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-largefile.patch
 	epatch ${FILESDIR}/${PV}-proper-c.patch
 	epatch ${FILESDIR}/${PV}-no-nasm.patch
+	epatch ${FILESDIR}/${PV}-gentoo-multilib.patch
 	[ "`gcc-version`" == "3.4" ] && epatch ${FILESDIR}/${PV}-gcc3.4.patch #49452
 	# remove a52 crap
 	echo > Makefile.a52
@@ -39,10 +40,12 @@ src_unpack() {
 	ln -s /usr/include/a52dec a52dec-0.7.3/include
 	local libs
 	libs=" -la52"
-	if grep -q djbfft ${ROOT}usr/$(get_libdir)/liba52.a; then
-		libs="${libs} -ldjbfft"
+	if ! [ -f "${ROOT}/usr/$(get_libdir)/liba52.so" ]; then
+		if grep -q djbfft ${ROOT}/usr/$(get_libdir)/liba52.a; then
+			libs="${libs} -ldjbfft"
+		fi
 	fi
-	sed -i "/LIBS = /s:$: -L\${ROOT}usr/lib ${libs}:" Makefile
+	sed -i "/LIBS = /s:$: -L\${ROOT}usr/$(get_libdir) ${libs}:" Makefile
 }
 
 src_compile() {
@@ -60,6 +63,6 @@ src_install() {
 	# to show the correct include syntax '<>' instead of '""'  This patch
 	# was also generated using info from SF's src.rpm
 	epatch ${FILESDIR}/${PV}-gentoo-p2.patch
-	make DESTDIR=${D}/usr install || die
+	make DESTDIR="${D}/usr" LIBDIR="$(get_libdir)" install || die
 	dohtml -r docs
 }