Fixes bug 380095 and 380089. Remove files no longer in use.

(Portage version: 2.1.10.3/cvs/Linux i686)

3 files changed, 49 insertions, 57 deletions

diff --git a/dev-db/postgis/files/postgis-1.1.1_doc.patch b/dev-db/postgis/files/postgis-1.1.1_doc.patch
deleted file mode 100644
index 3101f1184b65..000000000000
--- a/dev-db/postgis/files/postgis-1.1.1_doc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./doc/Makefile	2005-12-20 10:06:09.000000000 +0100
-+++ ./doc/Makefile	2006-01-19 16:29:50.000000000 +0100
-@@ -69,13 +69,11 @@
- 	@mkdir -p $(DESTDIR)$(docdir)/postgis
- 	@mkdir -p $(DESTDIR)$(mandir)/man1
- 	$(INSTALL_DATA) html/postgis.html $(DESTDIR)$(docdir)/postgis/postgis.html
--	$(INSTALL_DATA) ../README.postgis $(DESTDIR)$(docdir)/postgis/README.postgis
- 	$(INSTALL_DATA) man/pgsql2shp.1 $(DESTDIR)$(mandir)/man1/pgsql2shp.1
- 	$(INSTALL_DATA) man/shp2pgsql.1 $(DESTDIR)$(mandir)/man1/shp2pgsql.1
- 
- uninstall:
- 	rm -f $(DESTDIR)$(docdir)/postgis/postgis.html
--	rm -f $(DESTDIR)$(docdir)/postgis/README.postgis
- 	rm -f $(DESTDIR)$(mandir)/man1/shp2pgsql.1
- 	rm -f $(DESTDIR)$(mandir)/man1/pgsql2shp.1
- 
diff --git a/dev-db/postgis/files/postgis_dbs-1.4 b/dev-db/postgis/files/postgis_dbs-1.4
new file mode 100644
index 000000000000..fa7ac2542fa9
--- /dev/null
+++ b/dev-db/postgis/files/postgis_dbs-1.4
@@ -0,0 +1,49 @@
+# This file is used by 'emerge --config dev-db/postgis' to determine which
+# databases it should install to, upgrade or create as a template.
+
+# Unlike the previous versions of the PostGIS ebuilds, it no longer creates any
+# databases except for templates. All databases you list must already exist in
+# the cluster.
+
+# The user to perform the updates as. This user must have the privileges to
+# modify all of the databases you list here. 
+pguser="postgres"
+
+# By default, no databases will have PostGIS enabled. The databases listed here
+# must already exist. The databases you list here must not already be PostGIS
+# enabled. Instead, use the upgrade lists further down.
+#databases=( "your" "databases" )
+
+# Anything you place in this list will create a database and make it a template.
+# It will be PostGIS-enabled. To add additional features, add the template names
+# to the following lists.
+#templates=( "template_postgis" )
+
+# The PostGIS enabled templates will be created using this template.
+from_template="template1"
+
+# For a complete set of EPSG coordinate system definition identifiers, you can
+# also load the spatial_ref_sys.sql definitions file and populate the
+# spatial_ref_sys table. This will permit you to perform ST_Transform()
+# operations on geometries. 
+#epsg_databases=( "enable" "epsg" "on" "these" "databases" )
+
+# Add comments to PostGIS functions to the databases in this list.
+#comment_databases=( "comments" "on" "these" "databases" )
+
+# Any databases you have that are already PostGIS enabled can be listed among
+# the following list to perform a soft upgrade. If the soft upgrade fails,
+# you'll need to do a hard upgrade.
+# http://postgis.refractions.net/documentation/manual-1.5/ch02.html#hard_upgrade
+
+# Upgrade from PostGIS 1.2 to 1.4
+#upgrade_from_1_2=( "upgrade" "these" "databases" )
+
+# Upgrade from PostGIS 1.3 to 1.4
+#upgrade_from_1_3=( "upgrade" "these" "databases" )
+
+# Perform a minor upgrade for PostGIS 1.4
+#upgrade_from_1_4=( "upgrade" "these" "databases" )
+
+# Uncomment this once you're satisfied with the settings in this file.
+#configured="true"
diff --git a/dev-db/postgis/files/postgis_xsl.patch b/dev-db/postgis/files/postgis_xsl.patch
deleted file mode 100644
index f96a703f0ea0..000000000000
--- a/dev-db/postgis/files/postgis_xsl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- ./postgis-1.2.0/configure.in	2006-11-10 16:17:10.000000000 +0100
-+++ ./postgis-1.2.0-patched/configure.in	2006-12-19 22:55:03.000000000 +0100
-@@ -323,17 +323,28 @@
- dnl
- AC_SUBST(XSLBASE)
- XSLBASE=
--SEARCHPATH="
--	/usr/share/sgml/docbook/xsl-stylesheets 
--	/usr/share/xml/docbook/stylesheet/nwalsh
--	/usr/share/sgml/docbook/stylesheet/xsl/nwalsh
--"
--for p in ${SEARCHPATH}; do
--	if test -r ${p}/html/docbook.xsl; then
--		XSLBASE=${p}
--		break
-+AC_ARG_WITH(xsl,
-+[  --with-xsl=DIR      use the xsl stylesheets located in DIR],
-+	if test "$with_xsl" = yes; then
-+		AC_MSG_ERROR([option --with-xsl requires an argument])
- 	fi
--done
-+	if test "$with_xsl" != "no"; then
-+		xsl="$with_xsl"
-+	else
-+		SEARCHPATH="
-+			/usr/share/sgml/docbook/xsl-stylesheets 
-+			/usr/share/xml/docbook/stylesheet/nwalsh
-+			/usr/share/sgml/docbook/stylesheet/xsl/nwalsh
-+		"
-+		for p in ${SEARCHPATH}; do
-+			if test -r "${p}"/html/docbook.xsl; then
-+				xsl="${p}"
-+				break
-+			fi
-+		done
-+	fi
-+)
-+XSLBASE="${xsl}"
- 
- dnl
- dnl Search for other binaries needed to build docs