Adding metadata

7 files changed, 58 insertions, 152 deletions

diff --git a/dev-java/jsr305/jsr305-3.0.2.ebuild b/dev-java/jsr305/jsr305-3.0.2.ebuild
index c9b9cc291ba3..d5ebba4056ad 100644
--- a/dev-java/jsr305/jsr305-3.0.2.ebuild
+++ b/dev-java/jsr305/jsr305-3.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/netty-tcnative/Manifest b/dev-java/netty-tcnative/Manifest
deleted file mode 100644
index 667a99fb65c8..000000000000
--- a/dev-java/netty-tcnative/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST netty-tcnative-1.1.33.Fork15.tar.gz 186153 BLAKE2B 3d769a04e659c09aa32059fc2a2eede84f6105469de33ef7d26df436de6a1f6290a6640268934f63f77a969eb6aa024651380cca6dc69099c4016ed61f7d5310 SHA512 592c70a926473a4903b704be920aac1a4fd5a032a8d821a77800b6922b374cb28decf496a65ef62867c027dbac93f0e563e9bb4ecf6659bc70cc33663bb979f5
-DIST netty-tcnative-parent-2.0.31.Final.tar.gz 175283 BLAKE2B 421b8228fb30da7f2983771e3c20e2442ae0c3ef8d12a139a7c01cb43056e916c889294622dbde04443382965750db0195dc667deb34ffcce998ef6381b54eb3 SHA512 0b11d6ec82636e8db09142d345df4b50dbbb7b7a2543f8e4e4d8793205fb22f2f631f454f70b78e93d24a9aeebe55098635c0e9d7a0daf1786b63fe3580aa236
diff --git a/dev-java/netty-tcnative/metadata.xml b/dev-java/netty-tcnative/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/netty-tcnative/metadata.xml
+++ /dev/null
@@ -1,10 +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>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild b/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
deleted file mode 100644
index 5facd9153492..000000000000
--- a/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit autotools versionator java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-$(replace_version_separator 3 .Fork)"
-
-DESCRIPTION="Fork of Tomcat Native that incorporates various patches"
-HOMEPAGE="https://netty.io/wiki/forked-tomcat-native.html"
-SRC_URI="https://github.com/netty/netty-tcnative/archive/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-libs/apr:1=
-	dev-libs/openssl:0="
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/maven-hawtjni-plugin:0"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-JAVA_SRC_DIR="${S}/openssl-dynamic/src/main/java"
-NATIVE_DIR="${S}/openssl-dynamic/src/main/native-package"
-
-java_prepare() {
-	cd "${NATIVE_DIR}" || die
-	ln -sn ../c src || die
-	ln -sn . project-template || die
-
-	# Provides missing m4 files and Makefile.am template.
-	unzip -n $(java-pkg_getjars --build-only maven-hawtjni-plugin) project-template/\* || die
-
-	sed -i \
-		-e "s:@PROJECT_NAME@:${PN}:g" \
-		-e "s:@PROJECT_NAME_UNDER_SCORE@:${PN//-/_}:g" \
-		-e "s:@PROJECT_SOURCES@:$(echo src/*.c):g" \
-		Makefile.am || die
-
-	# Avoid dummy version and tedious symlink.
-	sed -i "s/-release @VERSION@/-avoid-version/g" configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	cd "${NATIVE_DIR}" || die
-	econf --with-apr=/usr/bin/apr-1-config --with-ssl=/usr
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	emake -C "${NATIVE_DIR}"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso "${NATIVE_DIR}"/.libs/lib${PN}.so
-	dodoc README.md
-}
diff --git a/dev-java/netty-tcnative/netty-tcnative-2.0.31.ebuild b/dev-java/netty-tcnative/netty-tcnative-2.0.31.ebuild
deleted file mode 100644
index da142b72aac4..000000000000
--- a/dev-java/netty-tcnative/netty-tcnative-2.0.31.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit autotools java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-parent-${PV}.Final"
-MAVEN_ID="io.netty:netty-tcnative:2.0.31"
-
-DESCRIPTION="Fork of Tomcat Native that incorporates various patches"
-HOMEPAGE="https://netty.io/wiki/forked-tomcat-native.html"
-SRC_URI="https://github.com/netty/netty-tcnative/archive/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-libs/apr:1=
-	dev-libs/openssl:0="
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8
-	app-arch/unzip
-	dev-java/maven-hawtjni-plugin:0"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-JAVA_SRC_DIR="${S}/openssl-dynamic/src/main/java"
-NATIVE_DIR="${S}/openssl-dynamic/src/main/native-package"
-
-src_prepare() {
-	default
-
-	cd "${NATIVE_DIR}" || die
-	ln -sn ../c src || die
-	ln -sn . project-template || die
-
-	# Provides missing m4 files and Makefile.am template.
-	unzip -n $(java-pkg_getjars --build-only maven-hawtjni-plugin) project-template/\* || die
-
-	sed -i \
-		-e "s:@PROJECT_NAME@:${PN}:g" \
-		-e "s:@PROJECT_NAME_UNDER_SCORE@:${PN//-/_}:g" \
-		-e "s:@PROJECT_SOURCES@:$(echo src/*.c):g" \
-		Makefile.am || die
-
-	# Avoid dummy version and tedious symlink.
-	sed -i "s/-release @VERSION@/-avoid-version/g" configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	cd "${NATIVE_DIR}" || die
-	econf --with-apr=/usr/bin/apr-1-config --with-ssl=/usr
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	emake -C "${NATIVE_DIR}"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso "${NATIVE_DIR}"/.libs/lib${PN}.so
-	dodoc README.md
-}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 87ea4747892e..e4219af26c33 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -4,3 +4,4 @@ DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101b
 DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
 DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
 DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
+DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31
diff --git a/dev-java/protobuf-java/protobuf-java-3.19.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.19.1.ebuild
new file mode 100644
index 000000000000..6ae6dca3c0b1
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.19.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+S="${WORKDIR}/protobuf-${PV}/java"
+
+LICENSE="BSD"
+SLOT="0/30"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.8:*
+"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+src_prepare() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+}