gentoo resync : 25.11.2020

4 files changed, 4 insertions, 152 deletions

diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index df7e92a74d88..7fda27119d54 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -1,7 +1,4 @@
-AUX 1.1-build.xml.patch 4213 BLAKE2B cf48828ccc8b46ce9488f79462492a03b1a3ec8b5c0b4a1d86b1b8ff2bc605034bfd70e22df09c82044c12d2d59e508e6d8fb775081c017e5b631214bdd6fd78 SHA512 a4b9bcf15588f41ba39ca5f2d9ab70ee1a19eb295904b4da96f3bf66ad83ca14b38f0866de6689e8f1a2cca0530c90301e2ec7d7a172e880f51be34251a3b18a
 AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f
-DIST hamcrest-1.1.tgz 1670123 BLAKE2B 2b1242a782949e084374918778c17f20b3b09746521949c12153cf1e599ab38a2a5a2bf0174d9676a8146cfab1e3f7c91a8a1b3ec829dd617f34f92c6852b931 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-generator-1.1.ebuild 1274 BLAKE2B 717dff6fd73252c1c6d347e3aca112a3f6bd998ba06062c793c251356d59a943b43f73cba2410d2e5f22a341ac4836e4cd8ead1014bb07578cd9b4d59f7b4a1d SHA512 377f209ef46d2754954e01dd969ac04226c464584ec8d92ea76d36cc2ce1462ef49af2b7159dd1da82b8a1481b08fdff5f3973aea1b4652964e4d2c0ecfe48d1
-EBUILD hamcrest-generator-1.3-r1.ebuild 1335 BLAKE2B fb8a85358fb10b39d4ff60cede789cc205f32abecff2d359b5e6de5b8b000e63a4150e70c7392b471c8b86e92df13189fa3ca9ea69f10ef557f5d66ce8afaeaa SHA512 c031ed09243682d55fce77f2ffa8226268e19afa30a8d15b1f8bff3cdbc24fc8bcb6f00d369d67c8e429e6d5634667e269760d9e41d427a7ddf4bc6eb7a6398f
+EBUILD hamcrest-generator-1.3-r2.ebuild 1335 BLAKE2B 4ca588b8727111656c541964dece54669b80f0b2109783b23088d59a77d2e047bb2224cff3f4df1c4c32832a2108b09f6169568407c55e5239f23e10e5ff0f65 SHA512 eff44e5a4f8caaebcf8f7f32a7c455f40b16faf375e4a144f6945aefca6b38b65dfb6f56f88f6e68ec00601f219ed1baae7f7c81b90d8e99942c05feda2d53e3
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-generator/files/1.1-build.xml.patch b/dev-java/hamcrest-generator/files/1.1-build.xml.patch
deleted file mode 100644
index c8f087ba8f12..000000000000
--- a/dev-java/hamcrest-generator/files/1.1-build.xml.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
-index f819d3d..18fba83 100644
---- a/hamcrest-1.1/build.xml
-+++ b/hamcrest-1.1/build.xml
-@@ -28,18 +28,6 @@
-                      classpath="

-                        lib/generator/qdox-1.6.1.jar;

-                      "/>

--        <taskdef name="jarjar"

--                 classname="com.tonicsystems.jarjar.JarJarTask"

--                 classpath="lib/generator/jarjar-1.0rc3.jar"/>

--        <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care

--             about it's existence. Uses JarJar to place classes under a different package

--             to prevent conflict. -->

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

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

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

--            <rule pattern="com.thoughtworks.qdox.**"

--                  result="org.hamcrest.generator.qdox.@1"/>

--        </jarjar>

-     </target>

- 

-     <target name="core"

-@@ -94,16 +82,16 @@
-                      classpath="build/hamcrest-core-${version}.jar"/>

-     </target>

- 

--    <target name="text"
--            depends="core, library"
--            description="Build text pattern matcher">
--        <java-to-jar srcdir="hamcrest-text/src/main/java"
--                     destjar="build/hamcrest-text-${version}.jar"
--                     classpath="
--                        build/hamcrest-core-${version}.jar;
--                        build/hamcrest-library-${version}.jar"/>
--    </target>
--	
-+    <target name="text"

-+            depends="core, library"

-+            description="Build text pattern matcher">

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

-+                     destjar="build/hamcrest-text-${version}.jar"

-+                     classpath="

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

-+                        build/hamcrest-library-${version}.jar"/>

-+    </target>

-+	

-     <target name="integration"

-             depends="core, library"

-             description="Build integration with external tools">

-@@ -121,7 +109,7 @@
-                      destjar="build/hamcrest-unit-test-${version}.jar"

-                      classpath="

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

--                        build/hamcrest-library-${version}.jar;
-+                        build/hamcrest-library-${version}.jar;

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

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

-                         build/hamcrest-generator-${version}.jar"/>

-@@ -164,7 +152,7 @@
-         <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">

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

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

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

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

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

-         </jar>

-@@ -221,7 +209,7 @@
- 

- 			<packageset dir="hamcrest-core/src/main/java"/>

- 			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>

--			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
-+			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>

- 			<packageset dir="hamcrest-integration/src/main/java"/>

- 			<packageset dir="build/generated-code"/>

- 			

-@@ -251,14 +239,10 @@
-                 </classpath>

-             </javac>

-             <copy file="LICENSE.txt" todir="build/temp/@{destjar}.contents"/>

--            <!-- Put Java source in Jars for user's convenience. -->

--            <copy todir="build/temp/@{destjar}.contents">

--                <fileset dir="@{srcdir}"/>

--            </copy>

-             <jar jarfile="@{destjar}">

-                 <fileset dir="build/temp/@{destjar}.contents"/>

-             </jar>

-         </sequential>

-     </macrodef>

- 

--</project>
-+</project>

diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
deleted file mode 100644
index 19e54674594e..000000000000
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="hamcrest"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Code generator for Hamcrest's 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="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-CDEPEND="dev-java/qdox:1.6"
-
-DEPEND=">=virtual/jdk-1.5
-	userland_GNU? ( sys-apps/findutils )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-EANT_BUILD_TARGET="generator"
-EANT_TEST_TARGET="unit-test"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/temp/${PN}-${PV}-nodeps.jar"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PV}-build.xml.patch
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files"
-
-	# These jars must be symlinked.  Specifying them using gentoo.classpath
-	# does not work.
-	java-pkg_jar-from --into lib/generator qdox-1.6 qdox.jar qdox-1.6.1.jar
-}
-
-src_install() {
-	java-pkg_newjar build/temp/${PN}-${PV}-nodeps.jar ${PN}.jar
-
-	dodoc README.txt CHANGES.txt
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild
index 14529ec5b9f8..ddc289d736b6 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,11 +21,11 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND=">=dev-java/qdox-1.12-r1:1.12"
 
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.8
 	userland_GNU? ( sys-apps/findutils )
 	${CDEPEND}"
 
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.8
 	${CDEPEND}"
 
 EANT_BUILD_TARGET="generator"