dev-db/postgis: Version Bump

Version bump fixing bug 564502.

Bug: 564502

Package-Manager: portage-2.2.20.1

3 files changed, 162 insertions, 0 deletions

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 2862459254e4..06cc04246646 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -7,3 +7,4 @@ DIST postgis-2.1.5.tar.gz 6827999 SHA256 0d0e27f72f12b8dba456fbde25ed0f6913f42ba
 DIST postgis-2.1.6.tar.gz 6803831 SHA256 6ffdf655bc4fca2b5495dd96f44b266e84111912d5c3f91b832023c4fec5c222 SHA512 a6c1263d64f2c1828656d5613840d721fb70ecbdfab3e28099c8f6b80d5404d46a9376913c0ab46c7f1109517c04430800b8c3be0c94d964421c6681afb2f997 WHIRLPOOL 98bfcae992f444b63840a28ef90077c01473ea528aa72ae5fd283b4fdcf7b7e37732afeac1a29fc87e330f687ca491d5afbed44b0792fb00763dc682501d37a3
 DIST postgis-2.1.7.tar.gz 6804372 SHA256 00ab79a3f609d7ea458f6fc358032ad059cb720baf88285243d6436a597a7ec2 SHA512 021fcb73c2109dafb67cb9d459eb08e0da7e55cf1a5fab81115aad3b0a61809b8f83d7a278aa04e41ecd633164e4257a90d5dfc0e81339b0c322e7d41d3c5eae WHIRLPOOL 938cacf1af4ba8a2f0f3bbefe11c0014a31cd331186cd7fc7fc0a242528094efb617326a484bdad76704bfb98fd065a7f280ab663088440af0555fc69862e36b
 DIST postgis-2.1.8.tar.gz 6811272 SHA256 7c2380b895fe7bda34c2e70deab3fcf4c12b13ab40d7501cdaa6fa36f1a6c662 SHA512 e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4 WHIRLPOOL b6675fecbb922379bd50c351abe1553fdbda53543fce56451c688e25a3fa2e9d0813d8f3a349b623b85fcb4016fc4710f6746a224ba7673ec0d2106c7635d3d1
+DIST postgis-2.2.0.tar.gz 10164837 SHA256 66f0f8480d535959b8bb9abb5ee5d602d1001413ca770df120baf3de627f9e91 SHA512 e9954d5c4aa381536ae87c32bb37b166a7ede0f9b9fc96cfb300dc2350b9351f40870429f64e755c3371be692a1956f5f8ea21733b64aab490f42d2232ae5d8f WHIRLPOOL 639c6b278dd6e5c3a11ed1d8de179ee72a4e6e9c54ba1e74e585e9233167a3c2cdca0704c47966cf757db22221ebbc8970a68375894a6179970ab6c0e6c637a2
diff --git a/dev-db/postgis/files/postgis-2.2.0-arflags.patch b/dev-db/postgis/files/postgis-2.2.0-arflags.patch
new file mode 100644
index 000000000000..97770042d8f6
--- /dev/null
+++ b/dev-db/postgis/files/postgis-2.2.0-arflags.patch
@@ -0,0 +1,18 @@
+diff -Naruw a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
+--- a/raster/rt_core/Makefile.in	2015-05-13 14:13:18.000000000 -0400
++++ b/raster/rt_core/Makefile.in	2015-12-14 16:49:49.166156232 -0500
+@@ -18,7 +18,7 @@
+ #
+ #############################################################################
+ 
+-AR = ar rs
++ARFLAGS = rs
+ 
+ CC = @CC@
+ LIBLWGEOM_LDFLAGS = ../../liblwgeom/.libs/liblwgeom.a
+@@ -64,4 +64,4 @@
+ 	rm -f Makefile
+ 
+ librtcore.a: $(RT_OBJS)
+-	$(AR) $(RT_LIB) $(RT_OBJS)
++	$(AR) $(ARFLAGS) $(RT_LIB) $(RT_OBJS)
diff --git a/dev-db/postgis/postgis-2.2.0.ebuild b/dev-db/postgis/postgis-2.2.0.ebuild
new file mode 100644
index 000000000000..6fb8ddc3aa2c
--- /dev/null
+++ b/dev-db/postgis/postgis-2.2.0.ebuild
@@ -0,0 +1,143 @@
+# 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.4.ebuild,v 1.2 2014/11/08 12:51:46 titanofold Exp $
+
+EAPI="5"
+POSTGRES_COMPAT=( 9.{1,2,3,4,5} )
+
+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="
+		|| (
+			dev-db/postgresql:9.5[server]
+			dev-db/postgresql:9.4[server]
+			dev-db/postgresql:9.3[server]
+			dev-db/postgresql:9.2[server]
+			dev-db/postgresql:9.1[server]
+		)
+		dev-libs/json-c
+		dev-libs/libxml2:2
+		>=sci-libs/geos-3.5.0
+		>=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.2.0-arflags.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}
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "To finish installing PostGIS, follow the directions detailed at:"
+	elog "http://postgis.net/docs/manual-${MY_PV}/postgis_installation.html#create_new_db_extensions"
+}