Adding metadata

9 files changed, 32 insertions, 7 deletions

diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
index 89617f7176fe..4450b56942d3 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j-12-api-2"
 
 inherit ant-tasks
 
-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"
 
 DEPEND="dev-java/log4j-12-api:2"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
index cc33ee96ffbd..bf48975a8034 100644
--- a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.mchange.com/projects/c3p0/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
 LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 CP_DEPEND="
 	dev-java/log4j-12-api:2
diff --git a/dev-java/cglib/cglib-3.3.0-r1.ebuild b/dev-java/cglib/cglib-3.3.0-r1.ebuild
index 286798bc0d47..64fd2b7900fc 100644
--- a/dev-java/cglib/cglib-3.3.0-r1.ebuild
+++ b/dev-java/cglib/cglib-3.3.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cglib/cglib/archive//${MY_PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CDEPEND="dev-java/ant-core:0
 	dev-java/asm:9
diff --git a/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild b/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
index 428acb0e79bf..878a708b6dbb 100644
--- a/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
+++ b/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 
 # junit-jupiter is not available in ::gentoo
 RESTRICT="test"
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
index 8e2886a930c9..0bb82041ec47 100644
--- a/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
+++ b/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/swaldman/${PN}-java/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="EPL-1.0 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 CP_DEPEND="
 	dev-java/log4j-api:2
diff --git a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
index 9536f39175b8..cbd072a2c5b3 100644
--- a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
 IUSE="test"
 
 # Same test failures as before the revbumps still occur. See https://bugs.gentoo.org/827221
diff --git a/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch b/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch
new file mode 100644
index 000000000000..f2742f658fa2
--- /dev/null
+++ b/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch
@@ -0,0 +1,18 @@
+--- a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
++++ b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
+@@ -69,7 +69,7 @@ public class BillionLaughsAttackTest {
+             map.toString();
+             fail("Expected overflow");
+         } catch (Throwable e) {
+-            assertTrue(e.getMessage().contains("heap"));
++            assertTrue("Catched exception " + e + " is not an instance of OutOfMemoryError", e instanceof OutOfMemoryError);
+         }
+     }
+ 
+@@ -94,4 +94,4 @@ public class BillionLaughsAttackTest {
+         assertNotNull(map);
+     }
+     
+-}
+\ No newline at end of file
++}
diff --git a/dev-java/snakeyaml/snakeyaml-1.30.ebuild b/dev-java/snakeyaml/snakeyaml-1.30.ebuild
index 97e755428cc8..6ae8d5e2d63e 100644
--- a/dev-java/snakeyaml/snakeyaml-1.30.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.30.ebuild
@@ -38,6 +38,8 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 "
 
+# https://bitbucket.org/snakeyaml/snakeyaml/pull-requests/7
+PATCHES=( "${FILESDIR}/snakeyaml-1.30-fix-test-check.patch" )
 DOCS=( README.md )
 
 S="${WORKDIR}/snakeyaml-snakeyaml-49227c24d741/"
@@ -48,6 +50,11 @@ JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,velocity"
 JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
 
+src_prepare() {
+	default
+	java-utils-2_src_prepare
+}
+
 src_test() {
 	export EnvironmentKey1="EnvironmentValue1"
 	export EnvironmentEmpty=""
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
index 3b9eb1d77ff8..e354c18fd748 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # Restriction to java 1.8
 # Otherwise jdk 11+ would fail to build javadoc: