Bump

Package-Manager: portage-2.2.0_alpha98/cvs/Linux x86_64

3 files changed, 265 insertions, 12 deletions

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 3c6d12235ba5..1e3f73920731 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgis
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.62 2012/03/07 00:27:57 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.63 2012/04/04 07:42:16 patrick Exp $
+
+*postgis-2.0.0 (04 Apr 2012)
+
+  04 Apr 2012; Patrick Lauer <patrick@gentoo.org> +postgis-2.0.0.ebuild:
+  Bump
 
   07 Mar 2012; Aaron W. Swenson <titanofold@gentoo.org> -postgis-1.3.1.ebuild,
   -postgis-1.4.0.ebuild, -postgis-1.5.0.ebuild, -postgis-1.5.0-r1.ebuild,
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 31eaabd4402c..c36ca2740947 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX postgis_dbs 2096 RMD160 64b66e99aed34fb8e9523505851962a547bd41d0 SHA1 68565ab29a22ec08c7a2271f2219d653e11ca393 SHA256 dafde4a1d1d95e18facb3287baddab3c1c116933498c310438c91dbd736833ec
 AUX postgis_dbs-1.4 2096 RMD160 ed058a46f1b124832dd85145c99187653a5bbe01 SHA1 cad17c357f165dcd65cde4df304020e3e41fb466 SHA256 287224c16cbd286c75098e786235ad07226217fbcf76071279081e6cb1d1add1
 DIST postgis-1.3.6.tar.gz 2227317 RMD160 1f1797c8063b40653707be404bdebdc2573bbfea SHA1 1d4c34a31994b75ef79cf139543fc80fe0bd4438 SHA256 d3b04d4a3439596a1f6368b0627f21762347cef1e0694d5471ef17c6a3b7d144
 DIST postgis-1.4.2.tar.gz 3276515 RMD160 007af40a83701ba828b2bb6d7e7899d386d3ef23 SHA1 9a3386380b68ef1b15af86789d68b7f420d9ffd4 SHA256 5ce49b83b4c8f62eccb7080157f05299ff0e49c6ba06c3e1fa1ecfa2682c4d4b
 DIST postgis-1.5.3.tar.gz 3779956 RMD160 e30275890b175cbe1d70d5899cbe45ec34ddbafb SHA1 e8c572e0258ba760a67b7f717bdc8321b9f6cd58 SHA256 a2334f8b229446c0497d48a430a40152a3b71a5da02f414a0340a0a025d416cf
+DIST postgis-2.0.0.tar.gz 5446748 RMD160 7100818bcf4f230d4367777b236a2c0c511b69f7 SHA1 ff8c8ee9f35120a0312016297055bbfde1f45069 SHA256 12179e24e348421c60c501590fda25bd349e2f697003958d9493f5c91b280081
 EBUILD postgis-1.3.6-r1.ebuild 5586 RMD160 d824f89bac4d74bdb2a526ae25ae3ae730c48697 SHA1 09368c82a2ff558bf449dd3454f74b7bc9ccc014 SHA256 3bcb7327811a4324ca9d73021170a525554544d8dc0aa942be06eba1284e563d
 EBUILD postgis-1.4.2-r1.ebuild 6696 RMD160 0b9672fdd64eed9a7f203a2f340ab2a3cd4ec087 SHA1 60abe281b88bf0d8fbef20dced9cfdd957b878a8 SHA256 789cd4a5a6515f10946931330b4241c5bdd7f3a8519de059c290713532f2cc11
 EBUILD postgis-1.5.3-r1.ebuild 6912 RMD160 16d2be1d567554203afa805ad357c2042c5664aa SHA1 72a6743a5e0697ed3632b49d495e2a922a6d5d20 SHA256 8680d2bf4db5fc0ff1d1631e7ecf827aae1786f86c5a2f19951bd86a549a156f
-MISC ChangeLog 8842 RMD160 5287d7d530e8f09fa0f27fd9d1ffbe1105b5490a SHA1 d850e3ba4a53c5769688b055ccea164c7c6a5f13 SHA256 cc3e550a963551c9cb0cb923400ca9eeb2fd1886092a7975bb0184d22be1e75d
+EBUILD postgis-2.0.0.ebuild 6929 RMD160 bb93d21c99a5c30dac8e36b61d1a99f36de28700 SHA1 73e25cbc9e2d7315b7a5ce439fb376e969b4a203 SHA256 f3e018724eb0e1b5bf87557ea9692bb24f112611b80cab5ea9e1b7dcf413c384
+MISC ChangeLog 8950 RMD160 8b3f1ec448150688e822402006d1c1fe0e5cb5a4 SHA1 6e7344697032712b5788f7c4294d0067835d3c3f SHA256 c44b1fb1919e412fc5af8852f9a610d3d54514c85c45722ab21adbf5f16b2ba0
 MISC metadata.xml 481 RMD160 09ed331d86c1d68797aaf8a4912539f08f91cbb6 SHA1 a45afb667212035b630d417d2fc9632d99bbd62a SHA256 d0ab8dbe26001259f36c968e1d48ad5fda768227d99319cf4302af804a08d5ef
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk9Wq5MACgkQVxOqA9G7/aBeDAD+Pis0hQ7moZqP8WVzrfJzbWDd
-bU31sSe0Y/qZdjakVG0A/3VLtMX/exzPR4rzsEg9glusMiOiLu44BwpZgIJafKuy
-=VpVo
------END PGP SIGNATURE-----
diff --git a/dev-db/postgis/postgis-2.0.0.ebuild b/dev-db/postgis/postgis-2.0.0.ebuild
new file mode 100644
index 000000000000..8cb5fe554903
--- /dev/null
+++ b/dev-db/postgis/postgis-2.0.0.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.0.ebuild,v 1.1 2012/04/04 07:42:16 patrick 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
+		sci-libs/gdal
+		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
+	else
+		eerror "You must edit:"
+		eerror "    ${EROOT%/}/etc/postgis_dbs"
+		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
+		eerror
+		die "Edit postgis_dbs"
+	fi
+
+	# 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 ${epsg_databases[@]} ; do
+		ebegin "Adding EPSG 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}"
+}