[gentoo-commits] gentoo-x86 commit in dev-db/postgis: metadata.xml ChangeLog postgis-1.5.2-r1.ebuild

[Aaron Swenson (titanofold)]

titanofold    11/05/01 17:33:49

  Modified:             metadata.xml ChangeLog
  Added:                postgis-1.5.2-r1.ebuild
  Log:
  Fixes bug 273960, 285082, 296172, 314243, 325113 and 339312
  
  (Portage version: 2.1.9.42/cvs/Linux i686)

Revision  Changes    Path
1.5                  dev-db/postgis/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/metadata.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/metadata.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/metadata.xml?r1=1.4&r2=1.5

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/postgis/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml	5 Aug 2008 16:41:00 -0000	1.4
+++ metadata.xml	1 May 2011 17:33:49 -0000	1.5
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>postgresql</herd>
-<herd>sci-geosciences</herd>
-<use>
-  <flag name='geos'>Add the <pkg>sci-libs/geos</pkg> library for exact
-    topological tests</flag>
-  <flag name='proj'>Add the <pkg>sci-libs/proj</pkg> library for reprojection
-    features</flag>
-</use>
+  <herd>postgresql</herd>
+  <herd>sci-geosciences</herd>
+  <use>
+	<flag name='geos'>Add the <pkg>sci-libs/geos</pkg> library for exact topological tests</flag>
+	<flag name='proj'>Add the <pkg>sci-libs/proj</pkg> library for reprojection features</flag>
+	<flag name="gtk">Build shp2pgsql-gui a graphical interface to shp2pgsql</flag>
+  </use>
 </pkgmetadata>



1.48                 dev-db/postgis/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/ChangeLog?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/ChangeLog?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/ChangeLog?r1=1.47&r2=1.48

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog	7 Mar 2011 13:22:00 -0000	1.47
+++ ChangeLog	1 May 2011 17:33:49 -0000	1.48
@@ -1,6 +1,12 @@
 # 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.47 2011/03/07 13:22:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.48 2011/05/01 17:33:49 titanofold Exp $
+
+*postgis-1.5.2-r1 (01 May 2011)
+
+  01 May 2011; Aaron W. Swenson <titanofold@g.o>
+  +postgis-1.5.2-r1.ebuild, +files/postgis_dbs, metadata.xml:
+  Fixes bug 273960, 285082, 296172, 314243, 325113 and 339312
 
   07 Mar 2011; Justin Lecher <jlec@g.o> postgis-1.5.0.ebuild,
   postgis-1.5.0-r1.ebuild, postgis-1.5.2.ebuild:



1.1                  dev-db/postgis/postgis-1.5.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/postgis-1.5.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/postgis-1.5.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: postgis-1.5.2-r1.ebuild
===================================================================
# 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.2-r1.ebuild,v 1.1 2011/05/01 17:33:49 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)"
PGSLOT="$(postgresql-config show)"

pkg_pretend() {
	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() {
	# Configure interprets --without-gui as being the same as --with-gui
	if use gtk ; then
		econf --with-gui
	else
		econf
	fi
}

src_compile() {
	# Occasionally, builds fail because of out of order compilation.
	# Otherwise, it'd be fine.
	emake -j1
	cd topology/
	emake -j1

	if use doc ; then
		cd "${S}"
		emake -j1 docs
	fi
}

src_install() {
	emake DESTDIR="${D}" install
	cd "${S}/topology/"
	emake 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
		emake DESTDIR="${D}" docs-install
	fi

	insinto /etc
	doins "${FILESDIR}/postgis_dbs"

	insinto /usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}/
	doins "${S}/doc/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
}