Rewrite using java-pkg-simple to avoid a generated build.xml file and

a cyclic dependency when testing. Fixes bug #554876. I notice that the
previous 4.12 ebuild didn't apply the gentoo-manifest.mf file like
earlier versions did. I doubt this is needed any more and it was
broken in 4.11 anyway because it was pointing at the wrong
hamcrest-core SLOT. I'll leave it out and see what happens.

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

5 files changed, 83 insertions, 342 deletions

diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index 7f477012e54b..cfe4715427aa 100644
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-java/junit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.88 2015/07/12 12:19:16 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.89 2015/07/20 21:46:23 chewi Exp $
+
+*junit-4.12-r1 (20 Jul 2015)
+
+  20 Jul 2015; James Le Cuirot <chewi@gentoo.org> +junit-4.12-r1.ebuild,
+  -files/junit-4.12-build.xml, -junit-4.12.ebuild:
+  Rewrite using java-pkg-simple to avoid a generated build.xml file and a cyclic
+  dependency when testing. Fixes bug #554876. I notice that the previous 4.12
+  ebuild didn't apply the gentoo-manifest.mf file like earlier versions did. I
+  doubt this is needed any more and it was broken in 4.11 anyway because it was
+  pointing at the wrong hamcrest-core SLOT. I'll leave it out and see what
+  happens.
 
   12 Jul 2015; Patrice Clement <monsieurp@gentoo.org>
   files/junit-4.12-build.xml, junit-4.12.ebuild:
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index c3a58829a90f..23e2819fb618 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -4,7 +4,6 @@ Hash: SHA256
 AUX gentoo-manifest.mf 54 SHA256 0e474881c459301cd882146728b6a912ae24009baa9f87331d548ab84d446269 SHA512 6e1be608ba73dd56b44c8604684886a654742f09c4b9c3661a9a06d84a1a8a0d4eb835c89580879b5b6d3edc2c51164e195732000527ee4cf9c9725fd9b9e460 WHIRLPOOL 6ef8c2a998d42df2fab735bbdb52fd18461d00fac51bee0f672291893e8214a4a322e6ab7f714a39810f459af77e55b3df7332b1cb1643f89543f4b7bd6a9376
 AUX junit-3.8.2-build.xml 3179 SHA256 ab78187535ef97b9984d969f313aff39944efbb57427071a8851f973dedf9042 SHA512 6d2c74c70569feed235db70fdb646c813ce9453b5e7fae6d5fe8c818d0ce820fc155eef8426d8f3263cff45cd4b78542d5524aa1d5efbb84e43698c1d4466f55 WHIRLPOOL f73a9854484abdbbe5a5a04a425627acdb76eb0202bb4b9e1d2c44ba6e20e9a8d022dad15b4e49d75c7584beefd7fc026936b79ddebe6e105ce15cceae157e6c
 AUX junit-4.11-do-not-unpack-hamcrest-sources.patch 613 SHA256 f9469e2a31c13a6781ee495f452c1a29c6a604a6fbe96afac2a2757672f5ae31 SHA512 c2cc1918b5b85c13153ef9ade7086193c287d5b7b7acb0cc1d514a255282850d908583a3bf194417330cee5952b5d53dc789d269123be93b4b01baf8683897f8 WHIRLPOOL af63cc9887754e5d86dd24f8cdac0ccc06400585af94c1bce7d988831d0766a7fc6e6c0e1d35ca27502ac0c386ef7d7caf7984a957ba5c9203d70deeaac56453
