Version bump to 1.5.0, EAPI 5, partially fixes bug #498874 reported by Mr. Anderson; remove old.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 385 insertions, 91 deletions

diff --git a/dev-java/jflex/ChangeLog b/dev-java/jflex/ChangeLog
index c2edda562306..70c123ea3ead 100644
--- a/dev-java/jflex/ChangeLog
+++ b/dev-java/jflex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jflex
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.12 2013/10/20 16:32:51 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.13 2014/03/08 16:17:17 tomwij Exp $
+
+*jflex-1.5.0 (08 Mar 2014)
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +files/jflex-1.5.0-build.xml,
+  +jflex-1.5.0.ebuild, -jflex-1.4.1-r1.ebuild:
+  Version bump to 1.5.0, EAPI 5, partially fixes bug #498874 reported by Mr.
+  Anderson; remove old.
 
   20 Oct 2013; Agostino Sarubbo <ago@gentoo.org> jflex-1.4.3.ebuild:
   Stable for ppc64, wrt bug #476958
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 1456071c4d95..9399635a5aa4 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX jflex-1.4.1-build.xml.patch 1216 SHA256 2b57811076497845bae61a0ea46026e2aaa92da14014a6ee57b2931202a3b9b9 SHA512 8071b70812556192d50766901f64258657c462ac66108ecfbb77afb136a5e189923e538f7dda61b23d7b76ed16bff3a4a3481635bdb3c85f9cf26786526a10c5 WHIRLPOOL 8c2526ed591e110834c8386fff2b50460d98c3e38f4c3f170588bf7b8f8b3eba89591cd4bf3014a73d3a5687f0bc32730d7b20f38ca992e1abcb4d553a1dbb03
-DIST jflex-1.4.1.tar.gz 986546 SHA256 6b70a95208b301ca6abcd80fb93c60de006b5b5d4fc9a7d63848bdf0c2e6973a SHA512 6f11f06a21802fca5975dbfe2f2abe47490d35b01e9abc1ef85d0f100b0915c111cc8fe91dd473c9fea0a46eab47e08a624114ef2d7d317b0343bc65f260e3ee WHIRLPOOL f6e018bde29350dcbc8987b278bc650a85797903c79d2c6d0f067fdd46d216e44759fcefbe41b5fada5533951ffa881bd19aeddaa6de6ff0208bc98f1e5696b1
+AUX jflex-1.5.0-build.xml 12957 SHA256 881595d2aa93f4fe83fda29686aa03b64979b2e5323619c767c04bcab01ad345 SHA512 9ef2510ddcaad7b00bb022ce6fe0c6944783ad30a6506cd7f6c97d604595f6428f4cc616d069ad9c92ad0e06f817be5aa09cc868e521e2311f8c88fe79cd070f WHIRLPOOL 6266778843bfbf1bebd8f7f99485a944267d7df7a92bd10564fca532e24c0218cc6283d500ab0256a87385ab9ac6d3310af34f0e6e8a922c2d5d6fb5d5fbf65e
 DIST jflex-1.4.3.tar.gz 1214420 SHA256 6ccdcf15fe9f1d863d538e8b1cfd428b8628a645d247adc40071d1ae70ede2f2 SHA512 901106ea5a9108ba6016da55093801fbaee50f8f8fb45f290cae3bb989663838e83a4d8484bc633b9acf2c085c83304a47d9348255d106117dace3d5f44ea835 WHIRLPOOL 709c130037be6491ea1a9d6301dcc4acc643c9d1127d11a0dccb9d7339fda7fe06ba159100c3f4ad34d7b34c6b5336f2328f6bdf7ee8cdf87e752e371120ff8d
-EBUILD jflex-1.4.1-r1.ebuild 1943 SHA256 142f67f97b5f87f0b9913ecdb0b7503bdb6e8997dab504987e6042b5437e83b8 SHA512 a274a503cf7e70c96167e4247e210b9c265bd97b2abaa2e58485b4f37da8f71e7f584ff63030c077868d8411527e1fdd2b365379e033ee7e2d7eea09a12841e4 WHIRLPOOL 4362942ec684df6960f3a67c128c6218d3fde1fd072f249aee2e83b27ca55e2d2adbdd4f8ad2451301cf83230759234e07c144f32bece2f5e0d181f074def784
+DIST jflex-1.5.0.tar.gz 2827866 SHA256 76b11d00fe94f79331a74045c7aaea292a80cb311a6840d0dd53209e81d4cb64 SHA512 5d46d3339a8e435228e8dab55ac52bbb40b4b39ea9c28963c5d02298f0ed8a7e8a66573003f165badb4c3939d6bd88852343d886d3b6c2bd78d17320201c3137 WHIRLPOOL 22d44cc90bf09666f0139c83cde2f9330ed12e2dd3313573d948527d2a0d420b71512a764c5579a94d4d30f4a573180bec2c08c37c3e3c81f079a018bee1a3b1
 EBUILD jflex-1.4.3.ebuild 1947 SHA256 d68b1cf96ee8204d62fed4d4421b4ea5006cd90d08b7941330b59cf6f0d138e8 SHA512 aab0b3cfe9e5dc967971b56bd516ac244db76eb5877724d47eebce6487535882dce51fa3c667674acfe0872d20f7d873a46b5a98cb9b8c18c3cbccbe1a3102ee WHIRLPOOL d9cee408c0dac6ebe4a80db112a518dfff9869c405b29a1eb6413ca932d0e9ead03b04b182080fc06d63d07b48146c6e6a6ec11dd580e12196d583421a24dd0b
-MISC ChangeLog 1694 SHA256 b769927ce309debeef7d4abb4baf6943baff9ccb818efc2e85018f6119d56fc7 SHA512 54ab7c7301183a091f279f55f91d532a003bdff3276bece06af830315efa0a63670867ad0d6f657fa78af21096b8a6e385e169d19db28f235e9cff87e9b9d1fe WHIRLPOOL 5788abe62397ee1c18c54ee321d55c909dda310e7fbb016d2604e5e71a29fc2e87e460d4b11de7a5d25a81ae1b7888667c4f4270aa37d28138f27972b8ad47af
+EBUILD jflex-1.5.0.ebuild 2056 SHA256 dc0b9045b22b26526fdf21c6fcda10ceac7497140fd0bf70b6402d38341371c6 SHA512 003fde27e32c5c013bdf094144eae3e80238566f50a08ebf1596c0127271e8b4483a1bb82c8005e05dddfa0965233bc8f2c73a6a5a8c987b498261b5c705343c WHIRLPOOL d1f564f47fc18c9020900c5ed8290a3146119810f6a4860033791d201d04578ef70c195ef9f84a89306cb5f944aa2ec9e2bd9e06ff4d06f0d3402c64f3e2ac69
+MISC ChangeLog 1951 SHA256 bfef847dfd3353a60fb3eaf48653de9724aeaaf841b6e0f5fcc7a3bb41cb13ea SHA512 c8969a7ea6881aa70055f7f28a2ce2550e706c5d93e1410e81aed9e7782278ec93e7d96b7f14ec6b4efa98dbcbaed06bb7537ffc1c5f13354a677945b27a6e8d WHIRLPOOL e4560ec590b5b1b24f5f1c160382d4f25fb01f528e52662805c2a9714103f5f4138f1a8e934f92ab669ae1e5d453d09afbd63401e505720b69091a92abf4cf45
 MISC metadata.xml 290 SHA256 e365b92e59f17ebb03d11d7c77908f81b3dd4cf230ff5817bf783228f144ae92 SHA512 61e1cff591501b1ee65715620d124a955960ac98fcfea7e2bbc5e4abe7fbbb963035c39c337a6612cd4a51688403141c06218318b015804897a9cb99726da5cc WHIRLPOOL 3fb116713a39a45cbc80a10cdaf9fe252946d4ac769443c0ae2b0da54b9155a4b4c341981322d413851852a71f75ce00f31bd903d349a59bf78a46b76c30ee19
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSZAWxAAoJELp701BxlEWfSFcP/2d8xi+83FOn8WeQTfrb/HxS
-etu4ezfefDR70vQQdTO4e693LI5bWag082PS3JQjyh3XWdHNbXBY6ty8d0C6PqPY
-CssSxRaIoMm8za1lma4dCeR5aRKsL7yt0IK3zpQA7WL8GlTrRLLAj4/zWXu7eRgG
-8JRBkQ1yylUxwm7EOuKSPHQzYIBen9MU1Vqa2m2xa8DWVR70fqLfsfPnEKCiKNOW
-kJcTnENv32IKWI0t47rsByspqDT2hNUkmzDw1LHXr0DmmAqRO0nMQAtrC+PyxUuH
-uEfUM3A7PMbKsxiKU8mGF9GDrLLWoDmcQPqDxvdQVdKKGnj5nkNvexLzXg+wkPtB
-QUaa00yPMDzoKSmwfNoP5ykOeXAs1qf5c0OqrzjaWojlNDz3kpHqsaeQTQU3FOzY
-pyNE6w97lgclpNhJO8lOyXL+/t/yNVKwTK9IBPflgN+fHasJFDP+ftIqnOZDXFNu
-Jy4I4L2I+2fZaJ5enjhWOkBr2HWNQ8t6A5xH69BmK73u3tm5R7AfqcAvjntXVKG7
-ISz9oj9knZHXJygtxJoBSyfrS1vhpSpoqgmR9f1YCw0Hj8aPky8SiI1syIyreAA9
-KN7TFXan/VijghCNr3ksAT7lxnjLt4wXGQ9uVa5llIHteY+5SZX5OMEYjl2OUmc+
-oW1E9acBl/I2FTJ+NJXW
-=bFjF
+iQEcBAEBCAAGBQJTG0JsAAoJEJWyH81tNOV97lIH/jNs6kW9PiAHl/amjYkym3j9
+PF0VYRzgYpcaMKRH9WibWXg0EqrZOK/wkDnNFoioRmWt3CPfzClH4cat6NX2rgtJ
+/H//piUdNpJ5x6Z7dK/SeLdUBRzYjZS2Og/TccgfgSY/kRTpUZrEmi307AcQmKfF
+2FivUyyeSeNkIcVoJB2yfk+XLtzHMupkDYO0O6jnGpCicTHi+9CpIcwMLg4pHeuz
+rjtWvFiJde4UP4ALqjWDgfKa3FhcH5R4MKJGfuX7YMCo/FQ7fg1iVwCMi70FnKyJ
+LvvwSEoAZjFlWDIObl4vGJTxKBNDa30Abk9tvPGKjmOSVuqKa6WEmyvuEY9eH5Y=
+=Ne84
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jflex/files/jflex-1.5.0-build.xml b/dev-java/jflex/files/jflex-1.5.0-build.xml
new file mode 100644
index 000000000000..0b0f32727da4
--- /dev/null
+++ b/dev-java/jflex/files/jflex-1.5.0-build.xml
@@ -0,0 +1,286 @@
+<?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}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <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>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation 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>
+    </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"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </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"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </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>
+
+  <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>
+
+  <!-- ====================================================================== -->
+  <!-- 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>
+
+  <!-- ====================================================================== -->
+  <!-- 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>
+
+  <!-- ====================================================================== -->
+  <!-- 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.4.1-r1.ebuild b/dev-java/jflex/jflex-1.4.1-r1.ebuild
deleted file mode 100644
index 23cb48a0b2cc..000000000000
--- a/dev-java/jflex/jflex-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.4.1-r1.ebuild,v 1.1 2009/01/31 14:27:08 serkan Exp $
-
-# Currently, this package uses an included JFlex.jar file to bootstrap.
-# Upstream was contacted and this bootstrap is really needed. The only way to avoid it would be to use a supplied pre-compiled .scanner file.
-
-EAPI="1"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JFlex is a lexical analyzer generator for Java"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.jflex.de/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-RDEPEND=">=virtual/jre-1.4
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	>=dev-java/ant-core-1.7.0
-	>=dev-java/javacup-0.11a_beta20060608:0"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/junit:0
-	>=dev-java/javacup-0.11a_beta20060608:0"
-
-IUSE="doc source vim-syntax"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}/src"
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	mkdir "${S}/tools"
-	cp "${S}/lib/JFlex.jar" "${S}/tools/JFlex.jar"
-	rm -rf java_cup "${S}/lib/JFlex.jar"
-
-	java-ant_rewrite-classpath
-}
-
-src_compile() {
-	ANT_TASKS="javacup"
-	jflex_cp="$(java-pkg_getjars --build-only junit):$(java-pkg_getjars ant-core,javacup)"
-	cd "${S}/src"
-	eant realclean
-	eant -Dgentoo.classpath="${jflex_cp}" jar
-
-	rm "${S}/tools/JFlex.jar"
-	cp "${S}/lib/JFlex.jar" "${S}/tools/"
-	rm "${S}/lib/JFlex.jar"
-
-	eant realclean
-	einfo "Recompiling using the newly generated JFlex library"
-	eant -Dgentoo.classpath="${jflex_cp}" jar
-}
-
-src_install() {
-	java-pkg_dojar lib/JFlex.jar
-	java-pkg_dolauncher "${PN}" --main JFlex.Main
-	java-pkg_register-ant-task
-
-	dodoc doc/manual.pdf doc/manual.ps.gz src/changelog
-	dohtml -r doc/*
-
-	use source && java-pkg_dosrc src/JFlex
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}/lib/jflex.vim"
-	fi
-}
diff --git a/dev-java/jflex/jflex-1.5.0.ebuild b/dev-java/jflex/jflex-1.5.0.ebuild
new file mode 100644
index 000000000000..689b13ec9d78
--- /dev/null
+++ b/dev-java/jflex/jflex-1.5.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 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 $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="http://www.jflex.de/"
+SRC_URI="http://${PN}.de/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND=">=virtual/jre-1.5
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	>=dev-java/ant-core-1.7.0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/junit:0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+IUSE="${JAVA_PKG_IUSE} source vim-syntax"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+# TODO: Try to avoid using bundled jar (See bug #498874)
+#
+# Currently, this package uses an included JFlex.jar file to bootstrap.
+# Upstream was contacted and this bootstrap is really needed. The only way to
+# avoid it would be to use a supplied pre-compiled .scanner file.
+
+EANT_GENTOO_CLASSPATH="ant-core"
+EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+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}
+	java-pkg-2_src_compile
+}
+
+# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet. 
+RESTRICT="test"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.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
+		dohtml -r doc/*
+		java-pkg_dojavadoc target/site/apidocs
+	fi
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/main
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}/lib/jflex.vim"
+	fi
+}