Fix .so dependencies in ODBC and MySQL drivers.

Package-Manager: portage-2.1.2-r4

5 files changed, 32 insertions, 21 deletions

diff --git a/dev-lang/xsb/ChangeLog b/dev-lang/xsb/ChangeLog
index a5d138a97947..d7fb42236a56 100644
--- a/dev-lang/xsb/ChangeLog
+++ b/dev-lang/xsb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/xsb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.2 2007/01/29 06:45:05 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.3 2007/01/29 08:04:45 keri Exp $
+
+  29 Jan 2007; keri <keri@gentoo.org> files/xsb-3.0.1-mysql.patch,
+  files/xsb-3.0.1-odbc.patch, files/xsb-3.0.1-xsb-script.patch:
+  Fix .so dependencies in ODBC and MySQL drivers.
 
   29 Jan 2007; keri <keri@gentoo.org> files/xsb-3.0.1-configure.patch:
   Enable use of iODBC driver manager without explicit support for ODBC.
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index fd6ee4c6ad20..5c96b852b633 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -18,18 +18,18 @@ AUX xsb-3.0.1-libwww.patch 2495 RMD160 c6e92c87eea53d2160986c469f3aec5c26a77160
 MD5 e91ded6ad224e20f085c34109cead5bb files/xsb-3.0.1-libwww.patch 2495
 RMD160 c6e92c87eea53d2160986c469f3aec5c26a77160 files/xsb-3.0.1-libwww.patch 2495
 SHA256 9cad32a23252e2b606c3727222c704cc1ca49b6559e093b5ef4ef89a07c0ae16 files/xsb-3.0.1-libwww.patch 2495
-AUX xsb-3.0.1-mysql.patch 3352 RMD160 a543f91e1246e0cdfef19334c0687e3f8490d33e SHA1 0997a2708961f0149d57458162eb7d31a2f3b4d3 SHA256 a3889879c83a6f11768c7de77796c4532f70665ff4e702e9369aca610536b1d2
-MD5 f60b0ae182ccf666e016a80bf1917313 files/xsb-3.0.1-mysql.patch 3352
-RMD160 a543f91e1246e0cdfef19334c0687e3f8490d33e files/xsb-3.0.1-mysql.patch 3352
-SHA256 a3889879c83a6f11768c7de77796c4532f70665ff4e702e9369aca610536b1d2 files/xsb-3.0.1-mysql.patch 3352
+AUX xsb-3.0.1-mysql.patch 3350 RMD160 91df2b072d62eb6fc3f8baf0f6e52208a2e4d769 SHA1 fb25162215012e33cff2e1e5f4ccbb522c713230 SHA256 082cb7bfa131edf5daab1bc94c54b677af1918d548ad1e4185ec5ba296830b05
+MD5 5332009e14840369c6b69a34241721bf files/xsb-3.0.1-mysql.patch 3350
+RMD160 91df2b072d62eb6fc3f8baf0f6e52208a2e4d769 files/xsb-3.0.1-mysql.patch 3350
+SHA256 082cb7bfa131edf5daab1bc94c54b677af1918d548ad1e4185ec5ba296830b05 files/xsb-3.0.1-mysql.patch 3350
 AUX xsb-3.0.1-nostrip.patch 386 RMD160 70870e9bec4bba5e041dab904d6e1d63a9f9b706 SHA1 f68f1c7531d249cb1c7a944614065432b600e836 SHA256 2b61a337d0bc0d05e5f2c9e3118a27dd03c775fdd399786d13337de5f3ddfb3f
 MD5 dc0f8be429eca78b7a5d783958b039c6 files/xsb-3.0.1-nostrip.patch 386
 RMD160 70870e9bec4bba5e041dab904d6e1d63a9f9b706 files/xsb-3.0.1-nostrip.patch 386
 SHA256 2b61a337d0bc0d05e5f2c9e3118a27dd03c775fdd399786d13337de5f3ddfb3f files/xsb-3.0.1-nostrip.patch 386
