Adding back to fix bug 401607.

Package-Manager: portage-2.1.10.41/cvs/Linux i686

4 files changed, 130 insertions, 5 deletions

diff --git a/dev-libs/libpqxx/ChangeLog b/dev-libs/libpqxx/ChangeLog
index e43b8f646965..38e8c6b02aee 100644
--- a/dev-libs/libpqxx/ChangeLog
+++ b/dev-libs/libpqxx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libpqxx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.80 2012/01/29 15:42:43 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.81 2012/01/31 11:18:22 titanofold Exp $
+
+  31 Jan 2012; Aaron W. Swenson <titanofold@gentoo.org> +libpqxx-3.1-r3.ebuild,
+  +files/libpqxx-3.1-gcc46.patch:
+  Adding back to fix bug 401607.
 
   29 Jan 2012; Aaron W. Swenson <titanofold@gentoo.org> libpqxx-4.0-r1.ebuild:
   Added static-libs support.
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 5272fc44012d..75ed93dab172 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -3,17 +3,20 @@ Hash: SHA256
 
 AUX libpqxx-2.6.9-gcc43.patch 1907 RMD160 79149bd560599e5352234a5ba54f2fe4fd411b12 SHA1 3847b1c45bf3ec6f52d4b971531dcf16482b9c3e SHA256 72b489af0d4b7c2d2071abf02ce50af1d3db4da7b0bc3eab2220b291e378e1d7
 AUX libpqxx-2.6.9-gcc44.patch 2384 RMD160 36984c849d7c46cee7d4cdf9454747f206d41531 SHA1 5212b19262ff99fa0d9044e78d12fa13ab76f360 SHA256 848cbad8889ce73301b8ae38d2f6dfc149f4cdcf7865c846779fec168b21ee76
+AUX libpqxx-3.1-gcc46.patch 1052 RMD160 00d554ea92e3963efebd93b2dcb4343a313e34ae SHA1 88a1ebebb9ca9d565a230e0f238956ab354061a9 SHA256 c3dee249eaa0f00cb7922e6e45c2cee78e3055be7d8fdbc8d9d7755ff571048b
 DIST libpqxx-2.6.9.tar.gz 1639557 RMD160 c456b5a3ed3c96963aad334d3504ed0443a8f63e SHA1 8be9dcd0375337b170d5c94370fa896911d361f1 SHA256 2b2ef5dfb852667299e50727419075cf333bbbeffadaa398d96dc93bac6f7b6a
+DIST libpqxx-3.1.tar.gz 1771846 RMD160 09fe492dfc3d16255c39a122e397e2c22bbee483 SHA1 700e0c96a2728eed70c48badb16ba1173cc24d2c SHA256 8950433f193e118cfd36ab91391eb174ef48897bacc26197da596988e66796a0
 DIST libpqxx-4.0.tar.gz 2631181 RMD160 517683e7f936126a9d133056740802518f62d18a SHA1 09e6301e610e7acddbec85f4803886fd6822b2e6 SHA256 b160043289cfbf2a186d3b12f9976b6914e76d918d3d4469ff408bd199bbb8ed
 EBUILD libpqxx-2.6.9.ebuild 1894 RMD160 7717392f069b80d975613ff0f5a7c6a07e3c4a88 SHA1 e843cd3917a91c87db1b873a4bb4e4e2ad312c11 SHA256 b5124abb2faa46669d4cac8cb80fd55f201f68e970eccd1bad313e2b0b269d00
+EBUILD libpqxx-3.1-r3.ebuild 2881 RMD160 5e83903b7bdd405e2624aaba7f3ee5b0d44261a4 SHA1 2ca50db4e1c9cfc74431b4c854ebff37a705bdc0 SHA256 774c976f12b7ce2788c490b3be6813ec6e40a397cdb2cd4dee35329e1557c93a
 EBUILD libpqxx-4.0-r1.ebuild 2312 RMD160 d5ae5c2ca4a4df92208b12c6e222b9e5fe1d1420 SHA1 14a359010eed4ad730beda17a86a2745120998c6 SHA256 93bfec61ddc694e73e2cf7818a525e98eb1cc2a8df3664fba71a753b8548efc0
 EBUILD libpqxx-4.0.ebuild 2711 RMD160 14e8b5db751fd2666a5fb9fb15bfd0755523f683 SHA1 ad07b8b12b33b8e7fa64bbfc7a7fcdcaaa1b90ba SHA256 0c6e531bca87bcfb5004573234bfd5e3ebb268ab21cc707f85e8a17ffbbd22af
