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

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     b5713c9fe93adc3c2b1469f2cff419cae278cbb7
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Mar  8 17:27:30 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar  9 07:07:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5713c9f

dev-java/hamcrest: add JAVA_AUTOMATIC_MODULE_NAME

Newer versions of dev-java/assertj-core would complain they cannot find
that module.

Also removes src_install() since https://bugs.gentoo.org/789582 is
solved.

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29997
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{hamcrest-2.2.ebuild => hamcrest-2.2-r1.ebuild}      | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/dev-java/hamcrest/hamcrest-2.2.ebuild b/dev-java/hamcrest/hamcrest-2.2-r1.ebuild
similarity index 66%
rename from dev-java/hamcrest/hamcrest-2.2.ebuild
rename to dev-java/hamcrest/hamcrest-2.2-r1.ebuild
index 8660d4f26194..401f297eddd3 100644
--- a/dev-java/hamcrest/hamcrest-2.2.ebuild
+++ b/dev-java/hamcrest/hamcrest-2.2-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom hamcrest-2.2.pom --download-uri https://github.com/hamcrest/JavaHamcrest/archive/v2.2.tar.gz --slot 0 --keywords "~amd64" --ebuild hamcrest-2.2.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -13,8 +10,9 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Core API and libraries of hamcrest matcher framework."
-HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
 SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/JavaHamcrest-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -32,8 +30,7 @@ PATCHES=( "${FILESDIR}"/hamcrest-2.2-java-11.patch )
 
 DOCS=( {CHANGES,README}.md )
 
-S="${WORKDIR}/JavaHamcrest-${PV}"
-
+JAVA_AUTOMATIC_MODULE_NAME="org.hamcrest"
 JAVA_SRC_DIR="hamcrest/src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="hamcrest/src/test/java"
@@ -42,8 +39,3 @@ src_prepare() {
 	default
 	java-pkg-2_src_prepare
 }
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}