-AUX junit-4.12-build.xml 10901 SHA256 e724b484ef26aa7d8560c0a0aee3efac900ce26d3b8ebac7595e03d618a5a228 SHA512 78ee58f20f9454cc11413793013ef8c332e99421eaaf6bb672f53c82086184e576bda9e26249c4f2ac3fb08a8f8f562cb279e47e3b2ff6610a4322360d24755a WHIRLPOOL 2d5e48d0a9882349a38fa323eae39c22eb2c4162528d17ee5727f2d5db974f6a8b3aa2a06a207cdbe7c2108c96844b8521101ab6c072486c3cb1ec217469e320
 DIST junit3.8.2.zip 461426 SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930 WHIRLPOOL 284a51a8b659b8dbce378a381475ae2bcedb78231cfe5435382053335ebe5d44b4eec90b9f14bc510fd5b9060b44672896fe0bfad57743e5aca0128f006781d8
 DIST junit4.10.zip 1781594 SHA256 49d1e176f518730c0d34a361932d9bd79d1bebd555126d95337ad7ad6fc9c6b6 SHA512 07cb518b684a254325d8972132f44dda8f8b52b627232b480bd90766a0f14afc6d8751e44b4162305cf9ab3cedd2858fcd7d388ab01b4f67b706dddb696a8cf6 WHIRLPOOL 72e3f6a3615d1e7f98ac24e7e7f4f634c93cdfdadcaafc0d59d7a1c8b218f019f821d2683c932f3716f1d69b9f0cf5c0fd664be6c35a0f297976b8a745ef612b
 DIST junit4.11.zip 2043600 SHA256 0bbf3818026984fd0c9c4f3cb1a9083d2be545147e13ba1cb101ee14161a3487 SHA512 947ba504aa009afc0773189e6ec89e34d5ff844430b0656cabc7b9f3fe5651c08b5b3c25b848454ee7f0a85e7573155d2c0c86e0ca5502c6e1bb573c970ade62 WHIRLPOOL bf21e351dd47099d3e7c280fe62192aa175c1f251ae4157971cfb69602af2724e6dfcb0592bb6fc8227548abe713c9f1056a22ee49446f48bb00e19ef0fa537b
@@ -12,17 +11,25 @@ DIST r4.12.zip 672377 SHA256 519971406171c580304fdf7b582b5d1df3ff396bb8855a70cb6
 EBUILD junit-3.8.2-r1.ebuild 1145 SHA256 c2dc1112494dd76830e0253693eec6e248374d1bf81b6efd75028b2ebb269c9e SHA512 5c51b14bcd8e10b651a0ca69fe67ec2f989d926542f30b75b5cda7c122c1e9619b0d07aee49e317b80f2c7aeda6f5b4b1e31dc074edf90fdff21e757013b0cf5 WHIRLPOOL 6945ae7b43f77f82c2b24de075eb2052bc31a7c31b175f0b99e4e064d03d2d3fb154984bac8fde28a22f007428bb7ed2abb919fc0bcefb45510a032e2e856c0d
 EBUILD junit-4.10.ebuild 2633 SHA256 bce81ec91ebe3a3d848f72d279846ebcd257309a16a290115e60cde2583418ac SHA512 d9b92b04f3121d948cbfc362cd24f299aac6de5b12b636342f9369936a957da01367fe96728a81f5cccfdbeef4ff4f7bd28e35e1fbfee29a47c4b418f118a5b6 WHIRLPOOL ee1f9d880365e3559a24cbb2eae614aea2957865fa8353d5ff100c5d74d48e513dee11b06c9b300e46a40f4c70bb4269e12cd4959a91c90e888cd8ea5b2fc3e0
 EBUILD junit-4.11.ebuild 2921 SHA256 3ef727b67f5f3195bb0b6da31384103990e74f9812fd3badf88e8507100b00b0 SHA512 2b3691f801a44edd79e15427bf172dd40c9be4bb6534cae8c8e8ba1beef23ceff9bb308dbb59c4f3a5317e088b17d9c3d828d7ed4d89d59109ffb8dae7a383d6 WHIRLPOOL 72e025142a7959d822b3f290ff8162fa9c286b0af103407f5920fdd3b9a94e1ed3f1c1edddfbb71ce8564ea2155f24f6db2d313acb733716cc9a0fca231364dd
