Moved pkg_prepare to pkg_setup. Fixes bug 398887.

Package-Manager: portage-2.1.10.41/cvs/Linux i686

3 files changed, 72 insertions, 10 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index f56d93515f3d..6753776bdb9b 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/pgadmin3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.72 2012/01/11 12:33:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.73 2012/01/28 21:03:14 titanofold Exp $
+
+*pgadmin3-1.14.1-r1 (28 Jan 2012)
+
+  28 Jan 2012; Aaron W. Swenson <titanofold@gentoo.org>
+  +pgadmin3-1.14.1-r1.ebuild:
+  Moved pkg_prepare to pkg_setup. Fixes bug 398887.
 
   11 Jan 2012; Agostino Sarubbo <ago@gentoo.org> pgadmin3-1.14.1.ebuild:
   Stable for AMD64, wrt bug #394447
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index 9cdb98ff5cf3..00504b296d9d 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX cflags.patch 325 RMD160 1d3aafb87a35c6f2f24f9320bb540c128b038caf SHA1 e3f661cb86a3e6065bf2f6d73804d5ec9f122770 SHA256 8d98f5bf44ae705687438d5ff531d736479c62deaf913eb8878ffbcd3ec8fdab
 AUX ssl-detect-r1.patch 1953 RMD160 3ec01ca17976ae3bcf24feb9d7ef363e92c6e361 SHA1 e4bffba32927bb38f8dc0a4ca98f2364e314099e SHA256 87753c32869b428ca89a8142cc292894ab19417b068055cd8a88ad820cc1d1c6
@@ -12,17 +12,14 @@ EBUILD pgadmin3-1.12.2.ebuild 1116 RMD160 315ab8933f7d74fa38aa0a76bd5a49f28ca0f5
 EBUILD pgadmin3-1.12.3-r1.ebuild 1439 RMD160 0a41a343b05b199fbef164ec026d69fde702ede7 SHA1 5af9f0add888f06c6b86be86212f0950bb93a4de SHA256 67c047731bf62e01c43ccb445bde920f3c4e0171f0f2c5149f6a9eeb1b9755cc
 EBUILD pgadmin3-1.12.3.ebuild 1048 RMD160 784ab9ae09503d45d960d9b31820f75b909f8d86 SHA1 13e2e2bbd5b7fe9897273745ff8d06ec6f53ca7f SHA256 6adbe2a205e0ea69338fd21c2efd7be334fc061ea2aeff2c9566d1d459634c1e
 EBUILD pgadmin3-1.14.0.ebuild 1430 RMD160 ed7013e4f5576629b2fc872d567e670eac6a9bd0 SHA1 5112d5a274d852633601b87c2bca111ec9518018 SHA256 b7e5dfaba3f40910eadf842c066b7d9852ca117e1754fbd3b2d148c403f71316
+EBUILD pgadmin3-1.14.1-r1.ebuild 1433 RMD160 76c578e7307fa738f2933ff64364bb13d057052b SHA1 d75a7433d96211c33930cd639f42a2e004b29030 SHA256 3a913ca3d82018d0c29081171740e1184d0ca00e04fc50e8c9148868c8fe858a
 EBUILD pgadmin3-1.14.1.ebuild 1424 RMD160 2ceba832cb34a347bded69a9d98b4a957b57177a SHA1 5aedf16ff9b4c16a0d988b49bd793b407ec1f99b SHA256 d0fdee68fe6c325c2d4fb3af4564d3ac07c462b5cd4d1f01fe9e4c0ad0033e83
-MISC ChangeLog 10047 RMD160 ac1f6fb0469413ce59b73c946bc037cf68fa52b1 SHA1 ac66081f5445472caf1aeabb53e329cffc1866e6 SHA256 8108c20e9c9dceba7dd1a4141ae3bb405d2d6ec365d453f77b89f1be5eecb144
+MISC ChangeLog 10228 RMD160 1113a77f396819c3383cfa97cc22b4c19a92bb9b SHA1 e1bf5d578bc6e585be1a2cd58bae49dec9bbd17d SHA256 4cc090fd17298632a4eac7607923f962f998ea35bdffe9cbf7d89c99d5d1336d
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPDYGOAAoJEOTDgjZ80txdH80IAIdKLrIGmwSquYaQLLL+pfgf
-awWVUVlC8YPsWpA43Fu8I09n3/G/ATt6YpzA16lKuvrO10GYcBkrv7YCEY7+x1QY
-W0a/7uTFTLLx87XIi7G6KXPYcxaocFWFj4zunEf+kavdqR+6h/9kTaIEDU7sp/dD
-vmH31FnjNIkYg3LwkiRhR1Ynen3KEs7YGkVbFxLqcsGo6FfaYJcuu5gBbA9zIUwo
-N+X0JXWl6+CX4wMI5BAuh9cDnSZuzhiQLpQ1jHGM+Yhe+g9RPuIkZXF0k55acNg1
-NH6ZBPjseMr70EIuOBKkKnI5d3prI3HqSDPts+zcUxPI4KVU+yc81sLbygPzKRE=
-=UC9l
+iF4EAREIAAYFAk8kYpgACgkQVxOqA9G7/aD6JgD/Rs2SalvfRD+yKt9RGfx3aea5
+cKBOBZFByIwpNKKZp+EA+wXixxZNs2YrUGJJYYpb2BGaQEGU+yAApWITIme37PaM
+=NaR/
 -----END PGP SIGNATURE-----
diff --git a/dev-db/pgadmin3/pgadmin3-1.14.1-r1.ebuild b/dev-db/pgadmin3/pgadmin3-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..1cd18dd0d988
--- /dev/null
+++ b/dev-db/pgadmin3/pgadmin3-1.14.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.14.1-r1.ebuild,v 1.1 2012/01/28 21:03:14 titanofold Exp $
+
+EAPI="4"
+
+WX_GTK_VER="2.8"
+
+inherit autotools multilib versionator wxwidgets
+
+DESCRIPTION="wxWidgets GUI for PostgreSQL."
+HOMEPAGE="http://www.pgadmin.org/"
+SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz"
+
+LICENSE="Artistic"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="x11-libs/wxGTK:2.8[X,debug=]
+	>=dev-db/postgresql-base-8.4.0
+	>=dev-libs/libxml2-2.6.18
+	>=dev-libs/libxslt-1.1"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	local pgslot=$(postgresql-config show)
+
+	if [[ ${pgslot//.} < 84 ]] ; then
+		eerror "PostgreSQL slot must be set to 8.4 or higher."
+		eerror "    postgresql-config set 8.4"
+		die "PostgreSQL slot is not set to 8.4 or higher."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/ssl-detect-r1.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-wx-version=2.8 \
+		$(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newicon "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png
+
+	# icon location for the desktop file provided in pkg folder
+	insinto /usr/share/pgadmin3
+	doins "${S}/pgadmin/include/images/pgAdmin3.png"
+
+	domenu "${S}/pkg/pgadmin3.desktop"
+
+	# Fixing world-writable files
+	fperms -R go-w /usr/share
+}