[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/files/, dev-java/easymock/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     f1e4695753735b7cb931e992044510301e1855b8
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Mar 25 23:03:03 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 07:44:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1e46957

dev-java/easymock: EAPI 7

Patch out missing dependency on "com.google.dexmaker.stock"

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20141
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/easymock/Manifest                        |  1 +
 dev-java/easymock/easymock-3.3.1-r1.ebuild        | 60 +++++++++++++++++++++++
 dev-java/easymock/files/3.3.1-r1-no-android.patch | 15 ++++++
 dev-java/easymock/metadata.xml                    |  3 ++
 4 files changed, 79 insertions(+)

diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index 281e30e7e42..7de27c3db75 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1 +1,2 @@
+DIST easymock-3.3.1.tar.gz 624460 BLAKE2B bb5a472aef6c162d3afe5b66edef4891cc48fe6698c1f1eccc7f45f1883ff7f940b0479af5c0dd61b3354b41225ca50f191ba54b92479362a0074ddf3dbb5b43 SHA512 93fefd458a42b6c13d85ab1df768bf906620f052eea88116e93578374a5086eb8b27d8731e82b689dc3d73699e45d03b718c7d8bf2a430ac4a6a717365e52a9a
 DIST easymock-3.3.1.zip 1015625 BLAKE2B 87e67c6092c3d2276438119a7604a7e5fceb6118f487313bdc706a56678aef56cae44bd9635ade1bb60f0809eddd48a0ddde175d012aa2ac208d3ee47f5ef646 SHA512 0898276df82a99df10e4c91b5b097b6d579914580995b35274ef9d4e0c874266d54c865f96d008becaa210a6307916f6488d0caa205a85caf62920e939becf46

diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
new file mode 100644
index 00000000000..d3b3861e422
--- /dev/null
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.easymock:easymock:3.3.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
+HOMEPAGE="https://easymock.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/cglib:3
+	dev-java/junit:4
+	dev-java/objenesis:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+JAVA_GENTOO_CLASSPATH="cglib-3,junit-4,objenesis"
+JAVA_SRC_DIR=(
+	"${PN}/src/main/java"
+	"${PN}/src/samples/java"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+JAVA_TEST_EXCLUDES=(
+	"org.easymock.tests2.EasyMockAnnotationsTest" # "java.lang.InstantiationException" (12 x)
+	"org.easymock.tests.BaseEasyMockRunnerTest" # No runnable methods
+)
+
+src_prepare() {
+	default
+	# error: package com.google.dexmaker.stock does not exist
+	eapply "${FILESDIR}"/3.3.1-r1-no-android.patch
+	rm easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java || die
+	# cannot find symbol   o = ProxyBuilder.forClass(ArrayList.class)
+	rm easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java || die
+}

diff --git a/dev-java/easymock/files/3.3.1-r1-no-android.patch b/dev-java/easymock/files/3.3.1-r1-no-android.patch
new file mode 100644
index 00000000000..a68dc6f3ae4
--- /dev/null
+++ b/dev-java/easymock/files/3.3.1-r1-no-android.patch
@@ -0,0 +1,15 @@
+--- a/easymock/src/main/java/org/easymock/internal/MocksControl.java
++++ b/easymock/src/main/java/org/easymock/internal/MocksControl.java
+@@ -137,12 +137,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
+             return cached;
+         }
+ 
+-        // ///CLOVER:OFF
+-        if (AndroidSupport.isAndroid()) {
+-            return classProxyFactory = new AndroidClassProxyFactory();
+-        }
+-        // ///CLOVER:ON
+-
+         try {
+             return classProxyFactory = new ClassProxyFactory();
+         } catch (final NoClassDefFoundError e) {

diff --git a/dev-java/easymock/metadata.xml b/dev-java/easymock/metadata.xml
index 144ebe41473..fd53b0590b5 100644
--- a/dev-java/easymock/metadata.xml
+++ b/dev-java/easymock/metadata.xml
@@ -7,5 +7,8 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">easymock</remote-id>
+		<remote-id type="github">easymock/easymock</remote-id>
+		<doc>https://easymock.org/user-guide.html</doc>
+		<bugs-to>https://github.com/easymock/easymock/issues</bugs-to>
 	</upstream>
 </pkgmetadata>