Really fix bug 454774.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

4 files changed, 115 insertions, 10 deletions

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 770fbbbbeb77..8647e053db34 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,10 @@
 # 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.73 2013/02/03 15:01:38 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.74 2013/02/04 14:55:54 titanofold Exp $
+
+  04 Feb 2013; Aaron W. Swenson <titanofold@gentoo.org>
+  postgis-2.0.2-r1.ebuild, +files/postgis-2.0-pkgconfig-json.patch:
+  Really fix bug 454774.
 
 *postgis-2.0.2-r1 (03 Feb 2013)
 
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 35febc49f985..6d7efc8f61eb 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX postgis-1.5-ldflags.patch 1379 SHA256 dd06c5a6dbf085cee2f4d08bae1c6440511596d21876f955f6b6d2e133c97559 SHA512 47164ecf5a875267d545504f2dec6b52d34161cd9598968d323bc8949d9bdcfd911d20519faca1a1cf3ce67d6dd0a9bc201c6afc0df7881752368c70bd3cb69b WHIRLPOOL 8c9fb2945c696b1208ba047e51869f11ceabccabd34d0cc0f2d345bb17d1d1c27421e5536882488eb64460e1e703823e5d3e6392eed1667448313b0fd7330601
 AUX postgis-2.0-ldflags.patch 1355 SHA256 8fd78bcee5d20e8735b4b8d034ca762af0d56d42586449e78207fcad2d52d308 SHA512 5e53f5812d8e4f0be72e92632f881ee8520a9fc0a73ae68a9abc494296075fdc82df51573f7a7d68ea4bf6d691d8de4496bb02f7fa78bf7cf73dcc202af6ae71 WHIRLPOOL 606cbb6a229000f18378f2e3a5e6e0e61d767b2c183df0b28927d4ba9b51488cce2ae36adbfa32386f3c2f5bade3ec6bc92d18bf107de1f9a46c0bd320220af8
+AUX postgis-2.0-pkgconfig-json.patch 3483 SHA256 81d277bef1be3b8465e7a03ddb14f7d1a1cd914940a784690623fde2aa0fe704 SHA512 b4d63b4eb2f4a4b583d04ea0fffbafcad8b101292b9ae039aa7a8a5973e6065efe361cb48c10d755d02ede65c238d356c5dab9f333e732f4e91d438b405543b0 WHIRLPOOL bd3f039fcb651789139ea78a50cd94d11f8dcc97cca8bfa00ec1e7986304fea30a4201b8670b7023ddb554e54c0413c0fca0dcd77e4fdea8f727f5dfb99dc768
 AUX postgis_dbs 2096 SHA256 dafde4a1d1d95e18facb3287baddab3c1c116933498c310438c91dbd736833ec SHA512 5a11a3ce0153461f363d1b9a393dd10392e123c7b18b20610a5e26f2c7c6ed258a1517082a244c6ab5de40d439bc8a370848a0177c3c2ffcffc67a24fca8e66a WHIRLPOOL 8e4c34ac428c5ac887b414334fe80424b09845585596be1affaf69a9205af7dd183198eed44fa0406074ad1bcc133db8a9a13acd4a0882945b32ec8e0a480b61
 AUX postgis_dbs-1.4 2096 SHA256 287224c16cbd286c75098e786235ad07226217fbcf76071279081e6cb1d1add1 SHA512 520711a6165dbb08c7ce86001f885340b5dbc54efc2a863726b09d93db9e0d888c21fa5b466506456cacadd55db8531284c5b85f484c599d313f4d9aac56c1ef WHIRLPOOL 1b87d8edf109dd76a54a8c7819731a843e7ec139bcaef4b69605304a336eb3d558e656c1adf06ca487f1c5624c542634be7b885dd888e5ef4ec89e2970d38195
 DIST postgis-1.3.6.tar.gz 2227317 SHA256 d3b04d4a3439596a1f6368b0627f21762347cef1e0694d5471ef17c6a3b7d144 SHA512 0e98aeaf8c3c3ca1c51c617a6f50f066a69129b63721507708f02c69b5ff8e75c4b7b076f5075263ceedaf10904eaf950784b2c2f9f27ba3bb982f871b68fd4b WHIRLPOOL c45c611a992b044f63be3259c046f01e34b0772f2f95bf7fb7b71b54adef1c72aa3c86141bff8d305751e4598ee18a40e1ebc5439501b76e6c430c19c988d316
