Patch to fix jflex-1.5.1 (bug 505498) courtesy of Martin Walch <walch.martin@web...

Package-Manager: portage-2.2.14/cvs/Linux x86_64

diff --git a/dev-java/jflex/ChangeLog b/dev-java/jflex/ChangeLog
index b3a071a94b8c673a98de3759b9f70ab50166e5dd..8bd5b553a609075d2878d6abf2a0904efe1cab19 100644 (file)
--- a/dev-java/jflex/ChangeLog
+++ b/dev-java/jflex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jflex
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.16 2015/01/18 21:16:24 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.17 2015/01/31 19:34:36 monsieurp Exp $
+
+  31 Jan 2015; Patrice Clement <monsieurp@gentoo.org> jflex-1.5.1.ebuild:
+  Patch to fix jflex-1.5.1 (bug 505498) courtesy of Martin Walch
+  <walch.martin@web.de>.
 
 *jflex-1.6.0 (18 Jan 2015)
 

diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 781fcf885765ba159b16d058b4ec63a390d151a0..281461bf08e86cfdd82349c1ab140bde6a7cb6b0 100644 (file)
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -6,7 +6,7 @@ DIST jflex-1.5.1.tar.gz 2764584 SHA256 3b24ed6ace401e70d71f82a65179a4eb958756f43
 DIST jflex-1.6.0.tar.gz 3035885 SHA256 0774da0ee2d01fc9274179de4243e0d229c01b5cf0fbb78952fb7fdc4672190c SHA512 16ce4a89f75ce5f3da02433ff66d39ed4db567b4cf7469997dd2617b82e52d589bb17ec3a2f36b4d00a62233e48820bc2e043dcc9ae3c01f1eeca323c0166eba WHIRLPOOL 4d9e7e8c3a0da66d860b895699d5b50e29f781f1cf18cab436f545b1fb007297ca9433694ce3808452c5d9340eddc978c2b32019b5a8d5d8c6cb0558543ea18e
 EBUILD jflex-1.4.3.ebuild 1947 SHA256 d68b1cf96ee8204d62fed4d4421b4ea5006cd90d08b7941330b59cf6f0d138e8 SHA512 aab0b3cfe9e5dc967971b56bd516ac244db76eb5877724d47eebce6487535882dce51fa3c667674acfe0872d20f7d873a46b5a98cb9b8c18c3cbccbe1a3102ee WHIRLPOOL d9cee408c0dac6ebe4a80db112a518dfff9869c405b29a1eb6413ca932d0e9ead03b04b182080fc06d63d07b48146c6e6a6ec11dd580e12196d583421a24dd0b
 EBUILD jflex-1.5.0.ebuild 2056 SHA256 dc0b9045b22b26526fdf21c6fcda10ceac7497140fd0bf70b6402d38341371c6 SHA512 003fde27e32c5c013bdf094144eae3e80238566f50a08ebf1596c0127271e8b4483a1bb82c8005e05dddfa0965233bc8f2c73a6a5a8c987b498261b5c705343c WHIRLPOOL d1f564f47fc18c9020900c5ed8290a3146119810f6a4860033791d201d04578ef70c195ef9f84a89306cb5f944aa2ec9e2bd9e06ff4d06f0d3402c64f3e2ac69
-EBUILD jflex-1.5.1.ebuild 2058 SHA256 1820d2abdc7249bf2b039caf4d191cd92fcb3dfd3374c55ecd7b4c0525f7a3b9 SHA512 c8f5dfcfebaba47c1d8b6d6c55859c994ba80e26918b7aec497dbf9a401deb30c58105824e9c9a89ade5ccaa23ec93ad9abcfb15c0debdc49b0dcd1436ac0770 WHIRLPOOL 7680362272432e20d478cb733e13d17fb251a8ae0d7cccafd16c54d5279557f0f4358176ae5f144efc8783f886b796f595fcd91dee4724f341c6e02e3eb6c373
+EBUILD jflex-1.5.1.ebuild 2501 SHA256 2146d32fc50c22d88f421aaa682100e78a346b345054d31bc0ee2dc53e5c3a36 SHA512 519d1f14ac7a68f7a53cafdbb804ede4d6fabfa9cffaff9031343a0294a0f76b766a798c6abb45fd28634ad61d7646705237a4a6e2cfc06868a5562343f52c40 WHIRLPOOL e29ab8d34808dcd6e388bfcd359d116352de6710520eb09d08cac25a4b2670a777d552566463bf85d5f3b7af81db8382ab6104c582e2ab5106f5a2e8a48ab6d9
 EBUILD jflex-1.6.0.ebuild 2501 SHA256 d07b78586ef5182a90431f75aba6deec558a157072f6b30e6e832084ce7c5f98 SHA512 2cd74e26cf46324a7a1e669735bc91757a6b5fecd69591deb370328c5b5163221529eea9fd756fc9721bc699a48af1f82f5176ada9fe2549fc9dae9823743a12 WHIRLPOOL cb2aa6e432eaf4e281bd824aa4ac84e1ab4601e821ef9b5065d4627443565c09571525b6119b2e343c8aedf6c3f96e8230e21255df1e1387f808ee4a404d2d4e
