Fixed typo: ESPG -> EPSG
authorAaron Swenson <titanofold@gentoo.org>
Tue, 23 Aug 2011 22:46:51 +0000 (22:46 +0000)
committerAaron Swenson <titanofold@gentoo.org>
Tue, 23 Aug 2011 22:46:51 +0000 (22:46 +0000)
Package-Manager: portage-2.1.10.3/cvs/Linux i686

dev-db/postgis/ChangeLog
dev-db/postgis/Manifest
dev-db/postgis/postgis-1.5.3-r1.ebuild [new file with mode: 0644]

index b01ebee56f75a6d5874ac29446a72ebca38eb978..83ea48208c7d6994b62952b3638b7e02a747c2f5 100644 (file)
@@ -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.56 2011/08/23 22:31:43 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.57 2011/08/23 22:46:51 titanofold Exp $
+
+*postgis-1.5.3-r1 (23 Aug 2011)
+
+  23 Aug 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  +postgis-1.5.3-r1.ebuild:
+  Fixed typo: ESPG -> EPSG
 
 *postgis-1.4.2 (23 Aug 2011)
 
index 62346ab1236adcd6f8552131a54990d2a3ef14da..f753c528e3e39cd1ac24aefd02ca259d21bf3fc6 100644 (file)
@@ -18,13 +18,14 @@ 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
+EBUILD postgis-1.5.3-r1.ebuild 6919 RMD160 c793d9600c9617c4024dfe4cfce7015a32686afe SHA1 7bba6c66f0c926d5036665129218f00f951da0c5 SHA256 3d65018c24746f74721ddff593afd41077e8189557f6cec31eebbd7b562644d5
 EBUILD postgis-1.5.3.ebuild 7023 RMD160 4e0cdd32268f8a9da26cfaffacc0749135c79cd7 SHA1 6a20b216440acecbdd801c33e8fc5346bfe4b937 SHA256 6b9d06a69aba974f630821a4fd69c4448e21718e3387378b79398b4ac99c2254
-MISC ChangeLog 7919 RMD160 be0393847c04e7abd5d3bbadbc6dc980149c4db2 SHA1 4b7637bc4be3987aba82566210b804b1fc5b1282 SHA256 0f639e3d72bc01b08efd05c72f61770e39207bcf76ee167c324198e99d526ac1
+MISC ChangeLog 8064 RMD160 f4161ed126e5f3f517f20ceada29b6dc3a845a30 SHA1 d3ce573654158b30aa88525e95432f3d15683880 SHA256 8bb80cd735f4c12fa7b935b0ef84c5d09494fc883d76dc8849c58ea4b5450798
 MISC metadata.xml 481 RMD160 09ed331d86c1d68797aaf8a4912539f08f91cbb6 SHA1 a45afb667212035b630d417d2fc9632d99bbd62a SHA256 d0ab8dbe26001259f36c968e1d48ad5fda768227d99319cf4302af804a08d5ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5UKlUACgkQCOhwUhu5AEk+egEAlK+dt9P5xdXztzORIAEjHmYs
-Qqs5GfX7XmNz3r+HhWgBAJsQHj0KPYDOME/nZPgsv5jUe97BeLOOTq0A1QMVVac4
-=kc00
+iF4EAREIAAYFAk5ULeEACgkQCOhwUhu5AEmMJgD+I+M+HhfDcERrK6Mv88P7uG2L
+vXN8DDWtDCjrNK87y+UA/0OuTkwSaD0hTo+1yUpJFNZUtLKOrewBL2FN8h2dLZDv
+=cbH3
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgis/postgis-1.5.3-r1.ebuild b/dev-db/postgis/postgis-1.5.3-r1.ebuild
new file mode 100644 (file)
index 0000000..0fc563a
--- /dev/null
@@ -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-r1.ebuild,v 1.1 2011/08/23 22:46:51 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
+       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}"
+}