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

(Portage version: 2.2_rc62/cvs/Linux x86_64)

4 files changed, 28 insertions, 7 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/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"