summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasatomo Nakano <nakano@gentoo.org>2005-06-20 05:29:24 +0000
committerMasatomo Nakano <nakano@gentoo.org>2005-06-20 05:29:24 +0000
commit63fc6ddbc1fde9e1e9b915560786b0cd281ada30 (patch)
tree5e24f1a604e7e8debe0b54f661da53a634d28867 /dev-db/pgadmin3
parentenewuser as well. (diff)
downloadgentoo-2-63fc6ddbc1fde9e1e9b915560786b0cd281ada30.tar.gz
gentoo-2-63fc6ddbc1fde9e1e9b915560786b0cd281ada30.tar.bz2
gentoo-2-63fc6ddbc1fde9e1e9b915560786b0cd281ada30.zip
fixed bug (#96520)
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-db/pgadmin3')
-rw-r--r--dev-db/pgadmin3/ChangeLog6
-rw-r--r--dev-db/pgadmin3/Manifest3
-rw-r--r--dev-db/pgadmin3/files/pgadmin3-1.2.2-configure.patch26
-rw-r--r--dev-db/pgadmin3/pgadmin3-1.2.2.ebuild12
4 files changed, 39 insertions, 8 deletions
diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index e74f65bcb495..5df09e1cebfa 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,10 @@
# 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.15 2005/06/19 09:13:15 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.16 2005/06/20 05:29:24 nakano Exp $
+
+ 20 Jun 2005; Masatomo Nakano <nakano@gentoo.org>
+ +files/pgadmin3-1.2.2-configure.patch, pgadmin3-1.2.2.ebuild:
+ Fixed configure problem in specific environment. (#96520)
*pgadmin3-1.2.2 (19 Jun 2005)
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index 496138956b05..155c413303bb 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -3,8 +3,9 @@ MD5 85d8072c5cd7a7f299a0367ad704611b pgadmin3-1.0.2.ebuild 1276
MD5 a8c7e7d446ef9c4fe2c7690d92f505cc pgadmin3-1.2.1-r1.ebuild 1953
MD5 cc222370912816991b716cc1bda0c21a pgadmin3-1.2.0.ebuild 2226
MD5 0656ab16d05447365217728121b274ae ChangeLog 1999
-MD5 75ff18021f2b34e15cf0a51806081bbe pgadmin3-1.2.2.ebuild 1955
+MD5 8828dd340dd0e9dc616254c552ecd2cf pgadmin3-1.2.2.ebuild 1950
MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 ea8ba09f3c984e557eb454fcf10b23aa files/pgadmin3-1.2.2-configure.patch 985
MD5 69a195a883fc22b21d9dbc8828dfb712 files/digest-pgadmin3-1.2.1-r1 67
MD5 e69c2dd9e40469e9bc040a05e04054f1 files/digest-pgadmin3-1.0.2 67
MD5 e6643c3efaa48470726839ac1c66d6c6 files/digest-pgadmin3-1.2.0 67
diff --git a/dev-db/pgadmin3/files/pgadmin3-1.2.2-configure.patch b/dev-db/pgadmin3/files/pgadmin3-1.2.2-configure.patch
new file mode 100644
index 000000000000..f04a977d0b85
--- /dev/null
+++ b/dev-db/pgadmin3/files/pgadmin3-1.2.2-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.2.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild
index 3e3a72598ed6..56ef7e355610 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
# 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.1 2005/06/19 09:13:15 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild,v 1.2 2005/06/20 05:29:24 nakano Exp $
inherit eutils libtool wxwidgets
@@ -25,11 +25,11 @@ pkg_setup() {
fi
}
-#src_unpack() {
-# unpack ${A}
-# cd ${S} || die "Couldn't cd to ${S}"
-# epatch ${FILESDIR}/${P}-configure.patch
-#}
+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