commit: 1cd5d8d3f1a46a707f43d56b93682ddd9152a47f Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Mar 12 20:36:52 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Mar 13 08:41:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cd5d8d3
dev-java/junit: Depend on hamcrest-library Closes: https://bugs.gentoo.org/770886 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/19902 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/junit/junit-4.13.1.ebuild | 25 +++++++++++++++---------- dev-java/junit/metadata.xml | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild index 60c035757c3..72680398bed 100644 --- a/dev-java/junit/junit-4.13.1.ebuild +++ b/dev-java/junit/junit-4.13.1.ebuild @@ -11,26 +11,31 @@ MAVEN_ID="junit:junit:4.13.1" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Simple framework to write repeatable tests" +HOMEPAGE="https://junit.org/junit5/"; SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz" -HOMEPAGE="http://junit.org/"; + LICENSE="EPL-1.0" SLOT="4" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="examples" -CDEPEND="dev-java/hamcrest-core:1.3" - -RDEPEND=">=virtual/jre-1.8 - ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.8 - ${CDEPEND}" +DEPEND=" + dev-java/hamcrest-core:1.3 + dev-java/hamcrest-library:1.3 + " +RDEPEND="${DEPEND} + >=virtual/jre-1.8 + " +BDEPEND="${DEPEND} + >=virtual/jdk-1.8 + " S="${WORKDIR}/${MY_P}" JAVA_SRC_DIR="src/main/java" -JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3" +JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3" -java_prepare() { +src_prepare() { + default rm -v lib/*.jar || die } diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml index 9c59435e026..618f5e0e4b6 100644 --- a/dev-java/junit/metadata.xml +++ b/dev-java/junit/metadata.xml @@ -6,7 +6,7 @@ <name>Java</name> </maintainer> <upstream> - <remote-id type="github">junit-team/junit</remote-id> + <remote-id type="github">junit-team/junit4</remote-id> <remote-id type="sourceforge">junit</remote-id> </upstream> </pkgmetadata>
