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 25F9215815E for ; Sat, 28 Sep 2024 14:03:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 735E9E2B91; Sat, 28 Sep 2024 14:03:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 5C02FE2B91 for ; Sat, 28 Sep 2024 14:03:31 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1532343205 for ; Sat, 28 Sep 2024 14:03:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FA0027F2 for ; Sat, 28 Sep 2024 14:03:29 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1727532198.6ffdba146792e45f64fdfbfeeab952c715e0b2f7.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/javacup/files/, dev-java/javacup/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/javacup/Manifest dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild X-VCS-Directories: dev-java/javacup/ dev-java/javacup/files/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 6ffdba146792e45f64fdfbfeeab952c715e0b2f7 X-VCS-Branch: master Date: Sat, 28 Sep 2024 14:03:29 +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: 789b132d-29c5-47a6-838c-1ecfa614f10d X-Archives-Hash: 7e3ee3e4a795086c221445c31339c899 commit: 6ffdba146792e45f64fdfbfeeab952c715e0b2f7 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sat Sep 28 13:01:06 2024 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sat Sep 28 14:03:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ffdba14 dev-java/javacup: drop 0.11b_p20151001-r1 Closes: https://bugs.gentoo.org/933674 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Arthur Zamarin gentoo.org> dev-java/javacup/Manifest | 1 - .../javacup-0.11b_beta20150326-build-xml-svn.patch | 44 ----------- dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild | 91 ---------------------- 3 files changed, 136 deletions(-) diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest index 5bb555f43821..d38691847d06 100644 --- a/dev-java/javacup/Manifest +++ b/dev-java/javacup/Manifest @@ -1,2 +1 @@ -DIST java-cup-src-11b-20151001.tar.gz 313405 BLAKE2B 126944916d120dd2150e4a665fea6d216f3d55e002a72b581621df726e4bf0e0664f9ff925189c97162582277c08a4f121e056299ea5a3f5c10cc31d7c0feb9c SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e DIST java-cup-src-11b-20160615.tar.gz 313847 BLAKE2B 0031cdb73471512162f69fff6ed47e91d78769c5162f37d4fdcef1c4b4be17ec9e950eda973a8842ae95423840be6c43a335180584b81c4618ea43cbfa926972 SHA512 532a8169f8e1ed2c637c66e7e21cc90eea363732870fbf4e3d66acbff03de3ba0583cefb7b4e7b8f8cb0c9bf1ca92dd5a59111860612bc7544e8beab87f5fbda diff --git a/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch deleted file mode 100644 index d5a14af3587b..000000000000 --- a/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1a908a86fa6c253332b673ecc98e4ec8dffcdca2 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sat, 8 Aug 2015 14:49:02 +0200 -Subject: [PATCH] No longer query subversion revision - -There is not .svn folder shipped anyway ---- - build.xml | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - -diff --git a/build.xml b/build.xml -index 33f0c60..860bbb5 100644 ---- a/build.xml -+++ b/build.xml -@@ -18,17 +18,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -67,7 +56,7 @@ - - -+ value='+ "v0.11b ${cupversion}"'> - - - --- -2.5.0 - diff --git a/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild b/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild deleted file mode 100644 index 4fd75cc0bcbd..000000000000 --- a/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_PV=${PV/_beta/-} -MY_PV=${MY_PV/_p/-} -MY_PV=${MY_PV#0.} -MY_P=java-cup-${MY_PV%-*} - -DESCRIPTION="CUP Parser Generator for Java" -HOMEPAGE="http://www2.cs.tum.edu/projects/cup/" -SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND="dev-java/ant-core:0 - dev-java/jflex:0 - >=virtual/jdk-1.8:*" - -RDEPEND=">=virtual/jre-1.8:*" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS+=" taskdef" - -S="${WORKDIR}" - -src_prepare() { - default - # Bizarrely, you can't build from the tarball without this patch. - eapply "${FILESDIR}"/${PN}-0.11b_beta20150326-build-xml-svn.patch - - # The JFlex package name has changed to lower case. - sed -i "s/JFlex\./jflex./g" build.xml || die - - # Remove the bundled JFlex. - rm -v bin/JFlex.jar || die -} - -src_configure() { - EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core,jflex) - java-ant-2_src_configure -} - -src_compile() { - # Annoyingly javacup bundles an older version of itself that will - # break jflex if that has already been built against this newer - # version beforehand. Even more annoyingly, the binary download is - # built with Java 8, which isn't much use to us. We therefore use - # any installed javacup that is newer than the bundled version where - # possible. If this approach turns out to be unworkable then we may - # just have to use the bundled jflex for bootstrapping. - if has_version \>=${CATEGORY}/${PN}-0.11b:${SLOT}; then - # Use PORTAGE_QUIET to suppress a QA warning that is spurious - # thanks to has_version above. This is Portage-specific but - # showing the warning elsewhere isn't the end of the world. - einfo "Bootstrapping with installed javacup ..." - EANT_GENTOO_CLASSPATH_EXTRA+=":$(PORTAGE_QUIET=1 java-pkg_getjars --build-only javacup)" eant - else - einfo "Bootstrapping with bundled javacup ..." - EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/bin/${MY_P:0:-1}.jar" eant - fi - - # Clean everything except the new jar. - rm -rv java/ classes/ || die - - einfo "Recompiling with newly built javacup ..." - EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/dist/${MY_P}.jar" eant - - use doc && ejavadoc -sourcepath src/ -d javadoc java_cup -} - -src_install() { - java-pkg_newjar dist/${MY_P}.jar - java-pkg_newjar dist/${MY_P}-runtime.jar ${PN}-runtime.jar - java-pkg_dolauncher ${PN} --jar ${PN}.jar - java-pkg_register-ant-task - - dodoc changelog.txt - docinto html - dodoc manual.html - - use source && java-pkg_dosrc java/* - use doc && java-pkg_dojavadoc javadoc -}