commit: 5a4de0cb8a5a2c58023c58167b14996352461dda Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Mon Oct 19 09:38:48 2020 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Oct 19 09:39:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a4de0cb
dev-java/hamcrest-core: increased min java version to 1.8 Closes: https://bugs.gentoo.org/749846 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../{hamcrest-core-1.1-r1.ebuild => hamcrest-core-1.1-r3.ebuild} | 6 +++--- .../{hamcrest-core-1.3.ebuild => hamcrest-core-1.3-r1.ebuild} | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild similarity index 89% rename from dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild rename to dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild index 78621915ae7..774a1f93f05 100644 --- a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild +++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -20,10 +20,10 @@ KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-macos ~x64-solaris" IUSE="" RDEPEND=" - >=virtual/jre-1.6" + >=virtual/jre-1.8" DEPEND=" - >=virtual/jdk-1.6 + virtual/jdk:1.8 source? ( app-arch/zip )" S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}" diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild similarity index 91% rename from dev-java/hamcrest-core/hamcrest-core-1.3.ebuild rename to dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild index c57f1153be9..f6a4828bbca 100644 --- a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild +++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -19,11 +19,11 @@ LICENSE="BSD-2" SLOT="${PV}" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos" -DEPEND=">=virtual/jdk-1.5 - ~dev-java/hamcrest-generator-${PV} +DEPEND="virtual/jdk:1.8 + ~dev-java/hamcrest-generator-${PV}:1.3 userland_GNU? ( sys-apps/findutils )" -RDEPEND=">=virtual/jre-1.5" +RDEPEND=">=virtual/jre-1.8" JAVA_ANT_REWRITE_CLASSPATH="true" JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
