diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2015-08-08 12:56:22 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2015-08-08 12:56:22 +0000 |
| commit | 1bc2785dc2f3f16fefd2d6b524d2a22a5a008ae0 (patch) | |
| tree | ef25751a4cec7a841fede2c017ae6b0e4929c8ea | |
| parent | Initial version. Fixes bug #258898. (diff) | |
| download | gentoo-2-1bc2785dc2f3f16fefd2d6b524d2a22a5a008ae0.tar.gz gentoo-2-1bc2785dc2f3f16fefd2d6b524d2a22a5a008ae0.tar.bz2 gentoo-2-1bc2785dc2f3f16fefd2d6b524d2a22a5a008ae0.zip | |
dev-java/javacup: Resolve calling of svn (bug #556998)
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)
| -rw-r--r-- | dev-java/javacup/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch | 44 | ||||
| -rw-r--r-- | dev-java/javacup/javacup-0.11b_beta20150326.ebuild | 3 |
3 files changed, 52 insertions, 2 deletions
diff --git a/dev-java/javacup/ChangeLog b/dev-java/javacup/ChangeLog index 127a579d985f..a7ecf9bdb126 100644 --- a/dev-java/javacup/ChangeLog +++ b/dev-java/javacup/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/javacup # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.37 2015/08/08 01:05:15 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.38 2015/08/08 12:56:22 sping Exp $ + + 08 Aug 2015; Sebastian Pipping <sping@gentoo.org> + javacup-0.11b_beta20150326.ebuild, + +files/javacup-0.11b_beta20150326-build-xml-svn.patch: + Resolve calling of svn (bug #556998) 08 Aug 2015; Sebastian Pipping <sping@gentoo.org> javacup-0.11b_beta20150326.ebuild, metadata.xml: 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 new file mode 100644 index 000000000000..d5a14af3587b --- /dev/null +++ b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch @@ -0,0 +1,44 @@ +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_beta20150326.ebuild b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild index ab0ef7e21c56..82dcbafb52dc 100644 --- a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild +++ b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild,v 1.2 2015/08/08 01:05:15 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild,v 1.3 2015/08/08 12:56:22 sping Exp $ EAPI="5" @@ -37,6 +37,7 @@ S="${WORKDIR}" src_prepare() { epatch "${FILESDIR}"/${P}-build-xml.patch + epatch "${FILESDIR}"/${P}-build-xml-svn.patch find . -name '*.class' -delete || die |