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

(Portage version: 2.0.51.22-r2)

3 files changed, 28 insertions, 15 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/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"