get_libdir fixes.

5 files changed, 39 insertions, 23 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 09b6098e52dd..290a140f2f22 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xvid
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.30 2004/10/04 14:31:47 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.31 2004/10/05 19:07:44 eradicator Exp $
+
+  05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xvid-0.9.2-r1.ebuild, xvid-1.0.1.ebuild, xvid-1.0.2.ebuild:
+  get_libdir fixes.
 
   04 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> xvid-1.0.2.ebuild:
   Fixing typo which broke patching (bug #62939).
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index d8d164678cfe..da89b7b601d3 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,16 +1,26 @@
-MD5 c2f3424484133a05bd6f8da842cee87b xvid-1.0.2.ebuild 1147
-MD5 b426fe20edac2b6d51baa646eaa7a946 xvid-1.0.0_rc4.ebuild 1075
-MD5 9615cc949305a8eb01238dce87fe2395 xvid-1.0.1.ebuild 1259
-MD5 417ac4fe11b061536e9b9c8e7675c917 xvid-0.9.2-r1.ebuild 1108
-MD5 f9f3a3810d057b0ad2d4468f2d2ae967 xvid-0.9.1.ebuild 1035
-MD5 52a40070149d2549cf8ab24de77e837d ChangeLog 3695
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 8c100445a64d960693db8424931ff0eb files/1.0.2-DESTDIR.patch 1450
+MD5 f9f3a3810d057b0ad2d4468f2d2ae967 xvid-0.9.1.ebuild 1035
+MD5 05a45c221688a428d5aebb618263c20c xvid-0.9.2-r1.ebuild 1146
+MD5 b426fe20edac2b6d51baa646eaa7a946 xvid-1.0.0_rc4.ebuild 1075
+MD5 8bd75d2532aeba3e3dbaa79dfd04b228 xvid-1.0.1.ebuild 1292
+MD5 994bfb6f25c8ef1eb57d9f3a3a1e7c1c ChangeLog 3837
+MD5 92c4cb8ada67aef64ec9cfe8e35b6af1 xvid-1.0.2.ebuild 1179
+MD5 8c100445a64d960693db8424931ff0eb files/1.0.0_rc4-DESTDIR.patch 1450
+MD5 8c100445a64d960693db8424931ff0eb files/1.0.1-DESTDIR.patch 1450
 MD5 e83498fda540ee61cdb0ce3fe79585c8 files/digest-xvid-0.9.1 67
-MD5 ea0eb745946d70fea0c5dfd32d166ddb files/digest-xvid-1.0.1 67
-MD5 3ed49831081a6eb29ccda7ec2956c592 files/digest-xvid-1.0.2 67
 MD5 3943af38157fef55f9da6987560d2e77 files/digest-xvid-0.9.2-r1 67
-MD5 b2f1f286ed22acfa893dae382f47fee2 files/xvid-1.0.1-64bit-clean.patch 1723
 MD5 181053d1f28fcfb20d9a491c674d5064 files/digest-xvid-1.0.0_rc4 71
-MD5 8c100445a64d960693db8424931ff0eb files/1.0.1-DESTDIR.patch 1450
-MD5 8c100445a64d960693db8424931ff0eb files/1.0.0_rc4-DESTDIR.patch 1450
+MD5 ea0eb745946d70fea0c5dfd32d166ddb files/digest-xvid-1.0.1 67
+MD5 b2f1f286ed22acfa893dae382f47fee2 files/xvid-1.0.1-64bit-clean.patch 1723
+MD5 8c100445a64d960693db8424931ff0eb files/1.0.2-DESTDIR.patch 1450
+MD5 3ed49831081a6eb29ccda7ec2956c592 files/digest-xvid-1.0.2 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBYvEKArHZZzCEUG0RAiE2AJ9QUeduzfJzByF7pLTmgkAiebQZOwCeJifa
+WCBQZTDRzidsqZaWfl+ye4Y=
+=VsAZ
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xvid/xvid-0.9.2-r1.ebuild b/media-libs/xvid/xvid-0.9.2-r1.ebuild
index 5b6b3a04c019..dd5f424fc6b7 100644
--- a/media-libs/xvid/xvid-0.9.2-r1.ebuild
+++ b/media-libs/xvid/xvid-0.9.2-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-0.9.2-r1.ebuild,v 1.8 2004/07/14 20:39:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-0.9.2-r1.ebuild,v 1.9 2004/10/05 19:07:44 eradicator Exp $
+
+inherit eutils
 
 MY_P=${PN}core-${PV}
 DESCRIPTION="high performance/quality MPEG-4 video de-/encoding solution"
@@ -24,7 +26,7 @@ src_install() {
 	cd ${S}/../../
 
 	dodoc authors.txt changelog.txt LICENSE README.txt todo.txt
-	dosym /usr/lib/libxvidcore.so.2.1 /usr/lib/libxvidcore.so
+	dosym /usr/$(get_libdir)/libxvidcore.so.2.1 /usr/$(get_libdir)/libxvidcore.so
 
 	if use doc
 	then
diff --git a/media-libs/xvid/xvid-1.0.1.ebuild b/media-libs/xvid/xvid-1.0.1.ebuild
index 46620c191baa..a142be827981 100644
--- a/media-libs/xvid/xvid-1.0.1.ebuild
+++ b/media-libs/xvid/xvid-1.0.1.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/xvid/xvid-1.0.1.ebuild,v 1.7 2004/08/19 03:16:07 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.1.ebuild,v 1.8 2004/10/05 19:07:44 eradicator Exp $
 
 inherit eutils
 
@@ -37,9 +37,9 @@ src_install() {
 	cd ${S}/../../
 	dodoc AUTHORS ChangeLog README TODO doc/*
 
-	local mylib="$(basename $(ls ${D}/usr/lib/libxvidcore.so*))"
-	dosym ${mylib} /usr/lib/libxvidcore.so
-	dosym ${mylib} /usr/lib/${mylib/.0}
+	local mylib="$(basename $(ls ${D}/usr/$(get_libdir)/libxvidcore.so*))"
+	dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
+	dosym ${mylib} /usr/$(get_libdir)/${mylib/.0}
 
 	if use doc ; then
 		dodoc CodingStyle doc/README
diff --git a/media-libs/xvid/xvid-1.0.2.ebuild b/media-libs/xvid/xvid-1.0.2.ebuild
index 76f1d9077d76..3415994beaf9 100644
--- a/media-libs/xvid/xvid-1.0.2.ebuild
+++ b/media-libs/xvid/xvid-1.0.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/xvid/xvid-1.0.2.ebuild,v 1.5 2004/10/04 14:31:47 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.2.ebuild,v 1.6 2004/10/05 19:07:44 eradicator Exp $
 
 inherit eutils
 
@@ -33,9 +33,9 @@ src_install() {
 	cd ${S}/../../
 	dodoc AUTHORS ChangeLog README TODO doc/*
 
-	local mylib="$(basename $(ls ${D}/usr/lib/libxvidcore.so*))"
-	dosym ${mylib} /usr/lib/libxvidcore.so
-	dosym ${mylib} /usr/lib/${mylib/.0}
+	local mylib="$(basename $(ls ${D}/usr/$(get_libdir)/libxvidcore.so*))"
+	dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
+	dosym ${mylib} /usr/$(get_libdir)/${mylib/.0}
 
 	if use doc ; then
 		dodoc CodingStyle doc/README