summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2009-06-17 06:19:57 +0000
committerSteve Arnold <nerdboy@gentoo.org>2009-06-17 06:19:57 +0000
commit3abbd087683db80b7d70271ff951f437f0699c77 (patch)
treed015567eadbc4aca1772f7d5b695b63c6a7b6f8e /sci-libs/gdal/files
parentremove tl-langmanju mask, its gone (diff)
downloadhistorical-3abbd087683db80b7d70271ff951f437f0699c77.tar.gz
historical-3abbd087683db80b7d70271ff951f437f0699c77.tar.bz2
historical-3abbd087683db80b7d70271ff951f437f0699c77.zip
Removed uneeded/stale patches.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/gdal/files')
-rw-r--r--sci-libs/gdal/files/gdal-1.3.1-installpathfix.patch203
-rw-r--r--sci-libs/gdal/files/gdal-1.3.2-destdir.patch201
-rw-r--r--sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch26
-rw-r--r--sci-libs/gdal/files/gdal-1.3.2-ruby-install.patch20
-rw-r--r--sci-libs/gdal/files/gdal-1.4.2-ruby-install.patch24
-rw-r--r--sci-libs/gdal/files/gdal-1.5.0-python-install.patch14
-rw-r--r--sci-libs/gdal/files/gdal-1.5.1-max-min.patch114
-rw-r--r--sci-libs/gdal/files/gdal-gcc4.patch19
8 files changed, 0 insertions, 621 deletions
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.