Version bump fixes bug 485696 and includes patch from bug 472554. pgadmin3-desktop.patch fixes bug 458172.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

4 files changed, 88 insertions, 6 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index 175aae689ad3..7b1c9add4d0d 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/pgadmin3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.93 2013/02/27 00:42:41 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.94 2013/09/25 17:37:46 titanofold Exp $
+
+*pgadmin3-1.18.0 (25 Sep 2013)
+
+  25 Sep 2013; Aaron W. Swenson <titanofold@gentoo.org>
+  +files/pgadmin3-desktop.patch, +pgadmin3-1.18.0.ebuild:
+  Version bump fixes bug 485696 and includes patch from bug 472554.
+  pgadmin3-desktop.patch fixes bug 458172.
 
   27 Feb 2013; Aaron W. Swenson <titanofold@gentoo.org>
   -pgadmin3-1.14.2.ebuild, -pgadmin3-1.14.3.ebuild, -pgadmin3-1.16.0.ebuild:
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index 7e6cc4e9c248..73ddedb7fb72 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -2,16 +2,19 @@
 Hash: SHA256
 
 AUX cflags.patch 325 SHA256 8d98f5bf44ae705687438d5ff531d736479c62deaf913eb8878ffbcd3ec8fdab SHA512 89ddd669d25b63631adfa58a6f7f3cb020c01a35c58e04aa008c128b47674f36215490c1ef825d2ed0964d743c3c0e47fb09ad7e0bdda59c7924861b91d4b560 WHIRLPOOL 7f052ec82026156031a93e762d7e97e1bcc18001f6b8ff0a5e0fe904b1f25dba4182631b1a884b99471066664fdaf77841e0be33c4f5e59acaec88b798407d5c
+AUX pgadmin3-desktop.patch 461 SHA256 94f8ddf43977b208ce31418f121f0be76dcf9070522bc8a8ad55e3ac0c8fe873 SHA512 88ba8d704012868c93655e07bfad54e6ebe5f36955e60688863b3d280eef25dad352639630c73700d9f2bbdc9a80f013614bbf7d92c50d2d17b8dd23b23c83a8 WHIRLPOOL 714565e0868ffcfd63ba6d8e684a6f11d70f049af09109a787c2824818e09f3b905037841eda26d36894788178ee3f9f7186c4deb5a5dbb13922367150d035d2
 AUX ssl-detect-r1.patch 1953 SHA256 87753c32869b428ca89a8142cc292894ab19417b068055cd8a88ad820cc1d1c6 SHA512 6615405719b76a4aa195c9a5a2f56b9519e7be6fb69d7c5b3e5ed4ca381063afee1ca5dc61eeffb6f8fabef6467d4fa24c373a41e2bb79a80d6877e72da838a7 WHIRLPOOL ef7e543cd0ac942ce8551e69dcc4bc4d8644035bc6b162d5e972ce9573c1e0f4d8db061aac4b02b98c083052d1a7f8e87b33e9ed14206e038d626aab1babb1a4
 AUX ssl-detect.patch 1164 SHA256 521ef777456e9597fd27f1abb85808b07dca359888197a3329356aa4e560aa5e SHA512 17839b5cf32da94f8e56e06c71ee6a72cb2cf71c517895a8081538019c4b6e54a79fd6473ba29883d50ae5a134d24cb09aa59062e8d7f67283d299e55f161c9d WHIRLPOOL feca399f000df37b0728bd49d13a927bf485adde33255ee6b22e1d559f16ae930ee0822a24824d350f5ed1b6476c16a05bb9d47483de974539a61156f2a90439
 DIST pgadmin3-1.16.1.tar.gz 13783723 SHA256 d4ba243dc24dc28e6d0db4104baec373ab3bec11c6dc0e6cfa4bd665a5b7c28e SHA512 f5f110f99d15801dc2b2253c803cf038871461909cb63f114ee769ff0977183d6825f3bf13f378822f874fc15aa593f52cd999ccb97370b786b6e02f45ce4a81 WHIRLPOOL 375f444147e2ff850d1fdffe8d88bbd9296aff652f1008447242e7cbe5995ad1ba37822fafe5012d09bf963cf4485183f72087c3ade3740c2eab974e931fb5b1
+DIST pgadmin3-1.18.0.tar.gz 14257838 SHA256 58f29f5a380a49065e4b97bd9c8effd12ae99f464fa8834ba403baa2a658278d SHA512 dbf052269e4c0478239f111bca2e09b430a590778d19460f24b1f39c0204dad4a182ee93df06675c5640fd532ad289f5425468e5c08d11d833429e3076e2ed7b WHIRLPOOL 30a07cfb3a6fd0525fe1677186f9cb95f232c65e7851807abf0e929ccc4e34a36ec7fcb4f9f0df8ff5e1fdcc93b8f67ee9acb4c90a8ce33337bcb8ae15c5999f
 EBUILD pgadmin3-1.16.1-r1.ebuild 1380 SHA256 34928694c94aedbefe09120b7b6d4432c22fc5533075b1df01d986125f860dcb SHA512 4761e1e3068df00b6aeb3f18bccea5fb404b3334162a7add072cdfc909aa3eb4f252554babc2bfccc4e632c00ca3d31b5c811e1784c7004df4ea76ec85400da9 WHIRLPOOL 9cf8161f0b7020d615940aaa13d45db1a62179e00f21fda5c0bc627255d3d4f194c4cbc553b54288552f9a69060bbab8bf3f565f0cb745bdbfaf4188281aa3e7
