Bump

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

3 files changed, 264 insertions, 16 deletions

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 6fd054b9f8ac..4b38b292fcb3 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.70 2012/08/20 01:46:29 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.71 2012/11/01 06:39:12 patrick Exp $
+
+*postgis-1.5.5 (01 Nov 2012)
+
+  01 Nov 2012; Patrick Lauer <patrick@gentoo.org> +postgis-1.5.5.ebuild:
+  Bump
 
   20 Aug 2012; Christoph Junghans <ottxor@gentoo.org> postgis-2.0.1.ebuild:
   added prefix keywords
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index d586725d3ab4..4fb406fd2399 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,28 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX postgis_dbs 2096 SHA256 dafde4a1d1d95e18facb3287baddab3c1c116933498c310438c91dbd736833ec SHA512 5a11a3ce0153461f363d1b9a393dd10392e123c7b18b20610a5e26f2c7c6ed258a1517082a244c6ab5de40d439bc8a370848a0177c3c2ffcffc67a24fca8e66a WHIRLPOOL 8e4c34ac428c5ac887b414334fe80424b09845585596be1affaf69a9205af7dd183198eed44fa0406074ad1bcc133db8a9a13acd4a0882945b32ec8e0a480b61
 AUX postgis_dbs-1.4 2096 SHA256 287224c16cbd286c75098e786235ad07226217fbcf76071279081e6cb1d1add1 SHA512 520711a6165dbb08c7ce86001f885340b5dbc54efc2a863726b09d93db9e0d888c21fa5b466506456cacadd55db8531284c5b85f484c599d313f4d9aac56c1ef WHIRLPOOL 1b87d8edf109dd76a54a8c7819731a843e7ec139bcaef4b69605304a336eb3d558e656c1adf06ca487f1c5624c542634be7b885dd888e5ef4ec89e2970d38195
 DIST postgis-1.3.6.tar.gz 2227317 SHA256 d3b04d4a3439596a1f6368b0627f21762347cef1e0694d5471ef17c6a3b7d144 SHA512 0e98aeaf8c3c3ca1c51c617a6f50f066a69129b63721507708f02c69b5ff8e75c4b7b076f5075263ceedaf10904eaf950784b2c2f9f27ba3bb982f871b68fd4b WHIRLPOOL c45c611a992b044f63be3259c046f01e34b0772f2f95bf7fb7b71b54adef1c72aa3c86141bff8d305751e4598ee18a40e1ebc5439501b76e6c430c19c988d316
 DIST postgis-1.4.2.tar.gz 3276515 SHA256 5ce49b83b4c8f62eccb7080157f05299ff0e49c6ba06c3e1fa1ecfa2682c4d4b SHA512 3c27e8ed9eeb0e884190cdd5e4731989f9752e2ba449cdfe45d09cd638bd5b600d5cef16140e072d5e328cac035b2ffcc18392651c7306dcc4b5401429efc73e WHIRLPOOL 34a92d15018c5c414f93bf16c7cccb53af0943564b378bf2ca49d1692ebe51b9935214a5b2e2bddee716734954be7aabe0b4ce8b9c6b7d9cfbb801fa177bf5c4
 DIST postgis-1.5.3.tar.gz 3779956 SHA256 a2334f8b229446c0497d48a430a40152a3b71a5da02f414a0340a0a025d416cf SHA512 fe51f6cd452de577d361b56196adcacd6715f608c3e2d073375f36e35a6b47b5cc92f8232b9d1d29cd00d1f85c77dbd035379687f7a180074ee7dbd38ca8f3cd WHIRLPOOL 1139e63a8875c98c6f147cba1b3693602846b61c93d73cb561ef567b29f04f51558dfe8a09e0778247fa3b6fc7d221b5ea8df44862808272123c879b21e36589
