gentoo auto-resync : 08:11:2024 - 03:03:27

2 files changed, 10 insertions, 22 deletions

diff --git a/dev-java/junitparams/Manifest b/dev-java/junitparams/Manifest
index ab91d31f7265..6949aa16b192 100644
--- a/dev-java/junitparams/Manifest
+++ b/dev-java/junitparams/Manifest
@@ -1,4 +1,4 @@
 AUX junitparams-1.1.1-test.patch 1894 BLAKE2B 8c2aacc726a9d5ac733971f20aa06ab21e1ac31cfa14cf23e11b0541777f22291417710f944fd3f6554791ea8deae022e42ea0af5177f6d97a542d55f510b8d4 SHA512 cae119b7c22b65e42a252d70bc92ad05cae568b2257d9640a498bc7cb15e3917f32c9fafd6b06ded8f739b4825c1662a8c4625114aab1252f4adf58cf52f1f34
 DIST junitparams-1.1.1.tar.gz 96180 BLAKE2B 0b12d61841d13c893d90f1a28e6b881930a66a9359b368b601a9ee9ced1fa82ff17c9142610e1ed122684e454b86a46d9d2cf451544a900b0a86399484df141c SHA512 77e25bff2f821e8be4f3747c58e550b728aace1dac4ac98f0cd8f99235d6a2b0129e61d7f90063d5f85dd3dd4b0e5d0614e3591633bdcf5dfa452c62a114acae
-EBUILD junitparams-1.1.1-r1.ebuild 1602 BLAKE2B e3487f6d0b988d163441f76369b1801b4bd46f194a0123521dd91d0c51fe8de93f57dc0ebf55b516eb6fdcdff59107934487a5baa5991e263171d757b7e0a652 SHA512 1419a3ef8fe772f4155bdfd6d37b97d15fb338df49d809950c0f119495e76a6814af9ec88336ee0c57d27223e91ef83a89590c86d17e6f7449e397eb561d7ee8
+EBUILD junitparams-1.1.1-r2.ebuild 1162 BLAKE2B 9bfae0d4af200729a7e060c0ff988ede462aa011e13fd7d7fd8bb1ed11c59200eeee06ca1e9ad747f2183531e6f6d7282f19a1b9a3593bb7f9ceb54b3c29e843 SHA512 86f1f54273e9d82e1d3f15d69d87e60889dde201af44140318a80939d74b5c37b278fb405435d7723a4403b913e7047be93508829e5764cc197fa0beb37bbd9d
 MISC metadata.xml 437 BLAKE2B 67db2ff59007450448d4de713df69f7999909a2070c093bd65f994d98fedcb92aa7b262d1da757e19c401fd8380acd234469a3b8abc9a70d412aaf1059699efa SHA512 02fcfa155548a74dbf633c5ac5fd69a3bf6303b202e16dd96948c58d22bd05cc2575cd8a82b51b961b20c4f0b65ba41cda63d5981ff652c1000c5d6912de5f31
diff --git a/dev-java/junitparams/junitparams-1.1.1-r1.ebuild b/dev-java/junitparams/junitparams-1.1.1-r2.ebuild
index 9b511a320bec..0b40cf5e590e 100644
--- a/dev-java/junitparams/junitparams-1.1.1-r1.ebuild
+++ b/dev-java/junitparams/junitparams-1.1.1-r2.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-1.1.1.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild junitparams-1.1.1.ebuild
-
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="pl.pragmatists:JUnitParams:1.1.1"
@@ -14,22 +11,15 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Better parameterised tests for JUnit"
 HOMEPAGE="https://github.com/Pragmatists/JUnitParams"
-SRC_URI="https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Pragmatists/JUnitParams/archive/JUnitParams-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/JUnitParams-JUnitParams-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
-# Common dependencies
-# POM: pom.xml
-# junit:junit:4.12 -> >=dev-java/junit-4.12:4
-
 CP_DEPEND="dev-java/junit:4"
 
-# Compile dependencies
-# POM: pom.xml
-# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
-
 DEPEND="
 	>=virtual/jdk-1.8:*
 	${CP_DEPEND}
@@ -40,19 +30,16 @@ DEPEND="
 
 RDEPEND="
 	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/junitparams-1.1.1-test.patch
-)
+	${CP_DEPEND}
+"
 
-S="${WORKDIR}/JUnitParams-JUnitParams-${PV}"
+PATCHES=( "${FILESDIR}"/junitparams-1.1.1-test.patch )
 
 JAVA_SRC_DIR="src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3"
-JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
 
 JAVA_TEST_EXCLUDES=(
 	# java.lang.RuntimeException: Could not find method: paramsForSuperclassMethod so no params were used.
@@ -60,5 +47,6 @@ JAVA_TEST_EXCLUDES=(
 )
 
 src_prepare() {
-	default
+	default #780585
+	java-pkg-2_src_prepare
 }