Removed uneeded/stale patches.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

10 files changed, 10 insertions, 631 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 2abce285d157..1a54869c2785 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.59 2009/06/17 04:45:59 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.60 2009/06/17 06:19:56 nerdboy Exp $
+
+  17 Jun 2009; Steve Arnold <nerdboy@gentoo.org>
+  -files/gdal-1.3.1-installpathfix.patch, -files/gdal-1.3.2-destdir.patch,
+  -files/gdal-1.3.2-gcc4-stl.patch, -files/gdal-1.3.2-ruby-install.patch,
+  -files/gdal-1.4.2-ruby-install.patch,
+  -files/gdal-1.5.0-python-install.patch, -files/gdal-1.5.1-max-min.patch,
+  -files/gdal-gcc4.patch:
+  Removed uneeded/stale patches.  Need I say more?
 
   17 Jun 2009; Steve Arnold <nerdboy@gentoo.org> -gdal-1.3.1.ebuild,
   -gdal-1.3.2.ebuild, -gdal-1.4.2.ebuild, -gdal-1.5.0-r1.ebuild,
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index b448e583cd44..02d03370efd1 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,23 +1,15 @@
-AUX gdal-1.3.1-installpathfix.patch 6805 RMD160 6cc35c1f741fdb19249666fa2f94052e8fe4a30e SHA1 ebd9b397bd1230a4b5110367f29f6040a86284f3 SHA256 0f9d7e1da2617df781429c2191f6e2429d2e8c73d01c6c115d36f3a295d69280
-AUX gdal-1.3.2-destdir.patch 6789 RMD160 f74a404c3d9874542b9074477af7d21fe7e0774a SHA1 09296a78067d6b3a12bc7ee47a1969e82efa2a26 SHA256 6818460591e7077878f4658ca73a4582325f19f9e5580d73411b13f4dd548e81
-AUX gdal-1.3.2-gcc4-stl.patch 859 RMD160 ae90783dc2230822e11ca56508d3939c827e1f6e SHA1 d37dee4c4d5aa778def1ff1976c47b99062148e3 SHA256 d27de594a54873c2524cea35da5f0418e4bb7c2b8f4c6d079f787bd8e26f5962
-AUX gdal-1.3.2-ruby-install.patch 766 RMD160 bd81796a97d162e238750e0184437ff54cbb38af SHA1 9e440863d68890d585b588fd5f5952fd8aa51d13 SHA256 9a42203279e512e629094ff9aea66c8d613acda3e1656fcf24f6e659c02e1061
 AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e
-AUX gdal-1.4.2-ruby-install.patch 934 RMD160 c63a79e091fee943526ec94182d75ca798ba1f5e SHA1 c61b02caf80495beb4af55113b5847fc8796d1d7 SHA256 cbf7b66b48406ad10c1c4b2d39216ad4e16944c033f7cac9dea85a9929b71352
 AUX gdal-1.5.0-makefile.patch 894 RMD160 955b2ac69f6d8477cc26ae1321ddc0d92e88fb90 SHA1 02ee0ac5351c2c83a848f7f9db646dcc19937123 SHA256 cd40c5f77c9f5d2a78a880a83d09656eacfe3437e8be7bfb13559a5e3fd9ee58
-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
-AUX gdal-1.5.1-max-min.patch 4292 RMD160 299c1ff45e3586986d5177ced76c29f9c3f94b3a SHA1 b355c50408351af34ce51f3232bb3e577d7ce513 SHA256 b3238774b3bde6b7cfa289084313eea5b82e71f3ea08c68f9c70ed7af465a3df
 AUX gdal-1.5.1-python-install.patch 493 RMD160 f925c5b902a14f4a75a8c6a7816c3e500a59c24e SHA1 7c02ab132485d1486751d45663af21aa9a04ace1 SHA256 122555483fcb811df1f305b20c9c492c64575321b4e834c75a2805ca8e62f593
 AUX gdal-1.5.2-xerces-64-bit.patch 2002 RMD160 3e8386a5d4127881a299344c36f18e9848cafea7 SHA1 62b30b6a4e55dd46f1e985d445b6ace58d698f4f SHA256 419c2c4713ae72a617cbdb5433a69a7217bc99743e34e94430bbca8119b5c1cf
 AUX gdal-1.6.0-ruby-make.patch 1071 RMD160 ec020c5c22a397e248363232197358ea0e9eb6de SHA1 d7b5a568da01dd83f46fee897f8622db3b6b6db2 SHA256 4a027ce95da9ab870676e097239b83d40e87b199852590854bbe349b18c7ac4e
 AUX gdal-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301ba SHA1 9b3214e7ffe6aa821d716caf3e984841f6e208fd SHA256 83f4de0287893efbc4528a0e4ecc97e0f174d5a44406a8ab5e94e66e51286db1
