Added patch to fix #158262

Package-Manager: portage-2.1.2_rc3

4 files changed, 59 insertions, 10 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 8ab4fb4c929b..f784bfdb9560 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.22 2006/12/14 20:51:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.23 2006/12/16 11:11:54 dev-zero Exp $
+
+  16 Dec 2006; Tiziano Müller <dev-zero@gentoo.org>
+  +files/geos-3.0.0_rc3-amd64.patch, geos-3.0.0_rc3.ebuild:
+  Added patch to fix #158262
 
 *geos-3.0.0_rc3 (14 Dec 2006)
 *geos-2.2.3 (14 Dec 2006)
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index cca3b7f68772..bda26b0f8d74 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -6,6 +6,10 @@ AUX geos-2.2.3-swig.patch 1505 RMD160 56801a93aaf6ddedfd97efb2eeadb04361a5adfd S
 MD5 70b92502580bd51021add3b462a19628 files/geos-2.2.3-swig.patch 1505
 RMD160 56801a93aaf6ddedfd97efb2eeadb04361a5adfd files/geos-2.2.3-swig.patch 1505
 SHA256 871e86801a64bbb6b5fbafa8bed23e6f9fa513f0a5d88f919aaedb64219961ce files/geos-2.2.3-swig.patch 1505
+AUX geos-3.0.0_rc3-amd64.patch 888 RMD160 6958b811bcc28fdce7426baab0791ea3a8e2bb7e SHA1 265f9d1b23a514b3f4a7c7417b8e48f0b31f4226 SHA256 6376b33276e21f2d7acc8d92ddfb82904658dc9a3001363136a91bb16291bba1
+MD5 f2bec335d3c2a26b1cf69650da9505fb files/geos-3.0.0_rc3-amd64.patch 888
+RMD160 6958b811bcc28fdce7426baab0791ea3a8e2bb7e files/geos-3.0.0_rc3-amd64.patch 888
+SHA256 6376b33276e21f2d7acc8d92ddfb82904658dc9a3001363136a91bb16291bba1 files/geos-3.0.0_rc3-amd64.patch 888
 AUX python.i 179 RMD160 b64f637b8d475f94f1e1319c700d6571dea7d410 SHA1 d0a92c5cbd888da380d1db847aa0004e46bfebb1 SHA256 ca71e5951088ffa7d571183eb0a9c0309b16305f451dc7a19fce91e91bca3a09
 MD5 fd33fc304cf7a479a5ea9c7362472489 files/python.i 179
 RMD160 b64f637b8d475f94f1e1319c700d6571dea7d410 files/python.i 179
@@ -21,14 +25,14 @@ EBUILD geos-2.2.3.ebuild 2880 RMD160 da6d59cbbc65cd2b9c67db95842eb6d0c1288220 SH
 MD5 cef9a7107ca28f1fa8059e51ebad7fcd geos-2.2.3.ebuild 2880
 RMD160 da6d59cbbc65cd2b9c67db95842eb6d0c1288220 geos-2.2.3.ebuild 2880
 SHA256 2aeb9d2d0d9d30e5385c0a68dcc1a49c5fcdf0ac48dc3977a82f40059120a42e geos-2.2.3.ebuild 2880
