updated python patch for bug 206608, along with new deps and use flags

Package-Manager: portage-2.1.4.1

4 files changed, 18 insertions, 72 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index e8306df43815..c3748a728c3b 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.35 2008/02/03 23:00:39 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.36 2008/02/09 18:39:06 nerdboy Exp $
+
+  09 Feb 2008; Steve Arnold <nerdboy@gentoo.org>
+  files/gdal-1.5.0-python-install.patch, gdal-1.5.0.ebuild:
+  Updated python patch, deps, and use flags (the first should fix the install
+  bug reported in #206608).  The rest picks up new features/depends in 1.5.0.
 
 *gdal-1.5.0 (03 Feb 2008)
 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 1fbfc260542b..c9480254dedf 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,80 +1,20 @@
 AUX gdal-1.3.1-installpathfix.patch 6805 RMD160 6cc35c1f741fdb19249666fa2f94052e8fe4a30e SHA1 ebd9b397bd1230a4b5110367f29f6040a86284f3 SHA256 0f9d7e1da2617df781429c2191f6e2429d2e8c73d01c6c115d36f3a295d69280
-MD5 f93770205b88c698e73487038b46a707 files/gdal-1.3.1-installpathfix.patch 6805
-RMD160 6cc35c1f741fdb19249666fa2f94052e8fe4a30e files/gdal-1.3.1-installpathfix.patch 6805
-SHA256 0f9d7e1da2617df781429c2191f6e2429d2e8c73d01c6c115d36f3a295d69280 files/gdal-1.3.1-installpathfix.patch 6805
 AUX gdal-1.3.2-destdir.patch 6789 RMD160 f74a404c3d9874542b9074477af7d21fe7e0774a SHA1 09296a78067d6b3a12bc7ee47a1969e82efa2a26 SHA256 6818460591e7077878f4658ca73a4582325f19f9e5580d73411b13f4dd548e81
-MD5 6f8eda6fa6406ee1ca216384b2810b95 files/gdal-1.3.2-destdir.patch 6789
-RMD160 f74a404c3d9874542b9074477af7d21fe7e0774a files/gdal-1.3.2-destdir.patch 6789
-SHA256 6818460591e7077878f4658ca73a4582325f19f9e5580d73411b13f4dd548e81 files/gdal-1.3.2-destdir.patch 6789
 AUX gdal-1.3.2-gcc4-stl.patch 902 RMD160 a8e6a79b8158913bfa3de9a4ef763f95f7197b53 SHA1 68f53438de2af1a325260d6070728d363fffd91f SHA256 c11381cabeb56e65f5277953b7b738d91f406560d88612d44d4295cb24bdae21
-MD5 3804056a14248b7d6a9a0afc965182b6 files/gdal-1.3.2-gcc4-stl.patch 902
-RMD160 a8e6a79b8158913bfa3de9a4ef763f95f7197b53 files/gdal-1.3.2-gcc4-stl.patch 902
-SHA256 c11381cabeb56e65f5277953b7b738d91f406560d88612d44d4295cb24bdae21 files/gdal-1.3.2-gcc4-stl.patch 902
 AUX gdal-1.3.2-ruby-install.patch 766 RMD160 bd81796a97d162e238750e0184437ff54cbb38af SHA1 9e440863d68890d585b588fd5f5952fd8aa51d13 SHA256 9a42203279e512e629094ff9aea66c8d613acda3e1656fcf24f6e659c02e1061
-MD5 f2b9cec943d95fcf9b3c487af6d96771 files/gdal-1.3.2-ruby-install.patch 766
-RMD160 bd81796a97d162e238750e0184437ff54cbb38af files/gdal-1.3.2-ruby-install.patch 766
-SHA256 9a42203279e512e629094ff9aea66c8d613acda3e1656fcf24f6e659c02e1061 files/gdal-1.3.2-ruby-install.patch 766
 AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e
-MD5 1c2d5761f3adb87249d2af7e3be5e11e files/gdal-1.4.2-datadir.patch 353
-RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 files/gdal-1.4.2-datadir.patch 353
-SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e files/gdal-1.4.2-datadir.patch 353
 AUX gdal-1.4.2-ruby-install.patch 934 RMD160 c63a79e091fee943526ec94182d75ca798ba1f5e SHA1 c61b02caf80495beb4af55113b5847fc8796d1d7 SHA256 cbf7b66b48406ad10c1c4b2d39216ad4e16944c033f7cac9dea85a9929b71352
-MD5 f10e534e57c2277dc192ac425e75327a files/gdal-1.4.2-ruby-install.patch 934
-RMD160 c63a79e091fee943526ec94182d75ca798ba1f5e files/gdal-1.4.2-ruby-install.patch 934
-SHA256 cbf7b66b48406ad10c1c4b2d39216ad4e16944c033f7cac9dea85a9929b71352 files/gdal-1.4.2-ruby-install.patch 934
 AUX gdal-1.5.0-makefile.patch 894 RMD160 955b2ac69f6d8477cc26ae1321ddc0d92e88fb90 SHA1 02ee0ac5351c2c83a848f7f9db646dcc19937123 SHA256 cd40c5f77c9f5d2a78a880a83d09656eacfe3437e8be7bfb13559a5e3fd9ee58
-MD5 8efdf3aa622a26011e59420693d107f3 files/gdal-1.5.0-makefile.patch 894
-RMD160 955b2ac69f6d8477cc26ae1321ddc0d92e88fb90 files/gdal-1.5.0-makefile.patch 894
-SHA256 cd40c5f77c9f5d2a78a880a83d09656eacfe3437e8be7bfb13559a5e3fd9ee58 files/gdal-1.5.0-makefile.patch 894
-AUX gdal-1.5.0-python-install.patch 491 RMD160 12752222f514d865617fb817baa805ed990f4fdb SHA1 f3d73dc5928240c1344c3ae407409070e0e55756 SHA256 8cb185df2f2719d5a9ccbe2e9b6ede6222c3aad60880629544e4904c763a528c
-MD5 3c2bbce3dc475186591db02732c787be files/gdal-1.5.0-python-install.patch 491
-RMD160 12752222f514d865617fb817baa805ed990f4fdb files/gdal-1.5.0-python-install.patch 491
-SHA256 8cb185df2f2719d5a9ccbe2e9b6ede6222c3aad60880629544e4904c763a528c files/gdal-1.5.0-python-install.patch 491
+AUX gdal-1.5.0-python-install.patch 481 RMD160 c618ad3238f6ed91740d148a87a068d00d7c4207 SHA1 66e594995f7670b3b209607b209c95c2982e4e1a SHA256 b7fd770ef84559ce2d5ba433534794b7a8f96d3d8ccf30268eb66a824b5dfb44
 AUX gdal-1.5.0-soname.patch 483 RMD160 4ed5e17c3b1e50a1d0bbb52a1d3a56f5bec52aa4 SHA1 8a98cc52bb1d74a1d45f72f8191cf322ee050682 SHA256 212f6f4cb1ef6051bdd1306cedd2236eada53a9ab650158c3b37577f7cd566e7
-MD5 4249ff740e5d55499cb62cf52ee9e817 files/gdal-1.5.0-soname.patch 483
-RMD160 4ed5e17c3b1e50a1d0bbb52a1d3a56f5bec52aa4 files/gdal-1.5.0-soname.patch 483
-SHA256 212f6f4cb1ef6051bdd1306cedd2236eada53a9ab650158c3b37577f7cd566e7 files/gdal-1.5.0-soname.patch 483
 AUX gdal-gcc4.patch 472 RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 SHA1 9cbba5ebf35e2ca90386e4ddcd53c47a748f4597 SHA256 25f4b1a67063373536407d23eb98bc98752b5341c1a4556e18906e2077d1d5ae
-MD5 2f3f328abbefa4056b6ee71dfbfce529 files/gdal-gcc4.patch 472
-RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 files/gdal-gcc4.patch 472
-SHA256 25f4b1a67063373536407d23eb98bc98752b5341c1a4556e18906e2077d1d5ae files/gdal-gcc4.patch 472
 DIST gdal-1.3.1.tar.gz 6856011 RMD160 5967608e6e1c9f0af8698fcffb58eab4dcdd518d SHA1 2783c4c0d2a83a34f4c5c6a8efe41e816ba396fb SHA256 4f8f3c462f9174e1dd99f7bfa2abe010aa129e04c08a242a3c63c1a9e5078753
 DIST gdal-1.3.2.tar.gz 7279872 RMD160 98c7f33bc3a57364e9ca15bf61d11d45f147b8ad SHA1 eda247dd96558ff79f843fb7b4393bf62cb01644 SHA256 00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87
 DIST gdal-1.4.2.tar.gz 7457778 RMD160 d4e2c09b4ec4ef3eb6a4da0e832168ef89878860 SHA1 42fc753f6fa70a66b9e619365575bcfb60a5003d SHA256 ee6e74cb80f47929fcfe8426fb024c2b195d237612be4d9a0795e9e353f588ee
 DIST gdal-1.5.0.tar.gz 6167411 RMD160 25326301edbc88739fce6f33b42dfb9499842896 SHA1 c049d29f530f1867e4edcf36b1a299c96a9327a1 SHA256 9ac75f8928aa649a70e2aa3ebda86e71e18acc295cd874c43d33a84ac11c1e91
 EBUILD gdal-1.3.1.ebuild 4424 RMD160 92cfb77b8b2348aab5847efb6783b8f6ba77ba91 SHA1 5cf1570aa03cf618b24e3c961490946dfd629d2e SHA256 1c912465c93dc6515a48a6824f4e43e442f341eac9729566cd9e6ecb34fe001c
-MD5 9b9e51ce4a91b0a574741f195946db7e gdal-1.3.1.ebuild 4424
-RMD160 92cfb77b8b2348aab5847efb6783b8f6ba77ba91 gdal-1.3.1.ebuild 4424
-SHA256 1c912465c93dc6515a48a6824f4e43e442f341eac9729566cd9e6ecb34fe001c gdal-1.3.1.ebuild 4424
 EBUILD gdal-1.3.2.ebuild 4710 RMD160 6c5f327b0c69a19078b5d87931826abef174c364 SHA1 ea273c09db5ab2a26bd4ee91d3ea70cdaa70d9ce SHA256 2db23bb124b9a6fb019da6e6c3494f406c6bea8ec72871af1e0a32b8018e834f
-MD5 ada46cc0dfc33f6964aed690000fbfb5 gdal-1.3.2.ebuild 4710
-RMD160 6c5f327b0c69a19078b5d87931826abef174c364 gdal-1.3.2.ebuild 4710
-SHA256 2db23bb124b9a6fb019da6e6c3494f406c6bea8ec72871af1e0a32b8018e834f gdal-1.3.2.ebuild 4710
 EBUILD gdal-1.4.2.ebuild 4581 RMD160 c47c1fba5b94bc3a4c57c8abfa2b19444962a4f7 SHA1 f6b426fd97c71e486cd4017d8f2139318079a3f4 SHA256 90946f8420887ecf15a6d054906a7937359fc809324f20df9b3913be5cda162f
-MD5 8ccb7b96d1719e5f57386d0a075dc26c gdal-1.4.2.ebuild 4581
-RMD160 c47c1fba5b94bc3a4c57c8abfa2b19444962a4f7 gdal-1.4.2.ebuild 4581
-SHA256 90946f8420887ecf15a6d054906a7937359fc809324f20df9b3913be5cda162f gdal-1.4.2.ebuild 4581
-EBUILD gdal-1.5.0.ebuild 5332 RMD160 d49aa6c10241fa061c1278306d9072b643f3c8bd SHA1 009ca448862e7f99677b2029cc50316033588a16 SHA256 b1613ffd4d50bdfb1ba58e0e426c62b888a7a69371dcde1e7d7b828d2f2d4555
-MD5 c92f5702572fbfcd2d70b9e26e2430b9 gdal-1.5.0.ebuild 5332
-RMD160 d49aa6c10241fa061c1278306d9072b643f3c8bd gdal-1.5.0.ebuild 5332
-SHA256 b1613ffd4d50bdfb1ba58e0e426c62b888a7a69371dcde1e7d7b828d2f2d4555 gdal-1.5.0.ebuild 5332
-MISC ChangeLog 7158 RMD160 f6bc4481fb4818d0d878a4157013a0c4f35b62d7 SHA1 11244de58e552993af36a71d84a304a91a8b192d SHA256 6b899173012ec372bf617b2e577b66f6e8598b7e72d0349e14acf98d7cce0721
-MD5 15cc241908ced8437c2141bfa687857b ChangeLog 7158
-RMD160 f6bc4481fb4818d0d878a4157013a0c4f35b62d7 ChangeLog 7158
-SHA256 6b899173012ec372bf617b2e577b66f6e8598b7e72d0349e14acf98d7cce0721 ChangeLog 7158
+EBUILD gdal-1.5.0.ebuild 5408 RMD160 50a94d03d043b5e3977f0735679f2b6163d19fd1 SHA1 b0983527d35e389aaa612a7c740fd4e2fe7ef842 SHA256 cb44f2f8ef7c1626920d9c3a830f13cd6347cdef6540d8af8fe22cd944f05d38
+MISC ChangeLog 7424 RMD160 f003f689dec5dff6619b79dcdaf206e1a204ea8b SHA1 5f3185f395de34397317221ecff35524c767dfaf SHA256 7434b84b6d0f50ee2e132db1694ded95e002d1c266a41bf395b3c475642978d6
 MISC metadata.xml 493 RMD160 8ad930d21e928734d6c22796abc6da27f420eb4d SHA1 d97adc27fa58d040e92e93d17fce2f666090ad36 SHA256 1f6fdd4665a2c5e8f6f53e3d7d1b05ab2696eb23af60d7f430e20b2b3022b958
-MD5 bf6b9c6083b3ccc9c3924343d20636e7 metadata.xml 493
-RMD160 8ad930d21e928734d6c22796abc6da27f420eb4d metadata.xml 493
-SHA256 1f6fdd4665a2c5e8f6f53e3d7d1b05ab2696eb23af60d7f430e20b2b3022b958 metadata.xml 493
-MD5 6e10f0b3bf2640b078ce2d38db68e77b files/digest-gdal-1.3.1 235
-RMD160 0576f091dc2fe7aa4d6e63b34544e05ed8c4a6d0 files/digest-gdal-1.3.1 235
-SHA256 a734d65225fe198341b408460b9b7b8be14296ba31070619486a0c83f6095596 files/digest-gdal-1.3.1 235
-MD5 eff5bde48b9efae3ae40982cb722008c files/digest-gdal-1.3.2 235
-RMD160 31f4e2ebbed5331e26f59bd812df2a0592d5a9ee files/digest-gdal-1.3.2 235
-SHA256 33b0611e0b879c18f363b9356c1700ba4d1aa9d0ab22d31c642825a636c87b98 files/digest-gdal-1.3.2 235
-MD5 0f9efaea4b8df419d4ab22166c2a3b3c files/digest-gdal-1.4.2 235
-RMD160 daae620929e3d2876c0fd1b682b957337d2fe75a files/digest-gdal-1.4.2 235
-SHA256 29eb75fa8cb7ed3a1b6e2ac1fe322eacabde1c1bcbded93bd9113a3ef2d4732c files/digest-gdal-1.4.2 235
-MD5 5ca294efceba4fdddc2b94263982d9fd files/digest-gdal-1.5.0 235
-RMD160 9aba534ad9b956f211ab3613239f5465d23024b9 files/digest-gdal-1.5.0 235
-SHA256 60bc7520622dae7ec8e413c9b2cbb47a2d85493f0352e699e529879b4226d2f5 files/digest-gdal-1.5.0 235
diff --git a/sci-libs/gdal/files/gdal-1.5.0-python-install.patch b/sci-libs/gdal/files/gdal-1.5.0-python-install.patch
index 8a79e63fa8cc..f5b44daa6b38 100644
--- a/sci-libs/gdal/files/gdal-1.5.0-python-install.patch
+++ b/sci-libs/gdal/files/gdal-1.5.0-python-install.patch
@@ -8,7 +8,7 @@
 +	python setup.py install --root=$(DESTDIR) 
  else
 -	python setup.py install --prefix=$(DESTDIR)$(prefix)
-+	python setup.py install --root=$(DESTDIR) --prefix=$(DESTDIR)$(prefix)
++	python setup.py install --root=$(DESTDIR) --prefix=$(prefix)
  endif
  
  	for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
diff --git a/sci-libs/gdal/gdal-1.5.0.ebuild b/sci-libs/gdal/gdal-1.5.0.ebuild
index 0dc4cd2ae135..0d3af1d9659e 100644
--- a/sci-libs/gdal/gdal-1.5.0.ebuild
+++ b/sci-libs/gdal/gdal-1.5.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.0.ebuild,v 1.1 2008/02/03 23:00:39 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.0.ebuild,v 1.2 2008/02/09 18:39:06 nerdboy Exp $
 
 inherit autotools distutils eutils perl-module toolchain-funcs
 
-IUSE="debug doc fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf \
-	odbc png ogdi perl postgres python ruby sqlite"
+IUSE="curl debug doc fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf \
+	odbc png ogdi perl postgres python ruby sqlite threads"
 
 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
 HOMEPAGE="http://www.gdal.org/"
@@ -20,6 +20,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 DEPEND=">=sys-libs/zlib-1.1.4
 	>=media-libs/tiff-3.7.0
 	sci-libs/libgeotiff
+	curl? ( net-misc/curl )
 	jpeg? ( media-libs/jpeg )
 	gif? ( media-libs/giflib )
 	png? ( media-libs/libpng )
@@ -78,11 +79,11 @@ src_compile() {
 		--with-libgrass=no --without-libtool $(use_enable debug)"
 
 	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
-	    $(use_with perl) $(use_with python) $(use_with ruby) \
-	    $(use_with postgres pg) $(use_with fits cfitsio) \
+	    $(use_with postgres pg) $(use_with python) $(use_with ruby) \
+	    $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
 	    $(use_with netcdf) $(use_with hdf hdf4) $(use_with geos) \
 	    $(use_with sqlite) $(use_with jpeg2k jasper) $(use_with odbc) \
-	    $(use_with gml xerces) $(use_with hdf5)"
+	    $(use_with gml xerces) $(use_with hdf5) $(use_with curl)"
 
 	# It can't find this
 	if useq ogdi ; then
@@ -134,7 +135,7 @@ src_compile() {
 
 src_install() {
 
-	if useq perl; then
+	if useq perl ; then
 	    cd "${S}"/swig/perl
 	    perl-module_src_install
 	    sed -i -e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \