Version bump

Package-Manager: portage-2.1.9.42/cvs/Linux i686

3 files changed, 268 insertions, 6 deletions

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 31d74b0067ae..e95975b205ef 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgis
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.52 2011/06/17 10:14:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.53 2011/06/26 01:56:27 titanofold Exp $
+
+*postgis-1.5.3 (26 Jun 2011)
+
+  26 Jun 2011; Aaron W. Swenson <titanofold@gentoo.org> +postgis-1.5.3.ebuild:
+  Version bump
 
   17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> postgis-1.5.2-r3.ebuild:
   Reorder src_install and set -j1 only once into global MAKEOPTS variable.
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 3fc0b9141921..3414f6ec59e6 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX postgis-1.1.1_doc.patch 711 RMD160 182a5127d83b18b48c5b013b63427d485f770e36 SHA1 00ad7282712c851fc38c852a8d21a70c5ab2b969 SHA256 4c0b50b26bc22e09d60ac14ad4639880e1fca7c92eb55929d6dc10c0ec4ce691
 AUX postgis_dbs 2096 RMD160 64b66e99aed34fb8e9523505851962a547bd41d0 SHA1 68565ab29a22ec08c7a2271f2219d653e11ca393 SHA256 dafde4a1d1d95e18facb3287baddab3c1c116933498c310438c91dbd736833ec
@@ -9,6 +9,7 @@ DIST postgis-1.3.6.tar.gz 2227317 RMD160 1f1797c8063b40653707be404bdebdc2573bbfe
 DIST postgis-1.4.0.tar.gz 3143966 RMD160 e5f6cb7ddc78f7c20954b0aa3a3906e31581a1d7 SHA1 454d87021c46c9fa4f657819e31a74b8fc75193a SHA256 71c5ffde54a2ecbb88fbffa12ca18c617ecfe2404fb9049940cd1b7a06a7e38d
 DIST postgis-1.5.0.tar.gz 3752211 RMD160 815c445d7ab628254130d2277648913e945b2af9 SHA1 8addacea2439a52f07735b58268dcef8df46912c SHA256 f79e8f740d48367e5481183c33e09b860c2c4466b196ea99c5601db287e2d324
 DIST postgis-1.5.2.tar.gz 3749293 RMD160 5ba251f6b4138d5a1a85ef26a2d08b6d4f280e0e SHA1 b1368c08f2a0d22bf7adc57ab419f1e30cacbf56 SHA256 0ae2778816b6a86026f38ba1e2a9418247a81c364ad468d6a5be0c77b1065f08
+DIST postgis-1.5.3.tar.gz 3779956 RMD160 e30275890b175cbe1d70d5899cbe45ec34ddbafb SHA1 e8c572e0258ba760a67b7f717bdc8321b9f6cd58 SHA256 a2334f8b229446c0497d48a430a40152a3b71a5da02f414a0340a0a025d416cf
 EBUILD postgis-1.3.1.ebuild 5288 RMD160 3a05746afeca4b09a0d4aa3e0b937518d432eb25 SHA1 77b8b8f7c6a0c1beef4abaa83cb73174f1fcf5e6 SHA256 5cd873726851e1727275d7fe473344951db02892c22de7cb10712ef0a3b3821d
 EBUILD postgis-1.3.6-r1.ebuild 5586 RMD160 d824f89bac4d74bdb2a526ae25ae3ae730c48697 SHA1 09368c82a2ff558bf449dd3454f74b7bc9ccc014 SHA256 3bcb7327811a4324ca9d73021170a525554544d8dc0aa942be06eba1284e563d
 EBUILD postgis-1.4.0.ebuild 5535 RMD160 d88ae3b22c6d56650e8473c33e944121da8e7e14 SHA1 0375209a5e716347818bc9da3300396c91ea4762 SHA256 f1d5082611460dd01e026d79e1e0ba7faa9554a17d1ed9cf4355af9a1a46ac28
@@ -16,12 +17,13 @@ EBUILD postgis-1.5.0-r1.ebuild 5949 RMD160 616de40fc630f742ce04c2f1d699369c7b7e3
 EBUILD postgis-1.5.0.ebuild 5554 RMD160 009a41a7162c935c7d321e5fb6d2a21d9b066270 SHA1 77c9bf519d40c0e497b9a8a28fbf337d070584fb SHA256 a3a6f2baa1c8deb9c8cc7dd91523e70ff48895e46ce748c521dc227afff8b023
 EBUILD postgis-1.5.2-r3.ebuild 7027 RMD160 794150f429f9c2587ec6dbc7fdccdf50e7ecda34 SHA1 bea14836cb1cb7936a6e65cfd9589108317179a5 SHA256 bcbba85d17e011faf1f0b0d60abac21f814d551c896f07b0d32c3e39756b401b
 EBUILD postgis-1.5.2.ebuild 5946 RMD160 5aa7c66101ba5faf4e309860fd56fb87e2709967 SHA1 b21b24835cce9a8dc7059dca551d161c098089e9 SHA256 3f9fef73adce04ee5f4582cb5c404da482b549230024a4326798b15fd42bbbae
