Respect -odbc -iodbc in USE flags.

Package-Manager: portage-2.1.2.2

diff --git a/dev-lang/xsb/ChangeLog b/dev-lang/xsb/ChangeLog
index 9bd0379dc6166b159578c8ad0d64e3ff25851338..785947807e98e3aa2b61e221b54a0c02a21563a7 100644 (file)
--- 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.7 2007/02/08 08:16:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.8 2007/04/24 22:51:37 keri Exp $
+
+  24 Apr 2007; keri <keri@gentoo.org> files/xsb-3.0.1-configure.patch:
+  Respect -odbc -iodbc in USE flags. Closes bug #174696.
 
   08 Feb 2007; keri <keri@gentoo.org> files/xsb-3.0.1-configure.patch,
   files/xsb-3.0.1-portage.patch:

diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index 78ba0c3414524bfeba6b9ba8e2550da9b5e6e431..d74e7b7c8272177ef44e090475efbaef96bdbcbe 100644 (file)
--- 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 7914 RMD160 344a3d3313edb104f2240b50d4cd4be6fd48c549 SHA1 e8d604e4a8a2b8f252254751aa2ec8e899a9a1f6 SHA256 beb6e86d5082c1bf118177639484c78c05ab23e561881af4b3612888761c08f3
-MD5 cf05041f21193f6119bffbf1eceffb3e files/xsb-3.0.1-configure.patch 7914
-RMD160 344a3d3313edb104f2240b50d4cd4be6fd48c549 files/xsb-3.0.1-configure.patch 7914
-SHA256 beb6e86d5082c1bf118177639484c78c05ab23e561881af4b3612888761c08f3 files/xsb-3.0.1-configure.patch 7914
+AUX xsb-3.0.1-configure.patch 8318 RMD160 272453f952afa06a4c0aac3c7bdc0e5be3d3c33e SHA1 f1ce6187f561a4b74cbf566955f86854eaa4817f SHA256 1163c736d3fa714df0ffbb207190cfe9181f21398875dfc9c30dd8c9e1c9e4ee
+MD5 e7b7eaa1559c8206e36b73ed97f3f121 files/xsb-3.0.1-configure.patch 8318
+RMD160 272453f952afa06a4c0aac3c7bdc0e5be3d3c33e files/xsb-3.0.1-configure.patch 8318
+SHA256 1163c736d3fa714df0ffbb207190cfe9181f21398875dfc9c30dd8c9e1c9e4ee files/xsb-3.0.1-configure.patch 8318
 AUX xsb-3.0.1-debug.patch 3812 RMD160 ee0b354b470cba2120d83fcf257fb76ae0f9e959 SHA1 0c6de43176aee0317e8f6237eba245d5280b11ce SHA256 ee0d6b6ebc803a7cf6fabf9f1d671056773224e194309c6a017005ec36b7e0f7
 MD5 b4aae1db10a7e4c018b1d15466dc9649 files/xsb-3.0.1-debug.patch 3812
 RMD160 ee0b354b470cba2120d83fcf257fb76ae0f9e959 files/xsb-3.0.1-debug.patch 3812
@@ -71,10 +71,10 @@ EBUILD xsb-3.0.1.ebuild 4567 RMD160 843aef64f81d827ba97c7341bd9b80c9d5ff9eea SHA
 MD5 003e3c9118f9292a99aaceeab465d483 xsb-3.0.1.ebuild 4567
 RMD160 843aef64f81d827ba97c7341bd9b80c9d5ff9eea xsb-3.0.1.ebuild 4567
 SHA256 ad8a81d24ccf079b2b30f16b5ec820bfd0c60674ab0f1afc9ec276997d32b50a xsb-3.0.1.ebuild 4567
-MISC ChangeLog 1680 RMD160 77129b742d2caad2b19ededa24d25abe3e63d116 SHA1 adc4377ead3930cd5ada010a955d6c843bad0e7b SHA256 0d496abf19a1834c1446a2f488dbf8cb4aead96cc1af37df19d747b048b955f7
-MD5 ab7d0fdbacd220acc17781f4d4e55cbd ChangeLog 1680
-RMD160 77129b742d2caad2b19ededa24d25abe3e63d116 ChangeLog 1680
-SHA256 0d496abf19a1834c1446a2f488dbf8cb4aead96cc1af37df19d747b048b955f7 ChangeLog 1680
+MISC ChangeLog 1809 RMD160 365984c11dabaf7547e289f79d5737a3c91346ac SHA1 675467bcb2f184636f241acdee83364db9f285e0 SHA256 cd81fd5405a08d34041786301d8292a5c76a3ab111a6232140141a462a30c780
+MD5 5c98f5ddeb342e94920bd23d7b3d8961 ChangeLog 1809
+RMD160 365984c11dabaf7547e289f79d5737a3c91346ac ChangeLog 1809
+SHA256 cd81fd5405a08d34041786301d8292a5c76a3ab111a6232140141a462a30c780 ChangeLog 1809
 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 69195f6647de8e0abff2232bf81f256b32b7f9e0..7c917582e6fb5325ef3f9e806340cd19454c77da 100644 (file)
--- a/dev-lang/xsb/files/xsb-3.0.1-configure.patch
+++ b/dev-lang/xsb/files/xsb-3.0.1-configure.patch
@@ -94,6 +94,15 @@
  
  AC_PROG_CC
  AC_PROG_CPP
+@@ -986,7 +986,7 @@
+ ODBCSRC=""
+ ODBCOBJ=""
+ 
+-if test "${with_odbc+set}" = "set"; then
++if test "${with_odbc}" = "yes"; then
+     if test -n "$with_os" ; then
+     echo -n ""
+ #     AC_DEFINE(XSB_ODBC)
 @@ -1024,11 +1024,11 @@
  #         with_odbc=no
  #     else
@@ -111,6 +120,18 @@
  #     fi
  #     dnl restore CPPFLAGS
  #     CPPFLAGS="${saved_cpp_flags}"
+@@ -1039,9 +1039,9 @@
+     fi
+ fi
+ 
+-if test "${with_odbc+set}" = "set"; then
++if test "${with_odbc}" = "yes"; then
+     AC_DEFINE(XSB_ODBC)
+-    with_odbc=yes
++#    with_odbc=yes
+ fi
+ 
+ INTERPROLOGSRC=""
 @@ -1132,8 +1132,8 @@
  AC_SUBST(perl_ccflags)
  AC_SUBST(perl_libs)