Clean out old versions and remove unused patches.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

7 files changed, 10 insertions, 255 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/Manifest b/dev-db/pgadmin3/Manifest
index 2c60fa7441a4..e18368e37cf0 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1,32 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cflags.patch 325 SHA256 8d98f5bf44ae705687438d5ff531d736479c62deaf913eb8878ffbcd3ec8fdab SHA512 89ddd669d25b63631adfa58a6f7f3cb020c01a35c58e04aa008c128b47674f36215490c1ef825d2ed0964d743c3c0e47fb09ad7e0bdda59c7924861b91d4b560 WHIRLPOOL 7f052ec82026156031a93e762d7e97e1bcc18001f6b8ff0a5e0fe904b1f25dba4182631b1a884b99471066664fdaf77841e0be33c4f5e59acaec88b798407d5c
 AUX pgadmin3-desktop.patch 461 SHA256 94f8ddf43977b208ce31418f121f0be76dcf9070522bc8a8ad55e3ac0c8fe873 SHA512 88ba8d704012868c93655e07bfad54e6ebe5f36955e60688863b3d280eef25dad352639630c73700d9f2bbdc9a80f013614bbf7d92c50d2d17b8dd23b23c83a8 WHIRLPOOL 714565e0868ffcfd63ba6d8e684a6f11d70f049af09109a787c2824818e09f3b905037841eda26d36894788178ee3f9f7186c4deb5a5dbb13922367150d035d2
-AUX ssl-detect-r1.patch 1953 SHA256 87753c32869b428ca89a8142cc292894ab19417b068055cd8a88ad820cc1d1c6 SHA512 6615405719b76a4aa195c9a5a2f56b9519e7be6fb69d7c5b3e5ed4ca381063afee1ca5dc61eeffb6f8fabef6467d4fa24c373a41e2bb79a80d6877e72da838a7 WHIRLPOOL ef7e543cd0ac942ce8551e69dcc4bc4d8644035bc6b162d5e972ce9573c1e0f4d8db061aac4b02b98c083052d1a7f8e87b33e9ed14206e038d626aab1babb1a4
-AUX ssl-detect.patch 1164 SHA256 521ef777456e9597fd27f1abb85808b07dca359888197a3329356aa4e560aa5e SHA512 17839b5cf32da94f8e56e06c71ee6a72cb2cf71c517895a8081538019c4b6e54a79fd6473ba29883d50ae5a134d24cb09aa59062e8d7f67283d299e55f161c9d WHIRLPOOL feca399f000df37b0728bd49d13a927bf485adde33255ee6b22e1d559f16ae930ee0822a24824d350f5ed1b6476c16a05bb9d47483de974539a61156f2a90439
-DIST pgadmin3-1.16.1.tar.gz 13783723 SHA256 d4ba243dc24dc28e6d0db4104baec373ab3bec11c6dc0e6cfa4bd665a5b7c28e SHA512 f5f110f99d15801dc2b2253c803cf038871461909cb63f114ee769ff0977183d6825f3bf13f378822f874fc15aa593f52cd999ccb97370b786b6e02f45ce4a81 WHIRLPOOL 375f444147e2ff850d1fdffe8d88bbd9296aff652f1008447242e7cbe5995ad1ba37822fafe5012d09bf963cf4485183f72087c3ade3740c2eab974e931fb5b1
-DIST pgadmin3-1.18.0.tar.gz 14257838 SHA256 58f29f5a380a49065e4b97bd9c8effd12ae99f464fa8834ba403baa2a658278d SHA512 dbf052269e4c0478239f111bca2e09b430a590778d19460f24b1f39c0204dad4a182ee93df06675c5640fd532ad289f5425468e5c08d11d833429e3076e2ed7b WHIRLPOOL 30a07cfb3a6fd0525fe1677186f9cb95f232c65e7851807abf0e929ccc4e34a36ec7fcb4f9f0df8ff5e1fdcc93b8f67ee9acb4c90a8ce33337bcb8ae15c5999f
 DIST pgadmin3-1.18.1.tar.gz 14265392 SHA256 27ac3e296a6ca3da9da8ee22ed98eabfe1377be507877ffc26048fc2a9c6cbc0 SHA512 e292aaf95159eda98fe5f5112aad758cc08c38fe325ef92c698009defeb3891d9e0d485c00a0cbb82b70a95f54755eeb7f90b82a34354e77b485f738b5458c99 WHIRLPOOL 1f1af18a721c2c99b0dc52ec571e5831aac89eb998d9917e82134f9a900fce5b5a8edcc55640c962bd9b14de1ebae42cf9d896e1a3f84a05402674252dfeeb17
