[gentoo-commits] repo/gentoo:master commit in: dev-java/jmock/

[Miroslav Šulc]

commit:     f8880555723ee71962cbabcd69144dc506ef1a65
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Nov  8 08:38:08 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 07:59:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8880555

dev-java/jmock: style update, update EAPI 7 -> 8

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: 
https://github.com/gentoo/gentoo/pull/39233/commits/62bcb33317aae7acc15ea9b874ba3de3875e319d
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 ...jmock-1.2.0-r2.ebuild => jmock-1.2.0-r3.ebuild} | 26 ++++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/dev-java/jmock/jmock-1.2.0-r2.ebuild 
b/dev-java/jmock/jmock-1.2.0-r3.ebuild
similarity index 78%
rename from dev-java/jmock/jmock-1.2.0-r2.ebuild
rename to dev-java/jmock/jmock-1.2.0-r3.ebuild
index 6ba5eb3a2018..7225c30b6999 100644
--- a/dev-java/jmock/jmock-1.2.0-r2.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -10,24 +10,26 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Library for testing Java code using mock objects"
 HOMEPAGE="http://jmock.org/";
 SRC_URI="http://jmock.org/downloads/${P}-jars.zip";
+S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="1.0"
 KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
-CDEPEND="dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.8:*
-       ${CDEPEND}"
+CP_DEPEND="dev-java/junit:0"
 
-DEPEND="app-arch/unzip
+DEPEND="
+       ${CP_DEPEND}
+       app-arch/unzip
        >=virtual/jdk-1.8:*
-       ${CDEPEND}"
+"
 
-S="${WORKDIR}/${P}"
+RDEPEND="
+       ${CP_DEPEND}
+       >=virtual/jre-1.8:*
+"
 
 JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="junit"
 
 PATCHES=(
        # This patch isn't changing the behaviour if jmock per se.
@@ -42,7 +44,7 @@ src_unpack() {
 }
 
 src_prepare() {
-       default
-       find -name "*.class" -delete || die
-       rm *.jar || die
+       default #780585
+       java-pkg-2_src_prepare
+       java-pkg_clean
 }