-AUX xsb-3.0.1-odbc.patch 2734 RMD160 7ccc51e81811c18e9cd458d34b9db4de376e5fee SHA1 0e10e137901916d450019b0f907f0aa14c9be22f SHA256 95bbfbe824bad0c946f9942729cad2469de473c256d4405ecc8df968f6244b18
-MD5 fd52fdd9a5df6ce28cc471854a5e9ad0 files/xsb-3.0.1-odbc.patch 2734
-RMD160 7ccc51e81811c18e9cd458d34b9db4de376e5fee files/xsb-3.0.1-odbc.patch 2734
-SHA256 95bbfbe824bad0c946f9942729cad2469de473c256d4405ecc8df968f6244b18 files/xsb-3.0.1-odbc.patch 2734
+AUX xsb-3.0.1-odbc.patch 2732 RMD160 08f5195eaeb1bed01dcf683b9ab893ecbb8e0bbe SHA1 d2832484137beb242aa23ba471e610c86ccdda29 SHA256 a20c214a894a6709968ffa4a969c4fc51b625dc55dd720e283432b11cc745ee6
+MD5 b14b79f89cb5dcc80bb224e4b27bd00e files/xsb-3.0.1-odbc.patch 2732
+RMD160 08f5195eaeb1bed01dcf683b9ab893ecbb8e0bbe files/xsb-3.0.1-odbc.patch 2732
+SHA256 a20c214a894a6709968ffa4a969c4fc51b625dc55dd720e283432b11cc745ee6 files/xsb-3.0.1-odbc.patch 2732
 AUX xsb-3.0.1-packages.patch 5789 RMD160 275b3cb6ca10e407ff17533216f52a01064a1e14 SHA1 2c1dc74debb82166cd71bfc740a0c1c946692c29 SHA256 84b753a1776c141d88af134cb1563756d83679d3f8cda60a12339b496b87b01f
 MD5 2596e7b8b535541a916e30a45b4b4d2a files/xsb-3.0.1-packages.patch 5789
 RMD160 275b3cb6ca10e407ff17533216f52a01064a1e14 files/xsb-3.0.1-packages.patch 5789
@@ -58,19 +58,19 @@ AUX xsb-3.0.1-xpath.patch 2359 RMD160 42b5292e58a312c197d8c33f14be8fe40737d5d7 S
 MD5 1e0effcdabd869915da2e7d8f5dc33a8 files/xsb-3.0.1-xpath.patch 2359
 RMD160 42b5292e58a312c197d8c33f14be8fe40737d5d7 files/xsb-3.0.1-xpath.patch 2359
 SHA256 193028c21f02942dceed056736a911cbe6bbc763ea4bb26fab09c30232b2377d files/xsb-3.0.1-xpath.patch 2359
-AUX xsb-3.0.1-xsb-script.patch 1332 RMD160 9d335ae8e929f7ac04fc5c26fe1fd3355d53bdff SHA1 3aa290e44ed59320cc5d538a1cb700eb435bdeb1 SHA256 a8f29272c0036baf80144c51b39019381a0f3e376b37714bc4adc4491aa2d14f
-MD5 6dcfe66a95367387fbc198875de18204 files/xsb-3.0.1-xsb-script.patch 1332
-RMD160 9d335ae8e929f7ac04fc5c26fe1fd3355d53bdff files/xsb-3.0.1-xsb-script.patch 1332
-SHA256 a8f29272c0036baf80144c51b39019381a0f3e376b37714bc4adc4491aa2d14f files/xsb-3.0.1-xsb-script.patch 1332
+AUX xsb-3.0.1-xsb-script.patch 1544 RMD160 4edc54d803e07cfff9d6fc70270e12dcfbb67bb7 SHA1 378b38b661adc472b221c06ff90a92561efcd899 SHA256 47d3e6033491cca86f5585c5d1f4c3078b3321eab6f7e6c608b396c6f3851196
+MD5 da6c7acb1861b1783e58a49acc61142b files/xsb-3.0.1-xsb-script.patch 1544
+RMD160 4edc54d803e07cfff9d6fc70270e12dcfbb67bb7 files/xsb-3.0.1-xsb-script.patch 1544
+SHA256 47d3e6033491cca86f5585c5d1f4c3078b3321eab6f7e6c608b396c6f3851196 files/xsb-3.0.1-xsb-script.patch 1544
 DIST xsb-3.0.1-src.tar.gz 4523327 RMD160 6f71401ad3cc9031ec0ced16df7d9dfd594b3fb2 SHA1 8cbef419913731617ec8811dd69799406119b9ff SHA256 05e2a76befe6303ff624c8a22543444604a75815eae276e065e462a1d21ae801
 EBUILD xsb-3.0.1.ebuild 4426 RMD160 75eb822125cceccc62b430030327389f8b719a57 SHA1 4d8e39e038dc5ef81560c40fcb1913285338f78b SHA256 742500b5bc4ee4a440aa1aae98cdd45f53b63cbfc6e2f656e666cf7d99256f6a
 MD5 fc162e3187e2dee7898fad8266d55426 xsb-3.0.1.ebuild 4426
 RMD160 75eb822125cceccc62b430030327389f8b719a57 xsb-3.0.1.ebuild 4426
 SHA256 742500b5bc4ee4a440aa1aae98cdd45f53b63cbfc6e2f656e666cf7d99256f6a xsb-3.0.1.ebuild 4426
