version bump

(Portage version: 2.1_pre6-r3)

5 files changed, 127 insertions, 12 deletions

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 085a4dc54401..4406a808e0d5 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgis
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.19 2005/08/27 22:28:27 nakano Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.20 2006/03/20 08:04:01 nakano Exp $
+
+*postgis-1.1.1 (20 Mar 2006)
+
+  20 Mar 2006; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgis-1.1.1_doc.patch, +postgis-1.1.1.ebuild:
+  Version bump. Ebuild submitted by FENOY Gérald <djay@gentoo.org>.
 
 *postgis-1.0.1_p20050805 (27 Aug 2005)
 
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index e8f4d1b07132..31a084ed6815 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 14bf62145982fe2ad7a09d1d1675362f ChangeLog 2093
 MD5 e02da1081e84b4266aff297f0e422688 files/digest-postgis-0.7.5-r2 135
 MD5 45fbdc11a7887af6cbdb23256ede1cbf files/digest-postgis-1.0.0_p20050512 76
 MD5 166d20a82877d518f78081c596450b49 files/digest-postgis-1.0.1_p20050805 80
+MD5 068275dc19c93d08c140031a8ae1f238 files/digest-postgis-1.1.1 66
+MD5 12ed945462c95968c560ca03fe6de27f files/postgis-1.1.1_doc.patch 711
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 8557793e4877948f4c89f36a7d74db81 postgis-0.7.5-r2.ebuild 1822
 MD5 77268390221b16c76a842a5316186254 postgis-1.0.0_p20050512.ebuild 2375
 MD5 92a41ea65d8613f1af45507e21c742b1 postgis-1.0.1_p20050805.ebuild 2576
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDEhkOI1lqEGTUzyQRAqehAKDMkaIQ8oGBRCTgfL1fxOy9G0TolwCgldCX
-V+ehWKdSvfxYuntwOaCeyQI=
-=qoaH
------END PGP SIGNATURE-----
+MD5 98d630ed793e3dc6450e354c7fe0a8b7 postgis-1.1.1.ebuild 3034
diff --git a/dev-db/postgis/files/digest-postgis-1.1.1 b/dev-db/postgis/files/digest-postgis-1.1.1
new file mode 100644
index 000000000000..bf2f32924fd1
--- /dev/null
+++ b/dev-db/postgis/files/digest-postgis-1.1.1
@@ -0,0 +1 @@
+MD5 3c86999ff2fa8678bb3d210202a84358 postgis-1.1.1.tar.gz 1546065
diff --git a/dev-db/postgis/files/postgis-1.1.1_doc.patch b/dev-db/postgis/files/postgis-1.1.1_doc.patch
new file mode 100644
index 000000000000..3101f1184b65
--- /dev/null
+++ b/dev-db/postgis/files/postgis-1.1.1_doc.patch
@@ -0,0 +1,16 @@
+--- ./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/postgis-1.1.1.ebuild b/dev-db/postgis/postgis-1.1.1.ebuild
new file mode 100644
index 000000000000..7115cc950cb4
--- /dev/null
+++ b/dev-db/postgis/postgis-1.1.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.1.1.ebuild,v 1.1 2006/03/20 08:04:01 nakano Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.refractions.net"
+SRC_URI="http://www.postgis.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="geos proj"
+
+DEPEND=">=dev-db/postgresql-7.2
+	app-text/docbook-xsl-stylesheets
+	geos? ( sci-libs/geos )
+	proj? ( sci-libs/proj )
+	sys-devel/autoconf"
+RDEPEND=">=dev-db/postgresql-7.2
+	geos? ( sci-libs/geos )
+	proj? ( sci-libs/proj )"
+
+src_unpack(){
+	unpack "${P}.tar.gz"
+	cd "${S}"
+	# Remove redundant installation of README.postgis from docs-install
+	epatch "${FILESDIR}"/${P}_doc.patch
+}
+
+src_compile(){
+	local myconf
+
+	cd "${S}"
+	local xslv="$(portageq match / app-text/docbook-xsl-stylesheets |\
+		cut -d'/' -f2 | sed s/"docbook-"//)"
+	einfo "doc will be build with ${xslv}"
+	if [ ! -z "$(echo ${xslv} | grep '\-r')" ]; then
+		xslv="$(echo ${xslv} | cut -d'-' -f1 )-$(echo ${xslv} | cut -d'-' -f2 )-$(echo ${xslv} | cut -d'-' -f3)"
+	fi
+	sed s/"xsl-stylesheets"/"${xslv}"/ -i configure.in
+	myconf="${myconf} --with-docdir=/usr/share/doc/${PF}/html/"
+
+	eautoconf
+	myconf="${myconf} --enable-autoconf \
+		--libdir=/usr/$(get_libdir)/postgresql/\
+		--datadir=/usr/share/postgresql/contrib/"
+	econf ${myconf} \
+		$(use_with geos) \
+		$(use_with proj)\
+		|| die "Error: econf failed"
+
+	emake || die "Error: emake failed"
+
+	make docs || die "Unable to build documentation"
+	cd topology/
+	emake || die "Unable to build topology sql file"
+}
+
+src_install(){
+	into /usr
+	cd ${S}
+	dodir /usr/$(get_libdir)/postgresql /usr/share/postgresql/contrib/
+	make DESTDIR="${D}" install || die "einstall failed"
+	cd "${S}"/topology/
+	make DESTDIR="${D}" install
+
+	cd "${S}"
+	dodoc CHANGES COPYING CREDITS README.postgis TODO loader/README.*\
+		doc/*txt || die "Unable to install doc"
+
+	docinto topology
+	dodoc topology/{TODO,README}
+
+	cd "${S}"
+	make DESTDIR="${D}" docs-install || die "Unable to install documentation"
+
+	# postgis_proc_upgrade.pl is not needed cause it was used during
+	# the compilation process and create the file
+	# /usr/share/postgresql/contrib/lwpostgis_upgrade.sql (used to upgrade all
+	# functions defined into the new lwpostgis.sql, simply done with command :
+	# 'create or replace function'). So I decided to install only
+	# postgis_restore.pl for a hard upgrade (cf.
+	# http://postgis.refractions.net/docs/ch02.html#upgrading)
+	bininto "${D}"/usr/bin/
+	dobin ./utils/postgis_restore.pl
+}
+
+pkg_postinst() {
+	einfo "To create your first postgis database do the followings commands :"
+	einfo " # su postgres"
+	einfo " # createdb test"
+	einfo " # createlang plpgsql test"
+	einfo " # psql -d test -f /usr/share/postgresql/contrib/lwpostgis.sql"
+	einfo " # psql -d test -f /usr/share/postgresql/contrib/spatial_ref_sys.sql"
+	einfo "For more informations see : http://postgis.refractions.net/documentation.php"
+	einfo "(For french user only see http://techer.pascal.free.fr/postgis)"
+}