From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5D6D4138359 for ; Mon, 19 Oct 2020 07:10:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF34AE0971; Mon, 19 Oct 2020 07:10:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87C2BE0971 for ; Mon, 19 Oct 2020 07:10:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 096D0340B29 for ; Mon, 19 Oct 2020 07:10:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B3823AA for ; Mon, 19 Oct 2020 07:10:15 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1603091410.bddc05cdddf8f7619988be67b1c762aeb60522f0.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-generator/files/, dev-java/hamcrest-generator/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/hamcrest-generator/Manifest dev-java/hamcrest-generator/files/1.1-build.xml.patch dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild X-VCS-Directories: dev-java/hamcrest-generator/ dev-java/hamcrest-generator/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: bddc05cdddf8f7619988be67b1c762aeb60522f0 X-VCS-Branch: master Date: Mon, 19 Oct 2020 07:10:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 952291a7-ecd8-4c75-84cb-f88be37168a0 X-Archives-Hash: 367b7cf8bbb06955552f4b28dcf22782 commit: bddc05cdddf8f7619988be67b1c762aeb60522f0 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Oct 19 07:10:01 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Mon Oct 19 07:10:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bddc05cd dev-java/hamcrest-generator: removed old 1.1 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/hamcrest-generator/Manifest | 1 - .../hamcrest-generator/files/1.1-build.xml.patch | 93 ---------------------- .../hamcrest-generator-1.1.ebuild | 52 ------------ 3 files changed, 146 deletions(-) diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest index 086c45b53bc..480364f4e8f 100644 --- a/dev-java/hamcrest-generator/Manifest +++ b/dev-java/hamcrest-generator/Manifest @@ -1,2 +1 @@ -DIST hamcrest-1.1.tgz 1670123 BLAKE2B 2b1242a782949e084374918778c17f20b3b09746521949c12153cf1e599ab38a2a5a2bf0174d9676a8146cfab1e3f7c91a8a1b3ec829dd617f34f92c6852b931 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 diff --git a/dev-java/hamcrest-generator/files/1.1-build.xml.patch b/dev-java/hamcrest-generator/files/1.1-build.xml.patch deleted file mode 100644 index c8f087ba8f1..00000000000 --- a/dev-java/hamcrest-generator/files/1.1-build.xml.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml -index f819d3d..18fba83 100644 ---- a/hamcrest-1.1/build.xml -+++ b/hamcrest-1.1/build.xml -@@ -28,18 +28,6 @@ - classpath=" - lib/generator/qdox-1.6.1.jar; - "/> -- -- -- -- -- -- -- - - - - - -- -- -- -- -+ -+ -+ -+ - -@@ -121,7 +109,7 @@ - destjar="build/hamcrest-unit-test-${version}.jar" - classpath=" - build/hamcrest-core-${version}.jar; -- build/hamcrest-library-${version}.jar; -+ build/hamcrest-library-${version}.jar; - build/hamcrest-text-${version}.jar; - build/hamcrest-integration-${version}.jar; - build/hamcrest-generator-${version}.jar"/> -@@ -164,7 +152,7 @@ - - - -- -+ - - - -@@ -221,7 +209,7 @@ - - - -- -+ - - - -@@ -251,14 +239,10 @@ - - - -- -- -- -- - - - - - - -- -+ diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild deleted file mode 100644 index 19e54674594..00000000000 --- a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -MY_PN="hamcrest" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Code generator for Hamcrest's 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="0" -KEYWORDS="~amd64 ~ppc64 ~x86" - -CDEPEND="dev-java/qdox:1.6" - -DEPEND=">=virtual/jdk-1.5 - userland_GNU? ( sys-apps/findutils ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.5 - ${CDEPEND}" - -EANT_BUILD_TARGET="generator" -EANT_TEST_TARGET="unit-test" -EANT_EXTRA_ARGS="-Dversion=${PV}" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/temp/${PN}-${PV}-nodeps.jar" - -java_prepare() { - epatch "${FILESDIR}"/${PV}-build.xml.patch - - find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files" - - # These jars must be symlinked. Specifying them using gentoo.classpath - # does not work. - java-pkg_jar-from --into lib/generator qdox-1.6 qdox.jar qdox-1.6.1.jar -} - -src_install() { - java-pkg_newjar build/temp/${PN}-${PV}-nodeps.jar ${PN}.jar - - dodoc README.txt CHANGES.txt - - use source && java-pkg_dosrc ${PN}/src/main/java/org -}