updated to latest upstream release plus patches

Package-Manager: portage-2.1.4

10 files changed, 311 insertions, 2 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 45d9af163471..e8306df43815 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2008/01/04 05:24:28 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.35 2008/02/03 23:00:39 nerdboy Exp $
+
+*gdal-1.5.0 (03 Feb 2008)
+
+  03 Feb 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/gdal-1.5.0-makefile.patch, +files/gdal-1.5.0-python-install.patch,
+  +files/gdal-1.5.0-soname.patch, +gdal-1.5.0.ebuild:
+  updated to latest upstream release plus patches
 
   04 Jan 2008; Steve Arnold <nerdboy@gentoo.org> gdal-1.4.2.ebuild:
   fixed mysql borkage; no idea what happened...
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index df063e07436f..1fbfc260542b 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,15 +1,80 @@
 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-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
-MISC ChangeLog 6901 RMD160 ab7ff4e36f9680944d9835a2eab8b06ffd9fe792 SHA1 0eddc33293e875460911c599e2a4d7117c284b30 SHA256 f690842e7367879280e082ac4006ad9cb879b2bfa84ee9419db72183a3c5485f
+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
 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/digest-gdal-1.3.1 b/sci-libs/gdal/files/digest-gdal-1.3.1
new file mode 100644
index 000000000000..fb5b692a91d7
--- /dev/null
+++ b/sci-libs/gdal/files/digest-gdal-1.3.1
@@ -0,0 +1,3 @@
+MD5 7ff1ceff745ee011793e1f860c02c172 gdal-1.3.1.tar.gz 6856011
+RMD160 5967608e6e1c9f0af8698fcffb58eab4dcdd518d gdal-1.3.1.tar.gz 6856011
+SHA256 4f8f3c462f9174e1dd99f7bfa2abe010aa129e04c08a242a3c63c1a9e5078753 gdal-1.3.1.tar.gz 6856011
diff --git a/sci-libs/gdal/files/digest-gdal-1.3.2 b/sci-libs/gdal/files/digest-gdal-1.3.2
new file mode 100644
index 000000000000..56220c22ba3a
--- /dev/null
+++ b/sci-libs/gdal/files/digest-gdal-1.3.2
@@ -0,0 +1,3 @@
+MD5 67ed02dcea21e93f5e123bb0d322898a gdal-1.3.2.tar.gz 7279872
+RMD160 98c7f33bc3a57364e9ca15bf61d11d45f147b8ad gdal-1.3.2.tar.gz 7279872
+SHA256 00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87 gdal-1.3.2.tar.gz 7279872
diff --git a/sci-libs/gdal/files/digest-gdal-1.4.2 b/sci-libs/gdal/files/digest-gdal-1.4.2
new file mode 100644
index 000000000000..ed44e919cd42
--- /dev/null
+++ b/sci-libs/gdal/files/digest-gdal-1.4.2
@@ -0,0 +1,3 @@
+MD5 dedf5ff6a766e85b9a2b5c54c1c59221 gdal-1.4.2.tar.gz 7457778
+RMD160 d4e2c09b4ec4ef3eb6a4da0e832168ef89878860 gdal-1.4.2.tar.gz 7457778
+SHA256 ee6e74cb80f47929fcfe8426fb024c2b195d237612be4d9a0795e9e353f588ee gdal-1.4.2.tar.gz 7457778
diff --git a/sci-libs/gdal/files/digest-gdal-1.5.0 b/sci-libs/gdal/files/digest-gdal-1.5.0
new file mode 100644
index 000000000000..d5e9fb981bfe
--- /dev/null
+++ b/sci-libs/gdal/files/digest-gdal-1.5.0
@@ -0,0 +1,3 @@
+MD5 ffbb024db521a002018cb5666bd6e60d gdal-1.5.0.tar.gz 6167411
+RMD160 25326301edbc88739fce6f33b42dfb9499842896 gdal-1.5.0.tar.gz 6167411
+SHA256 9ac75f8928aa649a70e2aa3ebda86e71e18acc295cd874c43d33a84ac11c1e91 gdal-1.5.0.tar.gz 6167411
diff --git a/sci-libs/gdal/files/gdal-1.5.0-makefile.patch b/sci-libs/gdal/files/gdal-1.5.0-makefile.patch
new file mode 100644
index 000000000000..a24aa5015d0a
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.5.0-makefile.patch
@@ -0,0 +1,19 @@
+--- GNUmakefile.orig	2008-02-02 18:19:45.000000000 -0800
++++ GNUmakefile	2008-02-02 18:48:56.000000000 -0800
+@@ -226,12 +226,12 @@
+ else
+ 	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
+ 	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)
+-	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
+-	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
++	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_SLIB_SO_VER)
++	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_SLIB_SO_VER)
+ 	(cd $(DESTDIR)$(INST_LIB) ; \
+-	 ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B))
++	 ln -s $(GDAL_SLIB_B).$(GDAL_SLIB_SO_VER) $(GDAL_SLIB_B))
+ 	(cd $(DESTDIR)$(INST_LIB) ; \
+-	 ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR))
++	 ln -s $(GDAL_SLIB_B).$(GDAL_SLIB_SO_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR))
+ endif
+ 
+ else
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
new file mode 100644
index 000000000000..8a79e63fa8cc
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.5.0-python-install.patch
@@ -0,0 +1,14 @@
+--- swig/python/GNUmakefile.orig	2008-02-02 17:00:52.000000000 -0800
++++ swig/python/GNUmakefile	2008-02-02 17:02:03.000000000 -0800
+@@ -51,9 +51,9 @@
+ install:
+ 
+ ifeq ($(PY_HAVE_SETUPTOOLS),1)
+-	python setup.py install 
++	python setup.py install --root=$(DESTDIR) 
+ else
+-	python setup.py install --prefix=$(DESTDIR)$(prefix)
++	python setup.py install --root=$(DESTDIR) --prefix=$(DESTDIR)$(prefix)
+ endif
+ 
+ 	for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
diff --git a/sci-libs/gdal/files/gdal-1.5.0-soname.patch b/sci-libs/gdal/files/gdal-1.5.0-soname.patch
new file mode 100644
index 000000000000..f784536316c2
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.5.0-soname.patch
@@ -0,0 +1,13 @@
+--- GDALmake.opt.in.orig	2008-02-02 18:25:48.000000000 -0800
++++ GDALmake.opt.in	2008-02-02 18:54:53.000000000 -0800
+@@ -97,6 +97,10 @@
+ GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
+ GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
+ 
++# for building without libtool
++GDAL_SLIB_SO_VER =	$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
++GDAL_SLIB_SONAME =	-Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR)
++
+ # Mac OS X Framework definition
+ MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
+ 
diff --git a/sci-libs/gdal/gdal-1.5.0.ebuild b/sci-libs/gdal/gdal-1.5.0.ebuild
new file mode 100644
index 000000000000..0dc4cd2ae135
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.5.0.ebuild
@@ -0,0 +1,179 @@
+# 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 $
+
+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"
+
+DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+# need to get these arches updated on several libs first
+#KEYWORDS="~alpha ~hppa"
+
+DEPEND=">=sys-libs/zlib-1.1.4
+	>=media-libs/tiff-3.7.0
+	sci-libs/libgeotiff
+	jpeg? ( media-libs/jpeg )
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )
+	perl? ( dev-lang/perl )
+	python? ( virtual/python
+		dev-python/numpy )
+	ruby? ( >=dev-lang/ruby-1.8.4.20060226
+		>=dev-lang/swig-1.3.28 )
+	fits? ( sci-libs/cfitsio )
+	ogdi? ( sci-libs/ogdi )
+	gml? ( >=dev-libs/xerces-c-2.8.0 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4 )
+	postgres? ( dev-db/postgresql )
+	|| (
+	    netcdf? ( sci-libs/netcdf )
+	    hdf? ( sci-libs/hdf )
+	)
+	jpeg2k? ( media-libs/jasper )
+	mysql? ( virtual/mysql )
+	odbc?   ( dev-db/unixODBC )
+	geos?   ( >=sci-libs/geos-2.2.1 )
+	sqlite? ( >=dev-db/sqlite-3 )
+	doc? ( app-doc/doxygen )"
+
+WANT_AUTOCONF="2.5"
+AT_M4DIR="${S}/m4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	eaclocal
+	eautoconf
+
+	epatch "${FILESDIR}/${PN}-1.4.2-datadir.patch" \
+	    "${FILESDIR}/${P}-python-install.patch" \
+	    "${FILESDIR}/${P}-soname.patch" \
+	    "${FILESDIR}/${P}-makefile.patch"
+
+	if useq netcdf && useq hdf; then
+	    einfo	"Checking if HDF4 is compiled with szip..."
+	    if built_with_use sci-libs/hdf szip ; then
+		einfo	"Found HDF4 compiled with szip. Nice."
+	    else
+		ewarn 	"HDF4 (sci-libs/hdf) must be compiled with the szip USE flag!"
+		einfo 	"Please emerge hdf with szip USE flag and then emerge GDAL."
+		die 	"HDF4 not merged with szip use flag"
+	    fi
+	fi
+}
+
+src_compile() {
+	distutils_python_version
+
+	pkg_conf="--enable-static=no --enable-shared=yes --with-pic \
+		--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 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)"
+
+	# It can't find this
+	if useq ogdi ; then
+	    use_conf="--with-ogdi=/usr/$(get_libdir) ${use_conf}"
+	fi
+
+	if useq mysql ; then
+	    use_conf="--with-mysql=/usr/bin/mysql_config ${use_conf}"
+	fi
+
+	if useq gif ; then
+	    use_conf="--with-gif=internal ${use_conf}"
+	else
+	    use_conf="--with-gif=no ${use_conf}"
+	fi
+
+	if useq python ; then
+	    use_conf="--with-pymoddir=/usr/$(get_libdir)/python${PYVER}/site-packages \
+		${use_conf}"
+	fi
+
+	# Fix doc path just in case
+	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" GDALmake.opt.in
+
+	econf ${pkg_conf} ${use_conf} || die "econf failed"
+
+	# parallel makes fail on the ogr stuff (C++, what can I say?)
+	# also failing with gcc4 in libcsf
+	emake -j1 || die "emake failed"
+
+	if use python; then
+	    sed -i -e "s#library_dirs = #library_dirs = /usr/$(get_libdir):#g" \
+		swig/python/setup.cfg
+	    sed -i -e "s:$(DESTDIR)$(prefix):$(DESTDIR)$(INST_PREFIX):g" \
+		swig/python/GNUmakefile
+	fi
+
+	if useq perl ; then
+	    cd "${S}"/swig/perl
+	    perl-module_src_prep
+	    perl-module_src_compile
+	    cd "${S}"
+	fi
+
+	if useq doc ; then
+	    make docs || die "make docs failed"
+	fi
+}
+
+src_install() {
+
+	if useq perl; then
+	    cd "${S}"/swig/perl
+	    perl-module_src_install
+	    sed -i -e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
+		GDALmake.opt
+	    cd "${S}"
+	fi
+
+	# einstall causes sandbox violations on /usr/lib/libgdal.so
+	make DESTDIR="${D}" install \
+	    || die "make install failed"
+
+	dodoc Doxyfile HOWTO-RELEASE NEWS
+
+	if useq doc ; then
+	    dohtml html/* || die "install html failed"
+	    docinto ogr
+	    dohtml ogr/html/* || die "install ogr html failed"
+	fi
+
+	if useq python; then
+	    newdoc swig/python/README.txt README-python.txt
+	    dodir /usr/share/${PN}/samples
+	    insinto /usr/share/${PN}/samples
+	    doins swig/python/samples/*
+	fi
+}
+
+pkg_postinst() {
+	einfo "GDAL is most useful with full graphics support enabled via various"
+	einfo "USE flags: png, jpeg, gif, jpeg2k, etc. Also python, fits, ogdi,"
+	einfo "geos, and support for either netcdf or HDF4 is available, as well as"
+	einfo "grass, and mysql, sqlite, or postgres (grass support requires grass 6"
+	einfo "and the new gdal-grass ebuild).  HDF5 support is now included."
+	ewarn
+	einfo "Note: tiff and geotiff are now hard depends, so no USE flags."
+	einfo "Also, this package will check for netcdf before hdf, so if you"
+	einfo "prefer hdf, please emerge hdf with USE=szip prior to emerging"
+	einfo "gdal.  Detailed API docs require doxygen (man pages are free)."
+	einfo ""
+	einfo "Check available image and data formats after building with"
+	einfo "gdalinfo and ogrinfo (using the --formats switch)."
+}