Reconf and python fixes, should close bug #371075 for good.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

3 files changed, 32 insertions, 17 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 1e1f6f7dd5b3..5f8643f99b64 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.111 2011/06/11 14:06:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.112 2011/07/05 01:00:30 nerdboy Exp $
+
+  05 Jul 2011; Steve Arnold <nerdboy@gentoo.org> gdal-1.8.0-r1.ebuild:
+  This should fix the seemingly random (and unreproducible by me) install 
+  bug reported again here.  I still can't reproduce it on any of my test 
+  boxes but the build log attached to this bug shows an extra DESTDIR that 
+  shouldn't be there (and now it isn't).  Also removed a failing autoheader
+  and added some additional python eclass helper functions.
 
   11 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.8.0-r1.ebuild:
   Build with any tiff version, but make sure it is always the external one.
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index e5d4bbe3b708..e0f4a7dce156 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.7.2-ruby_cflags.patch 1161 RMD160 5635b016c18a54a45e4f9410028f0a4596b52e5b SHA1 42389f01f14ba57a6337a9a1cdbe889c9fc34d61 SHA256 8a943b69b200e8b926e2ed9ad1861a152731bb829459f402a8024e1137eed754
 AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e
 AUX gdal-1.5.0-install_name.patch 1731 RMD160 9e6d9d2a8a14bf01de242d889140369d083fd7c4 SHA1 4c46ebb1bb7d5f5ca2f1079e6ad1a1230ef698ef SHA256 da631282e7ee42b3f9c46a4ce76d7b4905caa4a056c8109fce0f661b9aa58abd
@@ -12,13 +9,6 @@ AUX gdal-png-1.5.patch 1422 RMD160 5177f60d44189289fefc98ec8f59645b880b7362 SHA1
 DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 SHA1 b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67
 DIST gdal-1.8.0.tar.gz 8837824 RMD160 0e116f41b23ff5b44c692f56459facab332c6201 SHA1 e5a2802933054050c6fb0b0a0e1f46b5dd195b0a SHA256 515f0316cd17281a09a147914b47b28bbc4855cdb86d41d12cb8716d1721e435
 EBUILD gdal-1.6.3-r1.ebuild 6944 RMD160 6cc5139d6e9d67417867cc65b73a79c9b0e67342 SHA1 a64a3e9c00a208304076b7432b5f6699b1296f16 SHA256 8fee7711d458b29d1295ab9831d54a4659343f167e3cd0bee9c035b29912ae2c
-EBUILD gdal-1.8.0-r1.ebuild 6259 RMD160 2617e31ac70a3e15e04b9431941c61adda6cc1b6 SHA1 85af9a8f15eb54df889d276837db4c4253ec58f9 SHA256 276552836365f608a82bc3f8ad2ed576a1cb374bfa2694058efda02e57e5d64b
-MISC ChangeLog 20743 RMD160 9380da65d0e387af4db42c7d018c5c2a97ea820b SHA1 1f0f009224e6ff88d6c1df23e83e7be10a9c4a3d SHA256 f0239c50224b7c859fcf4a366854f89bca18352480c2608897fd5729c4e3d6bb
+EBUILD gdal-1.8.0-r1.ebuild 6647 RMD160 ec6b534d3bbc60c2f176238da07404663d4f3598 SHA1 fb5e807503df245b17e637aea67ad466d239f56b SHA256 8b8c1b4cea5567d8d743f2f1acc9a57b504651f642e980978a59811f37cf94cd
+MISC ChangeLog 21174 RMD160 8f4cb37a6bbdc40cf77e406956c7cee4b9e5bcd3 SHA1 a1df02df1ddb0e967703d2d0f3b1f001116a8b3d SHA256 e5c633e71d894a30f80f87c84871e3445dcb1062643e78eabda8adeca09e5b31
 MISC metadata.xml 1177 RMD160 1711328052cf0a70e14142ea08d571d564288c68 SHA1 c791c4e490071c65aad3938cee40e54db4541de4 SHA256 2d9cf1dfaf4d13f428e1dc5b5e4f5dfea3997475d09f994ce858f90768329807
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3zdjkACgkQHB6c3gNBRYcGaACfUPhYLhAhpfZh9MNHdjfd1/t5
-qcUAn1/bBYYI9XtjOqNofTzVNorXX+x9
-=AJOo
------END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.8.0-r1.ebuild b/sci-libs/gdal/gdal-1.8.0-r1.ebuild
index 39ddb3d4bd50..0b2f8779f89d 100644
--- a/sci-libs/gdal/gdal-1.8.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.8.0-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild,v 1.3 2011/06/11 14:06:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild,v 1.4 2011/07/05 01:00:30 nerdboy Exp $
 
 EAPI="2"
 
 WANT_AUTOCONF="2.5"
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby18"
-PYTHON_DEPEND="python? *:2.6"
+PYTHON_DEPEND="python? 2:2.6"
 
-inherit autotools eutils perl-module python ruby-ng toolchain-funcs
+inherit autotools eutils libtool perl-module python ruby-ng toolchain-funcs
 
 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
 HOMEPAGE="http://www.gdal.org/"
@@ -57,6 +57,13 @@ DEPEND="${RDEPEND}
 AT_M4DIR="${S}/m4"
 MAKEOPTS+=" -j1"
 
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
 src_unpack() {
 	# prevent ruby-ng.eclass from messing with the src path
 	default
@@ -69,8 +76,10 @@ src_prepare() {
 		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
 		GDALmake.opt.in || die
 
+	# the second sed expression should fix bug 371075
 	sed -i \
 		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
 		swig/python/GNUmakefile || die
 
 	epatch "${FILESDIR}"/1.7.2-ruby_cflags.patch
@@ -81,7 +90,11 @@ src_prepare() {
 		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
 		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
 
-	eautoreconf
+	# autoheader fail
+	eaclocal
+	eautoconf
+	eautomake
+	elibtoolize
 }
 
 src_configure() {
@@ -234,6 +247,11 @@ src_install() {
 }
 
 pkg_postinst() {
+	if use python; then
+		    python_need_rebuild
+		    python_mod_optimize $(python_get_sitedir)/${PN}.py \
+			    $(python_get_sitedir)/ogr.py
+	fi
 	echo
 	elog "Check available image and data formats after building with"
 	elog "gdalinfo and ogrinfo (using the --formats switch)."