[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: 0a340045108c02c4e8f683ac0a301e1b4d83fbcf
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 3 06:04:45 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 3 06:04:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a340045
dev-java/easymock: Stabilize 2.5.2 x86, #879293
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/easymock/easymock-2.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/easymock/easymock-2.5.2.ebuild
b/dev-java/easymock/easymock-2.5.2.ebuild
index cbc09bfd69ea..30cfb883f7a9 100644
--- a/dev-java/easymock/easymock-2.5.2.ebuild
+++ b/dev-java/easymock/easymock-2.5.2.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz;
LICENSE="Apache-2.0"
SLOT="2.5"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: bb14b8d376e293de0c788446ff440c2c6d25f5ac
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 2 06:26:20 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 2 06:26:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb14b8d3
dev-java/easymock: Stabilize 2.5.2 amd64, #879293
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/easymock/easymock-2.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/easymock/easymock-2.5.2.ebuild
b/dev-java/easymock/easymock-2.5.2.ebuild
index db85a81b0e5a..cbc09bfd69ea 100644
--- a/dev-java/easymock/easymock-2.5.2.ebuild
+++ b/dev-java/easymock/easymock-2.5.2.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz;
LICENSE="Apache-2.0"
SLOT="2.5"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: 372a9a96b9949ffe2f208c2326bbf03e7e7158ee
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Nov 3 17:56:41 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Nov 3 17:56:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=372a9a96
dev-java/easymock: Stabilize 2.5.2 arm64, #879293
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/easymock/easymock-2.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/easymock/easymock-2.5.2.ebuild
b/dev-java/easymock/easymock-2.5.2.ebuild
index 87683e7f6f42..db85a81b0e5a 100644
--- a/dev-java/easymock/easymock-2.5.2.ebuild
+++ b/dev-java/easymock/easymock-2.5.2.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz;
LICENSE="Apache-2.0"
SLOT="2.5"
-KEYWORDS="~amd64 ~arm ppc64"
+KEYWORDS="~amd64 ~arm arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: b75e658340ee61f44c318aeddaf1cec9154f98ff
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Nov 3 17:23:48 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Nov 3 17:24:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b75e6583
dev-java/easymock: Stabilize 2.5.2 ppc64, #879293
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/easymock/easymock-2.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/easymock/easymock-2.5.2.ebuild
b/dev-java/easymock/easymock-2.5.2.ebuild
index b1a4c88ddd5d..87683e7f6f42 100644
--- a/dev-java/easymock/easymock-2.5.2.ebuild
+++ b/dev-java/easymock/easymock-2.5.2.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz;
LICENSE="Apache-2.0"
SLOT="2.5"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: 14efd4c107a56b830520afa79c99b0d6d817f918
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Oct 5 18:55:50 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Oct 5 18:55:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14efd4c1
dev-java/easymock: Keyword 2.5.2 arm, #874879
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/easymock/easymock-2.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/easymock/easymock-2.5.2.ebuild
b/dev-java/easymock/easymock-2.5.2.ebuild
index 44d36338c51a..b1a4c88ddd5d 100644
--- a/dev-java/easymock/easymock-2.5.2.ebuild
+++ b/dev-java/easymock/easymock-2.5.2.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz;
LICENSE="Apache-2.0"
SLOT="2.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: 0886e996eb109db054a755ada62cf46392916b4b Author: Florian Schmaus gentoo org> AuthorDate: Tue Oct 4 09:35:17 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Tue Oct 4 09:40:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0886e996 dev-java/easymock: update EAPI 7 -> 8 Signed-off-by: Florian Schmaus gentoo.org> dev-java/easymock/easymock-3.3.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild index 8a7db3b2235f..0193c3bb5f12 100644 --- a/dev-java/easymock/easymock-3.3.1-r1.ebuild +++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source test" MAVEN_ID="org.easymock:easymock:3.3.1"
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/, dev-java/easymock/files/
commit: 15697e114bf8ba229627f43891d67d065778fc3b
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Sep 11 11:20:40 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Oct 4 09:38:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15697e11
dev-java/easymock: add 2.5.2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/easymock/Manifest | 1 +
dev-java/easymock/easymock-2.5.2.ebuild| 57 +++
.../easymock/files/easymock-2.5.5-nameClash.patch | 230 +++
.../files/easymock-2.5.5-tests2nameClash.patch | 420 +
4 files changed, 708 insertions(+)
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index d534942235a7..36d55f52bdad 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1 +1,2 @@
+DIST easymock-2.5.2.tar.gz 100112 BLAKE2B
2952aad1a88b169413152e8fa63eaba85767d93ccd8535e309cb647b90ad86695da59c394d1199abfb6f1c624913b2546f326ae5a68092261968d734d2018c5c
SHA512
0343815f74258739ac60e1ef2fe72a0e9ce0e1b6ecd4f14d657d7da2a10523e24df5160533b0d75e87ffa0322a3477ec6823b257fe5968929d55dee9dfa68267
DIST easymock-3.3.1.tar.gz 624460 BLAKE2B
bb5a472aef6c162d3afe5b66edef4891cc48fe6698c1f1eccc7f45f1883ff7f940b0479af5c0dd61b3354b41225ca50f191ba54b92479362a0074ddf3dbb5b43
SHA512
93fefd458a42b6c13d85ab1df768bf906620f052eea88116e93578374a5086eb8b27d8731e82b689dc3d73699e45d03b718c7d8bf2a430ac4a6a717365e52a9a
diff --git a/dev-java/easymock/easymock-2.5.2.ebuild
b/dev-java/easymock/easymock-2.5.2.ebuild
new file mode 100644
index ..44d36338c51a
--- /dev/null
+++ b/dev-java/easymock/easymock-2.5.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 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/easymock/easymock/archive/easymock-2.5.2.tar.gz --slot 2.5
--keywords "~amd64" --ebuild easymock-2.5.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.easymock:easymock:2.5.2"
+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/easymock/easymock/archive/${P}.tar.gz;
+
+LICENSE="Apache-2.0"
+SLOT="2.5"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}/easymock-2.5.5-nameClash.patch"
+ "${FILESDIR}/easymock-2.5.5-tests2nameClash.patch"
+)
+
+S="${WORKDIR}/easymock-easymock-${PV}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+ default # https://bugs.gentoo.org/780585
+ # 1) testGetInstance(org.easymock.tests2.EasyMockPropertiesTest)
+ # java.lang.AssertionError: expected:<1> but was:
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/testGetInstance()/i @Ignore' \
+ -i
src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java || die
+
+ # 2) testPrimitiveDeprecated(org.easymock.tests2.CaptureTest)
+ # java.lang.AssertionError:
+ # 3) testPrimitiveVsObject(org.easymock.tests2.CaptureTest)
+ # java.lang.AssertionError:
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/testPrimitiveDeprecated()/i @Ignore' \
+ -e '/testPrimitiveVsObject()/i @Ignore' \
+ -i src/test/java/org/easymock/tests2/CaptureTest.java || die
+}
diff --git a/dev-java/easymock/files/easymock-2.5.5-nameClash.patch
b/dev-java/easymock/files/easymock-2.5.5-nameClash.patch
new file mode 100644
index ..7a4f0d92ab64
--- /dev/null
+++ b/dev-java/easymock/files/easymock-2.5.5-nameClash.patch
@@ -0,0 +1,230 @@
+--- a/src/main/java/org/easymock/EasyMock.java Thu Feb 23 10:32:43 2012 +0100
b/src/main/java/org/easymock/EasyMock.java Thu Feb 23 11:25:46 2012 +0100
+@@ -1452,81 +1452,200 @@
+
+ /**
+ * Expect any object but captures it for later use.
+- *
+- * @param Type of the captured object
+- * @param captured Where the parameter is captured
++ *
++ * @param
++ *Type of the captured object
++ * @param captured
++ *Where the parameter is captured
+ * @return null
+ */
+-public static T capture(Capture captured) {
++public static T capture(final Capture captured) {
+ reportMatcher(new Captures(captured));
+ return null;
+ }
+-
++
++/**
++ * Expect any boolean but captures it for later use.
++ *
++ * @param captured
++ *Where the parameter
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: 53e15a41acd0c5076a04e904d8eaed7b173b2cae
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun May 29 12:04:01 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Jun 3 08:56:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e15a41
dev-java/easymock: fix tests with jdk-17
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25674
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/easymock/easymock-3.3.1-r1.ebuild | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild
b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index 26eb0db0b3c8..8a7db3b2235f 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -58,3 +58,14 @@ src_prepare() {
# cannot find symbol o = ProxyBuilder.forClass(ArrayList.class)
rm
easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java || die
}
+
+src_test() {
+ #
ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain)
throws
+ # java.lang.ClassFormatError accessible: module java.base does not
"opens java.lang" to unnamed module @66da75e4
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 17; then
+ JAVA_TEST_EXTRA_ARGS+=(
--add-opens=java.base/java.lang=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=(
--add-opens=java.base/java.io=ALL-UNNAMED )
+ fi
+ java-pkg-simple_src_test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: 1fb713cad5f2b4c61df2c73a00ced72728faab94
Author: Sam James gentoo org>
AuthorDate: Sun May 16 18:57:39 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun May 16 18:57:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb713ca
dev-java/easymock: Stabilize 3.3.1-r1 arm64, #784407
Signed-off-by: Sam James gentoo.org>
dev-java/easymock/easymock-3.3.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild
b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index 3b4e321ccff..bef9d66247a 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -15,7 +15,7 @@
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"
+KEYWORDS="amd64 arm64 ppc64 x86"
CDEPEND="
dev-java/cglib:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/files/, dev-java/easymock/
commit: 1478373437e0c65ae6a291ca29d03379e5ee0c67
Author: Miroslav Šulc gentoo org>
AuthorDate: Thu Apr 22 12:21:43 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Apr 22 12:21:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14783734
dev-java/easymock: removed obsolete 3.3.1
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/easymock/Manifest | 1 -
dev-java/easymock/easymock-3.3.1.ebuild| 59 --
dev-java/easymock/files/3.3.1-no-android.patch | 17
3 files changed, 77 deletions(-)
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index 7de27c3db75..d534942235a 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1,2 +1 @@
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.ebuild
b/dev-java/easymock/easymock-3.3.1.ebuild
deleted file mode 100644
index 36438c1dfb0..000
--- 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-no-android.patch
deleted file mode 100644
index 18c4a00dc45..000
--- a/dev-java/easymock/files/3.3.1-no-android.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-@@ -137,12 +137,6 @@ public class MocksControl implements IMocksControl,
IExpectationSetters,
- return cached;
- }
-
--// ///CLOVER:OFF
--if (AndroidSupport.isAndroid()) {
--return classProxyFactory = new AndroidClassProxyFactory();
--}
--// ///CLOVER:ON
--
- try {
- return classProxyFactory = new ClassProxyFactory();
- } catch (final NoClassDefFoundError e) {
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: b7ff23d1ab0a61b3b360cda554744d3c6f7de244
Author: Sergei Trofimovich gentoo org>
AuthorDate: Tue Apr 20 06:37:55 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Apr 20 06:39:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7ff23d1
dev-java/easymock: stable 3.3.1-r1 for ppc64
stable wrt bug #783426
Package-Manager: Portage-3.0.18, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-java/easymock/easymock-3.3.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild
b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index d049b78d70b..3b4e321ccff 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -15,7 +15,7 @@
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"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
CDEPEND="
dev-java/cglib:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: fd704eae4e7b9a1eb50df5c1befd292748ad70ea
Author: Sam James gentoo org>
AuthorDate: Sun Apr 18 21:23:17 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 18 21:26:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd704eae
dev-java/easymock: Stabilize 3.3.1-r1 x86, #783426
Signed-off-by: Sam James gentoo.org>
dev-java/easymock/easymock-3.3.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild
b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index bb124249b8c..d049b78d70b 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -15,7 +15,7 @@
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"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
CDEPEND="
dev-java/cglib:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: bdd36608e1e51765bad43ebe5de437b463b8c367
Author: Sam James gentoo org>
AuthorDate: Sun Apr 18 07:16:09 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 18 07:16:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd36608
dev-java/easymock: Stabilize 3.3.1-r1 amd64, #783426
Signed-off-by: Sam James gentoo.org>
dev-java/easymock/easymock-3.3.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild
b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index d3b3861e422..bb124249b8c 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -15,7 +15,7 @@
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"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
CDEPEND="
dev-java/cglib:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/files/, dev-java/easymock/
commit: f1e4695753735b7cb931e992044510301e1855b8
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Mar 25 23:03:03 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Mar 30 07:44:17 2021 +
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 pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20141
Signed-off-by: Miroslav Šulc 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 000..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 000..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,
+ 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 @@
easymock
+ easymock/easymock
+ https://easymock.org/user-guide.html
+ https://github.com/easymock/easymock/issues
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: 7f3ef460de63b65a16114f14f8984f6b7baea8a5
Author: Volkmar W. Pogatzki <62425054+vaukai users noreply
github com>
AuthorDate: Thu Apr 9 17:27:21 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Fri Jun 19 22:33:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3ef460
dev-java/easymock: HOMEPAGE use https
Closes: https://github.com/gentoo/gentoo/pull/15279
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Conrad Kostecki gentoo.org>
dev-java/easymock/easymock-3.3.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/easymock/easymock-3.3.1.ebuild
b/dev-java/easymock/easymock-3.3.1.ebuild
index ccb754db050..36438c1dfb0 100644
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -8,7 +8,7 @@ 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="http://www.easymock.org/;
+HOMEPAGE="https://easymock.org/;
SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
LICENSE="|| ( MIT Apache-2.0 )"
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: 3cf3081efad7e2048afd9623e16721b3b5a7ad0e
Author: Alexis Ballier gentoo org>
AuthorDate: Thu Jul 13 18:27:41 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Thu Jul 13 18:32:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cf3081e
dev-java/easymock: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-java/easymock/easymock-3.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/easymock/easymock-3.3.1.ebuild
b/dev-java/easymock/easymock-3.3.1.ebuild
index 27e4b6061e1..ccb754db050 100644
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="3.2"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
IUSE=""
COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: 97ed799ef735d80af27cb9b536744e1454f6d1df
Author: Patrice Clement gentoo org>
AuthorDate: Sat Sep 5 09:41:56 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Sep 5 09:43:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ed799e
dev-java/easymock: Stable for amd64+x86+ppc+ppc64.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
dev-java/easymock/easymock-3.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/easymock/easymock-3.3.1.ebuild
b/dev-java/easymock/easymock-3.3.1.ebuild
index 446f885..aae38ba 100644
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="3.2"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+KEYWORDS="amd64 x86 ppc ppc64"
IUSE=""
COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: 8cb5fa20a85cb8f3d6bbeefb43ac4880224a651e
Author: Patrice Clement gentoo org>
AuthorDate: Sat Sep 5 15:41:40 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Sep 5 15:42:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb5fa20
dev-java/easymock: Clean up old.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
dev-java/easymock/Manifest | 1 -
dev-java/easymock/easymock-3.2-r1.ebuild | 56
2 files changed, 57 deletions(-)
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index ad46f06..469b59a 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1,2 +1 @@
-DIST easymock-3.2.zip 970922 SHA256
3ada340522b94d549a887774d42aaea008fb0aabc6f7e649ad6d23399bc7b80c SHA512
472b0f7183f48dcbd60996a78a69f3be0c9c5762856bf827d9a721b3ff03fca2fb68d3baae970a1de3eee0f293d02b3d9dba3c5634575ba395200e67f767ba3b
WHIRLPOOL
5bf9dc61bf4716b88d72cbf80553b2629f7e55ffcd00821e74d8fcdb58160d1a494008d75f39a17ef2319c0bb913ae666f7c7e7d45394f6ad69d032d9e125442
DIST easymock-3.3.1.zip 1015625 SHA256
06332d947698e615e00baa5441e54f03423912079d81733dc089e57cae138a36 SHA512
0898276df82a99df10e4c91b5b097b6d579914580995b35274ef9d4e0c874266d54c865f96d008becaa210a6307916f6488d0caa205a85caf62920e939becf46
WHIRLPOOL
61e68261374caa1c7a879c28c329e8f3f6a5f067b57bb3c3eb79405b978544e0f3924b5cbe63cdee35964284d3ea602bb039d68461c73869783cf5e555a2d245
diff --git a/dev-java/easymock/easymock-3.2-r1.ebuild
b/dev-java/easymock/easymock-3.2-r1.ebuild
deleted file mode 100644
index cbefa0d..000
--- a/dev-java/easymock/easymock-3.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Provides Mock Objects for interfaces in JUnit tests by generating
them on the fly"
-HOMEPAGE="http://www.easymock.org/;
-SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="3.2"
-KEYWORDS="amd64 x86 ~ppc ~ppc64"
-IUSE=""
-
-CDEPEND="dev-java/junit:4
- dev-java/objenesis:0
- dev-java/cglib:3"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-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
-
- use examples && java-pkg_doexamples examples
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: 09c67e49adc22ec8cd4ec79e91eb38fb12a02ffa
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 14:04:59 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 14:30:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c67e49
dev-java/easymock: Keyword for ppc+ppc64. Fixes bug 538380.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
dev-java/easymock/easymock-3.2-r1.ebuild | 2 +-
dev-java/easymock/easymock-3.3.1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/easymock/easymock-3.2-r1.ebuild
b/dev-java/easymock/easymock-3.2-r1.ebuild
index 4f1e6c5..cbefa0d 100644
--- a/dev-java/easymock/easymock-3.2-r1.ebuild
+++ b/dev-java/easymock/easymock-3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="3.2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~ppc ~ppc64"
IUSE=""
CDEPEND="dev-java/junit:4
diff --git a/dev-java/easymock/easymock-3.3.1.ebuild
b/dev-java/easymock/easymock-3.3.1.ebuild
index 9625ed7..446f885 100644
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="3.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
IUSE=""
COMMON_DEPEND="
