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

(Portage version: 2.1.9.42/cvs/Linux i686)

6 files changed, 95 insertions, 12 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/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>