[gentoo-commits] repo/gentoo:master commit in: dev-db/pgadmin3/files/, dev-db/pgadmin3/, profiles/

[Brian Evans]

commit:     6d1da50b8257d38b280f9719ab9dbc2069884ce5
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 23 19:48:32 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jan 23 19:48:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1da50b

Revert "dev-db/pgadmin3: Remove last rites package"

This reverts commit c27c8dfa1bc0dd1371ce9cd0a1383a44965b0dc9.

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-db/pgadmin3/Manifest                           |  1 +
 dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch    | 15 ++++++++
 .../files/pgadmin3-gcc6-null-pointer.patch         | 11 ++++++
 dev-db/pgadmin3/metadata.xml                       | 11 ++++++
 dev-db/pgadmin3/pgadmin3-1.22.2.ebuild             | 45 ++++++++++++++++++++++
 profiles/package.mask                              |  6 +++
 6 files changed, 89 insertions(+)

diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
new file mode 100644
index 00000000000..618d2737428
--- /dev/null
+++ b/dev-db/pgadmin3/Manifest
@@ -0,0 +1 @@
+DIST pgadmin3-1.22.2.tar.gz 14788481 BLAKE2B fd38ae523bfc554138f56a99ee5fe0aaf2446d3b77416552861d4c3d3d939e553ee160264720af3095f91d270b6c719e078ec29b998c2f4a13739ed34c4c0312 SHA512 dcfc72cc2e33dbf1c9d1ce287f9d1d46eb047c99a165372cb74ef1716098f90f2ce2a8d0cd21b511a1ac8c0569dc7b3c0593208a74641f5a8f29dc9c04e40bbd

diff --git a/dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch b/dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch
new file mode 100644
index 00000000000..64a599e00cd
--- /dev/null
+++ b/dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch
@@ -0,0 +1,15 @@
+diff -Naruw a/pkg/pgadmin3.desktop b/pkg/pgadmin3.desktop
+--- a/pkg/pgadmin3.desktop	2013-02-22 12:21:19.000000000 -0500
++++ b/pkg/pgadmin3.desktop	2015-02-04 15:36:34.845312953 -0500
+@@ -2,9 +2,8 @@
+ Encoding=UTF-8
+ Name=pgAdmin III
+ Exec=/usr/bin/pgadmin3
+-Icon=/usr/share/pgadmin3/pgAdmin3.png
++Icon=/usr/share/pixmaps/pgadmin3.png
+ Type=Application
+-Categories=Application;Development;
+-MimeType=text/html
++Categories=Development;
+ DocPath=/usr/share/pgadmin3/docs/en_US/index.html
+ Comment=PostgreSQL Tools

diff --git a/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch b/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch
new file mode 100644
index 00000000000..1396f8de8aa
--- /dev/null
+++ b/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch
@@ -0,0 +1,11 @@
+--- a/pgadmin/frm/plugins.cpp
++++ b/pgadmin/frm/plugins.cpp
+@@ -380,7 +380,7 @@ bool pluginUtilityFactory::CheckEnable(p
+ 	{
+ 		// If we need a specific server type, we can't enable unless
+ 		// we have a connection.
+-		if (!obj || !(obj->GetConnection()->GetStatus() == PGCONN_OK))
++		if (!obj || !obj->GetConnection() || !(obj->GetConnection()->GetStatus() == PGCONN_OK))
+ 			return false;
+ 
+ 		// Get the server type.

diff --git a/dev-db/pgadmin3/metadata.xml b/dev-db/pgadmin3/metadata.xml
new file mode 100644
index 00000000000..7d8a73bc92c
--- /dev/null
+++ b/dev-db/pgadmin3/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+	<email>pgsql-bugs@g.o</email>
+	<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
+<use>
+	<flag name="databasedesigner">Enable the Database Designer component</flag>
+</use>
+</pkgmetadata>

diff --git a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild
new file mode 100644
index 00000000000..5498f4be6fd
--- /dev/null
+++ b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils multilib versionator wxwidgets
+
+DESCRIPTION="wxWidgets GUI for PostgreSQL"
+HOMEPAGE="https://www.pgadmin.org/"
+SRC_URI="mirror://postgresql/pgadmin/pgadmin3/v${PV}/src/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+SLOT="0"
+IUSE="debug +databasedesigner"
+
+DEPEND="
+	x11-libs/wxGTK:3.0=[X]
+	>=dev-db/postgresql-8.4.0:=
+	>=dev-libs/libxml2-2.6.18
+	>=dev-libs/libxslt-1.1"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/pgadmin3-{desktop-r1,gcc6-null-pointer}.patch )
+
+src_configure() {
+	WX_GTK_VER="3.0"
+
+	setup-wxwidgets
+
+	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
+}

diff --git a/profiles/package.mask b/profiles/package.mask
index 65fac9ba71e..d0d70a949c7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -169,6 +169,12 @@ net-voip/linphone
 net-libs/libeXosip
 net-libs/libosip
 
+# Aaron W. Swenson <titanofold@g.o> (25 Oct 2018)
+# Fails to build against up to date OpenSSL library (Bug 663966). No longer
+# supported upstream. Use dev-db/pgadmin4.
+# Masked for removal on 2018-11-24, bug #669650.
+dev-db/pgadmin3
+
 # Lars Wendler <polynomial-c@g.o> (22 Oct 2018)
 # Breaks dev-libs/gobject-introspection and its consumers
 # See #669278