Version bump and fix bug 464386 and bug 477810.

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)

3 files changed, 57 insertions, 66 deletions

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 0e4722e125f0..6e3a4a46759a 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/postgis
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.83 2013/06/26 10:59:19 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.84 2013/08/18 19:18:15 titanofold Exp $
+
+*postgis-2.1.0 (18 Aug 2013)
+
+  18 Aug 2013; Aaron W. Swenson <titanofold@gentoo.org>
+  -postgis-2.1.0_beta3.ebuild, +postgis-2.1.0.ebuild,
+  files/postgis-2.1-pkgconfig-json.patch:
+  Version bump and fix bug 464386 and bug 477810.
 
 *postgis-2.1.0_beta3 (26 Jun 2013)
 
@@ -260,7 +267,7 @@
 
   06 Jan 2007; <djay@gentoo.org> metadata.xml, +postgis-1.1.6.ebuild,
   +postgis-1.2.0.ebuild:
-  Adding postgis-1.1.6 and postgis-1.2.0 ebuilds. Special thanks to 
+  Adding postgis-1.1.6 and postgis-1.2.0 ebuilds. Special thanks to
   dev-zero for his help.
 
   17 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
diff --git a/dev-db/postgis/files/postgis-2.1-pkgconfig-json.patch b/dev-db/postgis/files/postgis-2.1-pkgconfig-json.patch
index fcef149646e9..9907e73d7410 100644
--- a/dev-db/postgis/files/postgis-2.1-pkgconfig-json.patch
+++ b/dev-db/postgis/files/postgis-2.1-pkgconfig-json.patch
@@ -1,7 +1,7 @@
-diff -Naurw postgis-2.1.0beta3.orig/configure.ac postgis-2.1.0beta3/configure.ac
---- postgis-2.1.0beta3.orig/configure.ac	2013-06-21 15:45:40.000000000 +0000
-+++ postgis-2.1.0beta3/configure.ac	2013-06-23 22:47:31.914947086 +0000
-@@ -743,65 +743,14 @@
+diff -Naruw postgis-2.1.0.orig/configure.ac postgis-2.1.0/configure.ac
+--- postgis-2.1.0.orig/configure.ac	2013-07-09 03:36:15.000000000 +0000
++++ postgis-2.1.0/configure.ac	2013-08-18 18:14:23.263697970 +0000
+@@ -745,65 +745,21 @@
  dnl Detect if json-c installed
  dnl ===========================================================================
  
@@ -62,33 +62,36 @@ diff -Naurw postgis-2.1.0beta3.orig/configure.ac postgis-2.1.0beta3/configure.ac
 +                      HAVE_JSON=yes
  	AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
 -fi
-+                  ],
-+                  [HAVE_JSON=no])
- 
+-
 -AC_SUBST([JSON_CPPFLAGS])
 -AC_SUBST([JSON_LDFLAGS])
--
++                  ],
++                  [
++                      PKG_CHECK_MODULES([JSON], [json-c],
++                      [
++                          HAVE_JSON=yes
++	                  AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
++                      ],
++                      [HAVE_JSON=no])
++                  ])
+ 
 -fi dnl }
 +AC_SUBST([HAVE_JSON])
  
  dnl ===========================================================================
  dnl Detect GTK+2.0 for GUI
-@@ -892,10 +841,10 @@
- AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics])
- 
- 
--CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS"
-+CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $JSON_CFLAGS"
- dnl AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
+@@ -896,7 +852,7 @@
+ CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS"
+ AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
  
 -SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS $SFCGAL_LDFLAGS"
 +SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LIBS $XML2_LDFLAGS $SFCGAL_LDFLAGS"
  AC_SUBST([SHLIB_LINK])
  dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
  
-diff -Naurw postgis-2.1.0beta3.orig/liblwgeom/lwin_geojson.c postgis-2.1.0beta3/liblwgeom/lwin_geojson.c
---- postgis-2.1.0beta3.orig/liblwgeom/lwin_geojson.c	2013-02-28 17:42:49.000000000 +0000
-+++ postgis-2.1.0beta3/liblwgeom/lwin_geojson.c	2013-06-23 22:49:06.427947772 +0000
+diff -Naruw postgis-2.1.0.orig/liblwgeom/lwin_geojson.c postgis-2.1.0/liblwgeom/lwin_geojson.c
+--- postgis-2.1.0.orig/liblwgeom/lwin_geojson.c	2013-02-28 17:42:49.000000000 +0000
++++ postgis-2.1.0/liblwgeom/lwin_geojson.c	2013-08-18 18:11:52.473943571 +0000
 @@ -17,8 +17,8 @@
  
  #ifdef HAVE_LIBJSON
@@ -106,9 +109,9 @@ diff -Naurw postgis-2.1.0beta3.orig/liblwgeom/lwin_geojson.c postgis-2.1.0beta3/
  }
 -
 -
