Fix one issue with 64b patched post release in upstream repo.

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

4 files changed, 43 insertions, 7 deletions

diff --git a/sci-libs/ogdi/ChangeLog b/sci-libs/ogdi/ChangeLog
index 73cdb58d487e..356c4b300499 100644
--- a/sci-libs/ogdi/ChangeLog
+++ b/sci-libs/ogdi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/ogdi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.28 2011/06/17 10:54:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.29 2011/06/17 11:00:15 scarabeus Exp $
+
+  17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> ogdi-3.2.0_beta2.ebuild,
+  +files/ogdi-3.2.0_beta2-64b.patch:
+  Fix one issue with 64b patched post release in upstream repo.
 
 *ogdi-3.2.0_beta2 (17 Jun 2011)
 
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index e5732700ee7c..70649ed1bc9b 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -5,6 +5,7 @@ AUX ogdi-3.1.4-fpic.patch 7619 RMD160 090f659286e14cf53689ce48c0b8f2dda71e6b13 S
 AUX ogdi-3.1.5-fpic.patch 7619 RMD160 090f659286e14cf53689ce48c0b8f2dda71e6b13 SHA1 ca9c747046c4241508e9e166ebc62252172345ae SHA256 4cb6775b0b8af81a7a4a18bbdbac004b64df7661e3ad8fa89c26ef664fca1f46
 AUX ogdi-3.1.6-fpic.patch 961 RMD160 c260e867a75e84df0751a0f987c5a37d9807c07e SHA1 f7f5fae556b5671549baca091f6c841a0a41b736 SHA256 ddb4e93c553f703f2a14f0f25a2c092377de4cd692cb73c3ecacce0e1fdd40f2
 AUX ogdi-3.1.6-unbundle-libs.patch 330 RMD160 95af674f87347aa50ecdbae93ba9afda5db7573c SHA1 5ec149a069b0d1fe8b050192a45902c82729979d SHA256 4d19bbd04e01697162efd318048f39d53f307b071b6d2a00ad70c68b94dae17b
+AUX ogdi-3.2.0_beta2-64b.patch 1233 RMD160 a4c5f3584133ae11c5eac4f8c8b36376d3c5f5ec SHA1 6121c6132f066837eba688170a4e0f17d4d68222 SHA256 01506ea89d5977c078b71fafd875b4b903073d78eca9722106179802e50c96c4
 AUX ogdi-3.2.0_beta2-endianess.patch 590 RMD160 fd1cbbb4b0d738ff52b0e79f84d40301492ddd4f SHA1 ea0f60307135777c4d676fa8ae76be881ec5f3e3 SHA256 1f05fec46f560aafa54c2637a0e14b3b2c89e5752c189fc9011d8af105625256
 AUX ogdi-3.2.0_beta2-subdirs.patch 905 RMD160 95be50604ec7165f9aedb46786214674a5e1c20d SHA1 aea2b7ebc88aeec3b67112a0bbf8f10bc8c184aa SHA256 081ce1a5b9e649a40611253d12467a2a5402875acddda73ef8b7edd5b7bbca49
 DIST ogdi-3.1.5.tar.gz 913902 RMD160 fa06b3d6d87e688eeb24bbaab2b6775d7d17e0bd SHA1 f94ec72519733f8f65359f29d03eb1facc4284a0 SHA256 f9d65312d03ac0b1ba0a0dd05885c41a3995fccfe9cab8d7012300546da3e44b
@@ -12,13 +13,13 @@ DIST ogdi-3.1.6.tar.gz 960280 RMD160 78aaa95f376f7adfedfba71206b4491636571a1c SH
 DIST ogdi-3.2.0.beta2.tar.gz 956839 RMD160 77d2301b855a5ffaadf00f4d64889888a8193164 SHA1 e3fd0c8b3fb02ef5da2cc1e76bb5c2d3cb0b51b4 SHA256 cf4d39528b1b30c2ddb855884efa402d3f9c79363424b6221ec804aedc20a25a
 EBUILD ogdi-3.1.5-r1.ebuild 1241 RMD160 0e7ba1271bd85ea82cb7f11bbfae174e9f05d5a9 SHA1 a1923eaac888acec7d5c3fdf61678f0aab1bfdf9 SHA256 cb960ea48449b3afebf0cc8dbeb2855979bf159ebc5c27139f35d1059a045727
 EBUILD ogdi-3.1.6.ebuild 1480 RMD160 81dc7ccfe6493b8456603a56e811c368e647643c SHA1 ede3387ea08b536fece3d8c92d17811526a63b95 SHA256 6f9897ac9c60f451c66b27ea583ef56af7c32e380a770c89749e8fdb50202f84
