gentoo resync : 29.05.2018

19 files changed, 308 insertions, 261 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c0b0ac987b42..fe819a6f394d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index fb9d7bfbbd00..dc1c3441096e 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,12 +1,10 @@
 AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908a209691a04c1e3b24af21eddccf217c46120cc2c89eabe0cfe277fe245b7e174974de29ec2bd5affca2b SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f
 AUX ivy-1.3.1-noresolve.patch 371 BLAKE2B aa9cead35ea3bf8b4dd9ad0009a5794dc16598f2a3428cc41e2a46c0b6a946be78263f56390f4da5e5dc2940abdaa217489271c6effb07de7d3ee7445f900f3f SHA512 fa520c8bf17813c3aa9c6b41b50bf844c86b959b2046b64241bddc16675a7a2583151813b6ad3dd7369ab1ee453909fe84a34d8e4c81ee5729e9c929d9690b02
 AUX ivy-1.3.1-tasks.patch 593 BLAKE2B 7d6b478ced62f35619490248b3f62a32869695fdef67c0a5fe19cb52de565c5c20f1a3e903406aef6835559d84ba668c0dfa5e2ce8d78c9b86c645b89fc9fcf4 SHA512 399f5fd76af888d4aacac83ce0a1311e26e49f3101dc1577615b576057197518348917a7670d916e502ac4caa2620d9824470e72acd9708a35463d044e733278
-DIST apache-ivy-2.0.0-src.tar.gz 2248438 BLAKE2B a06c6716ae72d744e335734da4ca414b1c8fe3c819a1d25edae00d758e0db18e9aecb307d95c9f522f24d29c7249cd52d5729e82ab5cdf97abf977005ace702c SHA512 eb932069c42b42c421afc5b49a94204d5359b8f6f23708d3cbd04fee260c2348eea540bddbee7950cd71c8a5290383f7f2d4044e03fc8b53013fb381e410f1f6
 DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
 DIST ivy-1.3.1-src.zip 1302693 BLAKE2B fbf6da871fdb629810bfa15ec977da4e998a987bd509e80c462d6ebfc113f88ea0c609526795bc414cb0d17fb424c345e40d2fc1a6d17ac8a8bcd25cd9c9bcef SHA512 35c425ea8adc714496dbc2bc0d5a6037fe295967bea9014a16850e54ab3925192e42579ca1e23d68d776326e81e1e195ce85f1a7791a6b0b20ed179c09a22f82
 DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
 EBUILD ant-ivy-1.3.1-r1.ebuild 1505 BLAKE2B 4b39326155e46486d72641665bd26ac75b4a102a9739c819845a2e6ae901e445034276df9a1d71f925f0ecd054597220cee9e2b78fb3d02be5dac187372f8530 SHA512 1494f051c1ff8cb7ed72b764b12bf0c519f6060947ee04b5fa0464e54487f2e03a7d5760ae1f319141a2218f5fbe94dd343d6111d9566d822279d1470286ab01
 EBUILD ant-ivy-1.4.1-r1.ebuild 1759 BLAKE2B 30c437cccd0d86ca2a8b162569602ab2571ff570e6e373dd17f47d60df5c06c6ae8726caf67290d2a0d2b250de63f9638f17aa84cbf8ff9f479d66b161c503ca SHA512 21028c7fe5712daf3680fec1137261b9bde21fb46f0633abbbd98fab4e41d2cdd63d5364d6de4275f667f778a9c8b2ebfeed56b8ffc0d4b25cb8ae039f802a20
-EBUILD ant-ivy-2.0.0.ebuild 1992 BLAKE2B d2bb80357856974e08bc654b99258fd9467085c1d2604d02b26d047e541d08cadc5dbf35f3a1ff49475f31a3b4ab5dbe20f20262499b0d5ab030c78749fedaa1 SHA512 dd1c2849e60e06894fcf39e293e5356328f4a935db929e9af048e43193d9e2dc0bea462971a27a84ab18af33f8a8b4b35ce8ac1fbd3c9d2e8504addffe0b6ea8
 EBUILD ant-ivy-2.3.0-r2.ebuild 2216 BLAKE2B dcc9f39656185a5a0e56c30bc75231e12a8fca7f50ca1b6687795855c774c8ce39177fd0128887f2c9b87d028e3321cd6577aba5036fb8576330ba370639fcbe SHA512 7c7f55b44592a7cf60e82202d4d882867758936304a93a11c3677c39c486b1c28a2df4891a87c7e8d408ebf4ad70926959e05a5d4a9ac6ac03ca7de6f40d3b87
 MISC metadata.xml 655 BLAKE2B ae710cffd6d182e1f67df6734f0bb1e3b61daa87629b8259f8d75f7476fa732904cd73d2ef02d496448191e33c069d3d284a79aeedb87323e28c029e8ceaa40f SHA512 81eb7f4ce41f17a43b32ac6e4ade9677397696cab06ae94964d1756d6745aadc9d61df9ef3b0749eb547b62fdc5bb19a98484268fbce9d56773be09a03671c0d
