Reintroduced an automatable test. Now actually fails when psql cannot connect. Removed bad version.

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

4 files changed, 101 insertions, 74 deletions

diff --git a/dev-libs/libpqxx/ChangeLog b/dev-libs/libpqxx/ChangeLog
index a86b5c0b3990..1410c3f77d27 100644
--- a/dev-libs/libpqxx/ChangeLog
+++ b/dev-libs/libpqxx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libpqxx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.66 2011/04/16 11:00:47 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.67 2011/04/16 13:55:14 titanofold Exp $
+
+*libpqxx-3.1-r1 (16 Apr 2011)
+
+  16 Apr 2011; Aaron W. Swenson <titanofold@gentoo.org> -libpqxx-3.1.ebuild,
+  +libpqxx-3.1-r1.ebuild:
+  Reintroduced an automatable test. Now actually fails when psql cannot
+  connect. Removed bad version.
 
 *libpqxx-3.1 (16 Apr 2011)
 
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index c5fd8bc08e63..fea64336f199 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -11,13 +11,13 @@ DIST libpqxx-3.1.tar.gz 1771846 RMD160 09fe492dfc3d16255c39a122e397e2c22bbee483
 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.ebuild 2044 RMD160 af3316df3048eab9c30d7292758e2284acbacbf2 SHA1 fb10c11d24f249d47859715ccbd8e8efde39ccfa SHA256 8b7036cc9af3b8f93460607cb3cead49d71113ab68e7ecbaf2571f29799b20b7
-MISC ChangeLog 8309 RMD160 397505619823c5f98a9b4985fda9e1a41b3b0613 SHA1 3fe6bef29fd7c7aeb1394bf778ca75a8a1207ecb SHA256 bc535cbf51ac9298fbd6c36112b53a02ee983ec6259fc4e0169ff5b50664bb8d
+EBUILD libpqxx-3.1-r1.ebuild 2697 RMD160 f9812c187279ef2e3a46a901cc0e13fc6b2fee5d SHA1 38a9ae02fd7bf81746d4edb61ef9a3251a03defd SHA256 9129d97af5437baa2e063a8142de972371aa4e455938a0044eb8eacdd8ddc3ff
+MISC ChangeLog 8548 RMD160 9ac50f5f23bf028d3a1076685c77ee09eed3eaee SHA1 7c52124676a857593c902c4643e613f782c6c902 SHA256 9bf33ab2d846a82b96398c065bde6b11b969dc084c33a9b6218722110ab06045
 MISC metadata.xml 479 RMD160 b10fa4653f307d21cc36cb24911aa1d6ced1248e SHA1 213e666f9cd523ebbc163ab7d78472caf289d4ef SHA256 42e814ea6ceb5a7133c3ddbe0afd13a1b97083893405fee6f7984d5c9cbbb938
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2pdvoACgkQCOhwUhu5AEly+wEAnP46mOAWh5zqrY7cGgL7jIr6
-31jnRuklw8d2LN6+plwBAIHfSGC9XMlUivVmRxTyhmidPbe4YgJcDSX3x+i4xc5a
-=xhME
+iF4EAREIAAYFAk2pn9AACgkQCOhwUhu5AEnMVgD+ImetGxq7TeL5hm0Sn19zw7x4
+wUsWWD1cUj+lQrx/1SUBAMNH/oixSjUowBvzTpp7Ho9fp2ZeoikV8ty5yxa/MSXG
+=RZpU
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpqxx/libpqxx-3.1-r1.ebuild b/dev-libs/libpqxx/libpqxx-3.1-r1.ebuild
new file mode 100644
index 000000000000..5c5212aa389a
--- /dev/null
+++ b/dev-libs/libpqxx/libpqxx-3.1-r1.ebuild
@@ -0,0 +1,88 @@
+# 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-r1.ebuild,v 1.1 2011/04/16 13:55:14 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-9.0.0"
+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.ebuild b/dev-libs/libpqxx/libpqxx-3.1.ebuild
deleted file mode 100644
index 1d5e19cc8e63..000000000000
--- a/dev-libs/libpqxx/libpqxx-3.1.ebuild
+++ /dev/null
@@ -1,68 +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.ebuild,v 1.1 2011/04/16 11:00: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-9.0.0"
-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 "Make sure 'standard_conforming_strings' is set to off."
-
-	echo -n "Database (Default: $(whoami)): "
-	read PGDATABASE
-	[[ -z $PGDATABASE ]] && PGDATABASE="$(whoami)"
-	echo -n "Host (Default: Unix socket): "
-	read PGHOST
-	echo -n "Port (Default: 5432): "
-	read PGPORT
-	echo -n "User (Default: $(whoami)): "
-	read PGUSER
-	[[ -z $PGUSER ]] && PGUSER="$(whoami)"
-
-	local server_version=$(psql -Aqwt -U ${PGUSER} -c '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"
-			PGDATABASE="$PGDATABASE" PGHOST="$PGHOST" PGPORT="$PGPORT" \
-				PGUSER="$PGUSER" emake check
-		else
-			eerror "Server version must be 8.4.x are below."
-			ewarn "Test will fail on versions greater than 8.4.x, so skipping."
-		fi
-	else
-		eerror "Couldn't connect to server."
-		ewarn "Is the server running?"
-		ewarn "Check authentication method is set to trust for role: ${PGUSER}"
-		ewarn "And database: ${PGDATABASE}"
-		ewarn "Test will fail, so skipping."
-	fi
-}