Adding metadata

19 files changed, 18 insertions, 463 deletions

diff --git a/dev-java/cldc-api/Manifest b/dev-java/cldc-api/Manifest
deleted file mode 100644
index d5ce46f2ac5e..000000000000
--- a/dev-java/cldc-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cldc-api-1.1.tar.bz2 142368 BLAKE2B 3f17d5edba61d8caed820a230156485b995985b4bd04e01982bc84de9c28d890e4ba8d30c24c2b1c211d43c666b7e92163c0442a2cfcf1540ac404816145990f SHA512 b2baae07c037692b2e9ef418728817b60c39fcef7bbb2ccdfacb5551aef2022d342458434042154cc4b4f82895a427fab2f277b6269fa651ec3bcdb23a771e7e
diff --git a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
deleted file mode 100644
index d502d5ee9bc9..000000000000
--- a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java ME Connected Limited Device Configuration API"
-HOMEPAGE="http://java.sun.com/javame/reference/apis.jsp"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-# mkdir cldc-api-1.1 && cd cldc-api-1.1
-# you need a login on dev.java.net - use --username username if different from your local login
-# svn export https://phoneme.dev.java.net/svn/phoneme/components/cldc/trunk/src/javaapi/cldc1.1
-# svn export https://phoneme.dev.java.net/svn/phoneme/components/cldc/trunk/src/javaapi/share
-# cd ..
-# tar -cjf cldc-api-1.1.tar.bz2 cldc-api-1.1
-# move tarball to distdir, scp to d.g.o...
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc64 x86"
-SLOT="1.1"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/cldc-api/metadata.xml b/dev-java/cldc-api/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/cldc-api/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/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index db2b1f990082..e170628b3386 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,11 +1,5 @@
-DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-DIST protobuf-3.15.0.tar.gz 5284848 BLAKE2B 6c1135499dd73b6d1764f47ded6415f8073841bccf5d5626e751fc159b67a6103d71a84096f563053c34c9e4235504238fcdc86ebb757d38b2f4bc1674d08674 SHA512 f52dfbfabdff3306d26ec05cbba7cd47bf3db8b08f4fb27e2cbd5a594de57f0a7ab2212dcea2055a9adfddc94ae4df2d0b1caea311ead75bb850ef8458b1b74a
-DIST protobuf-3.15.1.tar.gz 5284851 BLAKE2B 5e3f487ba1c3f6a3d2d87f2421f9b07aa4618df0853b05364d7f29e93d8e7dc4c3ece08ba3b7cd0bf69d0faaa32ccc952218a8df7575b74aa6216977f2b2219b SHA512 24efeec969ee72833c377e6287e3b06a431d54d9b3be50635685f6903534f15c2957d78cdbf4bcc6482732ecdbc735dc894c0b9095486419b8d11d6df6169180
-DIST protobuf-3.15.2.tar.gz 5284455 BLAKE2B 433ac18774395174798d110e4eaae95c44bc8be89cfae85648497f8531cf19513f4c7745a6afc27d6d49a07e7e1fb4faeff73530fa082665727095e837f11940 SHA512 34e82ece83f47249fd5398a955e4f0a32d0722abcaa4e90c741bdc5106a0bd92088babe3d10d818dd89e2e9254cecbb68ae0c182ea408d4f1e2d70318e7baf37
-DIST protobuf-3.15.3.tar.gz 5283923 BLAKE2B f7b7b22200a4fffe6bb89e6d15fdcdb7e53ad91d4b8dc4c0b9ec7e64de39f0e3854c649edfd5a6eca040f35ccbb2bea6a3b86c7e22a9ba011db2dc11117646f6 SHA512 ca403cc2ed28b67c4219021273be59d36a3f4382a8111aeb6152fc0ded30dfc203d96c3c60977d19ff00a1d1524b8ed4c183e8badb56c942e599f78aaf6745f6
-DIST protobuf-3.15.4.tar.gz 5283753 BLAKE2B 256eb365b26a864755b43925bd4336fc76f1fb122aacdb01243b24ecc163541fd7d2105ba66f7fa0c14ced0166cf4bc8f480ac5d9f2cea13e4cc925dab6e1810 SHA512 d98d1ed408a6f3d15fb3a60d11df896632dfdffa06759c761bc227a8c8053ec9db6c62c21b115dc109c7d9139df239b19e29aff5783b585101bcab3f4d687547
-DIST protobuf-3.15.5.tar.gz 5283712 BLAKE2B 0da6255302014c885aee47d48344a75ee4808cb91fa6cdebef15150e0b8ce7f7835d21bdc8f42fd1ba5f5c5401e6fc60b9410ff1ea8bd0d0f698d3cf7d10dd2b SHA512 b9d3b261047c354f0f8735638041562e05d93691cdfdc295622fd30aa04c859a9e3d4200981807ea0d4926d0e4a31a918b4851ebc25bfb9709494a3699002531
-DIST protobuf-3.15.6.tar.gz 5284018 BLAKE2B 5895f618e233edd5744253821036857aa23f64b76ee3318b99f3530d9dd0c49cc8c386ef15c7394475c2bf0fa33fb631e481fa3fb927c2ab8a88af31234bd0b1 SHA512 673d61b492ce0e85f5c63f3fd7a0174737cc65f7871f79d24380bffa59ea1b312065137ecc63b0f4d4ffa3eb168a09e9c1129c21b0e6c5c3a8c2fabb2cecabb5
-DIST protobuf-3.15.7.tar.gz 5284817 BLAKE2B 43821bb283a0c1f87930593046a5c55f6efae3f644337289fd438c0612a9b7ef9531b61e48940b74dc5d20253ee1b6a805b902284a442dec2efe8c79f82c5aad SHA512 2b18ccba1ff8a0623c52abed0e0674bc6cfa2cd10d49764031a47e68f654f54083f4a4f9e3a94d833a6808426904ee642f173641063e79cb41a61fc348d603ac
 DIST protobuf-3.15.8.tar.gz 5285277 BLAKE2B 798fc011ac03cdc2406acf5845c667d8482082044bdace06c2c1d02b5b1b69c1b1f30e29774180dc1801a1d21d62e2ce50325105859564a1e36d3fe478e64d8b SHA512 56fc6df2dae14eee0fb67dd4204fc1ec54a18d994a69c9e42c7888d0cd50d269d1c5e1445d74f0fa705850d4ac86a22d86781e09769a716e5c6f829b15b05592
 DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5
+DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
+DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
+DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
diff --git a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
deleted file mode 100644
index 6b33107b79ac..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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
-
-LICENSE="BSD"
-SLOT="0/25"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-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
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.3.ebuild
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-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
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.4.ebuild
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-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
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.5.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.5.ebuild
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-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
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.6.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.6.ebuild
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-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
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.7.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.7.ebuild
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-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
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
index dd91ba9be92a..6c648819d2d6 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
@@ -31,8 +31,7 @@ IUSE=""
 BDEPEND="~dev-libs/protobuf-${PV}
 	>=virtual/jdk-1.7"
 DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
+RDEPEND=">=virtual/jre-1.7"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.16.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.16.0.ebuild
index 0c639fe2105a..96752936a170 100644
--- a/dev-java/protobuf-java/protobuf-java-3.16.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.16.0.ebuild
@@ -29,8 +29,7 @@ IUSE=""
 BDEPEND="~dev-libs/protobuf-${PV}
 	>=virtual/jdk-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*
-	!<dev-libs/protobuf-3[java(-)]"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.0.ebuild
index dfd68dd9ecf0..d24b960991a9 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.17.0.ebuild
@@ -22,15 +22,14 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
+	>=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.1.ebuild
index dfd68dd9ecf0..d24b960991a9 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.17.1.ebuild
@@ -22,15 +22,14 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
+	>=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.2.ebuild
index dfd68dd9ecf0..d24b960991a9 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.17.2.ebuild
@@ -22,15 +22,14 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
+	>=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index 19bed69c6fd9..11d9796bf900 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -29,8 +29,7 @@ IUSE=""
 BDEPEND="~dev-libs/protobuf-${PV}
 	>=virtual/jdk-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*
-	!<dev-libs/protobuf-3[java(-)]"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/tagsoup/Manifest b/dev-java/tagsoup/Manifest
deleted file mode 100644
index f81c51eef75c..000000000000
--- a/dev-java/tagsoup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tagsoup-1.2.1-src.zip 222757 BLAKE2B 79a43edfa9aed7f08bfaedbe758b2a08d5ff596e268cc415707aee9076bcdbf8de0b4c2a855b9558ff2cf598ed4811a7a690aef6c5004e34484ffe3087bef8e9 SHA512 3bb1608746270663f6ed45318457e3ee27419929411689d962cffc0ab0c32ec4b858020043be46e929014b696c753a01b49d6eea9a98f18d81fb9205e99ac0a1
diff --git a/dev-java/tagsoup/metadata.xml b/dev-java/tagsoup/metadata.xml
deleted file mode 100644
index 4f56d77f5e01..000000000000
--- a/dev-java/tagsoup/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>
- <longdescription>
-		This is the home page of TagSoup, a SAX-compliant parser written
-		in Java that, instead of parsing well-formed or valid XML, parses
-		HTML as it is found in the wild: nasty and brutish, though quite
-		often far from short.
-	</longdescription>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/tagsoup/tagsoup-1.2.1.ebuild b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
deleted file mode 100644
index 501db89baf9e..000000000000
--- a/dev-java/tagsoup/tagsoup-1.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-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-ant-2
-
-DESCRIPTION="A SAX-compliant parser written in Java"
-HOMEPAGE="http://mercury.ccil.org/~cowan/XML/tagsoup/"
-SRC_URI="http://mercury.ccil.org/~cowan/XML/tagsoup/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="app-arch/unzip"
-RDEPEND="
-	>=virtual/jre-1.4"
-DEPEND="
-	dev-java/saxon:9
-	>=virtual/jdk-1.4"
-
-EANT_BUILD_TARGET="dist"
-EANT_DOC_TARGET="docs-api"
-# Fails to detect a TransformerFactory. #421733
-# See also https://issues.apache.org/jira/browse/XALANJ-1549 for why the default is no good either.
-EANT_ANT_TASKS="saxon-9"
-EANT_EXTRA_ARGS="-Dtransformer.factory=net.sf.saxon.TransformerFactoryImpl"
-
-src_install() {
-	java-pkg_newjar dist/lib/${PN}-1.2.jar ${PN}.jar
-	java-pkg_dolauncher
-
-	doman ${PN}.1
-	dodoc CHANGES README TODO
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/{java,templates}/*
-}