diff --git a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
deleted file mode 100644
index 393bd5ad69f7..000000000000
--- a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc examples source test"
-# registers as split-ant task
-WANT_SPLIT_ANT="true"
-# rewrites examples otherwise... bad
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="apache-ivy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-RESTRICT="test" # We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet
-
-# There may be additional optional dependencies (commons-logging, commons-lang...)
-
-COMMON_DEP="
-	dev-java/ant-core:0
-	dev-java/jakarta-oro:2.0
-	dev-java/jsch:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-vfs:0"
-
-DEPEND="
-	>=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )
-	${COMMON_DEP}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -rf test/repositories
-	rm -rf test/triggers
-	rm -rf src/example/chained-resolvers/settings/repository/test-1.0.jar
-	rm -rf test/java/org/apache/ivy/core/settings/custom-resolver.jar
-
-	# Removing obsolete documentation
-
-	rm -rf doc/reports
-	rm -rf doc/configuration
-
-	java-ant_rewrite-classpath
-	mkdir lib
-}
-
-EANT_GENTOO_CLASSPATH="ant-core,commons-vfs,jakarta-oro-2.0,jsch
-	commons-httpclient-3"
-
-EANT_BUILD_TARGET="/offline jar"
-
-EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
-
-src_test() {
-	java-pkg_jar-from --into lib junit
-	ANT_TASKS="ant-junit" eant "/offline test"
-}
-
-src_install() {
-	java-pkg_dojar "build/artifact/jars/ivy.jar"
-
-	use doc && java-pkg_dojavadoc "build/doc/reports/api"
-	use doc && dohtml -r "doc"
-	use examples && java-pkg_doexamples "src/example"
-	use source && java-pkg_dosrc src/java/*
-
-	java-pkg_register-ant-task
-}
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index 32b750366d82..b8333b15b303 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,3 +1,6 @@
+AUX commons-codec-1.11-build.xml 8949 BLAKE2B f1a5dfadeebbc183c075d96a8769218e98745936b45d38de1d0da8034a052ca99c3def82c2360857849ba7daefa1bf5d7aae1288ec71505de7154b0ab9e87aef SHA512 fc22470e625e7405308d2a21f0dbdf4bf565cc8db623bb3c4dba08d55da3a0884bc3da744cd029716af2ba51d708d0ed309f7c6a21a7df6f0e5027d5c6f646a5
+DIST commons-codec-1.11.tar.gz 369538 BLAKE2B 6b77cb3c69c81a9684b298ac5233b788d6651ecc96b70ac7fda9face5af5a60970c5bb2531fd285d20dce7732829f7470b9e4941d63025faf47247410f1ffba2 SHA512 b3159308f28b2fc50208421412d8cc81f439cc07dc3d071df7b50f2d862aab65b3d20bc8eb2906367a05ecf5138c56b5f12c6cf9c224def8b8286fe12ac5346f
 DIST commons-codec-1.7-src.tar.gz 291251 BLAKE2B b8fecdb9b88a21ceb3106a13332493617ecd2c8064c84a1514dec1c1c254e18116ff4926f7445bef4171000ba77da411efd6a93fe80a4795e887832035373e10 SHA512 31358283ac2827cb05486b8ff1512242153f61deb086f7fe145ee3ca38d96e43fba080a1e89a3b8cd44d09761015ff4dbe5226d29b7f9fcd59e68ca7701b28d6
+EBUILD commons-codec-1.11.ebuild 1048 BLAKE2B f742d3ac245d6561e53fef06b73472ccde6ea21ce33e5b26777f74db1ca92d6788d782e3e38ed4a972bc1cb41595cc82f23674d8b47d1a54ddd259d93999dca2 SHA512 ec45f17ca4f6517343389136407dc1ef5745b7ffef3d7e69f69c8f0139e470ae7d59ba1bc77dc894e39a864520ab0e7ba50685b334ee40e054fb8034c6aec607
 EBUILD commons-codec-1.7.ebuild 895 BLAKE2B 25171d147e9638b88f210f02b6e12d13e6c391b51191a1c00ab118cac8e4fba1a063e824ab852500fcb2a99081378c81e12317d31349f8e0e6c15a9ceeceeb41 SHA512 d842c00d962bfbd508e893aa14e303ad74f9d5e9afdd85ab9df7ee67ffad174dc77d950328333566e29eaf04c5402b95a1080439724579cd4bd0209102945619
 MISC metadata.xml 1360 BLAKE2B 5e996a35877486521352b61fdb44872970caab9497267c9d95d1364bd299838486f1853b46f35ec140259d33e7158bca7224488f21c388caa4fa9e7a153006bb SHA512 d16f70860d4880e50d25e6297823fb71955c147eedd115ca7eda0a0bf6c4cbc6121bf8b12062241192facd4583f10df56a838c84940b5914f75d13f10c96e9ae
diff --git a/dev-java/commons-codec/commons-codec-1.11.ebuild b/dev-java/commons-codec/commons-codec-1.11.ebuild
new file mode 100644
index 000000000000..7abed459fb4e
--- /dev/null
+++ b/dev-java/commons-codec/commons-codec-1.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Implementations of common encoders and decoders in Java"
+HOMEPAGE="https://commons.apache.org/codec"
+SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+RESTRICT="test"
+
+DOCS=( RELEASE-NOTES.txt NOTICE.txt )
+
+src_prepare() {
+	cp "${FILESDIR}/${P}-build.xml" "${S}/build.xml" || die
+	default
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "target/${P}.jar"
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-codec/files/commons-codec-1.11-build.xml b/dev-java/commons-codec/files/commons-codec-1.11-build.xml
new file mode 100644
index 000000000000..251268136bf8
--- /dev/null
+++ b/dev-java/commons-codec/files/commons-codec-1.11-build.xml
@@ -0,0 +1,200 @@
+<?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 5/27/18 9:10 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="commons-codec-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="commons-codec-1.11"/>
+  <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.build.testResourceDir.1" value="."/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.12/junit-4.12.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.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="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           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>
+    <mkdir dir="${maven.build.outputDir}/META-INF"/>
+    <copy todir="${maven.build.outputDir}/META-INF">
+      <fileset dir="${maven.build.resourceDir.1}">
+        <include name="NOTICE.txt"/>
+        <include name="LICENSE.txt"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          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="**/*AbstractTest.java"/>
+          <exclude name="**/*PerformanceTest.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*AbstractTest.java"/>
+          <exclude name="**/*PerformanceTest.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </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" 
+             encoding="UTF-8" 
+             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" 
+             docencoding="UTF-8" 
+             source="1.6" 
+             linksource="true" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+      <link href="http://docs.oracle.com/javaee/6/api/"/>
+    </javadoc>
+  </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" 
+         manifest="/var/tmp/portage/dev-java/commons-codec-1.11/work/commons-codec-1.11-src/target/osgi/MANIFEST.MF" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Main-Class"/>
+      </manifest>
+    </jar>
+  </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">
+    </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                                           -->
+  <!-- ====================================================================== -->
+
+</project>
diff --git a/dev-java/cssparser/Manifest b/dev-java/cssparser/Manifest
index 00011c99be43..c0ef54a580f6 100644
--- a/dev-java/cssparser/Manifest
+++ b/dev-java/cssparser/Manifest
@@ -1,7 +1,3 @@
-DIST cssparser-0.9.22.jar 245363 BLAKE2B ffe6838f3499d4c44097cbaabc79e2526f2c3052c9bbae4de63668ba3f01a7cffee71dbc230d416d5cd818f679b59205013eddfe79d97c9177276abf4b08f527 SHA512 33dd8906d967bdafeefb6cea9d03fc746cf350102e8e53360284638cdc3d55f254c616d2d3ab5d1849fd92e6924c9751ebff72942f0855b6fdd4ab309a509485
-DIST cssparser-0.9.23.jar 245655 BLAKE2B dfe78fde6fc706f0bfcb710c6b9dae599156dc819a1c4bf46b22bd2f9affc8da8b2e9ebecbc8e30249a48ff26da7f4c754f9bb869e3e6b7b7c1a5c311a094400 SHA512 a6799156eaa6cbd41b2969ea64fb4bc5105a866a2cdade73bef5e4a3f5b585f7f9cf0cf7f34329ef17f1b258d2d35e675f107bb81b793fdb2edf0c7c9d49da1d
-DIST cssparser-0.9.24.jar 250147 BLAKE2B bf4948bbfd58863b9bcdb3cb71192f323764f56a14e2384cc0b5d526ef6bf2bf4fce330880aa1bee7ffe45ae576999a98165fcba84e75ef402e3edfd5341e28f SHA512 bf86710473ae256fe8b24a6bf3babbe815fb1373de6acafe2695e09bb2ff11e63ec182d608861d7c7a39574bd00fc8627b48536644cd545ed45ae57e130e4bd3
-EBUILD cssparser-0.9.22.ebuild 524 BLAKE2B 90c629c61ce45c71e16da88675fa7bf4fd5611e631289fefa8846d9cfb2d325719991cf24b9dd02221a809d2ef25e6d4edc0d33aadf8877cfd796ab523f536fd SHA512 408f4f13d1988968f46a0a52cb4e0f7e43b4b191bfda52485004c8848755bfcdf505f647cb7608a18fcd2d77d4e27e8a7cafbb3ec4f2950fdd763fd81bbb38f0
-EBUILD cssparser-0.9.23.ebuild 526 BLAKE2B e268f81599b182a7cc7f92479071ae6ede794388609d48780202924cc4530f163c65db99b247373637efcbd940aed59306fb4736e1b352f597ae9cfd5ff08515 SHA512 0b8c83103cdc4ff926fff22b48eb8425dc4dc65aa7093a05b53e23ceea2792a50869aa607481b64f29b17a6031d5fe6cb788e71031726091d5005dbe3cb176d4
-EBUILD cssparser-0.9.24.ebuild 526 BLAKE2B e268f81599b182a7cc7f92479071ae6ede794388609d48780202924cc4530f163c65db99b247373637efcbd940aed59306fb4736e1b352f597ae9cfd5ff08515 SHA512 0b8c83103cdc4ff926fff22b48eb8425dc4dc65aa7093a05b53e23ceea2792a50869aa607481b64f29b17a6031d5fe6cb788e71031726091d5005dbe3cb176d4
+DIST cssparser-0.9.25.jar 256517 BLAKE2B 5281f70dd4e293aaf4aad44efc46107372756b03962057df8701947ec71478c40ace0728099122a0166e902a00075d7d89e6e93b50d8bc16d7f563a3553ad9c2 SHA512 94dffa2ff1edc01c183d2de4f77f106a9409ec5d1e68e9af4f3cd427b76c9d80c942a4d312c3e40ef5c8bd444975eedba173bf0eb730cf517a818dd69421a7bb
+EBUILD cssparser-0.9.25.ebuild 526 BLAKE2B 05384d781bd99bbfc191faccef066dd7a0ed90ccfaa49ef77e1f77ee4f117e6850dd1c5481bef718d6eae58f98893213135023a8ef183ce1f7ef3544b28ac5a4 SHA512 19abcc2a991321bf3c334110db5a1de38a48da60490f50123741a6032ac9ead32b45a1ac37eda8e14729bdc9256291ebc4f371a39a772c1130dd546b9a8e9c1c
 MISC metadata.xml 396 BLAKE2B 01cf3f00bcb1fa2f26aeb6813157821b5f6b4dd0316b8261f16a90e1cd3a66dda3a736921dd78e16ef500cc09dfecc9a045276e18c7c9e269715c1911fcd8a7e SHA512 d95036978f0c8b18cc4722df3e9f1be9fbc80df058255c4903746f00217c8e284ba7a87dbd0498b38e3f8185a95dace21a908e02304a2aaa49c32c53e02b0700
diff --git a/dev-java/cssparser/cssparser-0.9.22.ebuild b/dev-java/cssparser/cssparser-0.9.22.ebuild
deleted file mode 100644
index a5b994d65f0a..000000000000
--- a/dev-java/cssparser/cssparser-0.9.22.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="API for parsing CSS 2 in Java"
-HOMEPAGE="http://cssparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar -> ${P}.jar"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/sac:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/cssparser/cssparser-0.9.24.ebuild b/dev-java/cssparser/cssparser-0.9.24.ebuild
deleted file mode 100644
index 4e2aa29ee99f..000000000000
--- a/dev-java/cssparser/cssparser-0.9.24.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="API for parsing CSS 2 in Java"
-HOMEPAGE="http://cssparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar -> ${P}.jar"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/sac:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/cssparser/cssparser-0.9.23.ebuild b/dev-java/cssparser/cssparser-0.9.25.ebuild
index 4e2aa29ee99f..6b38a3223d5f 100644
--- a/dev-java/cssparser/cssparser-0.9.23.ebuild
+++ b/dev-java/cssparser/cssparser-0.9.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index ba8184e4aae4..3e07f700f48d 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -1,6 +1,6 @@
-AUX fontbox-1.7.1_maven-build.xml 10618 BLAKE2B 6fe7b6a3b274ee3a419675c56e86a865d1e05c393d39b5bd897bf54cf6c45fb27674078747da927c3df1e9d017d332ccf1aec00499947a62fc850590adfd5c31 SHA512 8f3173325808c096cca21f69bb70f9ed5a43c0e56b5d6487604de399625bb40fbeecc569c068bb6840a87fb5edcc3e22171d8c6fab28a2c00b36172196c1935c
-DIST pdfbox-1.7.1-src.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
+AUX fontbox-1.7.1-build.xml 10618 BLAKE2B 6fe7b6a3b274ee3a419675c56e86a865d1e05c393d39b5bd897bf54cf6c45fb27674078747da927c3df1e9d017d332ccf1aec00499947a62fc850590adfd5c31 SHA512 8f3173325808c096cca21f69bb70f9ed5a43c0e56b5d6487604de399625bb40fbeecc569c068bb6840a87fb5edcc3e22171d8c6fab28a2c00b36172196c1935c
+DIST fontbox-1.7.1.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
 DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
-EBUILD fontbox-1.7.1.ebuild 959 BLAKE2B 644d65f0887b9269d5e462bf47e544ff2789f199d540031a4df7cd2495d6e611f2f28187f487dbca0f77d32bf9b9305c8bc5750ace5f40e846dd23630d8fd34e SHA512 82e72b2807000cf0fa52cd0ed742db79648263cda84d5e6a568b369c0942e0dbc4690a7045f6952abaec0f2f656a4910a0c4666f14412d7a1636f3897e6e2663
+EBUILD fontbox-1.7.1-r1.ebuild 971 BLAKE2B 5d0a36f8cca1a5793386111563cf793a57c665f903c467c8a244dcfbe6986b59072661fbee1b363d1d0aaff1dc1f921d016c0723a3237a722ae9b05227c1fc0b SHA512 44d237b4a9e505dc45ff2bd0afbd4cbe8452ffc66e7b6155dfe3ecc00dedd1467e8a5870d429ad494cd48d8437461dcedeaa5c68f2fb02f613363c5134abc2d5
 EBUILD fontbox-1.8.11.ebuild 1146 BLAKE2B c448e815ad5f90dd1b689948a994e7c37e5d48c2b292c0bb40fffcfc8046591ddb4693f4b6c07abdb8f817f5cb6ec42c4271c2d63e240a6e48810ce44e2811ba SHA512 ee11087e709c98760b273d3d71848b233ed7906d8d1bbc81d55ff5b2418bfa71d6033e98e83dea8823ffcc7034570f3129101ffbacca8ca347d11e2a13026956
 MISC metadata.xml 586 BLAKE2B dced74e0b5e677040e5bc60d35050eb2acd6e0c9f88f02ba5fe41dfcf6d90a1dacd70e17f85d1d091b6e4a6135cf31c54629107ae0fe33ff863644f849ceb96d SHA512 d7f91851ceae4b6d8a9315e201f5e5ba09a92c29ae26f4abc8dd4faeec30b1de64b1528f89e09cb84372197de93576a468a6e5897ca55a62c8c39c53e4943809
diff --git a/dev-java/fontbox/files/fontbox-1.7.1_maven-build.xml b/dev-java/fontbox/files/fontbox-1.7.1-build.xml
index ccde1983d680..ccde1983d680 100644
--- a/dev-java/fontbox/files/fontbox-1.7.1_maven-build.xml
+++ b/dev-java/fontbox/files/fontbox-1.7.1-build.xml
diff --git a/dev-java/fontbox/fontbox-1.7.1.ebuild b/dev-java/fontbox/fontbox-1.7.1-r1.ebuild
index 7b86b9036836..d2cd213f9ef4 100644
--- a/dev-java/fontbox/fontbox-1.7.1.ebuild
+++ b/dev-java/fontbox/fontbox-1.7.1-r1.ebuild
@@ -1,43 +1,43 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
 JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
-MY_PN=pdfbox
+MY_PN="pdfbox"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="An open source Java library for parsing font files"
 HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
+SRC_URI="https://archive.apache.org/dist/pdfbox/${PV}/${MY_P}-src.zip -> ${P}.zip"
 
 LICENSE="BSD"
 SLOT="1.7"
 KEYWORDS="amd64 ~arm64 ppc64 x86 ~x64-macos"
-IUSE=""
 
 RDEPEND="
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.6"
+
 DEPEND="
-	>=virtual/jdk-1.5
-	app-arch/unzip
+	>=virtual/jdk-1.6
 	test? (
 		dev-java/ant-junit:0
 		dev-java/junit:4
 	)"
 
-S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/${P}_maven-build.xml build.xml || die
-}
+S="${WORKDIR}/${MY_P}/${PN}"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
-
 EANT_TEST_GENTOO_CLASSPATH="junit-4"
 
+src_prepare() {
+	default
+	cp -v "${FILESDIR}/${P}-build.xml" build.xml || die
+}
+
 src_test() {
 	java-pkg-2_src_test
 }
diff --git a/dev-java/jcodings/Manifest b/dev-java/jcodings/Manifest
index 0c1914c73504..b5bfd2841668 100644
--- a/dev-java/jcodings/Manifest
+++ b/dev-java/jcodings/Manifest
@@ -1,8 +1,6 @@
 AUX maven-build.xml 7254 BLAKE2B 1004cdec7ec80a02f2a0344d748ec0e17e9902be72ea93ac39542b3cc0e8eacd5d95dfc716d5acd20124b9c71aaee2b99bf4bec084301f53897da52758071900 SHA512 0735062e262c9abcb3649ef48d87a9d7489d0d980ee9c77c1e7b6aff4f386344d423403dc54e4d1ae08606adbe1ffea4ac4cf531d4cf1cb2dcf21f1ab95571ad
 DIST jcodings-1.0.11.tar.gz 123802 BLAKE2B 22cde3714da0f1b9434d630905d9a5a8bcdf7ebcab8de5b03ff12d6b31d6fd256f87680743d96e860cd5af34a0b5e70bb1a326000b5440d9b4c4f8a20d9964ee SHA512 6bff29718ff04fd2f52cff767440d87f3dcb0f4acf71ee7b037241af7ef7533284176f53d08da5b1f37c643b766f4a9113651c994d1893ef302a2056d9ff40f3
