diff options
author | Steve Arnold <nerdboy@gentoo.org> | 2006-05-23 02:09:11 +0000 |
---|---|---|
committer | Steve Arnold <nerdboy@gentoo.org> | 2006-05-23 02:09:11 +0000 |
commit | ba8d7fb1fd3e0dd769deabbb397ae0f9b8e40fd3 (patch) | |
tree | 5b16c931fa4f9f03b35bd5c3df6272472dad9175 /sci-libs | |
parent | Change to poppler for building docs, pdftohtml is deprecated in Gentoo. (diff) | |
download | historical-ba8d7fb1fd3e0dd769deabbb397ae0f9b8e40fd3.tar.gz historical-ba8d7fb1fd3e0dd769deabbb397ae0f9b8e40fd3.tar.bz2 historical-ba8d7fb1fd3e0dd769deabbb397ae0f9b8e40fd3.zip |
dropped patches on the floor somehow
Package-Manager: portage-2.1_rc1-r3
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/gdal/ChangeLog | 6 | ||||
-rw-r--r-- | sci-libs/gdal/Manifest | 16 | ||||
-rw-r--r-- | sci-libs/gdal/files/gdal-1.3.2-destdir.patch | 201 | ||||
-rw-r--r-- | sci-libs/gdal/files/gdal-1.3.2-ruby-install.patch | 20 |
4 files changed, 238 insertions, 5 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog index cfb2741a3fd9..b3b41ae7bbe2 100644 --- a/sci-libs/gdal/ChangeLog +++ b/sci-libs/gdal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/gdal # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.23 2006/05/22 06:52:51 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.24 2006/05/23 02:09:11 nerdboy Exp $ + + 23 May 2006; Steve Arnold <nerdboy@gentoo.org> + +files/gdal-1.3.2-destdir.patch, +files/gdal-1.3.2-ruby-install.patch: + Sorry, dropped patches on the floor somehow... *gdal-1.3.2 (22 May 2006) diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index 3dc7005f3aa5..d277d7aaecc8 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -10,6 +10,14 @@ AUX gdal-1.3.1-installpathfix.patch 6805 RMD160 6cc35c1f741fdb19249666fa2f94052e MD5 f93770205b88c698e73487038b46a707 files/gdal-1.3.1-installpathfix.patch 6805 RMD160 6cc35c1f741fdb19249666fa2f94052e8fe4a30e files/gdal-1.3.1-installpathfix.patch 6805 SHA256 0f9d7e1da2617df781429c2191f6e2429d2e8c73d01c6c115d36f3a295d69280 files/gdal-1.3.1-installpathfix.patch 6805 +AUX gdal-1.3.2-destdir.patch 6789 RMD160 f74a404c3d9874542b9074477af7d21fe7e0774a SHA1 09296a78067d6b3a12bc7ee47a1969e82efa2a26 SHA256 6818460591e7077878f4658ca73a4582325f19f9e5580d73411b13f4dd548e81 size 6789 +MD5 6f8eda6fa6406ee1ca216384b2810b95 files/gdal-1.3.2-destdir.patch 6789 +RMD160 f74a404c3d9874542b9074477af7d21fe7e0774a files/gdal-1.3.2-destdir.patch 6789 +SHA256 6818460591e7077878f4658ca73a4582325f19f9e5580d73411b13f4dd548e81 files/gdal-1.3.2-destdir.patch 6789 +AUX gdal-1.3.2-ruby-install.patch 766 RMD160 bd81796a97d162e238750e0184437ff54cbb38af SHA1 9e440863d68890d585b588fd5f5952fd8aa51d13 SHA256 9a42203279e512e629094ff9aea66c8d613acda3e1656fcf24f6e659c02e1061 size 766 +MD5 f2b9cec943d95fcf9b3c487af6d96771 files/gdal-1.3.2-ruby-install.patch 766 +RMD160 bd81796a97d162e238750e0184437ff54cbb38af files/gdal-1.3.2-ruby-install.patch 766 +SHA256 9a42203279e512e629094ff9aea66c8d613acda3e1656fcf24f6e659c02e1061 files/gdal-1.3.2-ruby-install.patch 766 AUX gdal-gcc4.patch 472 RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 SHA1 9cbba5ebf35e2ca90386e4ddcd53c47a748f4597 SHA256 25f4b1a67063373536407d23eb98bc98752b5341c1a4556e18906e2077d1d5ae size 472 MD5 2f3f328abbefa4056b6ee71dfbfce529 files/gdal-gcc4.patch 472 RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 files/gdal-gcc4.patch 472 @@ -34,10 +42,10 @@ EBUILD gdal-1.3.2.ebuild 4759 RMD160 909631ad222798dd465aa7d1a533e60c1701d3f9 SH MD5 cc55bc12f0f2544f9a5c1b77f2ffcb2d gdal-1.3.2.ebuild 4759 RMD160 909631ad222798dd465aa7d1a533e60c1701d3f9 gdal-1.3.2.ebuild 4759 SHA256 beed1e3a92a11f0034d54c7d612a47ad66efbb33421ccca9e380453c38765a19 gdal-1.3.2.ebuild 4759 -MISC ChangeLog 4799 RMD160 788d785b0591b09695b588e0b5ff674f6580f8dc SHA1 bba15e0ddcd7fecce101f091cf320e6d9adeac93 SHA256 503507e1ced0e38dd526dfc6985338796fbcc0181d951684cd17aba96f5080d8 size 4799 -MD5 e253f5cf17a7798d02b23b5c5ff1cedc ChangeLog 4799 -RMD160 788d785b0591b09695b588e0b5ff674f6580f8dc ChangeLog 4799 -SHA256 503507e1ced0e38dd526dfc6985338796fbcc0181d951684cd17aba96f5080d8 ChangeLog 4799 +MISC ChangeLog 4971 RMD160 8ea0d5184b127f0e425c39453805f34332aa1198 SHA1 0b2b72188f17b46cf4cfa5bc1fd005f4fbdeacf4 SHA256 e56e7e545b2ca1cf38c5253e158c77afcdc044417b2e3ecb1e528e3a8a6a2585 size 4971 +MD5 af1b96e5e82cf58f0a5bed44664df337 ChangeLog 4971 +RMD160 8ea0d5184b127f0e425c39453805f34332aa1198 ChangeLog 4971 +SHA256 e56e7e545b2ca1cf38c5253e158c77afcdc044417b2e3ecb1e528e3a8a6a2585 ChangeLog 4971 MISC metadata.xml 481 RMD160 bf21d73428ffeb72d05c41556b846820666e6192 SHA1 84bd0e3bd2b57b0e3985a2fe1afbdec9178bce17 SHA256 6e64541abb8c79774ac99aeedeadfabb8771c9ad3da281e967629fbc83300fa4 size 481 MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481 RMD160 bf21d73428ffeb72d05c41556b846820666e6192 metadata.xml 481 diff --git a/sci-libs/gdal/files/gdal-1.3.2-destdir.patch b/sci-libs/gdal/files/gdal-1.3.2-destdir.patch new file mode 100644 index 000000000000..ba0581b009bf --- /dev/null +++ b/sci-libs/gdal/files/gdal-1.3.2-destdir.patch @@ -0,0 +1,201 @@ +--- 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-ruby-install.patch b/sci-libs/gdal/files/gdal-1.3.2-ruby-install.patch new file mode 100644 index 000000000000..dca8890483a2 --- /dev/null +++ b/sci-libs/gdal/files/gdal-1.3.2-ruby-install.patch @@ -0,0 +1,20 @@ +--- 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) |