-EBUILD pgadmin3-1.16.1-r1.ebuild 1380 SHA256 34928694c94aedbefe09120b7b6d4432c22fc5533075b1df01d986125f860dcb SHA512 4761e1e3068df00b6aeb3f18bccea5fb404b3334162a7add072cdfc909aa3eb4f252554babc2bfccc4e632c00ca3d31b5c811e1784c7004df4ea76ec85400da9 WHIRLPOOL 9cf8161f0b7020d615940aaa13d45db1a62179e00f21fda5c0bc627255d3d4f194c4cbc553b54288552f9a69060bbab8bf3f565f0cb745bdbfaf4188281aa3e7
-EBUILD pgadmin3-1.18.0.ebuild 1451 SHA256 ecef7b3080009175dbfcf901906263125f8f6f248dff6b59fed3d968238372ad SHA512 04f646242e51d955f3e8d3e8dce88ebef3b92256da50d9dc9ca4f902c074d0e47314d3e8e0fed7ed19495d04aec05a962d17c87a9dce793948914d3b99fa2c93 WHIRLPOOL 25090dab3f41ec66953eeee07ceff1f5f1f82c8d0a5a398d0bd81b13e0153b81b101f772e8db61c41e4b9a6b396f285ab88ad751e83f7b6e9bc7661863a35cac
 EBUILD pgadmin3-1.18.1.ebuild 1441 SHA256 c0c203cfeea6d998b03de9cd4f5c90a32cb19fb7877124030f7ddbedaad9365f SHA512 024287cf03f3ee06e92ee8ca38bd3d1d71d0bc1fd334041810922d6771e771df000ce7e811b0a98a2d8d394606762aa015f3f732e2baf063511952d890d353c5 WHIRLPOOL 8bbee6806adee5db3078e4a10bf53110cc283eff5f662f0ee0fc89e8013eb4a0dedc68c22ae0183fd43022ec3ec96e5ee17b977fad14d31e79904a8ddc9de917
-MISC ChangeLog 13695 SHA256 6ce119a9e56dcd537f2959042314b0410fe827eaa602407ccfaa35b99db85286 SHA512 d29600fd015b779e5cb5d2b010b186293831720d571753bca9092e77cbbdb8059d9273636705899ceb26dcc894f052ba21b1e26631a3a13bc912443d53a0c4bf WHIRLPOOL 3e638a76635e3ba65fb43ed0225f4fd548ed9601cc352d1ff0b59150e9f6821e5cb41b5de17857b5f8efd582bf187b378854803805519baaf901dea55b140b9c
+MISC ChangeLog 13942 SHA256 b118a4ff412ec1154575adbba96e9063f6e095957ff8013b3b0caa0405ed328a SHA512 4b853a9c0c8e1c7bc0e526fb9945bb3308257e62547cbb0f6b09f65da4ac9070c2bf2ff3731272c81bba70efb8cb5df5f7d5f3c8688e25fb9060702190660f27 WHIRLPOOL d0aaf6da093b9272bdad616edab54c92df69f82a2957a4f0cfe0b0ca5bea2949cfbbb9b1b7b574f935a294bbb5b0e64807d8c911e0f6cec824a61bfc1870a3bd
 MISC metadata.xml 254 SHA256 40e9505bc99da381353a4b9d1ea7e2b0af255c8276dfa10a77d6e798fc12cc9d SHA512 ad6b4f1526b1b7b8bc354fcccc68340d4e5a85da236b3a8709ad47cc4482dbe5454632193e5797bd9d8c92ec1637d93e7418d8592d7dbde65a6dc3509443ba2f WHIRLPOOL bd28d8a58b2688047dc3e22cbad28a60e4102f8536492dad1f82c2a9fd31d494a2f55d46fb5cefed6e40c172aa8cb39f3e75eeccb64d461bce78c9171b8002ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5OsIAAoJELp701BxlEWfJJ4P/iWRtyGAkZMLaVO5eDygHWJn
-GBmZq9nWRsPXb1bD6iehLzwWLJ8liycFNgIBD9T73gjo2GubHcOrbJGojpuy9oht
-PB4rufdTOBRPtj3zTXTrAXTYdhQDXyvfi3JT69O47olAgW6hQ4vTeIbnAGbO2lY3
-kHwI5TX2Kk9p9DAQSsSISp/avNWRK0U3t3DAH0XMAOVVvsXW5hTE1kAF+WzMprG/
-k6GR6In23gaAFs8F/XPUTMsdaEJoGH14u2+1+TbETXAHEyIrR+u8D/Hmp/11WYor
-uOeagGAj18KdEMsVA8Mtyiz/gNsk4T25PWiNSlXuEEcbAH81gIL4H5M9tW6vKfOB
-lxj9GIQymbLgm2P+CpOuzLBtX8KAOrTy+9WTASmeY8ZYZKjPZaqdKwAEscmcbIsR
-ncYWOWcz8RscboQxYXO8oAsZ93hMYifvq4bSeu1oh6ATVt1kg9kIkmguqB6lSncn
-AdYxUkJAkgQf6HRkCQhmRJS7lLlNUPxRmv0DCpJX28fvgCjz0urH8nuBV0uBMjgG
-ZZjv6uCJonOc08iysmphijg1hZcEZCu62StXaePjD5e2tcy0fwEtUFunC8MIQI3+
-+u6Y2ViU9p0lsLN4DywSLGds/CHOZSwSCUie0/UjAFpk3vwmZaQ7TFOviNxDCfhO
-egz1eWnCDy5JWNqJqGGW
-=EMl3
+iF4EAREIAAYFAlLmUIgACgkQVxOqA9G7/aA08AD+NQt1BWU744z7A3NURh3LlHOp
+9JIhdyrFfk7OAnX+4KcA/0PKIS9G//7RPgCXLHa8+ijto9IcMsPPLNpjFFJc9IBr
+=o1QU
 -----END PGP SIGNATURE-----
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
-}