Enable use of iODBC driver manager without explicit support for ODBC.

Package-Manager: portage-2.1.2-r4

3 files changed, 32 insertions, 16 deletions

diff --git a/dev-lang/xsb/ChangeLog b/dev-lang/xsb/ChangeLog
index ae4e4e0eaecb..a5d138a97947 100644
--- a/dev-lang/xsb/ChangeLog
+++ b/dev-lang/xsb/ChangeLog
@@ -1,6 +1,9 @@
 # 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.1 2007/01/28 09:19:36 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.2 2007/01/29 06:45:05 keri Exp $
+
+  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.
 
 *xsb-3.0.1 (28 Jan 2007)
 
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index d2683cefffb7..fd6ee4c6ad20 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -2,10 +2,10 @@ AUX xsb-3.0.1-chr_d.patch 276 RMD160 a1fbafb1d9250403f2e9c41fbd4644983e6d2d81 SH
 MD5 b2015ba2875087d48e0e03088df56e0d files/xsb-3.0.1-chr_d.patch 276
 RMD160 a1fbafb1d9250403f2e9c41fbd4644983e6d2d81 files/xsb-3.0.1-chr_d.patch 276
 SHA256 70977545ff66725cd7d58dbd633016e5d88f5c21302faaa007f3fe724c62b3a8 files/xsb-3.0.1-chr_d.patch 276
-AUX xsb-3.0.1-configure.patch 6888 RMD160 66b21bdcb73d7a83d3c97ee8d6d6e6269d70a69a SHA1 1a7c5bb98af6f6571181ccf2bf66f027c2bbe8e3 SHA256 3025bb231103b0bac65e26cd7a4bc5c44f2499486a172dd32de7585791e38107
-MD5 116ae40179a96f9c88ceb1c956965e2f files/xsb-3.0.1-configure.patch 6888
-RMD160 66b21bdcb73d7a83d3c97ee8d6d6e6269d70a69a files/xsb-3.0.1-configure.patch 6888
-SHA256 3025bb231103b0bac65e26cd7a4bc5c44f2499486a172dd32de7585791e38107 files/xsb-3.0.1-configure.patch 6888
+AUX xsb-3.0.1-configure.patch 7245 RMD160 64561500ff2341c7b999b9eb7e285f4c11e82549 SHA1 60eef289059428d1f780b593c3976c7f7ef49c9c SHA256 b6a6a9b94b3bebabf3249a43305da0b4175120b611b8a4fac4a35444904ec89c
+MD5 2871e41f7ca03ee322a78e1e14aa37bb files/xsb-3.0.1-configure.patch 7245
+RMD160 64561500ff2341c7b999b9eb7e285f4c11e82549 files/xsb-3.0.1-configure.patch 7245
+SHA256 b6a6a9b94b3bebabf3249a43305da0b4175120b611b8a4fac4a35444904ec89c files/xsb-3.0.1-configure.patch 7245
 AUX xsb-3.0.1-gap.patch 260 RMD160 c400b6520751234c375d0b2f96d3aee7c1db1113 SHA1 8a97c36f940af3e617a0afa0503ecd1eeec41a85 SHA256 ac806517f5eb82f119426accce84b8d5371dcd39293cdec0c0398efd6f40c3e1
 MD5 a62a122bc26d9ab164ce85a4f1ddcaf1 files/xsb-3.0.1-gap.patch 260
 RMD160 c400b6520751234c375d0b2f96d3aee7c1db1113 files/xsb-3.0.1-gap.patch 260
@@ -67,10 +67,10 @@ EBUILD xsb-3.0.1.ebuild 4426 RMD160 75eb822125cceccc62b430030327389f8b719a57 SHA
 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 829 RMD160 ba066b64e994cd95c053a54995a65b8dff46f200 SHA1 ff5ca72c4dc4636d409aae03ff9f3218b981c8ae SHA256 90eee8c49d2dbc4952c2725ebe1f3dc8ee42ee6e763a8451cd65db1336eb6789
-MD5 a59e2368d3e4e8dd7b47d4aed0a31125 ChangeLog 829
-RMD160 ba066b64e994cd95c053a54995a65b8dff46f200 ChangeLog 829
-SHA256 90eee8c49d2dbc4952c2725ebe1f3dc8ee42ee6e763a8451cd65db1336eb6789 ChangeLog 829
+MISC ChangeLog 973 RMD160 d76f266478275068058155bd6bc83bdfaa6a307e SHA1 9e7c6868c718a5324e432f8584755c3a559d8729 SHA256 53342cc53134850f1881f8610d9c7a832b9ac412d1909282c70994765f23949c
+MD5 0ebfab6a41952ffc2fbd0046f552d285 ChangeLog 973
+RMD160 d76f266478275068058155bd6bc83bdfaa6a307e ChangeLog 973
+SHA256 53342cc53134850f1881f8610d9c7a832b9ac412d1909282c70994765f23949c ChangeLog 973
 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-configure.patch b/dev-lang/xsb/files/xsb-3.0.1-configure.patch
index a4cf79cbd1b3..902761faec15 100644
--- a/dev-lang/xsb/files/xsb-3.0.1-configure.patch
+++ b/dev-lang/xsb/files/xsb-3.0.1-configure.patch
@@ -1,5 +1,5 @@
 --- XSB.orig/build/configure.in	2006-06-25 13:08:48.000000000 +1200
-+++ XSB/build/configure.in	2007-01-28 12:01:01.000000000 +1300
++++ XSB/build/configure.in	2007-01-29 19:38:38.000000000 +1300
 @@ -258,9 +258,9 @@
  dnl prefix given by the user. The prefix variable will later get
  dnl the <xsb-version> subdirectory added in.
@@ -147,22 +147,35 @@
      if test "${java_support}" != "yes"; then
          echo "Interprolog not supported due to failure to find Java"
          with_interprolog=""
-@@ -1553,11 +1556,11 @@
+@@ -1547,20 +1550,20 @@
+ #fi
+ 
+ # dnl ODBC library
+-if test "${with_odbc}" = yes ; then
++#if test "${with_odbc}" = yes ; then
+    case "$canonical" in
+     *-cygwin*)  LDFLAGS="-lodbc32 ${LDFLAGS}"
                  LINKFLAGS="-lodbc32 ${LINKFLAGS}"
          ;;
-     *)          if test -n "${with_iodbc}"; then
+-    *)          if test -n "${with_iodbc}"; then
 -                    LDFLAGS="-liodbc ${LDFLAGS}"
 -                    LINKFLAGS="-liodbc ${LINKFLAGS}"
-+                    LDFLAGS="$(iodbc-config --libs) ${LDFLAGS}"
-+#                    LINKFLAGS="-liodbc ${LINKFLAGS}"
-                 else
+-                else
 -                    LDFLAGS="-lodbc ${LDFLAGS}"
 -                    LINKFLAGS="-lodbc ${LINKFLAGS}"
++    *)          if test "${with_iodbc}" = "yes"; then
++                    LDFLAGS="$(iodbc-config --libs) ${LDFLAGS}"
++#                    LINKFLAGS="-liodbc ${LINKFLAGS}"
++                elif test "${with_odbc}" = "yes"; then
 +                    LDFLAGS="$(odbc_config --libs) ${LDFLAGS}"
 +#                    LINKFLAGS="-lodbc ${LINKFLAGS}"
                  fi
      esac
- fi
+-fi
++#fi
+ 
+ # this is needed for -mno-cygwin dll compilation
+ DLLTYPE=nodll
 @@ -1726,11 +1729,11 @@
  AC_SUBST(xsb_asm_extension)
  AC_SUBST(xsb_dcl_extension)