-DIST jcodings-1.0.4-git.tar.gz 90294 BLAKE2B d545c4ee0ea93ca549ec390d12b12f5eb88cd606ee3e8f7584886ef29fb32d1f3e83762f734a438240e5d2acc70bcf61040f4278ce8d16644ec099ad8f469a8c SHA512 49cdccbb27c9c6859447fa783b22dcd4fa1b9bb6fe9af3e8bddfe3ca4cd62850e4d6c51589481503dba9ea5e27139407834c9163063b74e960bf848ed4f9531e
 DIST jcodings-1.0.5-git.tar.gz 90788 BLAKE2B f1a72a1879e89c60bbb1537d5a6dd174b9f0a2bb4a3eb80520a2b4f7ddae5da359f11ba220b4f64db0413fd423c31623a0863cedbf62f7efd83ce73952557b35 SHA512 a0122eea18077daefdcf38ec9e6f12b000c558837835fe900f6e0c282fdfcf95dbb10652b4cfeb32e556ae8ebe1aec8c10e4a352cdb565837b2f16335140f8e3
 EBUILD jcodings-1.0.11.ebuild 828 BLAKE2B 555aa132da6212e4c772b3500ddfb54e584afc004c2082716defabee2af6d4c9cf4721e5e28c4b3daf9a91715462829828ff14fadda3aefec5257b461cdc27a7 SHA512 f4495874eda08d74cb2639c5a584ef789344d54a3ea6684d96c15df960ef54fb155d3a2ad7ad342d495435e406931550a63f69dd3dafbe51af333a85a5b4ea9c