-MISC ChangeLog 7318 RMD160 9734a4569ddb193aa71be9e0253ccaa42dcb74d0 SHA1 4655a825d943c9ea918f33988e057557a6c4f0ec SHA256 d60497bab29cc67bc62ae43009f02bfa9a9581c31f5368fb9282b33976a98ac3
+EBUILD postgis-1.5.3.ebuild 7025 RMD160 c6827bc1b48bb164ea2a746d466e4756542a94af SHA1 f9a14fa820d3dfd66de13e459bbb7b975cd7a214 SHA256 8e4bc2637e0563d64936f2c5541b874856399edad5fee3acf44b0f0a50104299
+MISC ChangeLog 7444 RMD160 e17b1b5052c1a984f04cefd170d3cf3a3c3bd207 SHA1 726e4ce9f17c039eda616defa089ee4b5dd25b9f SHA256 46ba513e7dfeadae7fcaf0ad9183fdcdd40fc8a91ba326d437bf9d2e0b845188
 MISC metadata.xml 481 RMD160 09ed331d86c1d68797aaf8a4912539f08f91cbb6 SHA1 a45afb667212035b630d417d2fc9632d99bbd62a SHA256 d0ab8dbe26001259f36c968e1d48ad5fda768227d99319cf4302af804a08d5ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk37KPYACgkQHB6c3gNBRYdq4QCfb7qX4fTZcfSyD+CCniVwHzpH
