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

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

4 files changed, 143 insertions, 275 deletions

diff --git a/dev-java/jflex/ChangeLog b/dev-java/jflex/ChangeLog
index 8bd5b553a609..439e1e514445 100644
--- a/dev-java/jflex/ChangeLog
+++ b/dev-java/jflex/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2015/01/31 19:34:36 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.18 2015/01/31 19:42:17 monsieurp Exp $
+
+  31 Jan 2015; Patrice Clement <monsieurp@gentoo.org>
+  files/jflex-1.5.0-build.xml, jflex-1.5.0.ebuild:
+  Patch to fix jflex-1.5.0 (bug 505498) courtesy of Martin Walch
+  <walch.martin@web.de>.
 
   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
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 281461bf08e8..e1db6c5fa02d 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,12 +1,12 @@
 AUX jflex-1.4.1-build.xml.patch 1216 SHA256 2b57811076497845bae61a0ea46026e2aaa92da14014a6ee57b2931202a3b9b9 SHA512 8071b70812556192d50766901f64258657c462ac66108ecfbb77afb136a5e189923e538f7dda61b23d7b76ed16bff3a4a3481635bdb3c85f9cf26786526a10c5 WHIRLPOOL 8c2526ed591e110834c8386fff2b50460d98c3e38f4c3f170588bf7b8f8b3eba89591cd4bf3014a73d3a5687f0bc32730d7b20f38ca992e1abcb4d553a1dbb03
-AUX jflex-1.5.0-build.xml 12957 SHA256 881595d2aa93f4fe83fda29686aa03b64979b2e5323619c767c04bcab01ad345 SHA512 9ef2510ddcaad7b00bb022ce6fe0c6944783ad30a6506cd7f6c97d604595f6428f4cc616d069ad9c92ad0e06f817be5aa09cc868e521e2311f8c88fe79cd070f WHIRLPOOL 6266778843bfbf1bebd8f7f99485a944267d7df7a92bd10564fca532e24c0218cc6283d500ab0256a87385ab9ac6d3310af34f0e6e8a922c2d5d6fb5d5fbf65e
+AUX jflex-1.5.0-build.xml 5935 SHA256 f38fff8c8c1483df8019a53f4ee0cc6cd73894c56d35b8414670a30205d52e7f SHA512 723e9a3957029a93606effd863b86dad33d80beacab4c64e10e7fdfd36ee1bc76da3b290ca9b99fb450f028960bd57da3deab8fa8cc5cd8e3e3bb94d966ee955 WHIRLPOOL 6510e01f41209f5854d24a990c00cb47fd79377652c1c98f9a3f6c034eaa9b96c81bc6fa9b24941f92dd75bda4cb69546a70fe4e11bdbf1cab8a2a1248211ced
 DIST jflex-1.4.3.tar.gz 1214420 SHA256 6ccdcf15fe9f1d863d538e8b1cfd428b8628a645d247adc40071d1ae70ede2f2 SHA512 901106ea5a9108ba6016da55093801fbaee50f8f8fb45f290cae3bb989663838e83a4d8484bc633b9acf2c085c83304a47d9348255d106117dace3d5f44ea835 WHIRLPOOL 709c130037be6491ea1a9d6301dcc4acc643c9d1127d11a0dccb9d7339fda7fe06ba159100c3f4ad34d7b34c6b5336f2328f6bdf7ee8cdf87e752e371120ff8d
 DIST jflex-1.5.0.tar.gz 2827866 SHA256 76b11d00fe94f79331a74045c7aaea292a80cb311a6840d0dd53209e81d4cb64 SHA512 5d46d3339a8e435228e8dab55ac52bbb40b4b39ea9c28963c5d02298f0ed8a7e8a66573003f165badb4c3939d6bd88852343d886d3b6c2bd78d17320201c3137 WHIRLPOOL 22d44cc90bf09666f0139c83cde2f9330ed12e2dd3313573d948527d2a0d420b71512a764c5579a94d4d30f4a573180bec2c08c37c3e3c81f079a018bee1a3b1
 DIST jflex-1.5.1.tar.gz 2764584 SHA256 3b24ed6ace401e70d71f82a65179a4eb958756f43ed4c647ce75f340f644becd SHA512 e0bb95fd70add73b662c34ff5821f9822bf1e982bd669bc4497bf210555ccd455b1d216391864e9983a4f90d430e0f8b57667c0f0623a8dfb0ff1ef97b2f5572 WHIRLPOOL 123668156410891a9a4c755cd7fbb4464c88b57c00d01ed4d4679c6b5b66e3d355b7006356937c54cc7a14a4b9bd7619912bd0186fc5b8a19294406fa432008b
 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.0.ebuild 2043 SHA256 62fdbdd10aa91994f421b8d78b1ce61418e9b9977a47503435a3014c29eef74d SHA512 6bf257b243a7cd460890f9ff32300bf210ebf5e2e8b89e2ae5d8de8324678dc2d4b61b02d73394a493f951db68199eec9c837c1107bb77b39920c3b311a1442a WHIRLPOOL 4077ba8fa0ccb7fb69045aa6e827870862816b23473da5f545b2f99f994238f7f8d72fa8fafd86b3605c9bceaa6bff7bddf197399ac20f3c4ea07bc02c088c79
 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 2631 SHA256 20f8102600418cb8c528833d0ef6b5380353986613e95f493f19369fab2b8bdd SHA512 5ec40a57eaeaedc4be8268ee2ce4e4d42c703439e3028e9ba87065c52fa3265d7372d993b03a121ffc98f23dc80958908f7972f84b24d3b7c83d288c19bb7383 WHIRLPOOL bd751a06fd26a932b278b762e4f4e6b71cb84c86fec2e21a9750efa373c00680b98ba2bb5d58def02a8aa162df08098dab2e59753e6a4861a393b797dc7589b5