+DIST postgis-1.5.5.tar.gz 3802212 SHA256 6f7fbb417cfce8cd120d098219ba5f9a19ccdcec0beb0163320b163b23231cf3 SHA512 c9252721c9b6bb9db5c4e9c5d89efdb9767eadc3f8bec0663bb61129c6c78d867114de31aa0022ec4434fe24e5ce3a6d5002158ec6a1e006b2cb2612a4200ea7 WHIRLPOOL 551e1b9f11c9f21409d4f77174f2c2e4433212290b0fdfba53f0e7149bb3c309dfa17a1cac783623775718b4b027d74109164179fa51cdb4ada1d8d5fbe3280c
 DIST postgis-2.0.0.tar.gz 5446748 SHA256 12179e24e348421c60c501590fda25bd349e2f697003958d9493f5c91b280081 SHA512 e6756d9bb2c88cb3cdbd7f74a8d4dff238b7e9e738468234045dce3646e211a28fd760f245cf93af55e096375de580a8283bc836c52ef216e060481dbe216894 WHIRLPOOL 18dac47cb4b3bc8104a79084da6bd32f32a58c3aaef5b96ee2ec67161d31ed0a4bd739e602a57d888f3b481e3b98ab2884ae8d9f8255c59b85e0f83222917d07
 DIST postgis-2.0.1.tar.gz 5373194 SHA256 32d181bbf0e648fe31c95b3dd23f7e4e49094d93cb4278fdf71c8feed4e9593c SHA512 c3dd03b8ae6e8917336bbaac0b91343f662d2477a7f54dcb823ef43f5433813615e992e729f2f1a30895c14a5039d3c34d9225e850f193192829380e043fc387 WHIRLPOOL a7df5478b3c23b652d48ac16d4f3fbc2d97bdb70ad5f1a450a3ad6142d977ae7de4cf5d2e53b6aee1a3beaf7feeccb12cc925a2cd08b6b5e74e2ca73e1d1786c
 EBUILD postgis-1.3.6-r1.ebuild 5595 SHA256 4cd4f8fa35064a3a34b873ad7e77dabead3b225bd7028ebbc95f3adc252fef13 SHA512 3eb25213a082b382efcd67ddead113d84928d730a6fa14dbb7a249757268170aef98350fe21d6b2eebaf5febb7bb9624bfef582d597bdee2a898af280267e864 WHIRLPOOL 5217be7480e86c55b51a2ce5fc4e7824ce07cf8af49f95f41c4793c805897a6213eabf4dacb9a1d61268388649115b32643859b54ccc43a45a423131a9e9e081
 EBUILD postgis-1.4.2-r1.ebuild 6696 SHA256 789cd4a5a6515f10946931330b4241c5bdd7f3a8519de059c290713532f2cc11 SHA512 1ebb80920c2d468aba3b31ceacfd5011fc3f8cc3f879506cdf80ca48bb080e01ad541f4844ab73c9635a68f360b8f229aca502e5c35ac4d2f07f52898be3df18 WHIRLPOOL 34ed155d44362eedb82df185203883963458c95598e88f48bb2ca2d604231655c5ae4120261f546a07a928bb13bed64e536ae4fd58dcb5bcd19e565f495c556f
 EBUILD postgis-1.5.3-r1.ebuild 6912 SHA256 8680d2bf4db5fc0ff1d1631e7ecf827aae1786f86c5a2f19951bd86a549a156f SHA512 93f568e74cfc1332554655b57963b7874fbd121f7b4904176a24ad7ed796b75fa25080eb82888197b84409a8dcd3da8833515fe5f44f4706851a7ef8b1854ad9 WHIRLPOOL f2e65ea8cedb7ca3ad86a8ba6d342e8c702c6d63aa84165496c0fbfa1e546eda2ffbaaa7a26b9afccc02e6f83d796eac7e6ccd48aafd256fac4306214b1baaf5
+EBUILD postgis-1.5.5.ebuild 6913 SHA256 49fa5186e567d8e857ee5088055d2380a3a72b6ae375c40db9bfae53ad78530e SHA512 61baa1c718f490822993d74749da7acdc8fba3e241d976b1526058844e2dd1bb3e2bec2f17e1f7f90047a46b642d3c8ea0fe7e8fd14db6ff5d991634edf46767 WHIRLPOOL 1d85d06d394c0ac5022ba72000fd03412e76aec2cbe4a56a0dddc8440eca49bf4316d29f9b825c8bb0120e125d77d1065f7a7f93bdf3acf901df56eda26ebdb6
 EBUILD postgis-2.0.0.ebuild 6901 SHA256 94fddc0709cad9a31370308593318277697d6f88cda576625db57547661c37d9 SHA512 f3985bbd13e2faba0e2c9e8ebcdcbae48b9ffc67c2b5ea965cd66e33f7f9f620217cf029ea487756eb5a45fab5ddd40297b7127c1354c7beb89ae4aa3e1a5708 WHIRLPOOL 6de8c7fbb55e17541d3d86b6bdb475cc28677cf517d286e1f8b392caa2fc0643b695ee4466533ff0f5354e1cce77c2482e7dd16915b45fb37f9134bc0caa78ed
 EBUILD postgis-2.0.1.ebuild 6960 SHA256 c2d3875e8c482790d4e7d603048e600863e2cc00faf94f3db365e73038525ecb SHA512 dc45b7fe13883f4c2706c45c3156d4964f4cb09041e8ace5de89adaea4b37ef2ddaf98fa22155ddb6c07bc9a840f32c9088d650952974a9e7c055d6c0e246947 WHIRLPOOL 5870ca61c8cc9872b6bdc917d943e0738356aa3d7947567b6e50f27dc90dcb390d53546c5b14ccf51e94ef8b852481c38343177ab672ae409f4f36c145f2c3c9
