From 5a4de0cb8a5a2c58023c58167b14996352461dda Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Mon, 19 Oct 2020 11:38:48 +0200 Subject: dev-java/hamcrest-core: increased min java version to 1.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/749846 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Miroslav Šulc --- dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild | 35 -------------- dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild | 35 ++++++++++++++ dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild | 54 ++++++++++++++++++++++ dev-java/hamcrest-core/hamcrest-core-1.3.ebuild | 54 ---------------------- 4 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild create mode 100644 dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild create mode 100644 dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild delete mode 100644 dev-java/hamcrest-core/hamcrest-core-1.3.ebuild (limited to 'dev-java') diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild deleted file mode 100644 index 78621915ae72..000000000000 --- a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -MY_PN="hamcrest" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Library of matchers for building test expressions" -HOMEPAGE="https://github.com/hamcrest" -SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.zip -> ${P}.zip" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-macos ~x64-solaris" -IUSE="" - -RDEPEND=" - >=virtual/jre-1.6" - -DEPEND=" - >=virtual/jdk-1.6 - source? ( app-arch/zip )" - -S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}" - -JAVA_SRC_DIR="${PN}/src" - -java_prepare() { - java-pkg_clean -} diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild new file mode 100644 index 000000000000..774a1f93f056 --- /dev/null +++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +MY_PN="hamcrest" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Library of matchers for building test expressions" +HOMEPAGE="https://github.com/hamcrest" +SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.zip -> ${P}.zip" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-macos ~x64-solaris" +IUSE="" + +RDEPEND=" + >=virtual/jre-1.8" + +DEPEND=" + virtual/jdk:1.8 + source? ( app-arch/zip )" + +S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}" + +JAVA_SRC_DIR="${PN}/src" + +java_prepare() { + java-pkg_clean +} diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild new file mode 100644 index 000000000000..f6a4828bbca6 --- /dev/null +++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +MY_PN="hamcrest" +MY_P="${MY_PN}-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Core library of matchers for building test expressions" +HOMEPAGE="https://github.com/hamcrest" +SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz" + +LICENSE="BSD-2" +SLOT="${PV}" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos" + +DEPEND="virtual/jdk:1.8 + ~dev-java/hamcrest-generator-${PV}:1.3 + userland_GNU? ( sys-apps/findutils )" + +RDEPEND=">=virtual/jre-1.8" + +JAVA_ANT_REWRITE_CLASSPATH="true" +JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar" + +EANT_BUILD_TARGET="core" + +java_prepare() { + # Empty out the contents of the generator target; it has already been built. + epatch "${FILESDIR}/hamcrest-1.3-empty_generator.patch" + + # Fix problems with Javadoc target. + epatch "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch" + + find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files" + + local cp="build/${P}.jar" + cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})" + EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}" +} + +src_install() { + java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar + + dodoc README.txt CHANGES.txt + + use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents + use source && java-pkg_dosrc ${PN}/src/main/java/org +} diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild deleted file mode 100644 index c57f1153be9d..000000000000 --- a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_PN="hamcrest" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Core library of matchers for building test expressions" -HOMEPAGE="https://github.com/hamcrest" -SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz" - -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} - userland_GNU? ( sys-apps/findutils )" - -RDEPEND=">=virtual/jre-1.5" - -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar" - -EANT_BUILD_TARGET="core" - -java_prepare() { - # Empty out the contents of the generator target; it has already been built. - epatch "${FILESDIR}/hamcrest-1.3-empty_generator.patch" - - # Fix problems with Javadoc target. - epatch "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch" - - find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files" - - local cp="build/${P}.jar" - cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})" - EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}" -} - -src_install() { - java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar - - dodoc README.txt CHANGES.txt - - use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents - use source && java-pkg_dosrc ${PN}/src/main/java/org -} -- cgit v1.2.3-65-gdbad