Fixes bug 232158 and bug 345817

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

6 files changed, 130 insertions, 16 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/Manifest b/dev-db/pgadmin3/Manifest
index 6f7dc130b549..ab23f52d688b 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 1.8.2-as_needed_ssl_detect_broken.patch 317 RMD160 08ec52c3f550444e84f58f0ccd4a1c0875178102 SHA1 2a70ecf74a47c65068fcdf77e2217dc645346c91 SHA256 7f3521c928e0d14118fc30a45c66ccc21722c839f63bfffce4fd40cf7ae4928d
+AUX cflags.patch 325 RMD160 1d3aafb87a35c6f2f24f9320bb540c128b038caf SHA1 e3f661cb86a3e6065bf2f6d73804d5ec9f122770 SHA256 8d98f5bf44ae705687438d5ff531d736479c62deaf913eb8878ffbcd3ec8fdab
+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
 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
-MISC ChangeLog 8534 RMD160 34bf5951f222bf606e0e1114f640f9b87925c1e4 SHA1 702bbe4760ec90a729acecf24030d035b5f38c77 SHA256 8fbf71da35b62380ea630a36c0fffc757207a11181fefc2767f0f2a94f0286f6
+MISC ChangeLog 8786 RMD160 55d96353dfd474681c459b2fd45ce6a0affe3b91 SHA1 ff4f68ca901b050daa80d0eec10a2145f55f2c51 SHA256 9056582af846990a126de02d917576cca8bf742ba4be091b76303b8e9fdde8af
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4SQ0wACgkQCOhwUhu5AEnNGQD7BqmZRSSMnyUaq5zN0KM7D5Qw
-hSEJ45YLyi/KramMRhIA/iSDtQ6sglrDQk3QIcj26UClPFymuCVxvOh83upt89OH
-=10tc
+iF4EAREIAAYFAk4aMfoACgkQCOhwUhu5AElSfQD/bfrdjnWTKpaVZLzFFi8bxmTZ
+2p5m+f8IBfWGrOFEsLwA+wSRoAL3cmaqTTE/ZIX2T1uYbp7frfnkE6QduT1PSibk
+=9xeH
 -----END PGP SIGNATURE-----
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
+}