gentoo resync : 04.01.2022

4 files changed, 2 insertions, 313 deletions

diff --git a/dev-java/jnr-constants/Manifest b/dev-java/jnr-constants/Manifest
index 8c32eba4c674..53abda980a91 100644
--- a/dev-java/jnr-constants/Manifest
+++ b/dev-java/jnr-constants/Manifest
@@ -1,6 +1,3 @@
-AUX jnr-constants_maven-build.xml 11304 BLAKE2B fad6aa5bfb222be73e0c064802dfabf5370562de03db80c2c35c03423e6829e11622cbb1a87f92929de9a8f2b70c3dfc039071c5e9c1cc5b27e40289a3f92fca SHA512 ebe66da46f9d80e02361a895c2aba7b635cf0a4e550f7a4f4c5534684bcf06585b43458381d6a3dc526d0f020b96bf93a259d2b4b6125c23e5d6d571a373ce2f
 DIST jnr-constants-0.10.3-sources.tar.gz 261921 BLAKE2B f8137455c067e774dd30d64fe457dd859692315f43415bdfbffa4870b981db26de23d73fa7682bbd924523ac17dec56caa7078580cf817d8df3eae4d87c61343 SHA512 f7cd6a3778670c9835f8dce87c8470c8b8cfeda6f30d68051c09dae40c4f7dd7db88bed016450c33ab5c8da9a802b4bd050adf358680d5ec6735467e398404dc
-DIST jnr-constants-0.8.6.tar.gz 71080 BLAKE2B db86f3c0347b85dd56de72465c4198e74faa877b8a1373ab378728945edaf0c45748ed707e6b591224858f498ae7d43269d8127cb61b7ac2893ef9817e36ca1c SHA512 2098f8e1869b9c018ba3afa70ef386fce2609d9c650ee851dcd7cf7dc9d4d87dbe26886eb2e744d96cc11425f6b66144a018826360b7bab48a4b99e323f3717a
-EBUILD jnr-constants-0.10.3.ebuild 987 BLAKE2B 85c5144a1d6e48e925130158d2f1488394513d525e7f9d122505a6462d9677b19c7c54f217fa8f05b335c8251d2bd8161cb153499247e3777ecaea867a915a02 SHA512 b40296f2991baf73932638a21a03834bbebbdc192f8d4e6c377d51b8c7164182dce34f76b9fde81ef47a1b67013f4d60844ebcab1e9a31b062a27dd622bd0d85
-EBUILD jnr-constants-0.8.6.ebuild 1058 BLAKE2B 512071e039a49fe64ae6432bd51979a1c3e13abf3cd655570f9aba4c74fb66df9eb433014f191d676aa79d7a04ae70394905f72dd812414e74f4d359853199a6 SHA512 d1fe0d566c5b8749bea6015a5cf6955763d187e48d4855147b9660a87dd8f0231f4a678080569f5b0b6ab48024d61948b232a0ef23451420c6969e2ad830d985
+EBUILD jnr-constants-0.10.3.ebuild 986 BLAKE2B 1addcfa23240cea6fed31e32d2fd90eb7208a94dedc612b77eaac5c61e627f87525c57cc188bebde84303f1a92e1d836ebe3044b8af64911679e825ca088893a SHA512 0fc5493a6d907348db6ee86d8e1f03e9cb528dcc013f97ebed07029ec38751a5e20ee71d9147d1edc0775b94e92d229c07f3338d6e0464210ac4f8ca8c2fafde
 MISC metadata.xml 329 BLAKE2B 6ab95abb16b9a4503c12cf6e06ae18a6ecbf217390f9ca6ba52516bedbe0c69c074aa3a01906974cca84efc02751afc2328d51245fce52d86996d64358f1fd08 SHA512 2e04327f332a4a421dcec67655242822cdd5f5ea5a8d2fdd37f24e68069320014a3bda438041f189831ef85087d53b4015c506fae40ec3a7494ef1f1efe41970
diff --git a/dev-java/jnr-constants/files/jnr-constants_maven-build.xml b/dev-java/jnr-constants/files/jnr-constants_maven-build.xml
deleted file mode 100644
index 75f8458ee2c2..000000000000
--- a/dev-java/jnr-constants/files/jnr-constants_maven-build.xml
+++ /dev/null
@@ -1,259 +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/11/12 12:52 PM                      -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jnr-constants-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jnr-constants-0.8.2"/>
-  <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/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
-  </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.1" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.1" 
-           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>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          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}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" 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>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- 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/4.8.2"/>
-    <get src="http://repository.jboss.com/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://snapshots.jboss.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repository.jboss.org/maven2//junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://repository.jboss.org/nexus/content/groups/public-jboss//junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild b/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
index 79937ba00103..03889724207a 100644
--- a/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
+++ b/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/jnr/jnr-constants"
 SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
deleted file mode 100644
index 3f8c33be960e..000000000000
--- a/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of platform constants (e.g. errno values)"
-HOMEPAGE="https://github.com/jnr/jnr-constants"
-# SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/junit-4.8:4
-	)"
-
-S="${WORKDIR}/${PN}-${P}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}