version bump.

Package-Manager: portage-2.0.51.21

5 files changed, 135 insertions, 2 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index b53bf410efb6..e4419ca89df4 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.11 2005/05/03 02:42:51 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.12 2005/05/03 12:57:08 nakano Exp $
+
+*pgadmin3-1.2.1 (03 May 2005)
+
+  03 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/pgadmin3-1.2.1-configure.patch, +pgadmin3-1.2.1.ebuild:
+  Version bump. Fixed ebuild by Rob Cakebread <pythonhead@gentoo.org>.
 
   03 May 2005; Masatomo Nakano <nakano@gentoo.org> pgadmin3-1.2.0.ebuild:
   Changed DEPEND from wxGTK-2.5 to wxGTK-2.6.
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index 7065733db59c..8103ffc42458 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1,6 +1,9 @@
+MD5 5a8448419304d6227178b5bfc16727e2 pgadmin3-1.2.1.ebuild 2002
 MD5 85d8072c5cd7a7f299a0367ad704611b pgadmin3-1.0.2.ebuild 1276
 MD5 cc222370912816991b716cc1bda0c21a pgadmin3-1.2.0.ebuild 2226
-MD5 3f5563f415a44c878d3d2f81eaf92c2f ChangeLog 1373
+MD5 5b130ec5dec758cfe5396ce4d6feb003 ChangeLog 1592
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 e69c2dd9e40469e9bc040a05e04054f1 files/digest-pgadmin3-1.0.2 67
 MD5 e6643c3efaa48470726839ac1c66d6c6 files/digest-pgadmin3-1.2.0 67
+MD5 69a195a883fc22b21d9dbc8828dfb712 files/digest-pgadmin3-1.2.1 67
+MD5 51c15dffcaca240691cfde7d2cdc5361 files/pgadmin3-1.2.1-configure.patch 1721
diff --git a/dev-db/pgadmin3/files/digest-pgadmin3-1.2.1 b/dev-db/pgadmin3/files/digest-pgadmin3-1.2.1
new file mode 100644
index 000000000000..3e56d8fdcf91
--- /dev/null
+++ b/dev-db/pgadmin3/files/digest-pgadmin3-1.2.1
@@ -0,0 +1 @@
+MD5 ae62e8cb19690568420b5eee5821a8e1 pgadmin3-1.2.1.tar.gz 3855296
diff --git a/dev-db/pgadmin3/files/pgadmin3-1.2.1-configure.patch b/dev-db/pgadmin3/files/pgadmin3-1.2.1-configure.patch
new file mode 100644
index 000000000000..5f07441adbab
--- /dev/null
+++ b/dev-db/pgadmin3/files/pgadmin3-1.2.1-configure.patch
@@ -0,0 +1,49 @@
+--- configure.orig	2005-05-03 04:13:31.111052040 +0000
++++ configure	2005-05-03 04:13:55.243383368 +0000
+@@ -4967,10 +4967,10 @@
+     echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+     WX_HOME=/usr/local/wx2
+-    if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h"
++    if test ! -f "${WX_HOME}/include/wx-2.6/wx/wx.h"
+     then
+         WX_HOME=/usr/local
+-        if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h"
++        if test ! -f "${WX_HOME}/include/wx-2.6/wx/wx.h"
+         then
+             WX_HOME=/usr
+         fi
+@@ -5025,8 +5025,8 @@
+     # Which version of wxWindows is this?
+     WX_VERSION=`${WX_CONFIG} --version`
+     case "${WX_VERSION}" in
+-        2.5*)
+-            WX_VERSION="2.5"
++        2.6*)
++            WX_VERSION="2.6"
+             ;;
+         2.4*)
+             WX_VERSION="2.4"
+@@ -5238,7 +5238,7 @@
+     fi
+ 
+     WX_NEW_CPPFLAGS=`${WX_CONFIG} --cxxflags`
+-    CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include/wx-2.5"
++    CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include/wx-2.6"
+     case "${host}" in
+         *-apple-darwin*)
+             CPPFLAGS="$CPPFLAGS -no-cpp-precomp -fno-rtti"
+@@ -5247,11 +5247,11 @@
+             ;;
+     esac
+     wx_wx_h="yes"
+-    if test ! -f "${WX_HOME}/include/wx-2.5/wx/version.h"
++    if test ! -f "${WX_HOME}/include/wx-2.6/wx/version.h"
+     then
+         wx_wx_h="no"
+     fi
+-    if test ! -f "${WX_HOME}/include/wx-2.5/wx/stc/stc.h"
++    if test ! -f "${WX_HOME}/include/wx-2.6/wx/stc/stc.h"
+     then
+         { { echo "$as_me:$LINENO: error: you need to install the stc package from wxWindows/contrib/src/stc" >&5
+ echo "$as_me: error: you need to install the stc package from wxWindows/contrib/src/stc" >&2;}
diff --git a/dev-db/pgadmin3/pgadmin3-1.2.1.ebuild b/dev-db/pgadmin3/pgadmin3-1.2.1.ebuild
new file mode 100644
index 000000000000..d5620d8cbaf0
--- /dev/null
+++ b/dev-db/pgadmin3/pgadmin3-1.2.1.ebuild
@@ -0,0 +1,74 @@
+# 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.2.1.ebuild,v 1.1 2005/05/03 12:57:09 nakano Exp $
+
+inherit eutils libtool wxwidgets
+
+IUSE=""
+
+RESTRICT="nomirror"
+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="~x86 ~ppc ~sparc ~alpha ~amd64"
+
+DEPEND=">=x11-libs/wxGTK-2.6.0
+	|| ( >=dev-db/postgresql-7.3.5 >=dev-db/postgresql-7.4.1-r2 )
+	>=sys-apps/sed-4"
+
+pkg_setup() {
+	if [ ! -e /usr/lib/wx/config/gtk2-unicode-release-2.6 ] ; 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}/${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
+}