-AUX gdal-gcc4.patch 472 RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 SHA1 9cbba5ebf35e2ca90386e4ddcd53c47a748f4597 SHA256 25f4b1a67063373536407d23eb98bc98752b5341c1a4556e18906e2077d1d5ae
 DIST gdal-1.5.2.tar.gz 6180070 RMD160 37601decec7cc23ee6ea77c9c0e7c12ef3154213 SHA1 bf759b28d2218919212484c2b593edbc1c09aabb SHA256 243dabf3c45530cac8be092f9a1d838a46b46a92d4138870423006ffd6ae4001
 DIST gdal-1.5.3.tar.gz 6194379 RMD160 3178dc1cc76e79071c77ad1cca0c8e23bcb91ef3 SHA1 b8b48f44f8da6e7d5028fe7f57c79e218625b986 SHA256 8f68386582d178842bf990e2e94473ec72c3fd69de2ca757542888f1c95bbf4d
 DIST gdal-1.6.0.tar.gz 7072689 RMD160 85bf968b5ec6c2af5a02597bc4c8375d8f775fec SHA1 cae5a891231ee5794350d1626a688d802a429423 SHA256 acdc2faf7496f8d8f4680347ce30fd3a2139b5c050f13dcd6ca8a3d7f6e418a4
 EBUILD gdal-1.5.2.ebuild 6420 RMD160 0619a3660937eda53d501235d3b95de7f492e13f SHA1 3d0a948f9959ad3b0e232476fe77345db6d727b8 SHA256 c09aabaa7019c25adf18763d16bfde2d5b4e801dc2a4747cc22155e1f5767fce
 EBUILD gdal-1.5.3.ebuild 6510 RMD160 f3ed966b180a4dc169c00c3fbfa0d2095759b78e SHA1 b810791d98d84867812cd6700558b00cf32ce03d SHA256 995c6f2b68fd78234580d7612f720ad6d3dc398dec707c65236c17cfcd1b322f
 EBUILD gdal-1.6.0-r1.ebuild 6544 RMD160 5a1341a5c0458249dbd5f7ff5412776c7dfc6c00 SHA1 c21106d24615110821f9818e1aff86413a3f5aec SHA256 74af1e59daa5d0bd966df71adbff0fe7125f43401401c690d69fa0422ccf5556
