Fixes bug 232158 and bug 345817

(Portage version: 2.1.9.42/cvs/Linux i686)

5 files changed, 123 insertions, 11 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index 99208bf73a36..783d678ba1d7 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,13 @@
 # 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.62 2011/07/04 22:48:30 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.63 2011/07/10 23:12:51 titanofold Exp $
+
+*pgadmin3-1.12.3-r1 (10 Jul 2011)
+
+  10 Jul 2011; Aaron W. Swenson <titanofold@gentoo.org> +files/cflags.patch,
+  +files/ssl-detect.patch, -files/1.8.2-as_needed_ssl_detect_broken.patch,
+  +pgadmin3-1.12.3-r1.ebuild:
+  Fixes bug 232158 and bug 345817
 
   04 Jul 2011; Aaron W. Swenson <titanofold@gentoo.org> pgadmin3-1.12.2.ebuild,
   pgadmin3-1.12.3.ebuild:
diff --git a/dev-db/pgadmin3/files/1.8.2-as_needed_ssl_detect_broken.patch b/dev-db/pgadmin3/files/1.8.2-as_needed_ssl_detect_broken.patch
deleted file mode 100644
index 36a9e91a8c89..000000000000
--- a/dev-db/pgadmin3/files/1.8.2-as_needed_ssl_detect_broken.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- acinclude.m4.orig	2008-05-19 20:33:59.000000000 +0200
-+++ acinclude.m4	2008-05-19 20:35:01.000000000 +0200
-@@ -465,6 +465,7 @@
- 	        			PG_SSL="no"
- 		        	fi
-         		else
-+					LIBS="${LIBS} -lssl"
- 	        		AC_CHECK_LIB(pq, SSL_connect, [PG_SSL=yes], [PG_SSL=no])
- 	        	fi
-                 fi
diff --git a/dev-db/pgadmin3/files/cflags.patch b/dev-db/pgadmin3/files/cflags.patch
new file mode 100644
index 000000000000..fa5040fae20a
--- /dev/null
+++ b/dev-db/pgadmin3/files/cflags.patch
@@ -0,0 +1,12 @@
+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.patch b/dev-db/pgadmin3/files/ssl-detect.patch
new file mode 100644
index 000000000000..38297d68952f
--- /dev/null
+++ b/dev-db/pgadmin3/files/ssl-detect.patch
@@ -0,0 +1,43 @@
+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.12.3-r1.ebuild b/dev-db/pgadmin3/pgadmin3-1.12.3-r1.ebuild
new file mode 100644
index 000000000000..f1f1db001f1e
--- /dev/null
+++ b/dev-db/pgadmin3/pgadmin3-1.12.3-r1.ebuild
@@ -0,0 +1,60 @@
+# 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.12.3-r1.ebuild,v 1.1 2011/07/10 23:12:51 titanofold Exp $
+
+EAPI="4"
+
+WX_GTK_VER="2.8"
+
+inherit autotools multilib 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.5
+	>=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}/cflags.patch" \
+		"${FILESDIR}/ssl-detect.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
+}