From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-java/hamcrest-core/Manifest | 7 --- .../files/hamcrest-1.3-empty_generator.patch | 21 --------- .../files/hamcrest-core-1.3-fix_javadoc.patch | 49 -------------------- dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild | 35 -------------- dev-java/hamcrest-core/hamcrest-core-1.3.ebuild | 54 ---------------------- dev-java/hamcrest-core/metadata.xml | 12 ----- 6 files changed, 178 deletions(-) delete mode 100644 dev-java/hamcrest-core/Manifest delete mode 100644 dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch delete mode 100644 dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch delete mode 100644 dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild delete mode 100644 dev-java/hamcrest-core/hamcrest-core-1.3.ebuild delete mode 100644 dev-java/hamcrest-core/metadata.xml (limited to 'dev-java/hamcrest-core') diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest deleted file mode 100644 index 5741b3122ec3..000000000000 --- a/dev-java/hamcrest-core/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX hamcrest-1.3-empty_generator.patch 1227 BLAKE2B 4e0bc6d085f6d26de9f2da8e09eb061c451a58d99385a2c41be28a137b209783affd76e1e0bd901a5497d40b290ac219d61046fc65931ea056c725ae0f835ee1 SHA512 766f57a449d4535432ab192c40a37ff9a09fe760b06ce5beb6a68b2b804c77ce232e8003fb3f3ef7b71df1cd2ceae7ff13fd3de28d20ec0ced1274c912d414b5 -AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb76d8c1c39266f6fb2f220849eeabec7ce5b084d2411c51102fa5b47853aed66acd6d237497c0c8bb2c688c93b7eb0785e27a3 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3 -DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 -DIST hamcrest-core-1.1.zip 1344232 BLAKE2B de9d346ff12ff29c4d1a13138eb8a80a527865b003f5d738cdfba4927714170720e2a778aecefeb895b82d0c40feeb1980c2ae5ab17a7caf2c27e19a0fcf6188 SHA512 af8d5d3a82df70a446f79f7247252595368820b0b54d8f612aa5b9bb3166c4664b97aaae338278f8f5d84add2d58d9c7a764e5e03a93588d3eba4472eaaa712b -EBUILD hamcrest-core-1.1-r1.ebuild 726 BLAKE2B 0bf2ceff64edd7c6359d06c2019e34dfea5862c0055f86865162127ed8946dafb71481d7fa37786bc613386cae965df060448841805e8f4c599097e47c09fc9e SHA512 7fa43c784e0ce93356d60704e1e1146fbfb34448252ea9d94849749a6f876a99c830fd3154fa37692fb14b12f2dc67c995b9047e067e968e59ccab04f318dc0c -EBUILD hamcrest-core-1.3.ebuild 1521 BLAKE2B b3f820d2a13406937497405865c7603d7985740a75f3c40e6ae6a3264d200c3b596921dfa844dbe550b8d0fce15e9318c629ba8658334a22fc9218039fc8139c SHA512 3416e84cda9a2c7939b9e61fcec5ae1663295568b541782f522d82f6ec2a16556416daaf3c31410e2368030c822852d211a86e3095a7406775e742730bdef3ec -MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8 diff --git a/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch b/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch deleted file mode 100644 index 709bca62c02d..000000000000 --- a/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/build.xml 2012-07-02 21:14:09.000000000 +0200 -+++ b/build.xml 2013-06-15 22:00:19.919038284 +0200 -@@ -12,18 +12,6 @@ - - - -- -- -- -- -- -- -- -- -- -- - - - diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch deleted file mode 100644 index 4f210ca3380a..000000000000 --- a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/build.xml 2013-06-15 22:29:44.445548674 +0200 -++- b/build.xml 2013-06-15 22:30:45.098876635 +0200 -@@ -132,30 +132,15 @@ - - - -- - -- -- -- - - -+ windowtitle="Hamcrest" source="1.6" failonerror="yes"> -- -- -- -- -- - -- -- - - - -- -- -- -- - - - -@@ -302,14 +287,7 @@ - destdir="build/temp/@{modulename}-${version}-javadoc.jar.contents" author="true" version="true" use="true" - windowtitle="Hamcrest" source="1.6" failonerror="yes"> - -- -- -- -- - -- -- -- - - - 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.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild deleted file mode 100644 index 24bdc77cad61..000000000000 --- a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild +++ /dev/null @@ -1,54 +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-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 -} diff --git a/dev-java/hamcrest-core/metadata.xml b/dev-java/hamcrest-core/metadata.xml deleted file mode 100644 index b09ef005001e..000000000000 --- a/dev-java/hamcrest-core/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - java@gentoo.org - Java - - - hamcrest - hamcrest/ - - -- cgit v1.2.3