app-emulation/qemulator: Modify basedir patch for multilib support.

svn path=/sunrise/; revision=3804

4 files changed, 49 insertions, 13 deletions

diff --git a/app-emulation/qemulator/ChangeLog b/app-emulation/qemulator/ChangeLog
index b98e5a405..517744d3d 100644
--- a/app-emulation/qemulator/ChangeLog
+++ b/app-emulation/qemulator/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   03 Jun 2007; Santiago M. Mola <gentoo@coldwind.org>
+  qemulator-0.4.4.ebuild, files/qemulator-0.4.4-basedir.patch:
+  Modify basedir patch for multilib support.
+
+  03 Jun 2007; Santiago M. Mola <gentoo@coldwind.org>
   qemulator-0.4.4.ebuild:
   Use {multilib,python}.eclass
 
diff --git a/app-emulation/qemulator/Manifest b/app-emulation/qemulator/Manifest
index 67e22e1c6..d7d4d4ac2 100644
--- a/app-emulation/qemulator/Manifest
+++ b/app-emulation/qemulator/Manifest
@@ -1,5 +1,5 @@
-AUX qemulator-0.4.4-basedir.patch 409 RMD160 fc9e2f33e82fcf45497922cc7e57dae22add37e0 SHA1 ea0251ea9a111f66b43d86cfe2a5d3cbff805d93 SHA256 607739458cf75a6e99fc166c18375f083610943a06cee32d8ef072b69a4f493a
+AUX qemulator-0.4.4-basedir.patch 1325 RMD160 5406d474bc9532300a3caededdc181f638ecb0c6 SHA1 0e47d666d0fe5cd9d98be30ad242971fefee32a6 SHA256 9695401f86522056c6eb802365add8fb5f40c6bbfd164cc71824ce19740cf714
 DIST dodownload.php?file=Qemulator-0.4.4.tar.gz 667896 RMD160 7505cc08be0fbada55809eea3a8a139ab04d556f SHA1 4913a6fc9ff39ccb56c72ddfb6fd5bea9b6ce80b SHA256 3ee68ec89300789702706a91903f999788110318ade0e29e1ab0eb18a549b19f
-EBUILD qemulator-0.4.4.ebuild 920 RMD160 7828d1462625aaa459cb431dd01a3f5c55df630f SHA1 0d5aadd50d3b9421734026dd3f6df004a145ad8e SHA256 12c0a04f32c97baed4c839ab6454dbb3ef3451506601fcc5697dd7e51437e3bf
-MISC ChangeLog 454 RMD160 1db986857eb49dc05150073378eac5ac9d8f9af8 SHA1 a04e545cc528d21226a90812178520a3337befd5 SHA256 7b2a79e8e16116dfc59ef95a37eae3293978c37d1e76da260abfcd398ddb18c6
+EBUILD qemulator-0.4.4.ebuild 1018 RMD160 a312f194fadfef46c619aeac5b02ef643f83918f SHA1 ba5fed224663af9dd26b153b19a82418c748d056 SHA256 e526aea91d04c500b98acdf7a57a09481d90828e5ecc970551e7f63fcc035e80
+MISC ChangeLog 617 RMD160 0e77cac61fcf07548867edd6495a9e429bc9df28 SHA1 f5abaf5ea99b4e691c02d9ebea8a09ee8a20fe15 SHA256 8aeeeca3ebd7a5f7726ef60a68f4728bb14267c831bf8ee997485eb873ed0845
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-emulation/qemulator/files/qemulator-0.4.4-basedir.patch b/app-emulation/qemulator/files/qemulator-0.4.4-basedir.patch
index fbb8fd4df..130567312 100644
--- a/app-emulation/qemulator/files/qemulator-0.4.4-basedir.patch
+++ b/app-emulation/qemulator/files/qemulator-0.4.4-basedir.patch
@@ -1,10 +1,41 @@
---- usr/local/bin/qemulator	2007-03-03 22:40:27.000000000 +0100
-+++ usr/local/bin/qemulator	2007-03-03 22:32:29.000000000 +0100
-@@ -78,6 +78,7 @@
- if not os.path.exists(os.path.join(basedir, "main.py")):
-     if os.path.exists(os.path.join(os.getcwd(), "main.py")):
-         basedir = os.getcwd()
-+basedir = "/usr/lib/qemulator"
- sys.path.insert(0, basedir)
- os.chdir(basedir)  
+--- usr/local/lib/qemulator/qemulator.py.orig	2007-06-03 15:32:03.000000000 +0200
++++ usr/local/lib/qemulator/qemulator.py	2007-06-03 15:49:08.000000000 +0200
+@@ -72,21 +72,16 @@
+     
+ #for param in os.environ.keys():
+ #    print "%20s %s" % (param,os.environ[param])
+-    
+-current_path = os.path.realpath(__file__)
+-basedir = os.path.dirname(os.path.realpath(__file__))
+-if not os.path.exists(os.path.join(basedir, "main.py")):
+-    if os.path.exists(os.path.join(os.getcwd(), "main.py")):
+-        basedir = os.getcwd()
+-sys.path.insert(0, basedir)
+-os.chdir(basedir)  
++_libdir = "@GENTOO_LIBDIR@"
++basedir = "/usr"
++
++
++
  #print "basedir: " + basedir
+-basedir = basedir.replace ( '/bin', '' ) 
+-basedir = basedir.replace ( '/lib/qemulator', '' ) 
+-sys.path.append(basedir)   
++sys.path.append(basedir)
+ bindir = basedir + "/bin"
+ #print "bindir: " + bindir
+-libdir = basedir + "/lib/qemulator"
++libdir = basedir + "/" + _libdir + "/qemulator"
+ #print "libdir: " + libdir
+ sharedir = basedir + "/share/qemulator"
+ #print "sharedir: " + sharedir
+@@ -96,7 +91,8 @@
+ configdir = homedir + "/config"
+ #print "configdir: " + configdir           
+ icondirs = [sharedir + "/icons",homedir + "/icons"] 
+-
++sys.path.insert(0, libdir)
++os.chdir(libdir)
+ ## Import all Qemulator classes 
+ import qml_network
+ import qml_controlmon
diff --git a/app-emulation/qemulator/qemulator-0.4.4.ebuild b/app-emulation/qemulator/qemulator-0.4.4.ebuild
index 53dea831a..04c428b72 100644
--- a/app-emulation/qemulator/qemulator-0.4.4.ebuild
+++ b/app-emulation/qemulator/qemulator-0.4.4.ebuild
@@ -26,7 +26,8 @@ src_unpack(){
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-basedir.patch"
-
+	sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):" \
+		usr/local/lib/${PN}/${PN}.py || die "sed failed"
 }
 
 src_install() {