Cleanup outdated ebuilds and patches. Fix bug 397407.

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

9 files changed, 87 insertions, 416 deletions

diff --git a/dev-libs/libpqxx/ChangeLog b/dev-libs/libpqxx/ChangeLog
index 5d6bcf735647..3585339720b3 100644
--- a/dev-libs/libpqxx/ChangeLog
+++ b/dev-libs/libpqxx/ChangeLog
@@ -1,6 +1,14 @@
 # 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.78 2012/01/15 16:34:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.79 2012/01/29 15:28:47 titanofold Exp $
+
+*libpqxx-4.0-r1 (29 Jan 2012)
+
+  29 Jan 2012; Aaron W. Swenson <titanofold@gentoo.org>
+  -files/libpqxx-2.5.1-gentoo.patch, -libpqxx-2.6.8.ebuild,
+  -libpqxx-3.0.2.ebuild, -libpqxx-3.1-r2.ebuild, -libpqxx-3.1-r3.ebuild,
+  -files/libpqxx-3.1-gcc46.patch, +libpqxx-4.0-r1.ebuild:
+  Cleanup outdated ebuilds and patches. Fix bug 397407.
 
   15 Jan 2012; Raúl Porcel <armin76@gentoo.org> libpqxx-4.0.ebuild:
   alpha/ia64/sparc stable wrt #396483
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 457e6adb3c5c..bcd784569ded 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,27 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX libpqxx-2.5.1-gentoo.patch 2723 RMD160 56627d68aa79c0e98a0ba7189dab12646afee91b SHA1 5028c6dc926f07d4b3e85bc4954af6bcb0cb8f96 SHA256 0e6d7f13bf2117fe3884bf4296209baaf5a28311bb71dc79134a239846788046
 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.8.tar.gz 1690973 RMD160 5a9a57774ac878d827af8940e87f5d92c2a1b86a SHA1 2f963c98b8a79675d537daadc3ba6c313c35f59d SHA256 b3b4a1de89936d36f61ba1da1ca2c0e0f412cdab004a402761f9433b1d0a3a8d
 DIST libpqxx-2.6.9.tar.gz 1639557 RMD160 c456b5a3ed3c96963aad334d3504ed0443a8f63e SHA1 8be9dcd0375337b170d5c94370fa896911d361f1 SHA256 2b2ef5dfb852667299e50727419075cf333bbbeffadaa398d96dc93bac6f7b6a
-DIST libpqxx-3.0.2.tar.gz 1565644 RMD160 0162ea135d56c203f45f9d5d328a29d2db72b102 SHA1 6af866e06668e9c8b7af4161dddb1ab5f4bf094c SHA256 de265ab5d397ace7596c3b6d19a0057ce2ba58477315acf9165b0a97facab6ca
-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.8.ebuild 1722 RMD160 a3c6cea43966c44a93e5023f91cf863d856abfd9 SHA1 28fc522b0c5de1a8dda2f15cd0056c15914da96c SHA256 13d6fa2d81ee3e6544463428c96729891a2422cbfbe0238395198edb2dac1f08
 EBUILD libpqxx-2.6.9.ebuild 1894 RMD160 7717392f069b80d975613ff0f5a7c6a07e3c4a88 SHA1 e843cd3917a91c87db1b873a4bb4e4e2ad312c11 SHA256 b5124abb2faa46669d4cac8cb80fd55f201f68e970eccd1bad313e2b0b269d00
-EBUILD libpqxx-3.0.2.ebuild 1791 RMD160 026f17e48393c9f657b9d88ca8994fb316c40a9a SHA1 e8b3baeee658ad053e770826afe5e60f1b1f3997 SHA256 a60c499b29b07fa2b964b5c58170e82e950caa2d6519730b5259cab650f4b946
-EBUILD libpqxx-3.1-r2.ebuild 2681 RMD160 30a995f7a83e604537eed783f66b91a8705bce0a SHA1 6f26cf4aa1c1dc74612b7ddb2661e334b24f22a2 SHA256 c2cead70dae8e42b47d56fe1e43342c965b6699406e5337fc5e6b47f7e095bcb
-EBUILD libpqxx-3.1-r3.ebuild 2881 RMD160 68eb0cf91fed4873a2eccb9c41e2f590c8089377 SHA1 b4d325e1f535d07246130a7a00e0d8321cfb91ac SHA256 25fe2647b113b7471d7ce4f00abeb925b13b5c13b1bfd55122d345e5e62504d2
+EBUILD libpqxx-4.0-r1.ebuild 2238 RMD160 2ae1966ccec741268e6ac5ee81b8369eb465479f SHA1 608fb49fefc51ba83cd19c7a76cac681e524290e SHA256 bdd819238fd06956136b1c7948c209e37842d68872610afe9743df1c75090b8c
 EBUILD libpqxx-4.0.ebuild 2711 RMD160 14e8b5db751fd2666a5fb9fb15bfd0755523f683 SHA1 ad07b8b12b33b8e7fa64bbfc7a7fcdcaaa1b90ba SHA256 0c6e531bca87bcfb5004573234bfd5e3ebb268ab21cc707f85e8a17ffbbd22af
