[gentoo-commits] repo/gentoo:master commit in: dev-java/javacup/files/, dev-java/javacup/

[gentoo-commits] repo/gentoo:master commit in: dev-java/javacup/files/, dev-java/javacup/

[James Le Cuirot]

commit:     1b95f8fe89daf404ada61645d7da160f57d3660a
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 21:30:36 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 21:36:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b95f8fe

dev-java/javacup: Remove old

Package-Manager: portage-2.2.25

 dev-java/javacup/Manifest                          |  1 -
 .../javacup-0.11b_beta20150326-build-xml.patch     | 26 --------
 dev-java/javacup/javacup-0.11b_beta20150326.ebuild | 72 ----------------------
 3 files changed, 99 deletions(-)

diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index 314e674..9f46d54 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1,3 +1,2 @@
-DIST java-cup-src-11b-20150326.tar.gz 376913 SHA256 3df107f48b9726d1bf6c4061f6a1304b125aa766da211cd17ff85a2d56339825 SHA512 020beda9f019e03b1d35a20b7c10f4d43d5d39e46f3beb0a993fe6471f4c1369440d76b4f88a6161f8169406760720c7811c07396ca0ad7eab5ee9e4b091b733 WHIRLPOOL 54e2b7d53918c0e053c690c0db14e5ab2ddc2454c64f7a531690b9e4fe37e76aee1e9bb3711cc515423cf2d288ca7054a903d331619b1dd0a28f62121555e004
 DIST java-cup-src-11b-20151001.tar.gz 313405 SHA256 959189360a8530c9e06cbf8cb99795bb4fcc25a00d774e961c98611c769b8f33 SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e WHIRLPOOL cba8a784f156b21ae2a40afe02112b5bded04176bd54b3190f1d210e5603334553f170b02f91f970ade3f68d8d00715f1237dd43476712f4e24c5d0857bf6304
 DIST javacup-0.11a_beta20060608.tar.bz2 285727 SHA256 cb3ad4951d734bd1e5a6ff835018dea26a47564f820ae0a925f9c30f2fb7e1ff SHA512 383172f7d9cb127ad5d1d6de561eaf53b057bf7511f6f8c353fc03860daabb023e11330e0518b9c390e255a643c9c1e609b5fbdfd3c2e92dd68dc2d2354a931f WHIRLPOOL 6480219de3a997eb9a942ce816f9868dc13d06b8c0553521e9cf37fe568265cf752efcd36d9b64ea424d225d4823fce0652c9b0d7e1c853e38cd9f00fb12ce30

diff --git a/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch
deleted file mode 100644
index 5aa3463..0000000
--- a/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1488926a5731b17a577a1fd161eb95b88458a09b Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Fri, 7 Aug 2015 21:42:29 +0200
-Subject: [PATCH] Bundled JFlex.jar also contains java_cup/runtime/Scanner, our
- replacement does not
-
----
- build.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build.xml b/build.xml
-index 33f0c60..89c9793 100644
---- a/build.xml
-+++ b/build.xml
-@@ -53,7 +53,7 @@
-   </target>
- 
-   <taskdef name="cup" classname="java_cup.anttask.CUPTask" classpath="${bin}/java-cup-11.jar" />
--  <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar" />
-+  <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar:${bin}/java-cup-11.jar" />
- 
-   <target name="cup" depends="init">
-     <cup srcfile="${cup}/parser.cup" interface="on" destdir="${java}" parser="parser" symbols="sym" quiet="false" nonterms="true"/>
--- 
-2.5.0
-

diff --git a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
deleted file mode 100644
index 46cd7d6..0000000
--- a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="CUP Parser Generator for Java"
-
-HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
-
-# We cannot put the actual SRC_URI because it causes conflicts with Gentoo mirroring system
-# No better URI is available, waiting until it hits actual Gentoo mirrors
-
-MY_PV=${PV/_beta/-}
-MY_PV=${MY_PV##0.}
-SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="userland_BSD system-jflex"
-
-# find for bug #214664
-DEPEND=">=virtual/jdk-1.5
-	system-jflex? ( dev-java/jflex:0 )
-	!userland_BSD? ( >=sys-apps/findutils-4.4 )
-	>=dev-java/ant-core-1.7.0:0"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build-xml.patch
-	epatch "${FILESDIR}"/${P}-build-xml-svn.patch
-
-	find . -name '*.class' -delete || die
-
-	if use system-jflex; then  # break the circular dependency
-		rm bin/JFlex.jar || die
-		java-pkg_jar-from --build-only jflex JFlex.jar bin/JFlex.jar
-	fi
-
-	java-ant_rewrite-classpath
-}
-
-src_compile() {
-	local classpath="$(java-pkg_getjars --build-only ant-core)"
-
-	eant -Dgentoo.classpath="${classpath}"
-	rm bin/java-cup-11.jar || die
-	cp dist/java-cup-11b.jar bin/java-cup-11.jar || die
-	eant clean
-
-	einfo "Recompiling with newly generated javacup"
-	eant -Dgentoo.classpath="${classpath}"
-	use doc && javadoc -sourcepath src/ java_cup -d javadoc
-}
-
-src_install() {
-	java-pkg_newjar dist/java-cup-11b.jar
-	java-pkg_newjar dist/java-cup-11b-runtime.jar ${PN}-runtime.jar
-	java-pkg_register-ant-task
-
-	dodoc changelog.txt || die
-	dohtml manual.html || die
-	use source && java-pkg_dosrc java/*
-	use doc && java-pkg_dojavadoc javadoc
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/javacup/files/, dev-java/javacup/

[Arthur Zamarin]

commit:     6ffdba146792e45f64fdfbfeeab952c715e0b2f7
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Sep 28 13:01:06 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> 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 <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> 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 <sebastian@pipping.org>
-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 @@
-     <mkdir dir="${classes}" />
-     <mkdir dir="${dist}" />
-     <loadfile property="cupversion" srcFile="version.txt"/>
--    <exec executable="svn" outputproperty="svnversion">
--      <arg value="info"/>
--      <redirector>
--	<outputfilterchain>
--	  <linecontains>
--	    <contains value="Revision"/>
--	  </linecontains>
--	  <deletecharacters chars="Revision: "/>
--        </outputfilterchain>
--      </redirector>
--    </exec>
-   </target>
- 
-   <property environment="env" />
-@@ -67,7 +56,7 @@
-     <copy todir="${java}"><fileset dir="${src}"></fileset></copy>
-     <replace file="${java}/java_cup/version.java"
-        token="+ version_str"
--       value='+ "v0.11b ${cupversion} (SVN rev ${svnversion})"'>
-+       value='+ "v0.11b ${cupversion}"'>
-     </replace>
-     <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.5" target="1.5">
-       <classpath refid="libraries"/>
--- 
-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
-}