From 427e68c33aaceabb48f41b01d6ebc17ada0ed9ce Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Thu, 30 May 2024 16:29:22 +0200 Subject: [PATCH] dev-java/xz-java: enable module-info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/36900 Signed-off-by: Miroslav Šulc --- .../{xz-java-1.9-r1.ebuild => xz-java-1.9-r2.ebuild} | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) rename dev-java/xz-java/{xz-java-1.9-r1.ebuild => xz-java-1.9-r2.ebuild} (84%) diff --git a/dev-java/xz-java/xz-java-1.9-r1.ebuild b/dev-java/xz-java/xz-java-1.9-r2.ebuild similarity index 84% rename from dev-java/xz-java/xz-java-1.9-r1.ebuild rename to dev-java/xz-java/xz-java-1.9-r2.ebuild index 0b7ed480b07ac..8d285914f3274 100644 --- a/dev-java/xz-java/xz-java-1.9-r1.ebuild +++ b/dev-java/xz-java/xz-java-1.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -DEPEND=">=virtual/jdk-1.8:*" +DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" BDEPEND=" @@ -28,10 +28,15 @@ BDEPEND=" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lassecollin.asc" -JAVA_SRC_DIR="src/org" +JAVA_SRC_DIR="src9" DOCS=( README NEWS COPYING THANKS ) +src_prepare() { + java-pkg-2_src_prepare + mv src{,9}/org || die +} + src_install() { java-pkg-simple_src_install use examples && java-pkg_doexamples src/*Demo.java