-pYMAn2095ofdm+WRELFO11R5TlO+mJvv
-=d5qq
+iF4EAREIAAYFAk4GkdEACgkQCOhwUhu5AEkE5wD8DItCuHnGpTjD0N9Ksi/ZX1gs
+z66PmmxQxLvFF5QYLk0BALMTsdh+UnV9YW7o2p97JpTHYfTq33tb4KdyehNVm2ww
+=F0Gz
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgis/postgis-1.5.3.ebuild b/dev-db/postgis/postgis-1.5.3.ebuild
new file mode 100644
index 000000000000..fed264b06c14
--- /dev/null
+++ b/dev-db/postgis/postgis-1.5.3.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.5.3.ebuild,v 1.1 2011/06/26 01:56:27 titanofold Exp $
+
+EAPI="4"
+
+inherit eutils versionator
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.refractions.net"
+SRC_URI="http://postgis.refractions.net/download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gtk"
+
+RDEPEND="
+		|| (
+			dev-db/postgresql-server:9.0
+			dev-db/postgresql-server:8.4
+			dev-db/postgresql-server:8.3
+			dev-db/postgresql-server:9.1
+		)
+		dev-libs/libxml2:2
+		>=sci-libs/geos-3.2
+		>=sci-libs/proj-4.6.0
+		gtk? ( x11-libs/gtk+:2 )
+"
+
+DEPEND="${RDEPEND}
+		doc? (
+				app-text/docbook-xsl-stylesheets
+				app-text/docbook-xml-dtd:4.3
+				dev-libs/libxslt
+				|| (
+					media-gfx/imagemagick
+					media-gfx/graphicsmagick[imagemagick]
+				)
+		)
+"
+
+RESTRICT="test"
+
+PGIS="$(get_version_component_range 1-2)"
+
+# not parallel safe
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	export PGSLOT="$(postgresql-config show)"
+	if [[ ${PGSLOT//.} < 83 ]] ; then
+		eerror "You must build ${CATEGORY}/${PN} against PostgreSQL 8.3 or higher."
+		eerror "Set an appropriate slot with postgresql-config."
+		die "postgresql-config not set to 8.3 or higher."
+	fi
+
+	if [[ ${PGSLOT//.} > 90 ]] ; then
+		ewarn "You are building ${CATEGORY}/${PN} against a version of PostgreSQL greater than 9.0."
+		ewarn "This is neither supported here nor upstream."
+		ewarn "However, all indicators show that this should work."
+		ewarn "Any bugs you encounter should be reported upstream."
+	fi
+}
+
+src_configure() {
+	local myargs=""
+	use gtk && myargs+=" --with-gui"
+	econf \
+		${myargs}
+}
+
+src_compile() {
+	# Occasionally, builds fail because of out of order compilation.
+	# Otherwise, it'd be fine.
+	emake
+	emake -C topology
+	use doc && emake -C doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake -C topology DESTDIR="${D}" install
+
+	cd "${S}"
+	dodoc CREDITS TODO loader/README.* doc/*txt
+
+	docinto topology
+	dodoc topology/{TODO,README}
+	dobin ./utils/postgis_restore.pl
+
+	if use doc; then
+		cd doc/html
+		dohtml -r *
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}/postgis_dbs"
+
+	cd "${S}/doc"
+	doman man/*
+	insinto /usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}/
+	doins postgis_comments.sql
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "To finish installing or updating PostGIS edit:"
+	elog "    ${EROOT%/}/etc/postgis_dbs"
+	elog
+	elog "Then, run:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config(){
+	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
+	source "${EROOT%/}/etc/postgis_dbs"
+	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
+
+	if [[ -n ${configured} ]] ; then
+		einfon "Password for PostgreSQL user '${pguser}': "
+		read -s PGPASSWORD
+		export PGPASSWORD
+		echo
+
+		# The server we work with must be the same slot we built against.
+		local server_version
+		server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
+			-Aqwtc 'SELECT version()' 2> /dev/null)
+		if [[ $? = 0 ]] ; then
+			server_version=$(echo ${server_version} | cut -d " " -f 2 | \
+				cut -d "." -f -2 | tr -d .)
+			if [[ $server_version != ${PGSLOT//.} ]] ; then
+				unset PGPASSWORD
+				eerror "Server version must be ${PGSLOT}.x"
+				die "Server version isn't ${PGSLOT}.x"
+			fi
+		else
+			unset PGPASSWORD
+			eerror "Is the server running?"
+			die "Couldn't connect to server."
+		fi
+
+		local retval
+		safe_exit() {
+			unset PGPASSWORD
+			sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
+			eend $retval
+			eerror "All actions could not be performed."
+			eerror "Read above to see what failed."
+			eerror "Once you fix the issue, you'll need to edit:"
+			eerror "    ${EROOT%/}/etc/postgis_dbs"
+			eerror "As some things may have succeeded."
+			eerror
+			die "All actions could not be performed"
+		}
+
+		local db
+		for db in ${databases[@]} ; do
+			ebegin "Performing CREATE LANGUAGE on ${db}"
+			createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
+			retval=$?
+			# In this case, only error code 1 is fatal
+			[[ $retval == 1 ]] && safe_exit || eend 0
+
+			ebegin "Enabling PostGIS on ${db}"
+			psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+				-f "${postgis_path}/postgis.sql"
+			retval=$?
+			[[ $retval == 0 ]] && eend 0 || safe_exit
+		done
+
+		for db in ${templates[@]} ; do
+			ebegin "Creating template database '${db}'"
+			createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
+				${db} "PostGIS Template"
+			retval=$?
+			[[ $retval != 0 ]] && safe_exit
+
+			psql -q -U ${pguser} -p ${PGPORT} -c \
+				"UPDATE pg_database \
+				 SET datistemplate = TRUE, datallowconn = TRUE \
+				 WHERE datname = '${db}'"
+			retval=$?
+			[[ $retval != 0 ]] && safe_exit
+
+			createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
+			retval=$?
+			# In this case, only error code 1 is fatal
+			[[ $retval == 1 ]] && safe_exit
+
+			psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+				-f "${postgis_path}/postgis.sql"
+			retval=$?
+			[[ $retval == 0 ]] && eend 0 || safe_exit
+		done
+
+		for db in ${espg_databases[@]} ; do
+			ebegin "Adding ESPG to ${db}"
+			psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+				-f "${postgis_path}/spatial_ref_sys.sql"
+			retval=$?
+			[[ $retval == 0 ]] && eend 0 || safe_exit
+		done
+
+		for db in ${comment_databases[@]} ; do
+			ebegin "Adding comments on ${db}"
+			psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+				-f "${postgis_path}/postgis_comments.sql"
+			retval=$?
+			[[ $retval == 0 ]] && eend 0 || safe_exit
+		done
+
+		for db in ${upgrade_from_1_3[@]} ; do
+			ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
+			psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+				-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
+			retval=$?
+			[[ $retval == 0 ]] && eend 0 || safe_exit
+		done
+
+		for db in ${upgrade_from_1_4[@]} ; do
+			ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
+			psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+				-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
+			retval=$?
+			[[ $retval == 0 ]] && eend 0 || safe_exit
+		done
+
+		for db in ${upgrade_from_1_5[@]} ; do
+			ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
+			psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+				-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
+			retval=$?
+			[[ $retval == 0 ]] && eend 0 || safe_exit
+		done
+
+		# Clean up and make it so the user has to edit postgis_dbs again that
+		# way this script won't step on any toes due to user error.
+		unset PGPASSWORD
+		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
+		einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
+		einfo
+		einfo "To enable other databases, change the default slot:"
+		einfo "    postgresql-config set <slot>"
+		einfo "Then, emerge this package again:"
+		einfo "    emerge -av =${CATEGORY}/${PF}"
+	else
+		eerror "You must edit:"
+		eerror "    ${EROOT%/}/etc/postgis_dbs"
+		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
+		eerror
+		die "Edit postgis_dbs"
+	fi
+}