gentoo resync : 28.04.2021

6 files changed, 2 insertions, 164 deletions

diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 99aab5975d31..11b9c3981406 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,11 +1,7 @@
-AUX hamcrest-1.3-empty_generator.patch 1227 BLAKE2B 4e0bc6d085f6d26de9f2da8e09eb061c451a58d99385a2c41be28a137b209783affd76e1e0bd901a5497d40b290ac219d61046fc65931ea056c725ae0f835ee1 SHA512 766f57a449d4535432ab192c40a37ff9a09fe760b06ce5beb6a68b2b804c77ce232e8003fb3f3ef7b71df1cd2ceae7ff13fd3de28d20ec0ced1274c912d414b5
 AUX hamcrest-core-1.1-java-11.patch 1198 BLAKE2B 0c9610b9225a6eff96669dbc0c4e052a33ad0ef46d8982d39220e851584afcf67b7696a5770ffe2a61090020a7dc6925367e5eb13c4f0e3c6a621361825e1ac7 SHA512 21f5305ef9bb2b0c4c8f9eb5524dd31a621b6acad1447644f75afac5c87de6187617c3beb592cb934f6befe316735f1cfb72b34371fd4b7c09e893a99461a87a
-AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb76d8c1c39266f6fb2f220849eeabec7ce5b084d2411c51102fa5b47853aed66acd6d237497c0c8bb2c688c93b7eb0785e27a3 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3
 AUX hamcrest-core-1.3-java-11.patch 886 BLAKE2B eb6e3a1f3cd47d067987a436d947ab89732dfec0f73096b9b9a0be3213cb0bd7ee800f29ff2766e997c202f9309b766aeede966d399c080e1529c9f0d83c7e1d SHA512 82ead3c1344ac7a153992923e06bdb40dad2729202aa695e690c755937f570ad927c5aa832de13553050dfcce48bd84c6e73164c26c39890c134259c9ab67254
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
-EBUILD hamcrest-core-1.1-r3.ebuild 716 BLAKE2B a0442ff57be2628e59b831794fb9e48cb54d1ae88abd9ab69bdfe39195e55c16da9234241af00378345e21dd4b98421b625a3e42ffe254f57b2b4fd0a4b8cb55 SHA512 8138d54074543ccbf142647639eb45efd304b0bceffcd0fbe942e3dfcfe565d15c184178661495717aee507196284543a7d4f596e0ea828f1b1871d6ba29f260
 EBUILD hamcrest-core-1.1-r4.ebuild 815 BLAKE2B cdffa29ff20d6b06b31d603bc2c55bfc5d5c492eb7e6cb778b0287b6d6f11acaab57a17f31640a94972f68c3c57afa8c83cb613de3e258ff35e7dcd6628befd1 SHA512 b77edf3f90c512774e0b959a6792b99380bd8a467c3251652f95f98d65ca134d429b06dffdacb8fb4b2b14c3a8bcf384b3373603733ad6c0566092f9ce63b4a0
-EBUILD hamcrest-core-1.3-r1.ebuild 1508 BLAKE2B 9d6f9a554c9194ae529da1323cb299012e0c9e24eb824abc81c97832d6bb3388278b1d2b70c2ab63a881d90e7e37051ab8a77775ebe58b6718f60a19a02a39cc SHA512 0c4e858cabb30eb516ee565bc12a34b3a10c160b8604a6c2ea7c64fdf1ef7f18f307bfd1f6dde9689606fc1396b67c54ed129c49bf92affa91917033ffddd510
-EBUILD hamcrest-core-1.3-r2.ebuild 1428 BLAKE2B ccbf85dcb4938e66ec439a2bda18a1703624031d34a40d6e5fd8f3127196376b0f2b3e4b924ff98c3530ca0fca7dd40fe13a45956268904f0e5f64d385f41b3f SHA512 a9dc9ca58c6a152b0800959098399b354009d6f0218228d0e10c32243537ff59beecd94a0183eaac6e60315a7bfd037cf945deabac27a9e50ad7e87a0b1e076e
+EBUILD hamcrest-core-1.3-r2.ebuild 1470 BLAKE2B f2074cbedbed6df3c8e9e32414d12902bdbfef2712f7906f2c10363f15ba441bf7275faff766f483063a8395d33f7f3ffac4aadaa8949fb1f1b75f8e860393fa SHA512 0fefd10c40fe3cd900a4c512ab91feefa554ed286c69df21143733c6a5c6e2d4833c25e92c9deb5d9a1e7d0561b4c869515981c344b97f763d1dd23b2d0bda8e
 MISC metadata.xml 310 BLAKE2B 18f629f94221f2689e8e27ebd26be9a7fcb14a4a5ba2632b59e370dae8a13e25a7cff75b36b4eee5abee203f9c9d8ad012226928ce7300207b2fe7af151934d6 SHA512 04a1836dd5ab9e764bdde86a1944830b3e272ecba3a6ae7ee84e8128edeff96b5936bf3a7dcd133171b97ab1feac4a2ff639951168d0937e7b76a6958e566cef
