diff options
author | Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2023-03-08 18:27:30 +0100 |
---|---|---|
committer | Miroslav Šulc <fordfrog@gentoo.org> | 2023-03-09 08:07:08 +0100 |
commit | b5713c9fe93adc3c2b1469f2cff419cae278cbb7 (patch) | |
tree | 81d8245334bc8af74dabae09a759ec08ef4d3cdf /dev-java | |
parent | media-sound/guitarix: EAPI 8 and py3.11 (diff) | |
download | gentoo-b5713c9fe93adc3c2b1469f2cff419cae278cbb7.tar.gz gentoo-b5713c9fe93adc3c2b1469f2cff419cae278cbb7.tar.bz2 gentoo-b5713c9fe93adc3c2b1469f2cff419cae278cbb7.zip |
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@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29997
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/hamcrest/hamcrest-2.2-r1.ebuild (renamed from dev-java/hamcrest/hamcrest-2.2.ebuild) | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/dev-java/hamcrest/hamcrest-2.2.ebuild b/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 -} |