Version bump. Fixes bug 349327. Moved to EAPI4 and interactive. Longer description added to metadata.xml. Fixed DESCRIPTION.toolong.

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

7 files changed, 107 insertions, 22 deletions

diff --git a/dev-libs/libpqxx/ChangeLog b/dev-libs/libpqxx/ChangeLog
index 7f3429184091..a86b5c0b3990 100644
--- a/dev-libs/libpqxx/ChangeLog
+++ b/dev-libs/libpqxx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libpqxx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.65 2010/10/21 14:52:04 flameeyes Exp $
+# 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 $
+
+*libpqxx-3.1 (16 Apr 2011)
+
+  16 Apr 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  libpqxx-2.6.8.ebuild, libpqxx-2.6.9.ebuild, libpqxx-3.0.2.ebuild,
+  +libpqxx-3.1.ebuild, metadata.xml:
+  Version bump. Fixes bug 349327. Moved to EAPI4 and interactive. Longer
+  description added to metadata.xml. Fixed DESCRIPTION.toolong.
 
   21 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   libpqxx-3.0.2.ebuild:
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 1ee6a53cf618..c5fd8bc08e63 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,5 +1,5 @@
 -----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
@@ -7,15 +7,17 @@ AUX libpqxx-2.6.9-gcc44.patch 2384 RMD160 36984c849d7c46cee7d4cdf9454747f206d415
 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
-EBUILD libpqxx-2.6.8.ebuild 1755 RMD160 99cb8ab80d212a588f97f75208f56ba41b2b969e SHA1 402a3cec09173e0bf7fbcebee75d7ee0a35edaaf SHA256 c1e6a8bc64b67e9a06a59a7aaae938aa68eb06a3782f969eabbf3123c8a4d788
-EBUILD libpqxx-2.6.9.ebuild 1927 RMD160 dacce323334fc0d459f29faf7f9cb9ffeb3d3da0 SHA1 307d616cab7a683ed6ced9b6aaacfd04fcc0c237 SHA256 0672cd3b1005a90cb8818accc0d1a3537715dda3149abfa33446155d8ee37293
-EBUILD libpqxx-3.0.2.ebuild 1826 RMD160 4ea25e4fda3a990e10d05855fcff82186719c4f3 SHA1 fdc1b3ff7f25e9b344bb2810c079c49b1f6775aa SHA256 92c0a7f7f3611d97a2873dfb781cbb70415b1780ff164e169410b5e00ed9261d
-MISC ChangeLog 7981 RMD160 06ec1b1fb97dade87a786e72d180bdd846f2158d SHA1 64372404809dcbc18630d1286bda83a18704f4d0 SHA256 be55cd1e7d39d4647dc8165376bbdf2e2f89b682913e5958b58cbbbfebefc330
-MISC metadata.xml 163 RMD160 70bbda1c1e8316a09d467334131898ae833a3205 SHA1 f43b9a4a2a82140936f9b04e4e63b3c9a495141f SHA256 f0699a4c3ad24cc38836c2d4a1ba03e4e403a9a5364b51df405db02014005891
+DIST libpqxx-3.1.tar.gz 1771846 RMD160 09fe492dfc3d16255c39a122e397e2c22bbee483 SHA1 700e0c96a2728eed70c48badb16ba1173cc24d2c SHA256 8950433f193e118cfd36ab91391eb174ef48897bacc26197da596988e66796a0
+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
+MISC metadata.xml 479 RMD160 b10fa4653f307d21cc36cb24911aa1d6ced1248e SHA1 213e666f9cd523ebbc163ab7d78472caf289d4ef SHA256 42e814ea6ceb5a7133c3ddbe0afd13a1b97083893405fee6f7984d5c9cbbb938
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzAU50ACgkQAiZjviIA2Xg/FgCg8ZHDHXgwCl7bmzjwK08L/TXE
-zXgAoJzUfq4iOyKL7zs+S47EnXfki5Lu
-=TEO4
+iF4EAREIAAYFAk2pdvoACgkQCOhwUhu5AEly+wEAnP46mOAWh5zqrY7cGgL7jIr6
+31jnRuklw8d2LN6+plwBAIHfSGC9XMlUivVmRxTyhmidPbe4YgJcDSX3x+i4xc5a
+=xhME
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpqxx/libpqxx-2.6.8.ebuild b/dev-libs/libpqxx/libpqxx-2.6.8.ebuild
index a8f853f86e2b..973dfa623cfb 100644
--- a/dev-libs/libpqxx/libpqxx-2.6.8.ebuild
+++ b/dev-libs/libpqxx/libpqxx-2.6.8.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.12 2010/06/17 18:23:01 patrick Exp $
+# $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. Supersedes older libpq++ interface."
+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"
diff --git a/dev-libs/libpqxx/libpqxx-2.6.9.ebuild b/dev-libs/libpqxx/libpqxx-2.6.9.ebuild
index ef32122e1c05..6c6d50125a01 100644
--- a/dev-libs/libpqxx/libpqxx-2.6.9.ebuild
+++ b/dev-libs/libpqxx/libpqxx-2.6.9.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.9.ebuild,v 1.20 2010/06/17 18:23:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-2.6.9.ebuild,v 1.21 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. Supersedes older libpq++ interface."
+DESCRIPTION="C++ client API for PostgreSQL. The standard front-end for writing C++ programs that use PostgreSQL."
 SRC_URI="ftp://pqxx.org/software/${PN}/${P}.tar.gz"
 HOMEPAGE="http://pqxx.org/development/libpqxx/"
 LICENSE="BSD"
diff --git a/dev-libs/libpqxx/libpqxx-3.0.2.ebuild b/dev-libs/libpqxx/libpqxx-3.0.2.ebuild
index 00d5727425aa..8fbe61b98772 100644
--- a/dev-libs/libpqxx/libpqxx-3.0.2.ebuild
+++ b/dev-libs/libpqxx/libpqxx-3.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.3 2010/10/21 14:52:04 flameeyes Exp $
+# $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"
 
@@ -8,7 +8,7 @@ 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. Supersedes older libpq++ interface."
+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"
diff --git a/dev-libs/libpqxx/libpqxx-3.1.ebuild b/dev-libs/libpqxx/libpqxx-3.1.ebuild
new file mode 100644
index 000000000000..1d5e19cc8e63
--- /dev/null
+++ b/dev-libs/libpqxx/libpqxx-3.1.ebuild
@@ -0,0 +1,68 @@
+# 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
+}
diff --git a/dev-libs/libpqxx/metadata.xml b/dev-libs/libpqxx/metadata.xml
index 309b51e9a965..dc20b00f6741 100644
--- a/dev-libs/libpqxx/metadata.xml
+++ b/dev-libs/libpqxx/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>postgresql</herd>
+  <herd>postgresql</herd>
+  <longdescription>
+	libpqxx is the official C++ client API for PostgreSQL. If you are
+	writing software in C++ that needs to access databases managed by
+	Postgres — on just about any platform — then libpqxx is the
+	library you use. Supersedes the now defunct libpq++ (AKA, libpqpp)
+	API.
+  </longdescription>
 </pkgmetadata>