Version bump fixes bug 389679. Improved SSL detection patch.

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

4 files changed, 138 insertions, 6 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index 78f18946fec8..96fc804607a5 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/pgadmin3
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.65 2011/07/11 17:30:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.66 2011/11/12 15:36:39 titanofold Exp $
+
+*pgadmin3-1.14.0 (12 Nov 2011)
+
+  12 Nov 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  +files/ssl-detect-r1.patch, +pgadmin3-1.14.0.ebuild:
+  Version bump fixes bug 389679. Improved SSL detection patch.
 
   11 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   pgadmin3-1.14.0_beta1.ebuild:
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index 0b2b0ce59356..f2477df04286 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX cflags.patch 325 RMD160 1d3aafb87a35c6f2f24f9320bb540c128b038caf SHA1 e3f661cb86a3e6065bf2f6d73804d5ec9f122770 SHA256 8d98f5bf44ae705687438d5ff531d736479c62deaf913eb8878ffbcd3ec8fdab
+AUX ssl-detect-r1.patch 1953 RMD160 3ec01ca17976ae3bcf24feb9d7ef363e92c6e361 SHA1 e4bffba32927bb38f8dc0a4ca98f2364e314099e SHA256 87753c32869b428ca89a8142cc292894ab19417b068055cd8a88ad820cc1d1c6
 AUX ssl-detect.patch 1164 RMD160 98a74cedd8aae69f12e525e2bf3e934b59ad9608 SHA1 8317172ac696a63b22678e82738de5960889c89e SHA256 521ef777456e9597fd27f1abb85808b07dca359888197a3329356aa4e560aa5e
 DIST pgadmin3-1.12.2.tar.gz 15111631 RMD160 56fcc8243728ab88b92db9f8c34295bac2a9d0df SHA1 c734e65679922d780953a4d79429037f1c8b1e9b SHA256 26b3debd2e15c1a4e8b496b131fe15d71ad325f0e5bfb010128a30f91c5686cd
 DIST pgadmin3-1.12.3.tar.gz 15115418 RMD160 1fc5fe096ac6440071c36b3b3152e929e464f8d9 SHA1 051462bcc003a7d9daddf8a01d6d4b4d82282229 SHA256 d3b13c3e90f8c8cedb8157e46aa6d9467596cc9b4e92cf5558b09e4fa8bb36de
 DIST pgadmin3-1.14.0-beta1.tar.gz 16813450 RMD160 64b0f7f21f57b7e3153f04f0f56d9c52dbf5c7d6 SHA1 156a3bf8d596cae75336f435b633b210dc9115b6 SHA256 a47f8244ce8021a368d6ad3eb34481dd04528c13453fbbc8ab013db278790558
+DIST pgadmin3-1.14.0.tar.gz 15041312 RMD160 919ba33e71826114613a169af2de0194db224525 SHA1 0b3387a091dfa8245216ad9efa6d400e83f9da33 SHA256 396c2b0394496f23ea51c095b619eecc8c33473f0f483b795bfeb391e56cafd2
 EBUILD pgadmin3-1.12.2.ebuild 1116 RMD160 315ab8933f7d74fa38aa0a76bd5a49f28ca0f5c7 SHA1 d158cefce4a9925aedbc311bf04ae3381e9bc65f SHA256 32eac3623fab5bdfd6a6a018e22c4106486c004bd0ff5740d9214d3ee9ebba03
 EBUILD pgadmin3-1.12.3-r1.ebuild 1439 RMD160 0a41a343b05b199fbef164ec026d69fde702ede7 SHA1 5af9f0add888f06c6b86be86212f0950bb93a4de SHA256 67c047731bf62e01c43ccb445bde920f3c4e0171f0f2c5149f6a9eeb1b9755cc
 EBUILD pgadmin3-1.12.3.ebuild 1048 RMD160 784ab9ae09503d45d960d9b31820f75b909f8d86 SHA1 13e2e2bbd5b7fe9897273745ff8d06ec6f53ca7f SHA256 6adbe2a205e0ea69338fd21c2efd7be334fc061ea2aeff2c9566d1d459634c1e
+EBUILD pgadmin3-1.14.0.ebuild 1425 RMD160 6d49a07b19776822c02430175e38248b0d9dd1e4 SHA1 7aad94e6d5245f33064bd7fb68f76ed13c384578 SHA256 4276b4e1966898e9f0cfe2bad5b63f820da63428de8f507e55ae6dbe57ec09a1
 EBUILD pgadmin3-1.14.0_beta1.ebuild 1453 RMD160 deba41cf6f1da592ed0ef8758269e732303340aa SHA1 9a7e3a55a663a7745af189ccd9c0ce0e87197518 SHA256 5cdb29543431446110328b8b8ea14d08ec1da405948e6f01de155dcd8c950b5f
-MISC ChangeLog 9133 RMD160 df6e82740a4910f1e8c9d61c53ccfb7bd2a17aea SHA1 14855821e2f52c10cd70fb896c4ed8d33d90f950 SHA256 bcaa9997778cf579d99464571e0b6432b31ebf8a88677ff4c37e2a2522d272ff
+MISC ChangeLog 9341 RMD160 7397945a7fef0246c8ac84363c77fd7d387e1ae9 SHA1 9499401280e2622ce6e77babe8e575e5f77abc6a SHA256 7bd5192be62e938315674e13b315f7533f58f12d79cfb76ff155b9676a5aaceb
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4bMxYACgkQHB6c3gNBRYexywCgnUdIwbhMC/b9KZ99L9181+CI
-CCgAniDfwLkseYg0x9XyfzvtGBHE237O
-=Jb1i
+iF4EAREIAAYFAk6+ko0ACgkQVxOqA9G7/aC6OAD/RPeQKFeZ6doqTm69gOUdoey2
+wW48Zl+iCk780/jjScsA/3ub4z1vE3eSaoVE3bV8aTAfm6T5e5s217wSnJXKrzd8
+=ZKlF
 -----END PGP SIGNATURE-----
diff --git a/dev-db/pgadmin3/files/ssl-detect-r1.patch b/dev-db/pgadmin3/files/ssl-detect-r1.patch
new file mode 100644
index 000000000000..a54b2ba218a9
--- /dev/null
+++ b/dev-db/pgadmin3/files/ssl-detect-r1.patch
@@ -0,0 +1,64 @@
+--- 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/pgadmin3-1.14.0.ebuild b/dev-db/pgadmin3/pgadmin3-1.14.0.ebuild
new file mode 100644
index 000000000000..18016bf78d0c
--- /dev/null
+++ b/dev-db/pgadmin3/pgadmin3-1.14.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.14.0.ebuild,v 1.1 2011/11/12 15:36:39 titanofold Exp $
+
+EAPI="4"
+
+WX_GTK_VER="2.8"
+
+inherit autotools 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="Artistic"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="x11-libs/wxGTK:2.8[X]
+	>=dev-db/postgresql-base-8.4.0
+	>=dev-libs/libxml2-2.6.18
+	>=dev-libs/libxslt-1.1"
+RDEPEND="${DEPEND}"
+
+pkg_pretend() {
+	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}/ssl-detect-r1.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-wx-version=2.8 \
+		$(use_enable debug)
+}
+
+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
+}