-EBUILD junit-4.12.ebuild 1587 SHA256 085baa34eecbb77cd93307fdc3794792b3998e733d325cb4ad40da72e5034e71 SHA512 4dd5ae5c6045e7a9d05a859ce8c515422bd198a3496819d55c1ae50f5c6bc70b1dc77e3c0a3b3ebccc64968aadf486d73edeb8cb2ecb10a8851541fec0dd0671 WHIRLPOOL bec6a56f7f83361c1fa8b5d632881b68188ab65458fe20fbea5159d34b51ad1ebf6da6b59ff8c7c3cd969f9683d5170d75496f129a49ac7c9611e3cd75e0e2e0
-MISC ChangeLog 11763 SHA256 8769554cda0a54b3dce450a1acb4b70af76738aa277be23ac9e7f19465c4a381 SHA512 c8e336307f761b2f4507ca4ea874c7a433efee1103d5b7a2c0d1ee27d4a36a747015300edb40942ed8bad10c5d74b6fa84a5193eb222b765326d12892cdcffc0 WHIRLPOOL 5a37aad5476f3a162c6b7c2010977918c928889d564653eb49504f9464d8632bbb5878556988c2122b1d2f952a81ad668db8f31616642237d2374b5e928ffd42
+EBUILD junit-4.12-r1.ebuild 1552 SHA256 f83066ebe776f18658438c19bb7625aa59c1b7eed0ede81dadb3618bfe555cd3 SHA512 84bb47b0b797bdc982686a312c73f7a575fd02115fa4b2bfda76b1973c9602d16114b33915531e170247adf322cb920b19ef9a9fc2da24d71942f8bab578ae18 WHIRLPOOL 3fc087827d96c5ae0a8e517306ce97177eb1022f6146d22d3c32431825a0121740b35cf46f60eb1e685fe1b022a6ad71eed8aa336d67319252bad74c8bf4d03f
+MISC ChangeLog 12318 SHA256 ea6cb94a9c5fd2aa511039c157aefd368a7b017fe4844cf70f12b575127a0766 SHA512 e1481610795a58f9fbf28823cbac63b2afee57bf1e2d872a5c36c2c04d5e1641a986ce0319a6e52f9589b0f2e02b61004e7c0cd748fa361efbbd379b0066e9af WHIRLPOOL 792f66175f5e424364c8d5fa5a014f5dd13450fb751b616031453020612cf617252eb151ff15a09a9f44eaaa5a0a3c983e0890db285795cb2cc81396aba86821
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJVommcAAoJEJGRpfGTSRu4yg8IAKmjbDJ8Qwoxf3igsEOxj+Zp
-MOeCLDAG+3hJDBLe3DnfCgJQ1dYmeDq2N3kKTyVH4Dczm4+Fl5c7mZkM98PRoqZT
-oKYVz9BYldJTlN/iELGauopsvY5whviUvRnCd72Et3ryP77xXodU0oXlkIQpMyS8
-T2e64pOWLs0YNnabTYrJ1ayLsKdorAD0pBoOmNoJsdRlbONAQLsrpkiuZu6dZiQj
-8gnXi1wDKy3pTCUwI22wrOFOaXcHPtyxCpknqIaRMrLe0AA7ksFXHYwP4D2NLDp5
-oja5KBha1XsKLfWjMGDXeWXdZz7PEIYow8I485cP9q7xknQUOhxxkLTJBvYH9D0=
-=V4oY
+iQJ8BAEBCABmBQJVrWwwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kyZQQAJQsRWp2Q1NDZfGWfGKhpgVU
+El+VcHhJB4vnvLp9x8EhQf+SK4Rm3ut6orKGspXDM+j/Frn/jNB7PAh+7WJ2f06U
+cYTPUq/6+s1mcLbVi79TQ4DrCTqbURMvwpmmG+E2NLhSihkujOWQhUCU13DPAnxA
+bRhjkXNCW61k+eOPkxijCTKAWU2ODGpyv18uJRI0Diue1vBv/TyS37bQ9EQIlEmg
+VNZslyqcPubfXK8t//gVGT4IV9Q7FzKaEp0w79YBQjNP8tWz4KFyixfqOuc/kktR
+4XcRYAU07I51Ui5gxrxd576ckWcmzoNlYAQtvOGxApPvvJAOML/SIezIczuqODW4
+EHwk0bljkJvkRIBOgKj8/GjWnISvV0khNB4dCkAlmeowlBCizhwfo0+ryfkK4my2
+TkkHuqt0DbcjyrPIriHjwZkJCD+x4J2dzIuzcBTLU2sRKlLbT3vlKOL+AiksvkP+
+wcNbsj5jjAWzRP5JuG/r9paib+8hX7/hJQlAYaWw9ORYppCaHsjqEAWnvzaj4q6y
+5+sDDnEN80ImXiAsxHrVZdVotmEMVH32hgt8OiYjcDjvH6Xubp1dc2WusSiSR+39
+cgPVf3eahB6E0+Sg9upXGTw1rMdHHODVf2gTqg4q6TVJ8Uw9KbhwdqDs+F6EIoJ+
+bqraMtyoAKq6+tDgfcmM
+=hXWN
 -----END PGP SIGNATURE-----