-MISC ChangeLog 973 RMD160 d76f266478275068058155bd6bc83bdfaa6a307e SHA1 9e7c6868c718a5324e432f8584755c3a559d8729 SHA256 53342cc53134850f1881f8610d9c7a832b9ac412d1909282c70994765f23949c
-MD5 0ebfab6a41952ffc2fbd0046f552d285 ChangeLog 973
-RMD160 d76f266478275068058155bd6bc83bdfaa6a307e ChangeLog 973
-SHA256 53342cc53134850f1881f8610d9c7a832b9ac412d1909282c70994765f23949c ChangeLog 973
+MISC ChangeLog 1155 RMD160 b9159658d8780be9c44c40cb53331eda752690fc SHA1 031ee0f8998a04b6dd275912da082787543ec8f0 SHA256 615a16a01b3c16639a6c34a9389ce72acadb980a8128032b8118acc9a0a05984
+MD5 78bc6c9d5e9ed37da952c78e2711db81 ChangeLog 1155
+RMD160 b9159658d8780be9c44c40cb53331eda752690fc ChangeLog 1155
+SHA256 615a16a01b3c16639a6c34a9389ce72acadb980a8128032b8118acc9a0a05984 ChangeLog 1155
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
diff --git a/dev-lang/xsb/files/xsb-3.0.1-mysql.patch b/dev-lang/xsb/files/xsb-3.0.1-mysql.patch
index b7949f740ea0..9b12014b2da6 100644
--- a/dev-lang/xsb/files/xsb-3.0.1-mysql.patch
+++ b/dev-lang/xsb/files/xsb-3.0.1-mysql.patch
@@ -84,7 +84,7 @@ diff -ur XSB.orig/packages/dbdrivers/mysql/mysql_driver_config.P XSB/packages/db
  	runtime_loader_flag(XCC, MysqlLibdir, MysqlRunpathFlag),
  	fmt_write_string(LD_flags,
 -			 ' %s %s -lmysqlclient -ldl %s%sdriver_manager.so %s%smysql_driver.so', f(MysqlRunpathFlag, MysqlLibdir_flag, ConfigLibdir, Slash, ConfigLibdir, Slash)),
-+			 ' %s %s -lmysqlclient -ldl ./driver_manager.so', f(MysqlRunpathFlag, MysqlLibdir_flag)),
++			 ' %s %s -lmysqlclient -ldl driver_manager.so', f(MysqlRunpathFlag, MysqlLibdir_flag)),
  	package_configuration(dir(mysql_driver), MySQLDriverDir),
  	fmt_write_string(LD_directives_file,
  			 '%s%scc%smysql_driver.H', f(MySQLDriverDir, Slash, Slash)),
diff --git a/dev-lang/xsb/files/xsb-3.0.1-odbc.patch b/dev-lang/xsb/files/xsb-3.0.1-odbc.patch
index bc3b6207d3f8..c091e0013298 100644
--- a/dev-lang/xsb/files/xsb-3.0.1-odbc.patch
+++ b/dev-lang/xsb/files/xsb-3.0.1-odbc.patch
@@ -74,7 +74,7 @@ diff -ur XSB.orig/packages/dbdrivers/odbc/odbc_driver_config.P XSB/packages/dbdr
 -			     ' %s %s %s%sdriver_manager.so %s%sodbc_driver.so -lodbc -ldl',
 -			     f(OdbcRunpathFlag, ODBC_libdir_flag, 
 -			       ConfigLibDir, Slash, ConfigLibDir, Slash))
-+			     ' %s %s ./driver_manager.so -lodbc -ldl',
++			     ' %s %s driver_manager.so -lodbc -ldl',
 +			     f(OdbcRunpathFlag, ODBC_libdir_flag))
  	),
  	package_configuration(dir(odbc_driver), ODBCDriverDir),
diff --git a/dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch b/dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch
index 7bffa83f40e8..bf9a3250e661 100644
--- a/dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch
+++ b/dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch
@@ -1,5 +1,5 @@
 --- XSB.orig/build/xsb.in	2005-01-15 07:30:43.000000000 +1300
-+++ XSB/build/xsb.in	2007-01-28 22:08:36.000000000 +1300
++++ XSB/build/xsb.in	2007-01-29 20:53:13.000000000 +1300
 @@ -72,9 +72,9 @@
  scriptdir=`dirname $thisfile`
  topdir=`dirname $scriptdir`
@@ -13,7 +13,14 @@
  executable=${exec_dir}/bin/xsb
  
  # The purpose of this complex thing is to make sure that arguments
-@@ -101,12 +101,12 @@
+@@ -95,18 +95,18 @@
+ fi
+ 
+ if test -x "$executable" ; then
+-   eval "exec @CROSS_SIMULATOR@ $executable $xsb_cmd"
++   LD_LIBRARY_PATH=${exec_dir}/lib eval "exec @CROSS_SIMULATOR@ $executable $xsb_cmd"
+ else
+    echo "${executable}: "
     echo "       file doesn't exist or is not executable"
     echo ""
     echo "XSB might not have have been compiled for the following machine configuration:"