get_libdir fixes.

4 files changed, 34 insertions, 20 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index c0a9775ce74c..42347747fb88 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.72 2004/09/30 01:37:41 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.73 2004/10/07 02:26:12 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  transcode-0.6.12-r1.ebuild, transcode-0.6.12-r2.ebuild:
+  get_libdir fixes
 
 *transcode-0.6.12-r2 (29 Sep 2004)
 
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index b56e211ba617..87503f42340d 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,17 +1,27 @@
-MD5 f9eec7a52a7ed77258780fe2864a6a68 transcode-0.6.11.ebuild 3824
-MD5 a4cf0b67ac117bcf19379edf8b49311e transcode-0.6.12-r2.ebuild 4291
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 86390d31bd8d79fc3914a707bb7f3c1b ChangeLog 13748
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 d1c7003902b194931e4fcf7994105fb5 transcode-0.6.10.ebuild 3758
-MD5 e7a071e38ddb21bcdc312d95cb540485 transcode-0.6.12-r1.ebuild 3653
+MD5 f9eec7a52a7ed77258780fe2864a6a68 transcode-0.6.11.ebuild 3824
+MD5 9e60a5fe6ed81870f4d91e03db5603bf transcode-0.6.12-r1.ebuild 3674
 MD5 01c1de259f9be1df3ec8d7b595547419 transcode-0.6.12.ebuild 2907
-MD5 f51cee8bf64848c76e51b5e325328482 ChangeLog 13609
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 b2561dbf66455c878a08afd19868dc5d files/transcode-0.6.12-gcc-3.4.patch 2503
+MD5 ef53728b075fba8cd9e15e46a7fc0c8d transcode-0.6.12-r2.ebuild 4324
 MD5 ef79fbe94405505c11c537e07b25c669 files/digest-transcode-0.6.10 69
 MD5 bc1cb5a39d56ce5216c803c74e73545d files/digest-transcode-0.6.11 69
 MD5 8fde4803c96e026f6caa94fa0e42687f files/digest-transcode-0.6.12 69
-MD5 3b957eef288ce095a2ff0a256aec7c93 files/transcode-0.6.11-no-mmx.patch 1491
-MD5 90f42fff1c2a0b4be8df0b015ac2b309 files/transcode-0.6.12-r2-gcc34.patch 2963
-MD5 085f514d559cd32a401241bbbf639d39 files/transcode-0.6.12-r2-dvdmenu.patch 4840
 MD5 8fde4803c96e026f6caa94fa0e42687f files/digest-transcode-0.6.12-r1 69
-MD5 8fde4803c96e026f6caa94fa0e42687f files/digest-transcode-0.6.12-r2 69
+MD5 3b957eef288ce095a2ff0a256aec7c93 files/transcode-0.6.11-no-mmx.patch 1491
 MD5 2cb7b1a00a0529a8256fc0104b5f2a09 files/transcode-gcc34.patch 460
+MD5 b2561dbf66455c878a08afd19868dc5d files/transcode-0.6.12-gcc-3.4.patch 2503
+MD5 8fde4803c96e026f6caa94fa0e42687f files/digest-transcode-0.6.12-r2 69
+MD5 085f514d559cd32a401241bbbf639d39 files/transcode-0.6.12-r2-dvdmenu.patch 4840
+MD5 90f42fff1c2a0b4be8df0b015ac2b309 files/transcode-0.6.12-r2-gcc34.patch 2963
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBZKlQArHZZzCEUG0RAmIpAJsE86aTRfTMhPIFxijuzop5c1X9UQCfYoy8
+aHt9pMb3WgJQGEXfcwI1D20=
+=oAG6
+-----END PGP SIGNATURE-----
diff --git a/media-video/transcode/transcode-0.6.12-r1.ebuild b/media-video/transcode/transcode-0.6.12-r1.ebuild
index a392193f9238..46e0fd91efcb 100644
--- a/media-video/transcode/transcode-0.6.12-r1.ebuild
+++ b/media-video/transcode/transcode-0.6.12-r1.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-video/transcode/transcode-0.6.12-r1.ebuild,v 1.13 2004/06/28 06:24:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.12-r1.ebuild,v 1.14 2004/10/07 02:26:12 eradicator Exp $
 
 inherit libtool flag-o-matic eutils gcc
 
@@ -81,9 +81,9 @@ src_compile() {
 	fi
 
 	# Use the MPlayer libpostproc if present
-	[ -f ${ROOT}/usr/lib/libpostproc.a ] && \
+	[ -f ${ROOT}/usr/$(get_libdir)/libpostproc.a ] && \
 	[ -f ${ROOT}/usr/include/postproc/postprocess.h ] && \
-		myconf="${myconf} --with-libpostproc-builddir=${ROOT}/usr/lib"
+		myconf="${myconf} --with-libpostproc-builddir=${ROOT}/usr/$(get_libdir)"
 
 	econf \
 		CFLAGS="${CFLAGS} -DDCT_YUV_PRECISION=1" \
diff --git a/media-video/transcode/transcode-0.6.12-r2.ebuild b/media-video/transcode/transcode-0.6.12-r2.ebuild
index edd63c2b4395..c0d469eac52b 100644
--- a/media-video/transcode/transcode-0.6.12-r2.ebuild
+++ b/media-video/transcode/transcode-0.6.12-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.12-r2.ebuild,v 1.1 2004/09/30 01:07:00 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.12-r2.ebuild,v 1.2 2004/10/07 02:26:12 eradicator Exp $
 
-inherit libtool flag-o-matic gcc
+inherit libtool flag-o-matic eutils gcc
 
 # dont strip binarys causes missing symbol problems
 # with pvm compiles
@@ -16,7 +16,7 @@ SRC_URI="http://www.zebra.fh-weingarten.de/~transcode/pre/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc -sparc -amd64"
+KEYWORDS="~x86 ~ppc -sparc ~amd64"
 IUSE="sdl static mpeg mmx sse 3dnow encode X quicktime avi altivec oggvorbis theora pvm"
 
 DEPEND=">=media-libs/a52dec-0.7.4
@@ -111,9 +111,9 @@ src_compile() {
 			--with-pvm3-include=/usr/local/pvm3/include"
 
 	# Use the MPlayer libpostproc if present
-	[ -f ${ROOT}/usr/lib/libpostproc.a ] && \
+	[ -f ${ROOT}/usr/$(get_libdir)/libpostproc.a ] && \
 	[ -f ${ROOT}/usr/include/postproc/postprocess.h ] && \
-		myconf="${myconf} --with-libpostproc-builddir=${ROOT}/usr/lib"
+		myconf="${myconf} --with-libpostproc-builddir=${ROOT}/usr/$(get_libdir)"
 
 	append-flags -DDCT_YUV_PRECISION=1
 
@@ -150,7 +150,7 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodoc AUTHORS ChangeLog README TODO