commit: 1478373437e0c65ae6a291ca29d03379e5ee0c67 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Thu Apr 22 12:21:43 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu Apr 22 12:21:43 2021 +0000 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 <fordfrog <AT> 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..00000000000 --- 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..00000000000 --- 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<Object>, - return cached; - } - -- // ///CLOVER:OFF -- if (AndroidSupport.isAndroid()) { -- return classProxyFactory = new AndroidClassProxyFactory(); -- } -- // ///CLOVER:ON -- - try { - return classProxyFactory = new ClassProxyFactory(); - } catch (final NoClassDefFoundError e) {
