From 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 20 Mar 2021 14:27:17 +0000
Subject: gentoo resync : 20.03.2021

---
 dev-java/junit/Manifest            |  4 ++--
 dev-java/junit/junit-4.13.1.ebuild | 23 ++++++++++++++---------
 dev-java/junit/metadata.xml        |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'dev-java/junit')

diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index f06b996a8f19..4b0ca791c430 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -3,5 +3,5 @@ DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6
 DIST junit4-r4.13.1.tar.gz 1072560 BLAKE2B d7a8ecf804f83461c281a494c1ad85e6797af64fd1344ba41a919a2783c28fc7c36b6c85984aaff66d41a99fde0141532be2e9bb00f3f53ae467f6dbde937f4a SHA512 a4c284f756916077100181af1dd8c0febdc855e21ea600366e5fda3904919ec2c4a5e828961c322f080f177eb53485c9ad01bfc65c7489a741be63c96cd472bb
 EBUILD junit-3.8.2-r2.ebuild 842 BLAKE2B 01cc39cca58291852a2bd71b97283ce344656648c741792013e7daaf50cccad14551e4d0885d9fa4c3dfe52cfccd18c0943a55c0d479cd49b1d182eaa8252f75 SHA512 25a498140852340c429d965b8770a1844fdcff906164fcdf873e32cd303871b446d80d88fef2772c765254c7396fdd6a3688e9b253f04cf02c289c5a85e99ebe
 EBUILD junit-4.12-r1.ebuild 1477 BLAKE2B 92482da40156f07c657f3f9463f7e9763330ad496032b74199084f8fb4bd521e236332050c461a06270b3574086d5dd2b3413f55cbf9c6361c171e31aafccdbb SHA512 418decaf336841e80eb82a8905d99fb897155fc2bc1ec45f7be72324f03cc63e6f07b9e1ecd3b12e9d8149291970ab2f27b0c482a96e48d1bc7e8301e8190f35
-EBUILD junit-4.13.1.ebuild 1483 BLAKE2B f56b0f948417658ab16cf313b4aff3c6122331e8ae2229da5854b9b36203a4927ef0fdfee7a4a37b7c393a8700868b8fae09d7722cee5cf264a411e890413614 SHA512 63916ea343e2e3472b861826de9aff49ed621d10bc59e2d8c6e1fba15877e255234448a07951a27d26cf9d1454e9bf4b5d93b41da960733000e4de7b6cd9b0c7
-MISC metadata.xml 367 BLAKE2B 7cd798ae028c83275e61522be10a35abba419a823042be242ee7fdf7e0ccfc978e817affaaf154b8d0723f502499f17bb81b0622fa493dc812b82ad23dfa647b SHA512 44e492dfaaa9faf54f4aaf420d5816da8d117951d6a52e37c76a9e533fcefbeaa3c44bafa4d525f878deb3af2b7f426e72a62b16464e85ce9690c61b1f0da71f
+EBUILD junit-4.13.1.ebuild 1561 BLAKE2B dae7806e52c1224bb555f9d3979382d453a51e11add5c2c212e49091b4189b157766e76de49d99184417aad1993e1615caa9800e175348424078e667611b698e SHA512 01cc082bebd6fab811ce838e3cb2f6c28f78da8f74eb6af6f67c41df6d7b27f6f5bfa213ed047ec8b895fe5048c5768fdd0d07e4c4db48f7f221fba32c642460
+MISC metadata.xml 368 BLAKE2B 8461f82cd98863df6643a7727fdef984d30f6cd8f9cf7cb37453fbae186896b2845bda742864eadaab1fc932604a48957b0c7f7b80ecfa8ca107276287abc602 SHA512 f9bf527c63c7c4cfb4c0967918b23e6c2abe6c9239d2a873bf2ccefe31be8224c38d4062c71b6ee2692f5b36a27c348e3fc24d48279bc392a9efae2a8d17e077
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
index 60c035757c38..d1c31fdaf6f0 100644
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ b/dev-java/junit/junit-4.13.1.ebuild
@@ -11,26 +11,31 @@ MAVEN_ID="junit:junit:4.13.1"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Simple framework to write repeatable tests"
+HOMEPAGE="https://junit.org/junit5/"
 SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
-HOMEPAGE="http://junit.org/"
+
 LICENSE="EPL-1.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
-CDEPEND="dev-java/hamcrest-core:1.3"
-
-RDEPEND=">=virtual/jre-1.8
+CDEPEND="
+	dev-java/hamcrest-core:1.3
+	dev-java/hamcrest-library:1.3
+	"
+RDEPEND="
+	>=virtual/jre-1.8:*
 	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.8
+DEPEND="
+	>=virtual/jdk-1.8:*
 	${CDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
 
-java_prepare() {
+src_prepare() {
+	default
 	rm -v lib/*.jar || die
 }
 
diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml
index 9c59435e026b..618f5e0e4b6d 100644
--- a/dev-java/junit/metadata.xml
+++ b/dev-java/junit/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">junit-team/junit</remote-id>
+		<remote-id type="github">junit-team/junit4</remote-id>
 		<remote-id type="sourceforge">junit</remote-id>
 	</upstream>
 </pkgmetadata>
-- 
cgit v1.2.3