Marked as stable.

4 files changed, 18 insertions, 36 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index 76d4940d2984..7769525e715a 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/pgadmin3
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.5 2004/01/17 15:08:27 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.6 2004/03/05 17:56:41 nakano Exp $
+
+  05 Mar 2004; Masatomo Nakano <nakano@gentoo.org> pgadmin3-1.0.2.ebuild:
+  Marked as stable.
 
   17 Jan 2004; Masatomo Nakano <nakano@gentoo.org> pgadmin3-1.0.2.ebuild:
   Fixed PostgreSQL library error. Closed #37803.
diff --git a/dev-db/pgadmin3/files/digest-pgadmin3-1.0.1 b/dev-db/pgadmin3/files/digest-pgadmin3-1.0.1
deleted file mode 100644
index 74e1ee3d37c8..000000000000
--- a/dev-db/pgadmin3/files/digest-pgadmin3-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bbdc2b4568bbaac103e3652aa04e6bf1 pgadmin3-1.0.1.tar.gz 3292840
diff --git a/dev-db/pgadmin3/pgadmin3-1.0.1.ebuild b/dev-db/pgadmin3/pgadmin3-1.0.1.ebuild
deleted file mode 100644
index af514f031497..000000000000
--- a/dev-db/pgadmin3/pgadmin3-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.0.1.ebuild,v 1.4 2003/12/29 04:53:57 nakano Exp $
-
-IUSE=""
-
-S=${WORKDIR}/${P}
-DESCRIPTION="wxWindows GUI for PostgreSQL"
-HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin3/release/src/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-
-# Need 2.4.1-r1 for the extras in contrib
-DEPEND=">=x11-libs/wxGTK-2.4.1-r1
-	dev-db/postgresql"
-
-src_compile() {
-	econf || die
-	cd ${S}/src
-	sed -i -e "s:^\(LIBS\).*:\1 = -lssl -lcrypto -lpq -lwx_gtk2-2.4	-lwx_gtk2_xrc-2.4 -lwx_gtk2_stc-2.4:" Makefile
-
-	cd ${S}
-	emake || die
-}
-
-src_install() {
-	einstall || die
-}
diff --git a/dev-db/pgadmin3/pgadmin3-1.0.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.0.2.ebuild
index 95c687ece379..d9b7f88a9b9b 100644
--- a/dev-db/pgadmin3/pgadmin3-1.0.2.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.0.2.ebuild
@@ -1,21 +1,32 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.0.2.ebuild,v 1.3 2004/01/17 15:08:27 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.0.2.ebuild,v 1.4 2004/03/05 17:56:41 nakano Exp $
 
 IUSE=""
 
 S=${WORKDIR}/${P}
+RESTRICT="nomirror"
 DESCRIPTION="wxWindows GUI for PostgreSQL"
 HOMEPAGE="http://www.pgadmin.org/"
 SRC_URI="mirror://postgresql/pgadmin3/release/src/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ppc sparc alpha amd64"
 
 # Need 2.4.1-r1 for the extras in contrib
 DEPEND=">=x11-libs/wxGTK-2.4.1-r1
-	|| ( >=dev-db/postgresql-7.3.5-r1 >=dev-db/postgresql-7.4.1-r2 )"
+	|| ( >=dev-db/postgresql-7.3.5 >=dev-db/postgresql-7.4.1-r2 )"
+
+pkg_setup() {
+	if wx-config --cppflags | grep gtk2u >& /dev/null; then
+		einfo "${PN} will not build if wxGTK was compiled"
+		einfo "with unicode support.  If you are using a version of"
+		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
+		einfo "you must set USE=-unicode."
+		die "wxGTK must be re-emerged without unicode suport"
+	fi
+}
 
 src_compile() {
 	LDFLAGS=-L/usr/lib/postgresql econf --with-pgsql-include=/usr/include/postgresql || die