commit: ba00bd4413d1043b56a08697877745e69d35a562 Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> AuthorDate: Fri Jun 21 11:45:34 2019 +0000 Commit: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> CommitDate: Fri Jun 21 11:45:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba00bd44
dev-db/pgadmin3,profiles/package.mask: Removal dev-db/pgadmin3 has been removed. Use dev-db/pgadmin4 instead. Closes: https://bugs.gentoo.org/669650 Closes: https://bugs.gentoo.org/663966 Signed-off-by: Aaron W. Swenson <titanofold <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 deletions(-) diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest deleted file mode 100644 index 618d2737428..00000000000 --- a/dev-db/pgadmin3/Manifest +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 64a599e00cd..00000000000 --- a/dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch +++ /dev/null @@ -1,15 +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,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 deleted file mode 100644 index 1396f8de8aa..00000000000 --- a/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 7d8a73bc92c..00000000000 --- a/dev-db/pgadmin3/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</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 deleted file mode 100644 index 5498f4be6fd..00000000000 --- a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# 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 6ae639c21af..c7a96dc8e60 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -381,12 +381,6 @@ dev-libs/gost-engine # Causes a dependency loop in the OpenRC script. Bug #651998 =sys-fs/cryptsetup-2.0.5-r1 -# Aaron W. Swenson <[email protected]> (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 - # Thomas Deutschmann <[email protected]> (12 Oct 2018) # EOL and has known vulnerabilities. Please move to # Firefox 60 or newer if you can.
