Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/files/, dev-java/easymock/
Date: Tue, 30 Mar 2021 07:44:25
Message-Id: 1617090257.f1e4695753735b7cb931e992044510301e1855b8.fordfrog@gentoo
1 commit: f1e4695753735b7cb931e992044510301e1855b8
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Thu Mar 25 23:03:03 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 30 07:44:17 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1e46957
7
8 dev-java/easymock: EAPI 7
9
10 Patch out missing dependency on "com.google.dexmaker.stock"
11
12 Package-Manager: Portage-3.0.13, Repoman-3.0.2
13 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
14 Closes: https://github.com/gentoo/gentoo/pull/20141
15 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
16
17 dev-java/easymock/Manifest | 1 +
18 dev-java/easymock/easymock-3.3.1-r1.ebuild | 60 +++++++++++++++++++++++
19 dev-java/easymock/files/3.3.1-r1-no-android.patch | 15 ++++++
20 dev-java/easymock/metadata.xml | 3 ++
21 4 files changed, 79 insertions(+)
22
23 diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
24 index 281e30e7e42..7de27c3db75 100644
25 --- a/dev-java/easymock/Manifest
26 +++ b/dev-java/easymock/Manifest
27 @@ -1 +1,2 @@
28 +DIST easymock-3.3.1.tar.gz 624460 BLAKE2B bb5a472aef6c162d3afe5b66edef4891cc48fe6698c1f1eccc7f45f1883ff7f940b0479af5c0dd61b3354b41225ca50f191ba54b92479362a0074ddf3dbb5b43 SHA512 93fefd458a42b6c13d85ab1df768bf906620f052eea88116e93578374a5086eb8b27d8731e82b689dc3d73699e45d03b718c7d8bf2a430ac4a6a717365e52a9a
29 DIST easymock-3.3.1.zip 1015625 BLAKE2B 87e67c6092c3d2276438119a7604a7e5fceb6118f487313bdc706a56678aef56cae44bd9635ade1bb60f0809eddd48a0ddde175d012aa2ac208d3ee47f5ef646 SHA512 0898276df82a99df10e4c91b5b097b6d579914580995b35274ef9d4e0c874266d54c865f96d008becaa210a6307916f6488d0caa205a85caf62920e939becf46
30
31 diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
32 new file mode 100644
33 index 00000000000..d3b3861e422
34 --- /dev/null
35 +++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
36 @@ -0,0 +1,60 @@
37 +# Copyright 1999-2021 Gentoo Authors
38 +# Distributed under the terms of the GNU General Public License v2
39 +
40 +EAPI=7
41 +
42 +JAVA_PKG_IUSE="doc source test"
43 +MAVEN_ID="org.easymock:easymock:3.3.1"
44 +JAVA_TESTING_FRAMEWORKS="junit-4"
45 +
46 +inherit java-pkg-2 java-pkg-simple
47 +
48 +DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
49 +HOMEPAGE="https://easymock.org/"
50 +SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${P}.tar.gz"
51 +
52 +LICENSE="Apache-2.0"
53 +SLOT="3.2"
54 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
55 +
56 +CDEPEND="
57 + dev-java/cglib:3
58 + dev-java/junit:4
59 + dev-java/objenesis:0
60 +"
61 +
62 +DEPEND="
63 + >=virtual/jdk-1.8:*
64 + ${CDEPEND}
65 +"
66 +
67 +RDEPEND="
68 + >=virtual/jre-1.8:*
69 + ${CDEPEND}
70 +"
71 +
72 +S="${WORKDIR}/${PN}-${P}"
73 +
74 +JAVA_ENCODING="ISO-8859-1"
75 +
76 +JAVA_GENTOO_CLASSPATH="cglib-3,junit-4,objenesis"
77 +JAVA_SRC_DIR=(
78 + "${PN}/src/main/java"
79 + "${PN}/src/samples/java"
80 +)
81 +
82 +JAVA_TEST_GENTOO_CLASSPATH="junit-4"
83 +JAVA_TEST_SRC_DIR="${PN}/src/test/java"
84 +JAVA_TEST_EXCLUDES=(
85 + "org.easymock.tests2.EasyMockAnnotationsTest" # "java.lang.InstantiationException" (12 x)
86 + "org.easymock.tests.BaseEasyMockRunnerTest" # No runnable methods
87 +)
88 +
89 +src_prepare() {
90 + default
91 + # error: package com.google.dexmaker.stock does not exist
92 + eapply "${FILESDIR}"/3.3.1-r1-no-android.patch
93 + rm easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java || die
94 + # cannot find symbol o = ProxyBuilder.forClass(ArrayList.class)
95 + rm easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java || die
96 +}
97
98 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
99 new file mode 100644
100 index 00000000000..a68dc6f3ae4
101 --- /dev/null
102 +++ b/dev-java/easymock/files/3.3.1-r1-no-android.patch
103 @@ -0,0 +1,15 @@
104 +--- a/easymock/src/main/java/org/easymock/internal/MocksControl.java
105 ++++ b/easymock/src/main/java/org/easymock/internal/MocksControl.java
106 +@@ -137,12 +137,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
107 + return cached;
108 + }
109 +
110 +- // ///CLOVER:OFF
111 +- if (AndroidSupport.isAndroid()) {
112 +- return classProxyFactory = new AndroidClassProxyFactory();
113 +- }
114 +- // ///CLOVER:ON
115 +-
116 + try {
117 + return classProxyFactory = new ClassProxyFactory();
118 + } catch (final NoClassDefFoundError e) {
119
120 diff --git a/dev-java/easymock/metadata.xml b/dev-java/easymock/metadata.xml
121 index 144ebe41473..fd53b0590b5 100644
122 --- a/dev-java/easymock/metadata.xml
123 +++ b/dev-java/easymock/metadata.xml
124 @@ -7,5 +7,8 @@
125 </maintainer>
126 <upstream>
127 <remote-id type="sourceforge">easymock</remote-id>
128 + <remote-id type="github">easymock/easymock</remote-id>
129 + <doc>https://easymock.org/user-guide.html</doc>
130 + <bugs-to>https://github.com/easymock/easymock/issues</bugs-to>
131 </upstream>
132 </pkgmetadata>