Fix bitmatrix handling in semweb package.

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index aa1af0d1bbfec48bfa77b9b2e39f84d2e299b00c..4ffd973cadcbe003280ee1a0271655299f04c804 100644 (file)
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.56 2007/01/01 05:01:30 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.57 2007/01/02 05:54:00 keri Exp $
+
+  02 Jan 2007; keri <keri@gentoo.org>
+  +files/swi-prolog-semweb-bitmatrix.patch, swi-prolog-5.6.25.ebuild:
+  Fix bitmatrix handling in semweb package.
 
   01 Jan 2007; keri <keri@gentoo.org>
   +files/swi-prolog-ssl-SIO_FLUSHOUTPUT.patch, swi-prolog-5.6.25.ebuild:

diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 6f9a7a64e12717218c77a82bf9ae49cd0a0a0974..df66f55c49ebd2bdef509a76f7eb9a730a94c303 100644 (file)
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -118,6 +118,10 @@ AUX swi-prolog-portage.patch 1313 RMD160 1e39cf3eace82d805fd1dcdbce72fd7a0cc0b18
 MD5 59a03d4ccddf260137fcd84ace39a7bb files/swi-prolog-portage.patch 1313
 RMD160 1e39cf3eace82d805fd1dcdbce72fd7a0cc0b18e files/swi-prolog-portage.patch 1313
 SHA256 043e86898cfe185fde4d34f20d2299e59d77e68529bd6cae7808e5640db8de37 files/swi-prolog-portage.patch 1313
+AUX swi-prolog-semweb-bitmatrix.patch 467 RMD160 7a08ba85dde2710f4b82d0dacbcded36c2625a24 SHA1 f025adb367b64d67b7c64b25cd2b935e5d417f9e SHA256 ceb4eb9eb153de408e51b4448033d766fda70f367dff9f5cbbf20ebe30020b01
+MD5 db842226a22c11a82a42cc77b36afda4 files/swi-prolog-semweb-bitmatrix.patch 467
+RMD160 7a08ba85dde2710f4b82d0dacbcded36c2625a24 files/swi-prolog-semweb-bitmatrix.patch 467
+SHA256 ceb4eb9eb153de408e51b4448033d766fda70f367dff9f5cbbf20ebe30020b01 files/swi-prolog-semweb-bitmatrix.patch 467
 AUX swi-prolog-semweb-sparc-alignment.patch 493 RMD160 01dbb170b0ba4f808fcedfa4e4baa93177a40ff1 SHA1 40fe01368d8988d88a49508953bf276f4f08663f SHA256 3cff34e6f3dedf5b549c93826593109669a486a188a11ae8d878286b52282e2a
 MD5 6e51d8bc5b62b73596a976e4e9ce4dc5 files/swi-prolog-semweb-sparc-alignment.patch 493
 RMD160 01dbb170b0ba4f808fcedfa4e4baa93177a40ff1 files/swi-prolog-semweb-sparc-alignment.patch 493
@@ -191,14 +195,14 @@ EBUILD swi-prolog-5.6.24.ebuild 3427 RMD160 b56ed79ceea825b2ad4e923dab90c0513ddd
 MD5 171154881ffaef618a019afe1f33a652 swi-prolog-5.6.24.ebuild 3427
 RMD160 b56ed79ceea825b2ad4e923dab90c0513ddd8b66 swi-prolog-5.6.24.ebuild 3427
 SHA256 7fb1f5e52fbdc6559a438b25ae11aedf0864319667d3754f6734febd62579b11 swi-prolog-5.6.24.ebuild 3427