diff --git a/dev-java/junit/files/junit-4.12-build.xml b/dev-java/junit/files/junit-4.12-build.xml
deleted file mode 100644
index a7d5f6a44571..000000000000
--- a/dev-java/junit/files/junit-4.12-build.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?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 7/10/15 10:33 AM                      -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="junit-4.12" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="junit-4.12"/>
-  <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.resourceDir.1" value="."/>
-  <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="lib/hamcrest-core.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="lib/hamcrest-core.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="ISO-8859-1" 
-           nowarn="true" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="true" 
-           memoryInitialSize="128m" 
-           source="1.6">
-      <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>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="LICENSE-junit.txt"/>
-      </fileset>
-    </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}" 
-           encoding="ISO-8859-1" 
-           nowarn="true" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="true" 
-           memoryInitialSize="128m" 
-           source="1.6">
-      <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" 
-          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="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-		  <exclude name="**/NotPublicTestCase.java"/>
-		  <exclude name="**/TestWatchmanTest.java"/>
-		  <exclude name="**/TestWatcherTest.java"/>
-		  <exclude name="**/SimpleTest.java"/>
-		  <exclude name="**/TestSystem.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" classpathref="build.test.classpath"/>
-  </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 the test classpath or 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="true" 
-             locale="en" 
-             encoding="UTF-8" 
-             version="false" 
-             use="false" 
-             author="false" 
-             splitindex="false" 
-             windowtitle="JUnit API" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             failonerror="false"
-             stylesheetfile="/var/tmp/portage/dev-java/junit-4.12/work/junit-r4.12/src/main/javadoc/stylesheet.css" 
-             charset="ISO-8859-1" 
-             linksource="true" 
-             breakiterator="false" 
-             maxmemory="128m" />
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" 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="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>
-
-</project>
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
new file mode 100644
index 000000000000..9a423ebd5edf
--- /dev/null
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.12-r1.ebuild,v 1.1 2015/07/20 21:46:23 chewi Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="https://github.com/${PN}-team/${PN}/archive/r${PV}.zip"
+HOMEPAGE="http://junit.org/"
+LICENSE="EPL-1.0"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+CDEPEND="dev-java/hamcrest-core:1.3"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}-r${PV}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
+
+java_prepare() {
+	rm -v lib/*.jar || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc {acknowledgements,{LEGACY_,}CODING_STYLE,NOTICE,to-do}.txt {CONTRIBUTING,README,doc/ReleaseNotes${PV}}.md
+	use examples && java-pkg_doexamples src/test/java/org/junit/samples
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed"
+}
diff --git a/dev-java/junit/junit-4.12.ebuild b/dev-java/junit/junit-4.12.ebuild
deleted file mode 100644
index cbadbe9003ef..000000000000
--- a/dev-java/junit/junit-4.12.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.12.ebuild,v 1.2 2015/07/12 12:19:16 monsieurp Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="https://github.com/${PN}-team/${PN}/archive/r${PV}.zip"
-HOMEPAGE="http://www.junit.org/"
-
-LICENSE="CPL-1.0"
-SLOT="4"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND="dev-java/hamcrest-core:1.3"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	userland_GNU? ( >=sys-apps/findutils-4.3 )
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_XML="build.xml"
-EANT_DOC_TARGET="javadoc"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml
-
-	find . -type f \( -name \*.jar -o -name \*.class \) -print -delete
-
-	java-pkg_jar-from --into lib hamcrest-core-1.3 hamcrest-core.jar
-}
-
-EANT_BUILD_TARGET="package"
-
-src_compile() {
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_TARGET="test"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar junit.jar
-	dodoc doc/ReleaseNotes${PV}.md
-
-	if use examples; then
-		java-pkg_doexamples src/test/java/org/junit/samples
-	fi
-
-	if use source; then
-		java-pkg_dosrc src/main/java/{org,junit}
-	fi
-
-	if use doc; then
-		java-pkg_dojavadoc target/site/apidocs
-	fi
-}