-diff -Naurw postgis-2.1.0beta3.orig/liblwgeom/Makefile.in postgis-2.1.0beta3/liblwgeom/Makefile.in
---- postgis-2.1.0beta3.orig/liblwgeom/Makefile.in	2013-05-09 19:38:17.000000000 +0000
-+++ postgis-2.1.0beta3/liblwgeom/Makefile.in	2013-06-23 22:53:56.715076184 +0000
+diff -Naruw postgis-2.1.0.orig/liblwgeom/Makefile.in postgis-2.1.0/liblwgeom/Makefile.in
+--- postgis-2.1.0.orig/liblwgeom/Makefile.in	2013-05-09 19:38:17.000000000 +0000
++++ postgis-2.1.0/liblwgeom/Makefile.in	2013-08-18 18:11:52.477943594 +0000
 @@ -11,8 +11,8 @@
  # **********************************************************************
  
diff --git a/dev-db/postgis/postgis-2.1.0_beta3.ebuild b/dev-db/postgis/postgis-2.1.0.ebuild
index 0af2f9a80fdf..8eed47fa3e12 100644
--- a/dev-db/postgis/postgis-2.1.0_beta3.ebuild
+++ b/dev-db/postgis/postgis-2.1.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.0_beta3.ebuild,v 1.1 2013/06/26 10:59:19 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.0.ebuild,v 1.1 2013/08/18 19:18:15 titanofold Exp $
 
-EAPI="4"
-
-PG_SLOT_MIN="9.0"
+EAPI="5"
+POSTGRES_COMPAT=( 9.{0,1,2,3} )
 
 inherit autotools eutils versionator
 
@@ -18,7 +17,7 @@ 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"
+IUSE="doc gtk"
 
 RDEPEND="
 		|| (
@@ -62,57 +61,37 @@ QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
 MAKEOPTS="-j1"
 
 postgres_check_slot() {
-	local pg_slot="$(postgresql-config show) 2> /dev/null"
-
-	# If app-admin/eselect-postgresql is not installed, or the slot
-	# hasn't been set before pkg_pretend is called, skip the rest of
-	# this function.
-	if [[ -z ${pg_slot} || "${pg_slot}" = "(none)" ]] ; then
-		if [[ "$EBUILD_PHASE" = "pretend" ]] ; then
-			return 1
-		else
-			if [[ "${pg_slot}" = "(none)" ]] ; then
-				die "Please set a default slot with postgresql-config"
-			elif [[ -z ${pg_slot} ]] ; then
-				die "This isn't supposed to happen."
-			fi
-		fi
+	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+		die 'POSTGRES_COMPAT not declared.'
 	fi
 
-	if [[ -n $PG_SLOT_MIN && $PG_SLOT_MIN != -1 ]] ; then
-		if [[ ${pg_slot//.} < ${PG_SLOT_MIN//.} ]] ; then
-			eerror "You must build ${CATEGORY}/${PN} against PostgreSQL ${PG_SLOT_MIN} or higher."
-			eerror "Set an appropriate slot with postgresql-config."
-			die
-		fi
-	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
 
-	if [[ -n $PG_SLOT_MAX && $PG_SLOT_MAX != -1 ]] ; then
-		if [[ ${pg_slot//.} > ${PG_SLOT_MAX//.} ]] ; then
-			eerror "You must build ${CATEGORY}/${PN} against PostgreSQL ${PG_SLOT_MAX} or lower."
-			eerror "Set an appropriate slot with postgresql-config."
-		fi
-	fi
+	local res=$(echo ${POSTGRES_COMPAT[@]} \
+		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
 
-	if [[ -n $PG_SLOT_SOFT_MAX ]] ; then
-		if [[ ${pg_slot//.} > ${PG_SLOT_SOFT_MAX//.} ]] ; then
-			ewarn "You are building ${CATEGORY}/${PN} against a version of PostgreSQL greater than ${PG_SLOT_SOFT_MAX}."
-			ewarn "This is not supported here."
-			ewarn "Any bugs you encounter should be reported upstream."
-		fi
+	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
+	postgres_check_slot || die
 }
+
 pkg_setup() {
-	postgres_check_slot
+	postgres_check_slot || die
 	export PGSLOT="$(postgresql-config show)"
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0-ldflags.patch" \
+	epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
 		"${FILESDIR}/${PN}-2.0-arflags.patch" \
 		"${FILESDIR}/${PN}-2.1-pkgconfig-json.patch"
 
@@ -123,7 +102,9 @@ src_prepare() {
 src_configure() {
 	local myargs=""
 	use gtk && myargs+=" --with-gui"
-	econf ${myargs}
+	econf \
+		--with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
+		${myargs}
 }
 
 src_compile() {