Adding metadata

9 files changed, 6 insertions, 83 deletions

diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index 99b8239fa929..667be7a046ba 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-net/commons-net-3.8.0.ebuild b/dev-java/commons-net/commons-net-3.8.0.ebuild
index 9e07e5083b23..7112d534cf16 100644
--- a/dev-java/commons-net/commons-net-3.8.0.ebuild
+++ b/dev-java/commons-net/commons-net-3.8.0.ebuild
@@ -18,4 +18,4 @@ RDEPEND=">=virtual/jre-1.8:*"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index 7de27c3db757..d534942235a7 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 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-no-android.patch
deleted file mode 100644
index 18c4a00dc45f..000000000000
--- 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) {
diff --git a/dev-java/jansi-native/jansi-native-1.8.ebuild b/dev-java/jansi-native/jansi-native-1.8.ebuild
index 9ab5f0cf0043..daf7ed72b36a 100644
--- a/dev-java/jansi-native/jansi-native-1.8.ebuild
+++ b/dev-java/jansi-native/jansi-native-1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 ~x86"
 
 CDEPEND="dev-java/hawtjni-runtime:0"
 
diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
index 86f30856f533..22b1e23539f2 100644
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD-2"
 SLOT="1.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="dom4j jdom xom"
 
 # It seems that most tests depend on dom4j, jdom and xom which all depend back on jaxen
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
index 89c91adcfed6..6ebc16ddfbdf 100644
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.jdom.org"
 
 LICENSE="Apache-1.1"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/xom/xom-1.3.7.ebuild b/dev-java/xom/xom-1.3.7.ebuild
index 58e85eac158a..9d67476c6a6d 100644
--- a/dev-java/xom/xom-1.3.7.ebuild
+++ b/dev-java/xom/xom-1.3.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/elharo/${PN}/releases/download/v${PV}/${P}-src.tar.g
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 CDEPEND="
 	dev-java/jaxen:1.2