+MISC ChangeLog 2827 SHA256 58f4a1382530c03093fab48223df9cd696a2a6a497e4e464265379a381f4ff2d SHA512 ecd00b1b4d1fa50d8f0f1a3c179f3ea4843e19c63a077278f30aff26340d878469c0dc2f116c80f5ea89d9182143cdc6c88813d648f65d298c9b82600d016225 WHIRLPOOL 693032c84e52cd6ca0e8bc32e062403b6b645edb7f0187311561e43951601d582163357bf0bf81086540eb521ec7a3e20f5823adc94ce58fb5e5bbbb06361b37
 MISC metadata.xml 290 SHA256 e365b92e59f17ebb03d11d7c77908f81b3dd4cf230ff5817bf783228f144ae92 SHA512 61e1cff591501b1ee65715620d124a955960ac98fcfea7e2bbc5e4abe7fbbb963035c39c337a6612cd4a51688403141c06218318b015804897a9cb99726da5cc WHIRLPOOL 3fb116713a39a45cbc80a10cdaf9fe252946d4ac769443c0ae2b0da54b9155a4b4c341981322d413851852a71f75ce00f31bd903d349a59bf78a46b76c30ee19
diff --git a/dev-java/jflex/files/jflex-1.5.0-build.xml b/dev-java/jflex/files/jflex-1.5.0-build.xml
index 0b0f32727da4..9ac1be49a7d6 100644
--- a/dev-java/jflex/files/jflex-1.5.0-build.xml
+++ b/dev-java/jflex/files/jflex-1.5.0-build.xml
@@ -1,286 +1,149 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 3/8/14 4:23 PM                        -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jflex-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jflex-1.5.0"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
+<?xml version="1.0"?>
+<project name="JFlex" default="help">
+
+  <property name="version" value="1.5.0" />
+  <property name="bootstrap.version" value="1.5.0" />
+  <property name="junit.version" value="4.11" />
+  <property name="cup.version" value="11a" />
+  <property name="java.source.version" value="1.5" />
+    
+  <!-- use any of these files to override properties -->
+  <property file="build.properties" />
+  <property file="${user.home}/.jflex.properties" />
+  
+  <!-- location of development tools necessary for the build -->
+  <property name="lib.dir" value="lib"/>
+    
+  <!-- override these if you want to use your own versions -->
+  <property name="bootstrap.jflex.jar" value="${lib.dir}/jflex-${bootstrap.version}.jar" />
+  <property name="cup.jar" value="${lib.dir}/java-cup-${cup.version}.jar" />
+  <property name="junit.jar" value="${lib.dir}/junit-${junit.version}.jar" />
+
+  <!-- where to get tool jars from -->
+  <property name="maven.central.url" value="http://central.maven.org/maven2" />
+  <property name="bootstrap.jflex.jar.url" 
+  	        value="${maven.central.url}/de/jflex/jflex/${bootstrap.version}/jflex-${bootstrap.version}.jar" />
+  <property name="junit.jar.url"
+            value="${maven.central.url}/junit/junit/${junit.version}/junit-${junit.version}.jar" />
+
+  <!-- where build output goes, including the jflex jar -->
+  <property name="build.dir" value="build"/>
+  <property name="generated.sources.dir" value="${build.dir}/generated-sources"/>
+  <property name="compile.output.dir" value="${build.dir}/classes"/>
+  <property name="test.compile.output.dir" value="${build.dir}/test-classes"/>
+  <property name="tests.dir" value="${build.dir}/tests"/>
+
+  <!-- where the output jar goes -->
+  <property name="output.jar.name" value="${build.dir}/jflex-${version}.jar" />
+  	        
+  <target name="help" description="show help message">
+  	<echo message="Ant build file for JFlex. Useful targets:"/> 
+  	<echo message=""/> 
+  	<echo message="gettools:  download development tools for the build"/> 
+  	<echo message="clean:     remove all generated and compiled files"/>
+    <echo message="compile:   generates sources and compiles non-test classes"/>
+  	<echo message="jar:       make ${output.jar.name}"/>
+    <echo message="build:     complete build from scratch (clean jar)"/>
+    <echo message="test:      run the unit tests"/>
+  	<echo message=""/> 
+  	<echo message="Use the gettool target or override the *.jar properties"/>
+  	<echo message="before you do the first build."/> 
+  </target> 
+
+  <target name="gettools" description="download development tools">
+    <get src="${bootstrap.jflex.jar.url}" dest="${bootstrap.jflex.jar}"/>
+    <get src="${junit.jar.url}" dest="${junit.jar}"/>
   </target>
 
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
+  <target name="build" depends="clean,jar" 
+          description="complete build from scratch (clean jar)"/>
 
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
+  <target name="clean" description="remove all generated and compiled files">
+    <delete includeemptydirs="true">
+      <fileset dir="${build.dir}" includes="**/*"/>
+    </delete>
   </target>
 
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
+  <target name="jar" depends="compile,-copy-resources" 
+          description="make ${output.jar.name}">
+    <jar basedir="${compile.output.dir}" jarfile="${output.jar.name}">
+      <manifest>
+        <attribute name="Main-Class" value="jflex.Main"/>
+      </manifest>
+    </jar>
+  </target>
 
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
+  <target name="compile" depends="-generate-scanner,-generate-parser"
+          description="generate sources and compile all non-test classes">
+    <mkdir dir="${compile.output.dir}" />
+    <javac destdir="${compile.output.dir}"
+           target="${java.source.version}"
+           source="${java.source.version}"
+           debug="on"
+           includeantruntime="true">
+      <src path="src/main/java"/>
+      <src path="${generated.sources.dir}"/>
     </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
   </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
