Fix bug 554872 with patch from upstream. Also, added epatch_user line.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x5713AA03D1BBFDA0)

3 files changed, 82 insertions, 1 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index f23a1aeeb628..9dec9a227b66 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/pgadmin3
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.107 2015/07/11 19:13:27 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.108 2015/07/15 11:24:52 titanofold Exp $
+
+*pgadmin3-1.20.0-r2 (15 Jul 2015)
+
+  15 Jul 2015; Aaron W. Swenson <titanofold@gentoo.org>
+  +pgadmin3-1.20.0-r2.ebuild, +files/pgadmin3-menu-assert.patch:
+  Fix bug 554872 with patch from upstream. Also, added epatch_user line.
 
   11 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> pgadmin3-1.20.0-r1.ebuild:
   x86 stable wrt bug #551322
diff --git a/dev-db/pgadmin3/files/pgadmin3-menu-assert.patch b/dev-db/pgadmin3/files/pgadmin3-menu-assert.patch
new file mode 100644
index 000000000000..ae6615d1f877
--- /dev/null
+++ b/dev-db/pgadmin3/files/pgadmin3-menu-assert.patch
@@ -0,0 +1,14 @@
+X-Git-Url: http://git.postgresql.org/gitweb/?p=pgadmin3.git;a=blobdiff_plain;f=pgadmin%2Fctl%2FctlMenuToolbar.cpp;h=4a70089698c37f1f4fcd1bdd78948b4b4336969d;hp=8951aa409177c5e72e9cc0a7a31d177966a7a104;hb=a00916753f88ee9323abd2ea8cddb01428b296fc;hpb=e3ab3ddd6b5faafbc883cfb5003b6a2cecef2ce2
+
+diff --git a/pgadmin/ctl/ctlMenuToolbar.cpp b/pgadmin/ctl/ctlMenuToolbar.cpp
+index 8951aa4..4a70089 100644
+--- a/pgadmin/ctl/ctlMenuToolbar.cpp
++++ b/pgadmin/ctl/ctlMenuToolbar.cpp
+@@ -109,7 +109,7 @@ void ctlMenuButton::DoProcessLeftClick(wxMouseEvent &event)
+ 		menu_pos.y = button_size.GetHeight();
+ 	}
+ 
+-	PopupMenu(m_menu, menu_pos);
++	DoPopupMenu(m_menu, menu_pos.x, menu_pos.y);
+ }
+ 
diff --git a/dev-db/pgadmin3/pgadmin3-1.20.0-r2.ebuild b/dev-db/pgadmin3/pgadmin3-1.20.0-r2.ebuild
new file mode 100644
index 000000000000..4e83d6ad304f
--- /dev/null
+++ b/dev-db/pgadmin3/pgadmin3-1.20.0-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.20.0-r2.ebuild,v 1.1 2015/07/15 11:24:52 titanofold Exp $
+
+EAPI="5"
+
+inherit eutils 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:=[X,debug=]
+	>=dev-db/postgresql-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" \
+		   "${FILESDIR}/pgadmin3-menu-assert.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	WX_GTK_PV=$(best_version x11-libs/wxGTK[X,debug=])
+	WX_GTK_VER=$(get_version_component_range 1-2 ${WX_GTK_PV#x11-libs/wxGTK-})
+
+	need-wxwidgets unicode
+
+	econf --with-wx-version=${WX_GTK_VER} \
+		$(use_enable debug) \
+		$(use_enable databasedesigner)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newicon "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png
+
+	domenu "${S}/pkg/pgadmin3.desktop"
+
+	# Fixing world-writable files
+	fperms -R go-w /usr/share
+}