replace the old multilib-patch with a more elegant one, thanks to Ben Skeggs; bug 103431

Package-Manager: portage-2.0.51.22-r2

4 files changed, 34 insertions, 21 deletions

diff --git a/media-gfx/yafray/ChangeLog b/media-gfx/yafray/ChangeLog
index b6168fe9ba7f..404c9a1d1a0c 100644
--- a/media-gfx/yafray/ChangeLog
+++ b/media-gfx/yafray/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/yafray
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/ChangeLog,v 1.22 2005/09/17 03:11:36 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/ChangeLog,v 1.23 2005/10/01 10:12:02 blubb Exp $
+
+  01 Oct 2005; Simon Stelling <blubb@gentoo.org>
+  +files/yafray-0.0.8-libdir.patch, -files/yafray-0.0.8-multilib.patch,
+  yafray-0.0.8.ebuild:
+  replace the old multilib-patch with a more elegant one, thanks to Ben
+  Skeggs; bug 103431
 
   17 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
   -files/yafray-gcc34-fix.gz, yafray-0.0.6.ebuild:
diff --git a/media-gfx/yafray/Manifest b/media-gfx/yafray/Manifest
index 59e0187ed7e5..a9eb83c10867 100644
--- a/media-gfx/yafray/Manifest
+++ b/media-gfx/yafray/Manifest
@@ -1,14 +1,14 @@
-MD5 a998d11d232890b45f990edea55e4fa5 yafray-0.0.7.ebuild 995
+MD5 4255cf67b32ddb1a2ae686dbb2fc8d0a ChangeLog 3116
+MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 MD5 6cd6b3531914a358df0c6698b3ecae0d yafray-0.0.4.ebuild 807
 MD5 97a8d3328032eff330989855015de006 yafray-0.0.6.ebuild 1067
-MD5 53d1b9323b2170c982baa8b88a006d00 yafray-0.0.8.ebuild 1175
-MD5 ca27148d75d11e8226316a24540dde29 ChangeLog 2883
-MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
+MD5 a998d11d232890b45f990edea55e4fa5 yafray-0.0.7.ebuild 995
+MD5 9efd27c5ec50f63cb06d5a5bd30bafb0 yafray-0.0.8.ebuild 1150
 MD5 9eb9f2e8a635d14ca7d085f6a0f271d0 files/digest-yafray-0.0.4 64
 MD5 c26515fc17ce25dd3a97c619f013d4da files/digest-yafray-0.0.6 126
 MD5 1369fb0f3bdcd1b7cbf08c71ded07fca files/digest-yafray-0.0.7 64
-MD5 b99ce19d58e373fa5dd2529e24bb3bfc files/digest-yafray-0.0.8 64
 MD5 7b50d20a15ce12bca91f1354401f1351 files/yafray-0.0.7-scons.patch 866
-MD5 63017b75fa2e4e4da822a1c0588125bb files/yafray-0.0.8-multilib.patch 833
+MD5 b99ce19d58e373fa5dd2529e24bb3bfc files/digest-yafray-0.0.8 64
 MD5 78f9242de2b0493dab84891fe6c9e2eb files/yafray-0.0.8-scons.patch 782
 MD5 6f303b3dd7cb31ba2fdd965c7bcddbe3 files/yafray-0.0.8-64bit.patch 659
+MD5 065bf1da4acf58011d3907c814822bb1 files/yafray-0.0.8-libdir.patch 962
diff --git a/media-gfx/yafray/files/yafray-0.0.8-multilib.patch b/media-gfx/yafray/files/yafray-0.0.8-libdir.patch
index 1b68c2e6fc4b..adab682c93e8 100644
--- a/media-gfx/yafray/files/yafray-0.0.8-multilib.patch
+++ b/media-gfx/yafray/files/yafray-0.0.8-libdir.patch
@@ -1,22 +1,31 @@
---- linux-settings.py.old	2005-09-04 15:51:15.000000000 +0200
-+++ linux-settings.py	2005-09-04 15:52:29.000000000 +0200
-@@ -10,8 +10,8 @@
- 	global prefix
- 	prefix = args.get('prefix','/usr/local')
+--- linux-settings.old	2005-07-06 06:12:10.000000000 +1000
++++ linux-settings.py	2005-08-23 20:28:12.000000000 +1000
+@@ -5,13 +5,15 @@
+ 
+ srcroot = os.getcwd()
+ prefix = ''
++libdir = ''
  
+ def init(args): 
+-	global prefix
++	global prefix, libdir
+ 	prefix = args.get('prefix','/usr/local')
+-
 -def get_libpath(args): return prefix+"/lib"
 -def get_pluginpath(args): return prefix+"/lib/yafray"
-+def get_libpath(args): return prefix+"/lib64"
-+def get_pluginpath(args): return prefix+"/lib64/yafray"
++	libdir = args.get('libdir','/lib')
++	
++def get_libpath(args): return prefix+libdir
++def get_pluginpath(args): return prefix+libdir+"/yafray"
  def get_binpath(args): return prefix+"/bin"
  def get_confpath(args): return prefix+"/etc"
  def get_cxxflags(args):
-@@ -34,7 +34,7 @@
+@@ -34,7 +36,7 @@
  			return False
  		
  	def get_include(args): return [ exr.PATH + "/include/OpenEXR" ]
 -	def get_libpath(args): return [ exr.PATH + "/lib" ]
-+	def get_libpath(args): return [ exr.PATH + "/lib64" ]
++	def get_libpath(args): return [ exr.PATH + libdir ]
  	def get_libs(args): return ['IlmImf', 'Imath', 'Iex', 'Half']
  
  class jpeg(globalinfo.library):
diff --git a/media-gfx/yafray/yafray-0.0.8.ebuild b/media-gfx/yafray/yafray-0.0.8.ebuild
index 3600dad82f31..88ea2743683f 100644
--- a/media-gfx/yafray/yafray-0.0.8.ebuild
+++ b/media-gfx/yafray/yafray-0.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.8.ebuild,v 1.2 2005/09/04 14:02:42 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.8.ebuild,v 1.3 2005/10/01 10:12:02 blubb Exp $
 
 inherit eutils python multilib
 
@@ -28,9 +28,7 @@ src_unpack() {
 	libtoolize --copy --force
 	epatch ${FILESDIR}/${P}-scons.patch
 	epatch ${FILESDIR}/${P}-64bit.patch
-	if [[ $(get_libdir) == "lib64" ]] ; then
-		epatch ${FILESDIR}/${P}-multilib.patch
-	fi
+	epatch ${FILESDIR}/${P}-libdir.patch
 	# Dirty hack for a dirty buildsystem.
 	sed -i -e "s:-O3:${CXXFLAGS} -fsigned-char:g" *-settings.py
 }
@@ -40,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	scons prefix="/usr" destdir="${D}" install || die
+	scons prefix="/usr" destdir="${D}" libdir="/$(get_libdir)" install || die
 
 	find ${D} -name .sconsign -exec rm \{\} \;
 	dodoc AUTHORS 		|| die "dodoc failed"