gentoo resync : 28.04.2021

4 files changed, 2 insertions, 102 deletions

diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index 18f1f6ed98df..aa0aa664eeba 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1,6 +1,4 @@
-AUX 1.3-remove-targets.patch 2263 BLAKE2B 17fb19da0f70f8d265a4e68f28ca530748af3372bcace0e7e04e04c46097abe2cf61265dd2b84f56467a83e0dc9c72bda2d94da25fa5abbb88f6f31f04d1321d SHA512 e403068cba91964dc7895c111a292a135ad27790da480c8779961075de559163052fa8ca5a997d3cfc278455ab3b8051bd3d4eb069f850dad2780a7ca974e551
 AUX hamcrest-library-1.3-java-11.patch 2323 BLAKE2B 6a16d58c3aadfbb7b6447b68f5d89ec17f82639b530f331e29276d1ebe947daa0c572e874efa328c03397058884ad6cc523c1ded08086fcfa42d1902624c948e SHA512 827966cf7ca175287df5005e35527575427986367013745ef49a7b1719fc3c6a0c7dd5697158726ff7d04122bc6e558bc402b71b6f2e9b932b87b61b5f71cecf
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-library-1.3-r1.ebuild 1348 BLAKE2B e597280ab13aa00088bd7f1173e1a0453cb2435a9db5c1186b9fd66a99ab0d10bf80ff932f21ffdffbc22b73d782348228c03418e7962d833a086452ecb2ee88 SHA512 49e2b5ffe18e7fc03987612d5e78cdc2e908e109fa906b78258ce0bfe17b1f1757ff5684f2598ac07bbce3b8ff72bd952bea118961589a6d629a61a20bdaa6c2
-EBUILD hamcrest-library-1.3-r2.ebuild 1490 BLAKE2B 2068bb62e5bd6e10c692c7de30f47d803ec15ccac13ab3236336eda0c9ded95370ae1ab2216450470cc1cd48a43888cfcd16e9a21fdc7540b02e3aa78d3e2e4f SHA512 53e2916ed7eeb4edad493ada301129252776ae5ae5531b98961cc29f3b103232f879f448f685bd79cfe1a3897f779367de4a507224f4d3e20995ea9062c73dcf
+EBUILD hamcrest-library-1.3-r2.ebuild 1535 BLAKE2B ece7a5fb55b5bf39c89c9eb98fcf49aef36fb403d44fa61f4561d4b2ee58faa7bc9a0cf40689b970c3d5faf9de9a5065886040b4d8747aaa2bedf8f3aa3e28b3 SHA512 76ed07eb45f29a0658627f12dc3db76dc212d16a71d6e8e4dd81565e331dacb41c9a24f2dba415416102fcc2c26c3d0c22e3ed2b31d0f8fd7ae02494f1c4e898
 MISC metadata.xml 310 BLAKE2B 18f629f94221f2689e8e27ebd26be9a7fcb14a4a5ba2632b59e370dae8a13e25a7cff75b36b4eee5abee203f9c9d8ad012226928ce7300207b2fe7af151934d6 SHA512 04a1836dd5ab9e764bdde86a1944830b3e272ecba3a6ae7ee84e8128edeff96b5936bf3a7dcd133171b97ab1feac4a2ff639951168d0937e7b76a6958e566cef
diff --git a/dev-java/hamcrest-library/files/1.3-remove-targets.patch b/dev-java/hamcrest-library/files/1.3-remove-targets.patch
deleted file mode 100644
index 6923b0bcc68e..000000000000
--- a/dev-java/hamcrest-library/files/1.3-remove-targets.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 1cfd4fb..185c563 100644
---- a/build.xml
-+++ b/build.xml
-@@ -12,42 +12,9 @@
-     </target>

- 

-     <target name="generator" description="Build code generator tool">

--        <java-to-jar srcdir="hamcrest-generator/src/main/java"

--                     modulename="hamcrest-generator-nodeps"

--                     classpath="lib/generator/qdox-1.12.jar"/>

--

--        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->

--        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>

--        <jarjar jarfile="build/hamcrest-generator-${version}.jar">

--            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>

--            <zipfileset src="lib/generator/qdox-1.12.jar"/>

--            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>

--        </jarjar>

--        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>

-     </target>

- 

-     <target name="core" depends="generator" description="Build core Hamcrest library">

--        <java-to-jar srcdir="hamcrest-core/src/main/java" modulename="hamcrest-core"/>

--

--        <!-- Generate one class with all static imports -->

--        <mkdir dir="build/temp/hamcrest-core/generated-code"/>

--

--        <java classname="org.hamcrest.generator.config.XmlConfigurator"

--              fork="yes"

--              failonerror="yes"

--              classpath="

--                build/hamcrest-core-${version}.jar;

--                build/hamcrest-generator-${version}.jar;

--              ">

--            <arg value="core-matchers.xml"/>

--            <arg value="hamcrest-core/src/main/java"/>

--            <arg value="org.hamcrest.CoreMatchers"/>

--            <arg value="build/temp/hamcrest-core/generated-code"/>

--        </java>

--        <!-- Append to core jar -->

--        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"

--                     modulename="hamcrest-core"

--                     classpath="build/hamcrest-core-${version}.jar"/>

-     </target>

- 

-     <target name="library"

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
deleted file mode 100644
index b26fd124cfcb..000000000000
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=${PN/-library}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-CDEPEND="
-	dev-java/hamcrest-generator:${SLOT}
-	dev-java/hamcrest-core:${SLOT}
-	dev-java/qdox:1.12
-"
-DEPEND=">=virtual/jdk-1.6
-	userland_GNU? ( sys-apps/findutils )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-EANT_GENTOO_CLASSPATH="hamcrest-generator-${SLOT},hamcrest-core-${SLOT},qdox-1.12"
-EANT_BUILD_TARGET="library"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar"
-
-java_prepare() {
-	# remove core+generator target as they are already built.
-	epatch "${FILESDIR}/${PV}-remove-targets.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
-}
-
-src_install() {
-	java-pkg_newjar build/${PN/core/library}-${PV}.jar ${PN/core/library}.jar
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index d55eef85cd82..afa5bc55ca58 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="source"
+MAVEN_ID="org.hamcrest:hamcrest-library:1.3"
 
 inherit java-pkg-2 java-pkg-simple