Clean out old versions that do not build with newer versions of GCC. Fixes bug 414131.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

7 files changed, 7 insertions, 429 deletions

diff --git a/dev-libs/libpqxx/ChangeLog b/dev-libs/libpqxx/ChangeLog
index 66060914e655..1ae0fb3853fd 100644
--- a/dev-libs/libpqxx/ChangeLog
+++ b/dev-libs/libpqxx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.86 2012/03/31 17:54:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.87 2012/05/03 19:46:26 titanofold Exp $
+
+  03 May 2012; Aaron W. Swenson <titanofold@gentoo.org> -libpqxx-2.6.9.ebuild,
+  -files/libpqxx-2.6.9-gcc43.patch, -files/libpqxx-2.6.9-gcc44.patch,
+  -libpqxx-3.1-r3.ebuild, -files/libpqxx-3.1-gcc46.patch, -libpqxx-4.0.ebuild:
+  Clean out old versions that do not build with newer versions of GCC. Fixes
+  bug 414131.
 
   31 Mar 2012; Raúl Porcel <armin76@gentoo.org> libpqxx-4.0-r1.ebuild:
   ia64/sparc/x86 stable wrt #396483
diff --git a/dev-libs/libpqxx/files/libpqxx-2.6.9-gcc43.patch b/dev-libs/libpqxx/files/libpqxx-2.6.9-gcc43.patch
deleted file mode 100644
index 24fad40ee69c..000000000000
--- a/dev-libs/libpqxx/files/libpqxx-2.6.9-gcc43.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ub ./libpqxx-2.6.9-orig/src/binarystring.cxx ./libpqxx-2.6.9/src/binarystring.cxx
---- ./libpqxx-2.6.9-orig/src/binarystring.cxx	2008-04-16 19:52:13.000000000 +0200
-+++ ./libpqxx-2.6.9/src/binarystring.cxx	2008-04-16 19:52:39.000000000 +0200
-@@ -18,6 +18,7 @@
- 
- #include <new>
- #include <stdexcept>
-+#include <cstring>
- 
- #include "libpq-fe.h"
- 
-diff -ub ./libpqxx-2.6.9-orig/src/connection_base.cxx ./libpqxx-2.6.9/src/connection_base.cxx
---- ./libpqxx-2.6.9-orig/src/connection_base.cxx	2008-04-16 19:52:13.000000000 +0200
-+++ ./libpqxx-2.6.9/src/connection_base.cxx	2008-04-16 19:53:10.000000000 +0200
-@@ -22,6 +22,7 @@
- #include <cerrno>
- #include <cstdio>
- #include <ctime>
-+#include <cstring>
- #include <stdexcept>
- 
- #ifdef PQXX_HAVE_SYS_SELECT_H
-diff -ub ./libpqxx-2.6.9-orig/src/cursor.cxx ./libpqxx-2.6.9/src/cursor.cxx
---- ./libpqxx-2.6.9-orig/src/cursor.cxx	2008-04-16 19:52:13.000000000 +0200
-+++ ./libpqxx-2.6.9/src/cursor.cxx	2008-04-16 19:53:30.000000000 +0200
-@@ -17,6 +17,7 @@
-  */
- #include "pqxx/compiler-internal.hxx"
- 
-+#include <cstring>
- #include <cstdlib>
- 
- #include "pqxx/cursor"
-diff -ub ./libpqxx-2.6.9-orig/src/result.cxx ./libpqxx-2.6.9/src/result.cxx
---- ./libpqxx-2.6.9-orig/src/result.cxx	2008-04-16 19:52:13.000000000 +0200
-+++ ./libpqxx-2.6.9/src/result.cxx	2008-04-16 19:54:02.000000000 +0200
-@@ -18,6 +18,8 @@
- #include "pqxx/compiler-internal.hxx"
- 
- #include <stdexcept>
-+#include <cstring>
-+#include <cstdlib>
- 
- #include "libpq-fe.h"
- 
-diff -ub ./libpqxx-2.6.9-orig/src/transaction_base.cxx ./libpqxx-2.6.9/src/transaction_base.cxx
---- ./libpqxx-2.6.9-orig/src/transaction_base.cxx	2008-04-16 19:52:13.000000000 +0200
-+++ ./libpqxx-2.6.9/src/transaction_base.cxx	2008-04-16 19:54:20.000000000 +0200
-@@ -19,6 +19,7 @@
- #include "pqxx/compiler-internal.hxx"
- 
- #include <stdexcept>
-+#include <cstring>
- 
- #include "pqxx/connection_base"
- #include "pqxx/result"
diff --git a/dev-libs/libpqxx/files/libpqxx-2.6.9-gcc44.patch b/dev-libs/libpqxx/files/libpqxx-2.6.9-gcc44.patch
deleted file mode 100644
index d7e6425d1500..000000000000
--- a/dev-libs/libpqxx/files/libpqxx-2.6.9-gcc44.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Taken from Debian's patchset to fix compilation with gcc-4.4 - JeR
-
---- libpqxx-2.6.9.orig/src/transaction_base.cxx
-+++ libpqxx-2.6.9/src/transaction_base.cxx
-@@ -18,6 +18,7 @@
-  */
- #include "pqxx/compiler-internal.hxx"
- 
-+#include <cstring>
- #include <stdexcept>
- 
- #include "pqxx/connection_base"
---- libpqxx-2.6.9.orig/src/binarystring.cxx
-+++ libpqxx-2.6.9/src/binarystring.cxx
-@@ -16,6 +16,7 @@
-  */
- #include "pqxx/compiler-internal.hxx"
- 
-+#include <cstring>
- #include <new>
- #include <stdexcept>
- 
---- libpqxx-2.6.9.orig/src/result.cxx
-+++ libpqxx-2.6.9/src/result.cxx
-@@ -17,6 +17,8 @@
-  */
- #include "pqxx/compiler-internal.hxx"
- 
-+#include <cstdlib>
-+#include <cstring>
- #include <stdexcept>
- 
- #include "libpq-fe.h"
-@@ -44,7 +46,7 @@
- pqxx::internal::result_data::~result_data() { PQclear(data); }
- 
- 
--void pqxx::internal::freemem_result_data(result_data *d) throw () { delete d; }
-+void PQXX_LIBEXPORT pqxx::internal::freemem_result_data(result_data *d) throw () { delete d; }
- 
- 
- pqxx::result::result(pqxx::internal::pq::PGresult *rhs,
---- libpqxx-2.6.9.orig/src/cursor.cxx
-+++ libpqxx-2.6.9/src/cursor.cxx
-@@ -18,6 +18,7 @@
- #include "pqxx/compiler-internal.hxx"
- 
- #include <cstdlib>
-+#include <cstring>
- 
- #include "pqxx/cursor"
- #include "pqxx/result"
---- libpqxx-2.6.9.orig/src/connection_base.cxx
-+++ libpqxx-2.6.9/src/connection_base.cxx
-@@ -21,6 +21,7 @@
- #include <cassert>
- #include <cerrno>
- #include <cstdio>
-+#include <cstring>
- #include <ctime>
- #include <stdexcept>
- 
---- libpqxx-2.6.9.orig/test/test003.cxx
-+++ libpqxx-2.6.9/test/test003.cxx
-@@ -1,4 +1,5 @@
- #include <cstdio>
-+#include <cstdlib>
- #include <iostream>
- #include <stdexcept>
- 
---- libpqxx-2.6.9.orig/test/test092.cxx
-+++ libpqxx-2.6.9/test/test092.cxx
-@@ -1,4 +1,5 @@
- #include <cassert>
-+#include <cstring>
- #include <iostream>
- #include <list>
- 
---- libpqxx-2.6.9.orig/test/test030.cxx
-+++ libpqxx-2.6.9/test/test030.cxx
-@@ -1,4 +1,5 @@
- #include <cstdio>
-+#include <cstring>
- #include <iostream>
- 
- #include <pqxx/connection>
---- libpqxx-2.6.9.orig/test/test022.cxx
-+++ libpqxx-2.6.9/test/test022.cxx
-@@ -1,4 +1,5 @@
- #include <cstdio>
-+#include <cstdlib>
- #include <iostream>
- #include <stdexcept>
- 
---- libpqxx-2.6.9.orig/test/test011.cxx
-+++ libpqxx-2.6.9/test/test011.cxx
-@@ -1,4 +1,5 @@
- #include <cstdio>
-+#include <cstring>
- #include <iostream>
- 
- #include <pqxx/connection>
-
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.9.ebuild b/dev-libs/libpqxx/libpqxx-2.6.9.ebuild
deleted file mode 100644
index 6c6d50125a01..000000000000
--- a/dev-libs/libpqxx/libpqxx-2.6.9.ebuild
+++ /dev/null
@@ -1,64 +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.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."
-SRC_URI="ftp://pqxx.org/software/${PN}/${P}.tar.gz"
-HOMEPAGE="http://pqxx.org/development/libpqxx/"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-db/postgresql-base"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	epatch "${FILESDIR}/${P}-gcc44.patch"
-
-	# 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
-
-	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-r3.ebuild b/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild
deleted file mode 100644
index 220fb88e450e..000000000000
--- a/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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
-}
diff --git a/dev-libs/libpqxx/libpqxx-4.0.ebuild b/dev-libs/libpqxx/libpqxx-4.0.ebuild
deleted file mode 100644
index e11af439bed5..000000000000
--- a/dev-libs/libpqxx/libpqxx-4.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.ebuild,v 1.5 2012/01/15 16:34:13 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}"
-
-# src_test is interactive unless PGDATABASE and PGUSER is set either as an
-# environment variable or in /etc/libpqxx_test_env
-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() {
-	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
-
-		# 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 -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
-}