Bump
authorPatrick Lauer <patrick@gentoo.org>
Fri, 19 Dec 2014 06:11:07 +0000 (06:11 +0000)
committerPatrick Lauer <patrick@gentoo.org>
Fri, 19 Dec 2014 06:11:07 +0000 (06:11 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64

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

index af373cde894b8cf9a5871a7dd482bb1afe87658d..c098914a6c7f52d31882ac48ae8e86d10e74aa04 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.96 2014/11/08 16:13:19 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.97 2014/12/19 06:10:53 patrick Exp $
+
+*postgis-2.1.5 (19 Dec 2014)
+
+  19 Dec 2014; Patrick Lauer <patrick@gentoo.org> +postgis-2.1.5.ebuild:
+  Bump
 
   08 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> postgis-2.1.4.ebuild:
   Fix bug 528576. Force serial compilation.
index f07eaa7dfdefe3bcac7639ec735297bcd8424d99..e06564bba1064530092e31fe8461fd8457391eaa 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX postgis-1.5-ldflags.patch 1379 SHA256 dd06c5a6dbf085cee2f4d08bae1c6440511596d21876f955f6b6d2e133c97559 SHA512 47164ecf5a875267d545504f2dec6b52d34161cd9598968d323bc8949d9bdcfd911d20519faca1a1cf3ce67d6dd0a9bc201c6afc0df7881752368c70bd3cb69b WHIRLPOOL 8c9fb2945c696b1208ba047e51869f11ceabccabd34d0cc0f2d345bb17d1d1c27421e5536882488eb64460e1e703823e5d3e6392eed1667448313b0fd7330601
 AUX postgis-2.0-arflags.patch 539 SHA256 02429ac34d53c0beaae9d323b65cc85702e46fbf7f83cfd0d0ba7c0f74ba3afa SHA512 e600cf3548fa7c13f7cddec24a0f9078646155b48fb42cd1d41bff311976718ba93bcf7d8361d0494df5e3c6bdff74af5b8b4821026a49618ad3d835383f2785 WHIRLPOOL 506aa9782eac840a9ee21ad2b139035431e2fee2e96b4a8f0900d71bb9aaf693a3f1fae864ad1a19133b4cba362153afda9ef1222cc3bab5e5aaa309772a16e4
 AUX postgis-2.0-ldflags.patch 1355 SHA256 8fd78bcee5d20e8735b4b8d034ca762af0d56d42586449e78207fcad2d52d308 SHA512 5e53f5812d8e4f0be72e92632f881ee8520a9fc0a73ae68a9abc494296075fdc82df51573f7a7d68ea4bf6d691d8de4496bb02f7fa78bf7cf73dcc202af6ae71 WHIRLPOOL 606cbb6a229000f18378f2e3a5e6e0e61d767b2c183df0b28927d4ba9b51488cce2ae36adbfa32386f3c2f5bade3ec6bc92d18bf107de1f9a46c0bd320220af8
@@ -15,17 +12,12 @@ DIST postgis-2.0.6.tar.gz 5651448 SHA256 438fc9cf8d008c537ed2d6776bc30e726eb1f9a
 DIST postgis-2.1.0.tar.gz 6518378 SHA256 fc00481aec904661f3eb11da4305b1666f2040c28b0651de7eac6c22f217b26c SHA512 ed5140aef0e68cb075fc06eaa91733c46d38ce4e01cbf1d97d14ff1a4d447f7cfcaf32924150946c7bb388d334bd5bc9f97753c47c84c16068b9dff6438e8493 WHIRLPOOL a52000a334dd2bb246b665ec7bcd743833c4699cb0cabdd1d9bab3538ee18df6e7b766c06728a97274647f63da1cc130f79902a32cf0621d9a3b8190c8fe596e
 DIST postgis-2.1.1.tar.gz 6717940 SHA256 f55acf056362e7e78766bec7a403e02a3b6b087a6d18b4222647b6a932d5c945 SHA512 f85c4d1db32802b3acbda3f4c391ca961bf1301c699a00682265c7a984fbc74ee7b9fbfc5580fc04dff0491921eb6dbe4d8bd73dded216794a4b7f90c3ed650f WHIRLPOOL 807d0ce975b72315a72d4c2ecd192c612b00530a7e542b18429fed0c69cf6cb95285554c34be58e3d2a2c513f436289449dfbe82c7430fba87e901a4bea49c2d
 DIST postgis-2.1.4.tar.gz 6854492 SHA256 cd73c2a38428c8736f6cae73b955aee0bd42f9ca4fd8d93c1af464524cb100fc SHA512 1d7dd2547fe9819addea0c9dfb4f4c78f30593af21f7cf05c4e40c2684ea3e04ad50c1937ba72172c69df713384c866e6a336b6cab733c9dd0f273f41df568d2 WHIRLPOOL f685cb2e991319b1a2f7a54ce050217d8ea636c02491fca2dafb1a2f66fe3548d4daff6d3de67925a700d9de42af29dfc4af0d26727e77f969a100a1fe964567
+DIST postgis-2.1.5.tar.gz 6827999 SHA256 0d0e27f72f12b8dba456fbde25ed0f6913f42baf57332a7f1b9bbc6f29fddbf4 SHA512 c1d186b237114c951feb78e97dc7d69896dcb0884c02e49d93e8602590e82d34a808eb12c127c7dc78db3237ac619709f8bd7febb4670909b03615f8278aede2 WHIRLPOOL c203aa2034e899647139445ce0b1e6e7637a0e2ad3c1f6d4ee1f303d9734b219b68d18fb6d6e7da6c9df53f90e8dfd30ce8d4ab8a6c942b96db7e8b55d632417
 EBUILD postgis-2.0.3.ebuild 7188 SHA256 82363577ee497a8b8155b362a0b9617f3786f1f1fb4f07e54de0761b916d59f6 SHA512 6c05a1537cf8e4cbcbe2203a3a05af31d6309d315ab685b4882ee041adf9258733faa88af4748a087a48d1749af544b0533d3ffd77c7f77913994a57292e9bb4 WHIRLPOOL 1e3dfc9043891c5f6d88b5e911dd74f7a606ca9a4c12b20462043a8f218056ff5d68c7b2c725584e66569e1a3471492c8373d28af8813f880407b929ffd9da0b
 EBUILD postgis-2.0.6.ebuild 7058 SHA256 67b6b8014fc5875586e01fde3194df4acf00644b432526435e5c6dcf06a92e90 SHA512 ef0a0e195fe47849bc02e175eaa0668ebf2a8359145b20c595752ebe1ee99045b70e1d8930f837eb825c779a9b4568feeb1df0730af4de58c7cc37f1b32ea0ed WHIRLPOOL 4d8d88dd25e55564d3b587388eb61593b25137a64ff795a79535059ddb20607f3e679e6c609773cdae1453d32fe583369822315999972f94b9838f3972aca6c1
 EBUILD postgis-2.1.0.ebuild 7791 SHA256 9eb718523c8ab27c3ebaa62023d5af1db52e2c147f000f3ca0b6c6fb1f8ce001 SHA512 fd286e608350d6e17908c685a751ce550393d85b4a50bd822226d13ffc0a05775a34a2f4bccdbf87807766e405baea9f1e816ee0a60bcb3b1b7f77714bb8ae95 WHIRLPOOL 676b896e122ac6adbade50bedba2280293e6b154188381c0e79f218708801211ff8532e19018671e747d86a87cdb2bff4ff27f4473f02dcd97d1b2ee7e426eb3
 EBUILD postgis-2.1.1.ebuild 7955 SHA256 b7afc5f5ec12b8cb0c7dc810525365135241d16ddf3873db660d1106056d2c44 SHA512 cfff7d798a843217384175134fd7beb6bbbc056641da1c10c4537c4cf0276991c7b4fe94795f013d90faa9c9b287866d4b41d0705abd9cf2b335fd4038ec9a2e WHIRLPOOL 565dacb6aec53cb3aa69cb991d8e44bc81894f895464cb0456ea4348556ec3cff319bc0a3ac20ec88e1ab3b08bf94f136f6ed1189ee7e5817d6bde4560579017
 EBUILD postgis-2.1.4.ebuild 7653 SHA256 bfde9b02c3d5d5acd6ffe05ef18e972326e9b8b17855f6524e328b2341a2d5f6 SHA512 096dd9b6581ff132611063c597a7513a4ad41dcc65fa18603a74798f1933b71e1999f9860d0e8af129abd4e8f7d8286b838ccd2773d29823d4f212c3fcfe64f7 WHIRLPOOL a117d65d3a1d79322cda70c0b400591a864576847e725eb47db7cefbae1c11fe8853148062f8b587fcf15eb1d4877dc423b3fba8684abe78c170eff9c7d7af88
-MISC ChangeLog 13948 SHA256 befcd6004d7c2dcda3d78ed0a73d63b9cd1c18942192245dfe0847551c6cf283 SHA512 377c6718be542c7631fbafde0ec6b2abd48c5c78a5bca455e9acf5b1f95bace2a60543d255559a643a5d556dac8374922f2d1bb76bd3b6e1898419b5266c179f WHIRLPOOL 9138359ff92cdb0e94ac7081bee278f88946066e1f76c23ff18a749e48ec98f33e5f2a22455408499a09e4a0e114943abdae6c13810fbf81a68d5dc4a748d8c1
+EBUILD postgis-2.1.5.ebuild 7650 SHA256 bff49871859d7498207acd22525b42f748d789f0d8a1f815e1d280f5506c4a1b SHA512 f9442595eac4da25a8f8903d67616dd33429c45f12a36db38e89c529a17d7efc6a32826f7dc336b30a1bc34d2c209f85251dee8c7dd4ab247ac419dd9d2d218b WHIRLPOOL 3ab982aa559073a3fa9e9bb040a7a0952900c0bcfe6acfdfbe46aad2c1a8dec0c79886415d4b6602f32b9130b2e906343e00e416ffc984f190010311acf26d89
+MISC ChangeLog 14056 SHA256 24b56adc00e79846d7dafc80e501e466a6c8803ae07e0daca114e06d2bbdd2d6 SHA512 ecf63466752abfe6d01bc5d96ddc8c090bc520c0b86f39b358797720caefb0373027e4152fef4447ca11e113ef109827eda91b6deff9a4d4112079f02be14e32 WHIRLPOOL 9f6b425124246b522906953771aa90c27748706f9a5e18b827e73d394f80b5df3b49492bfb89281e132496962b08c542f64493e42976b57e4f75ac496577d12e
 MISC metadata.xml 293 SHA256 aba886c4c12c0d9948f277e58a17e155a6d3d7c3424f409a4d4789fb613a5cd3 SHA512 74abb5ec4fae7313859af907a10d68462c185f07923fb4a7aeabcfaea949b6e71647dce38fa6fafcda3e24bbb1f4912fbec2405f5b7bfb4ddf012e59d9e31c01 WHIRLPOOL 9627fa5905b0a0758f64d7d269edbd889f26f6e39a03af6aabdf6b2781d23a581b9b4bc97f06589f997dbc4fa15c83fd149bedc9e12c206904e91af42c1eef84
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EAREIAAYFAlReQSAACgkQVxOqA9G7/aA+6AD+L+fkEyMhsfAHNF+mEsD/rx3u
-4IJpIZteusICPRwfVHsA/1vmbWH4LySb0qUFFykWk493Z7i6LHawjwY75Z8RDbrm
-=UTGB
------END PGP SIGNATURE-----
diff --git a/dev-db/postgis/postgis-2.1.5.ebuild b/dev-db/postgis/postgis-2.1.5.ebuild
new file mode 100644 (file)
index 0000000..c7017f2
--- /dev/null
@@ -0,0 +1,291 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.5.ebuild,v 1.1 2014/12/19 06:10:53 patrick Exp $
+
+EAPI="5"
+POSTGRES_COMPAT=( 9.{0,1,2,3,4} )
+
+inherit autotools eutils versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net"
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gtk static-libs test"
+
+RDEPEND="
+               || (
+                       virtual/postgresql:9.4[server]
+                       virtual/postgresql:9.3[server]
+                       virtual/postgresql:9.2[server]
+                       virtual/postgresql:9.1[server]
+                       virtual/postgresql:9.0[server]
+               )
+               dev-libs/json-c
+               dev-libs/libxml2:2
+               >=sci-libs/geos-3.4.2
+               >=sci-libs/proj-4.6.0
+               >=sci-libs/gdal-1.10.0
+               gtk? ( x11-libs/gtk+:2 )
+"
+
+DEPEND="${RDEPEND}
+               doc? (
+                               app-text/docbook-xsl-stylesheets
+                               app-text/docbook-xml-dtd:4.5
+                               dev-libs/libxslt
+                               || (
+                                       media-gfx/imagemagick[png]
+                                       media-gfx/graphicsmagick[imagemagick,png]
+                               )
+               )
+               virtual/pkgconfig
+               test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc )"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+MAKEOPTS+=' -j1'
+
+# These modules are built using the same *FLAGS that were used to build
+# dev-db/postgresql. The right thing to do is to ignore the current
+# *FLAGS settings.
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+postgres_check_slot() {
+       if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+               die 'POSTGRES_COMPAT not declared.'
+       fi
+
+# Don't die because we can't run postgresql-config during pretend.
+[[ "$EBUILD_PHASE" = "pretend" \
+       && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
+
+       local res=$(echo ${POSTGRES_COMPAT[@]} \
+               | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
+
+       if [[ "$res" -eq "0" ]] ; then
+                       eerror "PostgreSQL slot must be set to one of: "
+                       eerror "    ${POSTGRES_COMPAT[@]}"
+                       return 1
+       fi
+
+       return 0
+}
+
+pkg_pretend() {
+       postgres_check_slot || die
+}
+
+pkg_setup() {
+       postgres_check_slot || die
+       export PGSLOT="$(postgresql-config show)"
+}
+
+src_prepare() {
+       epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
+               "${FILESDIR}/${PN}-2.0-arflags.patch" \
+               "${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch"
+
+       local AT_M4DIR="macros"
+       eautoreconf
+}
+
+src_configure() {
+       local myargs=""
+       use gtk && myargs+=" --with-gui"
+       econf \
+               --with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
+               ${myargs}
+}
+
+src_compile() {
+       emake
+       emake -C topology
+
+       if use doc ; then
+               emake comments
+               emake cheatsheets
+               emake -C doc html
+       fi
+}
+
+src_install() {
+       emake DESTDIR="${D}" install
+       use doc && emake DESTDIR="${D}" comments-install
+       emake -C topology DESTDIR="${D}" install
+       dobin ./utils/postgis_restore.pl
+
+       dodoc CREDITS TODO loader/README.* doc/*txt
+
+       use doc && dohtml -r doc/html/*
+
+       docinto topology
+       dodoc topology/{TODO,README}
+
+       insinto /etc
+       doins "${FILESDIR}/postgis_dbs"
+
+       use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+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_match
+       server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
+               -Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}")
+       if [[ $? = 0 ]] ; then
+               if [[ $server_match -ne 1 ]] ; 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}"
+               local comment_file
+               for comment_file in "${postgis_path}"/*_comments.sql ; do
+                       psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
+                       retval=$?
+                       [[ $retval == 0 ]] && continue || safe_exit
+               done
+               eend 0
+       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 "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
+}