Patch up old ebuild to work with new wxwidgets.eclass changes.

Package-Manager: portage-2.1.2.7

3 files changed, 20 insertions, 17 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index 99ef07b38cf9..1dbb8ec2517d 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,9 @@
 # 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.31 2007/02/10 13:19:10 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.32 2007/05/12 07:24:51 dirtyepic Exp $
+
+  12 May 2007; Ryan Hill <dirtyepic@gentoo.org> pgadmin3-1.2.2.ebuild:
+  Patch up old ebuild to work with new wxwidgets.eclass changes.
 
   10 Feb 2007; Steve Dibb <beandog@gentoo.org> pgadmin3-1.4.3.ebuild:
   amd64 stable, bug 155828
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index 8cfa1d233862..fc07b7642ee7 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -4,18 +4,18 @@ RMD160 476d6ed4513d408c6fe5f0f1eb2b89f32e1e7ea8 files/pgadmin3-1.2.2-configure.p
 SHA256 afb15b08923dc1cb8f2b6c00925584881cdcab8331320a35863a6769b9be6fd1 files/pgadmin3-1.2.2-configure.patch 985
 DIST pgadmin3-1.2.2.tar.gz 4029500 RMD160 7ec57017ac285cb8fd266ee50cfe661e693c9812 SHA1 b6b7a18e6f783a0c238e8d1016c59af23244b156 SHA256 6fb5422f22942a72a5c46850a4d4689165ae743a6b9a8a38c9c32600177470b5
 DIST pgadmin3-1.4.3.tar.gz 6786185 RMD160 5b5127b7596484e0da8935ceb49351f33ac8757e SHA1 ef6c8625aab2b2c79d4f6966cd6faaefe78df3de SHA256 77a6368dbc748a0164d543d0f660d21d31746677f84553ecbea1e2fffa30a352
-EBUILD pgadmin3-1.2.2.ebuild 1947 RMD160 00cab6acf8029408e7eb3732f47124f2dbc93058 SHA1 6eac7edea019c6e01b412a4bfc558fff7f4dbcfe SHA256 b30200db8a1187156b4377dbb2291429ee42d83d71f978e3df8a34b1a6ff6576
-MD5 fda96699361e71e1f60886c745807ed8 pgadmin3-1.2.2.ebuild 1947
-RMD160 00cab6acf8029408e7eb3732f47124f2dbc93058 pgadmin3-1.2.2.ebuild 1947
-SHA256 b30200db8a1187156b4377dbb2291429ee42d83d71f978e3df8a34b1a6ff6576 pgadmin3-1.2.2.ebuild 1947
+EBUILD pgadmin3-1.2.2.ebuild 1932 RMD160 e615781e5e14d027a3c84ba0fef27054b84919f9 SHA1 bba55a010d1073af7729e00459347b03c116d1cc SHA256 7f18485898809952aeeb52322df53c8593bef97339964ec057651bba38a9ea0a
+MD5 fc49b38024dc822fe16e0d69f9b37d47 pgadmin3-1.2.2.ebuild 1932
+RMD160 e615781e5e14d027a3c84ba0fef27054b84919f9 pgadmin3-1.2.2.ebuild 1932
+SHA256 7f18485898809952aeeb52322df53c8593bef97339964ec057651bba38a9ea0a pgadmin3-1.2.2.ebuild 1932
 EBUILD pgadmin3-1.4.3.ebuild 1551 RMD160 f76a036c5688b1e93a621835b5772c61bf10fe7f SHA1 642b21357bf4718463c837ca9d02b0a6617c4422 SHA256 4a20e6993d3ce25511b1eab8044f6c7ab6a3cc16805354b05bf5c8672b91b38d
 MD5 0030136f5f4a06be913d6e4a036d2bfc pgadmin3-1.4.3.ebuild 1551
 RMD160 f76a036c5688b1e93a621835b5772c61bf10fe7f pgadmin3-1.4.3.ebuild 1551
 SHA256 4a20e6993d3ce25511b1eab8044f6c7ab6a3cc16805354b05bf5c8672b91b38d pgadmin3-1.4.3.ebuild 1551
-MISC ChangeLog 4256 RMD160 de93162f4df17be2a2edb70961b4481ac673a926 SHA1 42e777ebddcc5441a47db5beeb12435e31b6c63f SHA256 b48fa3209c7e3f4684238a01c6d704abeb4fa97919d96223df25f9ebfbb6a8d5
-MD5 efc3ab3b0b45a507ba8925f21f6e31a9 ChangeLog 4256
-RMD160 de93162f4df17be2a2edb70961b4481ac673a926 ChangeLog 4256
-SHA256 b48fa3209c7e3f4684238a01c6d704abeb4fa97919d96223df25f9ebfbb6a8d5 ChangeLog 4256
+MISC ChangeLog 4395 RMD160 92ebeb715417b667eb20e2ee642745bf18b6847e SHA1 09b456ec7fdbce0cccf03b822bfaee2eb86df306 SHA256 38eceaf9ca7a134b1b8bcc6e3341cbf8940d334ed35ae6ce26d1413a0b2b5dca
+MD5 7c9eadbd5c5dac84cbd8c68a4cbd2de4 ChangeLog 4395
+RMD160 92ebeb715417b667eb20e2ee642745bf18b6847e ChangeLog 4395
+SHA256 38eceaf9ca7a134b1b8bcc6e3341cbf8940d334ed35ae6ce26d1413a0b2b5dca ChangeLog 4395
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 MD5 6fe52df942ef15801d56449cd8299604 metadata.xml 164
 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc metadata.xml 164
diff --git a/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild
index fae1c0dac7cc..4a096112c842 100644
--- a/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.7 2005/10/13 22:05:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild,v 1.8 2007/05/12 07:24:51 dirtyepic Exp $
 
 inherit eutils libtool wxwidgets
 
@@ -15,13 +15,13 @@ SLOT="0"
 LICENSE="Artistic"
 KEYWORDS="alpha amd64 ppc sparc x86"
 
-DEPEND=">=x11-libs/wxGTK-2.6.0
+DEPEND="=x11-libs/wxGTK-2.6*
 	dev-db/libpq
 	>=sys-apps/sed-4"
 
 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'"
+	if ! built_with_use '=x11-libs/wxGTK-2.6*' unicode ; then
+		die "${PN} requires =x11-libs/wxGTK-2.6* emerged with USE='unicode'"
 	fi
 }
 
@@ -32,15 +32,15 @@ src_unpack() {
 }
 
 src_compile() {
-	export WX_GTK_VER=2.6
-	export WX_HOME=/usr
+	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} --with-wx-config=${WX_CONFIG/\/usr}"
 	myconf="${myconf} --enable-postgres"
 	LDFLAGS=-L/usr/lib/postgresql econf ${myconf} || die