-EBUILD swi-prolog-5.6.25.ebuild 3663 RMD160 131840c30d18d963540a6a408692a1e12896f975 SHA1 c18ce4e0a904ef36ee10a752484fd6d63685e52a SHA256 10a832902aef08e8cf40794514b348118c10ddcba2d92355daeaef77342ac9f5
-MD5 f294d51bf1eede387b9b24f566b77f95 swi-prolog-5.6.25.ebuild 3663
-RMD160 131840c30d18d963540a6a408692a1e12896f975 swi-prolog-5.6.25.ebuild 3663
-SHA256 10a832902aef08e8cf40794514b348118c10ddcba2d92355daeaef77342ac9f5 swi-prolog-5.6.25.ebuild 3663
-MISC ChangeLog 11100 RMD160 0f156c4d80ab3e56ab5785cd20281cb4b46a3210 SHA1 1c3414d746ef636bca68b086090b55c7031629dd SHA256 fe852299ce03af3f4dcd2df69f797e6b4b1d85293fb14a3bd5830a291e17085f
-MD5 dfe1a54cd2540d5cf32f7d312dc4068b ChangeLog 11100
-RMD160 0f156c4d80ab3e56ab5785cd20281cb4b46a3210 ChangeLog 11100
-SHA256 fe852299ce03af3f4dcd2df69f797e6b4b1d85293fb14a3bd5830a291e17085f ChangeLog 11100
+EBUILD swi-prolog-5.6.25.ebuild 3714 RMD160 97c0202040632fa2850aea4085cbf8e46bd035f4 SHA1 01f7153e52b0672f0c7994fe8d95f1636a631942 SHA256 da40c3bc064bd55df62e06dfcc7f7cd98a140d882beecd03868de58cd80abd2f
+MD5 00cdbefcaf73a47ceb69edb6239ae40d swi-prolog-5.6.25.ebuild 3714
+RMD160 97c0202040632fa2850aea4085cbf8e46bd035f4 swi-prolog-5.6.25.ebuild 3714
+SHA256 da40c3bc064bd55df62e06dfcc7f7cd98a140d882beecd03868de58cd80abd2f swi-prolog-5.6.25.ebuild 3714
+MISC ChangeLog 11253 RMD160 ae999520b6bb7e3e318546b259b275e06012e66f SHA1 bc4d0b37ae03da9640102bab7dea862db41cad8b SHA256 0e917cede313aaf558ca05c144c17cabb6ad4bc07870aca8b1a7c676ce42ce36
+MD5 b4f81a0d860d6642b8c749d297c0d488 ChangeLog 11253
+RMD160 ae999520b6bb7e3e318546b259b275e06012e66f ChangeLog 11253
+SHA256 0e917cede313aaf558ca05c144c17cabb6ad4bc07870aca8b1a7c676ce42ce36 ChangeLog 11253
 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/swi-prolog/files/swi-prolog-semweb-bitmatrix.patch b/dev-lang/swi-prolog/files/swi-prolog-semweb-bitmatrix.patch
new file mode 100644 (file)
index 0000000..7a489c3
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-semweb-bitmatrix.patch
@@ -0,0 +1,20 @@
+--- pl-5.6.25.orig/packages/semweb/rdf_db.c    2006-11-27 22:08:01.000000000 +1300
++++ pl-5.6.25/packages/semweb/rdf_db.c 2007-01-02 18:30:50.000000000 +1300
+@@ -1025,7 +1025,7 @@
+   int word = ij/WSIZE;
+   int bit  = ij%WSIZE;
+ 
+-  m->bits[word] |= 1<<(bit-1);
++  m->bits[word] |= 1<<bit;
+ }
+ 
+ 
+@@ -1035,7 +1035,7 @@
+   int word = ij/WSIZE;
+   int bit  = ij%WSIZE;
+ 
+-  return ((m->bits[word] & (1<<(bit-1))) != 0);
++  return ((m->bits[word] & (1<<bit)) != 0);
+ }
+ 
+ 

diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild
index 4a617a5791e5f8598443b0d938753aff39848fcd..74f627c5112a7b8d897d9e98fedf4d7a9a3938f7 100644 (file)
--- a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild,v 1.2 2007/01/01 05:01:30 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild,v 1.3 2007/01/02 05:54:00 keri Exp $
 
 inherit eutils
 
@@ -49,6 +49,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-jpl-junit.patch
        epatch "${FILESDIR}"/${PN}-jpl-check_java.patch
        epatch "${FILESDIR}"/${PN}-ltx2htm.patch
+       epatch "${FILESDIR}"/${PN}-semweb-bitmatrix.patch
        epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
        epatch "${FILESDIR}"/${PN}-ssl-SIO_FLUSHOUTPUT.patch
        epatch "${FILESDIR}"/${PN}-thread-tests.patch