-MISC ChangeLog 11906 RMD160 d3cdff6dc8ef7033e8d96758fbc42272f96629af SHA1 6753f48e68fd86e70a9bdbee9a4a69238035bc02 SHA256 192c55747e0ec1a59d64d818fcb8b2f7ee78f442436b8867d280d8e8bcc3d6ac
+MISC ChangeLog 12297 RMD160 a300bcd28059b55b66a9943df2e519ea4717a551 SHA1 963ff3a5121f75332ca095d73a413deb6a0a5c5e SHA256 11da051d92dacc0e05e6ede37665d1f33b7c2a2f0e43c3c6a885497a767d880a
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
diff --git a/sci-libs/gdal/files/gdal-1.3.1-installpathfix.patch b/sci-libs/gdal/files/gdal-1.3.1-installpathfix.patch
deleted file mode 100644
index 83c98623c6b4..000000000000
--- a/sci-libs/gdal/files/gdal-1.3.1-installpathfix.patch
+++ /dev/null
@@ -1,203 +0,0 @@
---- GDALmake.opt.in.orig	2005-09-29 21:52:58.000000000 -0700
-+++ GDALmake.opt.in	2005-10-24 20:49:49.000000000 -0700
-@@ -53,10 +53,10 @@
- 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@
-+INST_PYMOD      =	@pymoddir@
- INST_DOCS	=	@exec_prefix@/doc
- INST_MAN	=	@mandir@
- 
---- GNUmakefile.orig	2005-09-16 08:47:29.000000000 -0700
-+++ GNUmakefile	2005-10-24 20:38:33.000000000 -0700
-@@ -132,7 +132,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
-@@ -141,9 +141,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)
-@@ -155,14 +155,14 @@
- 	(cd pymod; $(MAKE) install)
- endif
- 	(cd swig; $(MAKE) install)
--	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
- 
-@@ -172,11 +172,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) ; \
-@@ -185,8 +185,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 
- 
---- alg/GNUmakefile.orig	2004-12-26 13:26:15.000000000 -0800
-+++ alg/GNUmakefile	2005-10-24 20:39:25.000000000 -0700
-@@ -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)
---- apps/GNUmakefile.orig	2005-05-12 00:10:00.000000000 -0700
-+++ apps/GNUmakefile	2005-10-24 20:40:28.000000000 -0700
-@@ -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
- 
---- frmts/mem/GNUmakefile.orig	2005-01-24 10:09:57.000000000 -0800
-+++ frmts/mem/GNUmakefile	2005-10-24 20:41:33.000000000 -0700
-@@ -15,4 +15,4 @@
- install-obj:	$(O_OBJ)
- 
- install:
--	$(INSTALL_DATA) memdataset.h $(INST_INCLUDE)
-+	$(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)
---- frmts/raw/GNUmakefile.orig	2005-01-24 10:09:57.000000000 -0800
-+++ frmts/raw/GNUmakefile	2005-10-24 20:42:10.000000000 -0700
-@@ -21,4 +21,4 @@
- $(OBJ) $(O_OBJ):	rawdataset.h
- 
- install:
--	$(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
-+	$(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
---- frmts/vrt/GNUmakefile.orig	2005-01-24 10:09:57.000000000 -0800
-+++ frmts/vrt/GNUmakefile	2005-10-24 20:42:48.000000000 -0700
-@@ -19,4 +19,4 @@
- $(OBJ) $(O_OBJ):	vrtdataset.h
- 
- install:
--	$(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)
-+	$(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)
---- gcore/GNUmakefile.orig	2005-09-24 12:03:11.000000000 -0700
-+++ gcore/GNUmakefile	2005-10-24 20:43:25.000000000 -0700
-@@ -33,4 +33,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
---- man/GNUmakefile.orig	2004-02-20 09:26:13.000000000 -0800
-+++ man/GNUmakefile	2005-10-24 20:44:21.000000000 -0700
-@@ -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
---- ogr/GNUmakefile.orig	2005-03-11 06:28:05.000000000 -0800
-+++ ogr/GNUmakefile	2005-10-24 20:46:02.000000000 -0700
-@@ -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
---- port/GNUmakefile.orig	2005-09-11 11:01:48.000000000 -0700
-+++ port/GNUmakefile	2005-10-24 20:46:38.000000000 -0700
-@@ -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
---- pymod/GNUmakefile.orig	2005-01-31 14:07:02.000000000 -0800
-+++ pymod/GNUmakefile	2005-10-24 20:47:51.000000000 -0700
-@@ -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
diff --git a/sci-libs/gdal/files/gdal-1.3.2-destdir.patch b/sci-libs/gdal/files/gdal-1.3.2-destdir.patch
deleted file mode 100644
index ba0581b009bf..000000000000
--- a/sci-libs/gdal/files/gdal-1.3.2-destdir.patch
+++ /dev/null
@@ -1,201 +0,0 @@
---- GDALmake.opt.in.orig	2006-05-21 14:59:21.000000000 -0700
-+++ GDALmake.opt.in	2006-05-21 15:13:22.000000000 -0700
-@@ -54,7 +54,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@
---- GNUmakefile.orig	2006-03-24 08:51:56.000000000 -0800
-+++ GNUmakefile	2006-05-21 15:18:42.000000000 -0700
-@@ -141,7 +141,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
-@@ -150,9 +150,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)
-@@ -166,14 +166,14 @@
- ifneq ($(BINDINGS),)
- 	(cd swig; $(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
- 
-@@ -183,11 +183,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) ; \
-@@ -196,8 +196,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 
- 
---- alg/GNUmakefile.orig	2006-03-24 08:51:56.000000000 -0800
-+++ alg/GNUmakefile	2006-05-21 15:19:29.000000000 -0700
-@@ -22,7 +22,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)
---- apps/GNUmakefile.orig	2006-03-24 08:51:56.000000000 -0800
-+++ apps/GNUmakefile	2006-05-21 15:20:41.000000000 -0700
-@@ -95,6 +95,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
- 
---- frmts/mem/GNUmakefile.orig	2006-03-24 08:51:57.000000000 -0800
-+++ frmts/mem/GNUmakefile	2006-05-21 15:21:37.000000000 -0700
-@@ -14,4 +14,4 @@
- install-obj:	$(O_OBJ)
- 
- install:
--	$(INSTALL_DATA) memdataset.h $(INST_INCLUDE)
-+	$(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)
---- frmts/raw/GNUmakefile.orig	2006-04-03 21:54:51.000000000 -0700
-+++ frmts/raw/GNUmakefile	2006-05-21 15:22:18.000000000 -0700
-@@ -20,4 +20,4 @@
- $(OBJ) $(O_OBJ):	rawdataset.h
- 
- install:
--	$(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
-+	$(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
---- frmts/vrt/GNUmakefile.orig	2006-03-24 08:51:57.000000000 -0800
-+++ frmts/vrt/GNUmakefile	2006-05-21 15:23:25.000000000 -0700
-@@ -18,4 +18,4 @@
- $(OBJ) $(O_OBJ):	vrtdataset.h
- 
- install:
--	$(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)
-+	$(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)
---- gcore/GNUmakefile.orig	2006-04-06 23:59:13.000000000 -0700
-+++ gcore/GNUmakefile	2006-05-21 15:24:12.000000000 -0700
-@@ -34,4 +34,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
---- man/GNUmakefile.orig	2006-03-24 08:51:57.000000000 -0800
-+++ man/GNUmakefile	2006-05-21 15:25:07.000000000 -0700
-@@ -4,5 +4,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
---- ogr/GNUmakefile.orig	2006-03-24 08:51:57.000000000 -0800
-+++ ogr/GNUmakefile	2006-05-21 15:27:34.000000000 -0700
-@@ -81,8 +81,8 @@
- 	cp ogr_feature_style.html html
- 
- install-docs:
--	$(INSTALL_DIR) $(INST_DOCS)/ogr
--	cp html/* $(INST_DOCS)/ogr
-+	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
-+	cp html/* $(DESTDIR)$(INST_DOCS)/ogr
- 	cp ../doc/ogr/*.gif $(INST_DOCS)/ogr
- 
- gdalso:	$(GDAL_SLIB)
-@@ -123,14 +123,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
---- port/GNUmakefile.orig	2006-03-24 08:51:58.000000000 -0800
-+++ port/GNUmakefile	2006-05-21 15:28:18.000000000 -0700
-@@ -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
---- pymod/GNUmakefile.orig	2006-03-24 08:51:58.000000000 -0800
-+++ pymod/GNUmakefile	2006-05-21 15:30:05.000000000 -0700
-@@ -44,9 +44,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
diff --git a/sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch b/sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch
deleted file mode 100644
index 5218430b9d2e..000000000000
--- a/sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ogr/ogrsf_frmts/ili/ogrili2layer.cpp	2006-06-08 10:40:06.804746888 +0200
-+++ ogr/ogrsf_frmts/ili/ogrili2layer.cpp	2006-06-08 10:35:53.648232528 +0200
-@@ -73,7 +76,6 @@
-     poFeatureDefn->SetGeomType( eReqType );
- 
-     bWriter = bWriterIn;
--    listFeatureIt = 0;
- }
- 
- /************************************************************************/
-@@ -116,6 +118,7 @@
- 
- OGRErr OGRILI2Layer::SetFeature (OGRFeature *poFeature) {
-     listFeature.push_back(poFeature);
-+    if (listFeature.size() == 1) ResetReading();
-     return OGRERR_NONE;
- }
- 
-@@ -132,7 +135,6 @@
- /************************************************************************/
- 
- OGRFeature *OGRILI2Layer::GetNextFeature() {
--    if (listFeatureIt == 0) listFeatureIt = listFeature.begin();
-     if (listFeatureIt != listFeature.end())
-         return *(listFeatureIt++);
-     return NULL;
diff --git a/sci-libs/gdal/files/gdal-1.3.2-ruby-install.patch b/sci-libs/gdal/files/gdal-1.3.2-ruby-install.patch
deleted file mode 100644
index dca8890483a2..000000000000
--- a/sci-libs/gdal/files/gdal-1.3.2-ruby-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- swig/ruby/RubyMakefile.mk.orig	2006-01-13 17:48:46.000000000 -0800
-+++ swig/ruby/RubyMakefile.mk	2006-05-21 18:08:38.000000000 -0700
-@@ -22,7 +22,7 @@
- RUBY_LIB_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['libdir']")
- RUBY_SO_NAME := $(shell ruby -rrbconfig -e "puts Config::CONFIG['RUBY_SO_NAME']")
- RUBY_EXTENSIONS_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
--INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
-+INSTALL_DIR := $(DESTDIR)$(RUBY_EXTENSIONS_DIR)/gdal
- 
- RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
- LDFLAGS += -shared -L$(RUBY_LIB_DIR)
-@@ -39,7 +39,7 @@
- 	rm -frd $(INSTALL_DIR)
- 
- $(INSTALL_DIR):
--	mkdir -v $(INSTALL_DIR)
-+	mkdir -p $(INSTALL_DIR)
- 
- install: $(INSTALL_DIR)
- 	$(INSTALL) $(RUBY_MODULES) $(INSTALL_DIR) 
diff --git a/sci-libs/gdal/files/gdal-1.4.2-ruby-install.patch b/sci-libs/gdal/files/gdal-1.4.2-ruby-install.patch
deleted file mode 100644
index 3aea3e26ea48..000000000000
--- a/sci-libs/gdal/files/gdal-1.4.2-ruby-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- swig/ruby/RubyMakefile.mk.orig	2007-07-01 18:15:18.000000000 -0700
-+++ swig/ruby/RubyMakefile.mk	2007-07-01 18:18:47.000000000 -0700
-@@ -22,7 +22,7 @@
- RUBY_LIB_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['libdir']")
- RUBY_SO_NAME := $(shell ruby -rrbconfig -e "puts Config::CONFIG['RUBY_SO_NAME']")
- RUBY_EXTENSIONS_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
--INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
-+INSTALL_DIR := $(DESTDIR)$(RUBY_EXTENSIONS_DIR)/gdal
- 
- RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
- LDFLAGS += -shared -L$(RUBY_LIB_DIR)
-@@ -39,10 +39,10 @@
- 	rm -frd $(INSTALL_DIR)
- 
- $(INSTALL_DIR):
--	mkdir -p $(DESTDIR)$(INSTALL_DIR)
-+	mkdir -p $(INSTALL_DIR)
- 
- install: $(INSTALL_DIR)
--	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
-+	$(INSTALL) $(RUBY_MODULES) $(INSTALL_DIR) 
- 
- $(RUBY_MODULES): %.so: %_wrap.o
- 	$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
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
deleted file mode 100644
index f5b44daa6b38..000000000000
--- a/sci-libs/gdal/files/gdal-1.5.0-python-install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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=$(prefix)
- endif
- 
- 	for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
diff --git a/sci-libs/gdal/files/gdal-1.5.1-max-min.patch b/sci-libs/gdal/files/gdal-1.5.1-max-min.patch
deleted file mode 100644
index e2775b301802..000000000000
--- a/sci-libs/gdal/files/gdal-1.5.1-max-min.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## max.dpatch by Francesco Paolo Lovergine <frankie@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/arraylist.c gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/arraylist.c
---- gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/arraylist.c	2007-11-07 05:00:48.000000000 +0100
-+++ gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/arraylist.c	2008-04-07 13:26:42.000000000 +0200
-@@ -23,6 +23,8 @@
- #include "bits.h"
- #include "arraylist.h"
- 
-+#include <cpl_port.h> /* MIN and MAX macros */ 
-+
- struct array_list*
- array_list_new(array_list_free_fn *free_fn)
- {
-@@ -62,7 +64,7 @@
-   int new_size;
- 
-   if(max < this->size) return 0;
--  new_size = max(this->size << 1, max);
-+  new_size = MAX(this->size << 1, max);
-   if(!(t = realloc(this->array, new_size*sizeof(void*)))) return -1;
-   this->array = t;
-   (void)memset(this->array + this->size, 0, (new_size-this->size)*sizeof(void*));
-diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/bits.h gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/bits.h
---- gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/bits.h	2007-11-07 05:00:48.000000000 +0100
-+++ gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/bits.h	2008-04-07 13:25:45.000000000 +0200
-@@ -12,14 +12,6 @@
- #ifndef _bits_h_
- #define _bits_h_
- 
--#ifndef min
--#define min(a,b) ((a) < (b) ? (a) : (b))
--#endif
--
--#ifndef max
--#define max(a,b) ((a) > (b) ? (a) : (b))
--#endif
--
- #define hexdigit(x) (((x) <= '9') ? (x) - '0' : ((x) & 7) + 9)
- #define error_ptr(error) ((void*)error)
- #define is_error(ptr) ((unsigned long)ptr > (unsigned long)-4000L)
-diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/json_tokener.c gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/json_tokener.c
---- gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/json_tokener.c	2007-11-07 12:51:17.000000000 +0100
-+++ gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/json_tokener.c	2008-04-07 13:30:21.000000000 +0200
-@@ -23,6 +23,7 @@
- #include "json_object.h"
- #include "json_tokener.h"
- 
-+#include <cpl_port.h> /* MIN and MAX macros */ 
- 
- #if !HAVE_STRNCASECMP && defined(_MSC_VER)
-   /* MSC has the version as _strnicmp */
-@@ -106,7 +107,7 @@
- {
-   if(str) {
-     size_t len = strlen(str);
--    size_t nn = min(len,n);
-+    size_t nn = MIN(len,n);
-     char* s = (char*)malloc(sizeof(char) * (nn + 1));
- 
-     if(s) {
-@@ -230,7 +231,7 @@
-     case json_tokener_state_null:
-       printbuf_memappend(tok->pb, &c, 1);
-       if(strncasecmp(json_null_str, tok->pb->buf,
--		     min(tok->st_pos+1, strlen(json_null_str))) == 0) {
-+		     MIN(tok->st_pos+1, strlen(json_null_str))) == 0) {
- 	if(tok->st_pos == strlen(json_null_str)) {
- 	  current = NULL;
- 	  saved_state = json_tokener_state_finish;
-@@ -351,7 +352,7 @@
-     case json_tokener_state_boolean:
-       printbuf_memappend(tok->pb, &c, 1);
-       if(strncasecmp(json_true_str, tok->pb->buf,
--		     min(tok->st_pos+1, strlen(json_true_str))) == 0) {
-+		     MIN(tok->st_pos+1, strlen(json_true_str))) == 0) {
- 	if(tok->st_pos == strlen(json_true_str)) {
- 	  current = json_object_new_boolean(1);
- 	  saved_state = json_tokener_state_finish;
-@@ -359,7 +360,7 @@
- 	  goto redo_char;
- 	}
-       } else if(strncasecmp(json_false_str, tok->pb->buf,
--			    min(tok->st_pos+1, strlen(json_false_str))) == 0) {
-+			    MIN(tok->st_pos+1, strlen(json_false_str))) == 0) {
- 	if(tok->st_pos == strlen(json_false_str)) {
- 	  current = json_object_new_boolean(0);
- 	  saved_state = json_tokener_state_finish;
-diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/printbuf.c gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/printbuf.c
---- gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/printbuf.c	2007-12-02 19:32:25.000000000 +0100
-+++ gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/printbuf.c	2008-04-07 13:27:06.000000000 +0200
-@@ -28,6 +28,8 @@
- 
- #include "cpl_string.h"
- 
-+#include <cpl_port.h> /* MIN and MAX macros */ 
-+
- struct printbuf* printbuf_new()
- {
-   struct printbuf *p;
-@@ -47,7 +49,7 @@
- {
-   char *t;
-   if(p->size - p->bpos <= size) {
--    int new_size = max(p->size * 2, p->bpos + size + 8);
-+    int new_size = MAX(p->size * 2, p->bpos + size + 8);
- #ifdef PRINTBUF_DEBUG
-     mc_debug("printbuf_memappend: realloc "
- 	     "bpos=%d wrsize=%d old_size=%d new_size=%d\n",
diff --git a/sci-libs/gdal/files/gdal-gcc4.patch b/sci-libs/gdal/files/gdal-gcc4.patch
deleted file mode 100644
index d6718d7f310a..000000000000
--- a/sci-libs/gdal/files/gdal-gcc4.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** gdal-1.3.1/frmts/fit/fitdataset.cpp.old	   Thu Nov 24 12:14:08 2005
---- gdal-1.3.1/frmts/fit/fitdataset.cpp	      Thu Nov 24 12:14:19 2005
-***************
-*** 174,180 ****
-  
-  public:
-  
-!     FITRasterBand::FITRasterBand( FITDataset *, int );
-  	~FITRasterBand();
-      
-      // should override RasterIO eventually.
---- 174,180 ----
-  
-  public:
-  
-!     FITRasterBand( FITDataset *, int );
-  	~FITRasterBand();
-      
-      // should override RasterIO eventually.