[gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/

[Conrad Kostecki]

commit:     6c9e523e263c2c8bce11f02aa00fee7b8d572339
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 21:07:57 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 21:07:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9e523e

dev-java/protobuf-java: update live ebuild

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-java/protobuf-java/protobuf-java-9999.ebuild | 27 ++++++++++++------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild 
b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index db1925f3a2ba..43fa605b496c 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 2008-2021 Gentoo Authors
+# Copyright 2008-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
@@ -9,6 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 if [[ "${PV}" == "9999" ]]; then
        inherit git-r3
 
+       EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
        EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf";
        EGIT_SUBMODULES=()
 fi
@@ -20,22 +22,19 @@ if [[ "${PV}" == "9999" ]]; then
 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"
+SLOT="0/31"
 KEYWORDS=""
-IUSE=""
 
-BDEPEND="~dev-libs/protobuf-${PV}
-       >=virtual/jdk-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-       EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
+COMMON_DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="
+       ~dev-libs/protobuf-${PV}
+       ${COMMON_DEPEND}
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
        pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die