@@ -22,13 +23,13 @@ EBUILD postgis-1.5.5.ebuild 6913 SHA256 49fa5186e567d8e857ee5088055d2380a3a72b6a
 EBUILD postgis-1.5.8.ebuild 6674 SHA256 38555180bb2e4921d6fa19c12aee36d1e016c601c35350e6c43b68b0a2da95ed SHA512 15a4533460d2ab46cbda115ebe1d607939a8014f3f7a7a726fd1138bc0261f03f3a6366737a120590d2d776fa13832377acb79351c739c875e38ce5bce7a4881 WHIRLPOOL d753889eb5384d0a3c4473223d0cba6c17b3be9a2e2b75a4557ebae3ff81ceff12ca0582053d116401f15924d37d7b29c9c78fe4514c88137becbc3746fe8669
 EBUILD postgis-2.0.0.ebuild 6901 SHA256 94fddc0709cad9a31370308593318277697d6f88cda576625db57547661c37d9 SHA512 f3985bbd13e2faba0e2c9e8ebcdcbae48b9ffc67c2b5ea965cd66e33f7f9f620217cf029ea487756eb5a45fab5ddd40297b7127c1354c7beb89ae4aa3e1a5708 WHIRLPOOL 6de8c7fbb55e17541d3d86b6bdb475cc28677cf517d286e1f8b392caa2fc0643b695ee4466533ff0f5354e1cce77c2482e7dd16915b45fb37f9134bc0caa78ed
 EBUILD postgis-2.0.1.ebuild 6960 SHA256 c2d3875e8c482790d4e7d603048e600863e2cc00faf94f3db365e73038525ecb SHA512 dc45b7fe13883f4c2706c45c3156d4964f4cb09041e8ace5de89adaea4b37ef2ddaf98fa22155ddb6c07bc9a840f32c9088d650952974a9e7c055d6c0e246947 WHIRLPOOL 5870ca61c8cc9872b6bdc917d943e0738356aa3d7947567b6e50f27dc90dcb390d53546c5b14ccf51e94ef8b852481c38343177ab672ae409f4f36c145f2c3c9
