[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Sam James]

commit:     2fbd5433754fc7d0399e93aaf09727cec1983c14
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Dec  1 08:02:10 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 18:55:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fbd5433

dev-java/jline: Drop 2.12.1-r1, 1.0-r1

Closes: https://bugs.gentoo.org/736834
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23108
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jline/Manifest               |  2 -
 dev-java/jline/jline-1.0-r1.ebuild    | 70 -----------------------------------
 dev-java/jline/jline-2.12.1-r1.ebuild | 66 ---------------------------------
 3 files changed, 138 deletions(-)

diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
index d2ec5d9401eb..b48e375690f1 100644
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -1,3 +1 @@
-DIST jline-1.0.zip 463082 BLAKE2B 4f4eec5a2674bf97ed9fe83c60d339fce54dcd556aca6e95db74438e87253fd4e36e4eef26b3ac14ed84fff3d2fe1b58ba3a6fe13f33d96fe50a34f7bb34f541 SHA512 2957e19a3536d89aeaf8f27afb1f8eb4eb8bcc99560244c7f1ba14693a84a2f5e677a6c21d5f85ec519674cc4cd6cb3c9e4725cb4797144168d2f6df3954aba9
-DIST jline-2.12.1.tar.gz 97289 BLAKE2B 375711ad78cba26c0b4702dd739a18dd4db2fd1e8b16ce817dd1f567c405b7b0f96c72a6c6b7fabff1520617cf9149a29040e132d0b61e2d57149bb83b404c8d SHA512 368492fa0b28e6aa3827db05d266b332935d9a03c2f6645d039941c61a698e85fd57accfac444503de4cb2f2dae5787496924b8d258faad1c18b6cafe787f99d
 DIST jline-2.14.6.tar.gz 116599 BLAKE2B a3576314d8bb4886e0297822e0f37b4cc4c49cad1c5ea71a61a2813b0afae7ba8a5d5ad914fe900c4dca6c2f3891551157ca4a3d24231e8731cda4b5dbe80b32 SHA512 9e141c9a112dcb4850db95a7c2cec9b84f11be1f6740a3a33c99ec2ed5f900f4dae7474058e14319ef79476121997afbdb248ca22559a82a905c31690afa1d51

diff --git a/dev-java/jline/jline-1.0-r1.ebuild b/dev-java/jline/jline-1.0-r1.ebuild
deleted file mode 100644
index eb4e3f9754da..000000000000
--- a/dev-java/jline/jline-1.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Handle console input in Java"
-HOMEPAGE="http://jline.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:0
-	)"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	java-pkg_clean
-
-	# we don't support maven for building yet.
-	# this build.xml was generated by:
-	# - mvn ant:ant
-	# - tweak build.xml to not load properties from home dir
-	# - tweak the test target to match the test cases
-	# - change maven.repo.local from ~/.maven to "lib" in .properties
-	# - change classpath definitions to "*.jar"
-
-	cp "${FILESDIR}/maven-build.xml" build.xml || die
-	cp "${FILESDIR}/maven-build.properties" . || die
-	java-ant_ignore-system-classes
-
-	mkdir lib || die
-	cd lib || die
-	if use test; then
-		java-pkg_jar-from --build-only junit
-	fi
-}
-
-src_compile() {
-	# precompiled javadocs (needs maven to generate)
-	# -Dmaven.build.finalName is needed to override the one defined in the
-	# build.xml, which because it was generated with 0.9.9, defaults to
-	# jline-0.9.9 -nichoj
-	eant package -Dmaven.build.finalName=${P}
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test -Djunit.present=true
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	# no api docs in this release
-	# use doc && java-pkg_dojavadoc ../apidocs
-	use source && java-pkg_dosrc src/main/java
-}

diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
deleted file mode 100644
index b0d0dafc0f21..000000000000
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ /dev/null
@@ -1,66 +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 java-pkg-simple
-
-DESCRIPTION="A Java library for handling console input"
-HOMEPAGE="https://github.com/jline/jline2"
-SRC_URI="https://github.com/jline/${PN}2/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-java/jansi:0
-	dev-java/jansi-native:0"
-
-DEPEND="
-	test? (
-		dev-java/junit:4
-	)
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}2-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
-
-java_prepare() {
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
-
-	# Don't forget the resources!
-	mkdir -p target/classes || die
-	cp -r src/main/resources/* target/classes || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	dodoc {CHANGELOG,README}.md
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}