gentoo resync : 28.04.2021

5 files changed, 69 insertions, 67 deletions

diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index e8f477914085..5649fcf47000 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1,4 +1,4 @@
-AUX 3.3.1-no-android.patch 685 BLAKE2B 30500598f719669c893111aca6afb09a0823343a7813f89c80b12fc41729ab22f0825718f622fe4f6effbaaaf199f599504418cd876a0aae9f64230e86c67f95 SHA512 3ead2f05c122e3e8a3eb1d1748b59c15775fee79e28cf01dba193b8b21aae0039d9608300cbca6e9bdbe291ab15db9f56abe8c2503c6667495f61fccbf3d56ff
-DIST easymock-3.3.1.zip 1015625 BLAKE2B 87e67c6092c3d2276438119a7604a7e5fceb6118f487313bdc706a56678aef56cae44bd9635ade1bb60f0809eddd48a0ddde175d012aa2ac208d3ee47f5ef646 SHA512 0898276df82a99df10e4c91b5b097b6d579914580995b35274ef9d4e0c874266d54c865f96d008becaa210a6307916f6488d0caa205a85caf62920e939becf46
-EBUILD easymock-3.3.1.ebuild 1129 BLAKE2B 794b05c19e790c1fbe9c9e99dd03d2da42b241b3a519250f1173fc83a4fe851fea812dc680e4315e8ee06ae9ed41324dba9f285311fe746b8a6180ad15bb80e7 SHA512 e66d211b69a1a419393d8fdc6736af1cca25f3301796ba35522ed1e7659147ab21d2699ab3dd98657d68d092e70e492316b2eb13454e80e46753a95a525fa9a0
-MISC metadata.xml 314 BLAKE2B 9af04035962b6d333264caf33b4d16e3099709c9a2069f732333a3ec17812dbd88e9086539ec0de3b5009696b92ccebb52bbaf7bd8d543ba2a52bfe926cd7f50 SHA512 a9461432a42e98c60f9b88b92e9a2a170f7c7263178c884c67463f204dc315b689b6a02fc713c8313583536ef5554bcdbbac7eb32ba98b52ccded6ed1913581f
+AUX 3.3.1-r1-no-android.patch 590 BLAKE2B 1fd2493bc0208516421c31adead309adfaad4b30a137739a082588f38b8d85933258718aca277f8f863f468c2775ec1c4ce107948b7d10cc8a4fc8b07cb47383 SHA512 ba9fcb6c5922869511f421b9f1c005c7656840762fac0d9aecf87b5db615dd181bae24d9ce491191c2a7ee8a863ebf14aaf42f94e40d40d8f2192ad4296ece7f
+DIST easymock-3.3.1.tar.gz 624460 BLAKE2B bb5a472aef6c162d3afe5b66edef4891cc48fe6698c1f1eccc7f45f1883ff7f940b0479af5c0dd61b3354b41225ca50f191ba54b92479362a0074ddf3dbb5b43 SHA512 93fefd458a42b6c13d85ab1df768bf906620f052eea88116e93578374a5086eb8b27d8731e82b689dc3d73699e45d03b718c7d8bf2a430ac4a6a717365e52a9a
+EBUILD easymock-3.3.1-r1.ebuild 1478 BLAKE2B 917b09c220baf610511dddae5f5ed0deedcc788cafdf2184399eba177b2b7f825e306bdb9db9f4423b4f58b055a1de084120761900f9a78cd1d9431dc8248adf SHA512 a15f005149d48806f34e1452f43f116a00da270d0542552e911f685de99fab16a734504a044d3b23f15f8b0de631f4a2d8ff1409596055421670a34494aecf3f
+MISC metadata.xml 486 BLAKE2B 90b0a999f8cf928fb74f6b80f15137fcbb4d3bf881f080dee4b424281d95ce0a342f41bf041cfa9d3e72624ca85849bbca1bf2aeebe317a8768951c20d1ab0b2 SHA512 3fc28642c63761d234abf049fa6e33e6548a381e9b15e10a71d1263e1b80e93b4fa773831e0021751ce9736282f50480e93f07aa4f5fc6da5e19c7875f78b3c7
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 000000000000..3b4e321ccffe
--- /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/easymock-3.3.1.ebuild b/dev-java/easymock/easymock-3.3.1.ebuild
deleted file mode 100644
index 36438c1dfb09..000000000000
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-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="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="3.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-java/junit:4
-	dev-java/objenesis:0
-	dev-java/cglib:3
-"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${COMMON_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="junit-4,objenesis,cglib-3"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
-	default
-
-	cd "${S}" || die
-	unzip ${P}-sources.jar -d src/ || die
-
-	if use examples; then
-		unzip ${P}-samples.jar -d examples/ || die
-	fi
-}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PV}-no-android.patch
-	rm src/org/easymock/internal/AndroidClassProxyFactory.java || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	if use examples; then
-		java-pkg_doexamples examples
-	fi
-}
diff --git a/dev-java/easymock/files/3.3.1-no-android.patch b/dev-java/easymock/files/3.3.1-r1-no-android.patch
index 18c4a00dc45f..a68dc6f3ae45 100644
--- a/dev-java/easymock/files/3.3.1-no-android.patch
+++ b/dev-java/easymock/files/3.3.1-r1-no-android.patch
@@ -1,7 +1,5 @@
-diff --git a/src/org/easymock/internal/MocksControl.java b/src/org/easymock/internal/MocksControl.java
-index e709dc4..cd9d5a9 100644
---- a/src/org/easymock/internal/MocksControl.java
-+++ b/src/org/easymock/internal/MocksControl.java
+--- 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;
          }
diff --git a/dev-java/easymock/metadata.xml b/dev-java/easymock/metadata.xml
index 144ebe414735..fd53b0590b5e 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>