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

[Aaron Swenson]

commit:     90665fc12ab36100aa4540faf0ac6f7c488a1df4
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 21 11:09:23 2018 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Wed Mar 21 11:09:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90665fc1

dev-db/pgadmin3: Cleanup

Closes: https://bugs.gentoo.org/629422
Closes: https://bugs.gentoo.org/630448
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-db/pgadmin3/Manifest                     |  1 -
 dev-db/pgadmin3/files/pgadmin3-desktop.patch | 16 --------
 dev-db/pgadmin3/pgadmin3-1.22.1-r1.ebuild    | 59 ----------------------------
 dev-db/pgadmin3/pgadmin3-1.22.1-r2.ebuild    | 45 ---------------------
 4 files changed, 121 deletions(-)

diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index d9e7e6783f6..618d2737428 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1,2 +1 @@
-DIST pgadmin3-1.22.1.tar.gz 14667770 BLAKE2B 3222b1a13ebe42e08b1e2aa9a5d893725eb9a352fadb6bec2a06cd05d77a9cafe82d7defca5542a2428924ff0d3705f2233005b03b462006f2b776fd170b7cef SHA512 f190e82317e10b75cb0ebd7cc0c878c4be9c392e33aba44a1356446e4cac92735834a32b1d65999ffc3e36ed130d4cfcc1c25ad5faa3c745e884fccd797331e0
 DIST pgadmin3-1.22.2.tar.gz 14788481 BLAKE2B fd38ae523bfc554138f56a99ee5fe0aaf2446d3b77416552861d4c3d3d939e553ee160264720af3095f91d270b6c719e078ec29b998c2f4a13739ed34c4c0312 SHA512 dcfc72cc2e33dbf1c9d1ce287f9d1d46eb047c99a165372cb74ef1716098f90f2ce2a8d0cd21b511a1ac8c0569dc7b3c0593208a74641f5a8f29dc9c04e40bbd

diff --git a/dev-db/pgadmin3/files/pgadmin3-desktop.patch b/dev-db/pgadmin3/files/pgadmin3-desktop.patch
deleted file mode 100644
index 0453d8d7e4b..00000000000
--- a/dev-db/pgadmin3/files/pgadmin3-desktop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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,9 @@
- 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;
-+MimeType=text/html;
- DocPath=/usr/share/pgadmin3/docs/en_US/index.html
- Comment=PostgreSQL Tools

diff --git a/dev-db/pgadmin3/pgadmin3-1.22.1-r1.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.1-r1.ebuild
deleted file mode 100644
index f2ebdc7e46e..00000000000
--- a/dev-db/pgadmin3/pgadmin3-1.22.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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:3.0=[X]
-	>=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"
-
-	epatch_user
-}
-
-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/dev-db/pgadmin3/pgadmin3-1.22.1-r2.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.1-r2.ebuild
deleted file mode 100644
index 27d932986e3..00000000000
--- a/dev-db/pgadmin3/pgadmin3-1.22.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils wxwidgets
-
-DESCRIPTION="wxWidgets GUI for PostgreSQL"
-HOMEPAGE="https://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="
-	>=dev-db/postgresql-8.4.0:=
-	>=dev-libs/libxml2-2.6.18
-	>=dev-libs/libxslt-1.1
-	x11-libs/wxGTK:3.0=[X]"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-desktop-r1.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() {
-	default
-
-	newicon "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png
-
-	domenu "${S}/pkg/pgadmin3.desktop"
-
-	# Fixing world-writable files
-	fperms -R go-w /usr/share
-}