-EBUILD jcodings-1.0.4.ebuild 732 BLAKE2B ec9299f2bd12870bb87fa1668e4cfeaa07701bb9e8927c16da2864336a802edeb88d8ad69329cfc2e5fac1db677c345dde43719f0599117e728f742199b469cb SHA512 4592a5f24ec84d056d3c46e9459d4fe9fe951a1fde6cbd8c7b08a9dbc4c40d1f5a420c6f0962e976e3ed9ce829d1cd99defd88dbc78708c16d8d5d81d7ab7976
 EBUILD jcodings-1.0.5.ebuild 763 BLAKE2B cb9ea59e1101e31c8e5f6fdaa9093dd2fb6bbbbdcffa7506ce10968d9a90b346145f56ffd863ad770a3698eb06fdd9128999a702cfa093b59ae041b089439e98 SHA512 bda1b75cbfef5252d46fa1f927775727fd73c306c62e6c2095a5cbbe4a39c9acf318fd0added610fb29c2d39fee198eb3a856fe500aef8199e13c80f5fc435e8
 MISC metadata.xml 325 BLAKE2B ffc57bb511b07c41330a25a5fbc924232362e45c3206c32e7c3d90cd624a9a2b0cd1e5499b510b19387c5eb43134b01bf501b112964beb629d1f1b0b0e6a3abe SHA512 b0a431f148289e90b6bbf25940157336603658375d13d4a256e224174ddeedac53e6dd625239e51763b467678090a6305463c4c89fd878027ca8c4b369434095
