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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 62252158094 for ; Sun, 9 Oct 2022 07:33:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A512E08FA; Sun, 9 Oct 2022 07:33:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 64C61E08FA for ; Sun, 9 Oct 2022 07:33:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D158341112 for ; Sun, 9 Oct 2022 07:33:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D66E5608 for ; Sun, 9 Oct 2022 07:33:30 +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: <1665300808.0bc3ae314c980e227d5d30b588d235ea87e1be9c.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/hamcrest-generator-1.3-no_jarjar.patch dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild X-VCS-Directories: dev-java/hamcrest-generator/files/ dev-java/hamcrest-generator/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 0bc3ae314c980e227d5d30b588d235ea87e1be9c X-VCS-Branch: master Date: Sun, 9 Oct 2022 07:33:30 +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: f9f06382-8420-49ea-b86e-4f0c55a6d4dc X-Archives-Hash: f88e64c1ff1c02d73140ce25ce86bd17 commit: 0bc3ae314c980e227d5d30b588d235ea87e1be9c Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Oct 9 05:58:29 2022 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sun Oct 9 07:33:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc3ae31 dev-java/hamcrest-generator: drop 1.3-r3 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/hamcrest-generator/Manifest | 1 - .../files/hamcrest-generator-1.3-no_jarjar.patch | 16 ------- .../hamcrest-generator-1.3-r3.ebuild | 52 ---------------------- 3 files changed, 69 deletions(-) diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest index 42f381d82b57..1139a7ccc0a9 100644 --- a/dev-java/hamcrest-generator/Manifest +++ b/dev-java/hamcrest-generator/Manifest @@ -1,2 +1 @@ -DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b diff --git a/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch b/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch deleted file mode 100644 index 6cd74732c2c0..000000000000 --- a/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/build.xml 2012-07-02 21:14:09.000000000 +0200 -+++ b/build.xml 2013-06-15 21:39:55.005813436 +0200 -@@ -16,13 +16,6 @@ - modulename="hamcrest-generator-nodeps" - classpath="lib/generator/qdox-1.12.jar"/> - -- -- -- -- -- -- -- - - - diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild deleted file mode 100644 index 6aa236cef3f7..000000000000 --- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="source test" - -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="http://hamcrest.org/JavaHamcrest/" -SRC_URI="mirror://gentoo/${MY_P}.tgz" - -LICENSE="BSD-2" -SLOT="${PV}" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos" - -CDEPEND="dev-java/qdox:1.12" - -DEPEND=">=virtual/jdk-1.8:* - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" - -EANT_BUILD_TARGET="generator" -EANT_EXTRA_ARGS="-Dversion=${PV}" - -src_prepare() { - default - # Don't include source in JAR. If a Gentoo user wants the source the source - # USE flag will be enabled. - eapply "${FILESDIR}/${P}-no_jarjar.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.12 qdox.jar qdox-1.12.jar -} - -src_install() { - java-pkg_newjar build/${PN}-nodeps-${PV}.jar ${PN}.jar - - dodoc README.txt CHANGES.txt - - use source && java-pkg_dosrc ${PN}/src/main/java/org -}