diff --git a/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch b/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
deleted file mode 100644
index 709bca62c02d..000000000000
--- a/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/build.xml	2012-07-02 21:14:09.000000000 +0200
-+++ b/build.xml	2013-06-15 22:00:19.919038284 +0200
-@@ -12,18 +12,6 @@
-     </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">

diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
deleted file mode 100644
index 4f210ca3380a..000000000000
--- a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/build.xml	2013-06-15 22:29:44.445548674 +0200
-++- b/build.xml	2013-06-15 22:30:45.098876635 +0200
-@@ -132,30 +132,15 @@
-     </target>

- 

-     <target name="javadoc" description="build javadoc jars">

--        <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>

-         <java-to-javadoc-jar modulename="hamcrest-core"/>

--        <java-to-javadoc-jar modulename="hamcrest-library"/>

--        <java-to-javadoc-jar modulename="hamcrest-integration"/>

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

- 

-         <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"

-                  destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"

--                 windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">

-+                 windowtitle="Hamcrest" source="1.6" failonerror="yes">

--            <classpath>

--                <fileset dir="lib/integration">

--                    <include name="*.jar"/>

--                </fileset>

--            </classpath>

-             <packageset dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/>

--            <packageset dir="build/temp/hamcrest-library-${version}-sources.jar.contents" excludes="org/hamcrest/internal"/>

--            <packageset dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/>

-             

-             <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>

-             <group title="Matcher Library" packages="org.hamcrest.*"/>

--            <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>

--            

--            <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>

--            <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>

-         </javadoc>

-         <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">

-             <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>

-@@ -302,14 +287,7 @@
-                      destdir="build/temp/@{modulename}-${version}-javadoc.jar.contents" author="true" version="true" use="true"

-                      windowtitle="Hamcrest" source="1.6" failonerror="yes">

-                 <classpath>

--                    <fileset dir="lib/integration">

--                        <include name="*.jar"/>

--                    </fileset>

--                    <fileset file="lib/generator/qdox-1.12.jar"/>

-                     <fileset file="build/hamcrest-core-${version}.jar"/>

--                    <fileset file="build/hamcrest-library-${version}.jar"/>

--                    <fileset file="build/hamcrest-generator-${version}.jar"/>

--                    <fileset file="build/hamcrest-integration-${version}.jar"/>

-                 </classpath>

-             </javadoc>

-             <jar jarfile="build/@{modulename}-${version}-javadoc.jar">

diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
deleted file mode 100644
index 5d747d9d15f4..000000000000
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
+++ /dev/null
@@ -1,35 +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
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-DEPEND="
-	virtual/jdk:1.8
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
-
-JAVA_SRC_DIR="${PN}/src"
-
-java_prepare() {
-	java-pkg_clean
-}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
deleted file mode 100644
index 977e37eca2f5..000000000000
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
+++ /dev/null
@@ -1,54 +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-ant-2
-
-MY_PN="hamcrest"
-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 ~ppc-macos ~x64-macos"
-
-DEPEND="virtual/jdk:1.8
-	~dev-java/hamcrest-generator-${PV}:1.3
-	userland_GNU? ( sys-apps/findutils )"
-
-RDEPEND=">=virtual/jre-1.8"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-
-EANT_BUILD_TARGET="core"
-
-java_prepare() {
-	# Empty out the contents of the generator target; it has already been built.
-	epatch "${FILESDIR}/hamcrest-1.3-empty_generator.patch"
-
-	# Fix problems with Javadoc target.
-	epatch "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
-
-	local cp="build/${P}.jar"
-	cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})"
-	EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
-}
-
-src_install() {
-	java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar
-
-	dodoc README.txt CHANGES.txt
-
-	use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
index 1828b5a8a3f8..627607d45aa2 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.hamcrest:hamcrest-core:1.3"
 
 inherit java-pkg-2 java-pkg-simple