diff --git a/dev-java/jcodings/jcodings-1.0.4.ebuild b/dev-java/jcodings/jcodings-1.0.4.ebuild
deleted file mode 100644
index f710dfa7f2a4..000000000000
--- a/dev-java/jcodings/jcodings-1.0.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-inherit base java-pkg-2 java-ant-2
-
-MY_PN="jruby-${PN}"
-GIT_PV="0-gbaaab90"
-
-DESCRIPTION="Byte-based encoding support library for Java"
-HOMEPAGE="https://github.com/codehaus"
-#SRC_URI="https://github.com/jruby/${PN}/tarball/${PV} -> ${P}-git.tar.gz"
-SRC_URI="mirror://gentoo/${P}-git.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-EANT_BUILD_TARGET="build"
-S="${WORKDIR}/${MY_PN}-${PV}-${GIT_PV}"
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/proguard/Manifest b/dev-java/proguard/Manifest
index d36cd92a5af9..fe546c722fc7 100644
--- a/dev-java/proguard/Manifest
+++ b/dev-java/proguard/Manifest
@@ -1,9 +1,7 @@
 DIST proguard4.5.tar.gz 1827325 BLAKE2B a8bc7f8527f98094c08d178b0544e44e09b3ee03b8a100bba7a978b70ca60b655a12fbca822bd0bb60c1d81c9b83cfb61ebe7bbde6b2f854de962ede23c75d82 SHA512 bf1d9c29a4b3e1ba8062632b0f7f97e8f8d3dd2fbfbdc4bbbe98fa76151721fa45b22a1d99890654c557f3a1b87b45038d4882c0cb192b907ec2c65f4e7429fa