-MISC ChangeLog 13014 SHA256 acdaf902fb97f5d52972a21fa90876f3555ad516564d378a3ad45b2a5b76474d SHA512 3764a539970a5f5bb3c0e53faf39aa6761dc26371735c091e7070287cc84f82f632d1467f5b7597004700b382b89461d7db9a336587f21a87bdcc0435c76905c WHIRLPOOL 75e92ab0282f599cac97a9008252eb726c45b154987719efda70aaf581deffe0431e6031911293e023878276eead7888a36a3c4fe1495829de42bbf1b1962901
+EBUILD pgadmin3-1.18.0.ebuild 1451 SHA256 ecef7b3080009175dbfcf901906263125f8f6f248dff6b59fed3d968238372ad SHA512 04f646242e51d955f3e8d3e8dce88ebef3b92256da50d9dc9ca4f902c074d0e47314d3e8e0fed7ed19495d04aec05a962d17c87a9dce793948914d3b99fa2c93 WHIRLPOOL 25090dab3f41ec66953eeee07ceff1f5f1f82c8d0a5a398d0bd81b13e0153b81b101f772e8db61c41e4b9a6b396f285ab88ad751e83f7b6e9bc7661863a35cac
+MISC ChangeLog 13272 SHA256 e24483a644f0e5ffd5d92614e32102bc5824a41eba1960cbb2affacb2a27f3d0 SHA512 13f9661d64b7402aecfa2db9955e96b6ab2b6b00591dd513ba435679f7546d5dc8b32acf82a1dfd572d1fed80aeae294caced96b1fc879f2b2e28841fa55dd04 WHIRLPOOL a3ebe87647cb68c08bc75d593eeebbdd4c1366bbeb7d074dc0d31c928ef3d5e429e65443d343ce75f17cec4d3245833930e07b4e136c66c5c55001029b7f2c93
 MISC metadata.xml 254 SHA256 40e9505bc99da381353a4b9d1ea7e2b0af255c8276dfa10a77d6e798fc12cc9d SHA512 ad6b4f1526b1b7b8bc354fcccc68340d4e5a85da236b3a8709ad47cc4482dbe5454632193e5797bd9d8c92ec1637d93e7418d8592d7dbde65a6dc3509443ba2f WHIRLPOOL bd28d8a58b2688047dc3e22cbad28a60e4102f8536492dad1f82c2a9fd31d494a2f55d46fb5cefed6e40c172aa8cb39f3e75eeccb64d461bce78c9171b8002ac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlEtVoAACgkQVxOqA9G7/aDiEQD5AURSJe2NOYHQJ1sn/0mam0Cm
-ijtg+wJcTJYgBa2cFzIA/jMGY0LbgawkrinzUmxpitxiYKnJWDTZxa9eYNtcJjZV
-=SFmU
+iF4EAREIAAYFAlJDH3AACgkQVxOqA9G7/aBCFAD/af1K275J4vbcXp6/H/rlYZb0
+96l4/AokKKjlabSe4ygA/38OtfEO91WxEJL+xhENjFEM9EZ2lbBy1kEK0Xf9kxC3
+=3xOp
 -----END PGP SIGNATURE-----
diff --git a/dev-db/pgadmin3/files/pgadmin3-desktop.patch b/dev-db/pgadmin3/files/pgadmin3-desktop.patch
new file mode 100644
index 000000000000..471a78a7807c
--- /dev/null
+++ b/dev-db/pgadmin3/files/pgadmin3-desktop.patch
@@ -0,0 +1,13 @@
+diff -Naruw a/pkg/pgadmin3.desktop b/pkg/pgadmin3.desktop
+--- a/pkg/pgadmin3.desktop	2013-02-22 17:21:19.000000000 +0000
++++ b/pkg/pgadmin3.desktop	2013-09-25 14:34:27.717913730 +0000
+@@ -4,7 +4,7 @@
+ Exec=/usr/bin/pgadmin3
+ Icon=/usr/share/pgadmin3/pgAdmin3.png
+ Type=Application
+-Categories=Application;Development;
+-MimeType=text/html
++Categories=Development;
++MimeType=text/html;
+ DocPath=/usr/share/pgadmin3/docs/en_US/index.html
+ Comment=PostgreSQL Tools
diff --git a/dev-db/pgadmin3/pgadmin3-1.18.0.ebuild b/dev-db/pgadmin3/pgadmin3-1.18.0.ebuild
new file mode 100644
index 000000000000..6d3a88671d2b
--- /dev/null
+++ b/dev-db/pgadmin3/pgadmin3-1.18.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.18.0.ebuild,v 1.1 2013/09/25 17:37:46 titanofold Exp $
+
+EAPI="4"
+
+WX_GTK_VER="2.8"
+
+inherit 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="POSTGRESQL"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE="debug +databasedesigner"
+
+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}/pgadmin3-desktop.patch"
+}
+
+src_configure() {
+	econf --with-wx-version=2.8 \
+		$(use_enable debug) \
+		$(use_enable databasedesigner)
+}
+
+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
+}