-EBUILD ogdi-3.2.0_beta2.ebuild 1566 RMD160 e418bc7b06e1e4b9869624519ee6d6145bb53ce6 SHA1 064f5c1a9b8797158b39aa373b50d2af21edeb5d SHA256 8a40a371e74cd3a1879927cda540554e84300adbc09b75fb13c9c7143d1acb1b
-MISC ChangeLog 4907 RMD160 39b89cc2cda458493bcd579299f6c9837e8f4a72 SHA1 35549b13a0eed5e37f9025fb27403bda54e8a967 SHA256 1b4997d6780dc5475557c3f7ac849ab38475f5f4ef3d6cebf272856ee1a8ef2e
+EBUILD ogdi-3.2.0_beta2.ebuild 1599 RMD160 65a7aad8cfa5f4b15219e5fc14b995f8922a143f SHA1 e85109712274298cabeac03c9e54123afa97d8db SHA256 64cf00a907555926f567f81e3d2ab9edf6a8ec6ac4b71be66eea71ba90be54fa
+MISC ChangeLog 5089 RMD160 c63712789cae8c3002a12e20176d5b3f00b22c4c SHA1 0d1840dbc2cb4aac7c7d4b5897091ab7202b9522 SHA256 1b5996b89af734281196205b5162419fb8af8c5f85d5fecc50561876108ec893
 MISC metadata.xml 219 RMD160 afa364dd7c619c7179794d9b79d1605cbf2b30e0 SHA1 732e2ff46a8902f6327d3c29cf41de3bea58a2df SHA256 23e5a7dc2ac7cb650cd59b8021fcfc866ee0cc4154e9f1f3be5db58f5ac49cd9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk37MngACgkQHB6c3gNBRYeCcgCfRTX0LoI6ZnmTrp6yuQy1Keoi
-skMAnj0TD27tKzHSzvhnuN3vBTaPuF4c
-=nXwS
+iEYEARECAAYFAk37M8QACgkQHB6c3gNBRYeVjQCgxc0z4URUnm0ytGgUzsQgd4Nq
+bd0AnR40fq7vcfjulDTbSB3c33t3ActN
+=hSoh
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
new file mode 100644
index 000000000000..3c6108bcfcd4
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
@@ -0,0 +1,30 @@
+--- ogdi.old/ogdi/driver/vrf/feature.c	2007/05/09 20:46:28	1.16
++++ ogdi/ogdi/driver/vrf/feature.c	2009/05/08 04:15:50	1.17
+@@ -17,6 +17,9 @@
+  ******************************************************************************
+  *
+  * $Log: not supported by cvs2svn $
++ * Revision 1.17  2009/05/08 04:15:50  warmerda
++ * fixed count type in VRF driver for 64bit systems (#2787502)
++ *
+  * Revision 1.16  2007/05/09 20:46:28  cbalint
+  * From: Even Rouault <even.rouault@mines-paris.org>
+  * Date: Friday 21:14:18
+@@ -106,7 +109,7 @@
+ #include "vrf.h"
+ #include <assert.h>
+ 
+-ECS_CVSID("$Id: ogdi-3.2.0_beta2-64b.patch,v 1.1 2011/06/17 11:00:15 scarabeus Exp $");
++ECS_CVSID("$Id: ogdi-3.2.0_beta2-64b.patch,v 1.1 2011/06/17 11:00:15 scarabeus Exp $");
+ 
+ vpf_projection_type NOPROJ = {DDS, 0.0, 0.0, 0.0, 0.0, 0, 0.0, 0.0,
+                               NULL, NULL, "Decimal Degrees     "};
+@@ -1347,7 +1350,7 @@
+   short int temp4;
+   int temp5;
+   date_type temp6;
+-  long count;
++  int32 count;
+ 
+   if (returnString != NULL) {
+     free(returnString);
diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
index 3b9eda5aae0f..14cebd095cd6 100644
--- a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild,v 1.1 2011/06/17 10:54:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild,v 1.2 2011/06/17 11:00:15 scarabeus Exp $
 
 EAPI=4
 
@@ -30,6 +30,7 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-subdirs.patch \
 		"${FILESDIR}"/${P}-endianess.patch \
+		"${FILESDIR}"/${P}-64b.patch \
 		"${FILESDIR}"/${PN}-3.1.6-fpic.patch
 	sed 's:O2:O9:g' -i configure || die
 }