dev-java/javacup: Resolve calling of svn (bug #556998)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

4 files changed, 58 insertions, 7 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/Manifest b/dev-java/javacup/Manifest
index b2d296ba8e83..83389d031a1a 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX javacup-0.11b_beta20150326-build-xml-svn.patch 1385 SHA256 5f8b468bacc48ee0ba9cbdc07c4d4066286647d8efa2f38ce9c27fc55193547a SHA512 211157370c61995a05ce45e70941d99da9031174fae2b6e4bbacfdd0c402c451009eb5952a8c3cf8a586402aa138e70733dfd46ce9cf6b5fb680edf65657506c WHIRLPOOL 5c736d4114f5557bdf179dd9bacff1eeaaba345dafc354592fc895e61737e9dd023878eb0ebc579098584d912b60df61f49a8018bc874ea62390425b03a15355
 AUX javacup-0.11b_beta20150326-build-xml.patch 949 SHA256 9dd0eadd540a3bd202485f79a1459b3dcf853d1bdfe7c76493f28cc5057a8010 SHA512 393d2300cafb6e7f1acf3377de1292374cee1e4da950b4b130d6558cceffd82b521dea9af2228899247c0aecf7ae3b6de43e42495da8c8292fe4d0f788de96be WHIRLPOOL 49160d10d390404de30e1d4cdc2fc6564f33dbf6eff9c6f7c446a66f7d1ce73b4a5e1818531179f3b6982afd3b161c88b12dabd1dab8aeab4ac36db5ac9e7dbc
 DIST java-cup-src-11b-20150326.tar.gz 376913 SHA256 3df107f48b9726d1bf6c4061f6a1304b125aa766da211cd17ff85a2d56339825 SHA512 020beda9f019e03b1d35a20b7c10f4d43d5d39e46f3beb0a993fe6471f4c1369440d76b4f88a6161f8169406760720c7811c07396ca0ad7eab5ee9e4b091b733 WHIRLPOOL 54e2b7d53918c0e053c690c0db14e5ab2ddc2454c64f7a531690b9e4fe37e76aee1e9bb3711cc515423cf2d288ca7054a903d331619b1dd0a28f62121555e004
 DIST javacup-0.11a_beta20060608.tar.bz2 285727 SHA256 cb3ad4951d734bd1e5a6ff835018dea26a47564f820ae0a925f9c30f2fb7e1ff SHA512 383172f7d9cb127ad5d1d6de561eaf53b057bf7511f6f8c353fc03860daabb023e11330e0518b9c390e255a643c9c1e609b5fbdfd3c2e92dd68dc2d2354a931f WHIRLPOOL 6480219de3a997eb9a942ce816f9868dc13d06b8c0553521e9cf37fe568265cf752efcd36d9b64ea424d225d4823fce0652c9b0d7e1c853e38cd9f00fb12ce30
 EBUILD javacup-0.11a_beta20060608.ebuild 1790 SHA256 9000d71da2734f3c8e864203dfca3ccc64633e36bd611464f091402f42f0f43d SHA512 e9c291c2201ceab9cdb752b51ef63bcd24d73720cbb7c430c733b7dfc4f24c005f98827237e6393eb28a17998ee1303b93f3d6544be489fb39ea1cf4ae2ad6cc WHIRLPOOL 5f9410130b549860576f43e5304644cddfd3eeaa40673696d03d38c29706219a3e6783e371e7e8c0380bbec8843b648b9f5ceaeaf2e3874d58398c4221ccca26
-EBUILD javacup-0.11b_beta20150326.ebuild 2090 SHA256 c6827211af77aaace6243addaf63ecbd4a708e8c787f9a66793d5a728c31f177 SHA512 1b7dd851353a7fba55d739697a3982f006166b2beaa0e780cd777b17571f38b9a8ae6b95ff395b575220ae489d21f78262fb256c44b0e646cbd64966a2939921 WHIRLPOOL 9630e4183225fa276037197f1c3efae38b5972ea1947f4c9556388ca34a2261c70c5b606226927f10b47b5e7cc82c4af385152ecdebdb32397b78fe4b8f3626c
-MISC ChangeLog 4903 SHA256 92b176c4dfb02d2da7f7a0bf15b4d477a796371a5c2b67ecea0dbd8c9cd44e98 SHA512 5ec86132df9df2f89b2fdbaa5d59e3bfd1853e61050a73243c4eac8b19a9c34edeb897a188b26eca229764234e94d5f3b8fdcc21b92aa3b463f1f149bb9efa74 WHIRLPOOL 838a1d77cf472a9fa43697b62d15e5de4a7ba41d890c7bc6cc28509e02855b354ae03f97e4f92684f57bdefc2f7763028a53c06d3eb3e1c8a0dfc3442659e1d9
+EBUILD javacup-0.11b_beta20150326.ebuild 2137 SHA256 ca30eebaed35ad7ccd92661cb25af45aa13d433bf312188355fc724684b41625 SHA512 ae1acec9c9f4738a14dca4cbbe6cd74de806bcd1b2cb61af2b6ec14e07e918d384b23e9150b211e103dfcf7600a9ea6264d2095c9d7421ca53651f08e2ecb4c0 WHIRLPOOL c3137b8796f319d2c277c020e9a25dda969328e93646483284c131cbcb643b609d8de06cca103ec7bbf9626512c7c5808ccef913e0d1fe804d177c6a2db35a21
+MISC ChangeLog 5089 SHA256 a3b8cb30e3b0a4402206d84856cdab4b4358332ffebcb1f2e547c6631bd7ad73 SHA512 81e8c3d9dc050948d5a8f00ad66b6db117b1d0323de768116ecbf546cd148bd9fb9e33dd0cabf16043646057488261789b798ebcb597ee0df03722428435971a WHIRLPOOL 4d885dcd0e06f9134ec312a31b6ff0d7a9e195573cd7f9c3d8bade06715022f6c6288ce5fe9332b70f994062a316e5702354adc7d0ce16a9f7d7de2038dd7f2c
 MISC metadata.xml 370 SHA256 1b8730623493e18e34cdddf569793af693ade323d3c688916711a52c9cd61438 SHA512 251403631412484e52c902420e4c3b5e5f4014b5503587f851c9800963360688308bc4c21b8b4c47716c3f3d8dcf2e20054a4aee420fcde47a8bc83564cbcc85 WHIRLPOOL f251297ba390d5e508e68e714d3f61984d1cc0d04c7118c56311b8c5a0d7a1cf15c31e0151ad9a5f83a7074d5e10c8777d383869e65dacbfaa78d0c9b541876f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlXFVcwACgkQsAvGakAaFgDDEwCfR3OPcNv+p3uQUxUOlaV7e2Ys
-VT8Ani5od8b2w7y6LTTLkTEVWYjouQk1
-=IVFD
+iEYEAREIAAYFAlXF/HcACgkQsAvGakAaFgDC5ACfUoOKzx9L5nuDuZPDnwoq0uY0
+GW0AoMAFVAqQkUolEjKml55O5MHm9Dal
+=Gj24
 -----END PGP SIGNATURE-----
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