version bump

Package-Manager: portage-2.0.53_rc5

5 files changed, 118 insertions, 16 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index 106f7026e249..9c8c285f1800 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/pgadmin3
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.22 2005/10/13 22:05:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.23 2005/10/18 21:39:33 nakano Exp $
+
+*pgadmin3-1.4.0_beta2 (18 Oct 2005)
+
+  18 Oct 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/pgadmin3-1.4.0-beta2-configure.patch, +pgadmin3-1.4.0_beta2.ebuild:
+  Version bump.
 
   13 Oct 2005; Aron Griffis <agriffis@gentoo.org> pgadmin3-1.2.2.ebuild:
   Mark 1.2.2 stable on alpha
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index baab01b8e259..605338c3b8e0 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 fda96699361e71e1f60886c745807ed8 pgadmin3-1.2.2.ebuild 1947
-MD5 ff00d8ed50ff601b2cc5d49a26797fb4 ChangeLog 2838
-MD5 85d8072c5cd7a7f299a0367ad704611b pgadmin3-1.0.2.ebuild 1276
+MD5 8cb1a4d80982959b3459ea98c7fe8ab1 ChangeLog 3018
+MD5 e69c2dd9e40469e9bc040a05e04054f1 files/digest-pgadmin3-1.0.2 67
 MD5 87c2509be27973faac529f94388b8180 files/digest-pgadmin3-1.2.2 67
+MD5 e1e7cb10442a3f692fc93ddefb3799dd files/digest-pgadmin3-1.4.0_beta2 73
 MD5 ea8ba09f3c984e557eb454fcf10b23aa files/pgadmin3-1.2.2-configure.patch 985
-MD5 e69c2dd9e40469e9bc040a05e04054f1 files/digest-pgadmin3-1.0.2 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDTtpLJrHF4yAQTrARAq6BAKCTWabxs2vTCMaF95XBYMB1JYYAPwCgxAMb
-TInrimnvZ3YKPsMNgi82EYQ=
-=iuTb
------END PGP SIGNATURE-----
+MD5 ea8ba09f3c984e557eb454fcf10b23aa files/pgadmin3-1.4.0-beta2-configure.patch 985
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 85d8072c5cd7a7f299a0367ad704611b pgadmin3-1.0.2.ebuild 1276
+MD5 fda96699361e71e1f60886c745807ed8 pgadmin3-1.2.2.ebuild 1947
+MD5 f26d394e1f205e41b6b039a5b22a071c pgadmin3-1.4.0_beta2.ebuild 1970
diff --git a/dev-db/pgadmin3/files/digest-pgadmin3-1.4.0_beta2 b/dev-db/pgadmin3/files/digest-pgadmin3-1.4.0_beta2
new file mode 100644
index 000000000000..f0fbbbf2bcea
--- /dev/null
+++ b/dev-db/pgadmin3/files/digest-pgadmin3-1.4.0_beta2
@@ -0,0 +1 @@
+MD5 0a8cf838e169bde4aa242dfe6714171a pgadmin3-1.4.0-beta2.tar.gz 6216722
diff --git a/dev-db/pgadmin3/files/pgadmin3-1.4.0-beta2-configure.patch b/dev-db/pgadmin3/files/pgadmin3-1.4.0-beta2-configure.patch
new file mode 100644
index 000000000000..f04a977d0b85
--- /dev/null
+++ b/dev-db/pgadmin3/files/pgadmin3-1.4.0-beta2-configure.patch
@@ -0,0 +1,26 @@
+--- 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.4.0_beta2.ebuild b/dev-db/pgadmin3/pgadmin3-1.4.0_beta2.ebuild
new file mode 100644
index 000000000000..2af0d33e0941
--- /dev/null
+++ b/dev-db/pgadmin3/pgadmin3-1.4.0_beta2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.4.0_beta2.ebuild,v 1.1 2005/10/18 21:39:33 nakano Exp $
+
+inherit eutils libtool wxwidgets
+
+IUSE=""
+
+RESTRICT="nomirror"
+DESCRIPTION="wxWindows GUI for PostgreSQL"
+HOMEPAGE="http://www.pgadmin.org/"
+MY_P=${P/_/-}
+SRC_URI="mirror://postgresql/pgadmin3/beta/src/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND=">=x11-libs/wxGTK-2.6.0
+	dev-db/libpq"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if ! built_with_use '>=x11-libs/wxGTK-2.6.0' unicode ; then
+		die "${PN} requires >=x11-libs/wxGTK-2.6.0 emerged with USE='unicode'"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die "Couldn't cd to ${S}"
+	epatch ${FILESDIR}/${MY_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=/lib/wx/config/${WX_CONFIG_NAME}"
+	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
+}