gentoo resync : 20.03.2022

4 files changed, 2 insertions, 190 deletions

diff --git a/dev-java/xerial-core/Manifest b/dev-java/xerial-core/Manifest
index 37749085dea8..80ed6051641e 100644
--- a/dev-java/xerial-core/Manifest
+++ b/dev-java/xerial-core/Manifest
@@ -1,5 +1,3 @@
-AUX 2.0.1-build.xml 5674 BLAKE2B dc70ae55f105e36306cc30e71b64fb1008003b2a330dd12b7531a81191e82a6ea376eedd58495b788fa2a526badb5b33b0e72a4627c5cbe0db3ebefbd9eee924 SHA512 fe6cae55b06099f1718fe2d2b70f680b3549c20047884f879d4fcdc7f8765d4b18a5f8b80478b09913013958834f2602ded4e0b9580db96467d89b1bd5c23650
 DIST xerial-core-2.0.1.tar.bz2 519709 BLAKE2B 3d81bda265e3b3b37a50a62061298f23de7c2947a9d50ba6eac336c3ec09fcaaeea84d456e344b0d2ae16710870025a869c2359a17f0956c8dda557804e9d5ff SHA512 39236e8a653301a6899ce80d3240d505e91f0cfc8878fa1a698113d06f3af3fd7adef540d72da1c0e1fb7101542c43e92fb9388243d95c3185a561532c18c6fb
-EBUILD xerial-core-2.0.1-r1.ebuild 1454 BLAKE2B 39c8bae5eea1ec987e023bd37a445fda6f38394cc310df81738195abaebacc3d22ebdba415696cac16f979befea37ea0ffad12094a9d38ef3151ffbe61c44d96 SHA512 c3074c29cc04a036755f1c25f401d782a1af7b3364010146f6679acff0e0d14863c81fb08098c648cba51584f8fa1da988cce9bdc978246edaf269549526b9f4
-EBUILD xerial-core-2.0.1.ebuild 924 BLAKE2B eeea14596a52313896ec32d3fad773bebb08a8ee73fbb43f7ee16e818896920e3bbc2a230b1de586ec33900701c908b7826c37e44d77ced69806fa5cfb901651 SHA512 1d0e2abac6e6733e1992ea76d87788e489654af275849e4e78a5bfd5bf29fa9ea5f845b82684a39421b4ab4d9332f49140093fc5e7da89570bc42f94b7cf997f
+EBUILD xerial-core-2.0.1-r1.ebuild 1469 BLAKE2B c00a498648c515ba78a4680db4c967d472ab4696435e7c0907d286b4703318571ce8f82400af41129019b09bca576222000432f3e5f1246a5118db280ece45ff SHA512 32cbb09e2e83358641c0cd3d939900d2bfdeac606f918ee23bbebbc7747a307af62ebc6f4de08645d1ec35479cd1f7267cac51b94f53802d51526fcca7a55d5a
 MISC metadata.xml 320 BLAKE2B e2b3c6290aa495c539b2b3f7afe9fbbad2011245a00e41dd928649a35256f1882ea2bc0eb95c9b468e041734464f4299c39da87c7727b9f43ad8346a0d68affa SHA512 86ce5a0bed000e534fce286494c981aa6e3d8e7619c549ad666655d51928a62699cfd1638d99dcb66f3a83c5717aacb50211f3e2e3314408c188594e986f7171
diff --git a/dev-java/xerial-core/files/2.0.1-build.xml b/dev-java/xerial-core/files/2.0.1-build.xml
deleted file mode 100644
index 76a6adfcb189..000000000000
--- a/dev-java/xerial-core/files/2.0.1-build.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="xerial-core-from-maven" default="package" basedir=".">
-	<property file="${user.home}/.m2/maven.properties" />
-	<property file="maven-build.properties" />
-
-	<property name="maven.build.finalName" value="xerial-core-2.0.1" />
-	<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/java" />
-	<property name="maven.build.resourceDir.1" 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/java" />
-	<property name="maven.build.testResourceDir.1" 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" />
-
-	<path id="build.classpath" />
-	<path id="build.test.classpath" />
-
-	<target name="clean" description="Clean the output directory">
-		<delete dir="${maven.build.dir}" />
-	</target>
-
-
-	<target name="compile" description="Compile the code">
-		<mkdir dir="${maven.build.outputDir}" />
-		<javac destdir="${maven.build.outputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
-			<src>
-				<pathelement location="${maven.build.srcDir.0}" />
-			</src>
-			<classpath refid="build.classpath" />
-		</javac>
-		<copy todir="${maven.build.outputDir}">
-			<fileset dir="${maven.build.resourceDir.0}">
-				<exclude name="**/*.java" />
-			</fileset>
-		</copy>
-	</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.6" verbose="false" fork="false" source="1.6">
-			<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}">
-				<exclude name="**/*.java" />
-			</fileset>
-		</copy>
-		<copy todir="${maven.build.testOutputDir}">
-			<fileset dir="${maven.build.testResourceDir.1}" />
-		</copy>
-	</target>
-
-	<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>
-
-	<target name="javadoc" description="Generates the Javadoc of the application">
-		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" charset="ISO-8859-1" linksource="false" breakiterator="false">
-			<doctitle>&lt;![CDATA[xerial-core-2.0.1 API]]&gt;</doctitle>
-		</javadoc>
-	</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>
-
-	<target name="jar" depends="package" description="Builds the jar for the application" />
-
-	<target name="test-offline">
-		<condition property="maven.mode.offline">
-			<equals arg1="${maven.settings.offline}" arg2="true" />
-		</condition>
-	</target>
-
-</project>
diff --git a/dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild b/dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild
index 93fd310af6bb..585c67d8e0b1 100644
--- a/dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild
+++ b/dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xerial-core/xerial-core-2.0.1.ebuild b/dev-java/xerial-core/xerial-core-2.0.1.ebuild
deleted file mode 100644
index edaab8c4a833..000000000000
--- a/dev-java/xerial-core/xerial-core-2.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 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="An open-source DBMS for XML/JSON/Relational data"
-HOMEPAGE="https://code.google.com/p/xerial/"
-SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/junit:4
-	)"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-}
-
-src_install() {
-	java-pkg_newjar "${S}/target/${P}.jar" "${PN}.jar"
-
-	use source && java-pkg_dosrc "${S}"/src/main/java/*
-	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
-}
-
-src_test() {
-	java-pkg-2_src_test
-}