-MISC ChangeLog 9856 RMD160 7fc41413bbc3321ca3d47e94ea568667b725c720 SHA1 060169ffc625a594ae9f49d4de7184b4c1ad9a9f SHA256 48a3eeb223029e4e8fb61a6645ab496945128f426b2787ccaab071260e19713f
+MISC ChangeLog 10194 RMD160 395ce1d7f1a76fd028e0670d562848f450037962 SHA1 53c9b9dbffbfb7c48da211e1669d5bab0294c7b6 SHA256 9eb1f4c78ad0f2460eb969e9d076acd64afde2c6203cf050e3b08c3a5d69fe12
 MISC metadata.xml 479 RMD160 b10fa4653f307d21cc36cb24911aa1d6ced1248e SHA1 213e666f9cd523ebbc163ab7d78472caf289d4ef SHA256 42e814ea6ceb5a7133c3ddbe0afd13a1b97083893405fee6f7984d5c9cbbb938
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8TAA0ACgkQuQc30/atMkDT8ACeOy1hv0rw5PTCq9lAaUXhX+kd
-8mEAniR0kS2BGKJ8tUe5mReDijJ+W3XI
-=Besj
+iF4EAREIAAYFAk8lZbUACgkQVxOqA9G7/aAdIQD9E+j1gJzjotf5cexAc6Swb/h7
+sAY92+A7nTpCTXcSftoBAJHXK9QZRDS4OUys6vn4HdJ6iT/F1vv/QGykOr27/YKN
+=hcY/
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpqxx/files/libpqxx-2.5.1-gentoo.patch b/dev-libs/libpqxx/files/libpqxx-2.5.1-gentoo.patch
deleted file mode 100644
index d7802ba875d3..000000000000
--- a/dev-libs/libpqxx/files/libpqxx-2.5.1-gentoo.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Naru libpqxx-2.5.1.org/configure libpqxx-2.5.1/configure
---- libpqxx-2.5.1.org/configure	2005-05-06 11:09:52.000000000 +0100
-+++ libpqxx-2.5.1/configure	2005-05-09 21:25:38.000000000 +0100
-@@ -20183,73 +20183,8 @@
- echo "$as_me:$LINENO: result: $cpp_pragma_message" >&5
- echo "${ECHO_T}$cpp_pragma_message" >&6
- 
--# Find PostgreSQL includes and libraries
--for ac_prog in pg_config
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PG_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $PG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PG_CONFIG="$PG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--  ;;
--esac
--fi
--PG_CONFIG=$ac_cv_path_PG_CONFIG
--
--if test -n "$PG_CONFIG"; then
--  echo "$as_me:$LINENO: result: $PG_CONFIG" >&5
--echo "${ECHO_T}$PG_CONFIG" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--  test -n "$PG_CONFIG" && break
--done
--
--if test -z "$PG_CONFIG" || test ! -r "$PG_CONFIG"; then
--	{ { echo "$as_me:$LINENO: error:
--PostgreSQL configuration script pg_config not found.  Make sure this is in your
--command path before configuring.  Without it, the configure script has no way to
--find the right location for the libpq library and its headers.
--" >&5
--echo "$as_me: error:
--PostgreSQL configuration script pg_config not found.  Make sure this is in your
--command path before configuring.  Without it, the configure script has no way to
--find the right location for the libpq library and its headers.
--" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--with_postgres_include=`$PG_CONFIG --includedir`
--{ echo "$as_me:$LINENO: using PostgreSQL headers at $with_postgres_include" >&5
--echo "$as_me: using PostgreSQL headers at $with_postgres_include" >&6;}
--with_postgres_lib=`$PG_CONFIG --libdir`
--{ echo "$as_me:$LINENO: using PostgreSQL libraries at $with_postgres_lib" >&5
--echo "$as_me: using PostgreSQL libraries at $with_postgres_lib" >&6;}
--
--
--
-+with_postgres_include=/usr/include/postgresql
-+with_postgres_lib=/usr/lib
- POSTGRES_LIB="-L${with_postgres_lib} -R${with_postgres_lib} -lpq"
- 
- POSTGRES_INCLUDE="-I${with_postgres_include}"
diff --git a/dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch b/dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch
deleted file mode 100644
index 91cd5d24a5f1..000000000000
--- a/dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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-2.6.8.ebuild b/dev-libs/libpqxx/libpqxx-2.6.8.ebuild
deleted file mode 100644
index 973dfa623cfb..000000000000
--- a/dev-libs/libpqxx/libpqxx-2.6.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-2.6.8.ebuild,v 1.13 2011/04/16 11:00:47 titanofold Exp $
-
-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="ftp://thaiopensource.org/software/${PN}/${P}.tar.gz"
-HOMEPAGE="http://thaiopensource.org/development/libpqxx/"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-db/postgresql-base"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# should be safe enough to remove the lines directly from configure,
-	# since it's copied directly from configure.ac
-	sed -i \
-		-e 's/\(gcc_visibility\)=yes/\1=no/g' \
-		-e 's@\(#define PQXX_HAVE_GCC_VISIBILITY 1\)@/* \1 */@g' \
-		-e '/-Werror/d' \
-		configure || die "sed failed"
-}
-
-src_compile() {
-	econf --enable-shared || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-	dohtml -r doc/html/*
-}
-
-src_test() {
-	ewarn "The tests need a running PostgreSQL server and an existing database!"
-	ewarn "You can set the following environment variables to change the connection parameters:"
-	ewarn "PGDATABASE (default: username, probably root)"
-	ewarn "PGHOST (default: localhost)"
-	ewarn "PGPORT (default: pg's UNIX domain-socket)"
-	ewarn "PGUSER (default: username, probably root)"
-	epause 10
-
-	cd "${S}/test"
-	# Working around a mysterious bug in gcc-4.1
-	sed -i -e 's/-O2/-O1/' Makefile
-	emake -j1 check || die "emake check failed"
-}
diff --git a/dev-libs/libpqxx/libpqxx-3.0.2.ebuild b/dev-libs/libpqxx/libpqxx-3.0.2.ebuild
deleted file mode 100644
index 8fbe61b98772..000000000000
--- a/dev-libs/libpqxx/libpqxx-3.0.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-3.0.2.ebuild,v 1.4 2011/04/16 11:00:47 titanofold Exp $
-
-EAPI="2"
-
-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=""
-
-DEPEND="dev-db/postgresql-base"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# should be safe enough to remove the lines directly from configure,
-	# since it's copied directly from configure.ac
-	sed -i \
-		-e 's/\(gcc_visibility\)=yes/\1=no/g' \
-		-e 's@\(#define PQXX_HAVE_GCC_VISIBILITY 1\)@/* \1 */@g' \
-		-e '/-Werror/d' \
-		configure || die "sed failed"
-}
-
-src_configure() {
-	econf --enable-shared || die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-	dohtml -r doc/html/*
-}
-
-src_test() {
-	ewarn "The tests need a running PostgreSQL server and an existing database!"
-	ewarn "You can set the following environment variables to change the connection parameters:"
-	ewarn "PGDATABASE (default: username, probably root)"
-	ewarn "PGHOST (default: localhost)"
-	ewarn "PGPORT (default: pg's UNIX domain-socket)"
-	ewarn "PGUSER (default: username, probably root)"
-	epause 10
-
-	if [[ -n ${PGDATABASE} ]] ; then
-		cd "${S}/test"
-		# Working around a mysterious bug in gcc-4.1
-		sed -i -e 's/-O2/-O1/' Makefile
-		emake -j1 check || die "emake check failed"
-	else
-		ewarn "Tests skipped since PGDATABASE is not defined or empty"
-	fi
-}
diff --git a/dev-libs/libpqxx/libpqxx-3.1-r2.ebuild b/dev-libs/libpqxx/libpqxx-3.1-r2.ebuild
deleted file mode 100644
index 4bbd2daa5f60..000000000000
--- a/dev-libs/libpqxx/libpqxx-3.1-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-3.1-r2.ebuild,v 1.5 2011/11/27 15:27:29 armin76 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}"
-
-PROPERTIES="interactive"
-
-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
-}
diff --git a/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild b/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild
deleted file mode 100644
index 3b393138354f..000000000000
--- a/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 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.1 2011/11/12 16:58:37 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
-}
diff --git a/dev-libs/libpqxx/libpqxx-4.0-r1.ebuild b/dev-libs/libpqxx/libpqxx-4.0-r1.ebuild
new file mode 100644
index 000000000000..3d316d7b952a
--- /dev/null
+++ b/dev-libs/libpqxx/libpqxx-4.0-r1.ebuild
@@ -0,0 +1,72 @@
+# 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-4.0-r1.ebuild,v 1.1 2012/01/29 15:28:47 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_configure() {
+	econf --enable-shared
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog NEWS README*
+	use doc && dohtml -r doc/html/*
+}
+
+src_test() {
+	einfo "The tests need a running PostgreSQL server and an existing database."
+	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
+	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
+	einfo "    ${EROOT%/}/etc/libpqxx_test_env"
+
+	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
+	fi
+
+	if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
+		local server_version
+		server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
+		if [[ $? = 0 ]] ; then
+			# Currently works with highest server version in tree
+			#server_version=$(echo ${server_version} | cut -d " " -f 2 | cut -d "." -f -2 | tr -d .)
+			#if [[ $server_version < 92 ]] ; 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 "Verify role and database exist, and are permitted in pg_hba.conf for:"
+			eerror "    Role: ${PGUSER}"
+			eerror "    Database: ${PGDATABASE}"
+			die "Couldn't connect to server."
+		fi
+	else
+		eerror "PGDATABASE and PGUSER must be set to perform tests."
+		eerror "Skipping tests."
+	fi
+}