-DIST proguard4.7.tar.gz 1902321 BLAKE2B 8996135c30e38aeaf1d65ced273cc129023337e450ea5590d60c14b315fb52a1790cdb8cf3e7136ee42d0863864901caac386fac83b1d241e5e626eb2bafa96e SHA512 cbf3e5ddb11a37af169cd563ffc04e554b925e99ff4f3797626e286ac40554577f2715050b46f5d1a9599de97cb62090b39798ea0aa006273d91cf8217e9e60b
 DIST proguard4.8.tar.gz 1914047 BLAKE2B e32b9eab0b9d91fb7e565c881659582c3c90ebe3b068e79aecd62b7e5200420ef61ae4f303e654329e46627d8c746747019347baae74cf23ed791dc89e8a0197 SHA512 f06c98c784a71fa9e2c137c6bc4c062dfcf2eeaa28653b909b475226cf133fb67821128a3fb6ab0702807cd229330da8b64e810d9078d0b7510083453feffa10
 DIST proguard5.2.1.tar.gz 2160584 BLAKE2B 35cedaee26a8f8fb3ae28843f55867277817bdde28603c615ce4bea0b5fb8babf35b49ae494cde0b0496117077aa2984197bb06915f50699b5a5dc66197f2601 SHA512 7c2735860d689f9002e40e7a5304eb61f8fb8abc1da36ea62fa32541cdf2e655bb2d27814e2b8137d29a1ab02a57c57961491612ea8e735788fdea719e6239be
 EBUILD proguard-4.5.ebuild 1589 BLAKE2B 2e7c870d216ac7b4fc099c229c8afd0830a1efc9347917bb7f5ea0baca0224a4e35a5c11afd433cb99b3986b617e85f4ae5d7b67391afaa904e6739499088431 SHA512 62c71f50e764ffc6658d2652d8adc5022ca872206e764fba09eb5bf33b8007366c5c7a0f47de19c6fbf5941f3cebb4be29f216ff5b78889fea3bfb2695d0e0a7
-EBUILD proguard-4.7.ebuild 1591 BLAKE2B 9ae1548fa1e632e15bcae065a8bd61bca3d718e5b927ecda232af2a97d2959ffeb3ce654de588f329651b3abc82171cc500c29dc9ff1bac87080c12f6ceb55ce SHA512 468627dd892376ace80ef0d5e41bbdc3618471135c5d20b601ab73c055230c18e85d351cb47ad3adea7d560507db23e29ea437c6540cd00f99d7db5bb2918a84
 EBUILD proguard-4.8.ebuild 1585 BLAKE2B 0143f0ffec6ec400c01893cdf7c1539d83fb89bf3bad99a38124c442d0c530f8a52f047f03e4bd615ec125262d4ea11e8369d36b875ab5a65c911b85f6e3c7d1 SHA512 00feb16820b8676eb02f0876e516cb7d7ee17878ef16d561ff77e4c7c8a8adbce87fcee9d75def8c55261dbf457f96c90d3ef1e28aceb71cab98a36d4d871666
 EBUILD proguard-5.2.1.ebuild 1582 BLAKE2B f5858a345acb37507e56cc9af29ac9d4efeea6bbf61f1f7a59b4ee8205fd8b54a6790ea395efa8614ab15953ba550972030ea040e4da565ba53fe13f229cad48 SHA512 3eb6154de15044062f182a1a0b0a3d58cb2f356e4d811ce4631ebcad81b1b22f671e75fcaa2badab43dd146e23db1d5ccaffbfeb1beef5a307e9fec023cb1b09
 MISC metadata.xml 470 BLAKE2B 038b609842f58b18fded44a04304459fdbb90f1eaa90e784e8e0aa8bb22c6725a240388cc12fef4dc9dd89bb87d2b963fa8c98d09c645e76341a5357cedcf5c9 SHA512 41a6f95762fe034432e6c02a20bf37a25f27e8a3edfc8b07d4506115526865e22a594582ca1d7ddc2f22ccc8b1fea59f66edb5209cab5f0c38553dc0f70a96f9
