made xine-lib use get_libdir. fixes bug 62339

3 files changed, 36 insertions, 27 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 56698b2a6155..571535d515ba 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.140 2004/08/15 14:55:20 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.141 2004/09/01 03:44:21 lv Exp $
+
+  31 Aug 2004; Travis Tilley <lv@gentoo.org> xine-lib-1_rc5-r3.ebuild:
+  made xine-lib use get_libdir. fixes bug 62339
 
   15 Aug 2004; Jason Wever <weeve@gentoo.org> xine-lib-1_rc5-r3.ebuild:
   Stable on sparc wrt bug #59948.
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index f2f3917014ef..16c18f702074 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,34 +1,34 @@
-MD5 44e22f7db7ceb810eee961e7605c2a8f ChangeLog 23849
-MD5 0118256c86331c5cbf93ea4fbb2adcdf metadata.xml 310
 MD5 bae904dab9ad5b925685aa5696cf55be xine-lib-0.9.13-r3.ebuild 3358
 MD5 1afa21a14a483b7ab3da77f0fe0da0b6 xine-lib-1_rc2.ebuild 3936
-MD5 cd0097aed0057e4252054a657518f7a7 xine-lib-1_rc3-r1.ebuild 4045
-MD5 440519b4014d0a0a37d494fc810c6acd xine-lib-1_rc5-r2.ebuild 5119
-MD5 8117790e59d85f138595a5c53fdcc1d8 xine-lib-1_rc5-r3.ebuild 5188
 MD5 889791b95cff6056978f8cf34978d447 xine-lib-1_rc4.ebuild 4465
+MD5 4db72ea7b68abd207c28dfe1915bd364 xine-lib-1_rc5-r3.ebuild 5512
 MD5 3bf8ecd5b5a394355bf35572b5fe5129 xine-lib-1_rc4-r1.ebuild 4992
-MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
-MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
-MD5 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68
-MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r2 67
+MD5 cd0097aed0057e4252054a657518f7a7 xine-lib-1_rc3-r1.ebuild 4045
+MD5 440519b4014d0a0a37d494fc810c6acd xine-lib-1_rc5-r2.ebuild 5119
+MD5 53dc634c4ae9e94c51798c8be5ded13b ChangeLog 23966
+MD5 0118256c86331c5cbf93ea4fbb2adcdf metadata.xml 310
+MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
+MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
 MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
-MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
-MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
-MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
+MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
 MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
+MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
+MD5 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68
+MD5 4927f9e562e68f539a5f3a6e4711d873 files/digest-xine-lib-1_rc4-r1 68
+MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r2 67
 MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67
-MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
+MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
+MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
+MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
+MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
+MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
 MD5 ae644beadf7c9218bdbd3ed27865918a files/digest-xine-lib-1_rc4 67
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
-MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
+MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc4-configure-sparc.patch 587
-MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
-MD5 4927f9e562e68f539a5f3a6e4711d873 files/digest-xine-lib-1_rc4-r1 68
-MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
-MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
-MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
diff --git a/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild b/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild
index 5cf1cf6299ba..2b448dfeecd9 100644
--- a/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc5-r3.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/xine-lib/xine-lib-1_rc5-r3.ebuild,v 1.8 2004/08/15 14:55:20 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild,v 1.9 2004/09/01 03:44:21 lv Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -106,6 +106,7 @@ src_compile() {
 	# Use the built-in dvdnav plugin.
 	local myconf="--with-included-dvdnav"
 
+	# the win32 codec path should ignore $(get_libdir) and always use lib
 	use avi	&& use x86 \
 		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
 		|| myconf="${myconf} --disable-asf"
@@ -114,7 +115,7 @@ src_compile() {
 		&& myconf="${myconf} --enable-vis --build=${CHOST}"
 
 	use amd64 \
-		&& myconf="${myconf} --with-xv-path=/usr/X11R6/lib"
+		&& myconf="${myconf} --with-xv-path=/usr/X11R6/$(get_libdir)"
 
 	# Fix compilation-errors on PowerPC #45393 & #55460
 	if use ppc ; then
@@ -129,6 +130,10 @@ src_compile() {
 		append-flags -ffunction-sections
 	fi
 
+	# if lib64 is a directory, sometimes the configure will set libdir itself
+	# and the installation fails. see bug #62339
+	myconf="${myconf} --libdir=/usr/$(get_libdir)"
+
 	econf \
 		`use_enable X x11` `use_with X x` `use_enable X shm` `use_enable X xft` \
 		`use_enable esd` \
@@ -146,7 +151,8 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die "Install failed"
+	# portage 2.0.50's einstall is broken for handling libdir
+	make DESTDIR=${D} install || die "Install failed"
 
 	# Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112).
 	dodir /usr/share/xine/libxine1/fonts