+    
+  <target name="test" depends="compile,-copy-resources,-compile-test">
+    <mkdir dir="${tests.dir}"/>
+    <junit dir="." printsummary="true" errorproperty="junit.failed">
       <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
+        <file file="${junit.jar}"/>
+        <pathelement location="${compile.output.dir}"/>
+        <pathelement location="${test.compile.output.dir}"/>
       </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/*Test.java"/>
-          <include name="**/*Tests.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
+      <assertions>
+        <enable/>
+      </assertions>
+      <batchtest fork="yes" todir="${tests.dir}">
+        <formatter type="plain"/>
+        <fileset dir="src/test/java">
+          <include name="**/*Test*.java"/>
         </fileset>
       </batchtest>
     </junit>
+    <fail if="junit.failed"/>
   </target>
 
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
+  <target name="-copy-resources">
+    <copy todir="${compile.output.dir}">
+      <fileset dir="src/main/resources"/>
+    </copy>
   </target>
 
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
+  <target name="-generate-scanner">
+    <taskdef classname="jflex.anttask.JFlexTask" 
+             name="jflex" classpath="${bootstrap.jflex.jar}"/>
+    <mkdir dir="${generated.sources.dir}/jflex"/>
+    <jflex file="src/main/jflex/LexScan.flex"
+           outdir="${generated.sources.dir}/jflex"
+           skeleton="src/main/jflex/skeleton.nested"
+           nobak="on"/>
   </target>
 
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
+  <target name="-generate-parser">
+    <taskdef classname="java_cup.anttask.CUPTask" 
+             name="cup" classpath="${cup.jar}"/>
+    <mkdir dir="${generated.sources.dir}"/>
+    <cup srcfile="src/main/cup/LexParse.cup" 
+         destdir="${generated.sources.dir}" 
+         interface="true" 
+         parser="LexParse"/>
   </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