-MISC ChangeLog 9737 SHA256 96c4e0720a67d2b635e2a2a04236b18a0f0b3633ef5509ed1f6f13424ca5c03b SHA512 e16a16e4b169691e06f619722e7505478244f9553b21e85759b47ff584a1d216ee1cdda2dbd4bfa352a8f3c4abe110a22ef280c24c61f3c90c1a925f58e814f8 WHIRLPOOL 9dda75de44f94209ce10c525ff620c17dba992551341aad949831430103e2dc488600f5db76fed070ba16d87e0232de8909081d61acd0bfda4645f3631e375e7
+MISC ChangeLog 9849 SHA256 432f4911416fe6e2665d2b96b20f70cb73d06096ff256ecc1e9e51d51d8b0fde SHA512 505badd657895998b4926ecdff5e878ee333222acedc3007baf328c48deaed5743515e090cd25ae10849745c6f57d2e4cb19215a7c26591729e88f9f8a8bf1fc WHIRLPOOL 870e83aab708f0fd83292f3dc15e5ad859f4bd2926c7be557195b54312ee8c7c2380e3436bcf140acbea77ed79c4ae98a191b5617bb6bac762dce2056dcd90e6
 MISC metadata.xml 481 SHA256 d0ab8dbe26001259f36c968e1d48ad5fda768227d99319cf4302af804a08d5ef SHA512 5299745d72d13ccc71d5f6eee5d343268a59f57ac208621c81643e7f2160b66382c3dd0bf07c97f4cefaebfbbbfc5e11e6b84318f5fc536877f123be2fd7743e WHIRLPOOL 257b7f00ffcd56df202c0e1cd75383bf7ed9b0c854cadb9371a281bbd200b8686c70d3d28cadd06756510f9d6536ee64c636a12f5170ce5c608e82d1148ba9fe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQMZb8AAoJEOeBhlrCAAWGPgAH/1NaZejIBi3jW+driSQVXExv
-UE+JhanVL0KqD3BwK76ZlceMfTG7kdH0S55HAPYiXUxnJe0v66rC6UvudOh/OM0y
-+9JW3UCgxT+YrCS3Q5ad8qsLeOhIQ1BGUGeIPBm0NMYxirh30kH9PURAFATwGvbw
-1ZpngfmP7zucGXNh+gDRBkI4jjTm4SfBaQqQCpT55dcw/SfGtc0H2qNaMkZhIaY3
-URMevrGsvX/FaUbUOdXVynBRjFgICLAiuM8n5URvhCJvBnt3wkbKLZJz/5xadz9W
-aBXPiaOeYD/12VpjmROZyOZu/gwRh8XRS1gL9NxTcHS8JXHgglh8U8mY3wARnZg=
-=s/c7
------END PGP SIGNATURE-----
diff --git a/dev-db/postgis/postgis-1.5.5.ebuild b/dev-db/postgis/postgis-1.5.5.ebuild
new file mode 100644
index 000000000000..c674e8749511
--- /dev/null
+++ b/dev-db/postgis/postgis-1.5.5.ebuild
@@ -0,0 +1,255 @@
+# 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-1.5.5.ebuild,v 1.1 2012/11/01 06:39:12 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.1
+			dev-db/postgresql-server:9.0
+			dev-db/postgresql-server:8.4
+			dev-db/postgresql-server:8.3
+		)
+		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
+	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}"
+}