Updated swig depends and added work-around for new perl with swig cruft.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 32 insertions, 11 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 4b8e7a00e4fe..5c31775db40d 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.72 2010/02/15 08:24:18 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.73 2010/02/23 05:29:53 nerdboy Exp $
+
+  23 Feb 2010; Steve Arnold <nerdboy@gentoo.org> gdal-1.6.1.ebuild,
+  gdal-1.6.2.ebuild, gdal-1.6.3.ebuild:
+  Updated swig depends and added work-around for new perl with swig cruft 
+  (fixes bug #305395).  Seems like there ought to be an EAPI2 way to do 
+  the swig deps in a nicer way, but I couldn't find one...
 
 *gdal-1.6.3 (15 Feb 2010)
 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 163a6c9355b2..672c5e9e53b5 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -15,8 +15,8 @@ DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 S
 EBUILD gdal-1.5.2.ebuild 6420 RMD160 0619a3660937eda53d501235d3b95de7f492e13f SHA1 3d0a948f9959ad3b0e232476fe77345db6d727b8 SHA256 c09aabaa7019c25adf18763d16bfde2d5b4e801dc2a4747cc22155e1f5767fce
 EBUILD gdal-1.5.3.ebuild 6510 RMD160 f3ed966b180a4dc169c00c3fbfa0d2095759b78e SHA1 b810791d98d84867812cd6700558b00cf32ce03d SHA256 995c6f2b68fd78234580d7612f720ad6d3dc398dec707c65236c17cfcd1b322f
 EBUILD gdal-1.6.0-r1.ebuild 6653 RMD160 271dc8fb8ac3b8941a008f5459fe5c9264060f51 SHA1 5f5d5179d95a9c69e888641276d5202f0061782c SHA256 ca12c8f828064b7a6a5340a97a495799d767df095a3fbe9db39e4e656ebf2142
-EBUILD gdal-1.6.1.ebuild 6212 RMD160 99cf716528a26e78679a7a31294a4dd62ca8276d SHA1 12ca0bca2aa8cce4ffc6c5cd6d68f60ee3204e08 SHA256 a59d633b5304e4c9b27f9996fddb502fb335cc188ab1179ad8010e2cdaaa7c42
-EBUILD gdal-1.6.2.ebuild 6212 RMD160 14649f0621f21e37c1554e5a3aa04c34667a59a6 SHA1 e529bd007d9dbc10e98e846a725d5379b7740d3d SHA256 73222b5d9f27a13266f60c96fba9d1f6d30df762a2eb939d22c39660a1f7ebb0
-EBUILD gdal-1.6.3.ebuild 6187 RMD160 e8df3ed408c0f0970e497650a415715f4790e38f SHA1 db564ed5e56d789d7e80be7af6015eba4d44ee9e SHA256 f70e975e67c364c1ae48a9a1af37d736026fe06302dbaeac38a313bc5c59a7fa
-MISC ChangeLog 14133 RMD160 c8076994212f724a613df4ee6bc04fea0aec3941 SHA1 98da54f51fa483a936af77c8183cf34a5a816a6e SHA256 6815a105e533f4433c66dc9e7cda6ac26146ab10e2f8240ebbcf3e7c57f7c7fe
+EBUILD gdal-1.6.1.ebuild 6261 RMD160 6b4d7360e237785bfcefa449ea9d25d14c2787cf SHA1 fb1333c67f56a6f5a12c549ed18bdc502d3cd9f0 SHA256 5b9e0280223437d8dbcfc3fba4a40e74635d59e329fc579717393972a15f66a3
+EBUILD gdal-1.6.2.ebuild 6258 RMD160 5a856ad8e38455c0a7acca0806f402b29720f5d1 SHA1 a749df11026604e81d3061f3be0e19e39895d4a0 SHA256 2e51a26f67ae3e1ace3911b3461586e5a95fd0b7f442b514d89ffa6619cd5aab
+EBUILD gdal-1.6.3.ebuild 6422 RMD160 cf47cde7626034a9b12f5edda669bb49b2640ca0 SHA1 e311209140f40a9ab70df9783c44fcd998045c55 SHA256 1a02068a8c9ba47f2bed2c17a2db4e846a599ae176ee34d8dc14535a9e1b519c
+MISC ChangeLog 14449 RMD160 38c47c06b36638e0e22ee30fd9920852722f71ea SHA1 e55b0970bb3ebbc1d64a8c42dea2021ced210b34 SHA256 e9925d849ee94d0a73be1d4002c6f4a06839517f28cf08622e38a94a19e6813b
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
diff --git a/sci-libs/gdal/gdal-1.6.1.ebuild b/sci-libs/gdal/gdal-1.6.1.ebuild
index 96690a5fc651..a68d59901e8a 100644
--- a/sci-libs/gdal/gdal-1.6.1.ebuild
+++ b/sci-libs/gdal/gdal-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild,v 1.8 2010/01/06 19:24:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild,v 1.9 2010/02/23 05:29:53 nerdboy Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.5"
@@ -54,7 +54,9 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	sqlite? ( >=dev-db/sqlite-3 )"
 
 DEPEND="${RDEPEND}
-	perl? ( python? ( ruby? ( >=dev-lang/swig-1.3.28 ) ) )
+	perl? ( >=dev-lang/swig-1.3.28 )
+	python? ( >=dev-lang/swig-1.3.28 )
+	ruby? ( >=dev-lang/swig-1.3.28 )
 	doc? ( app-doc/doxygen )"
 
 AT_M4DIR="${S}/m4"
diff --git a/sci-libs/gdal/gdal-1.6.2.ebuild b/sci-libs/gdal/gdal-1.6.2.ebuild
index 45346c68cf01..e08621ab61ff 100644
--- a/sci-libs/gdal/gdal-1.6.2.ebuild
+++ b/sci-libs/gdal/gdal-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.2.ebuild,v 1.3 2010/01/23 20:21:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.2.ebuild,v 1.4 2010/02/23 05:29:53 nerdboy Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.5"
@@ -54,7 +54,9 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	sqlite? ( >=dev-db/sqlite-3 )"
 
 DEPEND="${RDEPEND}
-	perl? ( python? ( ruby? ( >=dev-lang/swig-1.3.28 ) ) )
+	perl? ( >=dev-lang/swig-1.3.28 )
+	python? ( >=dev-lang/swig-1.3.28 )
+	ruby? ( >=dev-lang/swig-1.3.28 )
 	doc? ( app-doc/doxygen )"
 
 AT_M4DIR="${S}/m4"
diff --git a/sci-libs/gdal/gdal-1.6.3.ebuild b/sci-libs/gdal/gdal-1.6.3.ebuild
index 3d13a837e60a..a68577537393 100644
--- a/sci-libs/gdal/gdal-1.6.3.ebuild
+++ b/sci-libs/gdal/gdal-1.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3.ebuild,v 1.1 2010/02/15 08:24:18 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3.ebuild,v 1.2 2010/02/23 05:29:53 nerdboy Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.5"
@@ -53,7 +53,9 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	sqlite? ( >=dev-db/sqlite-3 )"
 
 DEPEND="${RDEPEND}
-	perl? ( python? ( ruby? ( >=dev-lang/swig-1.3.28 ) ) )
+	perl? ( >=dev-lang/swig-1.3.32 )
+	python? ( >=dev-lang/swig-1.3.32 )
+	ruby? ( >=dev-lang/swig-1.3.32 )
 	doc? ( app-doc/doxygen )"
 
 AT_M4DIR="${S}/m4"
@@ -130,6 +132,15 @@ src_configure() {
 }
 
 src_compile() {
+	local i
+	for i in perl ruby python; do
+		if useq $i; then
+			rm "${S}"/swig/$i/*_wrap.cpp
+			emake -C "${S}"/swig/$i generate || \
+				die "make generate failed for swig/$i"
+		fi
+	done
+
 	# parallel makes fail on the ogr stuff (C++, what can I say?)
 	# also failing with gcc4 in libcsf
 	emake -j1 || die "emake failed"