-EBUILD postgis-2.0.2-r1.ebuild 6986 SHA256 9c663a4acbe950b44c78aabcb3d5b92a6bda5bc51de2c2b16b87c3e2cedcc183 SHA512 01224ac851636e3ca5500d728d165e729b36ea62d4b7cc37bad9ef0fb5a86b44d4116c1c40c080a3928d0c4996937617b6acb931c3e232a20eb34077993d3d22 WHIRLPOOL 0c79568c46bb9a29e24e73f7da92fa7b0afd64500df6a64c8a88ae9e7111167e88d15c1da289f6eace7f94b17bc87b2f7089db367c541d2f6a4015657b708088
-MISC ChangeLog 10463 SHA256 3478a2a4967a0493c308a2f91ee8a70663c0eff435c0d36b215b0090a7861638 SHA512 563b66195d236de4209ea61bcf6c8aebd101cca9d4973eb41be325d02d3bb55014ef1b58eae821f425e1704e4f9fb7982e5b66fba428b516944df1d2d3701839 WHIRLPOOL a009714230c3d39ff021f8e991c2adfec13f2df1503eb9d9acfc8b95952619d6e7a26886fa651c59cb767feed8a4452121b964a490643ac0dc62dcc94bc1dd9e
+EBUILD postgis-2.0.2-r1.ebuild 7026 SHA256 0a39ebeacc083effe0657ec8cab88c4b9f2284d3632d7b7ae4ef0e62f7d18619 SHA512 beb90b4bee4396559ec59cc17e9571441fab619eac290a072177103f5c4d015a065d2d074f9efe7cb2ed290446cd3e3a194c792dcb7409008db1093c9471b93d WHIRLPOOL 5f1dafe619ee856fc885a3394ab2ef2326c5aa17975ead0f6a7da5bfb8935d869ed69fa49b6790082d9cdb763703841f0015c658b9b17869bdd48fd9404df9bb
+MISC ChangeLog 10613 SHA256 abb99642a91c4f9f858d42fb2a6792640ff42e1d4de1edae271511b4edc04d6a SHA512 5d7e07092980ea3d45093ddf4ddb78ac3dc652139d671d7e02858b8ac4603eed747362eaeaf94faafad131dcf07e34559b0aaee52120373becabd4b2a560d7b5 WHIRLPOOL fd13013ed4fb6b91ec3c6d5be6126f67f9bdd398c07435c27a4305ff3be21280e212f0f3be821051f5d2fe84ff865efadfc515e722d7b00d1966773c6f258565
 MISC metadata.xml 481 SHA256 d0ab8dbe26001259f36c968e1d48ad5fda768227d99319cf4302af804a08d5ef SHA512 5299745d72d13ccc71d5f6eee5d343268a59f57ac208621c81643e7f2160b66382c3dd0bf07c97f4cefaebfbbbfc5e11e6b84318f5fc536877f123be2fd7743e WHIRLPOOL 257b7f00ffcd56df202c0e1cd75383bf7ed9b0c854cadb9371a281bbd200b8686c70d3d28cadd06756510f9d6536ee64c636a12f5170ce5c608e82d1148ba9fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEOe9kACgkQVxOqA9G7/aBU4AD7BhcywsSSakpGvj/py+LVlgjr
