Clean out old versions and remove unused patches.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)

6 files changed, 6 insertions, 234 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index 8b63a28c32d4..4762cc5a687c 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/pgadmin3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.98 2014/01/26 11:01:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.99 2014/01/27 12:26:18 titanofold Exp $
+
+  27 Jan 2014; Aaron W. Swenson <titanofold@gentoo.org>
+  -pgadmin3-1.16.1-r1.ebuild, -files/ssl-detect-r1.patch,
+  -pgadmin3-1.18.0.ebuild, -files/cflags.patch, -files/ssl-detect.patch:
+  Clean out old versions and remove unused patches.
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> pgadmin3-1.18.1.ebuild:
   Stable for x86, wrt bug #495364
diff --git a/dev-db/pgadmin3/files/cflags.patch b/dev-db/pgadmin3/files/cflags.patch
deleted file mode 100644
index fa5040fae20a..000000000000
--- a/dev-db/pgadmin3/files/cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/acinclude.m4 b/acinclude.m4
---- a/acinclude.m4	2010-09-01 09:30:36.000000000 -0400
-+++ b/acinclude.m4	2011-07-09 23:57:49.734641040 -0400
-@@ -805,8 +805,6 @@
- AC_DEFUN([CLEANUP],
- [
- 	# CFLAGS/CXXFLAGS may well contain unwanted settings, so clear them.
--	CFLAGS=""
--	CXXFLAGS=""
- ])
- 
- #########################
diff --git a/dev-db/pgadmin3/files/ssl-detect-r1.patch b/dev-db/pgadmin3/files/ssl-detect-r1.patch
deleted file mode 100644
index a54b2ba218a9..000000000000
--- a/dev-db/pgadmin3/files/ssl-detect-r1.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- pgadmin3-1.14.0-rc1.orig/acinclude.m4	2011-06-28 13:44:29.000000000 +0000
-+++ pgadmin3-1.14.0-rc1/acinclude.m4	2011-09-05 21:10:03.222953210 +0000
-@@ -406,6 +406,13 @@
- 		PGSQL_OLD_LDFLAGS="$LDFLAGS"
- 		PGSQL_OLD_CPPFLAGS="$CPPFLAGS"
- 
-+		PG_INCLUDE=`${PG_CONFIG} --includedir` 
-+        PG_SVRINCLUDE=`${PG_CONFIG} --includedir-server`
-+		PG_PKGINCLUDE=`${PG_CONFIG} --pkgincludedir`
-+		CPPFLAGS="$CPPFLAGS -I${PG_INCLUDE} -I${PG_SVRINCLUDE} -I${PG_PKGINCLUDE}"
-+	
-+		PG_VERSION=`${PG_CONFIG} --version`
-+
- 		AC_LANG_SAVE    
- 		AC_LANG_C	       
- 		AC_CHECK_LIB(ssl, SSL_library_init, [LIB_SSL=yes], [LIB_SSL=no])
-@@ -477,33 +484,7 @@
- 		if test "$LIB_SSL" = "yes"
- 		then
- 		# Check for SSL support
--		if test "$BUILD_STATIC" = "yes"
--		then
--			AC_MSG_CHECKING(for SSL_connect in libpq.a)
--			if test "$(nm ${PG_LIB}/libpq.a | grep -c SSL_connect)" -gt 0
--			then
--				AC_MSG_RESULT(present)
--				PG_SSL="yes"
--			else   
--				AC_MSG_RESULT(not present)
--				PG_SSL="no"
--			fi
--		else
--			if test "$build_cpu-$build_vendor" = "powerpc-apple" -o "$build_cpu-$build_vendor" = "i386-apple" -o "$build_cpu-$build_vendor" = "i686-apple"
--			then
--				AC_MSG_CHECKING(for SSL_connect in -lpq)
--				if test "$(otool -L ${PG_LIB}/libpq.?.dylib | grep -c libssl)" -gt 0
--				then
--					AC_MSG_RESULT(present)
--					PG_SSL="yes"
--				else
--					AC_MSG_RESULT(not present)
--					PG_SSL="no"
--				fi
--			else
--				AC_CHECK_LIB(pq, SSL_connect, [PG_SSL=yes], [PG_SSL=no])
--			fi
--		fi
-+			AC_CHECK_DECL([USE_SSL], [PG_SSL=yes], [PG_SSL=no], [[#include <pg_config.h>]])
- 		else
- 			PG_SSL="no"
- 		fi
-@@ -547,12 +528,6 @@
- 
- 		AC_LANG_RESTORE
- 
--		PG_INCLUDE=`${PG_CONFIG} --includedir` 
--        PG_SVRINCLUDE=`${PG_CONFIG} --includedir-server`
--		PG_PKGINCLUDE=`${PG_CONFIG} --pkgincludedir`
--		CPPFLAGS="$CPPFLAGS -I${PG_INCLUDE} -I${PG_SVRINCLUDE} -I${PG_PKGINCLUDE}"
--	
--		PG_VERSION=`${PG_CONFIG} --version`
- 
- 		if test "$build_os" = "mingw32"
- 		then
diff --git a/dev-db/pgadmin3/files/ssl-detect.patch b/dev-db/pgadmin3/files/ssl-detect.patch
deleted file mode 100644
index 38297d68952f..000000000000
--- a/dev-db/pgadmin3/files/ssl-detect.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur a/acinclude.m4 b/acinclude.m4
---- a/acinclude.m4	2011-04-15 09:12:01.000000000 -0400
-+++ b/acinclude.m4	2011-07-10 16:09:46.405593411 -0400
-@@ -476,19 +476,7 @@
- 
- 		if test "$LIB_SSL" = "yes"
- 		then
--		# Check for SSL support
--		if test "$BUILD_STATIC" = "yes"
--		then
--			AC_MSG_CHECKING(for SSL_connect in libpq.a)
--			if test "$(nm ${PG_LIB}/libpq.a | grep -c SSL_connect)" -gt 0
--			then
--				AC_MSG_RESULT(present)
--				PG_SSL="yes"
--			else   
--				AC_MSG_RESULT(not present)
--				PG_SSL="no"
--			fi
--		else
-+			# Check for SSL support
- 			if test "$build_cpu-$build_vendor" = "powerpc-apple" -o "$build_cpu-$build_vendor" = "i386-apple" -o "$build_cpu-$build_vendor" = "i686-apple"
- 			then
- 				AC_MSG_CHECKING(for SSL_connect in -lpq)
-@@ -501,9 +489,16 @@
- 					PG_SSL="no"
- 				fi
- 			else
--				AC_CHECK_LIB(pq, SSL_connect, [PG_SSL=yes], [PG_SSL=no])
-+				AC_MSG_CHECKING(for SSL_connect in libpq.a)
-+				if test "$(nm ${PG_LIB}/libpq.a | grep -c SSL_connect)" -gt 0
-+				then
-+					AC_MSG_RESULT(present)
-+					PG_SSL="yes"
-+				else   
-+					AC_MSG_RESULT(not present)
-+					PG_SSL="no"
-+				fi
- 			fi
--		fi
- 		else
- 			PG_SSL="no"
- 		fi
diff --git a/dev-db/pgadmin3/pgadmin3-1.16.1-r1.ebuild b/dev-db/pgadmin3/pgadmin3-1.16.1-r1.ebuild
deleted file mode 100644
index 8dc2500354bf..000000000000
--- a/dev-db/pgadmin3/pgadmin3-1.16.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.16.1-r1.ebuild,v 1.4 2013/02/20 15:57:12 ago Exp $
-
-EAPI="4"
-
-WX_GTK_VER="2.8"
-
-inherit multilib versionator wxwidgets
-
-DESCRIPTION="wxWidgets GUI for PostgreSQL."
-HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-SLOT="0"
-IUSE="debug +databasedesigner"
-
-DEPEND="x11-libs/wxGTK:2.8[X,debug=]
-	>=dev-db/postgresql-base-8.4.0
-	>=dev-libs/libxml2-2.6.18
-	>=dev-libs/libxslt-1.1"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	local pgslot=$(postgresql-config show)
-
-	if [[ ${pgslot//.} < 84 ]] ; then
-		eerror "PostgreSQL slot must be set to 8.4 or higher."
-		eerror "    postgresql-config set 8.4"
-		die "PostgreSQL slot is not set to 8.4 or higher."
-	fi
-}
-
-src_configure() {
-	econf --with-wx-version=2.8 \
-		$(use_enable debug) \
-		$(use_enable databasedesigner)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newicon "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png
-
-	# icon location for the desktop file provided in pkg folder
-	insinto /usr/share/pgadmin3
-	doins "${S}/pgadmin/include/images/pgAdmin3.png"
-
-	domenu "${S}/pkg/pgadmin3.desktop"
-
-	# Fixing world-writable files
-	fperms -R go-w /usr/share
-}
diff --git a/dev-db/pgadmin3/pgadmin3-1.18.0.ebuild b/dev-db/pgadmin3/pgadmin3-1.18.0.ebuild
deleted file mode 100644
index 6d3a88671d2b..000000000000
--- a/dev-db/pgadmin3/pgadmin3-1.18.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.18.0.ebuild,v 1.1 2013/09/25 17:37:46 titanofold Exp $
-
-EAPI="4"
-
-WX_GTK_VER="2.8"
-
-inherit multilib versionator wxwidgets
-
-DESCRIPTION="wxWidgets GUI for PostgreSQL."
-HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE="debug +databasedesigner"
-
-DEPEND="x11-libs/wxGTK:2.8[X,debug=]
-	>=dev-db/postgresql-base-8.4.0
-	>=dev-libs/libxml2-2.6.18
-	>=dev-libs/libxslt-1.1"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	local pgslot=$(postgresql-config show)
-
-	if [[ ${pgslot//.} < 84 ]] ; then
-		eerror "PostgreSQL slot must be set to 8.4 or higher."
-		eerror "    postgresql-config set 8.4"
-		die "PostgreSQL slot is not set to 8.4 or higher."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/pgadmin3-desktop.patch"
-}
-
-src_configure() {
-	econf --with-wx-version=2.8 \
-		$(use_enable debug) \
-		$(use_enable databasedesigner)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newicon "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png
-
-	# icon location for the desktop file provided in pkg folder
-	insinto /usr/share/pgadmin3
-	doins "${S}/pgadmin/include/images/pgAdmin3.png"
-
-	domenu "${S}/pkg/pgadmin3.desktop"
-
-	# Fixing world-writable files
-	fperms -R go-w /usr/share
-}