-MISC ChangeLog 2466 SHA256 aa81ff830e6ecab6477e24e56854b24eef4c9d8c9ed343b267b18dce46f69c86 SHA512 141b2ee597620f575bfa08ca967ebedf7b5314363b6651ebfe407ec0e8d391c94b74a0b109c8917a2de7dbd01cb344aa3897f92dba44369e8806441227ac1813 WHIRLPOOL 69337ad2a1e50afd09370b317896f53724133010b984212615029ad190a14c071b7e8d352953625361d1718f599612a35acc576dc794e2acab37364edeff602a
+MISC ChangeLog 2631 SHA256 20f8102600418cb8c528833d0ef6b5380353986613e95f493f19369fab2b8bdd SHA512 5ec40a57eaeaedc4be8268ee2ce4e4d42c703439e3028e9ba87065c52fa3265d7372d993b03a121ffc98f23dc80958908f7972f84b24d3b7c83d288c19bb7383 WHIRLPOOL bd751a06fd26a932b278b762e4f4e6b71cb84c86fec2e21a9750efa373c00680b98ba2bb5d58def02a8aa162df08098dab2e59753e6a4861a393b797dc7589b5
 MISC metadata.xml 290 SHA256 e365b92e59f17ebb03d11d7c77908f81b3dd4cf230ff5817bf783228f144ae92 SHA512 61e1cff591501b1ee65715620d124a955960ac98fcfea7e2bbc5e4abe7fbbb963035c39c337a6612cd4a51688403141c06218318b015804897a9cb99726da5cc WHIRLPOOL 3fb116713a39a45cbc80a10cdaf9fe252946d4ac769443c0ae2b0da54b9155a4b4c341981322d413851852a71f75ce00f31bd903d349a59bf78a46b76c30ee19

diff --git a/dev-java/jflex/jflex-1.5.1.ebuild b/dev-java/jflex/jflex-1.5.1.ebuild
index 0bfbf06b0c8e34942463331436a095c173348448..c3be1846e38cb5e6ce3afccfde45b84e84ff11dd 100644 (file)
--- a/dev-java/jflex/jflex-1.5.1.ebuild
+++ b/dev-java/jflex/jflex-1.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v 1.2 2014/04/30 15:27:11 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v 1.3 2015/01/31 19:34:36 monsieurp Exp $
 
 EAPI="5"
 
@@ -28,7 +28,17 @@ DEPEND=">=virtual/jdk-1.5
 IUSE="${JAVA_PKG_IUSE} source vim-syntax"
 
 java_prepare() {
-       cp "${FILESDIR}"/${PN}-1.5.0-build.xml build.xml || die
+       # use a more convenient version number
+       sed -i s:"\(name=\"version\" value=\"\)[^\"]*\"":"\1${PV}\"":g build.xml
+       # fix bootstrapping
+       sed -i s:"\(name=\"bootstrap.version\" value=\"\)[^\"]*\"":"\1${PV}\"":g \
+               build.xml
+       # add javadoc capability to build.xml
+       sed -i s,"\(</project>\)",\
+"\n  <target depends=\"compile\" name=\"javadoc\">\n    <javadoc \
+packagenames=\"jflex\" sourcepath=\"src/main/java:build/generated-\
+sources\" destdir=\"javadoc\" version=\"true\" />\n  </target>\n\1",g \
+               build.xml
 }
 
 # TODO: Try to avoid using bundled jar (See bug #498874)
@@ -40,17 +50,17 @@ java_prepare() {
 EANT_GENTOO_CLASSPATH="ant-core"
 EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
 JAVA_ANT_REWRITE_CLASSPATH="true"
-ANT_TASKS="javacup"
+WANT_ANT_TASKS="javacup"
 
 src_compile() {
        java-pkg-2_src_compile
 
        # Compile another time, using our generated jar; for sanity.
-       cp target/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA}
+       cp build/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA}
        java-pkg-2_src_compile
 }
 
-# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet. 
+# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet.
 RESTRICT="test"
 
 src_test() {
@@ -58,14 +68,14 @@ src_test() {
 }
 
 src_install() {
-       java-pkg_newjar target/${PN}-*.jar ${PN}.jar
+       java-pkg_newjar build/${P}.jar ${PN}.jar
        java-pkg_dolauncher "${PN}" --main jflex.Main
        java-pkg_register-ant-task
 
        if use doc ; then
                dodoc doc/manual.pdf changelog.md
                dohtml -r doc/*
-               java-pkg_dojavadoc target/site/apidocs
+               java-pkg_dojavadoc javadoc
        fi
 
        use examples && java-pkg_doexamples examples