diff --git a/dev-java/proguard/proguard-4.7.ebuild b/dev-java/proguard/proguard-4.7.ebuild
deleted file mode 100644
index 27d90c562ca3..000000000000
--- a/dev-java/proguard/proguard-4.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Free Java class file shrinker, optimizer, and obfuscator"
-HOMEPAGE="http://proguard.sourceforge.net/"
-MY_P=${P/-/}
-MY_P=${MY_P/_/}
-SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ant j2me"
-
-DEPEND=">=virtual/jdk-1.4
-		j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )"
-RDEPEND=">=virtual/jre-1.4
-		>=dev-java/ant-core-1.7:0
-		j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-	find "${S}" -name "*.jar" | xargs rm -v
-}
-
-EANT_BUILD_XML="build/build.xml"
-EANT_BUILD_TARGET="basic"
-EANT_DOC_TARGET=""
-
-src_compile() {
-	local j2mearg antarg
-
-	use ant && antarg="-Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
-	use j2me && j2mearg="-Dwtk.jar=$(java-pkg_getjar sun-j2me-bin kenv.zip)"
-
-	java-pkg-2_src_compile \
-		$(use ant && echo anttask ${antarg}) \
-		$(use j2me && echo wtkplugin ${j2mearg})
-
-	if use doc; then
-		mkdir javadoc || die
-		javadoc -d javadoc -sourcepath src -classpath $${cp} -subpackages proguard || die "Cannot compile javadoc"
-	fi
-}
-
-src_install() {
-	java-pkg_dojar lib/*
-	java-pkg_dolauncher ${PN} --main proguard.ProGuard
-	java-pkg_dolauncher ${PN}gui --main proguard.gui.ProGuardGUI
-	java-pkg_dolauncher ${PN}_retrace --main proguard.retrace.ReTrace
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc javadoc
-	fi
-
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/sac/Manifest b/dev-java/sac/Manifest
index 2a563d83af70..b1bba814e8dc 100644
--- a/dev-java/sac/Manifest
+++ b/dev-java/sac/Manifest
@@ -1,3 +1,4 @@
 DIST sac-1.3.zip 163617 BLAKE2B d52ae09cfa7a60afb66ebebb395a93f2e69fb0fc2cdec3153b34350339d179c1621f9cb613889664e008a1ed9d121520431df13938b5d8d9d722e40da01eeb12 SHA512 e179d2e672f1e9e134c4bec92742410bcf2c5d423e5d236856bb53e849d7fcdb2bb09518796d30862685a9ab2344bfeea9b4c7f3c3dd4a1007c8056e120c87b9
 EBUILD sac-1.3-r2.ebuild 562 BLAKE2B 9c8ec80aaf5c5ae8b6122cc2eb2d17ee60977c8a02341ee9478219abe22d7e4322ae0da62ede15352b46c00148d9296bb463b19ee60a8ad1bd20fbe3e6633594 SHA512 2bcaf8dde6695b5aa684016768309e6a68a6cbb22fd2bb126d8165fdd3caf3d5796b50068a71ed5f1ab4b5833c8975f56ab58e2c98447c7b5a145550e36ded1e
+EBUILD sac-1.3-r3.ebuild 540 BLAKE2B 4a37cdafe23b541c68219e9fa8e1a64fd77b54a992c46a360c3b129ddb6af3d787d4b4f2f08f765e75ae3f5b4a64fa55c200813bd23ad15c3122614f4c98471e SHA512 cbe84690c3280ca58b8d11a63e257116f0e732db7d2878696ff35c177dd4b735571233981a947d906e6fda74dd68a0f99880081e61db74e15ce95d32495f9e62
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sac/sac-1.3-r3.ebuild b/dev-java/sac/sac-1.3-r3.ebuild
new file mode 100644
index 000000000000..5d076a366599
--- /dev/null
+++ b/dev-java/sac/sac-1.3-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SAC is a standard interface for CSS parser"
+HOMEPAGE="http://www.w3.org/Style/CSS/SAC/"
+SRC_URI="http://www.w3.org/2002/06/sacjava-${PV}.zip -> ${P}.zip"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="org"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}