1 |
commit: 08bde330c225a761b52d15fa2d18fb6cba033ded |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 22 08:36:23 2021 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 22 09:13:40 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08bde330 |
7 |
|
8 |
dev-db/henplus: treeclean |
9 |
|
10 |
Closes: https://bugs.gentoo.org/819684 |
11 |
Closes: https://bugs.gentoo.org/801292 |
12 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
13 |
|
14 |
dev-db/henplus/Manifest | 1 - |
15 |
dev-db/henplus/files/0.9.8-build.xml.patch | 23 -------------- |
16 |
dev-db/henplus/files/henplus.pre | 51 ------------------------------ |
17 |
dev-db/henplus/henplus-0.9.8-r1.ebuild | 43 ------------------------- |
18 |
dev-db/henplus/metadata.xml | 11 ------- |
19 |
profiles/package.mask | 5 --- |
20 |
6 files changed, 134 deletions(-) |
21 |
|
22 |
diff --git a/dev-db/henplus/Manifest b/dev-db/henplus/Manifest |
23 |
deleted file mode 100644 |
24 |
index c7f6c1d15660..000000000000 |
25 |
--- a/dev-db/henplus/Manifest |
26 |
+++ /dev/null |
27 |
@@ -1 +0,0 @@ |
28 |
-DIST henplus-0.9.8.tar.gz 233035 BLAKE2B 0cfba9cde654103f539ce28508d77169ce3a34ccc9a8805253e9bcd3a731118408c8a241f82eb6da8be2b96d1a4932c95024a158eae48396b045d5b94b0acaa9 SHA512 a22fc847f4441f627c1fa12f4f365c38d0c8ddfc205758d044e797e83f8d37032995666c2ee3dbb68d0a5f563fa5d574886e85757b1faa0acfc055e92b2fad0b |
29 |
|
30 |
diff --git a/dev-db/henplus/files/0.9.8-build.xml.patch b/dev-db/henplus/files/0.9.8-build.xml.patch |
31 |
deleted file mode 100644 |
32 |
index e2763978080e..000000000000 |
33 |
--- a/dev-db/henplus/files/0.9.8-build.xml.patch |
34 |
+++ /dev/null |
35 |
@@ -1,23 +0,0 @@ |
36 |
-diff -ur henplus-0.9.8.old/build.xml henplus-0.9.8/build.xml |
37 |
---- henplus-0.9.8.old/build.xml 2009-05-01 23:51:41.000000000 +0300 |
38 |
-+++ henplus-0.9.8/build.xml 2009-05-01 23:52:31.000000000 +0300 |
39 |
-@@ -33,13 +33,13 @@ |
40 |
- <pathelement path="${classes}" /> |
41 |
- </path> |
42 |
- |
43 |
-- <taskdef name="ant-server" classname="net.sweetohm.ant.server.ServerTask"> |
44 |
-- <classpath> |
45 |
-- <pathelement location="${lib}/build/sat-0.7.jar" /> |
46 |
-- </classpath> |
47 |
-- </taskdef> |
48 |
-- |
49 |
- <target name="server"> |
50 |
-+ <taskdef name="ant-server" classname="net.sweetohm.ant.server.ServerTask"> |
51 |
-+ <classpath> |
52 |
-+ <pathelement location="${lib}/build/sat-0.7.jar" /> |
53 |
-+ </classpath> |
54 |
-+ </taskdef> |
55 |
-+ |
56 |
- <ant-server/> |
57 |
- </target> |
58 |
- |
59 |
|
60 |
diff --git a/dev-db/henplus/files/henplus.pre b/dev-db/henplus/files/henplus.pre |
61 |
deleted file mode 100644 |
62 |
index c29585e369fa..000000000000 |
63 |
--- a/dev-db/henplus/files/henplus.pre |
64 |
+++ /dev/null |
65 |
@@ -1,51 +0,0 @@ |
66 |
-# |
67 |
-# Based on the upstream script but parts not relevant to Gentoo |
68 |
-# stripped away. We would not need this at all but better to make |
69 |
-# this behave as the upstream docs say and then also have all the |
70 |
-# Gentoo goodies. |
71 |
-# https://bugs.gentoo.org/show_bug.cgi?id=176185 |
72 |
- |
73 |
-##------------------ |
74 |
-THISDIR=`dirname $0` |
75 |
-# install layout is: script in /usr/bin/henplus and libs in /usr/share/henplus |
76 |
-HENPLUSDIR=$THISDIR/../share/henplus |
77 |
- |
78 |
-# you may just throw your own jar files in this dir. |
79 |
-# (like additional JDBC-drivers, that are not in default |
80 |
-# classpath) |
81 |
-for f in $HENPLUSDIR/*.jar $HENPLUSDIR/*.zip ; do |
82 |
- if [ -r "$f" ] ; then |
83 |
- CLASSPATH=$CLASSPATH:$f |
84 |
- fi |
85 |
-done |
86 |
- |
87 |
-# starting at the current directory we look for additional |
88 |
-# JDBC-drivers in .henplus/lib-directories up the path. |
89 |
-# if no directory like that has been found the one in the |
90 |
-# home directory will be used |
91 |
-DIR=`pwd` |
92 |
-CUSTOM_HENPLUSDIR="" |
93 |
- |
94 |
-while [ $DIR != "/" ] ; do |
95 |
- if [ -d $DIR"/.henplus/lib" ]; then |
96 |
- CUSTOM_HENPLUSDIR=$DIR"/.henplus/lib" |
97 |
- break |
98 |
- fi |
99 |
- DIR=`dirname $DIR` |
100 |
-done |
101 |
- |
102 |
-if [ -z $CUSTOM_HENPLUSDIR ]; then |
103 |
- if [ -d "/.henplus/lib" ]; then |
104 |
- CUSTOM_HENPLUSDIR="/.henplus/lib" |
105 |
- else |
106 |
- CUSTOM_HENPLUSDIR=$HOME/.henplus/lib |
107 |
- fi |
108 |
-fi |
109 |
- |
110 |
-for f in $CUSTOM_HENPLUSDIR/*.jar $CUSTOM_HENPLUSDIR/*.zip ; do |
111 |
- if [ -r "$f" ] ; then |
112 |
- CLASSPATH=$CLASSPATH:$f |
113 |
- fi |
114 |
-done |
115 |
- |
116 |
-export CLASSPATH |
117 |
|
118 |
diff --git a/dev-db/henplus/henplus-0.9.8-r1.ebuild b/dev-db/henplus/henplus-0.9.8-r1.ebuild |
119 |
deleted file mode 100644 |
120 |
index 4d87fb8700b0..000000000000 |
121 |
--- a/dev-db/henplus/henplus-0.9.8-r1.ebuild |
122 |
+++ /dev/null |
123 |
@@ -1,43 +0,0 @@ |
124 |
-# Copyright 1999-2021 Gentoo Authors |
125 |
-# Distributed under the terms of the GNU General Public License v2 |
126 |
- |
127 |
-EAPI=5 |
128 |
-JAVA_PKG_IUSE="doc source" |
129 |
- |
130 |
-inherit java-pkg-2 epatch java-ant-2 |
131 |
- |
132 |
-DESCRIPTION="Java-based multisession SQL shell for databases with JDBC support" |
133 |
-HOMEPAGE="http://henplus.sf.net" |
134 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
135 |
-LICENSE="GPL-2" |
136 |
-SLOT="0" |
137 |
-KEYWORDS="amd64 x86" |
138 |
-IUSE="" |
139 |
- |
140 |
-COMMON_DEPEND="dev-java/commons-cli:1 |
141 |
- dev-java/libreadline-java:0" |
142 |
-RDEPEND=">=virtual/jre-1.6 |
143 |
- ${COMMON_DEPEND}" |
144 |
-DEPEND=">=virtual/jdk-1.6 |
145 |
- ${COMMON_DEPEND}" |
146 |
- |
147 |
-java_prepare() { |
148 |
- epatch "${FILESDIR}/0.9.8-build.xml.patch" |
149 |
- rm -v lib/*.jar lib/*/*.jar || die |
150 |
-} |
151 |
- |
152 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
153 |
-EANT_GENTOO_CLASSPATH="commons-cli-1,libreadline-java" |
154 |
- |
155 |
-src_install() { |
156 |
- java-pkg_dojar "build/${PN}.jar" |
157 |
- |
158 |
- java-pkg_dolauncher ${PN} -pre "${FILESDIR}/${PN}.pre" \ |
159 |
- --main henplus.HenPlus |
160 |
- |
161 |
- dodoc README |
162 |
- dohtml doc/HenPlus.html |
163 |
- |
164 |
- use doc && java-pkg_dojavadoc javadoc/api |
165 |
- use source && java-pkg_dosrc "src/${PN}" |
166 |
-} |
167 |
|
168 |
diff --git a/dev-db/henplus/metadata.xml b/dev-db/henplus/metadata.xml |
169 |
deleted file mode 100644 |
170 |
index ba8234491c12..000000000000 |
171 |
--- a/dev-db/henplus/metadata.xml |
172 |
+++ /dev/null |
173 |
@@ -1,11 +0,0 @@ |
174 |
-<?xml version="1.0" encoding="UTF-8"?> |
175 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
176 |
-<pkgmetadata> |
177 |
- <maintainer type="project"> |
178 |
- <email>java@g.o</email> |
179 |
- <name>Java</name> |
180 |
- </maintainer> |
181 |
- <upstream> |
182 |
- <remote-id type="sourceforge">henplus</remote-id> |
183 |
- </upstream> |
184 |
-</pkgmetadata> |
185 |
|
186 |
diff --git a/profiles/package.mask b/profiles/package.mask |
187 |
index 703777707504..996f424d2fb3 100644 |
188 |
--- a/profiles/package.mask |
189 |
+++ b/profiles/package.mask |
190 |
@@ -357,11 +357,6 @@ app-admin/reportmagic |
191 |
# Removal on 2021-11-22. Bug #819693. |
192 |
app-admin/swatchdog |
193 |
|
194 |
-# Jakov Smolić <jsmolic@g.o> (2021-10-23) |
195 |
-# EAPI 5 java package, no revdeps. |
196 |
-# Removal on 2021-11-22. Bug #819684. |
197 |
-dev-db/henplus |
198 |
- |
199 |
# Sergey Popov <pinkbyte@g.o> (2021-10-22) |
200 |
# Upstream support discontinued, see https://bw.org/2019/03/19/bw-whois/ |
201 |
# Suggested replacement - net-misc/whois |