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

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

[Jakov Smolić]

commit:     08bde330c225a761b52d15fa2d18fb6cba033ded
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 08:36:23 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 09:13:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08bde330

dev-db/henplus: treeclean

Closes: https://bugs.gentoo.org/819684
Closes: https://bugs.gentoo.org/801292
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-db/henplus/Manifest                    |  1 -
 dev-db/henplus/files/0.9.8-build.xml.patch | 23 --------------
 dev-db/henplus/files/henplus.pre           | 51 ------------------------------
 dev-db/henplus/henplus-0.9.8-r1.ebuild     | 43 -------------------------
 dev-db/henplus/metadata.xml                | 11 -------
 profiles/package.mask                      |  5 ---
 6 files changed, 134 deletions(-)

diff --git a/dev-db/henplus/Manifest b/dev-db/henplus/Manifest
deleted file mode 100644
index c7f6c1d15660..000000000000
--- a/dev-db/henplus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST henplus-0.9.8.tar.gz 233035 BLAKE2B 0cfba9cde654103f539ce28508d77169ce3a34ccc9a8805253e9bcd3a731118408c8a241f82eb6da8be2b96d1a4932c95024a158eae48396b045d5b94b0acaa9 SHA512 a22fc847f4441f627c1fa12f4f365c38d0c8ddfc205758d044e797e83f8d37032995666c2ee3dbb68d0a5f563fa5d574886e85757b1faa0acfc055e92b2fad0b

diff --git a/dev-db/henplus/files/0.9.8-build.xml.patch b/dev-db/henplus/files/0.9.8-build.xml.patch
deleted file mode 100644
index e2763978080e..000000000000
--- a/dev-db/henplus/files/0.9.8-build.xml.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur henplus-0.9.8.old/build.xml henplus-0.9.8/build.xml
---- henplus-0.9.8.old/build.xml	2009-05-01 23:51:41.000000000 +0300
-+++ henplus-0.9.8/build.xml	2009-05-01 23:52:31.000000000 +0300
-@@ -33,13 +33,13 @@
-         <pathelement path="${classes}" />
-      </path>
- 
--     <taskdef name="ant-server" classname="net.sweetohm.ant.server.ServerTask">
--        <classpath>
--           <pathelement location="${lib}/build/sat-0.7.jar" />
--        </classpath>
--     </taskdef>
--
-      <target name="server">
-+        <taskdef name="ant-server" classname="net.sweetohm.ant.server.ServerTask">
-+           <classpath>
-+              <pathelement location="${lib}/build/sat-0.7.jar" />
-+           </classpath>
-+        </taskdef>
-+
-         <ant-server/>
-      </target>
- 

diff --git a/dev-db/henplus/files/henplus.pre b/dev-db/henplus/files/henplus.pre
deleted file mode 100644
index c29585e369fa..000000000000
--- a/dev-db/henplus/files/henplus.pre
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Based on the upstream script but parts not relevant to Gentoo
-# stripped away. We would not need this at all but better to make
-# this behave as the upstream docs say and then also have all the 
-# Gentoo goodies.
-# https://bugs.gentoo.org/show_bug.cgi?id=176185
-
-##------------------
-THISDIR=`dirname $0`
-# install layout is: script in /usr/bin/henplus and libs in /usr/share/henplus
-HENPLUSDIR=$THISDIR/../share/henplus
-
-# you may just throw your own jar files in this dir.
-# (like additional JDBC-drivers, that are not in default
-# classpath)
-for f in $HENPLUSDIR/*.jar $HENPLUSDIR/*.zip ; do
-    if [ -r "$f" ] ; then
-        CLASSPATH=$CLASSPATH:$f
-    fi
-done
-
-# starting at the current directory we look for additional
-# JDBC-drivers in .henplus/lib-directories up the path. 
-# if no directory like that has been found the one in the 
-# home directory will be used
-DIR=`pwd`
-CUSTOM_HENPLUSDIR=""
-
-while [ $DIR != "/" ] ; do
-        if [ -d $DIR"/.henplus/lib" ]; then
-            CUSTOM_HENPLUSDIR=$DIR"/.henplus/lib"
-	    break
-        fi
-        DIR=`dirname $DIR`
-done
-
-if [ -z $CUSTOM_HENPLUSDIR ]; then
-     if [ -d "/.henplus/lib" ]; then
-         CUSTOM_HENPLUSDIR="/.henplus/lib"
-     else
-         CUSTOM_HENPLUSDIR=$HOME/.henplus/lib
-     fi
-fi
-
-for f in $CUSTOM_HENPLUSDIR/*.jar $CUSTOM_HENPLUSDIR/*.zip ; do
-    if [ -r "$f" ] ; then
-        CLASSPATH=$CLASSPATH:$f
-    fi
-done
-
-export CLASSPATH

diff --git a/dev-db/henplus/henplus-0.9.8-r1.ebuild b/dev-db/henplus/henplus-0.9.8-r1.ebuild
deleted file mode 100644
index 4d87fb8700b0..000000000000
--- a/dev-db/henplus/henplus-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 epatch java-ant-2
-
-DESCRIPTION="Java-based multisession SQL shell for databases with JDBC support"
-HOMEPAGE="http://henplus.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="dev-java/commons-cli:1
-	dev-java/libreadline-java:0"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEPEND}"
-
-java_prepare() {
-	epatch "${FILESDIR}/0.9.8-build.xml.patch"
-	rm -v lib/*.jar lib/*/*.jar || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-cli-1,libreadline-java"
-
-src_install() {
-	java-pkg_dojar "build/${PN}.jar"
-
-	java-pkg_dolauncher ${PN} -pre "${FILESDIR}/${PN}.pre" \
-		--main henplus.HenPlus
-
-	dodoc README
-	dohtml doc/HenPlus.html
-
-	use doc && java-pkg_dojavadoc javadoc/api
-	use source && java-pkg_dosrc "src/${PN}"
-}

diff --git a/dev-db/henplus/metadata.xml b/dev-db/henplus/metadata.xml
deleted file mode 100644
index ba8234491c12..000000000000
--- a/dev-db/henplus/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">henplus</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 703777707504..996f424d2fb3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -357,11 +357,6 @@ app-admin/reportmagic
 # Removal on 2021-11-22. Bug #819693.
 app-admin/swatchdog
 
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-23)
-# EAPI 5 java package, no revdeps.
-# Removal on 2021-11-22. Bug #819684.
-dev-db/henplus
-
 # Sergey Popov <pinkbyte@gentoo.org> (2021-10-22)
 # Upstream support discontinued, see https://bw.org/2019/03/19/bw-whois/
 # Suggested replacement - net-misc/whois