-MISC ChangeLog 10303 RMD160 e4a25841cfc3806eca6bdd7a2c4334650792a815 SHA1 16eac1724548ef072f7b5d3c06d81dd9066429ef SHA256 30aef148f697f633abec5bd9600b09e96bf64762d02daa1cb9440dc9702d469e
+MISC ChangeLog 10451 RMD160 7804ff3d1d1e726e7151e281fe97c675a57a7b9f SHA1 7c121e989979513587ca9bd7ac284a5f4f6c367a SHA256 af91669e754ae12b53adf9926d790d44ed99947276b99d4afe0ff0577cf9e1ae
 MISC metadata.xml 479 RMD160 b10fa4653f307d21cc36cb24911aa1d6ced1248e SHA1 213e666f9cd523ebbc163ab7d78472caf289d4ef SHA256 42e814ea6ceb5a7133c3ddbe0afd13a1b97083893405fee6f7984d5c9cbbb938
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8laPkACgkQVxOqA9G7/aA+wgD+N8CzruSbNmXQ5DgCtanW1oOc
-sGVXTg5Xsjukgshh8zAA/RpAhCvwXnned7hObz+kd03Jj+O72bjEd7LRu+//jfZV
-=nVUK
+iF4EAREIAAYFAk8nzgQACgkQVxOqA9G7/aCkkgD9HorEQTi8+ZbBDEnuF/Vvzvbl
+FkPoZNON+v48dVl6G9gBAISvrcNHFxeGADriW/WLAiaCdHwhfwH2nIMpeyCx9G2t
+=jLqX
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch b/dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch
new file mode 100644
index 000000000000..91cd5d24a5f1
--- /dev/null
+++ b/dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch
@@ -0,0 +1,24 @@
+--- a/include/pqxx/compiler-internal.hxx
++++ b/include/pqxx/compiler-internal.hxx
+@@ -76,7 +76,7 @@
+ namespace internal
+ {
+ /// Wrapper for std::distance; not all platforms have std::distance().
+-template<typename T> inline ptrdiff_t distance(T first, T last)
++template<typename T> inline PGSTD::ptrdiff_t distance(T first, T last)
+ {
+ #ifdef PQXX_HAVE_DISTANCE
+   return PGSTD::distance(first, last);
+--- a/test/unit/test_escape.cxx
++++ b/test/unit/test_escape.cxx
+@@ -54,8 +54,8 @@
+   PQXX_CHECK_EQUAL(t.quote("x"), "'x'", "Basic quote() fails.");
+   PQXX_CHECK_EQUAL(t.quote(1), "'1'", "quote() not dealing with int properly.");
+   PQXX_CHECK_EQUAL(t.quote(0), "'0'", "Quoting zero is a problem.");
+-  const char *const nullptr = NULL;
+-  PQXX_CHECK_EQUAL(t.quote(nullptr), "NULL", "Not quoting NULL correctly.");
++  const char *const null_ptr = NULL;
++  PQXX_CHECK_EQUAL(t.quote(null_ptr), "NULL", "Not quoting NULL correctly.");
+   PQXX_CHECK_EQUAL(t.quote(string("'")), "''''", "Escaping quotes goes wrong.");
+ 
+   PQXX_CHECK_EQUAL(t.quote("x"),
diff --git a/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild b/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild
new file mode 100644
index 000000000000..220fb88e450e
--- /dev/null
+++ b/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild,v 1.3 2012/01/31 11:18:22 titanofold Exp $
+
+EAPI="4"
+
+inherit eutils
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="C++ client API for PostgreSQL. The standard front-end for writing C++ programs that use PostgreSQL."
+SRC_URI="http://pqxx.org/download/software/${PN}/${P}.tar.gz"
+HOMEPAGE="http://pqxx.org/development/libpqxx/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+
+DEPEND="dev-db/postgresql-base"
+RDEPEND="${DEPEND}"
+
+# src_test is interactive unless PGDATABASE and PGUSER is set either as an
+# environment variable or in /etc/libpqxx_test_env
+PROPERTIES="interactive"
+
+src_prepare() {
+	epatch "${FILESDIR}/libpqxx-3.1-gcc46.patch"
+}
+
+src_configure() {
+	econf --enable-shared
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog NEWS README*
+	use doc && dohtml -r doc/html/*
+}
+
+src_test() {
+	ewarn "The tests need a running PostgreSQL server version 8.4.x or older"
+	ewarn "and an existing database."
+	ewarn "Test requires PGDATABASE and PGUSER to be set at a minimum."
+	ewarn "Optionally, set PGPORT and PGHOST."
+	ewarn "Define them at the command line or in:"
+	ewarn "    ${EROOT%/}/etc/libpqxx_test_env"
+	ewarn "Make sure 'standard_conforming_strings' is set to off in postgresql.conf."
+
+	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
+		if [[ -f ${EROOT%/}/etc/libpqxx_test_env ]] ; then
+			source "${EROOT%/}/etc/libpqxx_test_env"
+			[[ -n $PGDATABASE ]] && export PGDATABASE
+			[[ -n $PGHOST ]] && export PGHOST
+			[[ -n $PGPORT ]] && export PGPORT
+			[[ -n $PGUSER ]] && export PGUSER
+		fi
+
+		# In case the file wasn't written properly or doesn't exist
+		if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
+			echo -n "Database (Default: $(whoami)): "
+			read PGDATABASE
+			[[ -n $PGDATABASE ]] && export PGDATABASE
+			echo -n "Host (Default: Unix socket): "
+			read PGHOST
+			[[ -n $PGHOST ]] && export PGHOST
+			echo -n "Port (Default: 5432): "
+			read PGPORT
+			[[ -n $PGPORT ]] && export PGPORT
+			echo -n "User (Default: $(whoami)): "
+			read PGUSER
+			[[ -n $PGUSER ]] && export PGUSER
+		fi
+	fi
+
+	local server_version
+	server_version=$(psql -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 < 90 ]] ; then
+			cd "${S}/test"
+			emake check
+		else
+			eerror "Server version must be 8.4.x or below."
+			die "Server version isn't 8.4.x or below"
+		fi
+	else
+		eerror "Is the server running?"
+		eerror "Check that the role and database exist, and authentication method is set to"
+		eerror "trust for:"
+		eerror "    Role: ${PGUSER}"
+		eerror "    Database: ${PGDATABASE}"
+		die "Couldn't connect to server."
+	fi
+}