+    
+  <target name="-compile-test" depends="compile">
+    <mkdir dir="${test.compile.output.dir}"/>
+    <javac srcdir="src/test/java"
+           destdir="${test.compile.output.dir}"
+           target="${java.source.version}"
+           source="${java.source.version}"
+           classpath="${compile.output.dir}:${junit.jar}"
+           includeantruntime="true"/>
   </target>
 
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class" 
-                   value="jflex.Main"/>
-      </manifest>
-    </jar>
+  <target depends="compile" name="javadoc">
+    <javadoc packagenames="jflex" sourcepath="src/main/java:build/generated-sources" destdir="javadoc" version="true" />
   </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/org/apache/ant/ant/1.7.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/apache/ant/ant/1.7.0/ant-1.7.0.jar" 
-         dest="${maven.repo.local}/org/apache/ant/ant/1.7.0/ant-1.7.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/apache/ant/ant/1.7.0/ant-1.7.0.jar" 
-         dest="${maven.repo.local}/org/apache/ant/ant/1.7.0/ant-1.7.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/apache/ant/ant-launcher/1.7.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar" 
-         dest="${maven.repo.local}/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar" 
-         dest="${maven.repo.local}/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.11"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.11/junit-4.11.jar" 
-         dest="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar" 
-         dest="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
 </project>
diff --git a/dev-java/jflex/jflex-1.5.0.ebuild b/dev-java/jflex/jflex-1.5.0.ebuild
index 689b13ec9d78..ba15541abc62 100644
--- a/dev-java/jflex/jflex-1.5.0.ebuild
+++ b/dev-java/jflex/jflex-1.5.0.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.0.ebuild,v 1.1 2014/03/08 16:17:17 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild,v 1.2 2015/01/31 19:42:17 monsieurp Exp $
 
 EAPI="5"
 
@@ -28,7 +28,7 @@ DEPEND=">=virtual/jdk-1.5
 IUSE="${JAVA_PKG_IUSE} source vim-syntax"
 
 java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+	cp "${FILESDIR}"/"${P}"-build.xml "${S}"/build.xml
 }
 
 # TODO: Try to avoid using bundled jar (See bug #498874)
@@ -40,17 +40,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 +58,14 @@ src_test() {
 }
 
 src_install() {
-	java-pkg_newjar target/${P}.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 doc/manual.ps.gz src/changelog
+		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