From ff774aecb59ffe1000ff9f907e91182662e8afa4 Mon Sep 17 00:00:00 2001
From: "Volkmar W. Pogatzki" <gentoo@pogatzki.net>
Date: Thu, 26 Jan 2023 16:28:42 +0100
Subject: [PATCH] dev-java/jol-core: switch dependency asm:4 -> asm:9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- fixes test failure by adjusting ${JAVA_TEST_SRC_DIR}
- switches dependency asm:4 -> asm:9
- updates HOMEPAGE
- removes src_install() which is no longer needed

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29276
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 ...re-0.16.ebuild => jol-core-0.16-r1.ebuild} | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)
 rename dev-java/jol-core/{jol-core-0.16.ebuild => jol-core-0.16-r1.ebuild} (55%)

diff --git a/dev-java/jol-core/jol-core-0.16.ebuild b/dev-java/jol-core/jol-core-0.16-r1.ebuild
similarity index 55%
rename from dev-java/jol-core/jol-core-0.16.ebuild
rename to dev-java/jol-core/jol-core-0.16-r1.ebuild
index a36940d2c74b3..18b26a8374823 100644
--- a/dev-java/jol-core/jol-core-0.16.ebuild
+++ b/dev-java/jol-core/jol-core-0.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,8 +13,8 @@ MY_PN="${PN%-core}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Java Object Layout: Core"
-HOMEPAGE="https://openjdk.java.net/projects/code-tools/jol/"
-SRC_URI="https://github.com/openjdk/jol/archive/refs/tags/${PV}.tar.gz -> jol-${PV}.tar.gz"
+HOMEPAGE="https://openjdk.org/projects/code-tools/jol/"
+SRC_URI="https://github.com/openjdk/jol/archive/${PV}.tar.gz -> jol-${PV}.tar.gz"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="0"
@@ -23,7 +23,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 DEPEND="
 	>=virtual/jdk-1.8:*
 	test? (
-		dev-java/asm:4
+		dev-java/asm:9
 	)
 "
 
@@ -34,12 +34,7 @@ RDEPEND="
 S="${WORKDIR}/${MY_P}"
 
 JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS=( "${PN}/src/main/resources" )
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
 
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,asm-4"
-JAVA_TEST_SRC_DIR="${PN}/src/test"
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,asm-9"
+JAVA_TEST_SRC_DIR="${PN}/src/test/java"