-EBUILD geos-3.0.0_rc3.ebuild 1144 RMD160 5ecd07724c877cae45e8c1dcf8accc8eefc5ed08 SHA1 e49587fa94a4652c228f98cb16be9ccc5d8bd54a SHA256 58dbbb2a024e45b82c08b05fd6f0e2dc2f5046498cd1327b39bb5fe5f905ec0c
-MD5 104028e3ad88e93c38cb297b7333ae0d geos-3.0.0_rc3.ebuild 1144
-RMD160 5ecd07724c877cae45e8c1dcf8accc8eefc5ed08 geos-3.0.0_rc3.ebuild 1144
-SHA256 58dbbb2a024e45b82c08b05fd6f0e2dc2f5046498cd1327b39bb5fe5f905ec0c geos-3.0.0_rc3.ebuild 1144
-MISC ChangeLog 4234 RMD160 ec05794e4f57addda72169ce73fd959567bc8990 SHA1 1969dcf4b89141d563403cab153f950203eed3ec SHA256 ec154441a05fde64fd3b29a04019a32defc5e95432e4790213dc021c47b0eda0
-MD5 3e890cb465168fbf9c5333fc050e2249 ChangeLog 4234
-RMD160 ec05794e4f57addda72169ce73fd959567bc8990 ChangeLog 4234
-SHA256 ec154441a05fde64fd3b29a04019a32defc5e95432e4790213dc021c47b0eda0 ChangeLog 4234
+EBUILD geos-3.0.0_rc3.ebuild 1241 RMD160 b543946d0531ba801c6df14f1bd5daaf1d64ace1 SHA1 d6e3e58bb5854cc4ecb029d6ea61550e616f71d1 SHA256 93c393c75f9bfc0579c78278fc8a4a192e2cf41b8fa5368f47fd2dbb51578c67
+MD5 55d52d3119582d53fc571aabb689b96e geos-3.0.0_rc3.ebuild 1241
+RMD160 b543946d0531ba801c6df14f1bd5daaf1d64ace1 geos-3.0.0_rc3.ebuild 1241
+SHA256 93c393c75f9bfc0579c78278fc8a4a192e2cf41b8fa5368f47fd2dbb51578c67 geos-3.0.0_rc3.ebuild 1241
+MISC ChangeLog 4377 RMD160 2c6c4b59a19dc550b23e2946f713447783fd7c89 SHA1 d50c93f0cac0cb951d8c6d95ef5023d08560a4cc SHA256 da733d3dc88c477798463e7ca9a30aef2d9c243672c5c4d7648a2aeba962a719
+MD5 d82a00654ac55d4ccf662af6ffbd9cdf ChangeLog 4377
+RMD160 2c6c4b59a19dc550b23e2946f713447783fd7c89 ChangeLog 4377
+SHA256 da733d3dc88c477798463e7ca9a30aef2d9c243672c5c4d7648a2aeba962a719 ChangeLog 4377
 MISC metadata.xml 194 RMD160 19177cc0060792a4212a48493143cc82f0302ef8 SHA1 4acac2c575abc8f6bfe00506117dc2f83a8355a2 SHA256 58a43dec1240568210b57a8396a5d317593309353f64e474c93d12a39a7bc071
 MD5 b37bf0bf48388c9f32b981c5bb00468e metadata.xml 194
 RMD160 19177cc0060792a4212a48493143cc82f0302ef8 metadata.xml 194
diff --git a/sci-libs/geos/files/geos-3.0.0_rc3-amd64.patch b/sci-libs/geos/files/geos-3.0.0_rc3-amd64.patch
new file mode 100644
index 000000000000..9376051ded4c
--- /dev/null
+++ b/sci-libs/geos/files/geos-3.0.0_rc3-amd64.patch
@@ -0,0 +1,33 @@
+--- swig/geos.i.orig	2006-12-16 11:47:15.000000000 +0100
++++ swig/geos.i	2006-12-16 11:48:33.000000000 +0100
+@@ -127,7 +127,7 @@
+ 
+ void checkCoordSeqBounds(const GEOSCoordSeq coordSeq, const size_t index)
+ {
+-    size_t size = 0;
++    unsigned int size = 0;
+     GEOSCoordSeq_getSize(coordSeq, &size);
+ 
+     if (index < 0 || index >= size)
+@@ -223,17 +223,17 @@
+         return result;
+     }
+ 
+-    int getSize()
++    unsigned int getSize()
+     {
+-        size_t result;
++        unsigned int result;
+         GEOSCoordSeq coords = (GEOSCoordSeq) self;
+         GEOSCoordSeq_getSize(coords, &result);
+         return result;
+     }
+ 
+-    int getDimensions()
++    unsigned int getDimensions()
+     {
+-        size_t result;
++        unsigned int result;
+         GEOSCoordSeq coords = (GEOSCoordSeq) self;
+         GEOSCoordSeq_getDimensions(coords, &result);
+         return result;
diff --git a/sci-libs/geos/geos-3.0.0_rc3.ebuild b/sci-libs/geos/geos-3.0.0_rc3.ebuild
index 4fcf25155a2e..b7f924ab7998 100644
--- a/sci-libs/geos/geos-3.0.0_rc3.ebuild
+++ b/sci-libs/geos/geos-3.0.0_rc3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.0.0_rc3.ebuild,v 1.1 2006/12/14 20:51:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.0.0_rc3.ebuild,v 1.2 2006/12/16 11:11:54 dev-zero Exp $
+
+inherit eutils
 
 MY_P=${PN}-${PV/_/}
 
@@ -22,6 +24,12 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-amd64.patch"
+}
+
 src_compile() {
 	local myconf="--with-pic"