Version bump (bug #148707). Dropped old version. Changed dependency for postgresql to virtual/postgresql-base

(Portage version: 2.1.5_rc7)

6 files changed, 75 insertions, 105 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index bf57e48df5c0..3edac3bc11eb 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/pgadmin3
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.34 2007/07/02 14:31:03 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.35 2008/05/19 19:10:18 dev-zero Exp $
+
+*pgadmin3-1.8.2 (19 May 2008)
+
+  19 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -files/pgadmin3-1.2.2-configure.patch,
+  +files/1.8.2-as_needed_ssl_detect_broken.patch, -pgadmin3-1.2.2.ebuild,
+  pgadmin3-1.4.3.ebuild, +pgadmin3-1.8.2.ebuild:
+  Version bump (bug #148707). Dropped old version. Changed dependency for
+  postgresql to virtual/postgresql-base
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> pgadmin3-1.2.2.ebuild:
   (QA) RESTRICT clean up.
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
new file mode 100644
index 000000000000..36a9e91a8c89
--- /dev/null
+++ b/dev-db/pgadmin3/files/1.8.2-as_needed_ssl_detect_broken.patch
@@ -0,0 +1,10 @@
+--- 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/pgadmin3-1.2.2-configure.patch b/dev-db/pgadmin3/files/pgadmin3-1.2.2-configure.patch
deleted file mode 100644
index f04a977d0b85..000000000000
--- a/dev-db/pgadmin3/files/pgadmin3-1.2.2-configure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.orig	2005-06-19 23:29:13.000000000 +0200
-+++ configure	2005-06-19 23:32:38.000000000 +0200
-@@ -5364,13 +5364,22 @@
-         then
-             if test ! -f "${WX_HOME}/${wx_config_binary}"
-             then
-+	    	# PP: here i have trouble, since on my machine
-+		# the WX_HOME point to /usr/local (old 2.5) and should be /usr...
-+		# lets try as last chance
-+		WX_HOME=/usr
-+		if test ! -f "${WX_HOME}/${wx_config_binary}"
-+           	then
-                 { { echo "$as_me:$LINENO: error: Could not find ${wx_config_binary}" >&5
--echo "$as_me: error: Could not find ${wx_config_binary}" >&2;}
-+			echo "$as_me: error: Could not find ${wx_config_binary}" >&2;}
-    { (exit 1); exit 1; }; }
-             else
-                 WX_CONFIG="${WX_HOME}/${wx_config_binary}"
-             fi
-         else
-+                WX_CONFIG="${WX_HOME}/${wx_config_binary}"
-+            fi
-+        else
-             WX_CONFIG="${WX_HOME}/bin/${wx_config_binary}"
-         fi
-     else
diff --git a/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild
deleted file mode 100644
index 5948905f9a26..000000000000
--- a/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild,v 1.9 2007/07/02 14:31:03 peper Exp $
-
-inherit eutils libtool wxwidgets
-
-IUSE=""
-
-RESTRICT="mirror"
-DESCRIPTION="wxWindows GUI for PostgreSQL"
-HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin3/release/v${PV}/src/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="alpha amd64 ppc sparc x86"
-
-DEPEND="=x11-libs/wxGTK-2.6*
-	dev-db/libpq
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	if ! built_with_use '=x11-libs/wxGTK-2.6*' unicode ; then
-		die "${PN} requires =x11-libs/wxGTK-2.6* emerged with USE='unicode'"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S} || die "Couldn't cd to ${S}"
-	epatch ${FILESDIR}/${P}-configure.patch
-}
-
-src_compile() {
-	export WX_GTK_VER="2.6"
-	export WX_HOME="/usr"
-	need-wxwidgets unicode
-
-	local myconf
-	myconf="${myconf} --enable-unicode"
-	myconf="${myconf} --enable-gtk2"
-	myconf="${myconf} --with-pgsql-include=/usr/include/postgresql"
-	myconf="${myconf} --with-wx-config=${WX_CONFIG/\/usr}"
-	myconf="${myconf} --enable-postgres"
-	LDFLAGS=-L/usr/lib/postgresql econf ${myconf} || die
-
-	cd ${S}
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodir /usr/share/pixmaps
-
-	cp ${S}/src/include/images/elephant48.xpm ${D}/usr/share/pixmaps/pgadmin3.xpm
-
-	dodir /usr/share/pgadmin3
-
-	cp ${S}/src/include/images/elephant48.xpm ${D}/usr/share/pgadmin3/pgadmin3.xpm
-
-	chmod 644 ${D}/usr/share/pixmaps/pgadmin3.xpm
-	chmod 644 ${D}/usr/share/pgadmin3/pgadmin3.xpm
-
-	dodir /usr/share/applications
-
-	cp ${S}/pkg/pgadmin3.desktop ${D}/usr/share/applications/pgadmin3.desktop
-	chmod 644 ${D}/usr/share/applications/pgadmin3.desktop
-
-	dodir /usr/share/applnk/Development
-
-	cp ${S}/pkg/pgadmin3.desktop ${D}/usr/share/applnk/Development/pgadmin3.desktop
-	chmod 644 ${D}/usr/share/applnk/Development/pgadmin3.desktop
-}
diff --git a/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild b/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild
index 36fa37511c14..e7fb2ea7eb38 100644
--- a/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild,v 1.6 2007/06/04 22:05:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild,v 1.7 2008/05/19 19:10:18 dev-zero Exp $
 
 inherit wxwidgets eutils autotools
 
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE="debug"
 
 DEPEND="=x11-libs/wxGTK-2.6*
-	>=dev-db/libpq-7.4
+	>=virtual/postgresql-base-7.4
 	>=dev-libs/libxml2-2.5
 	>=dev-libs/libxslt-1.1"
 RDEPEND="${DEPEND}"
diff --git a/dev-db/pgadmin3/pgadmin3-1.8.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.8.2.ebuild
new file mode 100644
index 000000000000..0aab672f8b04
--- /dev/null
+++ b/dev-db/pgadmin3/pgadmin3-1.8.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.8.2.ebuild,v 1.1 2008/05/19 19:10:18 dev-zero Exp $
+
+EAPI="1"
+
+WX_GTK_VER="2.8"
+
+inherit wxwidgets eutils autotools
+
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DESCRIPTION="wxWidgets GUI for PostgreSQL."
+HOMEPAGE="http://www.pgadmin.org/"
+SRC_URI="mirror://postgresql/pgadmin3/release/v${PV}/src/${P}.tar.gz"
+LICENSE="Artistic"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="x11-libs/wxGTK:2.8
+	virtual/postgresql-base
+	>=dev-libs/libxml2-2.5
+	>=dev-libs/libxslt-1.1"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-as_needed_ssl_detect_broken.patch"
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--with-wx-version=2.8 \
+		$(use_enable debug)
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "einstall failed"
+
+	insinto /usr/share/pixmaps
+	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
+
+	insinto /usr/share/pgadmin3
+	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
+
+	insinto /usr/share/applications
+	doins "${S}/pkg/pgadmin3.desktop"
+}