-IM4X37HAbnIaHlkbga8A/0E0M1XzCdDHKLCT04p/3oWqYVwicOK85hLGWLxn6Urx
-=WnqM
+iF4EAREIAAYFAlEPyQkACgkQVxOqA9G7/aAExgD9FSOwmokCpK56JR3RgLi+mHpl
+8GBL4u0iJIpBh8/A97oA/jeo0vdueGUeRdV3xYb6KXVwEfPOuIl3h7Y5YRT8OvOf
+=gWmV
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch b/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch
new file mode 100644
index 000000000000..06a1c6a5740c
--- /dev/null
+++ b/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch
@@ -0,0 +1,97 @@
+diff -Naurw postgis-2.0.2.orig/configure.ac postgis-2.0.2/configure.ac
+--- postgis-2.0.2.orig/configure.ac	2012-05-17 12:10:04.000000000 +0000
++++ postgis-2.0.2/configure.ac	2013-02-03 23:23:31.884847406 +0000
+@@ -701,57 +701,11 @@
+ dnl Detect if json-c installed
+ dnl ===========================================================================
+ 
+-HAVE_JSON=no
+-AC_SUBST([HAVE_JSON])
+-
+-AC_ARG_WITH([jsondir],
+-	[AS_HELP_STRING([--with-jsondir=PATH], [specify the json-c installation directory])],
+-	[JSONDIR="$withval"], [JSONDIR=])
+-
+-if test ! "x$JSONDIR" = "x"; then
+-	dnl Make sure that the directory exists
+-	if test "x$JSONDIR" = "xyes"; then
+-		AC_MSG_ERROR([you must specify a parameter to --with-jsondir, e.g. --with-jsondir=/path/to])
+-	else
+-		dnl We need (libjson.so OR libjson.a OR libjson.dll) AND json/json.h
+-		if test ! -e "${JSONDIR}/include/json/json.h" -o \
+-		        ! \( -e "${JSONDIR}/lib/libjson.so" -o \
+-		            -e "${JSONDIR}/lib/libjson.dll" -o \
+-		            -e "${JSONDIR}/lib/libjson.dylib" -o \
+-		            -e "${JSONDIR}/bin/libjson.dll" -o \
+-		            -e "${JSONDIR}/lib/libjson.a" \) 
+-		then
+-			AC_MSG_ERROR([Cannot find json dev files in "$JSONDIR"])
+-		fi
+-		AC_MSG_RESULT([Using user-specified json-c directory: $JSONDIR])
+-
+-		dnl Add the include directory to JSON_CPPFLAGS
+-		JSON_CPPFLAGS="-I$JSONDIR/include"
+-		JSON_LDFLAGS="-L$JSONDIR/lib -ljson"
+-	fi
+-fi
++PKG_CHECK_MODULES([JSON], [json], [HAVE_JSON=yes], [HAVE_JSON=no])
+ 
+-dnl Check that we can find the json/json.h header file
+-CPPFLAGS_SAVE="$CPPFLAGS"
+-CPPFLAGS="$JSON_CPPFLAGS"
+-AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [])	
+-CPPFLAGS="$CPPFLAGS_SAVE"
+-
+-dnl Ensure we can link against libjson
+-LIBS_SAVE="$LIBS"
+-LIBS="$JSON_LDFLAGS"
+-AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes], [], [])
+-LIBS="$LIBS_SAVE"
+-
+-if test "$HAVE_JSON" = "yes"; then
+-	AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
+-    if test "x$JSON_LDFLAGS" = "x"; then
+-        JSON_LDFLAGS="-ljson"
+-    fi
+-fi
+-
+-AC_SUBST([JSON_CPPFLAGS])
+-AC_SUBST([JSON_LDFLAGS])
++AC_SUBST([HAVE_JSON])
++AC_SUBST([JSON_CFLAGS])
++AC_SUBST([JSON_LIBS])
+ 
+ dnl ===========================================================================
+ dnl Detect GTK+2.0 for GUI
+@@ -842,10 +796,10 @@
+ AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics])
+ 
+ 
+-CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $JSON_CPPFLAGS $XML2_CPPFLAGS"
++CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $JSON_CFLAGS $XML2_CPPFLAGS"
+ dnl AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
+ 
+-SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS"
++SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LIBS $XML2_LDFLAGS"
+ AC_SUBST([SHLIB_LINK])
+ dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
+ 
+diff -Naurw postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c postgis-2.0.2/postgis/lwgeom_in_geojson.c
+--- postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c	2012-12-03 16:18:33.000000000 +0000
++++ postgis-2.0.2/postgis/lwgeom_in_geojson.c	2013-02-04 14:23:34.242564302 +0000
+@@ -28,8 +28,8 @@
+ #ifdef HAVE_LIBJSON
+ 
+ #include "lwgeom_export.h"
+-#include <json/json.h>
+-#include <json/json_object_private.h>
++#include <json.h>
++#include <json_object_private.h>
+ 
+ /* Prototype */
+ LWGEOM* parse_geojson(json_object *geojson, bool *hasz,  int *root_srid);
+@@ -556,4 +556,3 @@
+ 	PG_RETURN_POINTER(geom);
+ #endif
+ }
+-
diff --git a/dev-db/postgis/postgis-2.0.2-r1.ebuild b/dev-db/postgis/postgis-2.0.2-r1.ebuild
index 8a3901d4476c..b53316e84d80 100644
--- a/dev-db/postgis/postgis-2.0.2-r1.ebuild
+++ b/dev-db/postgis/postgis-2.0.2-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.0.2-r1.ebuild,v 1.1 2013/02/03 15:01:38 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.2-r1.ebuild,v 1.2 2013/02/04 14:55:54 titanofold Exp $
 
 EAPI="4"
 
-inherit eutils flag-o-matic versionator
+inherit autotools eutils versionator
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
 HOMEPAGE="http://postgis.net"
@@ -62,8 +62,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-${PGIS}-ldflags.patch"
-	append-flags $(pkg-config --cflags-only-I json)
+	epatch "${FILESDIR}/${PN}-${PGIS}-ldflags.patch" \
+		"${FILESDIR}/${PN}-${PGIS}-pkgconfig-json.patch"
+
+	local AT_M4DIR="macros"
+	eautoreconf
 }
 
 src_configure() {