gentoo resync : 14.07.2018

5 files changed, 87 insertions, 0 deletions

diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
new file mode 100644
index 000000000000..2f1984a49376
--- /dev/null
+++ b/dev-db/pgadmin3/Manifest
@@ -0,0 +1,5 @@
+AUX pgadmin3-desktop-r1.patch 512 BLAKE2B feba83e9311785f2bd47f76328d5ec25fb8dbd6686207ecf22cbcf22bb863850ed6ee87f051ae8c709901b4d06e99742b8fa9a5d74a0758632eb29a89f8c9a7f SHA512 8a3253318ad6b98136b8fd4539dffc030d9625a256d7f802a399e972b9a5cf3440a3c602bde8ee21091eed4aae8c736643b9a15246dfd3bae56c8dbd80847ae6
+AUX pgadmin3-gcc6-null-pointer.patch 421 BLAKE2B 8e3c27ce3c80a01e4536253086eb2e6d4bb41e487db3084052acf5ba96a185ad186373d5ca9d5fe3a864cfdfa728350be8a44b66e04c3565e1bb0995f0b6e6a0 SHA512 c0fe3d3cc5c1c29f69f3b81b0c78fbe2cf6e484e3ace9e35a3352d93246fc8227047c7c59a168bedfdc7b4f67d3db800c8b1d7cd962d7952436e080a2ea1e083
+DIST pgadmin3-1.22.2.tar.gz 14788481 BLAKE2B fd38ae523bfc554138f56a99ee5fe0aaf2446d3b77416552861d4c3d3d939e553ee160264720af3095f91d270b6c719e078ec29b998c2f4a13739ed34c4c0312 SHA512 dcfc72cc2e33dbf1c9d1ce287f9d1d46eb047c99a165372cb74ef1716098f90f2ce2a8d0cd21b511a1ac8c0569dc7b3c0593208a74641f5a8f29dc9c04e40bbd
+EBUILD pgadmin3-1.22.2.ebuild 983 BLAKE2B 5ac3559d8547070ae9c6dc6018549406880dcbef8bf733a77637dd63a56d6a20f8a7c0708770c97364344928ef0c1c5f6296abadd039fdaa84b28032564f659e SHA512 e7e039b7ee56e62ff07e3326cc8338fda848b58936afeeda80238a826f9a13bf06c9da13c1fcc3b3b7f6465c889460fc66f6fbcdf3356caaca990a729167c317
+MISC metadata.xml 368 BLAKE2B ea267a284f54ca0becf05f4a7579a167ee591178e17e3922d1c493bdb24fcd63400f2146625108a0d42f7816c75bdd7b1c836c8c354f2058c4fad15c8a0f2a6b SHA512 435f2da400e35d133390ec90860cfe1dd135281156ae1ed6c28e32b4e9f67d93cdb5e7e9ffa183244984e689a131838e6301a50d5366216bccc2df5cd97b54ea
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 000000000000..64a599e00cdb
--- /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 000000000000..1396f8de8aab
--- /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 000000000000..7d8a73bc92c1
--- /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@gentoo.org</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 000000000000..5498f4be6fd3
--- /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
+}