1 |
commit: c27c8dfa1bc0dd1371ce9cd0a1383a44965b0dc9 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 23 18:35:50 2019 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 23 18:35:50 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c27c8dfa |
7 |
|
8 |
dev-db/pgadmin3: Remove last rites package |
9 |
|
10 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=669650 |
11 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
12 |
|
13 |
dev-db/pgadmin3/Manifest | 1 - |
14 |
dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch | 15 -------- |
15 |
.../files/pgadmin3-gcc6-null-pointer.patch | 11 ------ |
16 |
dev-db/pgadmin3/metadata.xml | 11 ------ |
17 |
dev-db/pgadmin3/pgadmin3-1.22.2.ebuild | 45 ---------------------- |
18 |
profiles/package.mask | 6 --- |
19 |
6 files changed, 89 deletions(-) |
20 |
|
21 |
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest |
22 |
deleted file mode 100644 |
23 |
index 618d2737428..00000000000 |
24 |
--- a/dev-db/pgadmin3/Manifest |
25 |
+++ /dev/null |
26 |
@@ -1 +0,0 @@ |
27 |
-DIST pgadmin3-1.22.2.tar.gz 14788481 BLAKE2B fd38ae523bfc554138f56a99ee5fe0aaf2446d3b77416552861d4c3d3d939e553ee160264720af3095f91d270b6c719e078ec29b998c2f4a13739ed34c4c0312 SHA512 dcfc72cc2e33dbf1c9d1ce287f9d1d46eb047c99a165372cb74ef1716098f90f2ce2a8d0cd21b511a1ac8c0569dc7b3c0593208a74641f5a8f29dc9c04e40bbd |
28 |
|
29 |
diff --git a/dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch b/dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch |
30 |
deleted file mode 100644 |
31 |
index 64a599e00cd..00000000000 |
32 |
--- a/dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch |
33 |
+++ /dev/null |
34 |
@@ -1,15 +0,0 @@ |
35 |
-diff -Naruw a/pkg/pgadmin3.desktop b/pkg/pgadmin3.desktop |
36 |
---- a/pkg/pgadmin3.desktop 2013-02-22 12:21:19.000000000 -0500 |
37 |
-+++ b/pkg/pgadmin3.desktop 2015-02-04 15:36:34.845312953 -0500 |
38 |
-@@ -2,9 +2,8 @@ |
39 |
- Encoding=UTF-8 |
40 |
- Name=pgAdmin III |
41 |
- Exec=/usr/bin/pgadmin3 |
42 |
--Icon=/usr/share/pgadmin3/pgAdmin3.png |
43 |
-+Icon=/usr/share/pixmaps/pgadmin3.png |
44 |
- Type=Application |
45 |
--Categories=Application;Development; |
46 |
--MimeType=text/html |
47 |
-+Categories=Development; |
48 |
- DocPath=/usr/share/pgadmin3/docs/en_US/index.html |
49 |
- Comment=PostgreSQL Tools |
50 |
|
51 |
diff --git a/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch b/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch |
52 |
deleted file mode 100644 |
53 |
index 1396f8de8aa..00000000000 |
54 |
--- a/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch |
55 |
+++ /dev/null |
56 |
@@ -1,11 +0,0 @@ |
57 |
---- a/pgadmin/frm/plugins.cpp |
58 |
-+++ b/pgadmin/frm/plugins.cpp |
59 |
-@@ -380,7 +380,7 @@ bool pluginUtilityFactory::CheckEnable(p |
60 |
- { |
61 |
- // If we need a specific server type, we can't enable unless |
62 |
- // we have a connection. |
63 |
-- if (!obj || !(obj->GetConnection()->GetStatus() == PGCONN_OK)) |
64 |
-+ if (!obj || !obj->GetConnection() || !(obj->GetConnection()->GetStatus() == PGCONN_OK)) |
65 |
- return false; |
66 |
- |
67 |
- // Get the server type. |
68 |
|
69 |
diff --git a/dev-db/pgadmin3/metadata.xml b/dev-db/pgadmin3/metadata.xml |
70 |
deleted file mode 100644 |
71 |
index 7d8a73bc92c..00000000000 |
72 |
--- a/dev-db/pgadmin3/metadata.xml |
73 |
+++ /dev/null |
74 |
@@ -1,11 +0,0 @@ |
75 |
-<?xml version="1.0" encoding="UTF-8"?> |
76 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
77 |
-<pkgmetadata> |
78 |
- <maintainer type="project"> |
79 |
- <email>pgsql-bugs@g.o</email> |
80 |
- <name>PostgreSQL and Related Package Development</name> |
81 |
- </maintainer> |
82 |
-<use> |
83 |
- <flag name="databasedesigner">Enable the Database Designer component</flag> |
84 |
-</use> |
85 |
-</pkgmetadata> |
86 |
|
87 |
diff --git a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild |
88 |
deleted file mode 100644 |
89 |
index 5498f4be6fd..00000000000 |
90 |
--- a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild |
91 |
+++ /dev/null |
92 |
@@ -1,45 +0,0 @@ |
93 |
-# Copyright 1999-2018 Gentoo Foundation |
94 |
-# Distributed under the terms of the GNU General Public License v2 |
95 |
- |
96 |
-EAPI="6" |
97 |
- |
98 |
-inherit eutils multilib versionator wxwidgets |
99 |
- |
100 |
-DESCRIPTION="wxWidgets GUI for PostgreSQL" |
101 |
-HOMEPAGE="https://www.pgadmin.org/" |
102 |
-SRC_URI="mirror://postgresql/pgadmin/pgadmin3/v${PV}/src/${P}.tar.gz" |
103 |
- |
104 |
-LICENSE="POSTGRESQL" |
105 |
-KEYWORDS="amd64 ppc x86 ~x86-fbsd" |
106 |
-SLOT="0" |
107 |
-IUSE="debug +databasedesigner" |
108 |
- |
109 |
-DEPEND=" |
110 |
- x11-libs/wxGTK:3.0=[X] |
111 |
- >=dev-db/postgresql-8.4.0:= |
112 |
- >=dev-libs/libxml2-2.6.18 |
113 |
- >=dev-libs/libxslt-1.1" |
114 |
-RDEPEND="${DEPEND}" |
115 |
- |
116 |
-PATCHES=( "${FILESDIR}"/pgadmin3-{desktop-r1,gcc6-null-pointer}.patch ) |
117 |
- |
118 |
-src_configure() { |
119 |
- WX_GTK_VER="3.0" |
120 |
- |
121 |
- setup-wxwidgets |
122 |
- |
123 |
- econf --with-wx-version=${WX_GTK_VER} \ |
124 |
- $(use_enable debug) \ |
125 |
- $(use_enable databasedesigner) |
126 |
-} |
127 |
- |
128 |
-src_install() { |
129 |
- emake DESTDIR="${D}" install |
130 |
- |
131 |
- newicon "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png |
132 |
- |
133 |
- domenu "${S}/pkg/pgadmin3.desktop" |
134 |
- |
135 |
- # Fixing world-writable files |
136 |
- fperms -R go-w /usr/share |
137 |
-} |
138 |
|
139 |
diff --git a/profiles/package.mask b/profiles/package.mask |
140 |
index d0d70a949c7..65fac9ba71e 100644 |
141 |
--- a/profiles/package.mask |
142 |
+++ b/profiles/package.mask |
143 |
@@ -169,12 +169,6 @@ net-voip/linphone |
144 |
net-libs/libeXosip |
145 |
net-libs/libosip |
146 |
|
147 |
-# Aaron W. Swenson <titanofold@g.o> (25 Oct 2018) |
148 |
-# Fails to build against up to date OpenSSL library (Bug 663966). No longer |
149 |
-# supported upstream. Use dev-db/pgadmin4. |
150 |
-# Masked for removal on 2018-11-24, bug #669650. |
151 |
-dev-db/pgadmin3 |
152 |
- |
153 |
# Lars Wendler <polynomial-c@g.o> (22 Oct 2018) |
154 |
# Breaks dev-libs/gobject-introspection and its consumers |
155 |
# See #669278 |