Adding metadata

9 files changed, 6 insertions, 93 deletions

diff --git a/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild b/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
index cd540512f493..74b677bcf379 100644
--- a/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
+++ b/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://joel-costigliola.github.io/assertj/"
 SRC_URI="https://github.com/assertj/assertj-core/archive/assertj-core-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="2"
 
 CDEPEND="dev-java/cglib:3
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
deleted file mode 100644
index a0ee5600d166..000000000000
--- a/dev-java/log4j/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST log4j-1.2.17.tar.gz 2864448 BLAKE2B 233763dbe53f92b5408d3e278b291dff8a7d74657f367ec8b7c7ae1e685ddc0170783c8a5e4b48ec2590b6dda13f45e91bd66066f2c6b515e5d692caca31660b SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8
diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
deleted file mode 100644
index 394459a31e1f..000000000000
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="log4j:log4j:1.2.17"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A low-overhead robust logging package for Java"
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
-HOMEPAGE="https://logging.apache.org/log4j/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux"
-IUSE="javamail jms"
-
-CDEPEND="
-	javamail? ( dev-java/oracle-javamail:0 )
-	jms? ( java-virtuals/jms:0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-MY_P="apache-${P}"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="log4j.jar"
-EANT_EXTRA_ARGS="-Djaxp-present=true -Djmx-present=true"
-EANT_DOC_TARGET=""
-
-src_compile() {
-	if use javamail; then
-		EANT_GENTOO_CLASSPATH+="oracle-javamail"
-		EANT_EXTRA_ARGS+=" -Djavamail-present=true"
-	fi
-
-	if use jms; then
-		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
-	fi
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r site/*
-		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
-		java-pkg_dojavadoc --symlink apidocs site/apidocs
-	fi
-
-	if use source; then
-		java-pkg_dosrc src/main/java/*
-	fi
-}
diff --git a/dev-java/log4j/metadata.xml b/dev-java/log4j/metadata.xml
deleted file mode 100644
index 12c93b838d73..000000000000
--- a/dev-java/log4j/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <upstream>
-  <remote-id type="cpe">cpe:/a:apache:log4j</remote-id>
- </upstream>
- <use>
-  <flag name="javamail">Build the SMTPAppender</flag>
-  <flag name="jms">Build the JMSAppender</flag>
- </use>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild
index 1987ba566070..594aff5cf66f 100644
--- a/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/30"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r3.ebuild
index 5837d6881a8c..672297e4ce95 100644
--- a/dev-java/qdox/qdox-1.12.1-r3.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.12"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.ebuild
index 6c37fbec8a55..df0da8059045 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.ebuild
index 91985a0a6d6d..d52a57de49fd 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.ebuild
index 10c37a0aa97d..48250c32ab99 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"