Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/javacup/files/, dev-java/javacup/
Date: Sun, 22 Nov 2015 21:37:06
Message-Id: 1448228212.1b95f8fe89daf404ada61645d7da160f57d3660a.chewi@gentoo
1 commit: 1b95f8fe89daf404ada61645d7da160f57d3660a
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 22 21:30:36 2015 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 22 21:36:52 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b95f8fe
7
8 dev-java/javacup: Remove old
9
10 Package-Manager: portage-2.2.25
11
12 dev-java/javacup/Manifest | 1 -
13 .../javacup-0.11b_beta20150326-build-xml.patch | 26 --------
14 dev-java/javacup/javacup-0.11b_beta20150326.ebuild | 72 ----------------------
15 3 files changed, 99 deletions(-)
16
17 diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
18 index 314e674..9f46d54 100644
19 --- a/dev-java/javacup/Manifest
20 +++ b/dev-java/javacup/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST java-cup-src-11b-20150326.tar.gz 376913 SHA256 3df107f48b9726d1bf6c4061f6a1304b125aa766da211cd17ff85a2d56339825 SHA512 020beda9f019e03b1d35a20b7c10f4d43d5d39e46f3beb0a993fe6471f4c1369440d76b4f88a6161f8169406760720c7811c07396ca0ad7eab5ee9e4b091b733 WHIRLPOOL 54e2b7d53918c0e053c690c0db14e5ab2ddc2454c64f7a531690b9e4fe37e76aee1e9bb3711cc515423cf2d288ca7054a903d331619b1dd0a28f62121555e004
23 DIST java-cup-src-11b-20151001.tar.gz 313405 SHA256 959189360a8530c9e06cbf8cb99795bb4fcc25a00d774e961c98611c769b8f33 SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e WHIRLPOOL cba8a784f156b21ae2a40afe02112b5bded04176bd54b3190f1d210e5603334553f170b02f91f970ade3f68d8d00715f1237dd43476712f4e24c5d0857bf6304
24 DIST javacup-0.11a_beta20060608.tar.bz2 285727 SHA256 cb3ad4951d734bd1e5a6ff835018dea26a47564f820ae0a925f9c30f2fb7e1ff SHA512 383172f7d9cb127ad5d1d6de561eaf53b057bf7511f6f8c353fc03860daabb023e11330e0518b9c390e255a643c9c1e609b5fbdfd3c2e92dd68dc2d2354a931f WHIRLPOOL 6480219de3a997eb9a942ce816f9868dc13d06b8c0553521e9cf37fe568265cf752efcd36d9b64ea424d225d4823fce0652c9b0d7e1c853e38cd9f00fb12ce30
25
26 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
27 deleted file mode 100644
28 index 5aa3463..0000000
29 --- a/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch
30 +++ /dev/null
31 @@ -1,26 +0,0 @@
32 -From 1488926a5731b17a577a1fd161eb95b88458a09b Mon Sep 17 00:00:00 2001
33 -From: Sebastian Pipping <sebastian@×××××××.org>
34 -Date: Fri, 7 Aug 2015 21:42:29 +0200
35 -Subject: [PATCH] Bundled JFlex.jar also contains java_cup/runtime/Scanner, our
36 - replacement does not
37 -
38 ----
39 - build.xml | 2 +-
40 - 1 file changed, 1 insertion(+), 1 deletion(-)
41 -
42 -diff --git a/build.xml b/build.xml
43 -index 33f0c60..89c9793 100644
44 ---- a/build.xml
45 -+++ b/build.xml
46 -@@ -53,7 +53,7 @@
47 - </target>
48 -
49 - <taskdef name="cup" classname="java_cup.anttask.CUPTask" classpath="${bin}/java-cup-11.jar" />
50 -- <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar" />
51 -+ <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar:${bin}/java-cup-11.jar" />
52 -
53 - <target name="cup" depends="init">
54 - <cup srcfile="${cup}/parser.cup" interface="on" destdir="${java}" parser="parser" symbols="sym" quiet="false" nonterms="true"/>
55 ---
56 -2.5.0
57 -
58
59 diff --git a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
60 deleted file mode 100644
61 index 46cd7d6..0000000
62 --- a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
63 +++ /dev/null
64 @@ -1,72 +0,0 @@
65 -# Copyright 1999-2015 Gentoo Foundation
66 -# Distributed under the terms of the GNU General Public License v2
67 -# $Id$
68 -
69 -EAPI="5"
70 -
71 -JAVA_PKG_IUSE="source doc"
72 -
73 -inherit eutils java-pkg-2 java-ant-2
74 -
75 -DESCRIPTION="CUP Parser Generator for Java"
76 -
77 -HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
78 -
79 -# We cannot put the actual SRC_URI because it causes conflicts with Gentoo mirroring system
80 -# No better URI is available, waiting until it hits actual Gentoo mirrors
81 -
82 -MY_PV=${PV/_beta/-}
83 -MY_PV=${MY_PV##0.}
84 -SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
85 -
86 -LICENSE="GPL-2"
87 -SLOT="0"
88 -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"
89 -IUSE="userland_BSD system-jflex"
90 -
91 -# find for bug #214664
92 -DEPEND=">=virtual/jdk-1.5
93 - system-jflex? ( dev-java/jflex:0 )
94 - !userland_BSD? ( >=sys-apps/findutils-4.4 )
95 - >=dev-java/ant-core-1.7.0:0"
96 -RDEPEND=">=virtual/jre-1.5"
97 -
98 -S="${WORKDIR}"
99 -
100 -src_prepare() {
101 - epatch "${FILESDIR}"/${P}-build-xml.patch
102 - epatch "${FILESDIR}"/${P}-build-xml-svn.patch
103 -
104 - find . -name '*.class' -delete || die
105 -
106 - if use system-jflex; then # break the circular dependency
107 - rm bin/JFlex.jar || die
108 - java-pkg_jar-from --build-only jflex JFlex.jar bin/JFlex.jar
109 - fi
110 -
111 - java-ant_rewrite-classpath
112 -}
113 -
114 -src_compile() {
115 - local classpath="$(java-pkg_getjars --build-only ant-core)"
116 -
117 - eant -Dgentoo.classpath="${classpath}"
118 - rm bin/java-cup-11.jar || die
119 - cp dist/java-cup-11b.jar bin/java-cup-11.jar || die
120 - eant clean
121 -
122 - einfo "Recompiling with newly generated javacup"
123 - eant -Dgentoo.classpath="${classpath}"
124 - use doc && javadoc -sourcepath src/ java_cup -d javadoc
125 -}
126 -
127 -src_install() {
128 - java-pkg_newjar dist/java-cup-11b.jar
129 - java-pkg_newjar dist/java-cup-11b-runtime.jar ${PN}-runtime.jar
130 - java-pkg_register-ant-task
131 -
132 - dodoc changelog.txt || die
133 - dohtml manual.html || die
134 - use source && java-pkg_dosrc java/*
135 - use doc && java-pkg_dojavadoc javadoc
136 -}