gentoo resync : 05.12.2021

6 files changed, 2 insertions, 356 deletions

diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
index fc279be0c551..b0f5463ec9fd 100644
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -1,9 +1,3 @@
-AUX maven-build.properties 501 BLAKE2B aaaaeb13e4e23588d6fe8c5e990b1e95edade85a7af30b4c9df3edf795b394c85a9baba202c8887cc46d7be1114b05637b486915ace8f51d25b31ee8c5e29012 SHA512 2e3347c2b53266c7d41cd9f73e79bdfecd28e41e78208b360533414ed551f101d04e4a76d416f061e56bbce43baf96c4c52fdba65ded3c0be18533c2c226ef6f
-AUX maven-build.xml 8634 BLAKE2B 4d1078e1201baf11da35772d0e48304522cad6b606a6d601c449bf1d97b2a43725ddcf703dea154ac923955aac5489d164686fb042fcb7c1753d0e9ef619a283 SHA512 45648b88f3df01e0623483c6c409ce1fb57b6b73e62775064b4bc7762d1dc3a3ead3a4925efe987986081ed34c26195827f3f34a1b631fdf4e7ce227376c2936
-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
-EBUILD jline-1.0-r1.ebuild 1648 BLAKE2B 19912fc975f67b97d779cb4b45ecc166abb6a888199b8fc22e2ef756a0fca488bb5392f0d4a49cc600950f7c84e654342c780170151567c1f3bc18ed9ececf14 SHA512 0720db354b7051ee9f322fb186dc5cb2a9f75919ee2daa92710f1d2fbd001519f61ecfe994a11de67eb7c5f5a8f20191235f3ff1ede74cd75eff733d2a436eff
-EBUILD jline-2.12.1-r1.ebuild 1286 BLAKE2B 617c3fa79f322537294de7546548a0ffe9d0ecf5ea7fff4bdd2becf22c20c0d648b4c0835c6d94756cf8f55b9bd5f8c95609ee0a52aed1808f7829a68de02820 SHA512 efe14afc050da11b56004f1abc43dd4d4346a8c50a839e8292e054958e372e8d2d56cf62631a702fe06cff7efc78a99cda92f859dbf30941f94e4ab3380c2ebd
-EBUILD jline-2.14.6.ebuild 1396 BLAKE2B 0d3d062551a82ea592ae995e5dd1eee4526cb23a976c110bb37173200d11b54584797823940a028cefc8936a438102eede91629f5b3cc47e47ae3de3d0633870 SHA512 ea4b027c443910aa74f0f8cb79eb3a7bd376a4b964fad245ffdce20a4b6bbfcd530085c5538049436dca0397aa76fc18a857d452eb427e5b492144578950e34c
+EBUILD jline-2.14.6.ebuild 1399 BLAKE2B 8d7117b233f4809da4f65380ba7e8aee7cfece26913fd01db405723923683556d3fed34be1b5f2e736d530ed2e9ce7cba48e53a36e4f029995ddb3aaa951b23f SHA512 df35e37818ccd8d0cea858f66dda0c4b8f236338d10ad5cd50aad8205fd86b9465dd3bea9ef804824813376d4e26214d2fe045aad0ba54c721307b3b37e061f4
 MISC metadata.xml 376 BLAKE2B 5879728bea0aa1b1d38110a053b6144407077d14968a0f45a76079388a302071ecb543c67366d3b3bbb30768eba852f07100e89253a7cdd9342614828d171a3c SHA512 363bc722f4e7908aba60f0c655265b289614ba80338ad381b92f2cd6e2214331b76fda29855a5a0fda992de7f03acb3a48e4bca10cb0147b5b302f499a5b25bb
diff --git a/dev-java/jline/files/maven-build.properties b/dev-java/jline/files/maven-build.properties
deleted file mode 100644
index 66ef7cf2840e..000000000000
--- a/dev-java/jline/files/maven-build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
-#Sun Jan 21 15:31:06 EET 2007
-maven.build.finalName=jline-0.9.9
-maven.build.outputDir=${maven.build.dir}/classes
-maven.build.resourceDir.0=src/main/resources
-maven.build.testResourceDir.0=src/test/resources
-maven.build.testOutputDir=${maven.build.dir}/test-classes
-maven.repo.local=lib
-maven.settings.offline=false
-maven.build.dir=target
-maven.settings.interactiveMode=true
-maven.build.srcDir.0=src/main/java
-maven.build.testDir.0=src/test/java
diff --git a/dev-java/jline/files/maven-build.xml b/dev-java/jline/files/maven-build.xml
deleted file mode 100644
index 7be70998ddcc..000000000000
--- a/dev-java/jline/files/maven-build.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 1/21/07 3:31 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jline-from-maven" default="dist" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environnement properties                                         -->
-  <!-- ====================================================================== -->
-
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jline-0.9.9"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/main/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-
-  <property name="maven.settings.offline" value="true"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <fileset dir="${maven.repo.local}">
-      <include name="*.jar"/>
-    </fileset>
-  </path>
-  <path id="build.test.classpath">
-    <fileset dir="${maven.repo.local}">
-      <include name="*.jar"/>
-    </fileset>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.3" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="junit-present, compile" 
-          description="Compile the test code" 
-          if="junit.present">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.3" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="junit-present, compile-tests" 
-          if="junit.present" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="junit-present" 
-          depends="test-junit-present" 
-          unless="junit.present">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Dist target                                                            -->
-  <!-- ====================================================================== -->
-
-  <target name="dist" depends="package,test" description="Package the application and run tests"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/>
-    <get src="http://jline.sourceforge.net/m2repo/junit/junit/3.8.1/junit-3.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
-         usetimestamp="true" 
-         ignoreerrors="true"/>
-    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
-         usetimestamp="true" 
-         ignoreerrors="true"/>
-  </target>
-</project>
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 e40695a585b8..000000000000
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 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 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}
-}
diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6.ebuild
index d8cb303a8f10..26d6c114de99 100644
--- a/dev-java/jline/jline-2.14.6.ebuild
+++ b/dev-java/jline/jline-2.14.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}2-${P}"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="test"
 # Needs yet-unpackaged powermock for tests
 RESTRICT="!test? ( test ) test"