Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sci-libs/gdal/ChangeLog13
-rw-r--r--sci-libs/gdal/Manifest56
-rw-r--r--sci-libs/gdal/files/digest-gdal-1.2.6-r43
-rw-r--r--sci-libs/gdal/files/digest-gdal-1.3.0-r13
-rw-r--r--sci-libs/gdal/files/gdal-1.2.6-installpathfix.patch210
-rw-r--r--sci-libs/gdal/files/gdal-1.3.0-installpathfix.patch210
-rw-r--r--sci-libs/gdal/gdal-1.2.6-r4.ebuild132
-rw-r--r--sci-libs/gdal/gdal-1.3.0-r1.ebuild133
-rw-r--r--sci-libs/gdal/gdal-1.3.1.ebuild16
-rw-r--r--sci-libs/gdal/gdal-1.3.2.ebuild20
-rw-r--r--sci-libs/gdal/gdal-1.4.2.ebuild18
11 files changed, 54 insertions, 760 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index a0829d813fc9..d5d3ef0accd0 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for sci-libs/gdal
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.32 2007/07/03 20:12:55 nerdboy Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.33 2008/01/04 04:08:15 nerdboy Exp $
+
+ 04 Jan 2008; Steve Arnold <nerdboy@gentoo.org>
+ -files/gdal-1.2.6-installpathfix.patch,
+ -files/gdal-1.3.0-installpathfix.patch, -gdal-1.2.6-r4.ebuild,
+ -gdal-1.3.0-r1.ebuild, gdal-1.3.1.ebuild, gdal-1.3.2.ebuild,
+ gdal-1.4.2.ebuild:
+ Updated xerces-c dep for API change (bug 203019) and removed stale versions.
+ The 1.4.3 release of GDAL was pulled, however, 1.4.4 will be updated for the
+ 2.8.0 version of xerces-c.
*gdal-1.4.2 (02 Jul 2007)
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index c273ba8b8c5f..54d031bf00b7 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,11 +1,3 @@
-AUX gdal-1.2.6-installpathfix.patch 7786 RMD160 0a8650cb4b8e4f8b21596434f3848ac4db548024 SHA1 6ac083a354a4d89b89935de4fe998eba805f95d0 SHA256 408fc31a7b96f8a6cf9c7a7ea9775668aa842f40964e6ac1d9add07956cbca02
-MD5 8069b0c62dde416a0c74d1bf73543c9d files/gdal-1.2.6-installpathfix.patch 7786
-RMD160 0a8650cb4b8e4f8b21596434f3848ac4db548024 files/gdal-1.2.6-installpathfix.patch 7786
-SHA256 408fc31a7b96f8a6cf9c7a7ea9775668aa842f40964e6ac1d9add07956cbca02 files/gdal-1.2.6-installpathfix.patch 7786
-AUX gdal-1.3.0-installpathfix.patch 7764 RMD160 ed78619093dc7d59502cd4b62bc0abb2ed19c232 SHA1 41e59d060692aa43a94e3602e4011ceeb8434ac1 SHA256 ffe7a37daf6025b53eff06b0ca3908fea2aa7b217d6bc7fffa56a7cee35aa985
-MD5 3f4304111ffcc48b1784cc03ef64844b files/gdal-1.3.0-installpathfix.patch 7764
-RMD160 ed78619093dc7d59502cd4b62bc0abb2ed19c232 files/gdal-1.3.0-installpathfix.patch 7764
-SHA256 ffe7a37daf6025b53eff06b0ca3908fea2aa7b217d6bc7fffa56a7cee35aa985 files/gdal-1.3.0-installpathfix.patch 7764
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
@@ -34,45 +26,29 @@ AUX gdal-gcc4.patch 472 RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 SHA1 9cb
MD5 2f3f328abbefa4056b6ee71dfbfce529 files/gdal-gcc4.patch 472
RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 files/gdal-gcc4.patch 472
SHA256 25f4b1a67063373536407d23eb98bc98752b5341c1a4556e18906e2077d1d5ae files/gdal-gcc4.patch 472
-DIST gdal-1.2.6.tar.gz 4315879 RMD160 2492520cfa9b724a2a880145f03e44e9804418c8 SHA1 7f34ed16324b00a4d95708867995b6145533553b SHA256 b2c39995839296f396cebaf0410e44aa362851315508258a46c7caee4c37706c
-DIST gdal-1.3.0.tar.gz 6644839 RMD160 4296a5b6d3255ab8f3d20f4e7e372c35a2ca335c SHA1 05de80a5c6b605505576a59242306c2db9a0f2af SHA256 48624307e66b7e70fe75d9c4884617bfda75026cbfc20ab23764b28811864bf9
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
-EBUILD gdal-1.2.6-r4.ebuild 4144 RMD160 c0acaa1b9d04d4cc477b6dcb5665cfcdd338ed74 SHA1 d75bd31ad0d1d776634f4d0cdb8872013630a847 SHA256 b2824796e50a34de87095f3ab073d6bbacb95fa85465711e8c6bd91d8c31be5b
-MD5 79e1f1c41cf9308c754514e57bb8be65 gdal-1.2.6-r4.ebuild 4144
-RMD160 c0acaa1b9d04d4cc477b6dcb5665cfcdd338ed74 gdal-1.2.6-r4.ebuild 4144
-SHA256 b2824796e50a34de87095f3ab073d6bbacb95fa85465711e8c6bd91d8c31be5b gdal-1.2.6-r4.ebuild 4144
-EBUILD gdal-1.3.0-r1.ebuild 4204 RMD160 a31e3bec500e91129e935acafa7a8cdda724305b SHA1 f0315b256cebe83a2da991012d4ab5ab6beead6a SHA256 dc958ce4f216334e7c860440ed0228f958bff26f868decc6f6274c9428a70f4d
-MD5 1690d019659dbb249f9a4a9171e8130c gdal-1.3.0-r1.ebuild 4204
-RMD160 a31e3bec500e91129e935acafa7a8cdda724305b gdal-1.3.0-r1.ebuild 4204
-SHA256 dc958ce4f216334e7c860440ed0228f958bff26f868decc6f6274c9428a70f4d gdal-1.3.0-r1.ebuild 4204
-EBUILD gdal-1.3.1.ebuild 4418 RMD160 d78ed7f5fdf9de109fdfad3480c84d5cb98ea25b SHA1 a4ea400278883dda2828c4356ec142c4f2f43f07 SHA256 c881fded11bdcd31c2f74e36ffe5c96246415d70e01ba2c813ecd3439c5f7a7e
-MD5 a781fc0e1447c31b8492c34e1b428837 gdal-1.3.1.ebuild 4418
-RMD160 d78ed7f5fdf9de109fdfad3480c84d5cb98ea25b gdal-1.3.1.ebuild 4418
-SHA256 c881fded11bdcd31c2f74e36ffe5c96246415d70e01ba2c813ecd3439c5f7a7e gdal-1.3.1.ebuild 4418
-EBUILD gdal-1.3.2.ebuild 4691 RMD160 0eca64ea629540926e207bb796f236a408a4946d SHA1 3a818e0d326befbc1e7df6ecb6df8a41c44970d9 SHA256 b36d6b32346fd07929b48bded422a64661767a55b518c73a6fae6cae0d1e6412
-MD5 f671b7f110f22f99ef2377d8cbfac606 gdal-1.3.2.ebuild 4691
-RMD160 0eca64ea629540926e207bb796f236a408a4946d gdal-1.3.2.ebuild 4691
-SHA256 b36d6b32346fd07929b48bded422a64661767a55b518c73a6fae6cae0d1e6412 gdal-1.3.2.ebuild 4691
-EBUILD gdal-1.4.2.ebuild 4525 RMD160 257b394895e292f7f96d6c70a11dd3c30f2551e8 SHA1 25f04eed293c886597d224cc86776400d79db497 SHA256 59e16db381f103cc0dae8634dd04addf181a04e0973bdbbceca883a0cd1240f6
-MD5 fd73a7c464ec6ea0d235739ac7d00535 gdal-1.4.2.ebuild 4525
-RMD160 257b394895e292f7f96d6c70a11dd3c30f2551e8 gdal-1.4.2.ebuild 4525
-SHA256 59e16db381f103cc0dae8634dd04addf181a04e0973bdbbceca883a0cd1240f6 gdal-1.4.2.ebuild 4525
-MISC ChangeLog 6356 RMD160 9d445074d6c9175f18489cbb4e7df2204af76dba SHA1 87fac846573c533fdbf9b6fec6bcc8fca564427a SHA256 c6d183d20e7d710dffdebae8b21a6af0eb9d753853deed534f1a4e54237e6479
-MD5 ee295250041a702e235cbcfb9c714f5f ChangeLog 6356
-RMD160 9d445074d6c9175f18489cbb4e7df2204af76dba ChangeLog 6356
-SHA256 c6d183d20e7d710dffdebae8b21a6af0eb9d753853deed534f1a4e54237e6479 ChangeLog 6356
+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 4544 RMD160 58188a76c432070714a57fab09c7f9cdaec9ff62 SHA1 14e55e59ae3c7e60536088b9e99690bdfb346092 SHA256 675973dbbb84ab09f187e8b2f9d32f691f1cf732b051018f7898e8127d2ae370
+MD5 a53eb25565c8a186c96fbd474f4c1c3c gdal-1.4.2.ebuild 4544
+RMD160 58188a76c432070714a57fab09c7f9cdaec9ff62 gdal-1.4.2.ebuild 4544
+SHA256 675973dbbb84ab09f187e8b2f9d32f691f1cf732b051018f7898e8127d2ae370 gdal-1.4.2.ebuild 4544
+MISC ChangeLog 6784 RMD160 fdec208eab24c7cdbb79f6f669853e94e234a523 SHA1 d49de83727da3be4d2e1875f659f5ada4a2630ff SHA256 35d60e749c78bc1c01960b10c6886f47ba04b3146939c9c509fb4897affe12dd
+MD5 dbe218d6db323a9334cb14c58a968184 ChangeLog 6784
+RMD160 fdec208eab24c7cdbb79f6f669853e94e234a523 ChangeLog 6784
+SHA256 35d60e749c78bc1c01960b10c6886f47ba04b3146939c9c509fb4897affe12dd ChangeLog 6784
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 17d603b4bfd729d32378e6492d413af9 files/digest-gdal-1.2.6-r4 235
-RMD160 e725c1a5c166179753a2b72967a771868045e229 files/digest-gdal-1.2.6-r4 235
-SHA256 664d5b3bee2e028bdd35988bc4bd2779dd8a7546b71e41cd34f2cf177a865eb6 files/digest-gdal-1.2.6-r4 235
-MD5 79afc55e30e361d91420ef1131329989 files/digest-gdal-1.3.0-r1 235
-RMD160 bbe93557be7c7b8920ef02156e0eb27839161668 files/digest-gdal-1.3.0-r1 235
-SHA256 c708d39119a85fecce52385da9fb8454d4b7c8d24963440abb9a44d903a06e00 files/digest-gdal-1.3.0-r1 235
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
diff --git a/sci-libs/gdal/files/digest-gdal-1.2.6-r4 b/sci-libs/gdal/files/digest-gdal-1.2.6-r4
deleted file mode 100644
index 68e7cdb18303..000000000000
--- a/sci-libs/gdal/files/digest-gdal-1.2.6-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 410e581874ce2b94bfa00deb9f2087f6 gdal-1.2.6.tar.gz 4315879
-RMD160 2492520cfa9b724a2a880145f03e44e9804418c8 gdal-1.2.6.tar.gz 4315879
-SHA256 b2c39995839296f396cebaf0410e44aa362851315508258a46c7caee4c37706c gdal-1.2.6.tar.gz 4315879
diff --git a/sci-libs/gdal/files/digest-gdal-1.3.0-r1 b/sci-libs/gdal/files/digest-gdal-1.3.0-r1
deleted file mode 100644
index 881d81cad8ba..000000000000
--- a/sci-libs/gdal/files/digest-gdal-1.3.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fbf4e137c9d0f64f5a70273e555bf777 gdal-1.3.0.tar.gz 6644839
-RMD160 4296a5b6d3255ab8f3d20f4e7e372c35a2ca335c gdal-1.3.0.tar.gz 6644839
-SHA256 48624307e66b7e70fe75d9c4884617bfda75026cbfc20ab23764b28811864bf9 gdal-1.3.0.tar.gz 6644839
diff --git a/sci-libs/gdal/files/gdal-1.2.6-installpathfix.patch b/sci-libs/gdal/files/gdal-1.2.6-installpathfix.patch
deleted file mode 100644
index 85c847b2e51e..000000000000
--- a/sci-libs/gdal/files/gdal-1.2.6-installpathfix.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-diff -ru gdal-1.2.6/GNUmakefile gdal-1.2.6.fixed/GNUmakefile
---- gdal-1.2.6/GNUmakefile 2005-03-02 04:55:40.000000000 +1100
-+++ gdal-1.2.6.fixed/GNUmakefile 2005-10-02 18:22:05.000000000 +1000
-@@ -126,7 +126,7 @@
-
- install-docs:
- (cd ogr; $(MAKE) install-docs)
-- $(INSTALL_DIR) $(INST_DOCS)/gdal
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/gdal
- cp html/*.* $(INST_DOCS)/gdal
-
- web-update: docs
-@@ -135,9 +135,9 @@
- install: default install-actions
-
- install-actions: install-lib
-- $(INSTALL_DIR) $(INST_BIN)
-- $(INSTALL_DIR) $(INST_DATA)
-- $(INSTALL_DIR) $(INST_INCLUDE)
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_DATA)
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
- (cd port; $(MAKE) install)
- (cd gcore; $(MAKE) install)
- (cd frmts; $(MAKE) install)
-@@ -148,14 +148,14 @@
- ifneq ($(PYTHON),no)
- (cd pymod; $(MAKE) install)
- endif
-- for f in data/*.* ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
-+ for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
- $(LIBTOOL_FINISH) $(INST_LIB)
-
- ifeq ($(HAVE_LIBTOOL),yes)
-
- install-lib:
-- $(INSTALL_DIR) $(INST_LIB)
-- for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(INST_LIB) ; done
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
-+ for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(DESTDIR)$(INST_LIB) ; done
-
- else
-
-@@ -165,11 +165,11 @@
- GDAL_SLIB_B = $(notdir $(GDAL_SLIB))
-
- install-lib:
-- $(INSTALL_DIR) $(INST_LIB)
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
- rm -f $(INST_LIB)/$(GDAL_SLIB_B)
- rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER_MAJOR)
- rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-- $(INSTALL_LIB) $(GDAL_SLIB) $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-+ $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
- (cd $(INST_LIB) ; \
- ln -s $(GDAL_SLIB_B).$(GDAL_VER_MAJOR) $(GDAL_SLIB_B))
- (cd $(INST_LIB) ; \
-@@ -178,8 +178,8 @@
- else
-
- install-lib:
-- $(INSTALL_DIR) $(INST_LIB)
-- $(INSTALL_LIB) $(GDAL_LIB) $(INST_LIB)
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
-+ $(INSTALL_LIB) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
-
- endif # HAVE_LD_SHARED=no
-
-diff -ru gdal-1.2.6/alg/GNUmakefile gdal-1.2.6.fixed/alg/GNUmakefile
---- gdal-1.2.6/alg/GNUmakefile 2004-12-27 08:26:15.000000000 +1100
-+++ gdal-1.2.6.fixed/alg/GNUmakefile 2005-10-02 18:22:05.000000000 +1000
-@@ -23,7 +23,7 @@
- (cd ..; $(MAKE) docs)
-
- install:
-- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
-+ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
-
- lib: $(OBJ)
- (cd .. ; $(MAKE) force-lib)
-diff -ru gdal-1.2.6/apps/GNUmakefile gdal-1.2.6.fixed/apps/GNUmakefile
---- gdal-1.2.6/apps/GNUmakefile 2004-08-12 05:07:21.000000000 +1000
-+++ gdal-1.2.6.fixed/apps/GNUmakefile 2005-10-02 18:22:05.000000000 +1000
-@@ -85,6 +85,6 @@
-
-
- install: default
-- for f in $(BIN_LIST) ; do $(INSTALL) $$f $(INST_BIN) ; done
-- $(INSTALL) gdal-config-inst $(INST_BIN)/gdal-config
-+ for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
-+ $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
-
-diff -ru gdal-1.2.6/frmts/mem/GNUmakefile gdal-1.2.6.fixed/frmts/mem/GNUmakefile
---- gdal-1.2.6/frmts/mem/GNUmakefile 2005-01-25 05:09:57.000000000 +1100
-+++ gdal-1.2.6.fixed/frmts/mem/GNUmakefile 2005-10-02 18:22:05.000000000 +1000
-@@ -15,4 +15,4 @@
- install-obj: $(O_OBJ)
-
- install:
-- $(INSTALL_DATA) memdataset.h $(INST_INCLUDE)
-+ $(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)
-diff -ru gdal-1.2.6/frmts/raw/GNUmakefile gdal-1.2.6.fixed/frmts/raw/GNUmakefile
---- gdal-1.2.6/frmts/raw/GNUmakefile 2005-01-25 05:09:57.000000000 +1100
-+++ gdal-1.2.6.fixed/frmts/raw/GNUmakefile 2005-10-02 18:22:05.000000000 +1000
-@@ -21,4 +21,4 @@
- $(OBJ) $(O_OBJ): rawdataset.h
-
- install:
-- $(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
-+ $(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
-diff -ru gdal-1.2.6/frmts/vrt/GNUmakefile gdal-1.2.6.fixed/frmts/vrt/GNUmakefile
---- gdal-1.2.6/frmts/vrt/GNUmakefile 2005-01-25 05:09:57.000000000 +1100
-+++ gdal-1.2.6.fixed/frmts/vrt/GNUmakefile 2005-10-02 18:22:05.000000000 +1000
-@@ -19,4 +19,4 @@
- $(OBJ) $(O_OBJ): vrtdataset.h
-
- install:
-- $(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)
-+ $(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)
-diff -ru gdal-1.2.6/gcore/GNUmakefile gdal-1.2.6.fixed/gcore/GNUmakefile
---- gdal-1.2.6/gcore/GNUmakefile 2004-04-29 23:43:34.000000000 +1000
-+++ gdal-1.2.6.fixed/gcore/GNUmakefile 2005-10-02 18:22:05.000000000 +1000
-@@ -31,4 +31,4 @@
- $*.cpp -o $*.o
-
- install:
-- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
-+ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
-diff -ru gdal-1.2.6/man/GNUmakefile gdal-1.2.6.fixed/man/GNUmakefile
---- gdal-1.2.6/man/GNUmakefile 2004-02-21 04:26:13.000000000 +1100
-+++ gdal-1.2.6.fixed/man/GNUmakefile 2005-10-02 18:22:05.000000000 +1000
-@@ -5,5 +5,5 @@
- include ../GDALmake.opt
-
- install:
-- $(INSTALL_DIR) $(INST_MAN)/man1
-- for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(INST_MAN)/man1 ; done
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_MAN)/man1
-+ for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_MAN)/man1 ; done
-diff -ru gdal-1.2.6/ogr/GNUmakefile gdal-1.2.6.fixed/ogr/GNUmakefile
---- gdal-1.2.6/ogr/GNUmakefile 2005-03-12 01:28:05.000000000 +1100
-+++ gdal-1.2.6.fixed/ogr/GNUmakefile 2005-10-02 18:22:05.000000000 +1000
-@@ -79,7 +79,7 @@
- cp ogr_feature_style.html html
-
- install-docs:
-- $(INSTALL_DIR) $(INST_DOCS)/ogr
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
- cp html/* $(INST_DOCS)/ogr
-
- gdalso: $(GDAL_SLIB)
-@@ -120,14 +120,14 @@
-
- ifeq ($(OGR_ENABLED),yes)
- install-full: apps
-- $(INSTALL) ogr2ogr $(INST_BIN)
-- $(INSTALL) ogrinfo $(INST_BIN)
-- $(INSTALL) ogrtindex $(INST_BIN)
-+ $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
-+ $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
-+ $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
- else
- install-full:
- endif
-
- install: install-full
- for f in $(INST_H_FILES) ; \
-- do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
-+ do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
- done
-diff -ru gdal-1.2.6/port/GNUmakefile gdal-1.2.6.fixed/port/GNUmakefile
---- gdal-1.2.6/port/GNUmakefile 2003-12-29 04:25:00.000000000 +1100
-+++ gdal-1.2.6.fixed/port/GNUmakefile 2005-10-02 18:22:05.000000000 +1000
-@@ -25,7 +25,7 @@
- $(RM) *.o $(LIB)
-
- install:
-- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
-+ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
-
- xmlreformat: xmlreformat.o
- $(CXX) $(CXXFLAGS) xmlreformat.o $(CONFIG_LIBS) -o xmlreformat
-diff -ru gdal-1.2.6/pymod/GNUmakefile gdal-1.2.6.fixed/pymod/GNUmakefile
---- gdal-1.2.6/pymod/GNUmakefile 2005-02-01 09:07:02.000000000 +1100
-+++ gdal-1.2.6.fixed/pymod/GNUmakefile 2005-10-02 18:22:05.000000000 +1000
-@@ -45,9 +45,9 @@
-
- # special care is taken so that python scripts are installed as executables
- install: $(GDALMODULE_SO)
-- $(INSTALL_DIR) $(INST_PYMOD)
-- $(INSTALL_LIB) $(GDALMODULE_SO) $(INST_PYMOD)
-- for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(INST_BIN) ; done
-- for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(INST_PYMOD) ; done
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
-+ $(INSTALL_LIB) $(GDALMODULE_SO) $(DESTDIR)$(INST_PYMOD)
-+ for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
-+ for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; done
- # ugh! spurius relinking leaves a file owned by root into .libs/.
- rm -f .libs/*.soT
---- gdal-1.2.6/GDALmake.opt.in.orig 2005-10-02 21:07:42.000000000 +1000
-+++ gdal-1.2.6/GDALmake.opt.in 2005-10-02 21:08:23.000000000 +1000
-@@ -50,7 +50,7 @@
- exec_prefix = @exec_prefix@
- INST_PREFIX = @exec_prefix@
- INST_INCLUDE = @includedir@
--INST_DATA = @datadir@
-+INST_DATA = @datadir@/gdal
- INST_LIB = @libdir@
- INST_BIN = @bindir@
- INST_PYMOD = @pymoddir@
diff --git a/sci-libs/gdal/files/gdal-1.3.0-installpathfix.patch b/sci-libs/gdal/files/gdal-1.3.0-installpathfix.patch
deleted file mode 100644
index 931962d4c3a2..000000000000
--- a/sci-libs/gdal/files/gdal-1.3.0-installpathfix.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-diff -ru gdal-1.3.0.orig/GNUmakefile gdal-1.3.0/GNUmakefile
---- gdal-1.3.0.orig/GNUmakefile 2005-03-02 04:55:40.000000000 +1100
-+++ gdal-1.3.0/GNUmakefile 2005-10-02 18:28:59.000000000 +1000
-@@ -126,7 +126,7 @@
-
- install-docs:
- (cd ogr; $(MAKE) install-docs)
-- $(INSTALL_DIR) $(INST_DOCS)/gdal
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/gdal
- cp html/*.* $(INST_DOCS)/gdal
-
- web-update: docs
-@@ -135,9 +135,9 @@
- install: default install-actions
-
- install-actions: install-lib
-- $(INSTALL_DIR) $(INST_BIN)
-- $(INSTALL_DIR) $(INST_DATA)
-- $(INSTALL_DIR) $(INST_INCLUDE)
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_DATA)
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
- (cd port; $(MAKE) install)
- (cd gcore; $(MAKE) install)
- (cd frmts; $(MAKE) install)
-@@ -148,14 +148,14 @@
- ifneq ($(PYTHON),no)
- (cd pymod; $(MAKE) install)
- endif
-- for f in data/*.* ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
-+ for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
- $(LIBTOOL_FINISH) $(INST_LIB)
-
- ifeq ($(HAVE_LIBTOOL),yes)
-
- install-lib:
-- $(INSTALL_DIR) $(INST_LIB)
-- for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(INST_LIB) ; done
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
-+ for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(DESTDIR)$(INST_LIB) ; done
-
- else
-
-@@ -165,11 +165,11 @@
- GDAL_SLIB_B = $(notdir $(GDAL_SLIB))
-
- install-lib:
-- $(INSTALL_DIR) $(INST_LIB)
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
- rm -f $(INST_LIB)/$(GDAL_SLIB_B)
- rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER_MAJOR)
- rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-- $(INSTALL_LIB) $(GDAL_SLIB) $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-+ $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
- (cd $(INST_LIB) ; \
- ln -s $(GDAL_SLIB_B).$(GDAL_VER_MAJOR) $(GDAL_SLIB_B))
- (cd $(INST_LIB) ; \
-@@ -178,8 +178,8 @@
- else
-
- install-lib:
-- $(INSTALL_DIR) $(INST_LIB)
-- $(INSTALL_LIB) $(GDAL_LIB) $(INST_LIB)
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
-+ $(INSTALL_LIB) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
-
- endif # HAVE_LD_SHARED=no
-
-diff -ru gdal-1.3.0.orig/alg/GNUmakefile gdal-1.3.0/alg/GNUmakefile
---- gdal-1.3.0.orig/alg/GNUmakefile 2004-12-27 08:26:15.000000000 +1100
-+++ gdal-1.3.0/alg/GNUmakefile 2005-10-02 18:28:59.000000000 +1000
-@@ -23,7 +23,7 @@
- (cd ..; $(MAKE) docs)
-
- install:
-- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
-+ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
-
- lib: $(OBJ)
- (cd .. ; $(MAKE) force-lib)
-diff -ru gdal-1.3.0.orig/apps/GNUmakefile gdal-1.3.0/apps/GNUmakefile
---- gdal-1.3.0.orig/apps/GNUmakefile 2005-05-12 17:10:00.000000000 +1000
-+++ gdal-1.3.0/apps/GNUmakefile 2005-10-02 18:28:59.000000000 +1000
-@@ -89,6 +89,6 @@
-
-
- install: default
-- for f in $(BIN_LIST) ; do $(INSTALL) $$f $(INST_BIN) ; done
-- $(INSTALL) gdal-config-inst $(INST_BIN)/gdal-config
-+ for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
-+ $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
-
-diff -ru gdal-1.3.0.orig/frmts/mem/GNUmakefile gdal-1.3.0/frmts/mem/GNUmakefile
---- gdal-1.3.0.orig/frmts/mem/GNUmakefile 2005-01-25 05:09:57.000000000 +1100
-+++ gdal-1.3.0/frmts/mem/GNUmakefile 2005-10-02 18:28:59.000000000 +1000
-@@ -15,4 +15,4 @@
- install-obj: $(O_OBJ)
-
- install:
-- $(INSTALL_DATA) memdataset.h $(INST_INCLUDE)
-+ $(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)
-diff -ru gdal-1.3.0.orig/frmts/raw/GNUmakefile gdal-1.3.0/frmts/raw/GNUmakefile
---- gdal-1.3.0.orig/frmts/raw/GNUmakefile 2005-01-25 05:09:57.000000000 +1100
-+++ gdal-1.3.0/frmts/raw/GNUmakefile 2005-10-02 18:28:59.000000000 +1000
-@@ -21,4 +21,4 @@
- $(OBJ) $(O_OBJ): rawdataset.h
-
- install:
-- $(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
-+ $(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
-diff -ru gdal-1.3.0.orig/frmts/vrt/GNUmakefile gdal-1.3.0/frmts/vrt/GNUmakefile
---- gdal-1.3.0.orig/frmts/vrt/GNUmakefile 2005-01-25 05:09:57.000000000 +1100
-+++ gdal-1.3.0/frmts/vrt/GNUmakefile 2005-10-02 18:28:59.000000000 +1000
-@@ -19,4 +19,4 @@
- $(OBJ) $(O_OBJ): vrtdataset.h
-
- install:
-- $(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)
-+ $(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)
-diff -ru gdal-1.3.0.orig/gcore/GNUmakefile gdal-1.3.0/gcore/GNUmakefile
---- gdal-1.3.0.orig/gcore/GNUmakefile 2005-07-12 03:11:00.000000000 +1000
-+++ gdal-1.3.0/gcore/GNUmakefile 2005-10-02 18:28:59.000000000 +1000
-@@ -32,4 +32,4 @@
- $*.cpp -o $*.o
-
- install:
-- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
-+ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
-diff -ru gdal-1.3.0.orig/man/GNUmakefile gdal-1.3.0/man/GNUmakefile
---- gdal-1.3.0.orig/man/GNUmakefile 2004-02-21 04:26:13.000000000 +1100
-+++ gdal-1.3.0/man/GNUmakefile 2005-10-02 18:28:59.000000000 +1000
-@@ -5,5 +5,5 @@
- include ../GDALmake.opt
-
- install:
-- $(INSTALL_DIR) $(INST_MAN)/man1
-- for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(INST_MAN)/man1 ; done
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_MAN)/man1
-+ for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_MAN)/man1 ; done
-diff -ru gdal-1.3.0.orig/ogr/GNUmakefile gdal-1.3.0/ogr/GNUmakefile
---- gdal-1.3.0.orig/ogr/GNUmakefile 2005-03-12 01:28:05.000000000 +1100
-+++ gdal-1.3.0/ogr/GNUmakefile 2005-10-02 18:28:59.000000000 +1000
-@@ -79,7 +79,7 @@
- cp ogr_feature_style.html html
-
- install-docs:
-- $(INSTALL_DIR) $(INST_DOCS)/ogr
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
- cp html/* $(INST_DOCS)/ogr
-
- gdalso: $(GDAL_SLIB)
-@@ -120,14 +120,14 @@
-
- ifeq ($(OGR_ENABLED),yes)
- install-full: apps
-- $(INSTALL) ogr2ogr $(INST_BIN)
-- $(INSTALL) ogrinfo $(INST_BIN)
-- $(INSTALL) ogrtindex $(INST_BIN)
-+ $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
-+ $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
-+ $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
- else
- install-full:
- endif
-
- install: install-full
- for f in $(INST_H_FILES) ; \
-- do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
-+ do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
- done
-diff -ru gdal-1.3.0.orig/port/GNUmakefile gdal-1.3.0/port/GNUmakefile
---- gdal-1.3.0.orig/port/GNUmakefile 2005-06-11 01:00:00.000000000 +1000
-+++ gdal-1.3.0/port/GNUmakefile 2005-10-02 18:28:59.000000000 +1000
-@@ -25,7 +25,7 @@
- $(RM) *.o $(LIB)
-
- install:
-- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
-+ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
-
- xmlreformat: xmlreformat.o
- $(CXX) $(CXXFLAGS) xmlreformat.o $(CONFIG_LIBS) -o xmlreformat
-diff -ru gdal-1.3.0.orig/pymod/GNUmakefile gdal-1.3.0/pymod/GNUmakefile
---- gdal-1.3.0.orig/pymod/GNUmakefile 2005-02-01 09:07:02.000000000 +1100
-+++ gdal-1.3.0/pymod/GNUmakefile 2005-10-02 18:28:59.000000000 +1000
-@@ -45,9 +45,9 @@
-
- # special care is taken so that python scripts are installed as executables
- install: $(GDALMODULE_SO)
-- $(INSTALL_DIR) $(INST_PYMOD)
-- $(INSTALL_LIB) $(GDALMODULE_SO) $(INST_PYMOD)
-- for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(INST_BIN) ; done
-- for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(INST_PYMOD) ; done
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
-+ $(INSTALL_LIB) $(GDALMODULE_SO) $(DESTDIR)$(INST_PYMOD)
-+ for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
-+ for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; done
- # ugh! spurius relinking leaves a file owned by root into .libs/.
- rm -f .libs/*.soT
---- gdal-1.3.0/GDALmake.opt.in.orig 2005-10-02 21:04:30.000000000 +1000
-+++ gdal-1.3.0/GDALmake.opt.in 2005-10-02 21:04:59.000000000 +1000
-@@ -50,7 +50,7 @@
- exec_prefix = @exec_prefix@
- INST_PREFIX = @exec_prefix@
- INST_INCLUDE = @includedir@
--INST_DATA = @datadir@
-+INST_DATA = @datadir@/gdal
- INST_LIB = @libdir@
- INST_BIN = @bindir@
- INST_PYMOD = @pymoddir@
diff --git a/sci-libs/gdal/gdal-1.2.6-r4.ebuild b/sci-libs/gdal/gdal-1.2.6-r4.ebuild
deleted file mode 100644
index d305d54029d9..000000000000
--- a/sci-libs/gdal/gdal-1.2.6-r4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r4.ebuild,v 1.14 2007/07/13 06:57:51 mr_bones_ Exp $
-
-inherit eutils libtool distutils toolchain-funcs
-
-IUSE="jpeg png geos gif jpeg2k netcdf hdf python postgres mysql sqlite \
- odbc ogdi fits gml doc debug"
-
-DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.remotesensing.org/gdal/index.html"
-SRC_URI="http://dl.maptools.org/dl/gdal/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ppc sparc x86"
-# need to get these arches updated on several libs first
-#KEYWORDS="~alpha ~hppa ~ppc64"
-
-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 )
- python? ( dev-lang/python )
- fits? ( sci-libs/cfitsio )
- ogdi? ( sci-libs/ogdi )
- gml? ( dev-libs/xerces-c )
- || (
- postgres? ( dev-db/postgresql )
- mysql? ( virtual/mysql )
- )
- || (
- netcdf? ( sci-libs/netcdf )
- hdf? ( sci-libs/hdf )
- )
- jpeg2k? ( media-libs/jasper )
- odbc? ( dev-db/unixODBC )
- geos? ( sci-libs/geos )
- sqlite? ( >=dev-db/sqlite-3 )
- doc? ( app-doc/doxygen )"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${P}-installpathfix.patch || die "epatch failed"
- if [ $(gcc-major-version) -eq 4 ] ; then
- epatch ${FILESDIR}/${PN}-gcc4.patch || die "gcc4 patch failed"
- fi
- elibtoolize --patch-only
- if useq netcdf && useq hdf; then
- einfo "Checking is HDF4 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 szip USE flag!"
- einfo "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-gnu-ld"
-
- use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
- $(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)"
-
- # It can't find this
- if useq ogdi ; then
- use_conf="--with-ogdi=/usr/$(get_libdir) ${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 debug ; then
- export CFG=debug
- fi
-
- if useq python ; then
- use_conf="--with-pymoddir=/usr/$(get_libdir)/python${PYVER}/site-packages \
- ${use_conf}"
- else
- use_conf="--with-python=no ${use_conf}"
- fi
-
- # Fix doc path just in case
- sed -i -e "s:@exec_prefix@/doc:${D}usr/share/doc/${PF}/html:g" GDALmake.opt.in
-
- econf ${pkg_conf} ${use_conf} || die "econf failed"
- emake || die "emake failed"
- if useq doc ; then
- emake docs || die "emake docs failed"
- fi
-}
-
-src_install() {
- # einstall causes sandbox violations on /usr/lib/libgdal.so
- make DESTDIR=${D} install || die "make install failed"
- dodoc Doxyfile.man 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
-}
-
-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 newer"
- einfo "gdal and gdal-grass)."
- 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)."
-}
diff --git a/sci-libs/gdal/gdal-1.3.0-r1.ebuild b/sci-libs/gdal/gdal-1.3.0-r1.ebuild
deleted file mode 100644
index 180ca0a6cc40..000000000000
--- a/sci-libs/gdal/gdal-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.0-r1.ebuild,v 1.14 2007/07/13 06:57:51 mr_bones_ Exp $
-
-inherit eutils libtool distutils toolchain-funcs
-
-IUSE="jpeg png geos gif jpeg2k netcdf hdf hdf5 python postgres mysql \
- odbc sqlite ogdi fits gml doc debug"
-
-DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.remotesensing.org/gdal/index.html"
-SRC_URI="http://dl.maptools.org/dl/gdal/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ppc ~sparc x86"
-# need to get these arches updated on several libs first
-#KEYWORDS="~alpha ~hppa ~ppc64"
-
-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 )
- python? ( dev-lang/python )
- fits? ( sci-libs/cfitsio )
- ogdi? ( sci-libs/ogdi )
- gml? ( dev-libs/xerces-c )
- hdf5? ( >=sci-libs/hdf5-1.6.4 )
- || (
- postgres? ( dev-db/postgresql )
- mysql? ( virtual/mysql )
- )
- || (
- netcdf? ( sci-libs/netcdf )
- hdf? ( sci-libs/hdf )
- )
- jpeg2k? ( media-libs/jasper )
- odbc? ( dev-db/unixODBC )
- geos? ( >=sci-libs/geos-2.2.1 )
- sqlite? ( >=dev-db/sqlite-3 )
- doc? ( app-doc/doxygen )"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${P}-installpathfix.patch || die "epatch failed"
- if [ $(gcc-major-version) -eq 4 ] ; then
- epatch ${FILESDIR}/${PN}-gcc4.patch || die "gcc4 patch failed"
- fi
- elibtoolize --patch-only
- if useq netcdf && useq hdf; then
- einfo "Checking is HDF4 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 szip USE flag!"
- einfo "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-gnu-ld"
-
- use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
- $(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 gif ; then
- use_conf="--with-gif=internal ${use_conf}"
- else
- use_conf="--with-gif=no ${use_conf}"
- fi
-
- if useq debug ; then
- export CFG=debug
- fi
-
- if useq python ; then
- use_conf="--with-pymoddir=/usr/$(get_libdir)/python${PYVER}/site-packages \
- ${use_conf}"
- else
- use_conf="--with-python=no ${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"
- emake || die "emake failed"
- if useq doc ; then
- emake docs || die "emake docs failed"
- fi
-}
-
-src_install() {
- # einstall causes sandbox violations on /usr/lib/libgdal.so
- make DESTDIR=${D} install || die "make install failed"
- dodoc Doxyfile.man 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
-}
-
-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 newer"
- einfo "gdal and gdal-grass)."
- 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)."
-}
diff --git a/sci-libs/gdal/gdal-1.3.1.ebuild b/sci-libs/gdal/gdal-1.3.1.ebuild
index e706b47224aa..b9a0c1c4a02f 100644
--- a/sci-libs/gdal/gdal-1.3.1.ebuild
+++ b/sci-libs/gdal/gdal-1.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.3.1.ebuild,v 1.14 2007/01/05 09:08:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild,v 1.15 2008/01/04 04:08:15 nerdboy Exp $
inherit eutils libtool distutils toolchain-funcs
@@ -15,7 +15,7 @@ SLOT="0"
LICENSE="MIT"
KEYWORDS="amd64 ppc ppc64 sparc x86"
# need to get these arches updated on several libs first
-#KEYWORDS="~alpha ~hppa ~ppc64"
+#KEYWORDS="~alpha ~hppa"
DEPEND=">=sys-libs/zlib-1.1.4
>=media-libs/tiff-3.7.0
@@ -26,7 +26,7 @@ DEPEND=">=sys-libs/zlib-1.1.4
python? ( dev-lang/python )
fits? ( sci-libs/cfitsio )
ogdi? ( sci-libs/ogdi )
- gml? ( dev-libs/xerces-c )
+ gml? ( <dev-libs/xerces-c-2.8.0 )
hdf5? ( >=sci-libs/hdf5-1.6.4 )
postgres? ( dev-db/postgresql )
|| (
@@ -41,10 +41,10 @@ DEPEND=">=sys-libs/zlib-1.1.4
src_unpack() {
unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${P}-installpathfix.patch || die "installpath patch failed"
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-installpathfix.patch" || die "installpath patch failed"
if [ $(gcc-major-version) -eq 4 ] ; then
- epatch ${FILESDIR}/${PN}-gcc4.patch || die "gcc4 patch failed"
+ epatch "${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
fi
elibtoolize --patch-only
if useq netcdf && useq hdf; then
@@ -111,7 +111,7 @@ src_compile() {
src_install() {
# einstall causes sandbox violations on /usr/lib/libgdal.so
- make DESTDIR=${D} install || die "make install failed"
+ make DESTDIR="${D}" install || die "make install failed"
dodoc Doxyfile.man Doxyfile HOWTO-RELEASE NEWS
if useq doc ; then
dohtml html/* || die "install html failed"
diff --git a/sci-libs/gdal/gdal-1.3.2.ebuild b/sci-libs/gdal/gdal-1.3.2.ebuild
index f6db21d1aac7..b3de325bed84 100644
--- a/sci-libs/gdal/gdal-1.3.2.ebuild
+++ b/sci-libs/gdal/gdal-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.3.2.ebuild,v 1.4 2007/01/05 09:08:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild,v 1.5 2008/01/04 04:08:15 nerdboy Exp $
inherit eutils libtool distutils toolchain-funcs
@@ -28,7 +28,7 @@ DEPEND=">=sys-libs/zlib-1.1.4
>=dev-lang/swig-1.3.28 )
fits? ( sci-libs/cfitsio )
ogdi? ( sci-libs/ogdi )
- gml? ( dev-libs/xerces-c )
+ gml? ( <dev-libs/xerces-c-2.8.0 )
hdf5? ( >=sci-libs/hdf5-1.6.4 )
postgres? ( dev-db/postgresql )
|| (
@@ -43,11 +43,11 @@ DEPEND=">=sys-libs/zlib-1.1.4
src_unpack() {
unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${P}-destdir.patch || die "epatch failed"
- epatch ${FILESDIR}/${P}-ruby-install.patch || die "epatch failed"
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-destdir.patch" || die "epatch failed"
+ epatch "${FILESDIR}/${P}-ruby-install.patch" || die "epatch failed"
if [ $(gcc-major-version) -eq 4 ]; then
- epatch ${FILESDIR}/${P}-gcc4-stl.patch || die "epatch failed"
+ epatch "${FILESDIR}/${P}-gcc4-stl.patch" || die "epatch failed"
fi
elibtoolize --patch-only
if useq netcdf && useq hdf; then
@@ -109,9 +109,9 @@ src_compile() {
# also failing with gcc4 in libcsf
make || die "make failed"
if useq ruby ; then
- cd ${S}/swig
+ cd "${S}"/swig
make build || die "make ruby failed"
- cd ${S}
+ cd "${S}"
fi
if useq doc ; then
make docs || die "make docs failed"
@@ -120,7 +120,7 @@ src_compile() {
src_install() {
# einstall causes sandbox violations on /usr/lib/libgdal.so
- make DESTDIR=${D} install || die "make install failed"
+ make DESTDIR="${D}" install || die "make install failed"
dodoc Doxyfile.man Doxyfile HOWTO-RELEASE NEWS
if useq doc ; then
dohtml html/* || die "install html failed"
diff --git a/sci-libs/gdal/gdal-1.4.2.ebuild b/sci-libs/gdal/gdal-1.4.2.ebuild
index 2823886a107a..fd93ad3ebc4e 100644
--- a/sci-libs/gdal/gdal-1.4.2.ebuild
+++ b/sci-libs/gdal/gdal-1.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.4.2.ebuild,v 1.1 2007/07/03 20:12:55 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.4.2.ebuild,v 1.2 2008/01/04 04:08:15 nerdboy Exp $
inherit eutils libtool distutils toolchain-funcs
@@ -28,7 +28,7 @@ DEPEND=">=sys-libs/zlib-1.1.4
>=dev-lang/swig-1.3.28 )
fits? ( sci-libs/cfitsio )
ogdi? ( sci-libs/ogdi )
- gml? ( dev-libs/xerces-c )
+ gml? ( <dev-libs/xerces-c-2.8.0 )
hdf5? ( >=sci-libs/hdf5-1.6.4 )
postgres? ( dev-db/postgresql )
|| (
@@ -43,10 +43,10 @@ DEPEND=">=sys-libs/zlib-1.1.4
src_unpack() {
unpack ${A}
- cd ${S}
+ cd "${S}"
- epatch ${FILESDIR}/${P}-datadir.patch || die "epatch failed"
- epatch ${FILESDIR}/${P}-ruby-install.patch || die "epatch failed"
+ epatch "${FILESDIR}/${P}-datadir.patch" || die "epatch failed"
+ epatch "${FILESDIR}/${P}-ruby-install.patch" || die "epatch failed"
elibtoolize --patch-only
@@ -108,9 +108,9 @@ src_compile() {
# also failing with gcc4 in libcsf
make || die "make failed"
if useq ruby ; then
- cd ${S}/swig
+ cd "${S}"/swig
make build || die "make ruby failed"
- cd ${S}
+ cd "${S}"
fi
if useq doc ; then
make docs || die "make docs failed"
@@ -119,7 +119,7 @@ src_compile() {
src_install() {
# einstall causes sandbox violations on /usr/lib/libgdal.so
- make DESTDIR=${D} install || die "make install failed"
+ make DESTDIR="${D}" install || die "make install failed"
dodoc Doxyfile.man Doxyfile HOWTO-RELEASE NEWS
if useq doc ; then
dohtml html/* || die "install html failed"