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

[Florian Schmaus]

commit:     8a1f6a090df1f64290e73f5b1f3da49c90927dbf
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 11:41:02 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 11:41:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a1f6a09

dev-java/javassist: DEPEND jdk 8 if not test, if otherwise jdk 11

Also minor style fixes.

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/javassist/javassist-3.29.0.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev-java/javassist/javassist-3.29.0.ebuild b/dev-java/javassist/javassist-3.29.0.ebuild
index ad9f9e436cac..712141e86f6e 100644
--- a/dev-java/javassist/javassist-3.29.0.ebuild
+++ b/dev-java/javassist/javassist-3.29.0.ebuild
@@ -20,9 +20,10 @@ LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
 SLOT="3"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
-#	Tests run: 431,  Failures: 6
+# Tests run: 431,  Failures: 6
 # Cannot solve those test failures. Using "mvn test" they all pass.
-RESTRICT="test" # https://bugs.gentoo.org/856364
+# https://bugs.gentoo.org/856364
+RESTRICT="test"
 
 # Compile dependencies
 # POM: pom.xml
@@ -30,16 +31,17 @@ RESTRICT="test" # https://bugs.gentoo.org/856364
 # test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
 
 DEPEND="
-	>=virtual/jdk-11:*
+	!test? (
+		>=virtual/jdk-8:*
+	)
 	test? (
+		>=virtual/jdk-11:*
 		dev-java/hamcrest-library:1.3
 	)
 "
 
 # https://github.com/jboss-javassist/javassist/blob/rel_3_29_0_ga/pom.xml#L156-L157
-RDEPEND="
-	>=virtual/jre-11:*
-"
+RDEPEND=">=virtual/jre-8:*"
 
 S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"