gentoo resync : 14.07.2018

3113 files changed, 82341 insertions, 10620 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4c73d05ba328..840a9b12ce8f 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/absolutelayout-6.7_beta-r1 b/dev-java/absolutelayout-6.7_beta-r1
deleted file mode 100644
index 8c659691956e..000000000000
--- a/dev-java/absolutelayout-6.7_beta-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=AbsoluteLayout files extracted from Netbeans
-EAPI=5
-HOMEPAGE=http://www.netbeans.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 CDDL )
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/absolutelayout-6.7_beta.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c91c6aa4a3f822d39e6255d7f1aee5e7
diff --git a/dev-java/absolutelayout/Manifest b/dev-java/absolutelayout/Manifest
new file mode 100644
index 000000000000..5676ce5c2e50
--- /dev/null
+++ b/dev-java/absolutelayout/Manifest
@@ -0,0 +1,3 @@
+DIST absolutelayout-6.7_beta.tar.bz2 3359 BLAKE2B 3753b864a8609b58f37679700651c928b113da03cc3294e7dbf27d45dc4cd00f163cbd196b503f382301c12212df071c833f3cab20e2dd1db827bbb39763e9a2 SHA512 2e14300fca85d2d81533147de4dbfa13660749a46134d9a80facd992948ed18147e02fcf2ca3590154823342201bd99f6e84eb251176ae1906c09477718a36e3
+EBUILD absolutelayout-6.7_beta-r1.ebuild 454 BLAKE2B d9840c7ecf1f050e3b51b4491d2443955ecd6270aacd71062c310ffd41079517566e5c909a13242fe1a8f414d50e1fe6e566a0b1f7404722614d246802f48377 SHA512 a3b35f56a5c3fadf3cfe971535a710e6ae9827b011ad00f36098654e2e910f8dec1aaec2725bb3f9f9e9e00a8ea7d35e52d28b771e9e5cbfe8a47d8e74f246b3
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild b/dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild
new file mode 100644
index 000000000000..cdcf73e5abab
--- /dev/null
+++ b/dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="AbsoluteLayout files extracted from Netbeans"
+HOMEPAGE="http://www.netbeans.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 CDDL )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}"
diff --git a/dev-java/absolutelayout/metadata.xml b/dev-java/absolutelayout/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/absolutelayout/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/airline-0.7-r1 b/dev-java/airline-0.7-r1
deleted file mode 100644
index fcccb0170eae..000000000000
--- a/dev-java/airline-0.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/guava:20 dev-java/javax-inject:0 dev-java/jsr305:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java annotation-based framework for parsing Git like command line structures
-EAPI=6
-HOMEPAGE=https://github.com/airlift/airline/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/guava:20 dev-java/javax-inject:0 dev-java/jsr305:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/airlift/airline/archive/0.7.tar.gz -> dev-java-airline-0.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f10eb9d66f363dd910b206f40c4400b3
diff --git a/dev-java/airline/Manifest b/dev-java/airline/Manifest
new file mode 100644
index 000000000000..fa02dc3dd1c9
--- /dev/null
+++ b/dev-java/airline/Manifest
@@ -0,0 +1,3 @@
+DIST dev-java-airline-0.7.tar.gz 40489 BLAKE2B 507ee6cb7757d16c5b015269a61ff1b176898ae820eecb7d8cad0d9aacad5b8ab732c197b9c0ef71a62b06e98d6ad9e9637a3f36b9b065a7861c9f0cb3f28d7f SHA512 5c9bd29de0e48c94552daf4206a9a894abe5f67ea955217c487095167ed25db2e38b1d0d297322ed2901cb1615d0067e526e10c0d7a0842bbf540d2ab4cbafea
+EBUILD airline-0.7-r1.ebuild 788 BLAKE2B dd8cce48396228c8c1322ec3b9feeaa5adc960e293410ecef15e82e132a98a6f705f35066f29d651d8bef93f89532dcb76305723b8eb3974af56256064edfecb SHA512 f610d1a54bc7491e5c8ca51396e0d691cd6a32991a96632de967891e42092b1b0ddc23f7caa50c1bf662a64b5151a440c2bd9c0bc9c79fecf444f8109a7f28a6
+MISC metadata.xml 316 BLAKE2B 240a1c9bfe9513e12a6a1dd95e14e81e09c0536c773136c46564483dc483cffa6d03b28d5107734e3b802d6a7e5f0dfb0f084fc9dea92d47d2f3600ce745bb82 SHA512 0ef49a1230dde6d7fe80b873eace3a8b7fdfc390cd4dbc4818c707f0ee87f159e661a1ae61ad31e1e24f8859c9e44cf43a41f39bfb2beb139266dfc0d93fc961
diff --git a/dev-java/airline/airline-0.7-r1.ebuild b/dev-java/airline/airline-0.7-r1.ebuild
new file mode 100644
index 000000000000..acbb765ec82f
--- /dev/null
+++ b/dev-java/airline/airline-0.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 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="Java annotation-based framework for parsing Git like command line structures"
+HOMEPAGE="https://github.com/airlift/airline/"
+# Renaming to avoid conflict with app-vim/airline:
+SRC_URI="https://github.com/airlift/${PN}/archive/${PV}.tar.gz -> ${CATEGORY}-${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="dev-java/guava:20
+	dev-java/javax-inject:0
+	dev-java/jsr305:0"
+
+DEPEND=">=virtual/jdk-1.7
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CP_DEPEND}"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md
+}
diff --git a/dev-java/airline/metadata.xml b/dev-java/airline/metadata.xml
new file mode 100644
index 000000000000..718292830bb1
--- /dev/null
+++ b/dev-java/airline/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">airlift/airline</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/android-util-4.1.1.4 b/dev-java/android-util-4.1.1.4
deleted file mode 100644
index fe4c75003b61..000000000000
--- a/dev-java/android-util-4.1.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/xerces:2 dev-java/xpp3:0 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Library providing APIs for applications written for Google Android
-EAPI=5
-HOMEPAGE=https://source.android.com/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/xerces:2 dev-java/xpp3:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/com/google/android/android/4.1.1.4/android-4.1.1.4-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fee43c2327f774ac3e3222a715707194
diff --git a/dev-java/android-util/Manifest b/dev-java/android-util/Manifest
new file mode 100644
index 000000000000..056ae8d87e0a
--- /dev/null
+++ b/dev-java/android-util/Manifest
@@ -0,0 +1,3 @@
+DIST android-4.1.1.4-sources.jar 12140689 BLAKE2B 272059646bd8b393e623467df457c17b011064a7fb6d2da14910c5c4414719bda51e6c59bcc7f63f3671207e9293f3229e62a4067cb12e98635561a40dd6e58d SHA512 39bbe77447adce554d323a55c6324c4af51cdf130ad9d8f4578e27ac99564d56513705bc2de6969deb6c35f70f2edf2f3724571d57c931ff768b437912ff637d
+EBUILD android-util-4.1.1.4.ebuild 663 BLAKE2B 9b1d2a51fd7512d308ad2f9ce4b5f18bd3011ba7e3fd6f2baf12f426a0d1a93a5f2cba4068b6a7d27f821ed96bcde5ac5ba1c79f7cb6893fc6fb905cfa6cd0ce SHA512 09aa139b4d2d233bd5f1df72a6570f2a84abe00f6feb6bd733d6c1db2f8b14bbf6807b18154821dc66e9fb54f6ca8d4f4257c02546a383a5e81b2801bcf26e37
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/android-util/android-util-4.1.1.4.ebuild b/dev-java/android-util/android-util-4.1.1.4.ebuild
new file mode 100644
index 000000000000..401834050baa
--- /dev/null
+++ b/dev-java/android-util/android-util-4.1.1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN/-util}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Library providing APIs for applications written for Google Android"
+HOMEPAGE="https://source.android.com/"
+SRC_URI="http://central.maven.org/maven2/com/google/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.jar"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/xerces:2
+	dev-java/xpp3:0"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+JAVA_SRC_DIR="${MY_PN}/util"
+
+JAVA_GENTOO_CLASSPATH="xerces-2,xpp3"
diff --git a/dev-java/android-util/metadata.xml b/dev-java/android-util/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/android-util/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/animal-sniffer-annotations-1.15 b/dev-java/animal-sniffer-annotations-1.15
deleted file mode 100644
index 3340fd240d4e..000000000000
--- a/dev-java/animal-sniffer-annotations-1.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java annotations for marking methods that Animal Sniffer should ignore
-EAPI=6
-HOMEPAGE=http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/mojohaus/animal-sniffer/archive/animal-sniffer-parent-1.15.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=82673e2385696bf5213f642278bdf0bf
diff --git a/dev-java/animal-sniffer-annotations/Manifest b/dev-java/animal-sniffer-annotations/Manifest
new file mode 100644
index 000000000000..b703ecd1e7b4
--- /dev/null
+++ b/dev-java/animal-sniffer-annotations/Manifest
@@ -0,0 +1,3 @@
+DIST animal-sniffer-parent-1.15.tar.gz 77766 BLAKE2B 6d99959c457d032e69f5a5109dc9ae80660db0a3fa34e2ebfdd7e3941a33e19f0078a05f3c6d561760a89584b2826bca6ef40dd7f5ea943b32ae43a4f2ed403b SHA512 8d0f6baa86fcb79fc54b826eff0f7c390d236d3cfc285914d3645e3bd9c72612c039eb0f1c3c2a9fbaca43040d967a2a69e10a9e5713682d1e441e44f3b55eb1
+EBUILD animal-sniffer-annotations-1.15.ebuild 643 BLAKE2B b76e4153ac78f0ae12a75587bb47a685e5bbf32c50e90f3d3f524bd4ddd4e7f5e57862c9a4c2565099073910796e92f89376ac6842274b6e74b521660739f054 SHA512 9143c756eb1f273ce2668db1949b715e6a8c74787a71223d303507cfc4010c07736a4029295bf812972b248b5f0e9b48cf2d0fcc3f03183e44c1c9c13358babb
+MISC metadata.xml 324 BLAKE2B c75c7c8d638080ab23d4eae8221d2d38fc797a29c73ce4fe1f57a59907bb3aad34dcfae556e6b99ce64c728c18b57edb03f03c37d925ae867a69c7e6c2a19d7c SHA512 e56ef2e924143c68bec47d876972176b2eb5650fd1bdb5528dcafcb7c607523a6c29662cd320d8cecd6c0f85404e9e7cf059ae1d03bb77bacb34f0376e939a8a
diff --git a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
new file mode 100644
index 000000000000..465628dcbe99
--- /dev/null
+++ b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN%-annotations}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java annotations for marking methods that Animal Sniffer should ignore"
+HOMEPAGE="http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/"
+SRC_URI="https://github.com/mojohaus/${MY_PN}/archive/${MY_PN}-parent-${PV}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_PN}-parent-${PV}/${PN}"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/animal-sniffer-annotations/metadata.xml b/dev-java/animal-sniffer-annotations/metadata.xml
new file mode 100644
index 000000000000..488b657d1844
--- /dev/null
+++ b/dev-java/animal-sniffer-annotations/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mojohaus/animal-sniffer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/annogen-0.1.0-r3 b/dev-java/annogen-0.1.0-r3
deleted file mode 100644
index 208b6668e965..000000000000
--- a/dev-java/annogen-0.1.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=dev-java/qdox:1.6 dev-java/ant-core:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A tool which helps you work with JSR175 annotations
-EAPI=5
-HOMEPAGE=https://github.com/codehaus/annogen
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=dev-java/qdox:1.6 dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://dist.codehaus.org/annogen/distributions/annogen-0.1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f7891461712a56a310cef3be7180b77f
diff --git a/dev-java/annogen/Manifest b/dev-java/annogen/Manifest
new file mode 100644
index 000000000000..47978b4d0a02
--- /dev/null
+++ b/dev-java/annogen/Manifest
@@ -0,0 +1,3 @@
+DIST annogen-0.1.0.zip 1008931 BLAKE2B ca0da18f095c0db0aedfca1b83c5df6bc8fd348be3764e9ed182807189e151302f88f10c78c05a44dace66509a5a4d0e532541356758373a76932b8d284101dc SHA512 f5c4eeb92ef8c87874df6619ef701b99dace01bd3ebc87f201ee3ab523fe612b6d143da2646c280d4831bc8e3051887514aa06b8bad6928b68ddd6cd6357fa16
+EBUILD annogen-0.1.0-r3.ebuild 1092 BLAKE2B e925a3fbc7db7c4896021aa6507ff30e251068d4eab03b18036c4b01cb0ddf3a66793694b92a85702b7da021bf2448e028ae7e6ab843f675f7cf60c8d21ec58a SHA512 f53507ecf3e2327e598e373e31405ca98786a27a98e3d4d46f7e64586b72871362b10d4a0d834f3ea0127ffcb3666427a64b1ecab78c7b9abbc0dda9c3290652
+MISC metadata.xml 317 BLAKE2B 2ef8f9c718fc1d76c34bb90c379d339f64a6540e817f6215d62f4950b29a020f5fe2cbe7f94dceb5ef3ea4aac3797e87c2b7b0b6367818a5f190e5a9867cf63b SHA512 a6d16a6969b19140df262a9f967f2d8896ebfa66909d9304cb65e961a6685817744c4a3c41fa10c4f3bc6100ce31fa91afcc13d98f2e4a98a171a304012ec4fd
diff --git a/dev-java/annogen/annogen-0.1.0-r3.ebuild b/dev-java/annogen/annogen-0.1.0-r3.ebuild
new file mode 100644
index 000000000000..f6d31072bfeb
--- /dev/null
+++ b/dev-java/annogen/annogen-0.1.0-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A tool which helps you work with JSR175 annotations"
+HOMEPAGE="https://github.com/codehaus/annogen"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/qdox:1.6
+	dev-java/ant-core:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+# com.sun.mirror.declaration was removed from JDK 7 onwards.
+# These two files are just interfaces anyway.
+JAVA_RM_FILES=(
+	org/codehaus/annogen/view/MirrorAnnoViewer.java
+	org/codehaus/annogen/override/MirrorElementIdPool.java
+)
+
+JAVA_GENTOO_CLASSPATH="
+	ant-core
+	qdox-1.6
+"
+
+src_unpack() {
+	default
+	unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
+}
+
+java_prepare() {
+	java-pkg_clean
+	rm -rv examples || die
+}
+
+src_compile() {
+	# Needed for com.sun.* imports
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-config -t)" \
+		java-pkg-simple_src_compile
+}
diff --git a/dev-java/annogen/metadata.xml b/dev-java/annogen/metadata.xml
new file mode 100644
index 000000000000..3073b0da13b9
--- /dev/null
+++ b/dev-java/annogen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">codehaus/annogen</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/ant-1.9.2-r1 b/dev-java/ant-1.9.2-r1
deleted file mode 100644
index 478adc684301..000000000000
--- a/dev-java/ant-1.9.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile postinst
-DEPEND=~dev-java/ant-core-1.9.2
-DESCRIPTION=Java-based build tool similar to 'make' that uses XML configuration files
-EAPI=6
-HOMEPAGE=https://ant.apache.org/
-IUSE=X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf +jsch +log4j +oro +regexp +resolver testutil
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=~dev-java/ant-core-1.9.2 ~dev-java/ant-core-1.9.2 ~dev-java/ant-junit-1.9.2 !dev-java/ant-optional !dev-java/ant-tasks ~dev-java/ant-apache-xalan2-1.9.2 antlr? ( ~dev-java/ant-antlr-1.9.2 ) bcel? ( ~dev-java/ant-apache-bcel-1.9.2 ) bsf? ( ~dev-java/ant-apache-bsf-1.9.2 ) log4j? ( ~dev-java/ant-apache-log4j-1.9.2 ) oro? ( ~dev-java/ant-apache-oro-1.9.2 ) regexp? ( ~dev-java/ant-apache-regexp-1.9.2 ) resolver? ( ~dev-java/ant-apache-resolver-1.9.2 ) commonslogging? ( ~dev-java/ant-commons-logging-1.9.2 ) commonsnet? ( ~dev-java/ant-commons-net-1.9.2 ) jai? ( ~dev-java/ant-jai-1.9.2 ) javamail? ( ~dev-java/ant-javamail-1.9.2 ) jdepend? ( ~dev-java/ant-jdepend-1.9.2 ) jmf? ( ~dev-java/ant-jmf-1.9.2 ) jsch? ( ~dev-java/ant-jsch-1.9.2 ) testutil? ( ~dev-java/ant-testutil-1.9.2 ) X? ( ~dev-java/ant-swing-1.9.2 )
-SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f2247ca09251aadc841fb0834c23a9cd
diff --git a/dev-java/ant-antlr-1.9.2-r1 b/dev-java/ant-antlr-1.9.2-r1
deleted file mode 100644
index 2de120c14378..000000000000
--- a/dev-java/ant-antlr-1.9.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks for Antlr
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cf4a4bc44d4f2e921cbe2da5f44fd370
diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest
new file mode 100644
index 000000000000..0701346f5add
--- /dev/null
+++ b/dev-java/ant-antlr/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-antlr-1.9.2-r1.ebuild 474 BLAKE2B c97085ba99084edc5df177278c5d1e54c0e1cdbeb6aa28c1bf77c7996aa9e1c3178cc0d5a861e1bd8443f2bbeed27252ea2453f6e4a49d94f5ef4fccdacf9a28 SHA512 3701e4e4504ebe741c095dd7e66d4d4a81a5e7e38b09f42e8b3f4c369b85a676572c6ec93c497b5fea101fc47afe188c913592280b7d06891d12a737c9f67c6a
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..61c7c31879f1
--- /dev/null
+++ b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for Antlr"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
+
+src_install() {
+	ant-tasks_src_install
+	java-pkg_register-dependency antlr
+}
diff --git a/dev-java/ant-antlr/metadata.xml b/dev-java/ant-antlr/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-antlr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-bcel-1.9.2 b/dev-java/ant-apache-bcel-1.9.2
deleted file mode 100644
index 87fcdfdd4dd7..000000000000
--- a/dev-java/ant-apache-bcel-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on bcel
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0f543426b369505d956aada18eee2b4f
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
new file mode 100644
index 000000000000..12c86e82c21f
--- /dev/null
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-bcel-1.9.2.ebuild 359 BLAKE2B 6e3412a4764180bfbb9cbd3aef6134e228ce1b4bff207512b32a23a6b85214d671f89806aa02d5464819af8b1958d051df64c9c0f226ae0f8c734a01bb17a621 SHA512 d2a898cf6d8edea0f5b6f4e3c70c1547737337a2a5b0ff14619eb0173fab3b62386e00ef7316a50541ad49c34b6514d0985d174bd0fb7bf89d5fadf8f324cc21
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
new file mode 100644
index 000000000000..4c880a1ade48
--- /dev/null
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="bcel"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/bcel-5.1-r3:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bcel/metadata.xml b/dev-java/ant-apache-bcel/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-apache-bcel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-bsf-1.9.2 b/dev-java/ant-apache-bsf-1.9.2
deleted file mode 100644
index f43b5a8226da..000000000000
--- a/dev-java/ant-apache-bsf-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on bsf-2.3
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=python javascript tcl elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7a93525df1db49b86c6b7d47188d29b8
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
new file mode 100644
index 000000000000..75abdb452b9c
--- /dev/null
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-bsf-1.9.2.ebuild 638 BLAKE2B c9eab574053f8817ee6fa07012a6012524fbb295f45d53bb47835cf7a454152516fae1b1daed4108b6a563557adbc964d7184942a3d735801d01b9457d7ce0a5 SHA512 31d6748a916d8852015bd5d64f54745571050093b390c067f37cdfa57014c0798936478ce0823c54733b3563ba4b9a696aefb3992f51909aeafdb2e49d66517f
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
new file mode 100644
index 000000000000..45ae131b3f60
--- /dev/null
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="bsf-2.3"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="python javascript tcl"
+
+DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy,"
+		elog "ruby and beanshell. See its postinst elog messages for instructions."
+	fi
+}
diff --git a/dev-java/ant-apache-bsf/metadata.xml b/dev-java/ant-apache-bsf/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-apache-bsf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-log4j-1.9.2 b/dev-java/ant-apache-log4j-1.9.2
deleted file mode 100644
index 4fdf97a0395f..000000000000
--- a/dev-java/ant-apache-log4j-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on log4j
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=165c0c3a19b4f37c729f4f13b077b4e6
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
new file mode 100644
index 000000000000..c02d3edbe653
--- /dev/null
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-log4j-1.9.2.ebuild 364 BLAKE2B 17c62ecc9ca6650e3fcadda3b6c6d83afd0fe5e77ffb33ec8ac1a5fa926acf85107b87d91def668d76a405dc35de68aa49654e2e5be0a553f8125ac1ec730f8a SHA512 648e4a5370d9f5ee6d9ab9af80df505bb9eae238caf65b4b4ab7dc898ce61c8e552cddb2e1d303ec64e17eb5e5e7aebb9601a6719413a0759b4f63ec6a439de9
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
new file mode 100644
index 000000000000..da86da4ae08a
--- /dev/null
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="log4j"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/log4j-1.2.13-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/metadata.xml b/dev-java/ant-apache-log4j/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-apache-log4j/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-oro-1.9.2 b/dev-java/ant-apache-oro-1.9.2
deleted file mode 100644
index 2500a113adc5..000000000000
--- a/dev-java/ant-apache-oro-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on jakarta-oro-2.0
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8de3397cbde85e552c1cff53992876ec
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
new file mode 100644
index 000000000000..001510268459
--- /dev/null
+++ b/dev-java/ant-apache-oro/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-oro-1.9.2.ebuild 381 BLAKE2B 7c53667cf3fa487b6a951bfd5ebb3e14fe40b0501eac2592c62c38b4eb9c6b0fcc65da7050724f518958232af5373f85716cc4a8a89e2cacedb597bf9eb8b856 SHA512 a996273c2bc9d48bfe09d0f0bd952fb52fbcd5fa21950865943ae09a4ca430f6c3aacf6b649d6f166c58815838c19bef5d6c7ccce22025cca635f02ede31c45c
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
new file mode 100644
index 000000000000..834e899d1b83
--- /dev/null
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="jakarta-oro-2.0"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/metadata.xml b/dev-java/ant-apache-oro/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-apache-oro/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-regexp-1.9.2 b/dev-java/ant-apache-regexp-1.9.2
deleted file mode 100644
index 4e1029001611..000000000000
--- a/dev-java/ant-apache-regexp-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on jakarta-regexp-1.4
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8645de8212d1ec09ed93d04ca185a94b
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
new file mode 100644
index 000000000000..8186ff13b977
--- /dev/null
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-regexp-1.9.2.ebuild 385 BLAKE2B c861e14076d4c261a93229a25b490b19f797850abba6f01a34c0ab7fc0cceaa5ce83a3f0177351bb1f7a053ac279c4c2530c064450e03dd25ba29fea1072aac2 SHA512 9d110c02c11a0ce43995b52d17f46d4542712625eec0a90ecd2b4653e954117306f5e59f52611a80d2b0b750e1b1f34ffd4df6de91c991e01082426c1ca39222
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
new file mode 100644
index 000000000000..3e5ad52958e3
--- /dev/null
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="jakarta-regexp-1.4"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/metadata.xml b/dev-java/ant-apache-regexp/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-apache-regexp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-resolver-1.9.2 b/dev-java/ant-apache-resolver-1.9.2
deleted file mode 100644
index a379c93d8a4d..000000000000
--- a/dev-java/ant-apache-resolver-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on xml-commons-resolver
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c6247c1105ef0feebdf813bcc2143c43
diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
new file mode 100644
index 000000000000..4a050cc5907d
--- /dev/null
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-resolver-1.9.2.ebuild 388 BLAKE2B a5313956f0cf362f9df0d0943e53a383c00aebd76cc4d1b1dfd61378095af53f59700463d5d9538092340e75ecf6dae6d30e92f15edd9d307bf0e1cfa8987229 SHA512 38aa44f7bb8aa22f078a85e71f5429a5c9905891cb967458f890d0bb5fbc3c5c1cc52c98590a0907bd517eff310f0c881dea2dfa5e38b9c2060d37f83c1cdd0e
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
new file mode 100644
index 000000000000..cba18e193cf5
--- /dev/null
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="xml-commons-resolver"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/metadata.xml b/dev-java/ant-apache-resolver/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-apache-resolver/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-xalan2-1.9.2-r1 b/dev-java/ant-apache-xalan2-1.9.2-r1
deleted file mode 100644
index 6a08462fab89..000000000000
--- a/dev-java/ant-apache-xalan2-1.9.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on xalan
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=149f9c2e892fa2a8f381dcd190d60c16
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
new file mode 100644
index 000000000000..049cbb684b78
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-xalan2-1.9.2-r1.ebuild 462 BLAKE2B 7043bd1b05eeda1bbc2c313853b4a15c8d94c3442fbd53e81eab9972d039230893219a375a92435addcfcfff7a5ab96d3d8520a3b00503b339a03cfee16b9dac SHA512 08d378e572d27dcb93db643d246a219c89a4e3ed27f55749162a2d932ac89c1acd91fb23b80c556613350581e56be9df7221f35827b98a0d96cb11e4db199fd8
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..3f3b7c497853
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="xalan"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/xalan:0
+	dev-java/xalan-serializer:0"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	ant-tasks_src_unpack all
+	java-pkg_jar-from xalan-serializer
+}
diff --git a/dev-java/ant-apache-xalan2/metadata.xml b/dev-java/ant-apache-xalan2/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-commons-logging-1.9.2 b/dev-java/ant-commons-logging-1.9.2
deleted file mode 100644
index faf75bd4e71f..000000000000
--- a/dev-java/ant-commons-logging-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on commons-logging
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4d7619d04c7fc8e72a616543479589bd
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
new file mode 100644
index 000000000000..f611f60219d7
--- /dev/null
+++ b/dev-java/ant-commons-logging/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-commons-logging-1.9.2.ebuild 347 BLAKE2B 5006e6af3bce302bdbd1faf26a94386a79a0638b89e8028debd2d62a80b7fb9bae84ba666bcd1bb6645fb20eef74de283c4f538196fd5043e4359cde8aac7542 SHA512 4fa770c28772e034807242fc5051d19227c7efd233bc362fd650ae7dfcd3032c2b759ff04c73e5689bcaa97080fd388e7d012574b35f19fa4bd0cfffa63863bd
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
new file mode 100644
index 000000000000..c4e08645d064
--- /dev/null
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-logging/metadata.xml b/dev-java/ant-commons-logging/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-commons-logging/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-commons-net-1.9.2 b/dev-java/ant-commons-net-1.9.2
deleted file mode 100644
index 8552c02f59de..000000000000
--- a/dev-java/ant-commons-net-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on commons-net
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5f16b4cf2a9a04da1fc44430f5c261e7
diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
new file mode 100644
index 000000000000..9203ff75d7e7
--- /dev/null
+++ b/dev-java/ant-commons-net/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-commons-net-1.9.2.ebuild 343 BLAKE2B d6a203ecbb2c405b725819c206c4a6af97b11d1632bbff59b8f9baeddd1cb24ae302792ef5e6fb79997a7c8726c992f6cba9cf0f087276bddcbf5aa4e5c6da75 SHA512 7681da0c70374d90f106e93dbb7f153db36fef7dfda3f31a780419f65ae071788ed7a1f12e5ec63a6408bb8ea9afdc4e532c2915b5059ae956391009f3cc5350
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
new file mode 100644
index 000000000000..fcf4a4acdfe6
--- /dev/null
+++ b/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/metadata.xml b/dev-java/ant-commons-net/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-commons-net/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-contrib-1.0_beta2-r2 b/dev-java/ant-contrib-1.0_beta2-r2
deleted file mode 100644
index b9aa849caa57..000000000000
--- a/dev-java/ant-contrib-1.0_beta2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 >=dev-java/bcel-5.1 >=dev-java/xerces-2.7 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A collection of tasks for Apache Ant
-EAPI=0
-HOMEPAGE=http://ant-contrib.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/bcel-5.1 >=dev-java/xerces-2.7 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib-1.0b2-src.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0702e6dcbe40a485b6f838e4adc29ef2
diff --git a/dev-java/ant-contrib-1.0_beta3-r2 b/dev-java/ant-contrib-1.0_beta3-r2
deleted file mode 100644
index 00e8f4b0a2e7..000000000000
--- a/dev-java/ant-contrib-1.0_beta3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=dev-java/ant-core-1.7.0:0 dev-java/ant-ivy:0 >=dev-java/bcel-5.1:0 dev-java/commons-httpclient:3 dev-java/xerces:2 >=virtual/jdk-1.4 >=dev-java/javatoolkit-0.3.0-r2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-ivy >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A collection of tasks for Apache Ant
-EAPI=6
-HOMEPAGE=http://ant-contrib.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/ant-core-1.7.0:0 dev-java/ant-ivy:0 >=dev-java/bcel-5.1:0 dev-java/commons-httpclient:3 dev-java/xerces:2 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-src.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5f09bd7d6f7b4e8ab3be0f800debf404
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
new file mode 100644
index 000000000000..7ed34e11fa2c
--- /dev/null
+++ b/dev-java/ant-contrib/Manifest
@@ -0,0 +1,6 @@
+AUX tests-visibility.patch 755 BLAKE2B 57a0815dc7881b5e5b1ebccf20a139624bc237aa67553634f9a2f91d45065694c655c8a63fc78c64c27e389f31c5a9356cafed8864aa56f720d648eff72a005f SHA512 a848c5573ffc9e02b77dd63c74d4314be5c35e47da7646d048d7e28a098290bc50d30287928ef3e06d8dcbba758b7ec1e87118ebac29bf72b04021f20e8c371d
+DIST ant-contrib-1.0b2-src.tar.bz2 118216 BLAKE2B 518e7bd19280ea035be155a5b8c5f1f5e228a7b24ebe1291c859c2216a57ce673c41f4d8975e73d9a4d07d54fbef404604dd22cc52adfe49820445c05c79e471 SHA512 5245ed1458c9c4892ab8196a8acdf8678aab0d45fc58fcd8ca446e3589f378a9a02de8e608abb75d24fa190cdcbe209454a703eec8d4e563b7690d6d58ea9af8
+DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8
+EBUILD ant-contrib-1.0_beta2-r2.ebuild 1455 BLAKE2B e26b5bb6352d9958e95aa914ba564a7b5e671d4c46ee3042476f268000c244ea4132e2f5805ae6b5d6239838fbf89cda662b3097e51c67b54119e8c12181e12f SHA512 60de0610acc54616f3f4763b0d243c3b07c63827ca70e94c5f95bea2e797eb61e7a5b4f937f87a7176ffbb478804c19743d27ebca91378f7c45fd5c96e81518a
+EBUILD ant-contrib-1.0_beta3-r2.ebuild 1831 BLAKE2B 84992885fae9dfa5ce27b0992e6d9b98e29741f68797c59ced485afdff4e4b80f04d5cb6676a49ebec1669ccdbafa738b4f8443bf2bfd2d696b5f59e70e4d704 SHA512 373a13f4d4d027a6ecd58615a98b0b4a53f14db7a38a17a2c2aec88c28ebfe52150009a5ebbbb1fc9c50d98aa65cf794ed98f113e93cb02c4b1840524ca25b60
+MISC metadata.xml 317 BLAKE2B 7a5bf5450578fb6d057233a53ba7f3e7fa6c3f969f7fa0eba8c22ac17b4efa19b270a765043d61635780b0da1f22e8a0d0304f0c15d468f72fafee1341b8131d SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
new file mode 100644
index 000000000000..8b10e01db511
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A collection of tasks for Apache Ant"
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+#	test? ( dev-java/ant-junit dev-java/ant-testutil )
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/bcel-5.1
+	>=dev-java/xerces-2.7
+	>=dev-java/ant-core-1.7.0"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/tests-visibility.patch"
+	cd "${S}/lib"
+	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from bcel bcel.jar bcel-5.1.jar
+	java-pkg_jar-from xerces-2
+}
+
+EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
+EANT_DOC_TARGET="docs"
+
+# The tests fail to find bcel and fail
+RESTRICT="test"
+
+src_test() {
+	cd test/lib || die
+	java-pkg_jar-from junit junit.jar junit-3.8.1.jar
+	java-pkg_jar-from ant-testutil
+	cd "${S}"
+	local testutil=$(java-pkg_getjars ant-testutil)
+	EANT_TEST_EXTRA_ARGS="-Dtestutil.jar.location=${testutil}" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_register-ant-task
+	dodoc README.txt || die
+	use doc && java-pkg_dojavadoc build/docs/api
+	use source && java-pkg_dosrc src/net
+	java-pkg_dohtml -r manual
+}
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
new file mode 100644
index 000000000000..7d467945ad73
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-ivy"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A collection of tasks for Apache Ant"
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+#	test? ( dev-java/ant-junit dev-java/ant-testutil )
+CP_DEPEND="
+	>=dev-java/ant-core-1.7.0:0
+	dev-java/ant-ivy:0
+	>=dev-java/bcel-5.1:0
+	dev-java/commons-httpclient:3
+	dev-java/xerces:2
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.4"
+
+# javatoolkit for cElementTree
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.4
+	>=dev-java/javatoolkit-0.3.0-r2"
+
+S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/tests-visibility.patch )
+
+rewrite_build_xml() {
+	python <<EOF
+import xml.etree.cElementTree as et
+tree = et.ElementTree(file='build.xml')
+root = tree.getroot()
+root.append(et.Element('path',id='test.classpath'))
+root.append(et.Element('path',id='compile.classpath'))
+skip=['resolve','classpath']
+for target in tree.getiterator("target"):
+	if target.attrib['name'] in skip:
+		target.attrib['if'] = 'false'
+
+tree.write('build.xml')
+EOF
+	[[ $? != 0 ]] && die "Removing taskdefs failed"
+}
+
+src_prepare() {
+	default
+	rewrite_build_xml
+	java-pkg_clean
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
+
+# Can't load bcel for some reason
+RESTRICT="test"
+# for tests
+EANT_GENTOO_CLASSPATH_EXTRA="target/${PN}.jar"
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc target/docs/api
+	use source && java-pkg_dosrc src/java/net
+
+	java-pkg_dohtml -r docs/manual
+}
diff --git a/dev-java/ant-contrib/files/tests-visibility.patch b/dev-java/ant-contrib/files/tests-visibility.patch
new file mode 100644
index 000000000000..182a17f054e0
--- /dev/null
+++ b/dev-java/ant-contrib/files/tests-visibility.patch
@@ -0,0 +1,12 @@
+diff -ur ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java
+--- ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java   2008-03-05 23:56:16.000000000 +0200
++++ ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java       2008-03-05 23:56:55.000000000 +0200
+@@ -76,7 +76,7 @@
+     * @param filename            name of project file to run
+     * @exception BuildException  Description of the Exception
+     */
+-   protected void configureProject( String filename ) throws BuildException {
++   public void configureProject( String filename ) throws BuildException {
+       // find the build file
+       File f = new File( filename );
+       if ( !f.exists() ) {
diff --git a/dev-java/ant-contrib/metadata.xml b/dev-java/ant-contrib/metadata.xml
new file mode 100644
index 000000000000..5c1224a74c63
--- /dev/null
+++ b/dev-java/ant-contrib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ant-contrib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/ant-core-1.9.2 b/dev-java/ant-core-1.9.2
deleted file mode 100644
index a5ca6e46fe19..000000000000
--- a/dev-java/ant-core-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk ) !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java-based build tool similar to 'make' that uses XML configuration files
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk ) !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=72d59c71cbe2d58c406dc7152a2d9bca
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
new file mode 100644
index 000000000000..b40bf9f81128
--- /dev/null
+++ b/dev-java/ant-core/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-core-1.9.2.ebuild 3216 BLAKE2B fdd1e40be093d25a40afd4e6009539ee1be4877a5e281596fb246d64c913da5c0877b05b7b8f024132ecdff31dc48bf9df691b1a6d07cc6580d1176b16027600 SHA512 fa3f6f9120f3ba469aad57c73317ea37adde68d39451d773172fd2c0c6c5e2b537f2c3ab1334733481740ec74021bc73756e8c502de861aae0057a87c36237a1
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
new file mode 100644
index 000000000000..1f5fc1092c46
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# Don't depend on itself.
+JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
+
+# Rewriting build.xml files for the testcases has no use at the moment.
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 prefix versionator
+
+MY_P="apache-ant-${PV}"
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="http://ant.apache.org/"
+SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~tomwij/files/dist/ant-${PV}-gentoo.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk )
+	!dev-java/ant-tasks
+	!dev-java/ant-optional"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/"
+	eprefixify "${WORKDIR}/ant"
+
+	# use our split-ant build.xml.
+	mv -f "${WORKDIR}/build.xml" . || die
+
+	# Fixes bug 556008.
+	java-ant_xml-rewrite -f build.xml \
+		-c -e javadoc \
+		-a failonerror \
+		-v "false"
+
+	# See bug #196080 for more details.
+	java-ant_bsfix_one build.xml
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	export ANT_HOME=""
+
+	local bsyscp
+
+	# This ensures that when building ant with bootstrapped ant,
+	# only the source is used for resolving references, and not
+	# the classes in bootstrapped ant but jikes in kaffe has issues with this...
+	if ! java-pkg_current-vm-matches kaffe; then
+		bsyscp="-Dbuild.sysclasspath=ignore"
+	fi
+
+	CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars internal_dist \
+		$(use_doc javadocs) || die "build failed"
+}
+
+src_install() {
+	dodir /usr/share/ant/lib
+
+	for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
+		java-pkg_dojar build/lib/${jar}
+		dosym /usr/share/${PN}/lib/${jar} /usr/share/ant/lib/${jar}
+	done
+
+	dobin "${WORKDIR}/ant"
+
+	dodir /usr/share/${PN}/bin
+	for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do
+		dobin "${S}/src/script/${each}"
+		dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
+	done
+	dosym /usr/share/${PN}/bin /usr/share/ant/bin
+
+	insinto /usr/share/${PN}
+	doins -r dist/etc
+	dosym /usr/share/${PN}/etc /usr/share/ant/etc
+
+	echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
+	doenvd "${T}/20ant"
+
+	dodoc NOTICE README WHATSNEW KEYS
+
+	if use doc; then
+		dohtml -r manual/*
+		java-pkg_dojavadoc --symlink manual/api build/javadocs
+	fi
+
+	use source && java-pkg_dosrc src/main/*
+}
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ! version_is_at_least 1.7.0 ${REPLACING_VERSIONS}; then
+			elog "The way of packaging ant in Gentoo has changed significantly since"
+			elog "the 1.7.0 version, For more information, please see:"
+			elog "https://www.gentoo.org/proj/en/java/ant-guide.xml"
+		fi
+
+		if ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; then
+			elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
+			elog "flags have been moved to dev-java/ant."
+		fi
+	fi
+}
diff --git a/dev-java/ant-core/metadata.xml b/dev-java/ant-core/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-core/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-eclipse-ecj-4.2.1 b/dev-java/ant-eclipse-ecj-4.2.1
deleted file mode 100644
index 5683020ec113..000000000000
--- a/dev-java/ant-eclipse-ecj-4.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-4.2.1 >=dev-java/ant-core-1.7 app-arch/unzip >=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
-EAPI=4
-HOMEPAGE=http://www.eclipse.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-4.2.1 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=4.2
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6aa0efa068cbbff0e638f168873c2c5b
diff --git a/dev-java/ant-eclipse-ecj-4.4.2 b/dev-java/ant-eclipse-ecj-4.4.2
deleted file mode 100644
index 4ebb10241d69..000000000000
--- a/dev-java/ant-eclipse-ecj-4.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=~dev-java/eclipse-ecj-4.4.2:4.4 >=dev-java/ant-core-1.7 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-RDEPEND=~dev-java/eclipse-ecj-4.4.2:4.4 >=dev-java/ant-core-1.7 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.4
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=afe7211dcd0054d80f6d2704edcc2444
diff --git a/dev-java/ant-eclipse-ecj-4.5.1 b/dev-java/ant-eclipse-ecj-4.5.1
deleted file mode 100644
index 59fdb79b8098..000000000000
--- a/dev-java/ant-eclipse-ecj-4.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=~dev-java/eclipse-ecj-4.5.1:4.5 >=dev-java/ant-core-1.7 app-arch/unzip >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-RDEPEND=~dev-java/eclipse-ecj-4.5.1:4.5 >=dev-java/ant-core-1.7 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.5
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3ba13ec75d567154997fbe542f7b59aa
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
new file mode 100644
index 000000000000..995ec6828b00
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -0,0 +1,10 @@
+AUX ecj-4.2 290 BLAKE2B 4c96c6ead1903a37769bb2453d6320f2cff933855e7086bd9e59b3577ce0a30ac0887aea26eac1599a89a28eb048fc19c05cb1eba21b4dad23caaacefa36cfc8 SHA512 9fee5e853c9ffde67103b35cb8b28d06dde9be305aba872703a14a95be3e51f5087a5c897e6685f0381794415a524513a4e988ca088b7d30a574518943f97713
+AUX ecj-4.4 314 BLAKE2B 9855d136e85d003ef85e2b0e854d0ea6d29ee37e4221ca612d1ed6c51f89e6f2268f9082dd946468119129240166394122f54618e1a6a799dded0eeb9f0046cc SHA512 a0023e61ed3b1174e7ab7ebc9eb2bc42e9df6a23e5010ede6c2456eca60c4f4a9e11633fcc6438824fe1db4c881499b5f384715c19381411460e78e78ddca678
+AUX ecj-4.5 322 BLAKE2B 2941d70de68459d2bea21ae10680dbbee7888e156753e2bb7bae89b4c2aa41e453106b6ab0ae3660790cf70799550e09fd612a8736b0ac07a3859cdc25446e86 SHA512 d46976eb709a65e1d01af6b48d095325daf10a1ee4ff5da22de12593a253ba21e9550538ff13d1b7844fdb2604462d28133011301ba6a69cab83b2de7c7324f2
+DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
+DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
+DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
+EBUILD ant-eclipse-ecj-4.2.1.ebuild 1363 BLAKE2B 1fd46c888db8d7662c55ceda97bfcfb2074bde7d26a249f0837e9a4f53f130b7776b9e131f3714d0ce272dbe8a777879366160e7fcb03e809099d7d3e168de50 SHA512 edbcd030f67950128afb6aad948d2104ca9610152cded95750c10771513246463c3da9d9a7fd128a623c9669cb3d6559875c69f4045e2ff1ea6a0b6f6bae9461
+EBUILD ant-eclipse-ecj-4.4.2.ebuild 1248 BLAKE2B dd7249882bbb0c2511e424165dcc12ccdee58baf9985da2182d31d451fa1fb94f736407e303bc1a61d9d43355a7142fd7af1078ff7277122540e1bc0a47786f5 SHA512 310dd8cb237d922b55186fcfad23136e0861464dc6aaa252ea8615a9dcf61a3f6042c5edc463af1147fb1f9d4c76b61fca15a035b8b9718252cc8d9ef85c4277
+EBUILD ant-eclipse-ecj-4.5.1.ebuild 1249 BLAKE2B 4f0fd6db9c642716d87396a421521a5087d014c41235436596a1e3d81c32ffc71d6734d1dd858b1d3c4ec088b8adf1cf2920402575910f51f1bda35c6a6f964d SHA512 45c87738ac2c850d2fbbcf1fb2cdbb03b271900b63324f6d9418337431da7fb260371a39814354e6abae1115fa9e84ffd43d6036be7bca724ff0e32780bef69f
+MISC metadata.xml 546 BLAKE2B 1d3e6201cf0f0e87bf1ede2db78c4c706d9a59df9321a0820a9d180c7da9736c4af6a3442c1abf175e45969447ef9c8e0a0f8d73ce50985405c445f14c694903 SHA512 999312c6cfed7b52584e3e80ac1a9f5b372a05b1f6523f859b367080e7989c988e2773fd2b0f5ec5fb11da42386e37dffedf761324a41b43c309b3ab5a57fd36
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
new file mode 100644
index 000000000000..79c8636d1587
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit java-pkg-2
+
+DMF="R-${PV}-201209141800"
+S="${WORKDIR}"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF/.0}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.2"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	~dev-java/eclipse-ecj-${PV}
+	>=dev-java/ant-core-1.7"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.4"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p src/org/eclipse/jdt/{core,internal}
+	cp org/eclipse/jdt/core/JDTCompilerAdapter.java \
+		src/org/eclipse/jdt/core || die
+	cp -r org/eclipse/jdt/internal/antadapter \
+		src/org/eclipse/jdt/internal || die
+	rm -fr about* org
+}
+
+src_compile() {
+	cd src
+	java-pkg_filter-compiler jikes
+	ejavac -classpath "$(java-pkg_getjars ant-core,eclipse-ecj-${SLOT})" \
+		$(find org/ -name '*.java') || die "ejavac failed!"
+	find org/ -name '*.class' -o -name '*.properties' | \
+			xargs jar cf "${S}/${PN}.jar" || die "jar failed!"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	sed -i "s/^JAVAC=/&${EPREFIX}:" /usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
new file mode 100644
index 000000000000..3656f27ea48d
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-201502041700"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.4"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	>=dev-java/ant-core-1.7"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+java_prepare() {
+	# Remove everything but the Ant component.
+	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
+
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
new file mode 100644
index 000000000000..3e841d328273
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-201509040015"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.5"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	>=dev-java/ant-core-1.7"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.7"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+java_prepare() {
+	# Remove everything but the Ant component.
+	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
+
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.2 b/dev-java/ant-eclipse-ecj/files/ecj-4.2
new file mode 100644
index 000000000000..5100ad03962f
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.2
@@ -0,0 +1,7 @@
+JAVAC="/usr/bin/ecj-4.2"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.2*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.2,ant-eclipse-ecj-4.2"
+GENERATION="2"
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.4 b/dev-java/ant-eclipse-ecj/files/ecj-4.4
new file mode 100644
index 000000000000..36fef918e57b
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.4
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.4"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.4*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.4,ant-eclipse-ecj-4.4"
+GENERATION="2"
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.5 b/dev-java/ant-eclipse-ecj/files/ecj-4.5
new file mode 100644
index 000000000000..e0a0eb367f50
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.5
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.5"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.5*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.5,ant-eclipse-ecj-4.5"
+GENERATION="2"
diff --git a/dev-java/ant-eclipse-ecj/metadata.xml b/dev-java/ant-eclipse-ecj/metadata.xml
new file mode 100644
index 000000000000..410d61c1447b
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription>
+ECJ is the Eclipse Compiler for Java. It's a separate packaging of
+the embedded Java compiler that comes with Eclipse. It can be used
+as a batch-compiler by running the ecj-3.1 script, or it can be
+used with Ant by using the -lib option to and and setting
+-Dbuild.compiler=ecj
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/ant-ivy-1.4.1-r1 b/dev-java/ant-ivy-1.4.1-r1
deleted file mode 100644
index 0f902fddfcbe..000000000000
--- a/dev-java/ant-ivy-1.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip test? ( dev-java/ant-junit:0 ) dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-httpclient:3 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Ivy is a free java based dependency manager
-EAPI=5
-HOMEPAGE=https://ant.apache.org/ivy/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-httpclient:3 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=49ed3431f037d7ce198750b72caa0241
diff --git a/dev-java/ant-ivy-2.3.0-r2 b/dev-java/ant-ivy-2.3.0-r2
deleted file mode 100644
index 2d7a9af42a68..000000000000
--- a/dev-java/ant-ivy-2.3.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) dev-java/jsch:0 dev-java/bcpg:1.50 dev-java/ant-core:0 dev-java/bcpkix:1.50 dev-java/bcprov:1.50 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/commons-httpclient:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Ivy is a free java based dependency manager
-EAPI=5
-HOMEPAGE=https://ant.apache.org/ivy/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/jsch:0 dev-java/bcpg:1.50 dev-java/ant-core:0 dev-java/bcpkix:1.50 dev-java/bcprov:1.50 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/commons-httpclient:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://apache/ant/ivy/2.3.0/apache-ivy-2.3.0-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=87014c2cf04e583cffbd125307eb1e83
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
new file mode 100644
index 000000000000..d095587b2e80
--- /dev/null
+++ b/dev-java/ant-ivy/Manifest
@@ -0,0 +1,6 @@
+AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908a209691a04c1e3b24af21eddccf217c46120cc2c89eabe0cfe277fe245b7e174974de29ec2bd5affca2b SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f
+DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
+DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
+EBUILD ant-ivy-1.4.1-r1.ebuild 1759 BLAKE2B 30c437cccd0d86ca2a8b162569602ab2571ff570e6e373dd17f47d60df5c06c6ae8726caf67290d2a0d2b250de63f9638f17aa84cbf8ff9f479d66b161c503ca SHA512 21028c7fe5712daf3680fec1137261b9bde21fb46f0633abbbd98fab4e41d2cdd63d5364d6de4275f667f778a9c8b2ebfeed56b8ffc0d4b25cb8ae039f802a20
+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-1.4.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..11291a26fda5
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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="${PN##*-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="https://ant.apache.org/ivy/"
+SRC_URI="http://www.jaya.free.fr/downloads/ivy/${PV}/${MY_P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+COMMON_DEP="
+	dev-java/ant-core:0
+	dev-java/commons-cli:1
+	dev-java/commons-httpclient:3
+	dev-java/commons-vfs:0
+	dev-java/jakarta-oro:2.0
+	dev-java/jsch:0"
+
+DEPEND="
+	>=virtual/jdk-1.4
+	app-arch/unzip
+	test? ( dev-java/ant-junit:0 )
+	${COMMON_DEP}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	epatch "${FILESDIR}/1.4.1-javadoc.patch"
+
+	# init-ivy expects existing ivy.jar, but we don't need actually it
+	sed -i -e 's/depends="init-ivy, prepare"/depends="prepare"/' build.xml \
+		|| die
+
+	rm -v src/java/fr/jayasoft/ivy/repository/vfs/IvyWebdav* || die
+	java-ant_rewrite-classpath
+	mkdir lib
+}
+
+EANT_GENTOO_CLASSPATH="
+	ant-core,commons-cli-1,commons-httpclient-3
+	commons-vfs,jakarta-oro-2.0,jsch"
+
+EANT_BUILD_TARGET="offline jar"
+
+src_test() {
+	# TODO: find out why a couple of these fail
+	java-pkg_jar-from --into lib junit
+	ANT_TASKS="ant-junit" eant offline test
+}
+
+src_install() {
+	java-pkg_dojar build/artifact/${MY_PN}.jar
+
+	use doc && java-pkg_dojavadoc doc/ivy/api
+	use examples && java-pkg_doexamples src/example
+	use source && java-pkg_dosrc src/java/*
+
+	java-pkg_register-ant-task
+}
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..23bf9f5f7c28
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+# Register this as a split-ant task.
+WANT_SPLIT_ANT="true"
+
+# Don't rewrite examples, that's 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"
+
+# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
+RESTRICT="test"
+
+# SLOT to use for all bc dependencies.
+BC_SLOT="1.50"
+
+# There may be additional optional dependencies (commons-logging, commons-lang...)
+CDEPEND="dev-java/jsch:0
+	dev-java/bcpg:${BC_SLOT}
+	dev-java/ant-core:0
+	dev-java/bcpkix:${BC_SLOT}
+	dev-java/bcprov:${BC_SLOT}
+	dev-java/commons-vfs:0
+	dev-java/jakarta-oro:2.0
+	dev-java/commons-httpclient:3"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	# This stuff needs removing.
+	local CLEANUP=(
+		doc/reports
+		test/triggers
+		doc/configuration
+		test/repositories
+		test/java/org/apache/ivy/core/settings/custom-resolver.jar
+		src/example/chained-resolvers/settings/repository/test-1.0.jar
+	)
+
+	rm -rf "${CLEANUP[@]}" || die
+
+	java-ant_rewrite-classpath
+	mkdir lib || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+	jsch
+	bcpkix-${BC_SLOT}
+	ant-core
+	bcpg-${BC_SLOT}
+	commons-vfs
+	bcprov-${BC_SLOT}
+	jakarta-oro-2.0
+	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
+	java-pkg_register-ant-task
+
+	if use doc; then
+		java-pkg_dojavadoc build/doc/reports/api
+		java-pkg_dohtml -r doc
+	fi
+
+	use examples && java-pkg_doexamples src/example
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/ant-ivy/files/1.4.1-javadoc.patch b/dev-java/ant-ivy/files/1.4.1-javadoc.patch
new file mode 100644
index 000000000000..4a0b47d8a714
--- /dev/null
+++ b/dev-java/ant-ivy/files/1.4.1-javadoc.patch
@@ -0,0 +1,14 @@
+diff -ur ivy-1.4.1.old/build.xml ivy-1.4.1/build.xml
+--- ivy-1.4.1.old/build.xml	2007-09-04 02:44:23.000000000 +0300
++++ ivy-1.4.1/build.xml	2007-09-04 02:44:53.000000000 +0300
+@@ -245,9 +245,7 @@
+ 	</target>

+ 	

+ 	<target name="javadoc">

+-		<javadoc destdir="${javadoc.build.dir}">

+-			<fileset dir="${src.dir}"/>

+-		</javadoc>

++		<javadoc destdir="${javadoc.build.dir}" sourcepath="${src.dir}" />

+ 	</target>

+ 

+ 	<target name="get-dxml" description="download dxml doc file from web site">

diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml
new file mode 100644
index 000000000000..231bfe529dc0
--- /dev/null
+++ b/dev-java/ant-ivy/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Ivy is a powerful dependencies manager with transitive dependencies
+		support and much more features.
+
+		With Ivy you define the dependencies of your module in an xml file,
+		called an ivy file. Then you usually ask ivy to retrieve your dependencies
+		to a local lib dir, and it does it for you by locating the artifacts of
+		your dependencies in repositories, such as ibiblio.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/ant-jai-1.9.2 b/dev-java/ant-jai-1.9.2
deleted file mode 100644
index 45db5072af3b..000000000000
--- a/dev-java/ant-jai-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on sun-jai-bin
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=35237aa274e73386ecc2140b6b6d946c
diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
new file mode 100644
index 000000000000..e999fb035ec0
--- /dev/null
+++ b/dev-java/ant-jai/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-jai-1.9.2.ebuild 330 BLAKE2B bd2f662e949c6ea8155595ecf7778a6cd7453e19c7dc4e61e3ee4880755005ea628a34091209e1d53c856accd3b3694e83857657579b27411147d498003dba99 SHA512 797fe5463151d9a66ccc7f4fdc666dee23935b36d45c1543ee6221d7a0d74c400921b9456677e3555f9f8bdb3242a658f3e361b54b1c968b4d19f999ad27b7a4
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jai/ant-jai-1.9.2.ebuild b/dev-java/ant-jai/ant-jai-1.9.2.ebuild
new file mode 100644
index 000000000000..4d424488a10a
--- /dev/null
+++ b/dev-java/ant-jai/ant-jai-1.9.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="sun-jai-bin"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86"
+
+# Unmigrated, has textrels and there's also some source one now too.
+DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jai/metadata.xml b/dev-java/ant-jai/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-jai/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-javamail-1.9.2-r2 b/dev-java/ant-javamail-1.9.2-r2
deleted file mode 100644
index dcd793cc6db7..000000000000
--- a/dev-java/ant-javamail-1.9.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on oracle-javamail
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3948a19af726de7d7626018b2d4e578a
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
new file mode 100644
index 000000000000..508d2aaf8583
--- /dev/null
+++ b/dev-java/ant-javamail/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-javamail-1.9.2-r2.ebuild 372 BLAKE2B 729648d88eb3d1af5da67c490d0d4437d7dbd19344a81c1c3dc67ede261acf87e170b1e3c87df226fec860440b1184bbdd1fbaa2fc86a85496a51f7b57382a45 SHA512 956c6a3bb062f99efc8d45538d9703e9a90665559079d34e3edaedf0cd029969b84a88877cf8d5a47c6da1a95d5e1acc915d161a884e11ff774a589863907ea2
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild
new file mode 100644
index 000000000000..f09165a59c20
--- /dev/null
+++ b/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="oracle-javamail"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/oracle-javamail:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-javamail/metadata.xml b/dev-java/ant-javamail/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-javamail/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-jdepend-1.9.2 b/dev-java/ant-jdepend-1.9.2
deleted file mode 100644
index f4ddc6d03b55..000000000000
--- a/dev-java/ant-jdepend-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on jdepend
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b668cc89775a08a57c2017a961c33e42
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
new file mode 100644
index 000000000000..6f943f0aa79c
--- /dev/null
+++ b/dev-java/ant-jdepend/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-jdepend-1.9.2.ebuild 337 BLAKE2B e761853e3f289559d234740faeff0155ed6dba6d22983edeea141785498f83f1854442cb0f55704d602ef844131b0678a4e42d1998317706a0237067c76cc9a7 SHA512 b8c848cc52646142102056f523f2fef73ac28bf6f1899522e74a7b32caf7adc8003f8e923cd46ad3e245a771b2a9b7fc5df46a81303795209648b9542f2af4e9
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
new file mode 100644
index 000000000000..fd84d5ea01db
--- /dev/null
+++ b/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/jdepend-2.9-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/metadata.xml b/dev-java/ant-jdepend/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-jdepend/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-jmf-1.9.2 b/dev-java/ant-jmf-1.9.2
deleted file mode 100644
index baf6604376bd..000000000000
--- a/dev-java/ant-jmf-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks for the Java Media Framework (JMF)
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9316cef2d79f489f0a68ab7c0a9d1111
diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
new file mode 100644
index 000000000000..0c68af7be756
--- /dev/null
+++ b/dev-java/ant-jmf/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-jmf-1.9.2.ebuild 442 BLAKE2B 72c38a29c480b64d268a4fcb35343360fec007cdd9bc5001fc85117f881b9380384574767b57d337dbce4e751dcd1b9d9f9153070eb70625035226e7dd543acb SHA512 25ff6db6ea214003d27446f52a20fee2c34a78b4ee0f4bb96995d4059b1b3d2f04abd116a9c3bf086b9c507293063dcba7a1d96e667cdaac76679d1d77be6700
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild b/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
new file mode 100644
index 000000000000..bc8934bcd488
--- /dev/null
+++ b/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# Seems we don't need to depend on jmf-bin, the classes ant imports are in J2SE
+# API since version 1.3.
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jmf/metadata.xml b/dev-java/ant-jmf/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-jmf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-jsch-1.9.2 b/dev-java/ant-jsch-1.9.2
deleted file mode 100644
index 3acd6bc92179..000000000000
--- a/dev-java/ant-jsch-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on jsch
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bed845d81eb6c83c6ecc9ac2f8be0425
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
new file mode 100644
index 000000000000..85dafcf55d79
--- /dev/null
+++ b/dev-java/ant-jsch/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-jsch-1.9.2.ebuild 334 BLAKE2B ca0fb3b2033c1405cfc6ed4d53ff1a00313d584c8bd70ffde3856f64cd2f5792ff82b91d5cf2fd6743e772e528188b244c45b6f52d7ed943621a20d1b4748bdd SHA512 eab9878016474d7c2dd04994b97f37fab9e7556dabb6fc4e556fd877ca274bcda0d04c349c9e59a0e3b20e46c75c3baaa4df40f7fa339b4669b340f81bd15c04
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild b/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
new file mode 100644
index 000000000000..bf0f7290e70c
--- /dev/null
+++ b/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/jsch-0.1.37:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jsch/metadata.xml b/dev-java/ant-jsch/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-jsch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-junit-1.9.2 b/dev-java/ant-junit-1.9.2
deleted file mode 100644
index 4ffaf4b359b0..000000000000
--- a/dev-java/ant-junit-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on junit
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ed5b2422ad1611633b81538083d6b4ce
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
new file mode 100644
index 000000000000..447f2adcff58
--- /dev/null
+++ b/dev-java/ant-junit/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-junit-1.9.2.ebuild 440 BLAKE2B 1591305f815f914e673e2b32b2431cfd0366d8624c1b7f5714ee467c5f447bb2a1d6f1e3cc06b8158df038f0cadc00db673144d175861e18e97df4d67630354e SHA512 60fe961cb9b9f919ed04ec80d79cff2ac7468fe58cdd76de85170bd51ebf6b6443d449c80831713ab3b221ba2feb8db28f3c64458a8cbf17e008df75ff340ef9
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit/ant-junit-1.9.2.ebuild b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
new file mode 100644
index 000000000000..262d4c31b670
--- /dev/null
+++ b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/junit:4"
+RDEPEND="${DEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit-4"
+
+src_compile() {
+	eant jar-junit
+}
diff --git a/dev-java/ant-junit/metadata.xml b/dev-java/ant-junit/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-junit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-junit4-1.9.2 b/dev-java/ant-junit4-1.9.2
deleted file mode 100644
index d12d5835a671..000000000000
--- a/dev-java/ant-junit4-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.9.2 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks depending on junit-4
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.9.2 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=468d53d584b9e1195e4cc0faa60569c3
diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
new file mode 100644
index 000000000000..5a1f955ac92b
--- /dev/null
+++ b/dev-java/ant-junit4/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-junit4-1.9.2.ebuild 892 BLAKE2B a86fbea1362673fa5a870d99aeda048af324cdd17378d544c26407d156ba4a95153711e6a640c484aca4920e12237e3a3ce79e5ee0ab01e331fd036ef2ba9149 SHA512 fb4d96d2c9f25d3be82aac963a73198f84fe98f0a517e131c604b3ad3b97f62ef517a3421fd947daa1dcab68e27c6d33a4647d51b875f3b1d90b1bdc93f62358
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild b/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
new file mode 100644
index 000000000000..7e52132ebaa4
--- /dev/null
+++ b/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_JDKVER=1.5
+ANT_TASK_JREVER=1.5
+ANT_TASK_DEPNAME="junit-4"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+
+DEPEND="dev-java/junit:4
+	~dev-java/ant-junit-${PV}"
+
+RDEPEND="${DEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit-4,ant-junit"
+
+src_compile() {
+	eant jar-junit4
+}
+
+src_install() {
+	# No registration as ant-task, would be loaded together with ant-junit.
+	java-pkg_dojar build/lib/ant-junit4.jar
+
+	# As we dont't want to depend on and-junit in package.env, because it depends
+	# on junit:0. Instead, we "steal" its jar and record it to our package.env as
+	# if it belongs to this package's classpath.
+	java-pkg_getjar --build-only ant-junit ant-junit.jar
+	java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar)
+}
diff --git a/dev-java/ant-junit4/metadata.xml b/dev-java/ant-junit4/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-junit4/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-nodeps-1.9.2 b/dev-java/ant-nodeps-1.9.2
deleted file mode 100644
index c53e88473f6c..000000000000
--- a/dev-java/ant-nodeps-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 !dev-java/ant-tasks
-DESCRIPTION=Formerly Ant's optional tasks w/o external deps, now compat empty jar
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=144b4aadb0979f294fabfec202580a60
diff --git a/dev-java/ant-nodeps/Manifest b/dev-java/ant-nodeps/Manifest
new file mode 100644
index 000000000000..83cf4e50464a
--- /dev/null
+++ b/dev-java/ant-nodeps/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-nodeps-1.9.2.ebuild 910 BLAKE2B 1070d9ed907ae07fff24be179bf2591b6b8e5bec091fc7409a17799670a111c9f6da8f8c84aa80c9623cd4c249063971a412066f29ff36580e761059d837f27f SHA512 123fd523f2c641e0c64dc857b90111dc1f57aadcd28872f09d380310e44687b9a5ec34a65655ffe6e70412ec8ed33392793888f9d298d84f73ac34829437a1d6
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
new file mode 100644
index 000000000000..11cd200f684f
--- /dev/null
+++ b/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_DEPNAME=""
+ANT_TASK_DISABLE_VM_DEPS="true"
+
+inherit ant-tasks
+
+DESCRIPTION="Formerly Ant's optional tasks w/o external deps, now compat empty jar"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Dependency needed for jar.
+DEPEND=">=virtual/jdk-1.4"
+
+src_compile() {
+	# The classes were moved to ant-core in 1.8.2, this is just for compatibility.
+	mkdir -p build/lib/empty && cd build/lib/empty || die
+	jar -cf ../${PN}.jar . || die
+}
+
+pkg_postinst() {
+	elog "Upstream has removed ant-nodeps.jar as of 1.8.2 and moved the classes to ant.jar"
+	elog "This package thus installs an empty jar for compatibility"
+	elog "and will be removed once reverse dependencies are transitioned."
+}
diff --git a/dev-java/ant-nodeps/metadata.xml b/dev-java/ant-nodeps/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-nodeps/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-owanttask-1.3.2 b/dev-java/ant-owanttask-1.3.2
deleted file mode 100644
index d249662a6f05..000000000000
--- a/dev-java/ant-owanttask-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/xalan >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=ObjectWeb's Ant tasks
-EAPI=5
-HOMEPAGE=http://monolog.objectweb.org
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 dev-java/xalan >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_1.3.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ddfa51b8afc12f6c2e2cf1e3e2a8b733
diff --git a/dev-java/ant-owanttask/Manifest b/dev-java/ant-owanttask/Manifest
new file mode 100644
index 000000000000..17da93cd3ff0
--- /dev/null
+++ b/dev-java/ant-owanttask/Manifest
@@ -0,0 +1,3 @@
+DIST ow_util_ant_tasks_1.3.2.zip 1170518 BLAKE2B bf0792c7ea18f8122a6a8755d976e109bf0d4bc6b26e8ae5dd7e9bdc8d6f1e16e4e0ff40ded79ebb571b57a433e96dd9e259843091be1efa18ac4bb227ea8e89 SHA512 c2ca84d34864b075c39e9699ac1a41c2980615ea6d813d007ee503fe19cfd5c869cdd0f6be27cbfdafc33aa49c32022b99ced2387381fdb6816925957207a603
+EBUILD ant-owanttask-1.3.2.ebuild 872 BLAKE2B 2f271ca7df182e8e98dbbe7b6e1e5b8a5d8ce2b412e11e70f755433a8d57fefdcc44460cb20d3b748e34c010aa0d61a491f1c3d6669b41b788014be7bda83ad2 SHA512 b7eeaf61829e0686a3690e11c19ebdcc17addee299a8def640ce0a2229b93c7f6c5f13938ed4e2290539ac09e7f0c39b05007465c0660e9e1cf918dc10a47fa4
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
new file mode 100644
index 000000000000..0a15fae99035
--- /dev/null
+++ b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="ObjectWeb's Ant tasks"
+HOMEPAGE="http://monolog.objectweb.org"
+SRC_URI="http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_${PV}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+COMMON_DEP="dev-java/xalan"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/ant-core-1.7.0
+	${COMMON_DEP}"
+
+S=${WORKDIR}
+
+src_prepare() {
+	rm -f output/lib/*.jar
+}
+
+src_install() {
+	java-pkg_dojar output/lib/ow_util_ant_tasks.jar
+}
+
+pkg_postinst() {
+	ewarn "The MultipleCopy task is not compatible with ant-1.7.0 and newer"
+	ewarn "Attempt to use it will break building."
+}
diff --git a/dev-java/ant-owanttask/metadata.xml b/dev-java/ant-owanttask/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/ant-owanttask/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-swing-1.9.2 b/dev-java/ant-swing-1.9.2
deleted file mode 100644
index d42c9ac0fc8b..000000000000
--- a/dev-java/ant-swing-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks for Swing
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f52a5798a3a9ea325e08f618550238b9
diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest
new file mode 100644
index 000000000000..972b58225f99
--- /dev/null
+++ b/dev-java/ant-swing/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-swing-1.9.2.ebuild 378 BLAKE2B 929e21c190b22bf1a2208d257a1d869fea004c18c1744c20868ea5b217a8ccdae554d4d191825b43574c2ca51ca97aedc0d9cff5b10ddf26e8cde9650c09f8ea SHA512 1ffdf04554b7dfcaf301e28f8c39ad73701ec7c8348a4dae57c0f39183a8a044a51a363d9645ab0815ed4b0c0a9a7e294ae4c16acca25597f43d4ffc6de8f177
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-swing/ant-swing-1.9.2.ebuild b/dev-java/ant-swing/ant-swing-1.9.2.ebuild
new file mode 100644
index 000000000000..ce2b13e20711
--- /dev/null
+++ b/dev-java/ant-swing/ant-swing-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# No extra dependencies are needed.
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for Swing"
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-swing/metadata.xml b/dev-java/ant-swing/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-swing/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-testutil-1.9.2 b/dev-java/ant-testutil-1.9.2
deleted file mode 100644
index 6f7599334528..000000000000
--- a/dev-java/ant-testutil-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.6 >=dev-java/junit-4.11:4 ~dev-java/ant-swing-1.9.2 ~dev-java/ant-junit4-1.9.2 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional test utility classes
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e62d079fa700b4fc8f23ee3b92dc9318
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
new file mode 100644
index 000000000000..8ae65e5e79a6
--- /dev/null
+++ b/dev-java/ant-testutil/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-testutil-1.9.2.ebuild 879 BLAKE2B b5d43761171505f960122afe17265f0d76e2c336a00510daa726adb31efba3586389a924acd37cdaa26cdfe6ef788b67c35de0ce972fded71e9fc3e56bdab346 SHA512 35fbd1785a5d1ed76bf8cb78b90d67fdb1eca04fab19f45fa04e2d2e80993ed2432d8ef1198f1bb0464691169bf76748cdd7c2ae862e48e80d3173617e9b9739
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild b/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
new file mode 100644
index 000000000000..5b82bd8d0c38
--- /dev/null
+++ b/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional test utility classes"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	>=dev-java/junit-4.11:4
+	~dev-java/ant-swing-${PV}
+	~dev-java/ant-junit4-${PV}"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+# The build system builds much more than it actually packages, so there are many
+# build-only deps, but since those are quite common, it wasn't worth to patch it.
+
+src_unpack() {
+	ant-tasks_src_unpack base
+	java-pkg_jar-from --build-only junit-4,ant-junit4,ant-swing
+	java-pkg_jar-from --build-only ant-core ant-launcher.jar
+}
+
+src_compile() {
+	eant test-jar
+}
diff --git a/dev-java/ant-testutil/metadata.xml b/dev-java/ant-testutil/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-testutil/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant-trax-1.9.2 b/dev-java/ant-trax-1.9.2
deleted file mode 100644
index 65188aac2833..000000000000
--- a/dev-java/ant-trax-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant .jar with optional tasks depending on XML transformer (Deprecated!)
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	dc76d8ba2fcb9925b5db9034c041a40d	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4230f4e0c2c5c66cbb2185346271369b
diff --git a/dev-java/ant-trax/Manifest b/dev-java/ant-trax/Manifest
new file mode 100644
index 000000000000..061d01a53044
--- /dev/null
+++ b/dev-java/ant-trax/Manifest
@@ -0,0 +1,4 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-trax-1.9.2.ebuild 910 BLAKE2B 3980b05b32731b1a97f4574fbd3a2127b05e13160fc2d93d3d8f859e3d8b1dee5bdacbbb8e3b63618dbe19de790c8896d82cfab806924464fce4525f9d6f23d7 SHA512 aac3b8e362f2c0fff8426437dadf84e64fae853dd735d7ef26c97cfe0039b000be9ab9a4b53bada5eec23b9189554dc9ed65b72242089927c43a69b63fa5fb07
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-trax/ant-trax-1.9.2.ebuild b/dev-java/ant-trax/ant-trax-1.9.2.ebuild
new file mode 100644
index 000000000000..e6c1636dcb56
--- /dev/null
+++ b/dev-java/ant-trax/ant-trax-1.9.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_DEPNAME=""
+ANT_TASK_DISABLE_VM_DEPS="true"
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (Deprecated!)"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Dependency needed for jar.
+DEPEND=">=virtual/jdk-1.4"
+
+src_compile() {
+	# The classes were moved to ant-core in 1.8.1, this is just for compatibility.
+	mkdir -p build/lib/empty && cd build/lib/empty || die
+	jar -cf ../${PN}.jar .
+}
+
+pkg_postinst() {
+	elog "Upstream has removed ant-trax.jar as of 1.8.1 and moved the classes to ant.jar"
+	elog "This package thus installs an empty jar for compatibility"
+	elog "and will be removed once reverse dependencies are transitioned."
+}
diff --git a/dev-java/ant-trax/metadata.xml b/dev-java/ant-trax/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-trax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
new file mode 100644
index 000000000000..37970fd4f453
--- /dev/null
+++ b/dev-java/ant/Manifest
@@ -0,0 +1,2 @@
+EBUILD ant-1.9.2-r1.ebuild 2027 BLAKE2B eee331a9cffd99f179cd2df829299f95e100d132cf7055dffa63463d42655febd55a3e7643af993f236a6ba5bc12efe5c332fcd73e7cebb4540bf45d4a7a7018 SHA512 092edc2dc1c0b2e2b607db39dab7632814bb124ef3c20c1787fc84760b4192e8690cdc575f21efc2b4146b1efea97e2317829f5c99b4f3b96cbb1c002951d605
+MISC metadata.xml 1159 BLAKE2B 393c61676e20af2acd08d2ecee954ea68ddb794f3aaf52bb576f72049b8807b25b8122919254d41cc249c88b375283d459193fe2c05dda46ae344e6774674ca2 SHA512 daa64360ccca2ae691a7d47b980cc35eb0c4577fd99493b235c4931861edc60a0bce1c7da5d360fd58c3c426421a7bbf41a8d9b463783e212dbae91f32a06a49
diff --git a/dev-java/ant/ant-1.9.2-r1.ebuild b/dev-java/ant/ant-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..b9f778d065f9
--- /dev/null
+++ b/dev-java/ant/ant-1.9.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit versionator
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="https://ant.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+	+jsch +log4j +oro +regexp +resolver testutil"
+
+DEPEND="~dev-java/ant-core-${PV}"
+
+RDEPEND="${DEPEND}
+	~dev-java/ant-core-${PV}
+	~dev-java/ant-junit-${PV}
+	!dev-java/ant-optional
+	!dev-java/ant-tasks
+	~dev-java/ant-apache-xalan2-${PV}
+	antlr? ( ~dev-java/ant-antlr-${PV} )
+	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
+	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
+	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
+	oro? ( ~dev-java/ant-apache-oro-${PV} )
+	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
+	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
+	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
+	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
+	jai? ( ~dev-java/ant-jai-${PV} )
+	javamail? ( ~dev-java/ant-javamail-${PV} )
+	jdepend? ( ~dev-java/ant-jdepend-${PV} )
+	jmf? ( ~dev-java/ant-jmf-${PV} )
+	jsch? ( ~dev-java/ant-jsch-${PV} )
+	testutil? ( ~dev-java/ant-testutil-${PV} )
+	X? ( ~dev-java/ant-swing-${PV} )
+"
+
+S="${WORKDIR}"
+
+src_compile() { :; }
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		# if we update from a version below 1.7.1
+		if ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; then
+			elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
+			elog "flags have been moved to dev-java/ant."
+			elog
+			elog "You may now freely set the USE flags of this package without breaking"
+			elog "building of Java packages, which depend on the exact ant tasks they need."
+			elog "The USE flags default to enabled (except X, jai and jmf) for convenience."
+		fi
+	fi
+}
diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml
new file mode 100644
index 000000000000..2874ae4bc71e
--- /dev/null
+++ b/dev-java/ant/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <use>
+    <flag name="antlr">Enable ANTLR Ant tasks</flag>
+    <flag name="bcel">Enable bcel (bytecode manipulation) Ant tasks</flag>
+    <flag name="commonslogging">Enable commons-logging Ant tasks</flag>
+    <flag name="commonsnet">Enable commons-net Ant tasks</flag>
+    <flag name="jai">Enable JAI (Java Imaging) Ant task</flag>
+    <flag name="javamail">Enable JavaMail Ant task</flag>
+    <flag name="jdepend">Enable Jdepend Ant tasks</flag>
+    <flag name="jmf">Enable JMF (Java Media Framework) Ant tasks</flag>
+    <flag name="jsch">Disable Jsch (ssh, scp and related) Ant tasks</flag>
+    <flag name="log4j">Enable Apache log4j Ant tasks</flag>
+    <flag name="oro">Enable Apache Oro Ant tasks</flag>
+    <flag name="regexp">Enable Apache Regexp Ant tasks</flag>
+    <flag name="resolver">Enable Apache Resolver Ant tasks</flag>
+    <flag name="testutil">Enable optional test util classes</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/antlr-2.7.7-r7 b/dev-java/antlr-2.7.7-r7
deleted file mode 100644
index a5aab3ea2613..000000000000
--- a/dev-java/antlr-2.7.7-r7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A parser generator for many languages
-EAPI=5
-HOMEPAGE=http://www.antlr2.org/
-IUSE=examples source elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=13d2df691607cbd713674665d935b021
diff --git a/dev-java/antlr-2.7.7-r8 b/dev-java/antlr-2.7.7-r8
deleted file mode 100644
index fe619c667185..000000000000
--- a/dev-java/antlr-2.7.7-r8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A parser generator for many languages
-EAPI=6
-HOMEPAGE=http://www.antlr2.org/
-IUSE=examples elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a200a5273d61bca7e83d68000e0598bf
diff --git a/dev-java/antlr-3.2 b/dev-java/antlr-3.2
deleted file mode 100644
index 4f99b8a959fd..000000000000
--- a/dev-java/antlr-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A parser generator for many languages
-EAPI=5
-HOMEPAGE=http://www.antlr3.org/
-IUSE=doc test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=3
-SRC_URI=http://www.antlr3.org/download/antlr-3.2.tar.gz http://www.antlr3.org/download/antlr-3.2.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5d3287dd522bd525160068f825dd7953
diff --git a/dev-java/antlr-3.5.2 b/dev-java/antlr-3.5.2
deleted file mode 100644
index 481027af2331..000000000000
--- a/dev-java/antlr-3.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/stringtemplate:4 >=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A parser generator for many languages
-EAPI=5
-HOMEPAGE=http://www.antlr3.org/
-IUSE=doc test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-java/stringtemplate:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=3.5
-SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz http://www.antlr3.org/download/antlr-3.5.2-complete.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=79f056cf51b80d1cd8445e9554cf0d9e
diff --git a/dev-java/antlr-4.5.1 b/dev-java/antlr-4.5.1
deleted file mode 100644
index 31ed7fd84d1b..000000000000
--- a/dev-java/antlr-4.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=virtual/jdk-1.6 test? ( dev-java/hamcrest-core:1.3 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A parser generator for many languages
-EAPI=5
-HOMEPAGE=http://www.antlr.org/
-IUSE=doc test elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4
-SRC_URI=https://github.com/antlr/antlr4/archive/4.5.1.tar.gz -> antlr-4.5.1.tar.gz http://www.antlr.org/download/antlr-4.5.1-complete.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=67abe3e17580b738801f7edeeac7623d
diff --git a/dev-java/antlr-4.5.3 b/dev-java/antlr-4.5.3
deleted file mode 100644
index b58c999757ce..000000000000
--- a/dev-java/antlr-4.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=virtual/jdk-1.6 test? ( dev-java/hamcrest-core:1.3 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A parser generator for many languages
-EAPI=5
-HOMEPAGE=http://www.antlr.org/
-IUSE=doc test elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4
-SRC_URI=https://github.com/antlr/antlr4/archive/4.5.3.tar.gz -> antlr-4.5.3.tar.gz http://www.antlr.org/download/antlr-4.5.3-complete.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f565f4aadb4c52ef080df5f3e35f308a
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
new file mode 100644
index 000000000000..19ee2f8409c6
--- /dev/null
+++ b/dev-java/antlr/Manifest
@@ -0,0 +1,19 @@
+AUX 3.2-java-8.patch 1318 BLAKE2B f7cf19e6da346c50ed066782905fffeac9b9f42c9988bc3ba0d18bc434fecfaa6d4ad3e74d2c84c87854716435be4a596c47b919ce42b310e48dc70d184bc7f5 SHA512 70c9dc23ec64ba75bfcfc0597544b13c2c35c523c6f2c9d82dbc54a44c30a5432a56b6193db74ca9c3d92235bdadc5427857c364abc4df79ffdc1d2b55221d32
+AUX 3.2-test-fixes.patch 10278 BLAKE2B 868e9dc24f26b9933fe169f93b9156b3965473da7e636058ac630455b4f9347f465f86151681ee9734bcf1e435345abb033fbfb7cfbd845d6d41b423ae6478e0 SHA512 b593da8fb05d8ac51b0fd72172b740aeae060bd18c58413c67ff0c5242609b419d4a1b0a4f5ae66d5a3b2103007d4511ece41da6b09dab5f12ffd5f905d45d31
+AUX 3.5.2-test-fixes.patch 2093 BLAKE2B 4016d770a226f1fb86f7f6e630df38c0d2ed0b4a025991f6b88e88506d2a44838c17097fc4ad5f63e506a839ebce0fcfa8e57f22415f777b0bd4c37afc93a0b1 SHA512 dcdde9daabfb3379f85d831a594259b21e1cc0283f7f0972d42801cb144d6932fe5cccff576cc885614db3f9e07b98782c4932a03687658df35f698455588533
+DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
+DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
+DIST antlr-3.2.tar.gz 837320 BLAKE2B 3addcfed45e67a7f8f3841a890be418626d93229dc326fe4670c6b145a457203a26f01723695573692c65bb6c376349a8d8cd852b339b1f6da7b71a52e14bb4f SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c
+DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
+DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
+DIST antlr-4.5.1-complete.jar 1478820 BLAKE2B 7f6ab8d1bad6b75ede4930fe594a3302bd2bdeac8426d65d0a16610a8da4dd3bda23db68b7feafc90449bda5032115ad0f0dbe7c376c4095cb4ccac3e7a70e84 SHA512 1109087c44706694d75a7f88f6ce96e8653467d5721505db747e7e70a4f40a24469b1fb3ffcb327819bba1548b0025412e46a11a41e329b0ecf847cb1094238c
+DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55f2a6bcc4ca244655a6d2aacc15226111b00fc0a8a6424f8a7c6eb3bfa49172e3b2149714a5c0c6ad69943cd9 SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9
+DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
+DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
+EBUILD antlr-2.7.7-r7.ebuild 1088 BLAKE2B e142dbcdb4c0d46a6ffe42b9106156e1ded900014521ce184c0b1f124c4424c059034d60ee0ce1e115baa1bc820934ab98047878522294e355291c19310b71d4 SHA512 f4d31e2a60405ad2934321406f6ade73bdb903ee79304a3726351adbdb8f5f89a1b284fe27e796b3aabe8bfa0b71d0b4941fdc045492ea001d1f0005634dba4a
+EBUILD antlr-2.7.7-r8.ebuild 1099 BLAKE2B 33c966b64de3577aada4aa8e19b367104f89e236a42e78b8ea106682030a5989512e24ed0dbbf0b263716c9c7a081fc81ff1fa77b602d39fbac0abb1b0298d3c SHA512 a308fb2c7c359d206a25fc4215b37d72220f5e33425577d126379c960d1a009c7644dd18dd0e5b5b608abb55c7c34a3f25abcd826cc2c617e0a8d581c10eba02
+EBUILD antlr-3.2.ebuild 3242 BLAKE2B 19729b322437e4ef21672eaa432568b94a6f6bc0efde5ac856e148c55a3bcccf9fbb4631421c2f25a7d09f88758033d2f830d1565ff88051eb7016473b778fbd SHA512 38d68d796dc5ea1bf214779642e9ea40840295c6caf69017bfa92ca623289f9ac532e5262a64d48bd8ef1c709b45a1a9590da8e0636c37377649a6c335bddb5f
+EBUILD antlr-3.5.2.ebuild 2995 BLAKE2B b9825d24f8743279add37e97612644fdad2ff5731ad1806fe610b87e926461c1cf5913c64ff5be1321ca88c46a466a66f5d1bbbbeaaf87eefe4b9c52352bfa34 SHA512 abe140c64f10c39f82c5771acdb2a848ca0ecbfe718a0cb9514805c2109c2f4128b97ae8e5abb81f63417507dcbf5b23b42850d48f1eb826c7e0d390e64cc0e9
+EBUILD antlr-4.5.1.ebuild 2452 BLAKE2B eeb1ef4d8aac8a1317fb494c6943f496d39f706ad4f077afb58efc90f5b92ceb7cea296c0fbd4f1f31dc2c7787f9191eda7cb47584692e7984dc53b4e1b1e1e3 SHA512 ccb84e30811f01bb4d28d38117c75c79b8e0048a86d06194bdfe1aeb7de5b33b9d08e907a850a8a3714e637dcee4a7a396cd314ffc6c8472671e236220bbdee2
+EBUILD antlr-4.5.3.ebuild 2455 BLAKE2B 13f8824ca0268841a2ff9493633d3308853e020c5b263ece94598b1db48d1720139b95554eaf8456eb24730d1645dc19f656d2cc4afa52498900d3628c08e7a2 SHA512 03e9c3c64e3c04f14ef82b3fcd5d3018778f39e8c5386da05071634c14791d6335ed3212387cd0ecd7bf4774c5a3d2a49569e566dfb61ea6a66fa71ba4857841
+MISC metadata.xml 313 BLAKE2B 211bde607161c54e23a30950b17cda11291e84a9f745a2c44c17c7c224ad8ef309786ec4952f094e90cc569d86e0186bd2fa426fc1de6718541e207be12c3fd0 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57
diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
new file mode 100644
index 000000000000..09dc38c165a3
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="http://www.antlr2.org/"
+SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples source"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="${S}/${PN}"
+
+java_prepare() {
+	java-pkg_clean
+
+	# Delete build files from examples.
+	find examples \( -name Makefile.in -o -name shiplist \) -delete || die
+}
+
+src_configure() {
+	: # Avoid configure script.
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher antlr --main antlr.Tool
+	dodoc {CHANGES,README}.txt
+
+	use doc && java-pkg_dohtml -r doc/*
+	use examples && java-pkg_doexamples examples/java
+	use source && java-pkg_dosrc antlr
+}
diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r8.ebuild
new file mode 100644
index 000000000000..10056965f258
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r8.ebuild
@@ -0,0 +1,47 @@
+# 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="A parser generator for many languages"
+HOMEPAGE="http://www.antlr2.org/"
+SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="${S}/${PN}"
+
+DOCS=( CHANGES.txt README.txt )
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	# Delete build files from examples.
+	find examples \( -name Makefile.in -o -name shiplist \) -delete || die
+}
+
+# Avoid configure script.
+src_configure() { :; }
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher antlr --main antlr.Tool
+
+	use doc && java-pkg_dohtml -r doc/*
+	use examples && java-pkg_doexamples examples/java
+	use source && java-pkg_dosrc antlr
+
+	einstalldocs
+}
diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
new file mode 100644
index 000000000000..d8976fb16787
--- /dev/null
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="http://www.antlr3.org/"
+SRC_URI="http://www.antlr3.org/download/${P}.tar.gz
+	http://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+CDEPEND=">=dev-java/antlr-2.7.7-r7:0
+	dev-java/stringtemplate:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${P}"
+JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
+JAVA_GENTOO_CLASSPATH="antlr,stringtemplate"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+java_prepare() {
+	java-pkg_clean
+
+	# These fixes have been applied in 3.5.
+	epatch "${FILESDIR}/${PV}-test-fixes.patch"
+	epatch "${FILESDIR}/${PV}-java-8.patch"
+
+	# Some tests fail under Java 8 in ways that probably aren't limited
+	# to the tests. This is bad but upstream is never going to update
+	# 3.2 even though other projects still rely on it. If any issues
+	# arise, we can only put pressure on those projects to upgrade.
+	if java-pkg_is-vm-version-ge 1.8; then
+		rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
+	fi
+
+	# 3.2 has strange hidden files.
+	find -type f -name "._*.*" -delete || die
+}
+
+src_compile() {
+	cd "${S}/runtime/Java/src/main" || die
+	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
+
+	cd "${S}/tool/src/main" || die
+
+	local G; for G in antlr codegen antlr.print assign.types buildnfa define; do # from pom.xml
+		antlr -o antlr2/org/antlr/grammar/v2/{,${G}.g} || die
+	done
+
+	# We have applied a patch to fix this version under Java 8. Trouble
+	# is that we need to run a prebuilt version before we can build our
+	# own and that version doesn't have the fix applied. We work around
+	# this by building just the offending class against the prebuilt
+	# version and then putting them together in the classpath. That
+	# isn't all. Due to a compiler limitation that Chewi doesn't fully
+	# understand, this class cannot be compiled by itself without a
+	# couple of tweaks that have been applied in the Java 8 patch.
+	ejavac -classpath "${DISTDIR}/${P}.jar" java/org/antlr/tool/CompositeGrammar.java
+
+	java -classpath "java:${DISTDIR}/${P}.jar" org.antlr.Tool $(find antlr3 -name "*.g") || die
+	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
+	java-pkg_addres "${S}/${PN}-tool.jar" resources
+}
+
+src_install() {
+	java-pkg_dojar ${PN}-{runtime,tool}.jar
+	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.Tool
+	use doc && java-pkg_dojavadoc runtime/Java/src/main/target/api
+}
+
+src_test() {
+	cd tool/src/test/java || die
+	local CP=".:${S}/${PN}-runtime.jar:${S}/${PN}-tool.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+
+	local TESTS=$(find * -name "Test*.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
new file mode 100644
index 000000000000..46c6402f4b20
--- /dev/null
+++ b/dev-java/antlr/antlr-3.5.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="http://www.antlr3.org/"
+SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
+	http://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
+LICENSE="BSD"
+SLOT="3.5"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+CDEPEND="dev-java/stringtemplate:4"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${PN}3-${PV}"
+JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
+JAVA_GENTOO_CLASSPATH="stringtemplate-4"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+java_prepare() {
+	java-pkg_clean
+
+	# This requires StringTemplate v3 and is only needed for
+	# output=template. Nothing in the tree currently needs that and the
+	# dependency situation is already hairy enough as it is.
+	rm -v runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java || die
+
+	# Some tests have to be removed as a result.
+	rm -v tool/src/test/java/org/antlr/test/Test{RewriteTemplates,Templates}.java || die
+	epatch "${FILESDIR}/${PV}-test-fixes.patch"
+
+	# Some tests fail under Java 8 in ways that probably aren't limited
+	# to the tests. This is bad but upstream is never going to update
+	# 3.5. At the time of writing, we only use it to build 4 anyway.
+	if java-pkg_is-vm-version-ge 1.8; then
+		rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
+	fi
+}
+
+src_compile() {
+	cd "${S}/runtime/Java/src/main" || die
+	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
+
+	cd "${S}/tool/src/main" || die
+	java -jar "${DISTDIR}/${P}-complete.jar" $(find antlr3 -name "*.g") || die
+	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
+	java-pkg_addres "${S}/${PN}-tool.jar" resources
+}
+
+src_install() {
+	java-pkg_dojar ${PN}-{runtime,tool}.jar
+	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.Tool
+	use doc && java-pkg_dojavadoc runtime/Java/src/main/target/api
+}
+
+src_test() {
+	cd tool/src/test/java || die
+	local CP=".:${S}/${PN}-runtime.jar:${S}/${PN}-tool.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+
+	local TESTS=$(find * -name "Test*.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find -name "*.java")
+
+	# ejunit automatically adds all registered subdependencies to the
+	# classpath, which is annoying in this case because of the cyclic
+	# dependency on stringtemplate. It will blow up when trying to find
+	# antlr-3.5 on the system before it is installed. The easiest but
+	# somewhat ugly way to avoid this is to unset JAVA_PKG_DEPEND_FILE.
+	JAVA_PKG_DEPEND_FILE= ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
new file mode 100644
index 000000000000..a7c4c1ffbb73
--- /dev/null
+++ b/dev-java/antlr/antlr-4.5.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="http://www.antlr.org/"
+SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
+	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+CDEPEND="dev-java/antlr:3.5
+	dev-java/stringtemplate:4
+	dev-java/treelayout:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${PN}4-${PV}"
+JAVA_GENTOO_CLASSPATH="stringtemplate-4,treelayout"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_configure() {
+	# TODO: Make java-config accept a jar@package query.
+	JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar:$(java-pkg_getjar antlr-3.5 antlr-runtime.jar)"
+}
+
+src_compile() {
+	cd "${S}/runtime/Java/src"
+	local G PKG
+
+	for G in $(find * -name "*.g4"); do
+		PKG="${G%/*}"
+		PKG="${PKG//\//.}"
+		java -jar "${DISTDIR}/${P}-complete.jar" -package "${PKG}" "${G}" || die
+	done
+
+	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
+
+	cd "${S}/tool/src"
+	antlr3.5 $(find -name "*.g") || die
+	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
+	java-pkg_addres "${S}/${PN}-tool.jar" ../resources
+}
+
+src_install() {
+	java-pkg_dojar ${PN}-{runtime,tool}.jar
+	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.v4.Tool
+	use doc && java-pkg_dojavadoc runtime/Java/src/target/api
+	use source && java-pkg_dosrc runtime/Java/src/org tool/src/org
+}
+
+junit_suite() {
+	cd "${S}/$1-testsuite/test" || die
+	local CP=".:${S}/runtime-testsuite/test:${S}/${PN}-tool.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH}):${JAVA_GENTOO_CLASSPATH_EXTRA}"
+
+	local TESTS=$(find ${2:-*} -name "Test*.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find ${2:-*} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
+
+src_test() {
+	# Only run Java runtime tests as we haven't built other languages.
+	junit_suite runtime org/antlr/v4/test/runtime/java
+	junit_suite tool
+}
diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
new file mode 100644
index 000000000000..3b48b132714c
--- /dev/null
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="http://www.antlr.org/"
+SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
+	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+CDEPEND="dev-java/antlr:3.5
+	dev-java/stringtemplate:4
+	dev-java/treelayout:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${PN}4-${PV}"
+JAVA_GENTOO_CLASSPATH="stringtemplate-4,treelayout"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_configure() {
+	# TODO: Make java-config accept a jar@package query.
+	JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar:$(java-pkg_getjar antlr-3.5 antlr-runtime.jar)"
+}
+
+src_compile() {
+	cd "${S}/runtime/Java/src"
+	local G PKG
+
+	for G in $(find * -name "*.g4"); do
+		PKG="${G%/*}"
+		PKG="${PKG//\//.}"
+		java -jar "${DISTDIR}/${P}-complete.jar" -package "${PKG}" "${G}" || die
+	done
+
+	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
+
+	cd "${S}/tool/src"
+	antlr3.5 $(find -name "*.g") || die
+	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
+	java-pkg_addres "${S}/${PN}-tool.jar" ../resources
+}
+
+src_install() {
+	java-pkg_dojar ${PN}-{runtime,tool}.jar
+	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.v4.Tool
+	use doc && java-pkg_dojavadoc runtime/Java/src/target/api
+	use source && java-pkg_dosrc runtime/Java/src/org tool/src/org
+}
+
+junit_suite() {
+	cd "${S}/$1-testsuite/test" || die
+	local CP=".:${S}/runtime-testsuite/test:${S}/${PN}-tool.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH}):${JAVA_GENTOO_CLASSPATH_EXTRA}"
+
+	local TESTS=$(find ${2:-*} -name "Test*.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find ${2:-*} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
+
+src_test() {
+	# Only run Java runtime tests as we haven't built other languages.
+	junit_suite runtime org/antlr/v4/test/runtime/java
+	junit_suite tool
+}
diff --git a/dev-java/antlr/files/3.2-java-8.patch b/dev-java/antlr/files/3.2-java-8.patch
new file mode 100644
index 000000000000..662abfe1e17f
--- /dev/null
+++ b/dev-java/antlr/files/3.2-java-8.patch
@@ -0,0 +1,32 @@
+diff -Naur antlr-3.3.orig/tool/src/main/java/org/antlr/tool/CompositeGrammar.java antlr-3.3/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
+--- antlr-3.3.orig/tool/src/main/java/org/antlr/tool/CompositeGrammar.java	2010-11-30 01:54:04.000000000 +0000
++++ antlr-3.3/tool/src/main/java/org/antlr/tool/CompositeGrammar.java	2015-10-03 14:28:50.063497181 +0100
+@@ -219,7 +219,9 @@
+ 	public List<Grammar> getIndirectDelegates(Grammar g) {
+ 		List<Grammar> direct = getDirectDelegates(g);
+ 		List<Grammar> delegates = getDelegates(g);
+-		delegates.removeAll(direct);
++		if (direct != null) {
++			delegates.removeAll(direct);
++		}
+ 		return delegates;
+ 	}
+ 
+@@ -389,7 +391,7 @@
+ 		Set<String> localRuleDefs = new HashSet<String>();
+ 		Set<String> overrides = new HashSet<String>();
+ 		// compute set of non-overridden rules for this delegate
+-		for (Rule r : p.grammar.getRules()) {
++		for (Rule r : (Collection<Rule>) p.grammar.getRules()) {
+ 			if ( !ruleDefs.contains(r.name) ) {
+ 				localRuleDefs.add(r.name);
+ 			}
+@@ -409,7 +411,7 @@
+ 
+ 		// pass larger set of defined rules to delegates
+ 		if ( p.children!=null ) {
+-			for (CompositeGrammarTree delegate : p.children) {
++			for (CompositeGrammarTree delegate : (List<CompositeGrammarTree>) p.children) {
+ 				_minimizeRuleSet(ruleDefs, delegate);
+ 			}
+ 		}
diff --git a/dev-java/antlr/files/3.2-test-fixes.patch b/dev-java/antlr/files/3.2-test-fixes.patch
new file mode 100644
index 000000000000..0544b7006170
--- /dev/null
+++ b/dev-java/antlr/files/3.2-test-fixes.patch
@@ -0,0 +1,249 @@
+--- tool/src/test/java/org/antlr/test/BaseTest.java.orig	2010-11-30 01:54:04.000000000 +0000
++++ tool/src/test/java/org/antlr/test/BaseTest.java	2015-09-24 22:25:36.872191194 +0100
+@@ -130,8 +130,8 @@
+ 		try {
+ 			Process process =
+ 				Runtime.getRuntime().exec(args, null, outputDir);
+-			StreamVacuum stdout = new StreamVacuum(process.getInputStream());
+-			StreamVacuum stderr = new StreamVacuum(process.getErrorStream());
++			StreamVacuum stdout = new StreamVacuum(process.getInputStream(), tmpdir+"/"+fileName);
++			StreamVacuum stderr = new StreamVacuum(process.getErrorStream(), tmpdir+"/"+fileName);
+ 			stdout.start();
+ 			stderr.start();
+ 			process.waitFor();
+@@ -406,8 +406,8 @@
+ 			//System.out.println("execParser: "+cmdLine);
+ 			Process process =
+ 				Runtime.getRuntime().exec(args, null, new File(tmpdir));
+-			StreamVacuum stdoutVacuum = new StreamVacuum(process.getInputStream());
+-			StreamVacuum stderrVacuum = new StreamVacuum(process.getErrorStream());
++			StreamVacuum stdoutVacuum = new StreamVacuum(process.getInputStream(), tmpdir+"/input");
++			StreamVacuum stderrVacuum = new StreamVacuum(process.getErrorStream(), tmpdir+"/input");
+ 			stdoutVacuum.start();
+ 			stderrVacuum.start();
+ 			process.waitFor();
+@@ -499,8 +499,10 @@
+ 		StringBuffer buf = new StringBuffer();
+ 		BufferedReader in;
+ 		Thread sucker;
+-		public StreamVacuum(InputStream in) {
++		String inputFile;
++		public StreamVacuum(InputStream in, String inputFile) {
+ 			this.in = new BufferedReader( new InputStreamReader(in) );
++			this.inputFile = inputFile;
+ 		}
+ 		public void start() {
+ 			sucker = new Thread(this);
+@@ -510,6 +512,8 @@
+ 			try {
+ 				String line = in.readLine();
+ 				while (line!=null) {
++					if (line.startsWith(inputFile))
++						line = line.substring(inputFile.length()+1);
+ 					buf.append(line);
+ 					buf.append('\n');
+ 					line = in.readLine();
+--- tool/src/test/java/org/antlr/test/TestTopologicalSort.java.orig	2009-09-23 19:36:14.000000000 +0100
++++ tool/src/test/java/org/antlr/test/TestTopologicalSort.java	2010-11-30 01:54:04.000000000 +0000
+@@ -49,7 +49,7 @@
+         g.addEdge("F", "H");
+         g.addEdge("E", "F");
+ 
+-        String expecting = "[H, F, E, D, A, G, B, C]";
++        String expecting = "[H, F, E, D, G, A, B, C]";
+         List nodes = g.sort();
+         String result = nodes.toString();
+         assertEquals(expecting, result);
+@@ -91,7 +91,7 @@
+         g.addEdge("Def.g", "Java.tokens");    // walkers feed off generated tokens
+         g.addEdge("Ref.g", "Java.tokens");
+ 
+-        String expecting = "[MyJava.tokens, Java.g, Java.tokens, Def.g, Ref.g]";
++        String expecting = "[MyJava.tokens, Java.g, Java.tokens, Ref.g, Def.g]";
+         List nodes = g.sort();
+         String result = nodes.toString();
+         assertEquals(expecting, result);
+@@ -105,7 +105,7 @@
+         g.addEdge("Def.g", "JavaLexer.tokens");
+         g.addEdge("Ref.g", "JavaLexer.tokens");
+ 
+-        String expecting = "[JavaLexer.g, JavaLexer.tokens, JavaParser.g, Def.g, Ref.g]";
++        String expecting = "[JavaLexer.g, JavaLexer.tokens, JavaParser.g, Ref.g, Def.g]";
+         List nodes = g.sort();
+         String result = nodes.toString();
+         assertEquals(expecting, result);
+--- tool/src/test/java/org/antlr/test/TestSemanticPredicates.java.orig	2009-09-23 19:36:12.000000000 +0100
++++ tool/src/test/java/org/antlr/test/TestSemanticPredicates.java	2015-12-05 13:52:05.923411552 +0000
+@@ -731,19 +731,23 @@
+ 			"c : a\n" +
+ 			"  | b\n" +
+ 			"  ;\n");
+-		String expecting =
+-			".s0-X->.s1\n" +
+-            ".s1-{((a&&c)||(b&&c))}?->:s2=>1\n" +
+-            ".s1-{c}?->:s3=>2\n";
+-		int[] unreachableAlts = null;
+-		int[] nonDetAlts = null;
+-		String ambigInput = null;
+-		int[] insufficientPredAlts = null;
+-		int[] danglingAlts = null;
+-		int numWarnings = 0;
+-		checkDecision(g, 3, expecting, unreachableAlts,
+-					  nonDetAlts, ambigInput, insufficientPredAlts,
+-					  danglingAlts, numWarnings, false);
++		try {
++			String expecting =
++				".s0-X->.s1\n" +
++	            ".s1-{((a&&c)||(b&&c))}?->:s2=>1\n" +
++	            ".s1-{c}?->:s3=>2\n";
++			checkDecision(g, 3, expecting, null,
++						  null, null, null,
++						  null, 0, false);
++		} catch (org.junit.ComparisonFailure e) {
++			String expecting =
++				".s0-X->.s1\n" +
++	            ".s1-{((b&&c)||(a&&c))}?->:s2=>1\n" +
++	            ".s1-{c}?->:s3=>2\n";
++			checkDecision(g, 3, expecting, null,
++						  null, null, null,
++						  null, 0, false);
++		}
+ 	}
+ 
+     @Test
+--- tool/src/test/java/org/antlr/test/TestAttributes.java.orig	2015-12-05 13:55:55.392843185 +0000
++++ tool/src/test/java/org/antlr/test/TestAttributes.java	2015-12-05 14:04:38.120599871 +0000
+@@ -439,20 +439,15 @@
+ 		ErrorManager.setErrorListener(equeue);
+ 		Grammar g = new Grammar(
+ 			"parser grammar t;\n"+
+-			"a : x=b {"+action+"} ;\n" +
++			"a : x=b {###"+action+"!!!} ;\n" +
+ 			"b : B ;\n");
+ 		Tool antlr = newTool();
+ 		CodeGenerator generator = new CodeGenerator(antlr, g, "Java");
+ 		g.setCodeGenerator(generator);
+-		generator.genRecognizer(); // forces load of templates
+-		ActionTranslator translator = new ActionTranslator(generator,"a",
+-																	 new antlr.CommonToken(ANTLRParser.ACTION,action),1);
+-		String rawTranslation =
+-			translator.translate();
+-		StringTemplateGroup templates =
+-			new StringTemplateGroup(".", AngleBracketTemplateLexer.class);
+-		StringTemplate actionST = new StringTemplate(templates, rawTranslation);
+-		String found = actionST.toString();
++		generator.genRecognizer(); // codegen phase sets some vars we need
++		StringTemplate codeST = generator.getRecognizerST();
++		String code = codeST.toString();
++		String found = code.substring(code.indexOf("###")+3,code.indexOf("!!!"));
+ 		assertEquals(expecting, found);
+ 
+ 		assertEquals("unexpected errors: "+equeue, 0, equeue.errors.size());
+@@ -1771,20 +1766,15 @@
+ 		Grammar g = new Grammar(
+ 			"parser grammar t;\n" +
+ 			"options {output=template;}\n"+
+-			"a : {"+action+"}\n" +
++			"a : {###"+action+"!!!}\n" +
+ 			"  ;\n");
+ 		Tool antlr = newTool();
+ 		CodeGenerator generator = new CodeGenerator(antlr, g, "Java");
+ 		g.setCodeGenerator(generator);
+-		generator.genRecognizer(); // forces load of templates
+-		ActionTranslator translator = new ActionTranslator(generator,"a",
+-																	 new antlr.CommonToken(ANTLRParser.ACTION,action),1);
+-		String rawTranslation =
+-			translator.translate();
+-		StringTemplateGroup templates =
+-			new StringTemplateGroup(".", AngleBracketTemplateLexer.class);
+-		StringTemplate actionST = new StringTemplate(templates, rawTranslation);
+-		String found = actionST.toString();
++		generator.genRecognizer(); // codegen phase sets some vars we need
++		StringTemplate codeST = generator.getRecognizerST();
++		String code = codeST.toString();
++		String found = code.substring(code.indexOf("###")+3,code.indexOf("!!!"));
+ 		assertEquals(expecting, found);
+ 
+ 		assertEquals("unexpected errors: "+equeue, 0, equeue.errors.size());
+@@ -1869,35 +1859,21 @@
+ 		ErrorManager.setErrorListener(equeue);
+ 		Grammar g = new Grammar(
+ 			"grammar t;\n"+
+-			"a : b {"+action+"}\n" +
+-			"  | c {"+action2+"}\n" +
++			"a : b {###"+action+"!!!}\n" +
++			"  | c {^^^"+action2+"&&&}\n" +
+ 			"  ;\n" +
+ 			"b : 'a';\n" +
+ 			"c : '0';\n");
+ 		Tool antlr = newTool();
+ 		CodeGenerator generator = new CodeGenerator(antlr, g, "Java");
+ 		g.setCodeGenerator(generator);
+-		generator.genRecognizer(); // forces load of templates
+-		ActionTranslator translator = new ActionTranslator(generator,"a",
+-																	 new antlr.CommonToken(ANTLRParser.ACTION,action),1);
+-		String rawTranslation =
+-			translator.translate();
+-		StringTemplateGroup templates =
+-			new StringTemplateGroup(".", AngleBracketTemplateLexer.class);
+-		StringTemplate actionST = new StringTemplate(templates, rawTranslation);
+-		String found = actionST.toString();
++		generator.genRecognizer(); // codegen phase sets some vars we need
++		StringTemplate codeST = generator.getRecognizerST();
++		String code = codeST.toString();
++		String found = code.substring(code.indexOf("###")+3,code.indexOf("!!!"));
+ 		assertEquals(expecting, found);
+ 
+-		assertEquals("unexpected errors: "+equeue, 0, equeue.errors.size());
+-		translator = new ActionTranslator(generator,
+-											   "a",
+-											   new antlr.CommonToken(ANTLRParser.ACTION,action2),2);
+-		rawTranslation =
+-			translator.translate();
+-		templates =
+-			new StringTemplateGroup(".", AngleBracketTemplateLexer.class);
+-		actionST = new StringTemplate(templates, rawTranslation);
+-		found = actionST.toString();
++		found = code.substring(code.indexOf("^^^")+3,code.indexOf("&&&"));
+ 
+ 		assertEquals(expecting2, found);
+ 
+@@ -3208,7 +3184,7 @@
+ 
+ 	@Test public void testAssignToTreeNodeAttribute() throws Exception {
+ 		String action = "$tree.scope = localScope;";
+-		String expecting = "(()retval.tree).scope = localScope;";
++		String expecting = "((Object)retval.tree).scope = localScope;";
+ 		ErrorQueue equeue = new ErrorQueue();
+ 		ErrorManager.setErrorListener(equeue);
+ 		Grammar g = new Grammar(
+@@ -3219,24 +3195,17 @@
+ 			"   Scope localScope=null;\n" +
+ 			"}\n" +
+ 			"@after {\n" +
+-			"   $tree.scope = localScope;\n" +
++			"   ###$tree.scope = localScope;!!!\n" +
+ 			"}\n" +
+ 			"   : 'a' -> ^('a')\n" +
+ 			";");
+ 		Tool antlr = newTool();
+ 		CodeGenerator generator = new CodeGenerator(antlr, g, "Java");
+ 		g.setCodeGenerator(generator);
+-		generator.genRecognizer(); // forces load of templates
+-		ActionTranslator translator = new ActionTranslator(generator,
+-																	 "rule",
+-																	 new antlr.CommonToken(ANTLRParser.ACTION,action),1);
+-		String rawTranslation =
+-			translator.translate();
+-		StringTemplateGroup templates =
+-			new StringTemplateGroup(".", AngleBracketTemplateLexer.class);
+-		StringTemplate actionST = new StringTemplate(templates, rawTranslation);
+-		String found = actionST.toString();
+-		assertEquals("unexpected errors: "+equeue, 0, equeue.errors.size());
++		generator.genRecognizer(); // codegen phase sets some vars we need
++		StringTemplate codeST = generator.getRecognizerST();
++		String code = codeST.toString();
++		String found = code.substring(code.indexOf("###")+3,code.indexOf("!!!"));
+ 		assertEquals(expecting, found);
+ 	}
+ 
diff --git a/dev-java/antlr/files/3.5.2-test-fixes.patch b/dev-java/antlr/files/3.5.2-test-fixes.patch
new file mode 100644
index 000000000000..f2609ac1f0b5
--- /dev/null
+++ b/dev-java/antlr/files/3.5.2-test-fixes.patch
@@ -0,0 +1,36 @@
+diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java
+--- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java	2014-03-25 11:47:54.000000000 +0000
++++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java	2015-10-02 22:42:56.921263410 +0100
+@@ -2131,7 +2132,7 @@
+ 		assertEquals(expecting, found);
+ 	}
+ 
+-	@Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
++	@org.junit.Ignore @Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
+ 		String grammar =
+ 			"grammar T;\n"+
+ 				"options {output=template;}\n"+
+diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java
+--- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java	2014-03-25 11:47:54.000000000 +0000
++++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java	2015-10-02 22:43:07.303105023 +0100
+@@ -339,7 +340,7 @@
+ 		assertEquals("b:alt 2 a:alt 1\n", found);
+ 	}
+ 
+-	@Test public void testSynPredWithOutputTemplate() throws Exception {
++	@org.junit.Ignore @Test public void testSynPredWithOutputTemplate() throws Exception {
+ 		// really just seeing if it will compile
+ 		String grammar =
+ 			"grammar T;\n" +
+diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java
+--- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java	2014-03-25 11:47:54.000000000 +0000
++++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java	2015-10-02 22:41:32.235554776 +0100
+@@ -141,7 +142,7 @@
+ 		assertEquals("alt 1\n", found);
+ 	}
+ 
+-	@Test public void testTemplateOutput() throws Exception {
++	@org.junit.Ignore @Test public void testTemplateOutput() throws Exception {
+ 		String grammar =
+ 			"grammar T;\n" +
+ 			"options {output=AST;}\n" +
diff --git a/dev-java/antlr/metadata.xml b/dev-java/antlr/metadata.xml
new file mode 100644
index 000000000000..f70ce39614d6
--- /dev/null
+++ b/dev-java/antlr/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">antlr/antlr4</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/aopalliance-1.0-r2 b/dev-java/aopalliance-1.0-r2
deleted file mode 100644
index aa0a917bae06..000000000000
--- a/dev-java/aopalliance-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Aspect-Oriented Programming (AOP) Alliance classes
-EAPI=5
-HOMEPAGE=http://aopalliance.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e33f26fb25ad7df0f94d595aa010dc85
diff --git a/dev-java/aopalliance/Manifest b/dev-java/aopalliance/Manifest
new file mode 100644
index 000000000000..a2bd7b8ae003
--- /dev/null
+++ b/dev-java/aopalliance/Manifest
@@ -0,0 +1,3 @@
+DIST aopalliance-1.0-gentoo.tar.bz2 4203 BLAKE2B 193ef51f8670a0e659ff7d43e909629168c3840f205368ab31a00b07e1e0bd81c8fec2a0429dd4d2932dd7bc6f582c54708c4f118ad697b4f3b41ab999a322c7 SHA512 6761933b9c127af9773f518df89a905fd67696964837b8cb841664f16564bc879dcfbd5f47dcf85e999d4dd64561a3b46edac1c639471d3ee9be3237d9064187
+EBUILD aopalliance-1.0-r2.ebuild 887 BLAKE2B a7587aeef882bfa4b2aaba8fc852f0b72afed62e967be6dcdf8d706bae856a99642c6f3731b68cb4c8adbc2876869a09f3fa0e3cd425efe2f0574699920b7059 SHA512 abadfa5574950edaa6ef3e40b238fadb79e63fdb73aab22ecc27c3f71d76cb3e74416d442efef798425a008f3c7c4602e458b5a925df27ec14ba559229490369
+MISC metadata.xml 317 BLAKE2B f5a883f65fccbed912af92c6fb31d77ab3f3b865360220c24c33a410ffb59ff7b7bfc03d9af13887dd6ec8cee4e4ca2cdfd04cfa0aa1004827beba209364f433 SHA512 566df2a1062c0a0b5be648ee6d5163645ccb7ca885b8883a28cf1c851a9528d4da7eeacded56ed0270f4b3c8eafa61a808de5b27f9790487d107535b39ff4360
diff --git a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
new file mode 100644
index 000000000000..67ff490caef4
--- /dev/null
+++ b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Aspect-Oriented Programming (AOP) Alliance classes"
+SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2"
+# Tarball creation:
+# cvs -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance login
+# cvs -z3 -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance export -r interception_1_0 aopalliance
+# tar cjvf aopalliance-1.0-gentoo.tar.bz2 aopalliance
+HOMEPAGE="http://aopalliance.sourceforge.net/"
+LICENSE="public-domain"
+SLOT="1"
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux"
+
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main"
+
+java_prepare() {
+	rm build.xml || die
+}
diff --git a/dev-java/aopalliance/metadata.xml b/dev-java/aopalliance/metadata.xml
new file mode 100644
index 000000000000..9d0fd7b935b3
--- /dev/null
+++ b/dev-java/aopalliance/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">aopalliance</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/appframework-1.03-r5 b/dev-java/appframework-1.03-r5
deleted file mode 100644
index 1a9e3d5d822f..000000000000
--- a/dev-java/appframework-1.03-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/jnlp-api:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Set of Java classes to build desktop applications easily
-EAPI=6
-HOMEPAGE=https://java.net/projects/appframework
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/jnlp-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/AppFramework-1.03-src.zip -> appframework-1.03.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=aad034aab359dcbd2af584dccca7029f
diff --git a/dev-java/appframework/Manifest b/dev-java/appframework/Manifest
new file mode 100644
index 000000000000..14ec3ee0a9e8
--- /dev/null
+++ b/dev-java/appframework/Manifest
@@ -0,0 +1,4 @@
+AUX appframework-1.03-fix-imports.patch 859 BLAKE2B a42eaa58f066d831ec50d07e356d7b29a31b6e3b60686b8c17a808af210fce56f731b791c42fca50cd829a7a5ae7274168e25aeeb921ca03714aa7badb70e814 SHA512 9fcf414f952d19b78d26eceee80ea8367491e29c26ef195593c54eaeeba296f9874adedca0a119197cde56a7be48955c8b6a4e78a6440c7100120354b15b1541
+DIST appframework-1.03.zip 413438 BLAKE2B 8f7c397e1d1f8fcfd62b648648650f0a736615317ec37fbc2f8a9c2834e3e18b4a754f89f1b6d94836e2f775010135b740dd474d10ff13e3e115f554380060fb SHA512 7d24329361f0d5f2225a7248ba30b1f0db364efd93e0581e1f10d0f8e2b6354f9d578d585ff1a08b27846dfae0b805b0f609711234be616b3f0a065dc1801309
+EBUILD appframework-1.03-r5.ebuild 916 BLAKE2B 7bf95c011766f287bd7c47de8b59f7b9c0de323c25054761ea132e194d5cffd1f60be2781111b9cd6a29f5efa88b9a02e6dbe71e39c07422466f00bce5134587 SHA512 86d9b9e9e20f3001c65389444312c748a89b9fd0d9d9c43e76cfa3ed957a9bd8570a853638e089b0332f2f16b1be899e0e1bd7b64186e911f026492c2ce55703
+MISC metadata.xml 980 BLAKE2B 73187a55f372e134ba07bafd9c84d85fa7a4d8f9fb5be49f6e6840c1bb82e0e74d348c48a1079f06f4f7ee84c9b1826f6c69c3324c86ab13c26e6c68e68a8ffe SHA512 182e31f0a6cbf64e1707e08a27ac11b70a54b33f3ce717654cfa1f4435774311895efe7e9efc36c587722dc15b6c052d57a63e55a56a886bdd4f9bcaaa2ee08a
diff --git a/dev-java/appframework/appframework-1.03-r5.ebuild b/dev-java/appframework/appframework-1.03-r5.ebuild
new file mode 100644
index 000000000000..5d1988117424
--- /dev/null
+++ b/dev-java/appframework/appframework-1.03-r5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="AppFramework"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Set of Java classes to build desktop applications easily"
+HOMEPAGE="https://java.net/projects/appframework"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${MY_P}-src.zip -> ${P}.zip"
+
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/jnlp-api:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="jnlp-api"
+
+JAVA_SRC_DIR="src"
+
+PATCHES=( "${FILESDIR}/${P}-fix-imports.patch" )
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	mv src/examples "${S}" || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/appframework/files/appframework-1.03-fix-imports.patch b/dev-java/appframework/files/appframework-1.03-fix-imports.patch
new file mode 100644
index 000000000000..3e5a958597e2
--- /dev/null
+++ b/dev-java/appframework/files/appframework-1.03-fix-imports.patch
@@ -0,0 +1,24 @@
+--- a/src/org/jdesktop/application/Task.java	2017-03-28 11:24:05.988108949 +0000
++++ b/src/org/jdesktop/application/Task.java	2017-03-28 11:24:09.433122008 +0000
+@@ -15,8 +15,8 @@
+ import java.util.concurrent.TimeUnit;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+-import org.jdesktop.swingworker.SwingWorker;
+-import org.jdesktop.swingworker.SwingWorker.StateValue;
++import javax.swing.SwingWorker;
++import javax.swing.SwingWorker.StateValue;
+ 
+ 
+ /**
+--- a/src/org/jdesktop/application/TaskMonitor.java	2017-03-28 11:24:18.988158228 +0000
++++ b/src/org/jdesktop/application/TaskMonitor.java	2017-03-28 11:24:31.895207149 +0000
+@@ -9,7 +9,7 @@
+ import java.util.Iterator;
+ import java.util.LinkedList;
+ import java.util.List;
+-import org.jdesktop.swingworker.SwingWorker.StateValue;
++import javax.swing.SwingWorker.StateValue;
+ 
+ 
+ /**
diff --git a/dev-java/appframework/metadata.xml b/dev-java/appframework/metadata.xml
new file mode 100644
index 000000000000..d217a05000e5
--- /dev/null
+++ b/dev-java/appframework/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		The JSR-296  Swing Application Framework prototype implementation is a small set of Java classes that simplify building desktop applications. The prototype provides infrastructure that's common to most desktop applications:
+
+		* Application lifecyle, notably GUI startup and shutdown.
+		* Support for managing and loading resources, like strings, formatted messages, images, colors, fonts, and other types common to desktop applications.
+		* Support for defining, managing, and binding Actions, including Actions that run asynchronously (in the "background").
+		* Persistent session state: support for automatically and selectively saving GUI state from one run of an application to the next.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/apple-java-extensions-bin-1.5-r1 b/dev-java/apple-java-extensions-bin-1.5-r1
deleted file mode 100644
index c766a2330e75..000000000000
--- a/dev-java/apple-java-extensions-bin-1.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Apple eAWT and eIO APIs for Java on Mac OS X
-EAPI=5
-HOMEPAGE=http://developer.apple.com/samplecode/AppleJavaExtensions/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apple
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> apple-java-extensions-bin-1.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f19f66c11422b405cbcd89b9b99bd617
diff --git a/dev-java/apple-java-extensions-bin/Manifest b/dev-java/apple-java-extensions-bin/Manifest
new file mode 100644
index 000000000000..d7e5f4863ec5
--- /dev/null
+++ b/dev-java/apple-java-extensions-bin/Manifest
@@ -0,0 +1,3 @@
+DIST apple-java-extensions-bin-1.5.zip 18036 BLAKE2B 413ff37758ca59ab0114c747745619dc0886b47b7ebf05b0383f819eee12e3d0d2c01f95520395cdf5586ceaa784cb2ccb89ba13f56c6dbc6bb2879e37b64813 SHA512 9f3e9a8eab3980feda8584ca75d58da8b31ec0ed77fb2a4a1488d0b2ca0efd845ff705fc372ba3958753690f839b0ccb2e9310d6896564317b625ff9ba9cc456
+EBUILD apple-java-extensions-bin-1.5-r1.ebuild 588 BLAKE2B 2b35f183434384c68ca733c3ffd8aaa162ce6761b5e02c0c3eaf2140d923425007149143a35cfbddc9b7d836d2fa02c0f28f2f697e8a7f146429916f2fa2d3bd SHA512 d861e1f02e16c5be7abcfab2caa65320eebc68e27ecec68efb0a319c00b78e56a5ef43abd8a6695673c1afaf80120cf6abbeaf24a125a44c14aaf008156ccedc
+MISC metadata.xml 501 BLAKE2B 84e5241185181ae803fbf5d3ea71c61e1e811845d8df6fa7eb82bf320f15b9d6751e2c9f5dbf62cd49e33bef1ff88673da88cb0ba6c31d31b657ab80bcb60869 SHA512 3020f46051a0c24205d991413131b00510ca137564c3c50b329f42ef564ef02a1701a3607fd1720a8169428fb98b5795653b1b40cb520be72c45a23fffcaf440
diff --git a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild
new file mode 100644
index 000000000000..2a587c9f0fe5
--- /dev/null
+++ b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2
+
+DESCRIPTION="Apple eAWT and eIO APIs for Java on Mac OS X"
+HOMEPAGE="http://developer.apple.com/samplecode/AppleJavaExtensions/"
+SRC_URI="http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> ${P}.zip"
+LICENSE="Apple"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+
+S=${WORKDIR}/AppleJavaExtensions
+
+src_install() {
+	dodoc README.txt
+	java-pkg_dojar AppleJavaExtensions.jar
+}
diff --git a/dev-java/apple-java-extensions-bin/metadata.xml b/dev-java/apple-java-extensions-bin/metadata.xml
new file mode 100644
index 000000000000..17fc8259b81a
--- /dev/null
+++ b/dev-java/apple-java-extensions-bin/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription>
+This is a pluggable jar of stub classes representing the new Apple eAWT
+and eIO APIs for Java 1.4 on Mac OS X. The purpose of these stubs is to
+allow for compilation of eAWT- or eIO-referencing code on platforms other
+than Mac OS X
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/apt-mirror-1.0-r1 b/dev-java/apt-mirror-1.0-r1
deleted file mode 100644
index a6ba6cc225dd..000000000000
--- a/dev-java/apt-mirror-1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Annotation processing apt mirror API introduced in J2SE 5.0
-EAPI=5
-HOMEPAGE=http://aptmirrorapi.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/apt-mirror-1.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a7de7f688f5cd7929b870f72f332a77d
diff --git a/dev-java/apt-mirror/Manifest b/dev-java/apt-mirror/Manifest
new file mode 100644
index 000000000000..60796ca322a3
--- /dev/null
+++ b/dev-java/apt-mirror/Manifest
@@ -0,0 +1,3 @@
+DIST apt-mirror-1.0.tar.bz2 21396 BLAKE2B 996253732f3aeaffeb57d6ac26d5e18ae47a40843a60ffe570edcbd325691b43c69fdd866e44d1d35295b2ccc64f5042f1dbe588a3700cd01ad10927ded702b4 SHA512 fdb58498bc5ff1f77858716b67dd952a3f3bea55d06d7190b1a1d283d11843ebf03c7403ba58f23478c1c553402d21c2089c2dca52f216d693ab713a43f5c1ff
+EBUILD apt-mirror-1.0-r1.ebuild 470 BLAKE2B 91bb7b33aac10fdcc9d548423b6beba8aaaabcb886d6c41f342c27bc02dea4a2c859df3c0ea8828be81f40e17b07c2869f28e7e3a6b0f4039e6299ae69c33998 SHA512 da54c738c49411f69485b732f833a59ca97e7b2285ef3f5a1f405b4b14cf1e1214dbd46fa5897c08395c67b8a9abff06f2a0639936dba41e04693f15e1c76795
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild b/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild
new file mode 100644
index 000000000000..67d7bdd5497b
--- /dev/null
+++ b/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotation processing apt mirror API introduced in J2SE 5.0"
+HOMEPAGE="http://aptmirrorapi.dev.java.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/apt"
diff --git a/dev-java/apt-mirror/metadata.xml b/dev-java/apt-mirror/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/apt-mirror/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/args4j-2.32 b/dev-java/args4j-2.32
deleted file mode 100644
index 791869dea61c..000000000000
--- a/dev-java/args4j-2.32
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=args4j is a Java command line arguments parser
-EAPI=5
-HOMEPAGE=http://args4j.kohsuke.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=2
-SRC_URI=http://repo1.maven.org/maven2/args4j/args4j/2.32/args4j-2.32-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7bee76157b14452151d231b5a796a303
diff --git a/dev-java/args4j-2.33 b/dev-java/args4j-2.33
deleted file mode 100644
index 175684720483..000000000000
--- a/dev-java/args4j-2.33
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=args4j is a Java command line arguments parser
-EAPI=6
-HOMEPAGE=http://args4j.kohsuke.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=2
-SRC_URI=http://repo1.maven.org/maven2/args4j/args4j/2.33/args4j-2.33-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1ed258de3dd8bf6f394c163eebcb20c3
diff --git a/dev-java/args4j/Manifest b/dev-java/args4j/Manifest
new file mode 100644
index 000000000000..78c939b45a1a
--- /dev/null
+++ b/dev-java/args4j/Manifest
@@ -0,0 +1,5 @@
+DIST args4j-2.32-sources.jar 65381 BLAKE2B 6fe8d2bc9a8d564dbd324f64b9b528df6d52d721e1cb02b15352d9f2b2b0e02c70cdb64fbd1d3314a23ec38435f4dca49f7bff88c069de4cf45071f3d3a744e0 SHA512 97b48a133f6e3348e17a653aa15d92e0bc240e689615c22321573f7f82f01f22cffe43ef7b24f72a9a52cfb91ab6601463567b18f634fcc64362ea366456a12f
+DIST args4j-2.33-sources.jar 65430 BLAKE2B c1c4c38beac5d9de4bcc444953098d4b6745678332bd3203fffc5982fcaf81062bbd87814321fb3e3c1750d695d2f96e4c7c6e3674c491701dccf1a294b67189 SHA512 5cfdff97bc95c07dbea1f83a48f8a61edf4758c9284cd6b510ab0a628724561226b10d3a0d6bdeee71e7115cbcf8fa53858f40ad8ee40e614e882d734f881014
+EBUILD args4j-2.32.ebuild 452 BLAKE2B b75f30e390c9e01b490c972af13053cf4802ee42f0ec58e70f8517e83b5ea82d3a85b271883da0b2395bef4c36d6783a85af0f0462bc1503ddbb222706005010 SHA512 2241a68052a565ec463092711a4857847a2d42be39676b3f187122d3a7249f9997834d7ede149d6d0d2a134149b1cbca19204e1352b87217c308214b7f9312f9
+EBUILD args4j-2.33.ebuild 435 BLAKE2B 3920414785df9ae2e0c4a858889a33b603bc2609852d42528b22867aba57a2841af8f8b18290daef8fdc8d34651872b50e4e233f0a78be539ceeb57e97ea918a SHA512 607f9bca5426b7b7cb74ad66924d1582cdc8cc20a8eed14ff61b91fd16d9b7853e534593b2a695500842ed9d1205fa374b49e6857a387640cba084e9f487dc44
+MISC metadata.xml 312 BLAKE2B c04203cfee029cccd32b0aae6cdb6af0a5c88917d5422e32215481551ada2b91cf40d724b5e5b2ec35f1f524170aabcd335b31bf9310daba83c3a6d5a02ad5e0 SHA512 5d44a664c67e8c67ef42692b7e953f4566b3c260cc986b7e43cf4b67652bbcae01e3336b6b3404d50564b2efc0684a3e2bd0acd860dee828158045922a04f883
diff --git a/dev-java/args4j/args4j-2.32.ebuild b/dev-java/args4j/args4j-2.32.ebuild
new file mode 100644
index 000000000000..be60edae23d1
--- /dev/null
+++ b/dev-java/args4j/args4j-2.32.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="args4j is a Java command line arguments parser"
+HOMEPAGE="http://args4j.kohsuke.org/"
+SRC_URI="http://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip"
diff --git a/dev-java/args4j/args4j-2.33.ebuild b/dev-java/args4j/args4j-2.33.ebuild
new file mode 100644
index 000000000000..7d1a85dfca1a
--- /dev/null
+++ b/dev-java/args4j/args4j-2.33.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="args4j is a Java command line arguments parser"
+HOMEPAGE="http://args4j.kohsuke.org/"
+SRC_URI="http://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.7"
+
+DEPEND="
+	>=virtual/jdk-1.7"
diff --git a/dev-java/args4j/metadata.xml b/dev-java/args4j/metadata.xml
new file mode 100644
index 000000000000..9c9024ca9bc7
--- /dev/null
+++ b/dev-java/args4j/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+	<email>monsieurp@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/asm-3.3.1-r1 b/dev-java/asm-3.3.1-r1
deleted file mode 100644
index a193f7ad1559..000000000000
--- a/dev-java/asm-3.3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-owanttask >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Bytecode manipulation framework for Java
-EAPI=5
-HOMEPAGE=http://asm.objectweb.org
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~sparc-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=3
-SRC_URI=http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1537c16182828095098e0b40d45595a3
diff --git a/dev-java/asm-5.0.3 b/dev-java/asm-5.0.3
deleted file mode 100644
index 2649d7845d3b..000000000000
--- a/dev-java/asm-5.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Bytecode manipulation framework for Java
-EAPI=5
-HOMEPAGE=http://asm.ow2.org
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=4
-SRC_URI=http://download.forge.objectweb.org/asm/asm-5.0.3.tar.gz http://download.forge.objectweb.org/asm/asm-4.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=138cbd34157e281dd32f7686dfccc5d4
diff --git a/dev-java/asm-5.1 b/dev-java/asm-5.1
deleted file mode 100644
index 419b8079064f..000000000000
--- a/dev-java/asm-5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Bytecode manipulation framework for Java
-EAPI=5
-HOMEPAGE=http://asm.ow2.org
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=4
-SRC_URI=http://download.forge.objectweb.org/asm/asm-5.1.tar.gz http://download.forge.objectweb.org/asm/asm-4.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f707bee29b01120eac55b206ae74691e
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
new file mode 100644
index 000000000000..9ab18dd6a0d8
--- /dev/null
+++ b/dev-java/asm/Manifest
@@ -0,0 +1,8 @@
+DIST asm-3.3.1.tar.gz 854626 BLAKE2B e8738aeda26f72c4630d33f1696188501022b4764f9f93d5fe9c74dd94459107c3bf72752e6d53850807a75d057757968b859d5453e8c61e54a5fa56f2db81f4 SHA512 b0dffde873dcdfd8328736cfaeb8a3fca2e0788fa642d3af0c995d55c6ca4b1847e35c24100277a453b518305c5fe234d1935fa8de9b25bddd5dee5f1d4a4d44
+DIST asm-4.0.tar.gz 752187 BLAKE2B 00795e18a65d1c3d17ddb722fad20c0c7b01101ffc766a0d5f82da83ce0763401c36857780ee82267d18fa67993314069645ffc188207e4628e99626b3409a07 SHA512 642bc32fc0310b8e4291386866e53ba62802f2ae888163cd6e879232bbe3c3728c3a135aa667f91aec5bbb743621c2ee2d2a1a1d1ccb36c5249874a5ba9b08db
+DIST asm-5.0.3.tar.gz 781742 BLAKE2B a2d3f0e59244d27c090be8cfab67f86369a6dae0c49a3526ee25b7c4454c93df1efee461c9a4be33b414161b66d0df65b935ff06850ad8fa6a48fdbc178e77c1 SHA512 fb2fbddbd01ec6d355d5f218db801512a160b505e91c4ad81cc1a0f1265c358cf8df6140c216e2d5acc109dc2286c29de6bf5b60b29a094e70c96070a54b20af
+DIST asm-5.1.tar.gz 791417 BLAKE2B 90ee3e28b20ce649763c43cf1b0bb495995dcfc31a534d774c727d201a913b8ae25f4c015e580c9d73b6f3a847ce32720a0c2b0ea61eab8b35e92be4beaab2fe SHA512 de702516f9e16686c027c9a200a1750e6dcaee96bb1ed8bc0591673404d015b8817e37f210be645681dff7a2c31f7ddce8b406ccc8c6e11f1424e19c04c38f1e
+EBUILD asm-3.3.1-r1.ebuild 870 BLAKE2B e51b652599a40b8845d5c35ba37d6f20202c92092fab393040dfc7f9fbd17834d8afc73869065956bb4b2bf2d14b62f3d0c200b3dc8524bd029d4d98c244db8a SHA512 55384ff316829c25d191ec5d6280a487627ae2354436ff9ebd7ad0d10efb32d734a9dd33bb6cfa0cf823bf4d4b84b7651605cf3ea7b2a6022aba848f849afb43
+EBUILD asm-5.0.3.ebuild 1209 BLAKE2B 79453429c1e78192909435ae7247f0e11e4464ed38f4a0d2d1c2cfe5714ec1e433aed16ad5f0433abb07bee40369a5b5b135d644bbcf36719336d658937343e5 SHA512 3c03125070730ce4d554d163afde459b1f862235fddbff7788fb50556772c8709107c84eb56948c5c4d2bb2e86c9e98be18417ea70b573e562efac971f97003e
+EBUILD asm-5.1.ebuild 1205 BLAKE2B 2fc237ee6ad8d607b484b69034da962ea5136894b564e143ff51f7170f85a856c85a40da78eb43209e8472ffb0f0dd873cf6da87553381e73ac6a6521445ad2a SHA512 45710856d07d89fecd60c97605792eb723e4ce0c30301c38eebcffc36427851b0ce58c546cda2a075cd8c5bf639dfcf65c07945793da872b05bb53207204ab41
+MISC metadata.xml 978 BLAKE2B 6b111138552526b7876570392f2cf2bc1ff8fd72909c8565746e6f193c0e929f7a06e2e3654fd3fa02ae86250d4cc98c838217d4b4f22fc63143ec64f979b7a6 SHA512 79bd031562a3e6208ca10683f6ca33edb8d542461d96058f36e8c218b667b9815fedd006f02a94572118444023c169c466dc9bd5eade325654bd274be23e5a61
diff --git a/dev-java/asm/asm-3.3.1-r1.ebuild b/dev-java/asm/asm-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..e37a56ad9fdd
--- /dev/null
+++ b/dev-java/asm/asm-3.3.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WANT_ANT_TASKS="ant-owanttask"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="http://asm.objectweb.org"
+SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="3"
+IUSE=""
+KEYWORDS="amd64 ppc64 x86 ~sparc-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+# Needs deps we don't have yet
+RESTRICT="test"
+
+EANT_DOC_TARGET="jdoc"
+
+# Fails if this property is not set
+EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar"
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-5.0.3.ebuild b/dev-java/asm/asm-5.0.3.ebuild
new file mode 100644
index 000000000000..6bd00d55c4a1
--- /dev/null
+++ b/dev-java/asm/asm-5.0.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+OLD_P="${PN}-4.0"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="http://asm.ow2.org"
+SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
+	http://download.forge.objectweb.org/${PN}/${OLD_P}.tar.gz"
+LICENSE="BSD"
+SLOT="4"
+IUSE=""
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+# Needs dependencies we don't have yet.
+RESTRICT="test"
+
+EANT_DOC_TARGET="jdoc"
+
+# Fails if this objectweb.ant.tasks.path is not set.
+# Java generics seem to break unless product.noshrink is set.
+EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true"
+
+java_prepare() {
+	# Borrow some ant scripts from an old version to avoid requiring
+	# bndlib and friends. This may not work forever!
+	cp -vf "../${OLD_P}/archive"/*.xml archive/ || die
+}
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar "${x}" $(basename "${x%-*}.jar")
+	done
+
+	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-5.1.ebuild b/dev-java/asm/asm-5.1.ebuild
new file mode 100644
index 000000000000..e71765b94842
--- /dev/null
+++ b/dev-java/asm/asm-5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+OLD_P="${PN}-4.0"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="http://asm.ow2.org"
+SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
+	http://download.forge.objectweb.org/${PN}/${OLD_P}.tar.gz"
+LICENSE="BSD"
+SLOT="4"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-macos"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+# Needs dependencies we don't have yet.
+RESTRICT="test"
+
+EANT_DOC_TARGET="jdoc"
+
+# Fails if this objectweb.ant.tasks.path is not set.
+# Java generics seem to break unless product.noshrink is set.
+EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true"
+
+java_prepare() {
+	# Borrow some ant scripts from an old version to avoid requiring
+	# bndlib and friends. This may not work forever!
+	cp -vf "../${OLD_P}/archive"/*.xml archive/ || die
+}
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar "${x}" $(basename "${x%-*}.jar")
+	done
+
+	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/metadata.xml b/dev-java/asm/metadata.xml
new file mode 100644
index 000000000000..a432a00e09ef
--- /dev/null
+++ b/dev-java/asm/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+
+	<longdescription>
+	ASM is a Java bytecode manipulation framework. It can be used to
+	dynamically generate stub classes or other proxy classes, directly in
+	binary form, or to dynamically modify classes at load time, i.e., just
+	before they are loaded into the Java Virtual Machine.
+
+	ASM offers similar functionalities as BCEL or SERP, but is much more
+	smaller (25KB instead of 350KB for BCEL and 150KB for SERP) and faster
+	than these tools (the overhead of a load time class transformation is of
+	the order of 60% with ASM, 700% or more with BCEL, and 1100% or more
+	with SERP). Indeed ASM was designed to be used in a dynamic way* and was
+	therefore designed and implemented to be as small and as fast as
+	possible.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/aspectj-1.7.3-r1 b/dev-java/aspectj-1.7.3-r1
deleted file mode 100644
index c361c5fdabf5..000000000000
--- a/dev-java/aspectj-1.7.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 app-arch/zip dev-java/asm:4 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A seamless aspect-oriented extension to the Java programming language
-EAPI=5
-HOMEPAGE=http://eclipse.org/aspectj/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.5 dev-java/asm:4 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.3-src.jar&r=1 -> aspectj-1.7.3.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=413f95a9691d43ec03695e3f1a4aaf33
diff --git a/dev-java/aspectj-1.7.4 b/dev-java/aspectj-1.7.4
deleted file mode 100644
index 415682f83a5b..000000000000
--- a/dev-java/aspectj-1.7.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=dev-java/asm:4 dev-java/commons-logging:0 app-arch/zip >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A seamless aspect-oriented extension to the Java programming language
-EAPI=5
-HOMEPAGE=http://eclipse.org/aspectj/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=EPL-1.0
-RDEPEND=dev-java/asm:4 dev-java/commons-logging:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.4-src.jar&r=1 -> aspectj-1.7.4-src.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6c28ea71110f1b1a7b114b967431f7ee
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
new file mode 100644
index 000000000000..4bc0800ec2f1
--- /dev/null
+++ b/dev-java/aspectj/Manifest
@@ -0,0 +1,5 @@
+DIST aspectj-1.7.3.jar 7565941 BLAKE2B 8d3919ecae8bf190331a06644b8ba694b071b961d22e5b85e4f57b50c3ff27112e6c39b2644a400f64ca590d4de619aa1a86dd0d1ea59868499a6cff50709ecf SHA512 2297a11638c6519b50e1938341914c68c2841c7b7894081f3157ef3463fb29519d833d274e24b8da1203a7866b2e1296d67e0872dbaa2dd835b5520f5c0a7a71
+DIST aspectj-1.7.4-src.jar 7570114 BLAKE2B caa942a2414c6f1b39b881bc5abad0cd4e718b231822833756493ce389207d1d855be36f74a4c58ad5f00f7acfcd5791b4ab8e151fd0e11ac497d4f68cab2eb0 SHA512 643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf
+EBUILD aspectj-1.7.3-r1.ebuild 1271 BLAKE2B 7373ada5be09da47419417bc9e310bd07f7931a3eec3195b83594c40fffb6b4fa92dbf0b3b6a7eef33bad564e9f0978856042936b1ef84f00b273df19e210bbd SHA512 3f47fc35c451191c1b8ce57583d1b5d6126b0078e350616ff8dddcf83dbc5b659de3abd400ef08db7afc37efb133667a34f58418aa77079153639a9e5fd3696d
+EBUILD aspectj-1.7.4.ebuild 1259 BLAKE2B 897ff1e5eaaec08f9ac8998174b2251265c1d43373fcdfe97e2def0ab06cbfce039e1080fcc459c0eecf3c11b3022ed2f5c131fb90ef63b41e663267dead0b00 SHA512 885778f6e1ab1c66118ba3756a5369e705c464869898866e73b032014c143310bdd790a7d9bba003fb50d574ec92330afc6d99f7ea66f0213e8abf6e627bef3c
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..316152059dfc
--- /dev/null
+++ b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
+HOMEPAGE="http://eclipse.org/aspectj/"
+SRC_URI="http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.3-src.jar&r=1 -> ${P}.jar"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/asm:4
+	dev-java/commons-logging:0"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/zip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="${S}/src"
+JAVA_GENTOO_CLASSPATH="commons-logging,asm-4"
+JAVA_ENCODING="iso8859-1"
+
+src_unpack() {
+	default
+	unzip "${S}/aspectjweaver1.7.3-src.jar" -d "${S}/src/" || die
+}
+
+java_prepare() {
+	default
+	# needs part of BEA JRockit to compile
+	rm "${S}"/src/org/aspectj/weaver/loadtime/JRockitAgent.java || die
+	# aspectj uses a renamed version of asm:4
+	find -name "*.java" -exec sed -i -e 's/import aj.org.objectweb.asm./import org.objectweb.asm./g' {} \; || die
+	mkdir -p "${S}"/target/classes/org/aspectj/weaver/ || die
+	cp -vr "${S}"/src/org/aspectj/weaver/*.properties "${S}"/target/classes/org/aspectj/weaver/ || die
+}
diff --git a/dev-java/aspectj/aspectj-1.7.4.ebuild b/dev-java/aspectj/aspectj-1.7.4.ebuild
new file mode 100644
index 000000000000..4a9e2ff58cd1
--- /dev/null
+++ b/dev-java/aspectj/aspectj-1.7.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
+HOMEPAGE="http://eclipse.org/aspectj/"
+SRC_URI="http://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-src.jar&r=1 -> ${P}-src.jar"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/asm:4
+	dev-java/commons-logging:0"
+DEPEND="${CDEPEND}
+	app-arch/zip
+	>=virtual/jdk-1.5"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+S=${WORKDIR}
+
+JAVA_SRC_DIR="${S}/src"
+JAVA_GENTOO_CLASSPATH="commons-logging,asm-4"
+JAVA_ENCODING="iso8859-1"
+
+src_unpack() {
+	default
+	unzip "${S}"/aspectjweaver${PV}-src.jar -d "${S}"/src/ || die
+}
+
+java_prepare() {
+	default
+
+	# needs part of BEA JRockit to compile
+	rm "${S}"/src/org/aspectj/weaver/loadtime/JRockitAgent.java || die
+	# aspectj uses a renamed version of asm:4
+	find -name "*.java" -exec sed -i -e 's/import aj.org.objectweb.asm./import org.objectweb.asm./g' {} \; || die
+	mkdir -p "${S}"/target/classes/org/aspectj/weaver/ || die
+	cp -vr "${S}"/src/org/aspectj/weaver/*.properties "${S}"/target/classes/org/aspectj/weaver/ || die
+}
diff --git a/dev-java/aspectj/metadata.xml b/dev-java/aspectj/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/aspectj/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/assertj-core-2.3.0 b/dev-java/assertj-core-2.3.0
deleted file mode 100644
index dcf9fbfe28d1..000000000000
--- a/dev-java/assertj-core-2.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library that provides a fluent interface for writing assertions
-EAPI=5
-HOMEPAGE=http://joel-costigliola.github.io/assertj/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/joel-costigliola/assertj-core/archive/assertj-core-2.3.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=48caa779bec664eab903cf1c6674c791
diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest
new file mode 100644
index 000000000000..ebd307fb345f
--- /dev/null
+++ b/dev-java/assertj-core/Manifest
@@ -0,0 +1,3 @@
+DIST assertj-core-2.3.0.tar.gz 611609 BLAKE2B b99a01f67da75bad18e08df739c10943012f75eda9855ed906d407e474eeafe9a30be2e761de0bc791d72a6ff8c7ec8181cd37c6b6c9126f073df82a974163c3 SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3
+EBUILD assertj-core-2.3.0.ebuild 745 BLAKE2B 2dffcadb02ebd13c9178b71c4ae4732573c8a5d9464fa49cd8289dc7effc99738da2f019ed4575c34ad1bc64366c21ca88f85def16bb016030d5b3a1ddc14696 SHA512 6c6c8f520d2d64839eb615d5f4d8c5fb477657527885c1085e01a7b14cfeff7309ceb341722146becd80d24c12879bc6c854e3563c0aa718924aa6392bf7ddc3
+MISC metadata.xml 639 BLAKE2B 1bf3a68298529b7356f7416cd193cedb70c3f44fda7753cff7a9213d75e8ff000b92bd3bec724b5fe8eabec254c26920bedcccaa450e565074a1451cfc08b735 SHA512 784148def8994941ba884e79622d7d9ac8c6f2c5eb0a15acc003aa2b345c63a4574d4a9b3f521943f841598d61b1ce1a512bfe0328e51d10d9cfe4c7124a0cb7
diff --git a/dev-java/assertj-core/assertj-core-2.3.0.ebuild b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
new file mode 100644
index 000000000000..065a36adbeed
--- /dev/null
+++ b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library that provides a fluent interface for writing assertions"
+HOMEPAGE="http://joel-costigliola.github.io/assertj/"
+SRC_URI="https://github.com/joel-costigliola/${PN}/archive/${P}.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86"
+SLOT="2"
+
+CDEPEND="dev-java/cglib:3
+	dev-java/junit:4"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="cglib-3,junit-4"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc {CONTRIBUTING,README}.md
+}
diff --git a/dev-java/assertj-core/metadata.xml b/dev-java/assertj-core/metadata.xml
new file mode 100644
index 000000000000..a7b501cac593
--- /dev/null
+++ b/dev-java/assertj-core/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>AssertJ core is a Java library that provides a fluent interface for writing assertions. Its main goal is to improve test code readability and make maintenance of tests easier. AssertJ core provides assertions for JDK standard types can be used with either JUnit or TestNG.</longdescription>
+	<upstream>
+		<remote-id type="github">joel-costigliola/assertj-core</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/avalon-framework-4.1.5-r1 b/dev-java/avalon-framework-4.1.5-r1
deleted file mode 100644
index 3249e290a801..000000000000
--- a/dev-java/avalon-framework-4.1.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 =dev-java/avalon-logkit-2* >=dev-java/log4j-1.2.9 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Avalon Framework
-EAPI=0
-HOMEPAGE=http://avalon.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 =dev-java/avalon-logkit-2* >=dev-java/log4j-1.2.9 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=4.1
-SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.1.5.src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e864df1c8dce0a1d772f52bb2d265b08
diff --git a/dev-java/avalon-framework-4.1.5-r2 b/dev-java/avalon-framework-4.1.5-r2
deleted file mode 100644
index e202eab8e4f0..000000000000
--- a/dev-java/avalon-framework-4.1.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/avalon-logkit:2.0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Avalon Framework
-EAPI=5
-HOMEPAGE=http://avalon.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/avalon-logkit:2.0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.1
-SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.1.5.src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9fbfce69038b8ae32de5580f86ddced4
diff --git a/dev-java/avalon-framework-4.2.0-r1 b/dev-java/avalon-framework-4.2.0-r1
deleted file mode 100644
index 417ff928ee79..000000000000
--- a/dev-java/avalon-framework-4.2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 =dev-java/avalon-logkit-2* >=dev-java/log4j-1.2.9 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Avalon Framework
-EAPI=0
-HOMEPAGE=http://avalon.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 =dev-java/avalon-logkit-2* >=dev-java/log4j-1.2.9 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=4.2
-SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=50c58ae0092a4e6b4269474a1d616831
diff --git a/dev-java/avalon-framework-4.2.0-r2 b/dev-java/avalon-framework-4.2.0-r2
deleted file mode 100644
index 58b7ad9f769c..000000000000
--- a/dev-java/avalon-framework-4.2.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/avalon-logkit:2.0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Avalon Framework
-EAPI=5
-HOMEPAGE=http://avalon.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/avalon-logkit:2.0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.2
-SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e2cfad44953685210ccca733f9034887
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
new file mode 100644
index 000000000000..a127f789e3ec
--- /dev/null
+++ b/dev-java/avalon-framework/Manifest
@@ -0,0 +1,8 @@
+AUX build.xml 1838 BLAKE2B aa6ad2f58ef4bc96837c5f616376e2bc6dca2b338d0bdbff575b4ba0e45381e18d96c3266769fa23af60888d1baeb86e9456abb091f08cf92a54389e579a05d4 SHA512 a6dafeac52a7e7421c6e97972407b7b5424a8e35bae66153c52b92419c038d0cf31a049619b843ece7f26bcb1fbd675ea36475857609820ab6c66d03d4f8da2b
+DIST avalon-framework-4.1.5.src.tar.gz 99475 BLAKE2B c57c89661042137dd0f5b8d6fe4295030a861499b300d84a8c2dc6364d6bdca443cda96e954816da0351fda3d3ce70d47734656949bffba8d823f7e1c9f4ead9 SHA512 7a15dc2f7c691d7daaa5cbb589eb21e23ef8d6232b5bd1b6b3bb1d6962f4a4dd2dff0c0a1793309d7e8f3aaf4e75de65a9705431e1103c2e33c575770131471b
+DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671
+EBUILD avalon-framework-4.1.5-r1.ebuild 938 BLAKE2B 8a90f236e04c7426b8355a2be582ad63cdae1f51aca3ccae040a8516f36c0d15f1ad31836640b0e34890737ddd0845ce46e4008f240120ffb5f407fca794eed0 SHA512 0fc9453981fc142476db62e1870a3cf9a307a101cd591456226d8a2e590df78c6eb3f5ca1250b2180fb5b997b9c220331be6db4e7bffbcc660c3ab21f23c3c3e
+EBUILD avalon-framework-4.1.5-r2.ebuild 918 BLAKE2B a056554d0ce98cb5d6fadfb64d3dee801ba126bee4c6818dd069ff75b979556a11e15584a39940a64dcf5283dfcdf8714cdf540b75b6e13da477695157f3ea6d SHA512 47630957356af551f77d6c5070e5b6aaf15fa0049ff20feb9c16fa1abe54c228e1d10cbbd8d06e54ef3920d4d5caf7b09895018d4694dba4b348dad5ad454279
+EBUILD avalon-framework-4.2.0-r1.ebuild 1028 BLAKE2B e50a838974b65e28852713104412f87871a2faae183dc1bcee5711f56a63c460052e9c28d4cd4fb52333fd43bcbb16229726638c307ac1a99bc4f2ad92e231b7 SHA512 3816f82e7a60b4deaf313b0f6258a5af0815e2f2852e7ec62c06d85b1fabb54a82745202545150b755dc693996bca04595c5bab7b4fc4084a3dd409cbbacf576
+EBUILD avalon-framework-4.2.0-r2.ebuild 1004 BLAKE2B 161856652897e992c483ea7d1711394d5aad6b3ae1ca7f2371b6d5bb44fd69b549db7b1f8bc5677599306bb3577fdc2ce9dfe756d3c7c2c891eb1fe54949b39b SHA512 2f3b59f96c7d6a4b7aef7375a8b8dfadf6dee4beba0259233b50bf468eb0710a9428f4bb8a8ef4b06aeb6eda5404b489b3d4c4306401e1cac5d33bae3e223fe6
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
new file mode 100644
index 000000000000..437f5b34706d
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Avalon Framework"
+HOMEPAGE="http://avalon.apache.org/"
+SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}.src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.1"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+COMMON_DEP="
+	=dev-java/avalon-logkit-2*
+	>=dev-java/log4j-1.2.9"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	cp "${FILESDIR}"/build.xml ./build.xml || die "ANT update failure!"
+	local libs="log4j,avalon-logkit-2.0"
+	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/dist/avalon-framework.jar
+
+	use doc && java-pkg_dojavadoc "${S}"/target/docs
+	use source && java-pkg_dosrc impl/src/java/*
+}
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
new file mode 100644
index 000000000000..4e0a11914774
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Avalon Framework"
+HOMEPAGE="http://avalon.apache.org/"
+SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}.src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.1"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+CDEPEND="dev-java/avalon-logkit:2.0
+	dev-java/log4j:0"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	cp "${FILESDIR}"/build.xml ./build.xml || die "couldn't copy build.xml"
+	local libs="log4j,avalon-logkit-2.0"
+	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/dist/avalon-framework.jar
+
+	use doc && java-pkg_dojavadoc "${S}"/target/docs
+	use source && java-pkg_dosrc impl/src/java/*
+}
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..3e4cd5c81682
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Avalon Framework"
+HOMEPAGE="http://avalon.apache.org/"
+SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.2"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="=dev-java/avalon-logkit-2*
+	>=dev-java/log4j-1.2.9"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	cp "${FILESDIR}/build.xml" ./build.xml || die "ANT update failure!"
+	local libs="log4j,avalon-logkit-2.0"
+	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/dist/avalon-framework.jar
+
+	dodoc NOTICE.TXT || die
+	use doc && java-pkg_dojavadoc target/docs
+	use source && java-pkg_dosrc impl/src/java/*
+}
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
new file mode 100644
index 000000000000..18d039354186
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Avalon Framework"
+HOMEPAGE="http://avalon.apache.org/"
+SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="dev-java/avalon-logkit:2.0
+	dev-java/log4j:0"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	cp "${FILESDIR}"/build.xml ./build.xml || die "couldn't copy build.xml"
+	local libs="log4j,avalon-logkit-2.0"
+	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/dist/avalon-framework.jar
+
+	dodoc NOTICE.TXT || die
+	use doc && java-pkg_dojavadoc target/docs
+	use source && java-pkg_dosrc impl/src/java/*
+}
diff --git a/dev-java/avalon-framework/files/build.xml b/dev-java/avalon-framework/files/build.xml
new file mode 100644
index 000000000000..422246c2dbdc
--- /dev/null
+++ b/dev-java/avalon-framework/files/build.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="avalon-framework" basedir="." default="jar">
+   <property file="build.properties"/>
+   <property file="default.properties"/>
+   
+   <property name="api.src" value="${basedir}/api/src/java"/>
+   <property name="api.test.src" value="${basedir}/api/src/test"/>
+   <property name="impl.src" value="${basedir}/impl/src/java"/>
+   <property name="impl.test.src" value="${basedir}/impl/src/test"/>
+   
+   <property name="target" value="${basedir}/target"/>
+   <property name="dist" value="${basedir}/dist"/>
+   
+   <property name="jarfile" value="avalon-framework.jar"/>
+   
+   <property name="packages" value="org.apache.avalon.framework.*"/>
+   
+   <target name="init">
+      <tstamp/>
+      <mkdir dir="${target}"/>
+      <mkdir dir="${target}/docs"/>
+      <mkdir dir="${target}/tests"/>
+      <mkdir dir="${dist}"/>
+   </target>
+
+   <target name="compile" depends="init">
+      <javac srcdir="${api.src}" destdir="${target}" source="1.4" target="1.4" classpath="${classpath}"/>
+      <javac srcdir="${impl.src}" destdir="${target}" source="1.4" target="1.4" classpath="${classpath}:${target}"/>
+   </target>
+
+   <target name="javadoc" depends="compile">
+      <javadoc sourcepath="${api.src}" destdir="${target}/docs" packagenames="${packages}" classpath="${classpath}" source="1.4"/>
+      <javadoc sourcepath="${impl.src}" destdir="${target}/docs" packagenames="${packages}" classpath="${classpath}:${target}" source="1.4"/>
+   </target>
+   
+   <target name="jar" depends="compile">
+      <jar jarfile="${dist}/${jarfile}" basedir="${target}"/>
+   </target>
+   
+   <target name="clean">
+      <delete dir="${target}/api"/>
+      <delete dir="${target}/impl"/>
+      <delete dir="${target}/docs"/>
+      <delete dir="${target}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/avalon-framework/metadata.xml b/dev-java/avalon-framework/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/avalon-framework/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/avalon-logkit-2.1-r8 b/dev-java/avalon-logkit-2.1-r8
deleted file mode 100644
index fc32d4f40a21..000000000000
--- a/dev-java/avalon-logkit-2.1-r8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/log4j:0 java-virtuals/jms:0 dev-java/oracle-javamail:0 java-virtuals/servlet-api:3.0 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Easy-to-use Java logging toolkit
-EAPI=5
-HOMEPAGE=http://avalon.apache.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/log4j:0 java-virtuals/jms:0 dev-java/oracle-javamail:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.0
-SRC_URI=mirror://apache/excalibur/excalibur-logkit/source/avalon-logkit-2.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0d4415329ffddb2803e2e6cb8d818660
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
new file mode 100644
index 000000000000..beb1269a4f67
--- /dev/null
+++ b/dev-java/avalon-logkit/Manifest
@@ -0,0 +1,4 @@
+AUX avalon-logkit-2.1-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7
+DIST avalon-logkit-2.1-src.tar.gz 60218 BLAKE2B 1c35b38a22d95cffabb19e099d42697adf7aa6ad471f6cb62e02a30b6612c8405b9f7473ca61ea4f7f9c1f3b1ece6ee68f7ec711b79672330db3ac9e57642e0d SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a
+EBUILD avalon-logkit-2.1-r8.ebuild 1403 BLAKE2B c7886b499be92a24d299f86c040709a387caa925fd8db8c0676d2046b9e5a80053ffa3f32fc197dffca18829de1047f56c2bd048ccc7d41c87d029b42cfebf8e SHA512 132b042be721384a2686cd483aefcfd10236c58dd8fc0560d415d6f8fd3d5b913f67eadd6eca1a689cfce3a244f7c8875b7f5c2128f1d53c8612dcd8ae21a255
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
new file mode 100644
index 000000000000..4db25f78e353
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+# NB: this project is dead and we should look into removing it from the tree.
+# Take a look at the homepage.
+DESCRIPTION="Easy-to-use Java logging toolkit"
+HOMEPAGE="http://avalon.apache.org/"
+SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
+
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+IUSE=""
+
+CDEPEND="
+	dev-java/log4j:0
+	java-virtuals/jms:0
+	dev-java/oracle-javamail:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+java_prepare() {
+	# Doesn't like 1.6 / 1.7 changes to JDBC
+	epatch "${FILESDIR}/${P}-java7.patch"
+
+	java-ant_ignore-system-classes
+
+	java-ant_xml-rewrite \
+		-f build.xml \
+		-c -e available \
+		-a classpathref \
+		-v 'build.classpath' || die
+
+	java-pkg_filter-compiler jikes
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="oracle-javamail,jms,log4j,servlet-api-3.0"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch b/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch
new file mode 100644
index 000000000000..cb2611bf0de4
--- /dev/null
+++ b/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch
@@ -0,0 +1,30 @@
+diff -Nur avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java
+--- avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java	2005-08-30 05:03:49.000000000 +0300
++++ avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java	2011-09-27 08:27:49.313005212 +0300
+@@ -20,7 +20,9 @@
+ import java.sql.Connection;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import javax.sql.DataSource;
++import java.util.logging.Logger;
+ 
+ /**
+  * A basic datasource that doesn't do any pooling but just wraps
+@@ -111,4 +113,16 @@
+     {
+         m_logWriter = logWriter;
+     }
++
++    public boolean isWrapperFor(Class cls) {
++        return false;
++    }
++ 
++    public Object unwrap(Class cls) throws SQLException {
++        throw new SQLException("Not a wrapper for " + cls);
++    }
++    
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException("Not a supported feature");
++    }
+ }
diff --git a/dev-java/avalon-logkit/metadata.xml b/dev-java/avalon-logkit/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/avalon-logkit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/backport-util-concurrent-3.1-r1 b/dev-java/backport-util-concurrent-3.1-r1
deleted file mode 100644
index c7d6b4b4b7b0..000000000000
--- a/dev-java/backport-util-concurrent-3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:0 ) app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A portability wrapper for java.util.concurrent API (jsr166) 6.0
-EAPI=5
-HOMEPAGE=http://backport-jsr166.sourceforge.net/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/backport-jsr166/3.1/backport-util-concurrent-Java60-3.1-src.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6705d65049ec08671e4b1e127723e97f
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
new file mode 100644
index 000000000000..61b9417f9d03
--- /dev/null
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -0,0 +1,5 @@
+AUX backport-util-concurrent-3.0-notest.patch 491 BLAKE2B ea587be0736cd1aa4fcbc4095c31dd321816cbefa0cec4d6f0c8969e24e9e96038b30db4baec0d386ba18828cafad0c2d084b48d69c7db77414dd5282f1197f0 SHA512 f2f53a87283c1a6b13e360ba0140a93b0580a023cefbcb5dcd8658ddc7e80c401878229a323416213368f493226b445b5896bb0ff51f1a2bd95ef460f4ddd080
+AUX backport-util-concurrent-3.0-test.patch 380 BLAKE2B 5e1e437564035e652d6c41f8ab75b0589257e955aa06f2b83d8fb488ec7f2d7c4879fdc1556a47599231bf2ab1497243cdacfb7f64f5142bb4728265c296790a SHA512 01ad87f71b07c25193faf1d67de159233b2b298ef4ea31013f3af8d326a09b83f73bdbcfa5629f5531ffc0a0c02b20843c11377f1260448a9758be05c64420fe
+DIST backport-util-concurrent-Java60-3.1-src.tar.bz2 622882 BLAKE2B 49dd1065fb80d697dc917aeff1bf653a1c82bc24e3edf6d1eb272f3cee17130a6db20f562f40e7911a6382f8c545bdf37e1ce34b69a6a7ddf5a569e114a78e87 SHA512 caef9eef43d0de5ee3d05a84b44d3d2f6bb9498bdc82105626bd2631494fcd0347387da9beb6000fe9c80efacbbf2c2c3603a97b53e4c74037eaf629d790cd54
+EBUILD backport-util-concurrent-3.1-r1.ebuild 1163 BLAKE2B 9f5bc96e8401dd8451d213c04942458c46b8fa3c0d2d944e27727b6bdb63801cc0011b9b495eddd9678536e8b9fe9b0ff13769d81adabd12b58831bdf5952855 SHA512 ad14c0f08d9eae8e5cf8ea1281705bab4d4b225c51c5ffc8c9fc49c1bebc6ac80a9da8ca765a7e5e49afe9a62225df5b3f86d8eb4b82bfa68f20341a01aa3e76
+MISC metadata.xml 490 BLAKE2B 8c30e55ff1a4b70180d42e365d9eba3405a1591438e0fc801383b8a1ee65daf759b2544c1edb3b2a03cfe8f7932b5c4de8d12980c630fd5b625ad2f6a674c291 SHA512 81d2a6f504093869e765c56667feb53583a85c7cfe98bf12f571b2d4e202e5ab247e24b8a92ad5141654069d3a66179fbb28790781464dd43821ab55dee62eb9
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
new file mode 100644
index 000000000000..0c7e2df0256c
--- /dev/null
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+SF_PN="backport-jsr166"
+MY_P="${PN}-Java60-${PV}"
+
+DESCRIPTION="A portability wrapper for java.util.concurrent API (jsr166) 6.0"
+HOMEPAGE="http://${SF_PN}.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${SF_PN}/${PV}/${MY_P}-src.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/junit:0
+		)
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}-src"
+
+java_prepare() {
+	if use test; then
+		# make test not depend on make
+		epatch "${FILESDIR}/${PN}-3.0-test.patch"
+	else
+		# don't compile test classes
+		epatch "${FILESDIR}/${PN}-3.0-notest.patch"
+	fi
+
+	cd "${S}/external" || die
+	rm -v *.jar || die
+
+	use test && java-pkg_jar-from --build-only junit
+}
+
+EANT_BUILD_TARGET="javacompile archive"
+EANT_TEST_TARGET="test"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	dohtml README.html || die
+
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/backport-util-concurrent/files/backport-util-concurrent-3.0-notest.patch b/dev-java/backport-util-concurrent/files/backport-util-concurrent-3.0-notest.patch
new file mode 100644
index 000000000000..65642012fddb
--- /dev/null
+++ b/dev-java/backport-util-concurrent/files/backport-util-concurrent-3.0-notest.patch
@@ -0,0 +1,14 @@
+--- build.xml.orig	2007-05-09 23:23:00.000000000 +0200
++++ build.xml	2007-05-09 23:23:34.000000000 +0200
+@@ -33,9 +33,9 @@
+              deprecation="true" destdir="${dest}" nowarn="false"
+              source="1.4" target="1.4">
+         <src path="src"/>
+-        <src path="test/tck/src"/>
++<!--        <src path="test/tck/src"/>
+         <src path="test/loops/src"/>
+-        <src path="test/serialization"/>
++        <src path="test/serialization"/>-->
+       </javac>
+     </target>
+ 
diff --git a/dev-java/backport-util-concurrent/files/backport-util-concurrent-3.0-test.patch b/dev-java/backport-util-concurrent/files/backport-util-concurrent-3.0-test.patch
new file mode 100644
index 000000000000..493738b6055d
--- /dev/null
+++ b/dev-java/backport-util-concurrent/files/backport-util-concurrent-3.0-test.patch
@@ -0,0 +1,11 @@
+--- build.xml.original	2007-02-10 02:03:52.000000000 +0100
++++ build.xml	2007-02-10 02:04:02.000000000 +0100
+@@ -107,7 +107,7 @@
+     -Djunit.ui=swingui property.
+      -->
+ 
+-    <target name="test" depends="jdeps,make"
++    <target name="test" depends="jdeps"
+             description="runs TCK unit tests on the backport">
+ 
+         <property name="junit.ui" value="textui"/>
diff --git a/dev-java/backport-util-concurrent/metadata.xml b/dev-java/backport-util-concurrent/metadata.xml
new file mode 100644
index 000000000000..522fb4206926
--- /dev/null
+++ b/dev-java/backport-util-concurrent/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		This package is the backport of java.util.concurrent API, introduced
+		in Java 5.0, to Java 1.4, and from Java 6.0 to Java 5.0"
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">backport-jsr166</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/balloontip-1.2.1 b/dev-java/balloontip-1.2.1
deleted file mode 100644
index 8e04fa495a1b..000000000000
--- a/dev-java/balloontip-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A balloon tip component to spice up your Java Swing applications
-EAPI=5
-HOMEPAGE=https://balloontip.java.net/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://java.net/projects/balloontip/downloads/download/balloontip_1.2.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=57daaafd5a937a3111f7ac2f34a3fefb
diff --git a/dev-java/balloontip/Manifest b/dev-java/balloontip/Manifest
new file mode 100644
index 000000000000..9b1d4dc87642
--- /dev/null
+++ b/dev-java/balloontip/Manifest
@@ -0,0 +1,4 @@
+AUX balloontip-1.2.1-build.xml 8493 BLAKE2B 1f301cffb6549acdbe613bd617d3846aa43ef6db6332455af30f133e340e771b79aedc0330e92e50d3f782b3943e6e7af0d8b4f1e0a015aefde9fd6e243c32c3 SHA512 8fac922c637b09f54b72235ba50f78cfddedb6c75fc912a4575fa6064165b4723848b81ebf960254f82a0a56e07f3fcd43895d60b90237759fc10df10460e53f
+DIST balloontip_1.2.1.zip 822609 BLAKE2B db5e0f5687b6f03e0a0b62ed73a401240ff06d2eaafadc14e9a1946e9842fadf63176e7dbe6ff97f13b8e3b0c413356cc27c13ebfbcbb2994554971213c08240 SHA512 566e38767627b73324415b329d4f3e06e37572431bb34a022cbc81daf6057f9ab20da673702b2084a0026b70e7135aa8ae83f074ecea0c5a785e5006136ac91b
+EBUILD balloontip-1.2.1.ebuild 886 BLAKE2B 63dd42211ad223b2725ce6eb5fa14f96c35e927eb3671d7d962816b7bfc4cafcd80db49446f9b1581e600ab398620f059b9542ec7d9763a67cce07ebfbb49a01 SHA512 47c2185039a48c005c455615fb6df33ea64c0106678191c710d1cd98e2879457d4d93114dcd4beb61ba59e3bc28d1fe05f02fd763e3a1e6a90b4e3519073252a
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/balloontip/balloontip-1.2.1.ebuild b/dev-java/balloontip/balloontip-1.2.1.ebuild
new file mode 100644
index 000000000000..8f12b47cfdd6
--- /dev/null
+++ b/dev-java/balloontip/balloontip-1.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A balloon tip component to spice up your Java Swing applications"
+HOMEPAGE="https://balloontip.java.net/"
+SRC_URI="https://java.net/projects/${PN}/downloads/download/${PN}_${PV}.zip"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}_${PV}/src/${PN}"
+
+java_prepare() {
+	find . -name "*.jar" -delete || die
+
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	dodoc "${WORKDIR}"/${PN}_${PV}/README.txt
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use examples && java-pkg_doexamples "${S}-examples"
+	use source && java-pkg_dosrc src/main/java/*
+
+}
diff --git a/dev-java/balloontip/files/balloontip-1.2.1-build.xml b/dev-java/balloontip/files/balloontip-1.2.1-build.xml
new file mode 100644
index 000000000000..01613ad720ec
--- /dev/null
+++ b/dev-java/balloontip/files/balloontip-1.2.1-build.xml
@@ -0,0 +1,194 @@
+<?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/13/13 1:34 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="balloontip-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="balloontip-1.2.1"/>
+  <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"/>
+  <path id="build.test.classpath"/>
+
+  <!-- ====================================================================== -->
+  <!-- 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}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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">
+      <bottom>&lt;![CDATA[&lt;a href=&quot;http://balloontip.java.net/&quot;&gt;http://balloontip.java.net/&lt;/a&gt;]]&gt;</bottom>
+    </javadoc>
+  </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"/>
+  </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}"/>
+  </target>
+
+</project>
diff --git a/dev-java/balloontip/metadata.xml b/dev-java/balloontip/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/balloontip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/batik-1.9 b/dev-java/batik-1.9
deleted file mode 100644
index 3dcce5af92bd..000000000000
--- a/dev-java/batik-1.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0 dev-java/rhino:1.6 dev-java/ant-core:0 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java based SVG toolkit
-EAPI=5
-HOMEPAGE=https://xmlgraphics.apache.org/batik/
-IUSE=doc python tcl elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0 dev-java/rhino:1.6 dev-java/ant-core:0 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=1.9
-SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/batik/source/batik-src-1.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cceae751da77eeab869f4e182d420f5b
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
new file mode 100644
index 000000000000..898f4bb7e7fe
--- /dev/null
+++ b/dev-java/batik/Manifest
@@ -0,0 +1,4 @@
+AUX batik-1.9-ImportInfo.patch 439 BLAKE2B 2d1c13f8ffa944c9f303932818b4df5b2c9c10f2903b67500971413e9e3460340b4c6d9bb3e84875ce06845f6646d0ce566a295a5982e88209bf692266dabbb8 SHA512 ff390670537fd631dbd0041a4496e0a33daa1bbd9390867285d2a817ee7794d19c0d634dbfcf4a1e777db072a0f1b6bc2b68e475bbe590bce825aa7b7d76f643
+DIST batik-src-1.9.tar.gz 16748072 BLAKE2B 4e23c0de3d56ba130c5bc9ef80a01549e8c11ab4db3b1ac5dae8525cf0a3a8b7f4df3161c12f1f0df9c74229aaf2034fb6c9c2f91b7fc7407a0af580d144e606 SHA512 96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952
+EBUILD batik-1.9.ebuild 2608 BLAKE2B fafaccf8e95594e59b37e39d367a2461f01ab2c0c847d7482afa544e1c96aea539fef9493823510d5aa52ae0796d0b88d7937b023523f7f9429a852dd292becd SHA512 6dee45bb334ede236b28e376b68526d30c5347441c62687c9f2f062f888174ca59ebe382075df5d14e860384ccc103d1ebdc907dfd40d25d5e87fc78f05834b7
+MISC metadata.xml 449 BLAKE2B 44566acbbaba426170f7f8690216a45cb7809590fd62af0e87eef9cedb6caea2d896507925ec98ed278b90001f92cc38c968795a7b6fc5627c9c4e322da17743 SHA512 e437217b578831129aa80be572fd1044db0ee1c0afb0af0538dbed3e7d2ba739062eca68053426c79433ec03128ea0116a4a92be4d1946e20968be3fe89a4e02
diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
new file mode 100644
index 000000000000..ab95a4c9432a
--- /dev/null
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java based SVG toolkit"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.9"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc python tcl"
+
+CDEPEND="
+	tcl? ( dev-java/jacl:0 )
+	python? ( dev-java/jython:2.7 )
+	dev-java/xalan:0
+	dev-java/rhino:1.6
+	dev-java/ant-core:0
+	dev-java/xmlgraphics-commons:2
+	dev-java/xml-commons-external:1.3"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+	xml-commons-external-1.3
+	xmlgraphics-commons-2
+	rhino-1.6
+	xalan"
+
+src_prepare() {
+	default
+
+	# See bug 318323.
+	local file
+	for file in build.xml contrib/rasterizertask/build.xml; do
+		java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m
+	done
+
+	# See bug 628812.
+	use tcl && epatch "${FILESDIR}/${P}-ImportInfo.patch"
+
+	cd lib || die
+	rm -v *.jar build/*.jar || die
+	use python && java-pkg_jar-from jython-2.7
+	use tcl && java-pkg_jar-from jacl
+}
+
+src_compile() {
+	# Fails to build on amd64 without this
+	export ANT_OPTS="-Xmx256m"
+	use amd64 && export ANT_OPTS="-Xmx1g"
+
+	eant jars all-jar $(use_doc)
+	cd contrib/rasterizertask || die
+	eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc)
+}
+
+src_install() {
+	batik_unversion_jars() {
+		local jar
+		for jar in batik-*.jar; do
+			newj="${jar%-*}.jar"
+			java-pkg_newjar ${jar} ${newj}
+		done
+	}
+
+	# First unversion jars in ${P}/lib
+	cd "${S}/${P}/lib" || die
+	batik_unversion_jars
+
+	# Then, only those in ${P}
+	cd "${S}/${P}" || die
+	batik_unversion_jars
+
+	# Proceed with documentation installation
+	cd "${S}" || die
+	dodoc README CHANGES
+	use doc && java-pkg_dojavadoc "${P}/docs/javadoc"
+
+	# See bug #116976.
+	java-pkg_dolauncher "batik-${SLOT}" \
+		--pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
+		--main org.apache.batik.apps.svgbrowser.Main
+
+	# To find these lsjar batik-${SLOT} | grep Main.class
+	local launcher
+	for launcher in ttf2svg slideshow svgpp rasterizer; do
+		java-pkg_dolauncher batik-${launcher}-${SLOT} \
+			--main org.apache.batik.apps.${launcher}.Main
+	done
+
+	# Install and register the ant task.
+	java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar
+	java-pkg_register-ant-task
+}
diff --git a/dev-java/batik/files/batik-1.9-ImportInfo.patch b/dev-java/batik/files/batik-1.9-ImportInfo.patch
new file mode 100644
index 000000000000..103b99e1b967
--- /dev/null
+++ b/dev-java/batik/files/batik-1.9-ImportInfo.patch
@@ -0,0 +1,10 @@
+--- a/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java	2017-10-28 17:24:11.401276868 +0000
++++ b/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java	2017-10-28 17:27:13.314255999 +0000
+@@ -20,6 +20,7 @@
+ 
+ import java.net.URL;
+ 
++import org.apache.batik.script.ImportInfo;
+ import org.apache.batik.script.Interpreter;
+ import org.apache.batik.script.InterpreterFactory;
+ 
diff --git a/dev-java/batik/metadata.xml b/dev-java/batik/metadata.xml
new file mode 100644
index 000000000000..2eec2d22b8d0
--- /dev/null
+++ b/dev-java/batik/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription>
+	Java toolkit for applications or applets that want to use
+	images in the Scalable Vector Graphics (SVG) format for various
+	purposes, such as viewing, generation or manipulation.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/bcel-6.0_rc3 b/dev-java/bcel-6.0_rc3
deleted file mode 100644
index 0cccaf6e937f..000000000000
--- a/dev-java/bcel-6.0_rc3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=The Byte Code Engineering Library: analyze, create, manipulate Java class files
-EAPI=5
-HOMEPAGE=http://commons.apache.org/bcel/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/apache/commons-bcel/archive/BCEL_6_0_RC3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2e9551390e085e3f71303069c9b633a9
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
new file mode 100644
index 000000000000..0e8ad31eba8e
--- /dev/null
+++ b/dev-java/bcel/Manifest
@@ -0,0 +1,3 @@
+DIST BCEL_6_0_RC3.tar.gz 929878 BLAKE2B 05e2e307f226785cda54c06e80b47b8f738d2f5117deb4492cc758e4bfc2b046068f2aa7836336c26514f56c99525732c62acb02ed982e7f446dc254a5aeab3f SHA512 05ccf95ebf6b374fb112296509b4011d741acf2315b331aa971f8c3bc6be2f73b39592721a8c769b6b9d631e78e348c124c56f567adc2338ed5508d5ec3bed77
+EBUILD bcel-6.0_rc3.ebuild 1195 BLAKE2B 0c30434811449792b24275b28f518abbd6ea97390d5d4f9e744af468b1c8928444913c1fb53e073a1c8475fec346439bfc4a756d86a8cbcb5a6bdeb8eca2c350 SHA512 7ce0ffd7ef9472cdea7585a9671784c8d8267c6600d4b9c207c80c575daeaf2cc0b2096b48549f7669487749b2a2b9e72688ca44a4a3940383e8d255d30fe572
+MISC metadata.xml 819 BLAKE2B e997d77649047065ba6102ad1e4c71a3622fb20544234f529566e665c6c97830bead40f81fb4664f3565225f07abb6d7829b9a6a9f2b7d5365c9fdd02572b020 SHA512 2dd8f3339c680fe11255c65ea92b2ad808ec4cb59d49b47ea533092119fef14424859368feee8ce94e7621a607ef71c4499ab78e518ce07886388def593e7281
diff --git a/dev-java/bcel/bcel-6.0_rc3.ebuild b/dev-java/bcel/bcel-6.0_rc3.ebuild
new file mode 100644
index 000000000000..0dcfd4552f2e
--- /dev/null
+++ b/dev-java/bcel/bcel-6.0_rc3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PV="${PV//./_}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="BCEL_${MY_PV}"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Byte Code Engineering Library: analyze, create, manipulate Java class files"
+HOMEPAGE="http://commons.apache.org/bcel/"
+SRC_URI="https://github.com/apache/commons-${PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/commons-${PN}-${MY_P}/src"
+JAVA_SRC_DIR="main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ../{NOTICE,README,RELEASE-NOTES}.txt
+}
+
+src_test() {
+	cd test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
+	local TESTS=$(find * -name "*TestCase.java" ! -name "Abstract*")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -g -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/bcel/metadata.xml b/dev-java/bcel/metadata.xml
new file mode 100644
index 000000000000..a831a151c83a
--- /dev/null
+++ b/dev-java/bcel/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <longdescription lang="en">
+ This is the main Reference implementation of the BCEL JavaClass API.
+ The Byte Code Engineering Library (formerly known as JavaClass) is intended 
+ to give users a convenient possibility to analyze, create, and manipulate 
+ (binary) Java class files (those ending with .class). Classes are represented 
+ by objects which contain all the symbolic information of the given class: 
+ methods, fields and byte code instructions, in particular.
+</longdescription>
+  <upstream>
+    <remote-id type="github">apache/commons-bcel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/bcmail-1.38-r6 b/dev-java/bcmail-1.38-r6
deleted file mode 100644
index 0b453c393ee2..000000000000
--- a/dev-java/bcmail-1.38-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=dev-java/junit:0 dev-java/oracle-javamail:0 dev-java/bcprov:1.38 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=6
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-java/junit:0 dev-java/oracle-javamail:0 dev-java/bcprov:1.38 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.38
-SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk14-138.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=58a916e415e6543b833c6e59a4177526
diff --git a/dev-java/bcmail-1.45-r5 b/dev-java/bcmail-1.45-r5
deleted file mode 100644
index 31a596585935..000000000000
--- a/dev-java/bcmail-1.45-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=dev-java/junit:0 dev-java/oracle-javamail:0 dev-java/bcprov:1.45 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=6
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-java/junit:0 dev-java/oracle-javamail:0 dev-java/bcprov:1.45 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.45
-SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15-145.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d09ed8e38d7280cc86ff806109e0f836
diff --git a/dev-java/bcmail-1.50-r3 b/dev-java/bcmail-1.50-r3
deleted file mode 100644
index 95b90ae53a07..000000000000
--- a/dev-java/bcmail-1.50-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 dev-java/junit:0 dev-java/bcprov:1.50 dev-java/bcpkix:1.50 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=6
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/junit:0 dev-java/bcprov:1.50 dev-java/bcpkix:1.50 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.50
-SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15on-150.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9b7a2cf8814ee10d2d914d36730ec3cc
diff --git a/dev-java/bcmail-1.52-r3 b/dev-java/bcmail-1.52-r3
deleted file mode 100644
index c6990e412b63..000000000000
--- a/dev-java/bcmail-1.52-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=dev-java/junit:0 dev-java/bcprov:1.52 dev-java/bcpkix:1.52 dev-java/oracle-javamail:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=6
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-java/junit:0 dev-java/bcprov:1.52 dev-java/bcpkix:1.52 dev-java/oracle-javamail:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.52
-SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15on-152.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2ce085326ee7b49d38e33d4ae4dc8421
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
new file mode 100644
index 000000000000..897442c23902
--- /dev/null
+++ b/dev-java/bcmail/Manifest
@@ -0,0 +1,9 @@
+DIST bcmail-jdk14-138.tar.gz 386478 BLAKE2B 2fee04eee66ab352aa08f72063e0088e61b2e76e389ab0d599ca0496798ef5fbdeba4b1865921045405d886ad928cf1e83782324adcbc8464fb7c3af3f1f566a SHA512 1d79aebee02a8d0017dc0b05f68e49fc031a797043eec173aa68ef0148e06b6ebe4d001a1494d6ed95114b1534ece7c47982e119ad8aec2485323babe34f3a13
+DIST bcmail-jdk15-145.tar.gz 483519 BLAKE2B aed9d4ef1ede10b97979652a012f18e45b7d4d597cb8b3ad168e847563ce14f7effe429b7f213adb77befeb144c4c3a279738b76718bde85ce04265d62ef8e75 SHA512 2d3232d5eb1cd75ad56a7316beb32880f3f935fcd3ed0a6cb2cc3e1861dc9f0bece0cbae53471760246505adb5c28328691eb82e11fedb0b160c1248d21c48bb
+DIST bcmail-jdk15on-150.tar.gz 221760 BLAKE2B 48c5d3b692295dcf2ce1e73ce58097b20c11cc353a8e13da9b8987f19eb69f1dbb37747e778e9323c170c0a3baa2ec7257681beea8da4e95343f71c5c6ed186a SHA512 91727ddc4bf932cfaedd3cb90a807b5fec3120e56fde3e5fc73bb5bf2e97db50a35a63e0b5e342fe29e4b974579c5cdd5d427d01c9dd8e7abd521ccd3d1959f1
+DIST bcmail-jdk15on-152.tar.gz 240800 BLAKE2B eb7077f742a8746a1ce13c37bcb936c16f49f6a5eec7421d8f3f93048091d123f416a732add10ed5596fc150d3f129e6b216190c48f6bb1b9d226a0e2bf19637 SHA512 e7301991071709b5788e5a813ea765a5e59bb089104a031ca91a509036e7823b851f854e5f96de6a2d2ef817aad4435f78742dea3a9b1dbeb95a6cddf250619e
+EBUILD bcmail-1.38-r6.ebuild 918 BLAKE2B 76256eb09047227c4762af8e3c8c209a55b01b434b5c2fb1f4f484e4684604e264700b13efe1c0ca64935b93bcb2057d9113036b486642a250d588f946089782 SHA512 2a3500d4c8b22e574e97a4fdc6d6c77ecf641ce36080e49f2b1c693addb601dc0dd607828dbd3880293fb4b56257fe8d8d7781dbe304c31078be435b864409bc
+EBUILD bcmail-1.45-r5.ebuild 926 BLAKE2B 4f3ffde3e41a70c37d9e8529e881ef08d89645d78253cc63677ca6d699c6f2040c62a51fe2a158d3f1872ef4ccc81dc2582e4b84b7dedf87f79d80c4faf69863 SHA512 c4f846ae38bb7862ac39ae7472f5d25d1487cc67cc2731cc9bdf05e03d3356425f7e3e323650422b4f88f1e5d0dfb754465d8e953757cd1493a319ebe44a344f
+EBUILD bcmail-1.50-r3.ebuild 1190 BLAKE2B de5dce6dcce067dbe08ae08eca5c5769814bc4dece868c136b84703be1c12191048650044432ff2ce27276a3c76ae9e0267b6bd02fc9c1b0ceb1ca93719143c3 SHA512 d9b391bd4b4076d57b8109fd046a95e354273e1061a239915707305f175327260d7063b0951f606bd8e204232fdd61f4e30aead42147afad6873dca1a661fa50
+EBUILD bcmail-1.52-r3.ebuild 1190 BLAKE2B 23b0b40fa5af147ccf7b70fd4e5f10bf3f873cf1e4a4f73f8429f1b68b7eba65e8f5d2a1675a5f12827189eed2a2c43ac92b1a65eca5bdca701a8f7be57ad8ad SHA512 325d3e340faa4efe028447703ae9e8c33f3de0a1f311d6c4512eab65c4c830235ac68b2f9380b41bd97d56cf5d4d5cf93de5ec495337c0015c7756146783d4e6
+MISC metadata.xml 369 BLAKE2B 878e0ea0c58e12199e0370cd6898f990ec0b7c884e9937d11e8dac850e203e18f892f3a4e19e9fa98d9607899e4284c6f2760e8f4da352840702a27c07326e8e SHA512 d97ce68b00b528488ba871164a2fc5aee28d7128e756e381c2f1d1d0abd31c67204bbbfb2e61b0d3484a9545d279493f197e0254833353378aa88aacf3fba018
diff --git a/dev-java/bcmail/bcmail-1.38-r6.ebuild b/dev-java/bcmail/bcmail-1.38-r6.ebuild
new file mode 100644
index 000000000000..7a441755a8bb
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.38-r6.ebuild
@@ -0,0 +1,52 @@
+# 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
+
+MY_P="${PN}-jdk14-${PV/./}"
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.38"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/junit:0
+	dev-java/oracle-javamail:0
+	dev-java/bcprov:${SLOT}"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	junit
+	bcprov-${SLOT}
+	oracle-javamail"
+
+src_unpack() {
+	default
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcmail/bcmail-1.45-r5.ebuild b/dev-java/bcmail/bcmail-1.45-r5.ebuild
new file mode 100644
index 000000000000..88f13dd1b289
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.45-r5.ebuild
@@ -0,0 +1,53 @@
+# 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
+
+MY_P="${PN}-jdk15-${PV/./}"
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.45"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/junit:0
+	dev-java/oracle-javamail:0
+	dev-java/bcprov:${SLOT}"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	junit
+	bcprov-${SLOT}
+	oracle-javamail
+"
+
+src_unpack() {
+	default
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcmail/bcmail-1.50-r3.ebuild b/dev-java/bcmail/bcmail-1.50-r3.ebuild
new file mode 100644
index 000000000000..7a0136a1aa48
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.50-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.50"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND="
+	dev-java/junit:0
+	dev-java/bcprov:${SLOT}
+	dev-java/bcpkix:${SLOT}
+	dev-java/oracle-javamail:0"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	${CDEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	junit
+	bcprov-${SLOT}
+	bcpkix-${SLOT}
+	oracle-javamail
+"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+src_prepare() {
+	default
+	rm -rv \
+		org/bouncycastle/mail/smime/test/* \
+		org/bouncycastle/mail/smime/examples/CreateSignedMail.java || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcmail/bcmail-1.52-r3.ebuild b/dev-java/bcmail/bcmail-1.52-r3.ebuild
new file mode 100644
index 000000000000..8f6f1ad4c443
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.52-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.52"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND="
+	dev-java/junit:0
+	dev-java/bcprov:${SLOT}
+	dev-java/bcpkix:${SLOT}
+	dev-java/oracle-javamail:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	junit
+	bcprov-${SLOT}
+	bcpkix-${SLOT}
+	oracle-javamail
+"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+src_prepare() {
+	default
+	rm -rv \
+		org/bouncycastle/mail/smime/test/* \
+		org/bouncycastle/mail/smime/examples/CreateSignedMail.java || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcmail/metadata.xml b/dev-java/bcmail/metadata.xml
new file mode 100644
index 000000000000..46b84d53ab09
--- /dev/null
+++ b/dev-java/bcmail/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Lightweight Java cryptography APIs that work with everything
+		from the J2ME to the JDK 1.6
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/bcpg-1.50-r1 b/dev-java/bcpg-1.50-r1
deleted file mode 100644
index b48e60bec60f..000000000000
--- a/dev-java/bcpg-1.50-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip test? ( dev-java/ant-junit:0 ) dev-java/bcprov:1.50 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.50 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.50
-SRC_URI=http://www.bouncycastle.org/download/bcpg-jdk15on-150.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=730625c777004b7f8ae0fdb5f4a07914
diff --git a/dev-java/bcpg-1.50-r2 b/dev-java/bcpg-1.50-r2
deleted file mode 100644
index 72a72327c398..000000000000
--- a/dev-java/bcpg-1.50-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/bcprov:1.50 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=6
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-java/bcprov:1.50 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.50
-SRC_URI=http://polydistortion.net/bc/download/bcpg-jdk15on-150.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=af17fbcd86bff8d2a6ea5a13864060ba
diff --git a/dev-java/bcpg-1.52-r1 b/dev-java/bcpg-1.52-r1
deleted file mode 100644
index 89363e0ef4d3..000000000000
--- a/dev-java/bcpg-1.52-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip test? ( dev-java/ant-junit:0 ) dev-java/bcprov:1.52 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.52 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.52
-SRC_URI=http://www.bouncycastle.org/download/bcpg-jdk15on-152.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=16e0bb07eadc3a3533ce82d66eb38f89
diff --git a/dev-java/bcpg-1.52-r2 b/dev-java/bcpg-1.52-r2
deleted file mode 100644
index 757c7aae1294..000000000000
--- a/dev-java/bcpg-1.52-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/bcprov:1.52 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=6
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-java/bcprov:1.52 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.52
-SRC_URI=http://polydistortion.net/bc/download/bcpg-jdk15on-152.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3d4c36f84ca9cf12c47e8abd647d7f30
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
new file mode 100644
index 000000000000..b21ac5d01952
--- /dev/null
+++ b/dev-java/bcpg/Manifest
@@ -0,0 +1,7 @@
+DIST bcpg-jdk15on-150.tar.gz 691012 BLAKE2B ee566fb6deb44177e31bfe80b6bd1f13d39d6820cffe3693bd85314ccfd65c4805275b3925d52a6bda6b1ad7e3ea267f1f0bed3926420b5920e5f300020ecd9a SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6
+DIST bcpg-jdk15on-152.tar.gz 748424 BLAKE2B f847fa95ae4eff6c9c95f23ad318d3b967bd224a5dbaea20f8e904a50173076e16723519e8985d4afd2ac02c6a7fe83399e0c6005971bd460b41055c4866a506 SHA512 1619a8cd4024129876266415406882ac5df3dd84fd3e01d7593304874ad641fe72ae95150d0e4414b294e2e5ca8eb39e41a25658f9502b4cd9622fbf0f3d45a0
+EBUILD bcpg-1.50-r1.ebuild 1515 BLAKE2B 25e57aba985350e8922eb0edf9f6a12dbc8f5a2750e4d45c1cb9eb0df0b9ba909ac1eb8d2aa151bdaaa123e7e6accce4eb6182fdd9105c39a2414de9eda46c07 SHA512 eddecb8d3365fe745bf132119d52a46d12a835973e5c9e3e0121822f53b525e8ee24a2b3a6c98920082c24cdc7daf2da6d9d27784abcc424dc41dfbd6a185558
+EBUILD bcpg-1.50-r2.ebuild 1536 BLAKE2B 00122a19f7a787b43507a1a73ae345bd1783efca518818511ea8d8717b42706a2c30f9af202811be5ca60317e3e18250459aa9dd82564daff4e7cd27e36207af SHA512 ad42a74689b4012041e201121ccd134af357b6296f32a4bcba1faad79b03c4ed17579e0e514bdd8c9bcf7f628ad9602a1d8de0f0ff52841a984c408f3ed858cb
+EBUILD bcpg-1.52-r1.ebuild 1515 BLAKE2B 72b4bf72e59b56261b478537c5a29ac660a1504ba824c69c17355d61bdc9284b90e4aaac577856c145576eceff0ed1d453fad2fd22f6fffa70b2c4ec0f00cd3d SHA512 fe5f38bbb296c0217acf3564e403b184dae5e3e87f7a782b55a19e316869fd41853e9c8d7825e51a6825020965c5a7f30c884ba36ccfbb030555d5ddcc948814
+EBUILD bcpg-1.52-r2.ebuild 1536 BLAKE2B e98881a8414cd34669bbe93ef2e2d70b5cf6c69ed1233b1eb6e7f019cc2e3162d6564087c1c594222eb1a9c7c18e88f8d52331ef00ca42a4803c5bf62529f3b5 SHA512 992062b60f1d753f497739101032404483e86af1a1f01121d541d17b6b122f6c16b2e5ab553e67a6292b3644b69137a8c1ff38d7551d36b22bc490f4d8d2a95c
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpg/bcpg-1.50-r1.ebuild b/dev-java/bcpg/bcpg-1.50-r1.ebuild
new file mode 100644
index 000000000000..b895d1674885
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.50-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.50"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
+# Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
+RESTRICT="test"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/ant-junit:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		local RM_TEST_FILES=(
+			org/bouncycastle/openpgp/test
+			org/bouncycastle/openpgp/examples/test
+		)
+		rm -rf "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	local cp="${PN}.jar:bcprov.jar:junit.jar"
+	local pkg="org.bouncycastle"
+	java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcpg/bcpg-1.50-r2.ebuild b/dev-java/bcpg/bcpg-1.50-r2.ebuild
new file mode 100644
index 000000000000..6a89f6e93494
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.50-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.50"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Appears to need older version of bcprov; but
+# since bcprov is not slotted, this can cause conflicts.  Needs further
+# investigation; though, only a small part has tests and there are no tests for
+# bcpg itself.
+RESTRICT="test"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+
+src_unpack() {
+	default
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+src_prepare() {
+	default
+	if ! use test; then
+		local RM_TEST_FILES=(
+			org/bouncycastle/openpgp/test
+			org/bouncycastle/openpgp/examples/test
+		)
+		rm -rv "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	local cp="${PN}.jar:bcprov.jar:junit.jar"
+	local pkg="org.bouncycastle"
+	java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	einstalldocs
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcpg/bcpg-1.52-r1.ebuild b/dev-java/bcpg/bcpg-1.52-r1.ebuild
new file mode 100644
index 000000000000..74354a732de7
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.52-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.52"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
+# Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
+RESTRICT="test"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/ant-junit:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		local RM_TEST_FILES=(
+			org/bouncycastle/openpgp/test
+			org/bouncycastle/openpgp/examples/test
+		)
+		rm -rf "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	local cp="${PN}.jar:bcprov.jar:junit.jar"
+	local pkg="org.bouncycastle"
+	java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcpg/bcpg-1.52-r2.ebuild b/dev-java/bcpg/bcpg-1.52-r2.ebuild
new file mode 100644
index 000000000000..a819a8dcd7e9
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.52-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.52"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Appears to need older version of bcprov; but
+# since bcprov is not slotted, this can cause conflicts.  Needs further
+# investigation; though, only a small part has tests and there are no tests for
+# bcpg itself.
+RESTRICT="test"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+
+src_unpack() {
+	default
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+src_prepare() {
+	default
+	if ! use test; then
+		local RM_TEST_FILES=(
+			org/bouncycastle/openpgp/test
+			org/bouncycastle/openpgp/examples/test
+		)
+		rm -rv "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	local cp="${PN}.jar:bcprov.jar:junit.jar"
+	local pkg="org.bouncycastle"
+	java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	einstalldocs
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcpg/metadata.xml b/dev-java/bcpg/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/bcpg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/bcpkix-1.50-r2 b/dev-java/bcpkix-1.50-r2
deleted file mode 100644
index 9ad83b6a7e0a..000000000000
--- a/dev-java/bcpkix-1.50-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/bcprov:1.50 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.50 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.50
-SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.50/bcpkix-jdk15on-1.50-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=beb18b4121b3ebf169d78356ade14cc3
diff --git a/dev-java/bcpkix-1.52-r1 b/dev-java/bcpkix-1.52-r1
deleted file mode 100644
index 25d4a43a55e7..000000000000
--- a/dev-java/bcpkix-1.52-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/bcprov:1.52 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.52 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.52
-SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.52/bcpkix-jdk15on-1.52-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1b885692efa27647036f1ffef42c1f5d
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
new file mode 100644
index 000000000000..fd987248372e
--- /dev/null
+++ b/dev-java/bcpkix/Manifest
@@ -0,0 +1,5 @@
+DIST bcpkix-jdk15on-1.50-sources.jar 401716 BLAKE2B 7a656218b96da46027c82a023404c32b92a640aa0ed5a1256213139e8dc54f9ef07453478dcc66372a0a49562b92165148f18a5063c24f7569a3e40f649494ba SHA512 6dc6d63db649a94f54c7739144b4120db4255e0a0a713389d54fcd427b95a3ff5ec326ae066cb5aa8a6cf19ccb959cbb22f9f898d39bfe5bf8e20c4d9de6931c
+DIST bcpkix-jdk15on-1.52-sources.jar 422301 BLAKE2B 10a1b16d0d1f7560ce71f9f99c6efaede73250a1ae298c22396c6ac1eeebe0d51c52f8a6a6b1ff68cfd11ab076d5dc97182fb0accd53e769ef9fa65c6764961c SHA512 55f33846e16f7367a25df0933c904b435933e96d0e881bb949c3e3812618fc0d0b5a2901efa779e02a6f48157231da197e2bf5d8037b22169330fa374b07a988
+EBUILD bcpkix-1.50-r2.ebuild 715 BLAKE2B f2c0de3af8417fe27d20ba8f167fb2077a2f9dd1cf813b19559f6a163a30eca41803021bcd2b784ab1d8dd9f36de09bebc25287c47eb3f9cc2eb0b1d6bca9f5b SHA512 e9e7eff9f0cc68bb263b17af42dac1daa3864b5d50072dd7f9e48262a86c38bf1aa3fc8d61722b538ddd5f8ef70107605fd2d67fbbbfd5d08b7acd8379d4e84f
+EBUILD bcpkix-1.52-r1.ebuild 715 BLAKE2B dac94d79e39ff06e6fd097337774a8aecc02a96ee4960dd52bf9c2d81c7d18db3d0a3006486cd71b55cb55469e26af1b9134a101fcabc63914b45cdba5cc468e SHA512 d49f72ca1073cf56257e0c6abab3cb734ad9c2458c03579c0f6772428d0ceba62591b1516b0790a288f6be7aaff403bc8a8064898d74422a93c119c23aeb0779
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild b/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
new file mode 100644
index 000000000000..4689c228fa4f
--- /dev/null
+++ b/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-jdk15on"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+LICENSE="BSD"
+SLOT="1.50"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="org"
diff --git a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild b/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
new file mode 100644
index 000000000000..e99938a8a878
--- /dev/null
+++ b/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-jdk15on"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+LICENSE="BSD"
+SLOT="1.52"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="org"
diff --git a/dev-java/bcpkix/metadata.xml b/dev-java/bcpkix/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/bcpkix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/bcprov-1.38-r4 b/dev-java/bcprov-1.38-r4
deleted file mode 100644
index ad2ae4faabc7..000000000000
--- a/dev-java/bcprov-1.38-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.38
-SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.38/bcprov-jdk16-1.38-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f01d12cb7cbc7b8c8ba251d1b890b7c1
diff --git a/dev-java/bcprov-1.40-r2 b/dev-java/bcprov-1.40-r2
deleted file mode 100644
index ffa073edf669..000000000000
--- a/dev-java/bcprov-1.40-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.40
-SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.40/bcprov-jdk16-1.40-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=eb592b91484f4dbcd88b9cda8cc2e7d7
diff --git a/dev-java/bcprov-1.45-r2 b/dev-java/bcprov-1.45-r2
deleted file mode 100644
index 860ba6e0a753..000000000000
--- a/dev-java/bcprov-1.45-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.45
-SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.45/bcprov-jdk16-1.45-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=53b2e15a23512f30451f7e4cc1d0e585
diff --git a/dev-java/bcprov-1.48-r2 b/dev-java/bcprov-1.48-r2
deleted file mode 100644
index 5565a005b8af..000000000000
--- a/dev-java/bcprov-1.48-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.48
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-148.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4f0f6acbd68cf227e8529441aadbb3cd
diff --git a/dev-java/bcprov-1.49-r4 b/dev-java/bcprov-1.49-r4
deleted file mode 100644
index 224fe0abe8ec..000000000000
--- a/dev-java/bcprov-1.49-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.49
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-149.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=05d15815191905e7c2466055088ae55c
diff --git a/dev-java/bcprov-1.50-r2 b/dev-java/bcprov-1.50-r2
deleted file mode 100644
index b390956fe40f..000000000000
--- a/dev-java/bcprov-1.50-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.50
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=64164c1241d4778dfe5753c5fbc7c46a
diff --git a/dev-java/bcprov-1.50-r3 b/dev-java/bcprov-1.50-r3
deleted file mode 100644
index b5b1cb7e9e6c..000000000000
--- a/dev-java/bcprov-1.50-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=746fc90464034a0baad875e30ec310d1
diff --git a/dev-java/bcprov-1.50-r4 b/dev-java/bcprov-1.50-r4
deleted file mode 100644
index 01c0ffaa4b22..000000000000
--- a/dev-java/bcprov-1.50-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.50
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ab37dde5b10f0d212caeeed5956c514c
diff --git a/dev-java/bcprov-1.52-r1 b/dev-java/bcprov-1.52-r1
deleted file mode 100644
index 7183218fafd6..000000000000
--- a/dev-java/bcprov-1.52-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.52
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-152.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fe63485315ef42a1f5b10e57dc04d666
diff --git a/dev-java/bcprov-1.52-r2 b/dev-java/bcprov-1.52-r2
deleted file mode 100644
index f745efa52258..000000000000
--- a/dev-java/bcprov-1.52-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://polydistortion.net/bc/download/bcprov-jdk15on-152.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1adf6548a4fe5ba81d8cc9388ba988d5
diff --git a/dev-java/bcprov-1.52-r3 b/dev-java/bcprov-1.52-r3
deleted file mode 100644
index 0d1c9447e985..000000000000
--- a/dev-java/bcprov-1.52-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.52
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-152.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=78757ffa1e4b8f3a8ae4e9816a1674c7
diff --git a/dev-java/bcprov-1.54 b/dev-java/bcprov-1.54
deleted file mode 100644
index 461c8980f639..000000000000
--- a/dev-java/bcprov-1.54
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.54
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-154.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=db2047dfbb6a2f5adb5c39484fe6391f
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
new file mode 100644
index 000000000000..e86e75f1dc97
--- /dev/null
+++ b/dev-java/bcprov/Manifest
@@ -0,0 +1,21 @@
+DIST bcprov-jdk15on-148.tar.gz 4070349 BLAKE2B 7149be76738ce689ad77263ea08b0741db904a63a40e80d6900dc919f11d5c32283840186edfc7da061734785f087dcf7e04cbe66c0ab0c748c273d81bfb42ff SHA512 5216f6511c2ab280dc5a06a94017c2045befaa23c4ba71e67f20375f498ac2e1706b772440b5f5615cc18a52ce79fd61f7f95d2663202b50f29196dff33cde46
+DIST bcprov-jdk15on-149.tar.gz 4329897 BLAKE2B d2e13099db63bca877c92e60cab5e66119475389aaf1a0ccaa11ec19ee169f9c93fa93ee2c697de1273a61ed38b596e9f316c5edac78c34dbbd0f751988bcb1b SHA512 123b2c7063b8a1fe068571d8227269fd77b6d07163aec35dca2219b5a2e0ad970995a74027cc515ecaa6112ccb395fcc4db6fa323f9eadab2c4d6e62991c9143
+DIST bcprov-jdk15on-150.tar.gz 4629743 BLAKE2B 7ab18e83f90db38b9af9530246806b4d413718531ce4b34b7aefa7189e28ade8a2afd5d3b3dc25c8cb2d5ef23a8c7f8157ac947ae7d0a46356b00ea7dd6d5f76 SHA512 95400c338a65cbb7d1e80c776de41d3d372b4237aee91526a06774c3d4beb735dcfb4c1ed182a12f2ccac8204b9c546863d79eb99723394d48c415fa32b6ee0e
+DIST bcprov-jdk15on-152.tar.gz 6334971 BLAKE2B 5ef7db891c29147ac48689a1f15e907f4a91d15ac63e8f6a031847d92ddad22cef3dff791d4036b74cd39550e9b48b1926033449beca240db2d7ac78510c22c7 SHA512 df769d2647c1c0b535b1f6922df3f02ed7e13c941f8d954256fddb2ff31d5682924fedf2f2908bc09ebd20058413f40a4c2d62190b63542aa7840b860aeab07c
+DIST bcprov-jdk15on-154.tar.gz 6903567 BLAKE2B 12039cc6c7dbe06b74a0be8f9482209590ef134b37ef0bc64e97ee34f10ecd7c185bf1129f471e06347ea647d9b2d2dc5b845e0c1cefb5b99ebbe44442de3877 SHA512 3d3bf2a1d174a40941a99d1ac6ac6696e9866964bde0cb23e987e3fbd51e3dca220e16f609c29ef9e761faac670164fa9cccf90e1e0f795c33a3ce80e2783151
+DIST bcprov-jdk16-1.38-sources.jar 1197644 BLAKE2B 758b3c894d648dce357d27f20522f8df9c70e87d83702a4eebf5a96529ba3df7fb65dfd62555544fe5f2757ed3194bccc5bc6d97a074036f8b188d84f1f85a42 SHA512 e8ab0b6f47b9737f19ee548dfc6cf09087d1b9339bc48b599fac05d0eb3b00d355f203787a84ee3a504eff2dffd707237a0cc5e26c64a672a362b9161077326f
+DIST bcprov-jdk16-1.40-sources.jar 1221202 BLAKE2B a046d9ac06ed6087c39c9e2d9ae5bf932727b093b5138f6226a4ebcd95640d7b6b6607cf1bd70e6b7b342b5f4d59c358e35225e77ebe8133e8e81a61f632b4ca SHA512 ed94e54cd7a53b5219d0eebb1651f93201c177faf26724613a520e045987e74c462e7adde491bda5bd092fd651b9a7abef93bfac2fd6f0765fb7651525c199ce
+DIST bcprov-jdk16-1.45-sources.jar 1286663 BLAKE2B da19e2343761f10248f315f6966d071a87660f22fe3e51a35308a3b51f907990ef339f05f0c2367babcb06322ffb4600247ecb22b5a19bba3f5c820ed6fe2d2a SHA512 541b390efafba17c21a25bdf84725fd0f9808555eec9c4db51b0642c348d552417d9ba8d584d54690146f3e72fe3b348ab49f92ca263ea8a7a8f7b27bb7b8e5d
+EBUILD bcprov-1.38-r4.ebuild 1336 BLAKE2B 805b34cea2e31c685e8e241cc39bd81545f5de7421006b12f86b3274a09822c42b16a391c7a9506917cb728126dc80c34c2dfacc4a0f21f4ba26b76e5c685fc0 SHA512 dd26a429c403e8e5af917ee25c3ba56891176fd62455e839a9ca3b5046f88d30b8261cb1126a29f37571f290c3232a1789e145e2384f98ffc41805363f750a4f
+EBUILD bcprov-1.40-r2.ebuild 1336 BLAKE2B 8f2f2010097782f0492da774b38bb53460cde92e783ad1c4f78d5545da20f9b3b79bf849d6b7089f4670cf26aa39ee80eec2c48ce3976fc97763e14add3feeb2 SHA512 fe888f263a24ebdc20585cc98bbd9fb2d32c494d695d2eee3d14aae396bca791d4dd3d93e8f7fb20d3c974f31397012c4f126ee0c31d8a3f60a5b06d67d7488d
+EBUILD bcprov-1.45-r2.ebuild 1343 BLAKE2B 1f4e510474a375d532313eb6c6da68fa8b039ee361103d3c44bbc85061ccfce58979118a3be71e190e7ce68bb6c8a291561952a89016bc8a1f3654ceb901ae6b SHA512 d2c2dd791cdcbe27d98b804bfbe5caf5ee04f0a58568ad9917bc0eee43d9547e01cfcd059eba55b39e0e1cde821e75fcb71c15c3bce0afce9213326490341c96
+EBUILD bcprov-1.48-r2.ebuild 1354 BLAKE2B 118806a94e85354cdbe83fab557ae506625cdce911e03c8d3da5e7f059a04eecd37e691adf8c6f49fb2f526f9c68973ace7c62a6bfc4675e9fcf8d5326d08120 SHA512 f3b31ed53af927df1cf491382fc7297aadca264170de9024f1b1123b5debdf7a22d9b97922dd8e5849fcdd586bf5fc89e6bc2657a0428982a6f2893b58df907d
+EBUILD bcprov-1.49-r4.ebuild 1354 BLAKE2B c60a6a2e643aa5a426b154a39071db242c5361e99d8d9ff72853f6071f78f070b9ccbe8a71964b790601900d46e114836dc9110c6610531cf7708b6be7ae800e SHA512 b12cb9c84fd0a89f91850ba8a5ce9b60af846e70ea911adfa510715dcc4535e277c3c841a4e5afc8409dba31d705da3a545e1fa19a8a47f87475a1d33ff6e383
+EBUILD bcprov-1.50-r2.ebuild 1347 BLAKE2B c242438b0f9a8b1802971c1b44424e76bf6c2c11cf359cef7bcb317024c39c7828d6aa901f309055f8c51a180495cf4c3e9e41a788cab4e0a1ae15c3daa83d03 SHA512 3ad3610ab9b2459797bb1fb864582e9e38f85897982f8b1db0ceccb01a80393968a778f11efe04cd59e9b93c5cad2d684e31ac62cc2de6f12192804c847ef1fb
+EBUILD bcprov-1.50-r3.ebuild 1351 BLAKE2B 3092f94f003db082923aaba5140d7b6b5df3247d67ec8b5237c2bb954132fb72a40daecd32e59667c1c3b03c944de6c11d5863902928e80f70137e0921731a71 SHA512 97e407686a4f4fc58cf1a69876944d57a84c564e5cbd1ff06eb94da65afdb0c0f66a6a6e9a1ba379eef21368e072ef8777d550837eee7e115cf50d6ceb40cad5
+EBUILD bcprov-1.50-r4.ebuild 1321 BLAKE2B 3fb23d92770957225bd91d3ddbb81a70bf04a56f890b40e78849fd61c892d148c3f590444475c7afd26ba33a92e1bfb24a3ddd4b8735b7114d205328b479179c SHA512 410204b40d501bfc22d16798bff642b2c9db93f7a08a2b68213737553b17483f472cfc342bffe40ddb5b82b486ddd9198274cc0a8c548ad4f6ea96208a8cbc05
+EBUILD bcprov-1.52-r1.ebuild 1347 BLAKE2B 53b6e67db4ad60cd847a4d4ff23231d19fd158d2a396ee002b91f55a917e5eefc2e1cd9c9c4e5b3dc4b0c1eb0899d693281e0098146de2a448353191092cb50a SHA512 005e608991619786a105699c981c0ac63ae3cd22bd1355aed66693a482b7da25e6474f60dbc11d38c6ab9f8b1202ff3d1b8b6b38f2e404512439b646998957c7
+EBUILD bcprov-1.52-r2.ebuild 1352 BLAKE2B b64efb5bacd2a605e35bb242e4009cdc65009dd023f2bd50f3cf5978b8db4be55f8baff925abb09cd1e0b3245da34f48c44dc733ad47f710f99977a73645309b SHA512 7e070f559ffe303268f20a21b9f3258f983daa367d727ff91757c4fd2dd55c5008bb7e9bd52bb645fc6f369791853cc7862db1b54c98b05aa64effea2be1b0ac
+EBUILD bcprov-1.52-r3.ebuild 1321 BLAKE2B 82624cae6b6b36512f5c6df7b142da19e9def5dc4994a54b90496152273252cbf969df84404be2e584204ec90dec617eb3e85525adcae69ab5334fb09c77d25d SHA512 4f15bae3a89e35a3b1fa0e5530273570a82e48d945e412181a0dda6344b80fd416967aef1bae5783b45e6599bf03b6046e1ee316d28d34e9eae93504f3a38408
+EBUILD bcprov-1.54.ebuild 1328 BLAKE2B 9dc47ddea0ac595232d2037d5eefa5da6a643838d4204ce73062743d3426eb7adf0dfaa18f74d71538193c55df6c49e1cf4ebf24b12c6985cdc8d2d14aba367f SHA512 8102dbf7060f6f71f2a696e3624938e659e9fd6823b23390247a86b36286b693c96e7d3ba6e3fe7b771eea9b79b4d1d6fa3c4002ad5755d232be6b0c4651e507
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcprov/bcprov-1.38-r4.ebuild b/dev-java/bcprov/bcprov-1.38-r4.ebuild
new file mode 100644
index 000000000000..e44ab2704b0a
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.38-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-jdk16"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
+LICENSE="BSD"
+SLOT="1.38"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="org"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.40-r2.ebuild b/dev-java/bcprov/bcprov-1.40-r2.ebuild
new file mode 100644
index 000000000000..6ac8d34d571e
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.40-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-jdk16"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
+LICENSE="BSD"
+SLOT="1.40"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="org"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.45-r2.ebuild b/dev-java/bcprov/bcprov-1.45-r2.ebuild
new file mode 100644
index 000000000000..2722165d64d1
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.45-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-jdk16"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
+LICENSE="BSD"
+SLOT="1.45"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="org"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.48-r2.ebuild b/dev-java/bcprov/bcprov-1.48-r2.ebuild
new file mode 100644
index 000000000000..f3659b9a509a
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.48-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.48"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.49-r4.ebuild b/dev-java/bcprov/bcprov-1.49-r4.ebuild
new file mode 100644
index 000000000000..3e9043e3333e
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.49-r4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.49"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.50-r2.ebuild b/dev-java/bcprov/bcprov-1.50-r2.ebuild
new file mode 100644
index 000000000000..1eba489d573b
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.50-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.50"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}"
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.50-r3.ebuild b/dev-java/bcprov/bcprov-1.50-r3.ebuild
new file mode 100644
index 000000000000..08a9cb8ef610
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.50-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.50-r4.ebuild b/dev-java/bcprov/bcprov-1.50-r4.ebuild
new file mode 100644
index 000000000000..72fcc048689a
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.50-r4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.50"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.52-r1.ebuild b/dev-java/bcprov/bcprov-1.52-r1.ebuild
new file mode 100644
index 000000000000..2ac1295addb8
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.52-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.52"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be build with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}"
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.52-r2.ebuild b/dev-java/bcprov/bcprov-1.52-r2.ebuild
new file mode 100644
index 000000000000..6c5634bd30cc
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.52-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be build with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.52-r3.ebuild b/dev-java/bcprov/bcprov-1.52-r3.ebuild
new file mode 100644
index 000000000000..a3cf4ff83b52
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.52-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.52"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be build with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.54.ebuild b/dev-java/bcprov/bcprov-1.54.ebuild
new file mode 100644
index 000000000000..0b89cd3146bc
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.54.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.54"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be build with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/metadata.xml b/dev-java/bcprov/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/bcprov/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/bctsp-1.45-r1 b/dev-java/bctsp-1.45-r1
deleted file mode 100644
index c95533968e78..000000000000
--- a/dev-java/bctsp-1.45-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=dev-java/bcprov:1.45 dev-java/bcmail:1.45 >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-java/bcprov:1.45 dev-java/bcmail:1.45 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.bouncycastle.org/download/bctsp-jdk15-145.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2076b6bfc447be98f1ca558d35515f10
diff --git a/dev-java/bctsp/Manifest b/dev-java/bctsp/Manifest
new file mode 100644
index 000000000000..d7a588e21284
--- /dev/null
+++ b/dev-java/bctsp/Manifest
@@ -0,0 +1,3 @@
+DIST bctsp-jdk15-145.tar.gz 100494 BLAKE2B 916972fc2c0585b8ff22cfef890a9324391d1723030ce926d1ba041631162fcc800f4e3e43733191c2bb7eb39235a98c99f8a0b59df5b42b771d0a3389fee569 SHA512 8e06598b6286502a6cf908f60b9bcae134dca070869c58e408746470e1f4f80ad8bca8c6f2fe5265fed051b5ddbeb710154ae7bf3a50fff2980c6b562ba6a606
+EBUILD bctsp-1.45-r1.ebuild 766 BLAKE2B 776a7cb97704774324d20c6e467a494423f1432254628afb277933d6ad7a4b38dd867809055024923b9d881438f0e23df16a37d79214c5e025c462130d894457 SHA512 a8279b41cc6c4ca1a0b883c70c00803ab76f20ff7277303d8f193d15f2ccc7ddb59eadf7b4c7b51937687204a1e8d0908864e24f296180c319f33eeeb0b1fcd9
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/bctsp/bctsp-1.45-r1.ebuild b/dev-java/bctsp/bctsp-1.45-r1.ebuild
new file mode 100644
index 000000000000..8bfc4e6882a5
--- /dev/null
+++ b/dev-java/bctsp/bctsp-1.45-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15-${PV/./}"
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/bcprov:1.45
+	dev-java/bcmail:1.45"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}"/${MY_P}
+
+JAVA_GENTOO_CLASSPATH="bcprov-1.45,bcmail-1.45"
+
+src_unpack() {
+	default
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+java_prepare() {
+	# Remove tests
+	rm -R org/bouncycastle/tsp/test || die
+}
diff --git a/dev-java/bctsp/metadata.xml b/dev-java/bctsp/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/bctsp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/beansbinding-1.2.1-r3 b/dev-java/beansbinding-1.2.1-r3
deleted file mode 100644
index 4229085a6328..000000000000
--- a/dev-java/beansbinding-1.2.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Implementation of JSR295
-EAPI=5
-HOMEPAGE=https://java.net/projects/beansbinding/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/beansbinding-1.2.1-src.zip -> beansbinding-1.2.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=84fa356afa387ce31b8aa5a36d7bb848
diff --git a/dev-java/beansbinding/Manifest b/dev-java/beansbinding/Manifest
new file mode 100644
index 000000000000..244dd9958fbc
--- /dev/null
+++ b/dev-java/beansbinding/Manifest
@@ -0,0 +1,3 @@
+DIST beansbinding-1.2.1.zip 236905 BLAKE2B 81e48ef53c28106fc6e4fa4c7e85dc07ce4ce05635769d09d5d9bcd17f64f5b7ba44ab676311f44dd3906cc34c95539d1fbb8d3038c05a6ab4ba62f8bf8fe3ed SHA512 f617f0b5068c416bcaaa46fe141e9b8b1fec128403738093b205451f9bcd624d2588b9b77e0c67f6de97490f44a4cf7c5e58b1728d5d7d921bd861e3dfffb415
+EBUILD beansbinding-1.2.1-r3.ebuild 514 BLAKE2B 097d870457472e92d9eda45cd8bc254d2693163437b73397ae58130417966b56712351a8ae1660ee458960c059100fc47b3ae24f9c7dab0245afe6bb45a9f3b3 SHA512 4220480274ea8bfdb88f075936b3b67a9cb4e9a3a4985f04fed9ed0bbfe99f32e4e0c29d425970082fe4e1043c2a93e278cca1b81436902f075346d1b3905027
+MISC metadata.xml 547 BLAKE2B bc3405c9d4218c96c100b0db18ec29fc96c8927c0f57d0c750511404fe9dd7577ff469d3c8c010dd53f5decbbaa1e4ae36f5beb26ea397cb7a91c83ff4a0c5ef SHA512 609eeba195b71e3c6a941a8e0f52b1c55a39b1b3ee145afa61965edc30bd7e036f32f670b68ddbc712a19a684891aa70cb7a8aeba1c0cf6d5bda95785aa1c668
diff --git a/dev-java/beansbinding/beansbinding-1.2.1-r3.ebuild b/dev-java/beansbinding/beansbinding-1.2.1-r3.ebuild
new file mode 100644
index 000000000000..a6cca6a7abfb
--- /dev/null
+++ b/dev-java/beansbinding/beansbinding-1.2.1-r3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of JSR295"
+HOMEPAGE="https://java.net/projects/beansbinding/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}-src.zip -> ${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_SRC_DIR="src"
diff --git a/dev-java/beansbinding/metadata.xml b/dev-java/beansbinding/metadata.xml
new file mode 100644
index 000000000000..68f46e763e7f
--- /dev/null
+++ b/dev-java/beansbinding/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription lang="en">
+Beans Binding (JSR 295) is about keeping the properties of two beans in sync. This project provides the reference implementation of Beans Binding, with an additional emphasis on the ability to bind to Swing components, and easy integration with IDEs such as NetBeans.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/blowfishj-2.14-r3 b/dev-java/blowfishj-2.14-r3
deleted file mode 100644
index 74eceaaa4cc3..000000000000
--- a/dev-java/blowfishj-2.14-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Blowfish implementation in Java
-EAPI=5
-HOMEPAGE=http://blowfishj.sourceforge.net/index.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/blowfishj/blowfishj-2.14-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=545abc2772bb0d1a3adbbe8b05c19d1a
diff --git a/dev-java/blowfishj/Manifest b/dev-java/blowfishj/Manifest
new file mode 100644
index 000000000000..4931c6b6e281
--- /dev/null
+++ b/dev-java/blowfishj/Manifest
@@ -0,0 +1,3 @@
+DIST blowfishj-2.14-src.tar.gz 33726 BLAKE2B 08977621403c16700396109364e9de0b473ca797934de6d62e5f942b37f6fc4b2bea451be4f53f4a56cb19bd9b540c5b277d8634f0687bc4a36619139a39bdf7 SHA512 3f508be61b494eddf6f276e21c7979d1f6a46dac19e8256f7451f3a434cd1d7df34c268aa2c13b7370129c84f289f331f47456c400ac31a9f0996fefeae12aec
+EBUILD blowfishj-2.14-r3.ebuild 867 BLAKE2B 89f031f173abd8f7f2675c6264c765e67e80ed0407c225ef9d4dd13cfdce9ca7a6d05fb41c2d947c2a5a4e0087587834883024e72eea48db2c1d8a6be7edfbf7 SHA512 33caf27e02d61355778da994834f8709a550a885023b0427a529cddd92caaca4a0338b69bc95efe03f30a20faacb1545dab618b1da1d49bafbf1264f06b2a823
+MISC metadata.xml 685 BLAKE2B 4727a8e15ee682aa02ba1b2348654cdf97b6cdfbb99f7129ea1d83a0f01d80c88d9a8347638b1892e120e6c04549ee70012092a164179455cd1f470c1f29c5e0 SHA512 48bc52bb7d9e6b99b75d621ecedf4c3f194c5d5aeaadd7e20cb65ca4a7ee12c2009f8c984bf480611ddaa92dda2406e40a109327868373b380bc387414ff195b
diff --git a/dev-java/blowfishj/blowfishj-2.14-r3.ebuild b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
new file mode 100644
index 000000000000..61fa2f641db2
--- /dev/null
+++ b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Blowfish implementation in Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+HOMEPAGE="http://blowfishj.sourceforge.net/index.html"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+RDEPEND=">=virtual/jre-1.6"
+
+java_prepare() {
+	cd "${S}" || die
+	java-ant_ignore-system-classes
+	mkdir -p target/lib || die
+	cd target/lib || die
+	use test && java-pkg_jar-from --build-only junit
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test -DJunit.present=true
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/net
+}
diff --git a/dev-java/blowfishj/metadata.xml b/dev-java/blowfishj/metadata.xml
new file mode 100644
index 000000000000..e545108bd55c
--- /dev/null
+++ b/dev-java/blowfishj/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+	The Blowfish implementation in Java, provides very fast ECB and CBC encryption.
+	Comes with the BlowfishEasy class for simple string encryption, plus a solution
+	for streaming, both are binary compatible to Blowfish.NET. Additionally this
+	package includes its own SHA-1 class, all sources, JUnit test cases, demos and
+	JavaDocs.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">blowfishj</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/bnd-junit-2.1.0 b/dev-java/bnd-junit-2.1.0
deleted file mode 100644
index 111b3f8f9c55..000000000000
--- a/dev-java/bnd-junit-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/junit:4 ) dev-java/osgi-core-api:0 dev-java/bndlib:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Junit plugin for bndlib, a swiss army knife for OSGi
-EAPI=5
-HOMEPAGE=http://www.aqute.biz/Bnd/Bnd
-IUSE=elibc_FreeBSD test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/bndlib:0 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2673026a30262cbd49961b2d2375dee2
diff --git a/dev-java/bnd-junit/Manifest b/dev-java/bnd-junit/Manifest
new file mode 100644
index 000000000000..5a3776e4ab8a
--- /dev/null
+++ b/dev-java/bnd-junit/Manifest
@@ -0,0 +1,3 @@
+DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
+EBUILD bnd-junit-2.1.0.ebuild 1108 BLAKE2B e23ae80e3510e5858ae86cf1d08a029cc6f65a57516538496db22cc37c3c84d58df4d2563a8da1a08f3ba435a1e2b1ff02a71031fb9f277dbb6c276c76fdf553 SHA512 4ca41cd6424423e74da9251835c15ff946d9d9a157cf1760f30daf6e5ffe61b420c01fec4fc78bac46d946010925bced7534d88e2b9f6ea0c80f74a0ce02ae2f
+MISC metadata.xml 323 BLAKE2B b7a6a3bf3330da14a229f4b8e178c7f5da2bdab8d7249b92daa4a6d414471b001d21441465852b21f9abbbb6bdff229a8c7dbe162e4ae820d5feccf2684c19f8 SHA512 b9affc0513759478d6db10968d574cc820ac19476a539d27e279884314805f663f0807abd01ce8107154fae445ad3e4fd37f485004130f04aa890c0607f85fcf
diff --git a/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild b/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild
new file mode 100644
index 000000000000..e4de5405feee
--- /dev/null
+++ b/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Junit plugin for bndlib, a swiss army knife for OSGi"
+HOMEPAGE="http://www.aqute.biz/Bnd/Bnd"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/osgi-core-api:0
+	dev-java/bndlib:0"
+
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/junit:4 )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.junit"
+
+EANT_BUILD_TARGET="build"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="bndlib,junit-4,osgi-core-api"
+
+# Tests appear broken and cause a circular dependency.
+RESTRICT="test"
+
+java_prepare() {
+	# Move the correct build.xml into place, needed for testing.
+	cp ../cnf/build.xml . || die
+
+	# Remove bundled jar files.
+	find . -name '*.jar' -delete > /dev/null
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar generated/biz.aQute.junit.jar
+}
diff --git a/dev-java/bnd-junit/metadata.xml b/dev-java/bnd-junit/metadata.xml
new file mode 100644
index 000000000000..7ed2fdf0797a
--- /dev/null
+++ b/dev-java/bnd-junit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bndtools/bnd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/bndlib-2.1.0 b/dev-java/bndlib-2.1.0
deleted file mode 100644
index c468b7feb078..000000000000
--- a/dev-java/bndlib-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 dev-java/osgi-enterprise-api:0 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A swiss army knife for OSGi
-EAPI=5
-HOMEPAGE=http://www.aqute.biz/Bnd/Bnd
-IUSE=elibc_FreeBSD test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 dev-java/osgi-enterprise-api:0 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=07a34029be330d2867d34394e8a33c7c
diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest
new file mode 100644
index 000000000000..fb62f35e87cf
--- /dev/null
+++ b/dev-java/bndlib/Manifest
@@ -0,0 +1,3 @@
+DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
+EBUILD bndlib-2.1.0.ebuild 1629 BLAKE2B 0043daccb6de03e935f975eb5e75b27c4ef10ea56384f6dbda7d55f955aa0e0e69b0c2e04d7af9ced6452d90e7decafff71130761bf488ff2c93f08b7b2ccffa SHA512 acd9ea13ccb4636c537d392fdbb49ad1c0b9aebb0ad7adcf9d5ac277aae840cf5e221b62a96e940790ba6d10613325dcde311c61a9cae37ba05e726874479ba4
+MISC metadata.xml 323 BLAKE2B b7a6a3bf3330da14a229f4b8e178c7f5da2bdab8d7249b92daa4a6d414471b001d21441465852b21f9abbbb6bdff229a8c7dbe162e4ae820d5feccf2684c19f8 SHA512 b9affc0513759478d6db10968d574cc820ac19476a539d27e279884314805f663f0807abd01ce8107154fae445ad3e4fd37f485004130f04aa890c0607f85fcf
diff --git a/dev-java/bndlib/bndlib-2.1.0.ebuild b/dev-java/bndlib/bndlib-2.1.0.ebuild
new file mode 100644
index 000000000000..c9a398337963
--- /dev/null
+++ b/dev-java/bndlib/bndlib-2.1.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A swiss army knife for OSGi"
+HOMEPAGE="http://www.aqute.biz/Bnd/Bnd"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/libg:0
+	dev-java/osgi-compendium:0
+	dev-java/osgi-core-api:0
+	dev-java/osgi-enterprise-api:0"
+
+# Tests appear broken and cause a circular dependency.
+# test? ( dev-java/bnd-junit:0 )
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}
+	test? ( dev-java/junit:4 )"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.${PN}"
+
+EANT_BUILD_TARGET="build"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+# Tests appear broken and cause a circular dependency.
+RESTRICT="test"
+
+java_prepare() {
+	# Move the correct build.xml into place, needed for testing.
+	cp ../cnf/build.xml . || die
+
+	# Remove bundled jar files.
+	find . -name '*.jar' -delete > /dev/null
+
+	if ! use test ; then
+		rm -rf src/aQute/bnd/test || die "Failed to remove tests."
+	fi
+}
+
+src_compile() {
+	local extra_cp=""
+
+	if use test ; then
+		extra_cp=":$(java-pkg_getjars --build-only junit-4)"
+	fi
+
+	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars libg):$(java-pkg_getjars osgi-compendium):$(java-pkg_getjars osgi-core-api):$(java-pkg_getjars osgi-enterprise-api)${extra_cp}" \
+		java-pkg-2_src_compile
+}
+
+EANT_TEST_GENTOO_CLASSPATH="junit-4,bnd-junit"
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar generated/biz.aQute.${PN}.jar
+}
diff --git a/dev-java/bndlib/metadata.xml b/dev-java/bndlib/metadata.xml
new file mode 100644
index 000000000000..7ed2fdf0797a
--- /dev/null
+++ b/dev-java/bndlib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bndtools/bnd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/boilerpipe-1.2.0 b/dev-java/boilerpipe-1.2.0
deleted file mode 100644
index 6f03cc7b7fb4..000000000000
--- a/dev-java/boilerpipe-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/xerces:2 dev-java/nekohtml:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Boilerplate Removal and Fulltext Extraction from HTML pages
-EAPI=5
-HOMEPAGE=https://github.com/kohlschutter/boilerpipe
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/xerces:2 dev-java/nekohtml:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://boilerpipe.googlecode.com/files/boilerpipe-1.2.0-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a43ddeafcc79f17afb6c6068f3b23f6f
diff --git a/dev-java/boilerpipe/Manifest b/dev-java/boilerpipe/Manifest
new file mode 100644
index 000000000000..2be1d12df8c2
--- /dev/null
+++ b/dev-java/boilerpipe/Manifest
@@ -0,0 +1,3 @@
+DIST boilerpipe-1.2.0-src.tar.gz 46279 BLAKE2B 21e146bc772b6025dd22939fab64777bbbb55b3016ccb9627dfb7c1c4d3eb2fd61243aae2e22cd973e77a11eccba45b9a5837f08db265edb703779a46f08abe3 SHA512 db9349213debab932d2470e46f1e80366d6a6ca99e016b6f9ed4887881eecd4132e9aef29b8e4fe8282d1375d60b88a99d9aa43e249d6b673739ec017d2472a6
+EBUILD boilerpipe-1.2.0.ebuild 800 BLAKE2B 52acc306bf9782794dfd21beb710851a8a59df3be8ab1c990bb6bd6d8c6f45295b518ff9a7eb186da525c8285639b9b9aff7cd261ae7d89feaa2d8d675d6682c SHA512 13826a7c84190fabb2ffeed05e9fee0e3dcfaa63ea1f0f6e9cb70db9433ed803f0da87f5731853bb73ff744b9e9b6c2f3c65cc4422c47842120c192be4167e19
+MISC metadata.xml 255 BLAKE2B 287d65f3a6609362260b1406a0226c14b3be2b9ed17b5c4f422e718693a57b37c871914d2e8c60609eddf7339e4aba2fc257585e4a58c174f07395077a1a7485 SHA512 d11126781bff8c65605f533936f2817d35cfd1d88e89b33cc37ffa5af1d2b93bf22987c822b710719e9a0c0839563990acf4082ee30a5a0af6b0df3f8377ab62
diff --git a/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild b/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild
new file mode 100644
index 000000000000..3ec2b0f9e9a7
--- /dev/null
+++ b/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Boilerplate Removal and Fulltext Extraction from HTML pages"
+HOMEPAGE="https://github.com/kohlschutter/boilerpipe"
+SRC_URI="https://${PN}.googlecode.com/files/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+CDEPEND="dev-java/xerces:2
+	dev-java/nekohtml:0"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+EANT_BUILD_TARGET="jars"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="xerces-2,nekohtml"
+
+java_prepare() {
+	mkdir "${S}"/lib || die
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+	use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/boilerpipe/metadata.xml b/dev-java/boilerpipe/metadata.xml
new file mode 100644
index 000000000000..07ba689dd861
--- /dev/null
+++ b/dev-java/boilerpipe/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">kohlschutter/boilerpipe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/boot-bin-2.6.0 b/dev-java/boot-bin-2.6.0
deleted file mode 100644
index fdc2d1b04411..000000000000
--- a/dev-java/boot-bin-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.7:* >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Build tooling for Clojure
-EAPI=6
-HOMEPAGE=http://boot-clj.com/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jdk-1.7:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/boot-clj/boot/releases/download/2.6.0/boot.jar -> boot-2.6.0.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b7f9292d3a3d3c966bdc5dfaa4c3d724
diff --git a/dev-java/boot-bin-2.7.0 b/dev-java/boot-bin-2.7.0
deleted file mode 100644
index c0f903bee346..000000000000
--- a/dev-java/boot-bin-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.7:* >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Build tooling for Clojure
-EAPI=6
-HOMEPAGE=http://boot-clj.com/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jdk-1.7:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/boot-clj/boot/releases/download/2.7.0/boot.jar -> boot-2.7.0.jar https://raw.githubusercontent.com/boot-clj/boot/2.7.0/README.md -> boot-2.7.0-README.md https://raw.githubusercontent.com/boot-clj/boot/2.7.0/CHANGES.md -> boot-2.7.0-CHANGES.md
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bf5c6287ab05c255ad014c094743796c
diff --git a/dev-java/boot-bin-2.7.1 b/dev-java/boot-bin-2.7.1
deleted file mode 100644
index f2819912fcc8..000000000000
--- a/dev-java/boot-bin-2.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.7:* >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Build tooling for Clojure
-EAPI=6
-HOMEPAGE=http://boot-clj.com/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jdk-1.7:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/boot-clj/boot/releases/download/2.7.1/boot.jar -> boot-2.7.1.jar https://raw.githubusercontent.com/boot-clj/boot/2.7.1/README.md -> boot-2.7.1-README.md https://raw.githubusercontent.com/boot-clj/boot/2.7.1/CHANGES.md -> boot-2.7.1-CHANGES.md
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bf5c6287ab05c255ad014c094743796c
diff --git a/dev-java/boot-bin/Manifest b/dev-java/boot-bin/Manifest
new file mode 100644
index 000000000000..d865b53f3e68
--- /dev/null
+++ b/dev-java/boot-bin/Manifest
@@ -0,0 +1,12 @@
+AUX boot 247 BLAKE2B 138d1a35bb90dc4942c480b6d48494716dfeb406d8d66186e3732df247b74d65f947de22532f51b7c5c1b1a652a65e962e2c0ccdd2ae7189b102579c3a00ea3e SHA512 06ad5b0517a2ecddfa62e03b15d7af2bf76f029e2cd9dd096b27024a9dd1f6c8bc0ffe278b510249f624c6dc2178d41561e06c41dcef5cca8699f34722d215c0
+DIST boot-2.6.0.jar 8289462 BLAKE2B c9ff3c464f0ebf536594879681fb7d84454dd7e51db355ae48f9562a2b7f09e6b8aa3adf53c95d1310e29388b167030d6637eeb2cfe9817831f107a6ca8cfac2 SHA512 715aa320c0e44a2376020aa84c0640ae8e6fb15a4842b4267ff58e1d09682aae17f74dc568e50fa611993947bcd7b1430157a0f0b6b8bcddff1eaa3149ddc9ad
+DIST boot-2.7.0-CHANGES.md 19877 BLAKE2B 6d2190988bc73f41f88101eaf14c0d43e06f4386629ea712a0e6800288250ab9cfe3d435c68557005693bdda11047dde9e5b6d984f53a5cffd5032ccce69e756 SHA512 f97148da762a1e5ea5ab747dcff59e69a53690cd655a6b8968dd894b7e4184f49eacc2d1189d81df80eba78b74091dd47d137dc4963da5b9caead0db16259303
+DIST boot-2.7.0-README.md 16071 BLAKE2B de0f5168f1b4151ffc76bf02343a1d965ba418e90255d04ef8c6c0c30e32d1927042ed24d1e5e1e6dad3b9dc0e893bf7656a3cfc279f6e690a5c7587a3930897 SHA512 395b6fec79bd1299f4d84fda4ba3d0db0b54c9c591c7ffd2c3c0f239f5f1bade31bf6eb1b924d6e58775fb6d412417d251d77356698d54c93c3ee31b64c9652a
+DIST boot-2.7.0.jar 16723852 BLAKE2B ab067b0b2b42b4d8295b3de8367393e6e31192e127112a23ce6e21946afabff6f0bdb75a37b3120da361ec6a76d470185908e4264d5b5ee08f3d4749d86ecea0 SHA512 5a95b2d8e521d57e5773347df52982f0ab9cd325622606ea394f826610b9b27a1cbeed0749665d62f605cf9249b9f65d378b1b77e40c83e3cfe703d4d2fc2530
+DIST boot-2.7.1-CHANGES.md 20380 BLAKE2B 84a57834b78b752b6be051aa9513ad3360cc81b1311248892b3f61760c181a2c53083da8c61eeae2930b2501b95b71dd74bfededa2325806a83abbb0ef0f35e3 SHA512 5f8b9866dcb5e784caee89c7a0569d6a2392cda19aa498d15eaa8d4ea054900bdc0dff950ca60f6c62f0cd262373a3cd0760c755b805d952bc96838de135aeb8
+DIST boot-2.7.1-README.md 16071 BLAKE2B de0f5168f1b4151ffc76bf02343a1d965ba418e90255d04ef8c6c0c30e32d1927042ed24d1e5e1e6dad3b9dc0e893bf7656a3cfc279f6e690a5c7587a3930897 SHA512 395b6fec79bd1299f4d84fda4ba3d0db0b54c9c591c7ffd2c3c0f239f5f1bade31bf6eb1b924d6e58775fb6d412417d251d77356698d54c93c3ee31b64c9652a
+DIST boot-2.7.1.jar 8388320 BLAKE2B a5af7ee5468cd6db1c955fd7a1726da6bc370ff8fb2b38312c42b9b6577c9605cfd472f86878c8706e50a1523f9e8789e7b92aa7244f2ce0450b7447cd8d5aa8 SHA512 d8101ba2c3a2bdec655f0fcea95a3cb33aee90c9471f6cd31f465c3716cb3f6d9027b7ec0c1c7cd277f8b43cbc0fd69d2e164fa33b112bba94d4d3245caafb3c
+EBUILD boot-bin-2.6.0.ebuild 1524 BLAKE2B c968415c492f6b70529554fe4bf1d51bf36cbe115f73591bef5ad8dd76a88653156ff1e6a15369a3a0755b561c9858d35f2ae0d968d5dd2790b00c9f58ed04dc SHA512 d4f3886207b4e0057fab46c8f0a65ce4830c6d6c948f1cb37c8d3a5bbb4ff8a880bcfa920fa2c2e037d243e7f16926fa3f2105e69c0fec5564cd563b46ccb3e8
+EBUILD boot-bin-2.7.0.ebuild 1998 BLAKE2B e5e5c7d9a75fe277fa164a1cdbcd7b227011c4a945c628544f1a0afee867dbe9b5b4b8e79c64f1e59c5d5b7926e882cae1301a9d4fb89c23f4f8e4fc2b210027 SHA512 e4050452a886c3ecc9c8f9c42a8befed7f9aefd8f4123d8f49741f13c30f8bf59a73c067cbf0d4eb259ce64d353e7dd79c5de3cdb906d8348ef7f85bd3af4321
+EBUILD boot-bin-2.7.1.ebuild 1998 BLAKE2B e5e5c7d9a75fe277fa164a1cdbcd7b227011c4a945c628544f1a0afee867dbe9b5b4b8e79c64f1e59c5d5b7926e882cae1301a9d4fb89c23f4f8e4fc2b210027 SHA512 e4050452a886c3ecc9c8f9c42a8befed7f9aefd8f4123d8f49741f13c30f8bf59a73c067cbf0d4eb259ce64d353e7dd79c5de3cdb906d8348ef7f85bd3af4321
+MISC metadata.xml 400 BLAKE2B 9b861c7bbcf7f885204ab9bfce1d364bf75b0001ce1e3623826b9d3009b51276dd8ee33817c49899583ca4d79e2108c01da676f2e815c980cdeaefe716a858ff SHA512 1293c586f0885348baaeaf2c98c031a5c673aaa3604bd81c73159341d55f83a85686efd4866709709dcfec289087422af258e4df8c4f43445e7ad87a2dc43096
diff --git a/dev-java/boot-bin/boot-bin-2.6.0.ebuild b/dev-java/boot-bin/boot-bin-2.6.0.ebuild
new file mode 100644
index 000000000000..15ca39c55373
--- /dev/null
+++ b/dev-java/boot-bin/boot-bin-2.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_PNV="${MY_PN}-${PV}"
+
+DESCRIPTION="Build tooling for Clojure"
+HOMEPAGE="http://boot-clj.com/"
+SRC_URI="https://github.com/boot-clj/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jdk-1.7:*"
+DEPEND=">=virtual/jdk-1.7:*"
+
+RESTRICT="test"
+
+src_unpack() {
+	mkdir -p "${S}" || die "Can't mkdir ${S}"
+	cd "${S}"	|| die "Can't enter ${S}"
+	for file in ${A}; do
+		einfo "Copying ${file}"
+		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
+	done
+}
+
+src_prepare() {
+	einfo "Copying boot shell-script"
+	cp "${FILESDIR}/boot" "${S}/" || die "Can't copy boot"
+
+	java-pkg_init_paths_
+
+	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" 	"${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
+	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" 		"${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
+	sed -i "s|@@PN@@|${PN}|g" 					"${S}/boot" || die "Can't patch PN in boot"
+
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin "${S}/boot"
+	java-pkg_newjar "${S}/${MY_PNV}.jar"
+}
+
+pkg_postinst() {
+	einfo "This package will still download a whole lot of its own runtime"
+	einfo "dependencies the first time you run it."
+	einfo ""
+	einfo "This currently can't be helped and is expected behaviour for a"
+	einfo "java based development toolkit"
+}
diff --git a/dev-java/boot-bin/boot-bin-2.7.0.ebuild b/dev-java/boot-bin/boot-bin-2.7.0.ebuild
new file mode 100644
index 000000000000..8809cdf42e6b
--- /dev/null
+++ b/dev-java/boot-bin/boot-bin-2.7.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_PNV="${MY_PN}-${PV}"
+GITHUB_USER="boot-clj"
+
+DESCRIPTION="Build tooling for Clojure"
+HOMEPAGE="http://boot-clj.com/"
+SRC_URI="https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar
+		 https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md
+		 https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md
+"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jdk-1.7:*"
+DEPEND=">=virtual/jdk-1.7:*"
+
+RESTRICT="test"
+
+src_unpack() {
+	mkdir -p "${S}" || die "Can't mkdir ${S}"
+	cd "${S}"	|| die "Can't enter ${S}"
+	for file in ${A}; do
+		einfo "Copying ${file}"
+		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
+	done
+}
+
+src_prepare() {
+	einfo "Copying boot shell-script"
+	cp "${FILESDIR}/boot" "${S}/" || die "Can't copy boot"
+
+	for file in "README.md" "CHANGES.md"; do
+		einfo "Renaming ${MY_PNV}-${file} to ${file}"
+		mv "${S}/${MY_PNV}-${file}" "${S}/${file}" || die "Can't rename ${MY_PNV}-${file} to ${file}"
+	done
+
+	java-pkg_init_paths_
+
+	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" 	"${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
+	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" 		"${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
+	sed -i "s|@@PN@@|${PN}|g" 					"${S}/boot" || die "Can't patch PN in boot"
+
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin "${S}/boot"
+	dodoc "${S}/README.md"
+	dodoc "${S}/CHANGES.md"
+
+	java-pkg_newjar "${S}/${MY_PNV}.jar"
+}
+
+pkg_postinst() {
+	einfo "This package will still download a whole lot of its own runtime"
+	einfo "dependencies the first time you run it."
+	einfo ""
+	einfo "This currently can't be helped and is expected behaviour for a"
+	einfo "java based development toolkit"
+}
diff --git a/dev-java/boot-bin/boot-bin-2.7.1.ebuild b/dev-java/boot-bin/boot-bin-2.7.1.ebuild
new file mode 100644
index 000000000000..8809cdf42e6b
--- /dev/null
+++ b/dev-java/boot-bin/boot-bin-2.7.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_PNV="${MY_PN}-${PV}"
+GITHUB_USER="boot-clj"
+
+DESCRIPTION="Build tooling for Clojure"
+HOMEPAGE="http://boot-clj.com/"
+SRC_URI="https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar
+		 https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md
+		 https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md
+"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jdk-1.7:*"
+DEPEND=">=virtual/jdk-1.7:*"
+
+RESTRICT="test"
+
+src_unpack() {
+	mkdir -p "${S}" || die "Can't mkdir ${S}"
+	cd "${S}"	|| die "Can't enter ${S}"
+	for file in ${A}; do
+		einfo "Copying ${file}"
+		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
+	done
+}
+
+src_prepare() {
+	einfo "Copying boot shell-script"
+	cp "${FILESDIR}/boot" "${S}/" || die "Can't copy boot"
+
+	for file in "README.md" "CHANGES.md"; do
+		einfo "Renaming ${MY_PNV}-${file} to ${file}"
+		mv "${S}/${MY_PNV}-${file}" "${S}/${file}" || die "Can't rename ${MY_PNV}-${file} to ${file}"
+	done
+
+	java-pkg_init_paths_
+
+	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" 	"${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
+	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" 		"${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
+	sed -i "s|@@PN@@|${PN}|g" 					"${S}/boot" || die "Can't patch PN in boot"
+
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin "${S}/boot"
+	dodoc "${S}/README.md"
+	dodoc "${S}/CHANGES.md"
+
+	java-pkg_newjar "${S}/${MY_PNV}.jar"
+}
+
+pkg_postinst() {
+	einfo "This package will still download a whole lot of its own runtime"
+	einfo "dependencies the first time you run it."
+	einfo ""
+	einfo "This currently can't be helped and is expected behaviour for a"
+	einfo "java based development toolkit"
+}
diff --git a/dev-java/boot-bin/files/boot b/dev-java/boot-bin/files/boot
new file mode 100644
index 000000000000..acd8e404c28c
--- /dev/null
+++ b/dev-java/boot-bin/files/boot
@@ -0,0 +1,6 @@
+source @@JAVA_PKG_SHAREPATH@@/package.env
+jarpath="@@JAVA_PKG_JARDEST@@/@@PN@@.jar"
+declare -a "options=($BOOT_JVM_OPTIONS)"
+self="${BASH_SOURCE[0]}"
+exec ${BOOT_JAVA_COMMAND:-java} "${options[@]}" -Dboot.app.path="$jarpath" -jar "$jarpath" "$@"
+
diff --git a/dev-java/boot-bin/metadata.xml b/dev-java/boot-bin/metadata.xml
new file mode 100644
index 000000000000..db5ada7835a0
--- /dev/null
+++ b/dev-java/boot-bin/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kentnl@gentoo.org</email>
+		<name>Kent Fredric</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">boot-clj/boot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/browserlauncher2-1.3-r1 b/dev-java/browserlauncher2-1.3-r1
deleted file mode 100644
index f4c884cfc77d..000000000000
--- a/dev-java/browserlauncher2-1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A library that facilitates opening a browser from a Java application
-EAPI=5
-HOMEPAGE=http://browserlaunch2.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=mirror://sourceforge/browserlaunch2/BrowserLauncher2-all-1_3.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=71ebcb7a11216a2f1724ece5ddc4d7e5
diff --git a/dev-java/browserlauncher2/Manifest b/dev-java/browserlauncher2/Manifest
new file mode 100644
index 000000000000..a8ff5c9b77a1
--- /dev/null
+++ b/dev-java/browserlauncher2/Manifest
@@ -0,0 +1,3 @@
+DIST BrowserLauncher2-all-1_3.jar 186442 BLAKE2B b26509cf9a6700bd7261423b387479fde852f55735ddf6fb419e717c454b398a0a8c0c8acbd4be2e59aca6bd36837c0329f3a635482863273a1e9a389806bcdd SHA512 529195a94b757578afb3863c6b53cf16584097c659c576167fcbf86897cc484d80092c8d6e409ba1fdec69cb4f4a42b65c89c881663ae64bbc0a0a496309da5f
+EBUILD browserlauncher2-1.3-r1.ebuild 1111 BLAKE2B 343a7c5b94719bdfea674b5f3cf9916fe1bead20ed10512ffaad39a8133fd51bfc75fc693e00b6ee25ec83ddf55bd61b895a10a68e943880143ff1daa2524c50 SHA512 4cd6731a72bea53839c13cf46c472d609d5738e154898e0ff305fdf111292a5d188593750b18d87ed750cc1c57191d83d85ca8037bbc99015b4097d0904d51c0
+MISC metadata.xml 628 BLAKE2B 1cf381041505b896f78e6eff1771be500ad84af5827a59f5243b5c55883cebd53f53ddb5ec1e07c7491b2e0ac98eedd86353c50bf4a437be8302e43a5ab548d0 SHA512 0a45a31198ed3fa2b1e78a43342b9b079cf0ac421668ec360443e803272f25da44dac62f458568a030c67efc720a80eda629532dd2687c8324aebb506436a3d4
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
new file mode 100644
index 000000000000..315f0a029bed
--- /dev/null
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator eutils java-pkg-2 java-ant-2
+
+MY_PV="$(replace_all_version_separators _)"
+MY_PN="BrowserLauncher2"
+
+DESCRIPTION="A library that facilitates opening a browser from a Java application"
+HOMEPAGE="http://browserlaunch2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/browserlaunch2/${MY_PN}-all-${MY_PV}.jar"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	unpack ${A}
+	find . -name "*.class" -exec rm -v {} \; || die
+	# fixing build.xml
+	sed -i -e "s: includes=\"\*\*/\*\.class\"::g" "${S}/build.xml" || die
+}
+
+EANT_BUILD_TARGET="build"
+EANT_DOC_TARGET="api"
+
+src_install() {
+	java-pkg_newjar deployment/*.jar
+	java-pkg_dolauncher BrowserLauncherTestApp-${SLOT} \
+		--main "edu.stanford.ejalbert.testing.BrowserLauncherTestApp"
+
+	dodoc README* || die
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc source
+}
diff --git a/dev-java/browserlauncher2/metadata.xml b/dev-java/browserlauncher2/metadata.xml
new file mode 100644
index 000000000000..122c1b5ed38a
--- /dev/null
+++ b/dev-java/browserlauncher2/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		BrowserLauncher2, a continuation of the BrowserLauncher project, is a
+		library that facilitates opening a browser from a Java application and
+		directing the browser to a supplied url. In most cases the browser
+		opened will be the user's default browser.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">browserlaunch2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/bsf-2.4.0-r2 b/dev-java/bsf-2.4.0-r2
deleted file mode 100644
index 6a80f01fea81..000000000000
--- a/dev-java/bsf-2.4.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) dev-java/xalan:0 dev-java/commons-logging:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Bean Script Framework
-EAPI=5
-HOMEPAGE=http://commons.apache.org/bsf/
-IUSE=javascript python tcl elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) dev-java/xalan:0 dev-java/commons-logging:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.3
-SRC_URI=mirror://apache/jakarta/bsf/source/bsf-src-2.4.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=73108d81e9e6f2c6ed47ace2236a6a26
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
new file mode 100644
index 000000000000..bfd19426542a
--- /dev/null
+++ b/dev-java/bsf/Manifest
@@ -0,0 +1,5 @@
+AUX bsf-2.4.0-PyJavaInstance.patch 1650 BLAKE2B ceb772a69d454d1d85e05486d28d13824724813e7875f731a165aaf97bdd7f0c006baa927e849f82de7fa16228c3de5847f8d59013142f8df4823a951b42c785 SHA512 7946622658473ef4cf6b5921f58d224f7378cb00c345a748653306d2648a89b5ab3ed68786d09bbb170b95dc657f7f55501013c854536d6dfd6b38e6a1f3963e
+AUX bsf-2.4.0-build-properties.xml 1984 BLAKE2B 6db0c1ca7f899e95a0728d61b79ef6c0a1320ee747b5479c9c50a7bd258dc7fee0b6b569e3813f323cbc694d405f9af1d269dd5370ac82e6eca2bde5072d905d SHA512 d262daec432d7a22c217e24089f22e4c349be0487fd00a2e6992e77770a3699e7e2b5977e2108455d7f73c31b372d6a73febdff2856e256f93b25f3781e11679
+DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43
+EBUILD bsf-2.4.0-r2.ebuild 2713 BLAKE2B 36f4a13e7af9b0c02106346cd6927ca94d05cbbdd52e9fb396b789b5f1b1123232793ba2c821b1b8d620707c658d8002612bc1a35d3a4113242085e8cfcde736 SHA512 a639398a172fc896f123832b0ea5f5026c565a779f9848eb9361d77379cd61ac404ac2a6fb03f27dcf61a6e083e24980ba0a06679bb4f56ce437c7b993f036d6
+MISC metadata.xml 903 BLAKE2B 65b2684054dd53636f1fddfa7b83c5fc9bf9c10253f12d426a8641fbf431418c24acaf6762e02159f5a2f3e1bd3c16fe97d4b44093ff04a518a79d2645f11515 SHA512 f55f803d1d0fc7a1ce20ea5d46ee89afe46b738362a2b78adfd5f6a4e9d09360f3522de148c56a9b2fae9370df1ed003611d7b68b8ba8e2e4cd7ff5683696abf
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
new file mode 100644
index 000000000000..ba7669ffd2c1
--- /dev/null
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Bean Script Framework"
+HOMEPAGE="http://commons.apache.org/bsf/"
+SRC_URI="mirror://apache/jakarta/bsf/source/${PN}-src-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# If you add new ones, add them to ant-apache-bsf too for use dependencies
+IUSE="javascript python tcl"
+
+CDEPEND="
+	python? (
+		dev-java/jython:2.7
+	)
+	javascript? (
+		dev-java/rhino:1.6
+	)
+	tcl? (
+		dev-java/jacl:0
+	)
+	dev-java/xalan:0
+	dev-java/commons-logging:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+java_prepare() {
+	rm -v lib/*.jar || die
+	rm samples/*/*.class || die
+
+	java-ant_ignore-system-classes
+
+	# somebody forgot to add them to source tarball... fetched from svn
+	cp "${FILESDIR}/${P}-build-properties.xml" build-properties.xml || die
+
+	# Silence javadoc.
+	java-ant_xml-rewrite -f build.xml -c \
+		-e javadoc \
+		-a failonerror \
+		-v no
+
+	# http://bugs.jython.org/issue1814
+	# Also, bsf is an old project (2011) and hasn't officially taken the leap to
+	# jython-2.7. This patch fixes the issue.
+	epatch "${FILESDIR}"/${P}-PyJavaInstance.patch
+}
+
+src_compile() {
+	local pkgs="commons-logging,xalan"
+	local antflags="-Dxalan.present=true"
+
+	if use python; then
+		antflags="${antflags} -Djython.present=true"
+		pkgs="${pkgs},jython-2.7"
+	fi
+	if use javascript; then
+		antflags="${antflags} -Drhino.present=true"
+		pkgs="${pkgs},rhino-1.6"
+	fi
+	if use tcl; then
+		antflags="${antflags} -Djacl.present=true"
+		pkgs="${pkgs},jacl"
+	fi
+
+	local cp="$(java-pkg_getjars ${pkgs})"
+	eant -Dgentoo.classpath="${cp}" ${antflags} jar
+
+	# stupid clean
+	mv build/lib/${PN}.jar "${S}" || die
+	use doc && eant -Dgentoo.classpath="${cp}" ${antflags} javadocs
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	java-pkg_dolauncher ${PN} --main org.apache.bsf.Main
+
+	dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt || die
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/org
+
+	java-pkg_register-optional-dependency bsh,groovy-1,jruby
+}
+
+pkg_postinst() {
+	elog "Support for python, javascript, and tcl is controlled via USE flags."
+	elog "Also, following languages can be supported just by installing"
+	elog "respective package with USE=\"bsf\": BeanShell (dev-java/bsh),"
+	elog "Groovy (dev-java/groovy) and JRuby (dev-java/jruby)"
+}
diff --git a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch b/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
new file mode 100644
index 000000000000..bef35c168e48
--- /dev/null
+++ b/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
@@ -0,0 +1,35 @@
+--- src/org/apache/bsf/engines/jython/JythonEngine.java.orig	2015-07-04 08:00:17.120000000 +0000
++++ src/org/apache/bsf/engines/jython/JythonEngine.java	2015-07-04 08:04:55.230000000 +0000
+@@ -26,7 +26,7 @@
+ import org.apache.bsf.util.BSFFunctions;
+ import org.python.core.Py;
+ import org.python.core.PyException;
+-import org.python.core.PyJavaInstance;
++import org.python.core.PyJavaType;
+ import org.python.core.PyObject;
+ import org.python.util.InteractiveInterpreter;
+ 
+@@ -110,8 +110,9 @@
+           
+           Object result = interp.eval ("bsf_temp_fn()");
+           
+-          if (result != null && result instanceof PyJavaInstance)
+-              result = ((PyJavaInstance)result).__tojava__(Object.class);
++          if (result != null && result instanceof PyJavaType)
++              //result = ((PyJavaInstance)result).__tojava__(Object.class);
++              result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class);
+           return result;
+       } catch (PyException e) {
+           throw new BSFException (BSFException.REASON_EXECUTION_ERROR,
+@@ -126,8 +127,9 @@
+ 		      Object script) throws BSFException {
+ 	try {
+ 	  Object result = interp.eval (byteify(script.toString ()));
+-	  if (result != null && result instanceof PyJavaInstance)
+-		result = ((PyJavaInstance)result).__tojava__(Object.class);
++	  if (result != null && result instanceof PyJavaType)
++        //result = ((PyJavaInstance)result).__tojava__(Object.class);
++        result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class);
+ 	  return result;
+ 	} catch (PyException e) {
+ 	  throw new BSFException (BSFException.REASON_EXECUTION_ERROR,
diff --git a/dev-java/bsf/files/bsf-2.4.0-build-properties.xml b/dev-java/bsf/files/bsf-2.4.0-build-properties.xml
new file mode 100644
index 000000000000..6d716ed00563
--- /dev/null
+++ b/dev-java/bsf/files/bsf-2.4.0-build-properties.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="props">
+    <property name="project.name" value="bsf"/>
+    <property name="project.fullName" value="Bean Scripting Framework"/>
+    <property name="project.version" value="2.4.0"/>
+    <property name="project.debug" value="on"/>
+    <property name="project.deprecation" value="on"/>
+
+    <property name="build.file" value="build.xml"/>
+    <property name="build.properties.file" value="build-properties.xml"/>
+    <property name="build.dir" value="build"/>
+    <property name="build.dest" value="build/classes"/>
+    <property name="build.lib" value="build/lib"/>
+    <property name="build.lib.win32" value="build/lib/win32"/>
+    <property name="build.samples" value="build/samples"/>
+    <property name="build.samples.calc" value="build/samples/calc"/>
+    <property name="build.samples.scriptedui" value="build/samples/scriptedui"/>
+    <property name="build.samples.xsl" value="build/samples/xsl"/>
+    <property name="build.javadocs" value="build/javadocs"/>
+    <property name="build.tests" value="build/testcases" />
+
+    <property name="dist.dir" value="dist"/>
+    <property name="dist.dir.root" value="${dist.dir}/${project.name}-${project.version}"/>
+    <property name="dist.bin.file" value="${dist.dir}/${project.name}-bin-${project.version}"/>
+    <property name="dist.src.file" value="${dist.dir}/${project.name}-src-${project.version}"/>
+
+    <property name="packages" value="org.apache.*"/>
+
+    <property name="samples.dir" value="samples"/>
+
+    <property name="site.src" location="xdocs"/>
+    <property name="site.dest" location="docs"/>
+    <property name="site.projectFile" value="stylesheets/project.xml"/>
+
+    <property name="source.level" value="1.4" />
+
+    <property name="src.dir" value="src"/>
+
+    <property name="templ.path" location="xdocs/stylesheets"/>
+
+    <property name="tests.dir" value="test"/>
+
+    <property name="velocity.props" location="${site.src}/velocity.properties"/>
+</project>
diff --git a/dev-java/bsf/metadata.xml b/dev-java/bsf/metadata.xml
new file mode 100644
index 000000000000..688e2583cfb6
--- /dev/null
+++ b/dev-java/bsf/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+Bean Scripting Framework (BSF) is a set of Java classes which provides
+scripting language support within Java applications, and access to Java
+objects and methods from scripting languages. BSF allows one to write
+JSPs in languages other than Java while providing access to the Java
+class library. In addition, BSF permits any Java application to be
+implemented in part (or dynamically extended) by a language that is
+embedded within it. This is achieved by providing an API that permits
+calling scripting language engines from within Java, as well as an
+object registry that exposes Java objects to these scripting language
+engines.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/bsh-2.0_beta6 b/dev-java/bsh-2.0_beta6
deleted file mode 100644
index 1ad8de8bf726..000000000000
--- a/dev-java/bsh-2.0_beta6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/bsf:2.3 java-virtuals/servlet-api:3.0 test? ( dev-java/ant-junit:0 ) source? ( app-arch/zip ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A small embeddable Java source interpreter
-EAPI=5
-HOMEPAGE=https://github.com/beanshell/beanshell
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/bsf:2.3 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/beanshell/beanshell/archive/2.0b6.zip -> bsh-2.0b6.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0ca44d446252617c84efe3975dc405d8
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
new file mode 100644
index 000000000000..7761b988a4a0
--- /dev/null
+++ b/dev-java/bsh/Manifest
@@ -0,0 +1,3 @@
+DIST bsh-2.0b6.zip 1994608 BLAKE2B c06b783fed6a1b433d5c6efcf3f2343493c96895863118326f41076d56465b88b9139810c8ae38895b9c2c2da226788ef8ba7657b1ceadcac8ee8e7ed79d9c07 SHA512 ce461cc74bc48580c636c2f2e55e4e734a2b2075547cc5663722866e5c978a680051131c13240afb586a777ab93165119d1f96f9623bd9747f8e7d8293dd3bcf
+EBUILD bsh-2.0_beta6.ebuild 1313 BLAKE2B 67d40df99363970f214d50593c4d300f6e29a03c3208bebe8636ecfd4dd5394943ab8c07e5777210d4e31fa4894c8856c4fee92262f99b50bf810b6fd431c6b2 SHA512 5294ec898198726a1b5c1261bdb6d19bb23da96101882f82757a72b585c0453b26325244f2aebdc691ebb13cc09397f7b5eaa0f2f6b47d36a902ab52c2b8961a
+MISC metadata.xml 330 BLAKE2B 4295b9afc957d9b69add3267ff62910a7cb8bed9b918dec04d0f56612f452b669639462479e9627c2fd451977c4f74b2ddbf031b395e34e11a0af34a70405d8b SHA512 5c495c72dfc5d55c63b0af0740b0b82306e047817965a8c095dc6ae89324af842d5f8ccaa218107ff715544051e9c984fd1997ca11786a9c0fd070d72441b7be
diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6.ebuild
new file mode 100644
index 000000000000..2026697f5ffc
--- /dev/null
+++ b/dev-java/bsh/bsh-2.0_beta6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="beanshell"
+MY_BETA="b6"
+MY_PV="${PV%%_*}"
+MY_P="${PN}-${MY_PV}${MY_BETA}"
+
+DESCRIPTION="A small embeddable Java source interpreter"
+HOMEPAGE="https://github.com/beanshell/beanshell"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.zip -> ${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+CDEPEND="
+	dev-java/bsf:2.3
+	java-virtuals/servlet-api:3.0
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? ( dev-java/ant-junit:0 )
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}${MY_BETA}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="jarall"
+EANT_DOC_TARGET="javadoc"
+EANT_GENTOO_CLASSPATH="
+	bsf-2.3
+	servlet-api-3.0
+"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+EANT_TEST_TARGET="test"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "dist/${MY_P}.jar" "${PN}.jar"
+
+	java-pkg_dolauncher "${PN}-console" --main bsh.Console
+	java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/bsh
+}
diff --git a/dev-java/bsh/metadata.xml b/dev-java/bsh/metadata.xml
new file mode 100644
index 000000000000..203bfa39aeaf
--- /dev/null
+++ b/dev-java/bsh/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">beanshell/beanshell</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/btf-1.2 b/dev-java/btf-1.2
deleted file mode 100644
index 26fab53f21b7..000000000000
--- a/dev-java/btf-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/jsr305:0 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Generic interfaces to the classical builder pattern
-EAPI=5
-HOMEPAGE=https://github.com/fge/btf/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( LGPL-3 Apache-2.0 )
-RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/fge/btf/archive/1.2.tar.gz -> btf-1.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=53d687aa7f187cd3ddf8443b3107e327
diff --git a/dev-java/btf/Manifest b/dev-java/btf/Manifest
new file mode 100644
index 000000000000..4f5e70962321
--- /dev/null
+++ b/dev-java/btf/Manifest
@@ -0,0 +1,3 @@
+DIST btf-1.2.tar.gz 66887 BLAKE2B 62230c1af0c3c8b7d0ab294bc1e1dee523990a9b4e9aaa515d9119d4feffbf7db5fb548db9641b5709ec016dbb8e6b342509e7cb19e9e99f2b2f467c4fc8244a SHA512 ba70eea4370f090bf0295c9ac9907869a6bff62dc6ff86a443a887413f0c0fbb5c12924df6166b8ecd2348ee6bad409d954a16fe5a4a4695492f47a486e35acd
+EBUILD btf-1.2.ebuild 729 BLAKE2B a0186dca643573cd32208439004835aafd44cf5c4610d4fd11ef598685466775cc7d3a911ce79c308cab0e13b06b8b4fb6b4ced86ebca220538faf8ae083e146 SHA512 38792a5a6bd9d5852c421d4135000586d14456b475fcaafcdeeae5066f2a96d1057d2845cb234c55ab7edcfce2f577e2ad33e7b701d37d9494776e4b3dee8b09
+MISC metadata.xml 441 BLAKE2B 60b99de3da2ce08df798e93ff6dc241fb5c120477952655f0a1aec9b6a16a453df4114bc8cfd82606fcf4c832d12afcffb90dc368c2ee7b486a6e240c13cfc0a SHA512 14b2043c940657c57ca40933f9b71b14cd3856a453dfd6fbb7a0683b007107efcb1a544cc303bc758e75eba1ee733eac3fd6b88370e47baa3a5f91ac56383cf9
diff --git a/dev-java/btf/btf-1.2.ebuild b/dev-java/btf/btf-1.2.ebuild
new file mode 100644
index 000000000000..4cb97a387cb2
--- /dev/null
+++ b/dev-java/btf/btf-1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Generic interfaces to the classical builder pattern"
+HOMEPAGE="https://github.com/fge/btf/"
+SRC_URI="https://github.com/fge/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="
+	dev-java/jsr305:0
+"
+
+RDEPEND="
+	${COMMON_DEP}
+	>=virtual/jre-1.7
+"
+
+DEPEND="
+	${COMMON_DEP}
+	>=virtual/jdk-1.7
+"
+
+JAVA_GENTOO_CLASSPATH="jsr305"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/btf/metadata.xml b/dev-java/btf/metadata.xml
new file mode 100644
index 000000000000..3987330002b7
--- /dev/null
+++ b/dev-java/btf/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>Generic interfaces to the classical builder pattern and the less classical "freeze/thaw" pattern</longdescription>
+	<upstream>
+		<remote-id type="github">fge/btf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/byaccj-1.15-r1 b/dev-java/byaccj-1.15-r1
deleted file mode 100644
index 9bdff6b87250..000000000000
--- a/dev-java/byaccj-1.15-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A java extension of BSD YACC-compatible parser generator
-EAPI=4
-HOMEPAGE=http://byaccj.sourceforge.net/
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=public-domain
-SLOT=0
-SRC_URI=mirror://sourceforge/byaccj/byaccj1.15_src.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=810f14bb0bba0b982d433e60a94f677d
diff --git a/dev-java/byaccj/Manifest b/dev-java/byaccj/Manifest
new file mode 100644
index 000000000000..5102aca816db
--- /dev/null
+++ b/dev-java/byaccj/Manifest
@@ -0,0 +1,4 @@
+AUX Makefile 2003 BLAKE2B e57447ec26975954239e92509fa1491fb31235a150d56db7fdefbd4fb61bd53e13df5d0b6157843c094ff8b691de00515e92fdf4c95c9ea6e71fc122c4d27efb SHA512 d48f81fcf89ca5f6524572b75dcde4866cea5f434059233c234a664f56e80c0daadc8f314711cb9c55430a947cc9dbf48f4a0bead0433da5b333f5fd73fcbc68
+DIST byaccj1.15_src.tar.gz 53646 BLAKE2B a57cdb85253f2ea8485c05687222cf99912494841cdfb6deb13d80d49f87a3dd8f1eb3350bf2501c7c86b70a198415e339019930301bd8d2a770e10ca9bb850f SHA512 6423ecca70d21dd0c1dd8366361f6c4420536e099090b18738013fbb6e8e0710ee739e51dfd7f603a64f8761f48cdd1d8dc7844d1b5ec6b792535254d290addc
+EBUILD byaccj-1.15-r1.ebuild 691 BLAKE2B 4264f45b95fa79e347af7f4f731906398f630e7c186352df1f1de708b84b8d96de7fd022132c08fc015dc7a5a8b648f1b654a1fadc6dd0679ff4b63987f490a7 SHA512 e24b9878b8551f984060bb3b4b449f7d9cf8c7d876c9a1fbfa9efc46bb2f1a3a1eda104706b8e07bd52623019e0c348453a4ac33d66b17fe409f2602b8113551
+MISC metadata.xml 312 BLAKE2B 1148e4e9d86c4155c8413261aa2bd091a462baac98b22bbe6e7d609088c5dbe3fc3d0f8d4d537f2052c87571c29a95ffeeeebabbbaa6a623559bc5ba463c6171 SHA512 3ce25507ed5012c2f4c4961a9a9b739b04762e0a34bef6db4202240a65e6c1212a459ab35fa1c680dea52928c88f88301e36abc780228fb4b3591a37b3cff749
diff --git a/dev-java/byaccj/byaccj-1.15-r1.ebuild b/dev-java/byaccj/byaccj-1.15-r1.ebuild
new file mode 100644
index 000000000000..ecb1c7ade4cb
--- /dev/null
+++ b/dev-java/byaccj/byaccj-1.15-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A java extension of BSD YACC-compatible parser generator"
+HOMEPAGE="http://byaccj.sourceforge.net/"
+MY_P="${PN}${PV}_src"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+S="${WORKDIR}/${PN}${PV}"
+
+src_compile() {
+	cp "${FILESDIR}/Makefile" src/Makefile || die
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" -C src linux
+}
+
+src_install() {
+	newbin src/yacc.linux "${PN}"
+	dodoc docs/ACKNOWLEDGEMEN
+}
diff --git a/dev-java/byaccj/files/Makefile b/dev-java/byaccj/files/Makefile
new file mode 100644
index 000000000000..c46772a1de1b
--- /dev/null
+++ b/dev-java/byaccj/files/Makefile
@@ -0,0 +1,99 @@
+#################################################
+## Makefile for Byacc/Java
+## Date: 06 Aug 00
+## Author: Bob Jamison
+#################################################
+
+CC      = gcc
+CFLAGS  = -O
+LDFLAGS = -static
+TAR     = tar
+GZIP    = gzip
+VERS    = byaccj1.15
+JAVA    = /usr/java
+ZIP     = zip
+
+INC     = -I.
+
+OBJ 	= closure.o \
+	error.o \
+	lalr.o \
+	lr0.o \
+	main.o \
+	mkpar.o \
+	output.o \
+	reader.o \
+	skeleton.o \
+	symtab.o \
+	verbose.o \
+	warshall.o
+
+irix: yacc
+	mv yacc yacc.irix
+linux: yacc
+	mv yacc yacc.linux
+solaris: yacc
+	mv yacc yacc.solaris
+
+all: yacc
+
+dist:
+	( \
+	cd .. ; \
+	/bin/rm -rf $(VERS) ; \
+	/bin/mkdir -p $(VERS) ; \
+	/bin/mkdir -p dist ; \
+        /bin/cp -r docs $(VERS) ; \
+	/bin/mkdir -p $(VERS)/src ; \
+        /bin/cp src/*.c $(VERS)/src ; \
+        /bin/cp src/*.h $(VERS)/src ; \
+        /bin/cp src/Makefile $(VERS)/src ; \
+        /bin/cp src/Makefile.bcc $(VERS)/src ; \
+        /bin/cp -f src/yacc.irix $(VERS) ; \
+        /bin/cp -f src/yacc.solaris $(VERS) ; \
+        /bin/cp -f src/yacc.linux $(VERS) ; \
+        /bin/cp -f src/yacc.exe $(VERS) ; \
+        /bin/cp src/README $(VERS) ; \
+	$(TAR) -cvf - $(VERS) | $(GZIP) > dist/$(VERS).tar.gz ;\
+	$(ZIP) dist/$(VERS).zip $(VERS) \
+	)
+
+SRCS   = closure.c \
+	error.c \
+	lalr.c \
+	lr0.c \
+	main.c \
+	mkpar.c \
+	output.c \
+	reader.c \
+	skeleton.c \
+	symtab.c \
+	verbose.c \
+	warshall.c
+
+%.o : %.c
+	$(CC) -c $(CFLAGS) $(INC) $< -o $@
+
+yacc: $(OBJ)
+	$(CC) $(LDFLAGS) -o yacc $(OBJ)
+	@echo "done"
+
+clean:
+	/bin/rm -rf *.o  *.obj yacc y.tab.c *.java *.class
+	/bin/rm -rf yacc.linux yacc.irix yacc.solaris yacc.exe
+	(cd .. ; /bin/rm -rf $(VERS) ; /bin/rm -rf dist )
+
+### Dependencies
+closure.o:  closure.c defs.h
+error.o:    error.c defs.h
+lalr.o:     lalr.c defs.h
+lr0.o:      lr0.c defs.h
+main.o:     main.c defs.h
+mkpar.o:    mkpar.c defs.h
+output.o:   output.c defs.h
+reader.o:   reader.c defs.h
+skeleton.o: skeleton.c defs.h
+symtab.o:   symtab.c defs.h
+verbose.o:  verbose.c defs.h
+warshall.o: warshall.c defs.h
+
diff --git a/dev-java/byaccj/metadata.xml b/dev-java/byaccj/metadata.xml
new file mode 100644
index 000000000000..11872579d69e
--- /dev/null
+++ b/dev-java/byaccj/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">byaccj</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/bytelist-1.0.10 b/dev-java/bytelist-1.0.10
deleted file mode 100644
index d56119753ff3..000000000000
--- a/dev-java/bytelist-1.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jcodings:0 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JRuby support library
-EAPI=5
-HOMEPAGE=https://github.com/codehaus
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
-RDEPEND=dev-java/jcodings:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jruby/bytelist/tarball/1.0.10 -> bytelist-1.0.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=991dd9adffefccdb5541600bf84b849f
diff --git a/dev-java/bytelist/Manifest b/dev-java/bytelist/Manifest
new file mode 100644
index 000000000000..88b8cb054d67
--- /dev/null
+++ b/dev-java/bytelist/Manifest
@@ -0,0 +1,4 @@
+AUX maven-build.xml 8736 BLAKE2B 6c80c5869c375da19bd15b37f8fc00a7b94d5dcb14396b3c7d42a4cbc1c6e81c3720fcfac38089ae29e492beb5aaa760d82d94d81a83149d0b8cb5e241f06ecc SHA512 1238cb1b7c53c4138f05feaa4bde6bb275d3553039940122d29df7b696945c7b021fe856b28e41c6c0fe4072b0e71280af1ba9b7f07ee8ac9941a049a44a3e86
+DIST bytelist-1.0.10.tar.gz 15619 BLAKE2B d715949e9d78201c2fbc97a6c055630b83db4989108f7fb5f68d09cc461b4bf8f30f7ffb0ad66166aa13f23a50a832e12d721ffa2a72206348db0f4070fad941 SHA512 fb522a43d5cac8a4804f64caa38fb9ab793a0f0688a69987f3be6f2245a4a2c9739a0d807f88be947c0bd7f908c069a2f8092cc4d5314c3fddb6541d9db70f7c
+EBUILD bytelist-1.0.10.ebuild 988 BLAKE2B 1fd8bafad0f950e3f53c39be7b12889304725c05350548e17ad1870f825e391d62cb4dfaa86b01706bc886031661074dcbe6808fc02f1056421c9a9e8847c834 SHA512 a3c74bbc0603a0fac3c821ae07ca5b75233914e5da67f3a0a4013e2d5a49bd6501e79b03e5325dd2e4214f82e737171668a35cd9525c5ea0811c7c79de9ba59e
+MISC metadata.xml 303 BLAKE2B eb9bfc2199bfcb29a93a127137edd0d330f868824bccf1c74830515f1f3c4f5d008d9ab6a7e5c4f9f87fed1ef7e954b7955d6c70e1e840b400428920080be362 SHA512 94ee8b7bd5d0b719b1f2afd8b3f61812bb73cd764b482bcaa73a3d60ee8080b44486697fd58dc601f23502893a0995e1a46dfb262e7c9793531765eceeb1051f
diff --git a/dev-java/bytelist/bytelist-1.0.10.ebuild b/dev-java/bytelist/bytelist-1.0.10.ebuild
new file mode 100644
index 000000000000..eb1aa2d3d034
--- /dev/null
+++ b/dev-java/bytelist/bytelist-1.0.10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JRuby support library"
+HOMEPAGE="https://github.com/codehaus"
+SRC_URI="https://github.com/jruby/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEP="dev-java/jcodings:0"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? ( dev-java/ant-junit:0 )"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}"/jruby-${PN}-* "${WORKDIR}"/${P} || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="jcodings"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/bytelist/files/maven-build.xml b/dev-java/bytelist/files/maven-build.xml
new file mode 100644
index 000000000000..ee880775a409
--- /dev/null
+++ b/dev-java/bytelist/files/maven-build.xml
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="bytelist-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="bytelist"/>
+  <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"/>
+  <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="test"/>
+  <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">
+  </path>
+  <path id="build.test.classpath">
+  </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>
+  </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>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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" 
+         manifest="MANIFEST.MF" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </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">
+  </target>
+
+</project>
diff --git a/dev-java/bytelist/metadata.xml b/dev-java/bytelist/metadata.xml
new file mode 100644
index 000000000000..96cb48b87e21
--- /dev/null
+++ b/dev-java/bytelist/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jruby/bytelist</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/c3p0-0.9.5.1 b/dev-java/c3p0-0.9.5.1
deleted file mode 100644
index 2e47bc2442ce..000000000000
--- a/dev-java/c3p0-0.9.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/log4j:0 dev-java/mchange-commons:0 test? ( dev-java/junit:4 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JDBC drivers with JNDI-bindable DataSources
-EAPI=5
-HOMEPAGE=http://c3p0.sourceforge.net/
-IUSE=elibc_FreeBSD doc source examples test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2
-RDEPEND=dev-java/log4j:0 dev-java/mchange-commons:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/c3p0/c3p0-0.9.5.1.src.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d276529f7b28c5884a9d546627c9e318
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
new file mode 100644
index 000000000000..16e47112a13c
--- /dev/null
+++ b/dev-java/c3p0/Manifest
@@ -0,0 +1,3 @@
+DIST c3p0-0.9.5.1.src.tgz 839657 BLAKE2B b8cf89ecb5b3766852355cdeb234698b0d1d8327233152e2e51ddcfe4a6e3be5f0fe4cc12a70d0df90d8ead90b3506b405f267f83bbb4a2a0ea1ac9d86051c64 SHA512 1843696d48e68f6120a68c42f0eb60c342ed8d1ddcc1d78c500d85c3d7e5e48358d100ecb1e0efa192aba34c5d9221437d53c2a968a42b797ff84bc12db4a724
+EBUILD c3p0-0.9.5.1.ebuild 1152 BLAKE2B fe58ab3e84f29b2f53a49064df6ef04f2397870cdc7063c183b4a06d36d05aad82defdd24bf7d7f8c37ead28295e6250f080eff813917a09ac269f3286897d03 SHA512 749db00f3a6a3bf365f9a8d09ef453a6b972dc18dbe2b7710b313c4bc6c9d56fac95268f6bca40799efcee01693946a691f2d9165bc2d7df07ac7b133877d896
+MISC metadata.xml 310 BLAKE2B 75764bb0c3ddf44fc236047688d00826ba32fd0df3eca79db98cf0c3379dcb2e2a779607d7bd1b318759b77a86b5075747a0d5882998de9cb8e829cb7cec761b SHA512 5b2e9c58158f6f2c1d912ff5f9dc6b25906b32aad32608927d03f61fd90b935d7988bf54fe32d5c86dd5410ada1f5de8abd9ac0d15e277aa7345149edc83283b
diff --git a/dev-java/c3p0/c3p0-0.9.5.1.ebuild b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
new file mode 100644
index 000000000000..70cde9d852e1
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source examples test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
+HOMEPAGE="http://c3p0.sourceforge.net/"
+
+MY_P="${P}.src"
+
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+CDEPEND="
+	dev-java/log4j:0
+	dev-java/mchange-commons:0"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/junit:4
+	)
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+java_prepare() {
+	java-pkg_clean
+	java-pkg_jar-from --into lib/ mchange-commons
+	java-pkg_jar-from --into lib/ log4j
+
+}
+
+EANT_TEST_TARGET="junit-tests"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "build/${P}.jar"
+	dodoc README-SRC
+	use doc && java-pkg_dojavadoc build/apidocs
+	use source && java-pkg_dosrc src/java/com/mchange/v2
+	use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
+}
diff --git a/dev-java/c3p0/metadata.xml b/dev-java/c3p0/metadata.xml
new file mode 100644
index 000000000000..d6e27668bb3f
--- /dev/null
+++ b/dev-java/c3p0/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">c3p0</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/cal10n-0.8.1 b/dev-java/cal10n-0.8.1
deleted file mode 100644
index 0d3f5868ac6a..000000000000
--- a/dev-java/cal10n-0.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=java library for writing localized messages using resource bundle
-EAPI=5
-HOMEPAGE=http://cal10n.qos.ch/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://repo1.maven.org/maven2/ch/qos/cal10n/cal10n-api/0.8.1/cal10n-api-0.8.1-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=49a6d4f72816926d1248e47d4e6762eb
diff --git a/dev-java/cal10n/Manifest b/dev-java/cal10n/Manifest
new file mode 100644
index 000000000000..c188b160941b
--- /dev/null
+++ b/dev-java/cal10n/Manifest
@@ -0,0 +1,3 @@
+DIST cal10n-api-0.8.1-sources.jar 35685 BLAKE2B 949bfb049d51ee4789200a9e9f6141551a648b2be70abfe56fdb0e7ef7bdce432d482cb2a79ea1a9aad0d7738500e1d217954d9e3ee60ceba0262dceffc46a16 SHA512 b6bb8ee7744fb878da1968a6524fa2b95d55c55e0f5e7413e7afd854eae226050cd4209e7489ce4f1fae6f2adb501781048f75ddcb2ad8c6b69595ff053422a7
+EBUILD cal10n-0.8.1.ebuild 629 BLAKE2B faef9f8b9884365653d22f9c93d8fe055e18f9404f482f491a4b08da3cbad3a79a7474a71628c87d9846ef6eca22e25e25ecd5e108d91b2bdcd3ab98d9a8696e SHA512 4f3d130b0e5d45d7556508219f32f285a1b0f18b1f2f2faa638f37ba9f16b86786caa57a330863de164fa86c4932b75b0c9d903837e8160ff88ef8a4660427a8
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/cal10n/cal10n-0.8.1.ebuild b/dev-java/cal10n/cal10n-0.8.1.ebuild
new file mode 100644
index 000000000000..83bba579bad0
--- /dev/null
+++ b/dev-java/cal10n/cal10n-0.8.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="java library for writing localized messages using resource bundle"
+HOMEPAGE="http://cal10n.qos.ch/"
+SRC_URI="http://repo1.maven.org/maven2/ch/qos/${PN}/${PN}-api/${PV}/${PN}-api-${PV}-sources.jar"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	mkdir -p "${S}"/target/classes || die
+	mv "${S}"/META-INF "${S}"/target/classes || die
+}
diff --git a/dev-java/cal10n/metadata.xml b/dev-java/cal10n/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/cal10n/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/cdegroot-db-0.08-r2 b/dev-java/cdegroot-db-0.08-r2
deleted file mode 100644
index db95775c039f..000000000000
--- a/dev-java/cdegroot-db-0.08-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=OO database written in Java
-EAPI=6
-HOMEPAGE=http://www.cdegroot.com/software/db/
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=http://www.cdegroot.com/software/db/download/com.cdegroot.db-0.08.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=03c3ca44829823043a59540691fd7e2b
diff --git a/dev-java/cdegroot-db/Manifest b/dev-java/cdegroot-db/Manifest
new file mode 100644
index 000000000000..6a39c5f94420
--- /dev/null
+++ b/dev-java/cdegroot-db/Manifest
@@ -0,0 +1,5 @@
+AUX build.xml 1612 BLAKE2B 2480ba7774db6f2e20b70b3cfd2ffd3a690c86a7d1d12c521faabe942900e4770a6fddae86de4193299b7f738cb71634bde0cc15e356c5b186892b8b8d6fdae0 SHA512 b7d08ecfbecd1615d9a73ba1ab95b10d07ebddda0d4d273dadba770b662957006d84f8057d86f59dd1506cab0fa9f0fc79df7577b7ba1620fbf0d2d6d446de32
+AUX cdegroot-db-0.08-gentoo.patch 7914 BLAKE2B 6139fd7ffcf65bc04ebe03f35919ba28debf86b732dcbfcc8b37192c424ae7cc1f8863556f111c23bd1327cba94e1ffd7d79787ff850b0b99a4933badf9d8ca8 SHA512 f24f13acb265f75408e6cae2a432cbcebbcad912f77ce2883159dc93743ad85c636e5656f21478914712fe393c84a6fe11600c9394b81ce128403c8f59e521cf
+DIST com.cdegroot.db-0.08.tar.gz 154705 BLAKE2B a267d402d1741f701e0fc1a99fa765c0f86a9b13ccca20f4a592661472a31e85a4da49d6fb8be07ef1800cbd0fbb123366def29e30667448484ba419a0938684 SHA512 c8a6a6a46add440499dce42f27876cadfb9d247f4e7f8852e94cc20ca9afacb400f91f884760bf3659bad46979ddd5a65f6dda4bd5416da14d89a93ff5b447d1
+EBUILD cdegroot-db-0.08-r2.ebuild 853 BLAKE2B 9d2a183d4b75eed0599f16ba2a312a83710ef0ec50384b5a9c33f251ac950ca4b2a15787e8bae4736d42336eacb63fb5ff70054d73a77a5b2afab5a1e28c7915 SHA512 84a8476d33ac372b2b921e932373fb4cddf7532b5ade3b486a8cc94385ff8d4862f37562a2c9240d362442e08b0948ce165cbfe84b388be5a33bc4b76bd33421
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
new file mode 100644
index 000000000000..4149fbc8454c
--- /dev/null
+++ b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="OO database written in Java"
+HOMEPAGE="http://www.cdegroot.com/software/db/"
+SRC_URI="http://www.cdegroot.com/software/db/download/com.${P/-/.}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/com.${P/-/.}"
+
+PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
+src_prepare() {
+	default
+	rm -rv src/db/test lib/*.jar || die
+	cp -v "${FILESDIR}/build.xml" "${S}/build.xml" || die
+}
+
+EANT_DOC_TARGET="docs"
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+	dodoc TODO VERSION CHANGES BUGS README
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/cdegroot-db/files/build.xml b/dev-java/cdegroot-db/files/build.xml
new file mode 100644
index 000000000000..282ebdfc70e5
--- /dev/null
+++ b/dev-java/cdegroot-db/files/build.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<project name="cdegroot-db" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="src/db" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="docs" />
+	<property name="dist.dir" value="dist" />
+	<property name="lib.dir" value="lib" />
+	<property name="jarfile" value="${dist.dir}/${ant.project.name}.jar" />
+	<property name="target.jdk" value="1.3" />
+
+	<!-- init -->
+	<target name="init">
+		<mkdir dir="${dist.dir}" />
+		<mkdir dir="${build.dir}" />
+		<mkdir dir="${docs.dir}" />
+	</target>	
+
+	<!-- compile everything -->
+	<target name="compile" depends="init">
+		<mkdir dir="${build.dir}" />
+		<javac srcdir="${src.dir}" 
+			destdir="${build.dir}"
+			source="${target.jdk}"
+			target="${target.jdk}"/>
+	</target>
+
+	<!-- build the jar file -->
+	<target name="jar" depends="compile">
+		<jar jarfile="${jarfile}" basedir="${build.dir}" />
+	</target>
+	
+	<!-- generate javadocs -->
+	<target name="docs" depends="init">
+		<javadoc sourcepath="${src.dir}"
+			packagenames="com.*"
+           		destdir="${docs.dir}"
+           		author="true"
+           		version="true"
+           		use="true"
+           		windowtitle="${ant.project.name} API" />
+	</target>
+	
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}" />
+		<delete dir="${docs.dir}" />
+		<delete dir="${dist.dir}" />
+	</target>
+
+        <!-- zip the sources -->
+        <target name="sourcezip">
+		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
+                        <zipfileset dir="${src.dir}" />
+                </zip>
+        </target>
+
+</project>
diff --git a/dev-java/cdegroot-db/files/cdegroot-db-0.08-gentoo.patch b/dev-java/cdegroot-db/files/cdegroot-db-0.08-gentoo.patch
new file mode 100644
index 000000000000..f99584fdff1d
--- /dev/null
+++ b/dev-java/cdegroot-db/files/cdegroot-db-0.08-gentoo.patch
@@ -0,0 +1,205 @@
+diff -urpN src.orig/db/com/cdegroot/db/hash/EntryPage.java src/db/com/cdegroot/db/hash/EntryPage.java
+--- a/src/db/com/cdegroot/db/hash/EntryPage.java	2005-02-06 00:40:17.191151504 +0100
++++ b/src/db/com/cdegroot/db/hash/EntryPage.java	2005-02-06 00:54:14.045930240 +0100
+@@ -25,7 +25,7 @@ final class EntryPage extends PageHeader
+     /**
+      *  Constructs a page view from the indicated block.
+      */
+-    EntryPage(BlockIo block) {
++    public EntryPage(BlockIo block) {
+ 	super(block);
+     }
+ 
+@@ -33,7 +33,7 @@ final class EntryPage extends PageHeader
+      *  Factory method to create or return a data page for the
+      *  indicated block.
+      */
+-    static EntryPage getEntryPageView(BlockIo block) {
++    public static EntryPage getEntryPageView(BlockIo block) {
+ 	BlockView view = block.getView();
+ 	if (view != null && view instanceof EntryPage)
+ 	    return (EntryPage) view;
+diff -urpN src.orig/db/com/cdegroot/db/recman/BlockIo.java src/db/com/cdegroot/db/recman/BlockIo.java
+--- a/src/db/com/cdegroot/db/recman/BlockIo.java	2005-02-06 00:40:17.192151352 +0100
++++ b/src/db/com/cdegroot/db/recman/BlockIo.java	2005-02-06 00:58:02.990125432 +0100
+@@ -31,7 +31,7 @@ package com.cdegroot.db.recman;
+  *  @see java.io.DataInput
+  *  @see java.io.DataOutput
+  */
+-final class BlockIo implements java.io.Serializable {
++final public class BlockIo implements java.io.Serializable {
+     private long blockId;
+     private final byte[] snapshot; // committed snapshot.
+     private boolean snapshotValid = false;
+@@ -44,7 +44,7 @@ final class BlockIo implements java.io.S
+      *  Constructs a new BlockIo instance working on the indicated
+      *  buffer.
+      */
+-    BlockIo(long blockId, byte[] data) {
++    public BlockIo(long blockId, byte[] data) {
+ 	// removeme for production version
+ 	if (blockId > 10000000000L)
+ 	    throw new Error("bogus block id " + blockId);
+@@ -108,7 +108,7 @@ final class BlockIo implements java.io.S
+     /**
+      *  Returns the current view of the block.
+      */
+-    BlockView getView() {
++    public BlockView getView() {
+ 	return view;
+     }
+ 
+@@ -172,17 +172,25 @@ final class BlockIo implements java.io.S
+     /**
+      *  Reads a short from the indicated position
+      */
+-    short readShort(int pos) {
++    public short readShort(int pos) {
+ 	return (short)
+ 	    (((short) (data[pos+0] & 0xff) << 8) | 
+ 	     ((short) (data[pos+1] & 0xff) << 0));
+ 	
+     }
++   
++    public byte readByte(int pos) {
++	return data[pos];
++    }
++
++    public void writeByte(int pos, byte value)
++    {	data[pos] = value;
++    }
+     
+     /**
+      *  Writes a short to the indicated position
+      */
+-    void writeShort(int pos, short value) {
++    public void writeShort(int pos, short value) {
+ 	data[pos+0] = (byte)(0xff & (value >> 8));
+ 	data[pos+1] = (byte)(0xff & (value >> 0));
+ 	setDirty();
+@@ -191,7 +199,7 @@ final class BlockIo implements java.io.S
+     /**
+      *  Reads an int from the indicated position
+      */
+-    int readInt(int pos) {
++    public int readInt(int pos) {
+ 	return
+ 	    (((int)(data[pos+0] & 0xff) << 24) |
+ 	     ((int)(data[pos+1] & 0xff) << 16) |
+@@ -202,7 +210,7 @@ final class BlockIo implements java.io.S
+     /**
+      *  Writes an int to the indicated position
+      */
+-    void writeInt(int pos, int value) {
++    public void writeInt(int pos, int value) {
+ 	data[pos+0] = (byte)(0xff & (value >> 24));
+ 	data[pos+1] = (byte)(0xff & (value >> 16));
+ 	data[pos+2] = (byte)(0xff & (value >>  8));
+@@ -213,7 +221,7 @@ final class BlockIo implements java.io.S
+     /**
+      *  Reads a long from the indicated position
+      */
+-    long readLong(int pos) {
++    public long readLong(int pos) {
+ 	return
+ 	    (((long)(data[pos+0] & 0xff) << 56) |
+ 	     ((long)(data[pos+1] & 0xff) << 48) |
+@@ -228,7 +236,7 @@ final class BlockIo implements java.io.S
+     /**
+      *  Writes a long to the indicated position
+      */
+-    void writeLong(int pos, long value) {
++    public void writeLong(int pos, long value) {
+ 	data[pos+0] = (byte)(0xff & (value >> 56));
+ 	data[pos+1] = (byte)(0xff & (value >> 48));
+ 	data[pos+2] = (byte)(0xff & (value >> 40));
+diff -urpN src.orig/db/com/cdegroot/db/recman/BlockView.java src/db/com/cdegroot/db/recman/BlockView.java
+--- a/src/db/com/cdegroot/db/recman/BlockView.java	2005-02-06 00:40:17.193151200 +0100
++++ b/src/db/com/cdegroot/db/recman/BlockView.java	2005-02-06 00:47:57.632153832 +0100
+@@ -28,5 +28,5 @@ package com.cdegroot.db.recman;
+  *
+  *  @see BlockIo.setView()
+  */
+-interface BlockView {
++public interface BlockView {
+ }
+diff -urpN src.orig/db/com/cdegroot/db/recman/Magic.java src/db/com/cdegroot/db/recman/Magic.java
+--- a/src/db/com/cdegroot/db/recman/Magic.java	2005-02-06 00:40:17.193151200 +0100
++++ b/src/db/com/cdegroot/db/recman/Magic.java	2005-02-06 00:44:22.164909832 +0100
+@@ -25,7 +25,7 @@ package com.cdegroot.db.recman;
+ /**
+  *  This interface contains magic cookies.
+  */
+-interface Magic {
++public interface Magic {
+     /** Magic cookie at start of file */
+     short FILE_HEADER = 0x1350;
+   
+@@ -57,4 +57,6 @@ interface Magic {
+     int SZ_INT = 4;
+     /** Size of an externalized long */
+     int SZ_LONG = 8;
++    /** Size of byte */
++    int SZ_BYTE = 1;
+ }
+diff -urpN src.orig/db/com/cdegroot/db/recman/PageHeader.java src/db/com/cdegroot/db/recman/PageHeader.java
+--- a/src/db/com/cdegroot/db/recman/PageHeader.java	2005-02-06 00:40:17.193151200 +0100
++++ b/src/db/com/cdegroot/db/recman/PageHeader.java	2005-02-06 00:50:10.236994832 +0100
+@@ -28,15 +28,15 @@ import java.io.*;
+  *  This class represents a page header. It is the common superclass for
+  *  all different page views.
+  */
+-class PageHeader implements BlockView {
++public class PageHeader implements BlockView {
+     // offsets
+     private static final short O_MAGIC = 0; // short magic
+     private static final short O_NEXT = Magic.SZ_SHORT;  // long next
+     private static final short O_PREV = O_NEXT + Magic.SZ_LONG; // long prev
+-    static final int SIZE = O_PREV + Magic.SZ_LONG;
++    public static final int SIZE = O_PREV + Magic.SZ_LONG;
+     
+     // my block
+-    BlockIo block;
++    public BlockIo block;
+     
+     /**
+      *  Constructs a PageHeader object from a block
+@@ -45,7 +45,7 @@ class PageHeader implements BlockView {
+      *  @throws IOException if the block is too short to keep the file
+      *          header.
+      */
+-    PageHeader(BlockIo block) {
++    public PageHeader(BlockIo block) {
+ 	initialize(block);
+ 	if (!magicOk()) 
+ 	    throw new Error("CRITICAL: page header magic for block " 
+@@ -66,7 +66,7 @@ class PageHeader implements BlockView {
+      *  Factory method to create or return a page header for the
+      *  indicated block.
+      */
+-    static PageHeader getView(BlockIo block) {
++    public static PageHeader getView(BlockIo block) {
+ 	BlockView view = block.getView();
+ 	if (view != null && view instanceof PageHeader)
+ 	    return (PageHeader) view;
+diff -urpN src.orig/db/com/cdegroot/db/recman/RecordFile.java src/db/com/cdegroot/db/recman/RecordFile.java
+--- a/src/db/com/cdegroot/db/recman/RecordFile.java	2005-02-06 00:40:17.193151200 +0100
++++ b/src/db/com/cdegroot/db/recman/RecordFile.java	2005-02-06 00:45:38.616287456 +0100
+@@ -33,7 +33,7 @@ import java.util.*;
+  *  The set of dirty records on the in-use list constitutes a transaction. 
+  *  Later on, we will send these records to some recovery thingy.
+  */
+-final class RecordFile {
++final public class RecordFile {
+     private final TransactionManager txnMgr;
+ 
+     // Todo: reorganize in hashes and fifos as necessary.
+@@ -48,7 +48,7 @@ final class RecordFile {
+     private boolean transactionsDisabled = false;
+ 
+     /** The length of a single block. */
+-    final static int BLOCK_SIZE = 8192;//4096;
++    final public static int BLOCK_SIZE = 8192;//4096;
+ 
+     /** The extension of a record file */
+     final static String extension = ".db";
diff --git a/dev-java/cdegroot-db/metadata.xml b/dev-java/cdegroot-db/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/cdegroot-db/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/cdi-api-1.2 b/dev-java/cdi-api-1.2
deleted file mode 100644
index 3b8faa56a586..000000000000
--- a/dev-java/cdi-api-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/javax-inject:0 dev-java/glassfish-interceptor-api:0 dev-java/tomcat-servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Contexts and Dependency Injection for the Java EE platform
-EAPI=5
-HOMEPAGE=http://www.cdi-spec.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/javax-inject:0 dev-java/glassfish-interceptor-api:0 dev-java/tomcat-servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=https://repo1.maven.org/maven2/javax/enterprise/cdi-api/1.2/cdi-api-1.2-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c8b290a8f7447ddb716ee18f507db8d6
diff --git a/dev-java/cdi-api-1.2-r1 b/dev-java/cdi-api-1.2-r1
deleted file mode 100644
index 118d21cb8113..000000000000
--- a/dev-java/cdi-api-1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/javax-inject:0 dev-java/tomcat-servlet-api:3.0 dev-java/glassfish-interceptor-api:0 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Contexts and Dependency Injection for the Java EE platform
-EAPI=5
-HOMEPAGE=http://www.cdi-spec.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/javax-inject:0 dev-java/tomcat-servlet-api:3.0 dev-java/glassfish-interceptor-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/javax/enterprise/cdi-api/1.2/cdi-api-1.2-sources.jar -> cdi-api-1.2.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b7c06136f27076faabda0672a52b5dcf
diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest
new file mode 100644
index 000000000000..e9d4ddb9a1c6
--- /dev/null
+++ b/dev-java/cdi-api/Manifest
@@ -0,0 +1,5 @@
+DIST cdi-api-1.2-sources.jar 139331 BLAKE2B 40b1982610fbf4e4785410552055ef0e0b80aca3fb8bc1bcf25a31e2456b5ba5cc1ca28ab29ca8c33859c4400785a429074b2c8e3a40cb4fc8c90ae79473d95c SHA512 b24a16cc208cd865f561ecdc7590ddcdb08c2e83f8fea75eefa0e52598461cc98c804dfeeacb360278ddfbf5508e72f381b1379e19efe91f3c89b0e255b3cb9a
+DIST cdi-api-1.2.jar 139331 BLAKE2B 40b1982610fbf4e4785410552055ef0e0b80aca3fb8bc1bcf25a31e2456b5ba5cc1ca28ab29ca8c33859c4400785a429074b2c8e3a40cb4fc8c90ae79473d95c SHA512 b24a16cc208cd865f561ecdc7590ddcdb08c2e83f8fea75eefa0e52598461cc98c804dfeeacb360278ddfbf5508e72f381b1379e19efe91f3c89b0e255b3cb9a
+EBUILD cdi-api-1.2-r1.ebuild 862 BLAKE2B 72cda82a641fd6738ba2fd8253ac8d307577d7139156b63e18f13594f89c72a15e61b900dbd04ae4898219076927f05a5b25bdf11454e03f1f78c2fff5cd49dc SHA512 a4223293c3954f729c185e0cae6ef14509ed238581be7d03427180b9d8704a4994f6d8791dbcc80deb5682e8aeacd377c960a6c3ddaa531ce5e44d0fc3f42a97
+EBUILD cdi-api-1.2.ebuild 802 BLAKE2B cf61b68a82060facbb3eb356d2770f53d1ab3a906b1b26562fbc37fcfa7c741fb6aa2aade938f13696a25882fa3c782e76c850dc9940b0098217baacdc8d9654 SHA512 ea815946719e272503410f07ae71621785e95982eabce700d4ee0812122ef57b7983fdf1537cad851a8c6050360ff39c352253c4203438642f3235600c3f092a
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/cdi-api/cdi-api-1.2-r1.ebuild b/dev-java/cdi-api/cdi-api-1.2-r1.ebuild
new file mode 100644
index 000000000000..bdf05ea4ffb4
--- /dev/null
+++ b/dev-java/cdi-api/cdi-api-1.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Contexts and Dependency Injection for the Java EE platform"
+HOMEPAGE="http://www.cdi-spec.org/"
+SRC_URI="https://repo1.maven.org/maven2/javax/enterprise/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/javax-inject:0
+	dev-java/tomcat-servlet-api:3.0
+	dev-java/glassfish-interceptor-api:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="javax-inject,tomcat-servlet-api-3.0,glassfish-interceptor-api"
+
+JAVA_SRC_DIR="javax"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" . -name "*.xsd"
+}
diff --git a/dev-java/cdi-api/cdi-api-1.2.ebuild b/dev-java/cdi-api/cdi-api-1.2.ebuild
new file mode 100644
index 000000000000..9396af5ff0b5
--- /dev/null
+++ b/dev-java/cdi-api/cdi-api-1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Contexts and Dependency Injection for the Java EE platform"
+HOMEPAGE="http://www.cdi-spec.org/"
+SRC_URI="https://repo1.maven.org/maven2/javax/enterprise/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="1.2"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+CDEPEND="dev-java/javax-inject:0
+	dev-java/glassfish-interceptor-api:0
+	dev-java/tomcat-servlet-api:3.0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="javax-inject,tomcat-servlet-api-3.0,glassfish-interceptor-api"
+
+java_prepare() {
+	mkdir src || die
+	mv * src
+}
diff --git a/dev-java/cdi-api/metadata.xml b/dev-java/cdi-api/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/cdi-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/cglib-3.1 b/dev-java/cglib-3.1
deleted file mode 100644
index f6c36ae041be..000000000000
--- a/dev-java/cglib-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) dev-java/asm:4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=cglib is a powerful, high performance and quality Code Generation Library
-EAPI=5
-HOMEPAGE=https://github.com/cglib/cglib
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/asm:4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3
-SRC_URI=mirror://sourceforge/cglib/cglib-src-3.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1f20f1a606219b9740d98d2ec2fc1794
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
new file mode 100644
index 000000000000..b705b22e2e13
--- /dev/null
+++ b/dev-java/cglib/Manifest
@@ -0,0 +1,4 @@
+AUX cglib-3.1-build.xml.patch 1864 BLAKE2B 01fbf3ff50bcbcd4dea8b70db5a4fb6b0b3e5770a3d0c17f4fd5ed1106f5ac4f0e21054b81c06fbd731b1ba689ecc97f21db4fafcc9f84df3634ca70afe57401 SHA512 609cf02dd64fe57307ad9571f8b7d4bc3c7f9b452ce755fa968870fc252df08c985b5dc12647f8c543e39d57a01b532a4188d5ffc07359ddfc7967d32dfd978b
+DIST cglib-src-3.1.jar 1541525 BLAKE2B 46df8c11a8d05549c15a3bbf0f9789fbe4ad0540caa5be6d30f922aec95b55427cf36bff7740ba8c050c3c72749c6e9c98d8119a6de345126d7ef72343130568 SHA512 3b246b37f1c90acaefd4ba64f1f1db0b4d1fa64025f0e4e216ae7955e05701671bf8dc01d19c754286966cc5f8c06d78d02cb4f4500542f4448656768109c13f
+EBUILD cglib-3.1.ebuild 1127 BLAKE2B 89471d4fb3349610a09d7468cf5786ad2a2509ffe63bf08ca7bad52db12ff74d0622774cbeeeed673e7ede5649ffe6ce9b1efd3515c09524171bc30ec93c2d63 SHA512 59d439cc175332afe47931b43cf10c65e5fa46ccf81a6fad57059bb0dbad6e9f22f2ab4d51f8bf068449c0be7f180a1dbffb84aba69bf4a84f4e76cbdb2b1cfd
+MISC metadata.xml 554 BLAKE2B 253863978031d659d829e68719bab9dc8bc4a5d6134cd040dba882006eba9f6a6a5fec83efc83915bf7d4995af36752304252610d7163673584226c470ab7065 SHA512 480a6d306dd997a40cc695c42a4d51d12cd1ba131b5b3d80b4ca18ec751ba3dcf2394cb139c4c1a06ad98da30127c65c65eab036aaca167f46a6b63336f2c7ec
diff --git a/dev-java/cglib/cglib-3.1.ebuild b/dev-java/cglib/cglib-3.1.ebuild
new file mode 100644
index 000000000000..88dbbfbb6dd9
--- /dev/null
+++ b/dev-java/cglib/cglib-3.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
+HOMEPAGE="https://github.com/cglib/cglib"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+
+IUSE=""
+
+COMMON_DEP="dev-java/asm:4
+	dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="asm-4 ant-core"
+
+java_prepare() {
+	find . -iname '*.jar' -delete || die
+
+	# Get rid of some parts in XML.
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+
+	if use doc; then
+		java-pkg_dojavadoc docs
+	fi
+
+	if use source; then
+		java-pkg_dosrc src/proxy/net
+	fi
+
+	if use examples; then
+		java-pkg_doexamples --subdir samples src/proxy/samples
+	fi
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/cglib/files/cglib-3.1-build.xml.patch b/dev-java/cglib/files/cglib-3.1-build.xml.patch
new file mode 100644
index 000000000000..0bf60be7b014
--- /dev/null
+++ b/dev-java/cglib/files/cglib-3.1-build.xml.patch
@@ -0,0 +1,36 @@
+--- build.xml.orig	2015-04-11 20:26:25.459688628 +0200
++++ build.xml	2015-04-11 20:28:41.930026892 +0200
+@@ -73,7 +73,7 @@
+   <target depends="prepare" description="Compile shareable components" 

+           name="compile">

+     <javac debug="${compile.debug}" deprecation="${compile.deprecation}" destdir="${build.home}/classes" optimize="${compile.optimize}" srcdir="${source.home}"

+-      target="${compile.target}" bootclasspath="${compile.bootclasspath}" extdirs="${compile.extdirs}" source="${compile.source}">

++      target="${compile.target}" extdirs="${compile.extdirs}" source="${compile.source}">

+       <classpath refid="compile.classpath"/>

+       <compilerarg compiler="jikes" value="-nowarn"/>

+     </javac>

+@@ -123,15 +123,6 @@
+       <include name="**/*"/>

+       <exclude name="samples/**" />

+     </jar> 

+-

+-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>

+-    <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >

+-      <zipfileset dir="lib" includes="asm*.txt"/>

+-      <zipfileset src="lib/asm-4.2.jar" excludes="META-INF"/>

+-      <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>

+-      <include name="**/*"/>

+-      <exclude name="samples/**"/>

+-    </jarjar> 

+   </target>

+ 

+   <target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">

+@@ -246,7 +237,7 @@
+   <!-- <jvmarg value="-verbose:class"/> -->

+   <!-- <jvmarg value="-Xprof"/> -->

+   <!-- <jvmarg value="-server"/> -->

+-  <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->

++  <sysproperty key="cglib.debugLocation" value="debug"/>

+   <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->

+   <!-- <jvmarg value="-Djava.security.manager" />  -->

+  

diff --git a/dev-java/cglib/metadata.xml b/dev-java/cglib/metadata.xml
new file mode 100644
index 000000000000..5f26effad5fd
--- /dev/null
+++ b/dev-java/cglib/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		cglib is a powerful, high performance and quality Code Generation
+		Library, It is used to extend JAVA classes and implements interfaces
+		at runtime.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">cglib/cglib</remote-id>
+		<remote-id type="sourceforge">cglib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/classmate-0.9.0-r1 b/dev-java/classmate-0.9.0-r1
deleted file mode 100644
index 72c881566f3d..000000000000
--- a/dev-java/classmate-0.9.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Zero-dependency Java library for accurately introspecting type information
-EAPI=5
-HOMEPAGE=https://github.com/cowtowncoder/java-classmate/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/cowtowncoder/java-classmate/archive/classmate-0.9.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9b59d844cb5737177cf19ef1c1d0268f
diff --git a/dev-java/classmate-1.0.0 b/dev-java/classmate-1.0.0
deleted file mode 100644
index fb8237ed3c13..000000000000
--- a/dev-java/classmate-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Zero-dependency Java library for accurately introspecting type information
-EAPI=5
-HOMEPAGE=https://github.com/cowtowncoder/java-classmate/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/cowtowncoder/java-classmate/archive/classmate-1.0.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a7e1efedc84603a5266eb2f4c06ece5f
diff --git a/dev-java/classmate/Manifest b/dev-java/classmate/Manifest
new file mode 100644
index 000000000000..98538cafe45a
--- /dev/null
+++ b/dev-java/classmate/Manifest
@@ -0,0 +1,5 @@
+DIST classmate-0.9.0.tar.gz 57752 BLAKE2B 31247d159be4898b9ae71024da41c8602fe4d82f4ee10edab3146355cac06b23991fe926397737c43341085f35b392fc3f8a6b8278b9e47706f6fd06012f4c59 SHA512 7fb331c462458c8aab143f23c0d128a0e4e976f9d12bd181eb5658961b217bd1fe0871d056fc38bff794522c8b3118a2a017eab265afffc1d60b5580df1237a2
+DIST classmate-1.0.0.tar.gz 57807 BLAKE2B 171a82fb61fd1e183a5d435912099fd663d41c5d68791502c3a25752b77e809da817d2a8c5f8be55a211c4ab192aff6e2e566e8400c12fef688dfc05ea8a1b16 SHA512 cf721c813674e295fa6c1fe897493d14926d025cab51896ea0cec69ae285a540123060c39e3515daeffa48d6975d060861bf3ca5340bb9273980fee6d92d73b5
+EBUILD classmate-0.9.0-r1.ebuild 1153 BLAKE2B 8930a2941a6ba2dc88912ad163b6a90959b378b5589c762e35dd0a360337ba0695f554162e21bc5797cb84da76eaa5faf2e8274b35a18d978bfeb8581250bdbe SHA512 3f65f469845ed7e6d86e6f5e0473cac8d0a6c606270a0c256a01f78a5896267c975bf4b9dfbb4f36e25092c20e2baa1fc808ceb1ac18227aba3bee18ba24cfe4
+EBUILD classmate-1.0.0.ebuild 1161 BLAKE2B 2603fe68a5a76351ff3201e5e8afb8e89ffbf8e981a852b554d45022c61a5fba7c8c7a51dd0b6462d92fe732d795596c4c77f81f866a11a411e944f3f7ca0138 SHA512 d38fc03c084a8b941c8d6b6b2a8a5d07b2f092b416afc93b392c73c85eae14dd48485b223d61a14ac359c3526daf71bfe512d1080624b3d32f0562160a6a1ae3
+MISC metadata.xml 328 BLAKE2B b3f4d20d37178f91bc06a2b989603370c97231531d8221d2aed030b538e9b0a93e4ae1e906b5a2b56b6877ec175abe04e4bf7b5ef9768bbb17c88879d0721184 SHA512 ed87fc70d548ed88634183da0afb2548e74bbf5f7435edfa25e71392438df87cc1e18aa90264519009f445810ccd750626460dccb66e0f68ac844c44ba8d9430
diff --git a/dev-java/classmate/classmate-0.9.0-r1.ebuild b/dev-java/classmate/classmate-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..f6deb6b4e717
--- /dev/null
+++ b/dev-java/classmate/classmate-0.9.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple vcs-snapshot
+
+DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
+HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
+SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+# This one test is buggy.
+JAVA_RM_FILES=(
+	src/test/java/com/fasterxml/classmate/AnnotationsTest.java
+)
+
+java_prepare() {
+	rm pom.xml || die
+}
+
+src_test() {
+	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
+
+	mkdir target/tests || die
+	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
+
+	tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
+			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+			| grep -vP '\$');
+	ejunit4 -cp "${testcp}" ${tests}
+}
diff --git a/dev-java/classmate/classmate-1.0.0.ebuild b/dev-java/classmate/classmate-1.0.0.ebuild
new file mode 100644
index 000000000000..14bf78fc27ec
--- /dev/null
+++ b/dev-java/classmate/classmate-1.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
+HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
+SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/java-${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+# This one test is buggy.
+JAVA_RM_FILES=(
+	src/test/java/com/fasterxml/classmate/AnnotationsTest.java
+)
+
+java_prepare() {
+	rm pom.xml || die
+}
+
+src_test() {
+	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
+
+	mkdir target/tests || die
+	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
+
+	tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
+			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+			| grep -vP '\$');
+	ejunit4 -cp "${testcp}" ${tests}
+}
diff --git a/dev-java/classmate/metadata.xml b/dev-java/classmate/metadata.xml
new file mode 100644
index 000000000000..b333734bceaa
--- /dev/null
+++ b/dev-java/classmate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cowtowncoder/java-classmate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/cldc-api-1.1-r1 b/dev-java/cldc-api-1.1-r1
deleted file mode 100644
index fa0d5e3c9be8..000000000000
--- a/dev-java/cldc-api-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java ME Connected Limited Device Configuration API
-EAPI=5
-HOMEPAGE=http://java.sun.com/javame/reference/apis.jsp
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.1
-SRC_URI=mirror://gentoo/cldc-api-1.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8b1c7a55f93192fb6c6f126589ab74b3
diff --git a/dev-java/cldc-api/Manifest b/dev-java/cldc-api/Manifest
new file mode 100644
index 000000000000..849525836a34
--- /dev/null
+++ b/dev-java/cldc-api/Manifest
@@ -0,0 +1,3 @@
+DIST cldc-api-1.1.tar.bz2 142368 BLAKE2B 3f17d5edba61d8caed820a230156485b995985b4bd04e01982bc84de9c28d890e4ba8d30c24c2b1c211d43c666b7e92163c0442a2cfcf1540ac404816145990f SHA512 b2baae07c037692b2e9ef418728817b60c39fcef7bbb2ccdfacb5551aef2022d342458434042154cc4b4f82895a427fab2f277b6269fa651ec3bcdb23a771e7e
+EBUILD cldc-api-1.1-r1.ebuild 883 BLAKE2B 83818d42b3a4dc2685c987273ac6bea38e99123aaf582fabbcd1ff1c620cd087640e22ee70cfb69f3ccfa6eb8ddb9ca85886363695c33cde04760b38e8618937 SHA512 530df8267ba39c9c6a6fdeac2333dbf5239fe6a55caee592e732c257e5c3988160c2637219dd35c1ceecf375217ed7fde5567cdc38f6cebb9f0529a552baa5a2
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
new file mode 100644
index 000000000000..d502d5ee9bc9
--- /dev/null
+++ b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java ME Connected Limited Device Configuration API"
+HOMEPAGE="http://java.sun.com/javame/reference/apis.jsp"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+# mkdir cldc-api-1.1 && cd cldc-api-1.1
+# you need a login on dev.java.net - use --username username if different from your local login
+# svn export https://phoneme.dev.java.net/svn/phoneme/components/cldc/trunk/src/javaapi/cldc1.1
+# svn export https://phoneme.dev.java.net/svn/phoneme/components/cldc/trunk/src/javaapi/share
+# cd ..
+# tar -cjf cldc-api-1.1.tar.bz2 cldc-api-1.1
+# move tarball to distdir, scp to d.g.o...
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc64 x86"
+SLOT="1.1"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/cldc-api/metadata.xml b/dev-java/cldc-api/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/cldc-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/codemodel-2.6 b/dev-java/codemodel-2.6
deleted file mode 100644
index c499d2b395e1..000000000000
--- a/dev-java/codemodel-2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library for code generators
-EAPI=5
-HOMEPAGE=https://codemodel.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=http://repo.maven.apache.org/maven2/com/sun/codemodel/codemodel/2.6/codemodel-2.6-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=30e4e07e17e09986fa58741e384bb0ba
diff --git a/dev-java/codemodel/Manifest b/dev-java/codemodel/Manifest
new file mode 100644
index 000000000000..d84185c5bbf3
--- /dev/null
+++ b/dev-java/codemodel/Manifest
@@ -0,0 +1,3 @@
+DIST codemodel-2.6-sources.jar 178745 BLAKE2B d04979e3d912af5f16b0d0f6842c87e741abd32c8294fa429276a7457b328d577ed42352d8ea1874e9092845f7e8932df569f09f053702c5de635d243513d404 SHA512 f314fcd242d61bf0236b0520e8316df12cc5c068029d3a3a889db5d67ad1f0da37f3a1c09cc73d4709b7735b70f0ce8737365cb01441b3dedc6614f733e932c7
+EBUILD codemodel-2.6.ebuild 474 BLAKE2B 82e0476feca46ebe6aa760706a105b851964823e8f525fcb80950248c7ca52640506bc37982a7a0eb8dabed317344fc051bd7026f07da13bfb0c66103786c86e SHA512 c0bf6249f1b201ad3111a62f962a39d9aa082c3b44b5ec1b0a7ef368d665e5afcce3fd54c7b812ca855623641ea663d9089f0189fcb85110bd3f031d748adc50
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/codemodel/codemodel-2.6.ebuild b/dev-java/codemodel/codemodel-2.6.ebuild
new file mode 100644
index 000000000000..649702793616
--- /dev/null
+++ b/dev-java/codemodel/codemodel-2.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library for code generators"
+HOMEPAGE="https://codemodel.java.net/"
+SRC_URI="http://repo.maven.apache.org/maven2/com/sun/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="2"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=virtual/jdk-1.5
+		app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/codemodel/metadata.xml b/dev-java/codemodel/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/codemodel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/cofoja-1.2 b/dev-java/cofoja-1.2
deleted file mode 100644
index 6e952de83119..000000000000
--- a/dev-java/cofoja-1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/asm:4 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Contracts for Java
-EAPI=5
-HOMEPAGE=https://github.com/nhatminhle/cofoja
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=dev-java/asm:4 source? ( app-arch/zip ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/nhatminhle/cofoja/archive/v1.2.zip -> cofoja-1.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3d046f896b4e2108f6f33db0badfbd3f
diff --git a/dev-java/cofoja-1.3 b/dev-java/cofoja-1.3
deleted file mode 100644
index 2eec7946c385..000000000000
--- a/dev-java/cofoja-1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/asm:4 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Contracts for Java
-EAPI=6
-HOMEPAGE=https://github.com/nhatminhle/cofoja
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/nhatminhle/cofoja/archive/v1.3.tar.gz -> cofoja-1.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=457b766f2792edbb0bbaf208853d4401
diff --git a/dev-java/cofoja/Manifest b/dev-java/cofoja/Manifest
new file mode 100644
index 000000000000..0cde01c76699
--- /dev/null
+++ b/dev-java/cofoja/Manifest
@@ -0,0 +1,5 @@
+DIST cofoja-1.2.zip 229127 BLAKE2B b668a731bb86b38caaa599a723dbf34b42781a1c86afc8f905631a98f48fc8d94593d23eea24a53488019cd8f87f094256a7f1f3eda69f5dfb71340ca1bb8d63 SHA512 d6d73d32adaceaeb4c34600c0761f272d4917d276eb654a3e43ad368bc77eae26e9d5b90cb93f7ae073b6dad81eece129337e3c2d52daf7bb3dbc0577dcc2e7e
+DIST cofoja-1.3.tar.gz 104211 BLAKE2B 82c84a4cd0ce788c88f97256a47228512776113e7587c79518dd9d64618a3f92d45b97db25b33105160ee7f51c65518cdd086cafba2d89db3189c3c5dfd8b842 SHA512 c82e3b08ed193715e29a3b0b966ff38e17f73b24384f364946f1f00af0c376ce537d16fe0d0430f4c314f86ea5b46238ae0fa94d79d350c727f143d33f418d8e
+EBUILD cofoja-1.2.ebuild 807 BLAKE2B 9b7464d91cd5303f1a9cb64acc3cd59441d4a5afcfdbe5f4369cbc19fbf4fdae06f405bec0317095a9a4a9d5d81b2a9475936bd718575a866f0910e590bb55e2 SHA512 62642aa7711c2a6745b2f31343a57d888d2c36245b0d27488d2a641982744c87c5009f38777d65d75d75687ca46656685ae47508d1e080b7008bd900164f6a1b
+EBUILD cofoja-1.3.ebuild 806 BLAKE2B 002dea46fc7e71b0ca3e1ee806de0329bb7a6e60ca652a272a603b4abd19710d712273421d7bb36efc09aa7858bfd8103810abbda884f26b5b0a191da707a0f5 SHA512 c191b3059c17888691f4f29993b90da49f34bcc6c1c097b694e11db898fee6483b8944652bcc98d0555db256abf307a5c5e834cf7929040b7c41af785301b54b
+MISC metadata.xml 480 BLAKE2B 4804eb2f0a070c418f029be72085c659fe4ed58d5f3ae49d8ea1bd732bb904e4ab99f1da76c7e8efd80746969c9a6ac16b249929e8f6cdb6a83a02f775a59b70 SHA512 c7b6400370e8342c585663d9778ed6b5d491b2c764a963081a611142f8bb5a0a20bd497f5d19ab213d7583637efc04808f41c8be3ec62cca58466018cf588890
diff --git a/dev-java/cofoja/cofoja-1.2.ebuild b/dev-java/cofoja/cofoja-1.2.ebuild
new file mode 100644
index 000000000000..9848bd6a3251
--- /dev/null
+++ b/dev-java/cofoja/cofoja-1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Contracts for Java"
+HOMEPAGE="https://github.com/nhatminhle/cofoja"
+SRC_URI="https://github.com/nhatminhle/${PN}/archive/v${PV}.zip -> ${P}.zip"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RESTRICT="test"
+
+CDEPEND="dev-java/asm:4"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	source? ( app-arch/zip )
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="asm-4"
+JAVA_SRC_DIR="src/com/google/java/contract"
+
+# Relies on a bunch of classes in jsr308,
+# spec we don't have packaged in Gentoo.. yet.
+JAVA_RM_FILES=(
+	src/com/google/java/contract/core/apt/JavacUtils.java
+)
diff --git a/dev-java/cofoja/cofoja-1.3.ebuild b/dev-java/cofoja/cofoja-1.3.ebuild
new file mode 100644
index 000000000000..654d5541a289
--- /dev/null
+++ b/dev-java/cofoja/cofoja-1.3.ebuild
@@ -0,0 +1,41 @@
+# 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="Contracts for Java"
+HOMEPAGE="https://github.com/nhatminhle/cofoja"
+SRC_URI="https://github.com/nhatminhle/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test"
+
+CDEPEND="dev-java/asm:4"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="asm-4"
+JAVA_SRC_DIR="src/com/google/java/contract"
+
+src_prepare() {
+	default
+
+	# Relies on a bunch of classes in jsr308,
+	# spec we don't have packaged in Gentoo.. yet.
+	rm -v src/com/google/java/contract/core/apt/JavacUtils.java || die
+}
diff --git a/dev-java/cofoja/metadata.xml b/dev-java/cofoja/metadata.xml
new file mode 100644
index 000000000000..b6f3889baf54
--- /dev/null
+++ b/dev-java/cofoja/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="google-code">cofoja</remote-id>
+		<remote-id type="github">nhatminhle/cofoja</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/colt-1.2.0-r3 b/dev-java/colt-1.2.0-r3
deleted file mode 100644
index e7d06a7cdf2e..000000000000
--- a/dev-java/colt-1.2.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Libraries for High Performance Scientific and Technical Computing
-EAPI=5
-HOMEPAGE=http://www-itg.lbl.gov/~hoschek/colt/
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=colt
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://dsd.lbl.gov/~hoschek/colt-download/releases/colt-1.2.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0b3f45cd668acbb9e7e8706a06ef0799
diff --git a/dev-java/colt/Manifest b/dev-java/colt/Manifest
new file mode 100644
index 000000000000..76c34c4284d4
--- /dev/null
+++ b/dev-java/colt/Manifest
@@ -0,0 +1,5 @@
+AUX colt-1.2.0-benchmark-no-deprecation.patch 1180 BLAKE2B 748b1d14c0982ceb1d703cbf7dd478428c406afb0ae34ed22faf10fc93b97c36ff9d6764ac4b57057eabe4e85984fa5a650b9c65d24e0420e99a81046a67b1b9 SHA512 523a887bc104062a22ecb4e4350c1c8a4a0be642490b98770943b20e6e8e747d95657d10d042198516b2fd830feb0987ff3473b8ab83278ad3db57d29e9239c7
+AUX colt-1.2.0-remove-concurrent-util-imports.patch 6924 BLAKE2B 9ceaed0b61e0e8510d49c2151b9c42f2f125f42592ab98e8fd95812e0af572a8675b18642d103add8dbbec003683fe0d8b32e942a613a46245f3595a1c0827aa SHA512 86b568d66b342ede74dc3207268675c8f91b6b3dcc622486d649ba6a0a283de8b20a46f4ac16da8d90d89b4af603b1c8378b990866123e8e4b8b4e3733be4a36
+DIST colt-1.2.0.tar.gz 2545695 BLAKE2B be5a1e2ca50650a3dfe003855801350f4b01b931b11b59f41e635c4daeb011b7a761a7db8532168157bfbfac5a4473a39e0b49698d9ccd32e0099149dd7d4adb SHA512 a5e88e0cf671faeb336241d120daeb1ad90f1e2061827d06c0c2dc507cd3ae2ab45f2b80451aaedca0f5a8b3de66c13533178e3b6352ed8b2df886d25a924ce0
+EBUILD colt-1.2.0-r3.ebuild 1065 BLAKE2B 56292fa064677733e864b31e236dd475f0d87d57194fd648c70f5d200084e372eefd049224c191c6f2070976b3921533ad75dc1eb37b840a1096a9feef1040a9 SHA512 aaf5bf0dbb8193ba0b435218d2d23d8cedecfe5812ae65a374525730a2ec36436cd9511bab80e2d77920768231f68bad19cf0159efafb6d72601989c78af016c
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..118e1c232f82
--- /dev/null
+++ b/dev-java/colt/colt-1.2.0-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java Libraries for High Performance Scientific and Technical Computing"
+SRC_URI="http://dsd.lbl.gov/~hoschek/colt-download/releases/${P}.tar.gz"
+HOMEPAGE="http://www-itg.lbl.gov/~hoschek/colt/"
+
+LICENSE="colt"
+IUSE=""
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${PN}"
+
+EANT_BUILD_TARGET="javac jar"
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+# [0]: I don't know but it must be useful.
+# [1]: Monkey patch manually some classes to get rid of the
+# oswego.edu.concurrent.util imports.
+PATCHES=(
+	"${FILESDIR}/${P}-benchmark-no-deprecation.patch"
+	"${FILESDIR}/${P}-remove-concurrent-util-imports.patch"
+)
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg_dojar "lib/${PN}.jar"
+
+	dohtml README.html || die
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/colt/files/colt-1.2.0-benchmark-no-deprecation.patch b/dev-java/colt/files/colt-1.2.0-benchmark-no-deprecation.patch
new file mode 100644
index 000000000000..2617dc49ad57
--- /dev/null
+++ b/dev-java/colt/files/colt-1.2.0-benchmark-no-deprecation.patch
@@ -0,0 +1,31 @@
+--- src/cern/colt/matrix/impl/BenchmarkMatrix2D.java	2005-12-13 00:57:28.000000000 -0600
++++ src/cern/colt/matrix/impl/BenchmarkMatrix2D.java	2005-12-13 01:20:09.000000000 -0600
+@@ -331,6 +331,8 @@
+ 	cern.colt.Timer timer1 = new cern.colt.Timer();

+ 	cern.colt.Timer timer2 = new cern.colt.Timer();

+ 

++   cern.jet.math.Functions F = cern.jet.math.Functions.functions;

++

+ 	long size = (((long)rows)*columns)*runs;

+ 

+ 	DoubleMatrix2D  matrix = null;

+@@ -344,7 +346,8 @@
+ 	//if (kind.equals("sparse")) ((SparseDoubleMatrix2D)matrix).elements.hashCollisions = 0;

+ 	for (int i=0; i<runs; i++) {

+ 		timer1.start();

+-		cern.colt.matrix.doublealgo.Transform.mult(matrix, 3);

++		//cern.colt.matrix.doublealgo.Transform.mult(matrix, 3);

++      matrix.assign(F.mult(3));

+ 		timer1.stop();

+ 	}

+ 	timer1.display();

+@@ -366,7 +369,8 @@
+ 	//if (kind.equals("sparse")) ((SparseDoubleMatrix2D)matrix).elements.hashCollisions = 0;

+ 	for (int i=0; i<runs; i++) {

+ 		timer2.start();

+-		cern.colt.matrix.doublealgo.Transform.mult(matrix,3);

++		// cern.colt.matrix.doublealgo.Transform.mult(matrix,3);

++      matrix.assign(F.mult(3));

+ 		timer2.stop();

+ 	}

+ 	timer2.display();

diff --git a/dev-java/colt/files/colt-1.2.0-remove-concurrent-util-imports.patch b/dev-java/colt/files/colt-1.2.0-remove-concurrent-util-imports.patch
new file mode 100644
index 000000000000..2cfbef761baf
--- /dev/null
+++ b/dev-java/colt/files/colt-1.2.0-remove-concurrent-util-imports.patch
@@ -0,0 +1,210 @@
+--- src/cern/colt/matrix/linalg/SmpBlas.java.orig	2015-10-07 22:23:44.969486000 +0000
++++ src/cern/colt/matrix/linalg/SmpBlas.java	2015-10-07 22:29:15.475486000 +0000
+@@ -10,7 +10,8 @@
+ 

+ import cern.colt.matrix.DoubleMatrix1D;

+ import cern.colt.matrix.DoubleMatrix2D;

+-import EDU.oswego.cs.dl.util.concurrent.FJTask;

++

++import java.util.concurrent.ForkJoinTask;

+ /**

+ Parallel implementation of the Basic Linear Algebra System for symmetric multi processing boxes.

+ Currently only a few algorithms are parallelised; the others are fully functional, but run in sequential mode.

+@@ -198,7 +199,7 @@
+ 	

+ 	// set up concurrent tasks

+ 	int span = width/noOfTasks;

+-	final FJTask[] subTasks = new FJTask[noOfTasks];

++	final ForkJoinTask[] subTasks = new ForkJoinTask[noOfTasks];

+ 	for (int i=0; i<noOfTasks; i++) {

+ 		final int offset = i*span;

+ 		if (i==noOfTasks-1) span = width - span*i; // last span may be a bit larger

+@@ -217,24 +218,30 @@
+ 			CC = C.viewPart(offset,0,span,p);

+ 		}

+ 				

+-		subTasks[i] = new FJTask() { 

++		subTasks[i] = new ForkJoinTask() { 

+ 			public void run() { 

+ 				seqBlas.dgemm(transposeA,transposeB,alpha,AA,BB,beta,CC); 

+ 				//System.out.println("Hello "+offset); 

+ 			}

++

++      public boolean exec() { return true; }

++      public void setRawResult(Object o) {}

++      public Object getRawResult() {return null;}

+ 		};

+ 	}

+ 	

+ 	// run tasks and wait for completion

+-	try { 

+-		this.smp.taskGroup.invoke(

+-			new FJTask() {

+-				public void run() {	

+-					coInvoke(subTasks);	

+-				}

+-			}

+-		);

+-	} catch (InterruptedException exc) {}

++  this.smp.taskGroup.invoke(

++          new ForkJoinTask() {

++              public void run() {	

++                  invokeAll(subTasks);	

++              }

++

++              public boolean exec() { return true; }

++              public void setRawResult(Object o) {}

++              public Object getRawResult() {return null;}

++          }

++          );

+ }

+ public void dgemv(final boolean transposeA, final double alpha, DoubleMatrix2D A, final DoubleMatrix1D x, final double beta, DoubleMatrix1D y) {

+ 	/*

+@@ -271,7 +278,7 @@
+ 	

+ 	// set up concurrent tasks

+ 	int span = width/noOfTasks;

+-	final FJTask[] subTasks = new FJTask[noOfTasks];

++	final ForkJoinTask[] subTasks = new ForkJoinTask[noOfTasks];

+ 	for (int i=0; i<noOfTasks; i++) {

+ 		final int offset = i*span;

+ 		if (i==noOfTasks-1) span = width - span*i; // last span may be a bit larger

+@@ -280,24 +287,30 @@
+ 		final DoubleMatrix2D AA = A.viewPart(offset,0,span,n);

+ 		final DoubleMatrix1D yy = y.viewPart(offset,span);

+ 				

+-		subTasks[i] = new FJTask() { 

++		subTasks[i] = new ForkJoinTask() { 

+ 			public void run() { 

+ 				seqBlas.dgemv(transposeA,alpha,AA,x,beta,yy); 

+ 				//System.out.println("Hello "+offset); 

+ 			}

++

++      public boolean exec() { return true; }

++      public void setRawResult(Object o) {}

++      public Object getRawResult() {return null;}

+ 		};

+ 	}

+ 	

+ 	// run tasks and wait for completion

+-	try { 

+-		this.smp.taskGroup.invoke(

+-			new FJTask() {

+-				public void run() {	

+-					coInvoke(subTasks);	

+-				}

+-			}

+-		);

+-	} catch (InterruptedException exc) {}

++  this.smp.taskGroup.invoke(

++          new ForkJoinTask() {

++              public void run() {	

++                  invokeAll(subTasks);	

++              }

++

++              public boolean exec() { return true; }

++              public void setRawResult(Object o) {}

++              public Object getRawResult() {return null;}

++          }

++          );

+ }

+ public void dger(double alpha, DoubleMatrix1D x, DoubleMatrix1D y, DoubleMatrix2D A) {

+ 	seqBlas.dger(alpha,x,y,A);

+@@ -369,9 +382,6 @@
+ /**

+  * Prints various snapshot statistics to System.out; Simply delegates to {@link EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup#stats}.

+  */

+-public void stats() {

+-	if (this.smp!=null) this.smp.stats();

+-}

+ private double xsum(DoubleMatrix2D A) {

+ 	double[] sums = run(A,true,

+ 		new Matrix2DMatrix2DFunction() {

+--- src/cern/colt/matrix/linalg/Smp.java.orig	2015-10-07 21:08:19.443486000 +0000
++++ src/cern/colt/matrix/linalg/Smp.java	2015-10-07 22:28:24.722486000 +0000
+@@ -9,12 +9,13 @@
+ package cern.colt.matrix.linalg;

+ 

+ import cern.colt.matrix.DoubleMatrix2D;

+-import EDU.oswego.cs.dl.util.concurrent.FJTask;

+-import EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup;

++import java.util.concurrent.ForkJoinTask;

++import java.util.concurrent.ForkJoinPool;

++

+ /*

+ */

+ class Smp {

+-	protected FJTaskRunnerGroup taskGroup; // a very efficient and light weight thread pool

++	protected ForkJoinPool taskGroup; // a very efficient and light weight thread pool

+ 

+ 	protected int maxThreads;	

+ /**

+@@ -24,41 +25,39 @@
+ 	maxThreads = Math.max(1,maxThreads);

+ 	this.maxThreads = maxThreads;

+ 	if (maxThreads>1) {

+-		this.taskGroup = new FJTaskRunnerGroup(maxThreads);

++		this.taskGroup = new ForkJoinPool(maxThreads);

+ 	}

+ 	else { // avoid parallel overhead

+ 		this.taskGroup = null;

+ 	}

+ }

+-/**

+- * Clean up deamon threads, if necessary.

+- */

+-public void finalize() {

+-	if (this.taskGroup!=null) this.taskGroup.interruptAll();

+-}

+ protected void run(final DoubleMatrix2D[] blocksA, final DoubleMatrix2D[] blocksB, final double[] results, final Matrix2DMatrix2DFunction function) {

+-	final FJTask[] subTasks = new FJTask[blocksA.length];

++	final ForkJoinTask[] subTasks = new ForkJoinTask[blocksA.length];

+ 	for (int i=0; i<blocksA.length; i++) {

+ 		final int k = i;

+-		subTasks[i] = new FJTask() { 

++		subTasks[i] = new ForkJoinTask() { 

+ 			public void run() {

+ 				double result = function.apply(blocksA[k],blocksB != null ? blocksB[k] : null);

+ 				if (results!=null) results[k] = result; 

+ 				//System.out.print("."); 

+ 			}

++      public boolean exec() { return true; }

++      public void setRawResult(Object o) {}

++      public Object getRawResult() {return null;}

+ 		};

+ 	}

+ 

+ 	// run tasks and wait for completion

+-	try { 

+-		this.taskGroup.invoke(

+-			new FJTask() {

+-				public void run() {	

+-					coInvoke(subTasks);	

+-				}

+-			}

+-		);

+-	} catch (InterruptedException exc) {}

++  this.taskGroup.invoke(

++          new ForkJoinTask() {

++              public void run() {	

++                  invokeAll(subTasks);	

++              }

++              public boolean exec() { return true; }

++              public void setRawResult(Object o) {}

++              public Object getRawResult() {return null;}

++          }

++          );

+ }

+ protected DoubleMatrix2D[] splitBlockedNN(DoubleMatrix2D A, int threshold, long flops) {

+ 	/*

+@@ -186,10 +185,4 @@
+ 	}

+ 	return blocks;

+ }

+-/**

+- * Prints various snapshot statistics to System.out; Simply delegates to {@link EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup#stats}.

+- */

+-public void stats() {

+-	if (this.taskGroup!=null) this.taskGroup.stats();

+-}

+ }

diff --git a/dev-java/colt/metadata.xml b/dev-java/colt/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/colt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-beanutils-1.9.2 b/dev-java/commons-beanutils-1.9.2
deleted file mode 100644
index 5aa71c4e0fbb..000000000000
--- a/dev-java/commons-beanutils-1.9.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/junit:0 dev-java/commons-collections[test-framework] ) dev-java/commons-collections:0 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Provides easy-to-use wrappers around Reflection and Introspection APIs
-EAPI=5
-HOMEPAGE=http://commons.apache.org/beanutils/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-collections:0 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.7
-SRC_URI=mirror://apache/commons/beanutils/source/commons-beanutils-1.9.2-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=39e2313f052559b6e32b0f1322869e1e
diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
new file mode 100644
index 000000000000..10d25ea25457
--- /dev/null
+++ b/dev-java/commons-beanutils/Manifest
@@ -0,0 +1,3 @@
+DIST commons-beanutils-1.9.2-src.tar.gz 396910 BLAKE2B 1324c49605c9640aa3eee5c016a43bbb45b1984dd49eeab8f9b7a4ef1c5284ff8869228dda51719c2e6b3576517fdd02018a4f36654efc7f92d3fb7432008d05 SHA512 cf43aace33eb91368f86445874b16d977e827451f1355bb00e9b33bf0707855b5d757b0d58ad617f3a7f86f9065e7c900907dd604ba4de5ae61473d40cb758a9
+EBUILD commons-beanutils-1.9.2.ebuild 1897 BLAKE2B b684bad7e63c70cb8aa3e30947dcdd28650b0f580e777f3a93516569d966bbaeeac4b78023ffe8b592fc014e189f28c5a371987970ebe6bc0b0fe5cd394e1915 SHA512 fee166916e7fff8d39cf99d8e0b6278471b2e0ee7f740ca6075ec8cde4cce598b27796f02777b0b2cb44f25b218e77dc605f295fab735791e34933388cb9717f
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
new file mode 100644
index 000000000000..e5b223986bbe
--- /dev/null
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs"
+HOMEPAGE="http://commons.apache.org/beanutils/"
+SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.7"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+CDEPEND="dev-java/commons-collections:0
+	dev-java/commons-logging:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:0
+		dev-java/commons-collections[test-framework]
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+# Buggy tests.
+JAVA_RM_FILES=(
+	src/test/java/org/apache/commons/beanutils/IndexedPropertyTestCase.java
+	src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java
+	src/test/java/org/apache/commons/beanutils/bugs/Jira422TestCase.java
+	src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java
+	src/test/java/org/apache/commons/beanutils/DefaultIntrospectionContextTestCase.java
+)
+
+EANT_GENTOO_CLASSPATH="commons-logging,commons-collections"
+
+java_prepare() {
+	JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath
+}
+
+src_test() {
+	EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
+	ANT_TASKS="ant-junit" eant \
+		-Dcommons-collections.jar=$(java-pkg_getjar commons-collections commons-collections.jar) \
+		-Dcommons-collections-testframework.jar=$(java-pkg_getjar commons-collections commons-collections-testframework.jar) \
+		-Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar) \
+		test
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar
+
+	dodoc RELEASE-NOTES.txt || die
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/commons-beanutils/metadata.xml b/dev-java/commons-beanutils/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-beanutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-chain-1.2 b/dev-java/commons-chain-1.2
deleted file mode 100644
index 19bdce33afe4..000000000000
--- a/dev-java/commons-chain-1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/commons-digester:0 dev-java/mojarra:2.2 dev-java/portletapi:2.0 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=API exposing the Chain of Responsability design pattern - by the ASF
-EAPI=5
-HOMEPAGE=http://commons.apache.org/proper/commons-chain/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-digester:0 dev-java/mojarra:2.2 dev-java/portletapi:2.0 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/commons/chain/source/commons-chain-1.2-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b4472f5b46f83e26d8808e19097e98b3
diff --git a/dev-java/commons-chain/Manifest b/dev-java/commons-chain/Manifest
new file mode 100644
index 000000000000..6e96fbbe3dcc
--- /dev/null
+++ b/dev-java/commons-chain/Manifest
@@ -0,0 +1,4 @@
+AUX commons-chain-1.2-build.xml 8492 BLAKE2B c5d967e3d789b736eeb9c6136139915a0035083f74ca166af10fb2a8d251701ea6e25d3dd9e51b297969d940a288b8ca79db7a42b8b1dd06f8640dbd4941324a SHA512 7e9ec638693b5875cd2f0c0fe45cc3d5bd7029fb599f277565f195538dde981e1e1dc7f615f1a296a264a353d0b55dab2ca489a4f735c4500e50c25f45488b64
+DIST commons-chain-1.2-src.zip 316195 BLAKE2B 4f4b6221b5358634649cced0d558cfde4e7df133bda1b3edcb1264273c879ece2332310b65f0860d07b689d371397288db0b1aae7ab76966ce7a85664f10b248 SHA512 454cc3c00deb78f0c07e01ea5e2be9ea1210b7a0162e2490e5aba0df0788e1661aed88e4c4ac83e9f2046f62bdf063ecb7af7d3d49b7e87056aded1d5c1dad4b
+EBUILD commons-chain-1.2.ebuild 1347 BLAKE2B 36838887819e8e8250bba9f646d6f1eeb6147dc9e6639030a7f441a2ab585a1db061a980a5b74a67a124a6b9cb1c1b1549c93e2a606ba7b63221ae19581459a1 SHA512 0ba9e18f69c771078b3ef032eb17a63910af2d463da48070e48ffd8fc9f22b6e1399215b9ab25e501592b4ae220408fe8f38d1967c52cbf276e846e723ed1363
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-chain/commons-chain-1.2.ebuild b/dev-java/commons-chain/commons-chain-1.2.ebuild
new file mode 100644
index 000000000000..18ee9cf7307a
--- /dev/null
+++ b/dev-java/commons-chain/commons-chain-1.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+DESCRIPTION="API exposing the Chain of Responsability design pattern - by the ASF"
+HOMEPAGE="http://commons.apache.org/proper/commons-chain/"
+SRC_URI="mirror://apache/commons/chain/source/${MY_P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# Too many missing imports from javax.servlet.* which causes the
+# "compile-tests" target to fail compiling.
+# I gave up on them after wasting nearly half a day.
+RESTRICT="test"
+
+IUSE=""
+
+CDEPEND="dev-java/commons-digester:0
+	dev-java/mojarra:2.2
+	dev-java/portletapi:2.0
+	dev-java/commons-logging:0
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	commons-logging
+	commons-digester
+	portletapi-2.0
+	mojarra-2.2
+	servlet-api-3.0
+"
+
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/target/${P}.jar commons-chain.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/src/*
+	fi
+}
diff --git a/dev-java/commons-chain/files/commons-chain-1.2-build.xml b/dev-java/commons-chain/files/commons-chain-1.2-build.xml
new file mode 100644
index 000000000000..1ef9f3813c7c
--- /dev/null
+++ b/dev-java/commons-chain/files/commons-chain-1.2-build.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="commons-chain-1.2" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="commons-chain-1.2"/>
+  <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/java"/>
+  <property name="maven.build.resourceDir.0" value="."/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test"/>
+  <property name="maven.build.testResourceDir.0" value="src/test"/>
+  <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">
+  </path>
+  <path id="build.test.classpath">
+  </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="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>
+    <mkdir dir="${maven.build.outputDir}/META-INF"/>
+    <copy todir="${maven.build.outputDir}/META-INF">
+      <fileset dir="${maven.build.resourceDir.0}">
+        <include name="NOTICE.txt"/>
+        <include name="LICENSE.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="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           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}">
+        <include name="**/*.xml"/>
+      </fileset>
+    </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"/>
+        </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>
+
+  <!-- ====================================================================== -->
+  <!-- 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="iso-8859-1" 
+             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" 
+             source="1.3" 
+             linksource="true" 
+			 failonerror="false"
+             breakiterator="false">
+      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
+      <link href="http://java.sun.com/j2ee/1.4/docs/api/"/>
+      <link href="http://commons.apache.org/digester/apidocs/"/>
+    </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" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </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"/>
+
+</project>
diff --git a/dev-java/commons-chain/metadata.xml b/dev-java/commons-chain/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/commons-chain/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-cli-1.3.1 b/dev-java/commons-cli-1.3.1
deleted file mode 100644
index cebd0dc7a47b..000000000000
--- a/dev-java/commons-cli-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java library for working with the command line arguments and options
-EAPI=6
-HOMEPAGE=http://commons.apache.org/cli/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.3.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8b8753301b49aa1970f40045203e16fa
diff --git a/dev-java/commons-cli-1.4 b/dev-java/commons-cli-1.4
deleted file mode 100644
index 49213dce76c8..000000000000
--- a/dev-java/commons-cli-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java library for working with the command line arguments and options
-EAPI=6
-HOMEPAGE=http://commons.apache.org/cli/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.4-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=87a95638d9243f2e2cd6cc822ac2682a
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
new file mode 100644
index 000000000000..d6e20fa5e32e
--- /dev/null
+++ b/dev-java/commons-cli/Manifest
@@ -0,0 +1,5 @@
+DIST commons-cli-1.3.1-src.tar.gz 145886 BLAKE2B 951dd516a2b80089cbd3029e456dec295adef12a6e2225a99cf3acf88cb7434bbe0ea3b2dd40190ac1cbbaaf099a88405ac7c4cd9ae096ceeb13c9a13bd0198e SHA512 b5c569bea3c213a1959ae698894f2234477a7a5ed246f8e81142041173f668802959be018011bce6aa2a5631081378e67d69eeba9136fa19c96193dbdf2a7d15
+DIST commons-cli-1.4-src.tar.gz 148530 BLAKE2B 72460ee073b4e8c5179da03c3d599cf04b37b5b3aff89e4927b07765bd879acc9ac56f52e7dee03214e21f7ba9e5af3adf54d2f943aebb266bfa9b4983ba0380 SHA512 a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f
+EBUILD commons-cli-1.3.1.ebuild 1021 BLAKE2B b8e5af04fc22daac049f839ff28b3bb3f9bec1e6c3f412dda46510a05273ee4acdd3fdeef08c5b248b12a38d9963e26d3a8bd43a585e08d1b460b3f4cf1feb60 SHA512 a8f52c8889c3c75778bce7c491fb8b128da0578c33c5bff0477ef9c4c5f6f5fdcd1cafb9649630074213431efe02364ee731ce582480f238ea5d24d710718b1d
+EBUILD commons-cli-1.4.ebuild 1024 BLAKE2B 212a0952bd184096959f49d57df0a6cabb7dad9faf755c5a76fd3735a230dcd296fc756ae7a2400b3fae6075b18a0370fc5409c7240baddb332508da15f73ab7 SHA512 3c1f769888ebb51a017a73a92f89006735f28db41d8ee146eb1180d14a25e0d1487ee1712c795cd46ac7bd8df082671d1ce8294b8f075033bf21bbaf65b5ddc9
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-cli/commons-cli-1.3.1.ebuild b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
new file mode 100644
index 000000000000..a61fd6a54cde
--- /dev/null
+++ b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
@@ -0,0 +1,41 @@
+# 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="A Java library for working with the command line arguments and options"
+HOMEPAGE="http://commons.apache.org/cli/"
+SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.7"
+
+DEPEND=">=virtual/jdk-1.7
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${P}-src"
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc CONTRIBUTING.md NOTICE.txt README.md RELEASE-NOTES.txt
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/commons-cli/commons-cli-1.4.ebuild b/dev-java/commons-cli/commons-cli-1.4.ebuild
new file mode 100644
index 000000000000..91a2f1e31ae3
--- /dev/null
+++ b/dev-java/commons-cli/commons-cli-1.4.ebuild
@@ -0,0 +1,41 @@
+# 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="A Java library for working with the command line arguments and options"
+HOMEPAGE="http://commons.apache.org/cli/"
+SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.7"
+
+DEPEND=">=virtual/jdk-1.7
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${P}-src"
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc CONTRIBUTING.md NOTICE.txt README.md RELEASE-NOTES.txt
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/commons-cli/metadata.xml b/dev-java/commons-cli/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-cli/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-codec-1.11 b/dev-java/commons-codec-1.11
deleted file mode 100644
index eeb22629c941..000000000000
--- a/dev-java/commons-codec-1.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Implementations of common encoders and decoders in Java
-EAPI=6
-HOMEPAGE=https://commons.apache.org/codec
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.11-src.tar.gz -> commons-codec-1.11.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=450dba8e4215edac2517c6a902fc0123
diff --git a/dev-java/commons-codec-1.7 b/dev-java/commons-codec-1.7
deleted file mode 100644
index 1d11af628ddc..000000000000
--- a/dev-java/commons-codec-1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Implementations of common encoders and decoders in Java
-EAPI=5
-HOMEPAGE=http://commons.apache.org/codec
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.7-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a2893132c0e416c741f86b2e40525814
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
new file mode 100644
index 000000000000..b8333b15b303
--- /dev/null
+++ b/dev-java/commons-codec/Manifest
@@ -0,0 +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/commons-codec-1.7.ebuild b/dev-java/commons-codec/commons-codec-1.7.ebuild
new file mode 100644
index 000000000000..8a328da43bbc
--- /dev/null
+++ b/dev-java/commons-codec/commons-codec-1.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Implementations of common encoders and decoders in Java"
+HOMEPAGE="http://commons.apache.org/codec"
+SRC_URI="mirror://apache/commons/codec/source/${P}-src.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"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}*.jar
+
+	dodoc RELEASE-NOTES.txt
+	use doc && java-pkg_dojavadoc dist/docs/api
+	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/commons-codec/metadata.xml b/dev-java/commons-codec/metadata.xml
new file mode 100644
index 000000000000..f27bbde4a60f
--- /dev/null
+++ b/dev-java/commons-codec/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+Codec was formed as an attempt to focus development effort on one
+definitive implementation of the Base64 encoder. At the time of Codec's
+proposal, there were approximately 34 different Java classes that dealt
+with Base64 encoding spread over the Foundation's CVS repository.
+Developers in the Jakarta Tomcat project had implemented an original
+version of the Base64 codec which had been copied by the Commons
+HttpClient and Apache XML project's XML-RPC subproject. After almost one
+year, the two forked versions of Base64 had significantly diverged from
+one another. XML-RPC had applied numerous fixes and patches which were
+not applied to the Commons HttpClient Base64. Different subprojects had
+differing implementations at various levels of compliance with the RFC
+2045.
+
+Out of that confusing duplication of effort sprang this simple attempt
+to encourage code reuse among various projects. While this package
+contains a abstract framework for the creation of encoders and decoders,
+Codec itself is primarily focused on providing functional utilities for
+working with common encodings.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/commons-collections-3.2.1-r1 b/dev-java/commons-collections-3.2.1-r1
deleted file mode 100644
index dbb0ddcffe13..000000000000
--- a/dev-java/commons-collections-3.2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test-framework? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Jakarta-Commons Collections Component
-EAPI=5
-HOMEPAGE=http://commons.apache.org/collections/
-IUSE=test-framework elibc_FreeBSD doc source test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 test-framework? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ef71d71350e4086011262beef62b0e20
diff --git a/dev-java/commons-collections-3.2.1-r2 b/dev-java/commons-collections-3.2.1-r2
deleted file mode 100644
index 4ceddcd30854..000000000000
--- a/dev-java/commons-collections-3.2.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Jakarta-Commons Collections Component
-EAPI=6
-HOMEPAGE=https://commons.apache.org/collections/
-IUSE=test elibc_FreeBSD doc source test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=706646d68ce7b9f81e839a0357935ef7
diff --git a/dev-java/commons-collections-4.1 b/dev-java/commons-collections-4.1
deleted file mode 100644
index a5f2ad6a558e..000000000000
--- a/dev-java/commons-collections-4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/easymock:3.2 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Extends the JCF classes with new interfaces, implementations and utilities
-EAPI=6
-HOMEPAGE=https://commons.apache.org/collections/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4
-SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bd6ab5d01d5d6f7f82098f7d93c6e610
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
new file mode 100644
index 000000000000..bbbff6d57b9b
--- /dev/null
+++ b/dev-java/commons-collections/Manifest
@@ -0,0 +1,7 @@
+AUX commons-collections-3.2.1-Java-8.patch 7059 BLAKE2B c2dd3d388b15cd61224e96eb8b380f881ad4629ce58082c1b80cb843372741f10eaa4f3a71689a3f7817d7a702a82ef61dc7634187992fb03b2a8730262035ff SHA512 1007c9c46944c4b0104b0b13c4c2acdfc9791274019b20bd38b95769095843e4be1ee29d81ff61517d9a7d9b2ad5bd77c92a2f25ebe3bab68f9a04d3a986a44d
+DIST commons-collections-3.2.1-src.tar.gz 609930 BLAKE2B 547b785b82e16f1c318fafb5761292c5fe8beb57dd4a4881cc16ef7df7328df279713442cd1fc4a64fad0d84457c06d5536c084fd8084f62495ce44bfde19a34 SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0
+DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
+EBUILD commons-collections-3.2.1-r1.ebuild 1728 BLAKE2B 56dd7214eff19ebe391363a1c1066ab234290a458ee8943e5e13838cf41f6eca68abd6e9a31e62bc8e2c4285c628afdda809c2b6544080ba13b2ee54498d12dd SHA512 dea746396617ff3b693f444056ab157510980f191567d09910005352d51c0b3807d7a2c91897125da8a9a5608a35991898f41ad77d7948082ab100d7f64f15e3
+EBUILD commons-collections-3.2.1-r2.ebuild 1294 BLAKE2B a61b2884d319cc5c648ce5133d57a87f6d95128094d344adf4f206e5eacb3e925e370adeb958adaf8f41bac4a7d9b73a2010c3477dfb175cc487db9b6e822db4 SHA512 bccd79f3babd4416a1cdd0d27f3c6540258c61a395a261af024f84622f01f8bfcd3d0a3bcccff8f392a3a921637e40709dee12e1812f87f3533ab35b45be3cb8
+EBUILD commons-collections-4.1.ebuild 1182 BLAKE2B c127dfbfc2dcab974143e7efb1a5eee63e2472b81f2a75b8eff8d011d8b6528e023326aec74de1447bec9acdfb330e91ee19b949941dd33939333965291eb7c2 SHA512 e55765f2d3896a45f064cbaecb05b90d5a8bc9004055ca22629428b6778c62584a0ce3264cd3285edbcd5cfe7ce10559cd24f202b55d6e2a718948142a717605
+MISC metadata.xml 325 BLAKE2B af3d8863d79f6cb8290734821ff82fbff7b65ec3d017f7f530e5c74d745d94f4a15713fa06b24b7e3dcd092dedc10f6642a0a480ee13e916bbd5895c52f1fab0 SHA512 23d211dbb0efeb5909d6d43ddf7a58ab34d33d25fc80216e0e6d7722424c06df89912947105070e63a64d44b6ad37e3053e19bcddc4c808d9cfc234f4d923645
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..accce8f13e04
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 java-utils-2 eutils
+
+DESCRIPTION="Jakarta-Commons Collections Component"
+HOMEPAGE="http://commons.apache.org/collections/"
+SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test-framework"
+
+CDEPEND="
+	test-framework? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	# Check for VM version.
+	java-pkg_is-vm-version-ge 1.8
+	if [[ $? -eq 0 ]]; then
+		einfo "You are running a JVM greater or equal than version 1.8."
+		epatch "${FILESDIR}"/${P}-Java-8.patch
+	fi
+}
+
+src_compile() {
+	local antflags
+	if use test-framework; then
+		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
+		#no support for installing two sets of javadocs via dojavadoc atm
+		#use doc && antflags="${antflags} tf.javadoc"
+	fi
+	eant jar $(use_doc) ${antflags}
+}
+
+src_test() {
+	if [[ "${ARCH}" = "ppc" ]]; then
+		einfo "Tests are disabled on ppc"
+	else
+		ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	use test-framework && \
+		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
+			${PN}-testframework.jar
+
+	dodoc README.txt || die
+	java-pkg_dohtml *.html || die
+	if use doc; then
+		java-pkg_dojavadoc build/docs/apidocs
+		#use test-framework && java-pkg_dojavadoc build/docs/testframework
+	fi
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..50ad9b9cf0a5
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 java-utils-2
+
+DESCRIPTION="Jakarta-Commons Collections Component"
+HOMEPAGE="https://commons.apache.org/collections/"
+SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	>=virtual/jdk-1.6"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=( "${FILESDIR}/${P}-Java-8.patch" )
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local antflags
+	if use test; then
+		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
+	fi
+	eant jar $(use_doc) ${antflags}
+}
+
+src_test() {
+	if [[ "${ARCH}" = "ppc" ]]; then
+		einfo "tests are disabled on ppc"
+	else
+		ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	use test && \
+		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
+			${PN}-testframework.jar
+
+	java-pkg_dohtml *.html
+	if use doc; then
+		java-pkg_dojavadoc build/docs/apidocs
+	fi
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
new file mode 100644
index 000000000000..bd84b509220a
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -0,0 +1,51 @@
+# 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
+
+SLOT="4"
+MY_P="${PN}${SLOT}-${PV}"
+
+DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
+HOMEPAGE="https://commons.apache.org/collections/"
+SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="test"
+
+DEPEND="
+	>=virtual/jdk-1.7
+	test? (
+		dev-java/easymock:3.2
+		dev-java/junit:4
+	)"
+
+RDEPEND="
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc RELEASE-NOTES.txt
+	docinto html
+	dodoc {DEVELOPERS-GUIDE,PROPOSAL}.html
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${DIR}/../resources:${PN}.jar:$(java-pkg_getjars easymock-3.2,junit-4)"
+	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*" ! -name "BulkTest.*")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/commons-collections/files/commons-collections-3.2.1-Java-8.patch b/dev-java/commons-collections/files/commons-collections-3.2.1-Java-8.patch
new file mode 100644
index 000000000000..1a5ebe241f76
--- /dev/null
+++ b/dev-java/commons-collections/files/commons-collections-3.2.1-Java-8.patch
@@ -0,0 +1,160 @@
+--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java


++++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java


+@@ -153,7 +153,7 @@


+      * @param value the value to remove


+      * @return the value removed (which was passed in), null if nothing removed


+      */


+-    public Object remove(Object key, Object value) {


++    public Object removeMapping(Object key, Object value) {


+         Collection valuesForKey = getCollection(key);


+         if (valuesForKey == null) {


+             return null;


+--- a/src/java/org/apache/commons/collections/MultiHashMap.java


++++ b/src/java/org/apache/commons/collections/MultiHashMap.java


+@@ -331,7 +331,7 @@


+      * @param item  the value to remove


+      * @return the value removed (which was passed in), null if nothing removed


+      */


+-    public Object remove(Object key, Object item) {


++    public Object removeMapping(Object key, Object item) {


+         Collection valuesForKey = getCollection(key);


+         if (valuesForKey == null) {


+             return null;


+--- a/src/java/org/apache/commons/collections/MultiMap.java


++++ b/src/java/org/apache/commons/collections/MultiMap.java


+@@ -66,7 +66,7 @@


+      * @throws ClassCastException if the key or value is of an invalid type


+      * @throws NullPointerException if the key or value is null and null is invalid


+      */


+-    public Object remove(Object key, Object item);


++    public Object removeMapping(Object key, Object item);


+ 


+     //-----------------------------------------------------------------------


+     /**


+--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java


++++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java


+@@ -160,7 +160,7 @@


+         MultiValueMap one = new MultiValueMap();


+         Integer value = new Integer(1);


+         one.put("One", value);


+-        one.remove("One", value);


++        one.removeMapping("One", value);


+         


+         MultiValueMap two = new MultiValueMap();


+         assertEquals(two, one);


+@@ -186,7 +186,7 @@


+         assertEquals(4, map.totalSize());


+         map.remove("A");


+         assertEquals(3, map.totalSize());


+-        map.remove("B", "BC");


++        map.removeMapping("B", "BC");


+         assertEquals(2, map.totalSize());


+     }


+     


+@@ -203,7 +203,7 @@


+         assertEquals(2, map.size());


+         map.remove("A");


+         assertEquals(2, map.size());


+-        map.remove("B", "BC");


++        map.removeMapping("B", "BC");


+         assertEquals(2, map.size());


+     }


+     


+@@ -226,7 +226,7 @@


+         map.remove("A");


+         assertEquals(0, map.size("A"));


+         assertEquals(3, map.size("B"));


+-        map.remove("B", "BC");


++        map.removeMapping("B", "BC");


+         assertEquals(0, map.size("A"));


+         assertEquals(2, map.size("B"));


+     }


+@@ -327,11 +327,11 @@


+         map.put("A", "AA");


+         map.put("A", "AB");


+         map.put("A", "AC");


+-        assertEquals(null, map.remove("C", "CA"));


+-        assertEquals(null, map.remove("A", "AD"));


+-        assertEquals("AC", map.remove("A", "AC"));


+-        assertEquals("AB", map.remove("A", "AB"));


+-        assertEquals("AA", map.remove("A", "AA"));


++        assertEquals(null, map.removeMapping("C", "CA"));


++        assertEquals(null, map.removeMapping("A", "AD"));


++        assertEquals("AC", map.removeMapping("A", "AC"));


++        assertEquals("AB", map.removeMapping("A", "AB"));


++        assertEquals("AA", map.removeMapping("A", "AA"));


+         assertEquals(new MultiValueMap(), map);


+     }


+ 


+--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java


++++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java


+@@ -217,7 +217,7 @@


+         MultiHashMap one = new MultiHashMap();


+         Integer value = new Integer(1);


+         one.put("One", value);


+-        one.remove("One", value);


++        one.removeMapping("One", value);


+         


+         MultiHashMap two = new MultiHashMap();


+         assertEquals(two, one);


+@@ -269,7 +269,7 @@


+         assertEquals(4, map.totalSize());


+         map.remove("A");


+         assertEquals(3, map.totalSize());


+-        map.remove("B", "BC");


++        map.removeMapping("B", "BC");


+         assertEquals(2, map.totalSize());


+     }


+     


+@@ -292,7 +292,7 @@


+         map.remove("A");


+         assertEquals(0, map.size("A"));


+         assertEquals(3, map.size("B"));


+-        map.remove("B", "BC");


++        map.removeMapping("B", "BC");


+         assertEquals(0, map.size("A"));


+         assertEquals(2, map.size("B"));


+     }


+@@ -464,11 +464,11 @@


+         map.put("A", "AA");


+         map.put("A", "AB");


+         map.put("A", "AC");


+-        assertEquals(null, map.remove("C", "CA"));


+-        assertEquals(null, map.remove("A", "AD"));


+-        assertEquals("AC", map.remove("A", "AC"));


+-        assertEquals("AB", map.remove("A", "AB"));


+-        assertEquals("AA", map.remove("A", "AA"));


++        assertEquals(null, map.removeMapping("C", "CA"));


++        assertEquals(null, map.removeMapping("A", "AD"));


++        assertEquals("AC", map.removeMapping("A", "AC"));


++        assertEquals("AB", map.removeMapping("A", "AB"));


++        assertEquals("AA", map.removeMapping("A", "AA"));


+         assertEquals(new MultiHashMap(), map);


+     }


+ 


+--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java


++++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java


+@@ -197,7 +197,7 @@


+      * @param key2  the second key


+      * @return the value mapped to the removed key, null if key not in map


+      */


+-    public Object remove(Object key1, Object key2) {


++    public Object removeMultiKey(Object key1, Object key2) {


+         int hashCode = hash(key1, key2);


+         int index = map.hashIndex(hashCode, map.data.length);


+         AbstractHashedMap.HashEntry entry = map.data[index];


+--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java


++++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java


+@@ -315,10 +315,10 @@


+             switch (key.size()) {


+                 case 2:


+                 assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1)));


+-                assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1)));


++                assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));


+                 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));


+                 assertEquals(size - 1, multimap.size());


+-                assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1)));


++                assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));


+                 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));


+                 break;


+                 case 3:


diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
new file mode 100644
index 000000000000..3e4d58fc9fa2
--- /dev/null
+++ b/dev-java/commons-collections/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <use>
+    <flag name="test-framework">Install the test framework</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/commons-compress-1.10 b/dev-java/commons-compress-1.10
deleted file mode 100644
index 68ec4a841e30..000000000000
--- a/dev-java/commons-compress-1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/xz-java:0 >=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/ant-junit:0 dev-java/hamcrest-core:1.3 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java API for working with archive files
-EAPI=5
-HOMEPAGE=https://commons.apache.org/proper/commons-compress/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/xz-java:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons//compress/source/commons-compress-1.10-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4cc4ca6d29c0329282ff4f21ec471188
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
new file mode 100644
index 000000000000..c39fd4d7c1e0
--- /dev/null
+++ b/dev-java/commons-compress/Manifest
@@ -0,0 +1,5 @@
+AUX MANIFEST.MF 1222 BLAKE2B a7ec1ac35802d24cbc9ce95d3974004d89e6233aa41f95a33733b08dc447c54bbd6da2a3a01ef2d46cee303578a4dd116704e7e1dc551af1212b0b3ed891ea1e SHA512 048b09aa2ae2e20c8b5b0e116eb49fd680634e9b654d5026004e32a39bec4e5b669afcadea8338764a157f70cc0c3fdb5d2ce98513bfeae267be7ae02935381d
+AUX build.xml 11340 BLAKE2B 9a0366053069ca9d060257887cbe70a9de8e8796894975b00b0c25fb96b80d84e83e371debb619efbfbd244f31a0214d7487f38611f8532da838a971b5b8d528 SHA512 09abd59212021ac20fae760ce127546bde53e40e2ed0db26a0a93417c681e46b038d1940964e55fd46a8f7db44b5ea2666459d75358ee1dd5882895c803e0c89
+DIST commons-compress-1.10-src.tar.gz 8528642 BLAKE2B 7fe3891340f8d215134c6926711dabe139cc978560c1c92739a755d69f8f99503e3aa7f8b9a5728922e11109ee196f27ae04a03e26e009a61415d5df2bba975e SHA512 1eee157134d861f49b735df02f028781ef86370d7d246cb8fbfc1f445427d5cdd753a9df7a78e760d53667c43ab5c37df315a1e36e845e5d308961ebe138d910
+EBUILD commons-compress-1.10.ebuild 1498 BLAKE2B 753e2e3e8cc14f90ccadcdfc82f73dc5af6d54d7db6ad81b28465c235895325119df88e03028b214427a6642c05aa4b8b4554a5572dcf71dceebdb61bfef42a9 SHA512 0a172dfe3c1026925fd92418085c1324e9fae506f85917e84fee68d9ee4fb38d38c8019c7730157deb2e3fea7ab241296ff74787be3e5a23c996f81267695537
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-compress/commons-compress-1.10.ebuild b/dev-java/commons-compress/commons-compress-1.10.ebuild
new file mode 100644
index 000000000000..5670329df835
--- /dev/null
+++ b/dev-java/commons-compress/commons-compress-1.10.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API for working with archive files"
+HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND="dev-java/xz-java:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+		dev-java/hamcrest-core:1.3
+	)"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning"
+EANT_GENTOO_CLASSPATH="xz-java"
+EANT_BUILD_TARGET="compile package"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,hamcrest-core-1.3"
+
+# Dubious tests.
+JAVA_RM_FILES=(
+	src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
+)
+
+java_prepare() {
+	cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml"
+
+	# osgi stuff mvn ant:ant doesn't handle
+	mkdir -p target/osgi || die "Failed to create target dir"
+	cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest"
+
+	if ! use test; then
+		find -name "*.jar" -delete || die "Failed to remove test resources"
+	fi
+}
+
+src_test() {
+	EANT_TEST_TARGET="compile-tests test" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "target/${PN}-1.1.jar"
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-compress/files/MANIFEST.MF b/dev-java/commons-compress/files/MANIFEST.MF
new file mode 100644
index 000000000000..ab91795ef624
--- /dev/null
+++ b/dev-java/commons-compress/files/MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0

+Export-Package: org.apache.commons.compress.changes;version="1.1",org.

+ apache.commons.compress.archivers.ar;version="1.1",org.apache.commons

+ .compress.archivers.jar;version="1.1",org.apache.commons.compress.arc

+ hivers.cpio;version="1.1",org.apache.commons.compress.archivers.zip;v

+ ersion="1.1",org.apache.commons.compress.archivers;version="1.1",org.

+ apache.commons.compress.archivers.tar;version="1.1",org.apache.common

+ s.compress.compressors.bzip2;version="1.1",org.apache.commons.compres

+ s.compressors;version="1.1",org.apache.commons.compress.utils;version

+ ="1.1",org.apache.commons.compress.compressors.gzip;version="1.1"

+Tool: Bnd-0.0.255

+Bundle-Name: Commons Compress

+Created-By: 1.7.0-ea (Oracle Corporation)

+Bundle-Vendor: The Apache Software Foundation

+Bundle-Version: 1.1

+Bnd-LastModified: 1311506267618

+Bundle-ManifestVersion: 2

+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

+Bundle-Description: Commons Compress defines an API for working with c

+ ompression and archive formats.  These include: bzip2, gzip and ar, c

+ pio, jar, tar, zip.

+Bundle-SymbolicName: org.apache.commons.compress

+Bundle-DocURL: http://commons.apache.org/compress/

+

diff --git a/dev-java/commons-compress/files/build.xml b/dev-java/commons-compress/files/build.xml
new file mode 100644
index 000000000000..f42093f83866
--- /dev/null
+++ b/dev-java/commons-compress/files/build.xml
@@ -0,0 +1,269 @@
+<?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/24/11 12:42 PM                      -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="commons-compress-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="commons-compress-1.1"/>
+  <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="."/>
+  <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"/>
+  <path id="build.test.classpath">
+    <pathelement location="junit.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}" 
+           encoding="iso-8859-1" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.4" 
+           verbose="false" 
+           fork="false" 
+           source="1.4">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <mkdir dir="${maven.build.outputDir}/META-INF"/>
+    <copy todir="${maven.build.outputDir}/META-INF">
+      <fileset dir="${maven.build.resourceDir.0}">
+        <include name="NOTICE.txt"/>
+        <include name="LICENSE.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="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.4" 
+           verbose="false" 
+           fork="false" 
+           source="1.4">
+      <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="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+          <exclude name="**/*Abstract*TestCase.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"/>
+          <exclude name="**/*Abstract*TestCase.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" 
+             encoding="iso-8859-1" 
+             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" 
+             source="1.4" 
+             linksource="true" 
+             breakiterator="false">
+      <link href="http://java.sun.com/javase/6/docs/api/"/>
+      <tag name="Immutable" 
+               description="This class is immutable"/>
+      <tag name="NotThreadSafe" 
+               description="This class is not thread-safe"/>
+      <tag name="ThreadSafe" 
+               description="This class is thread-safe"/>
+    </javadoc>
+  </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" 
+         manifest="target/osgi/MANIFEST.MF" 
+         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                                           -->
+  <!-- ====================================================================== -->
+
+  <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}/junit/junit/3.8.2"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/3.8.2/junit-3.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/commons-compress/metadata.xml b/dev-java/commons-compress/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-compress/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-configuration-1.6-r2 b/dev-java/commons-configuration-1.6-r2
deleted file mode 100644
index be0268e6fa47..000000000000
--- a/dev-java/commons-configuration-1.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/commons-beanutils-1.7.0:1.7 >=dev-java/commons-codec-1.3:0 >=dev-java/commons-collections-3.1:0 >=dev-java/commons-digester-1.8:0 >=dev-java/commons-jxpath-1.2:0 >=dev-java/commons-lang-2.4:2.1 >=dev-java/commons-logging-1.1.1:0 java-virtuals/servlet-api:3.0 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Generic interface for reading configuration data from a variety of sources
-EAPI=5
-HOMEPAGE=http://commons.apache.org/configuration/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/commons-beanutils-1.7.0:1.7 >=dev-java/commons-codec-1.3:0 >=dev-java/commons-collections-3.1:0 >=dev-java/commons-digester-1.8:0 >=dev-java/commons-jxpath-1.2:0 >=dev-java/commons-lang-2.4:2.1 >=dev-java/commons-logging-1.1.1:0 java-virtuals/servlet-api:3.0 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/commons/configuration/source/commons-configuration-1.6-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b28571f055c9e0c436e599e100e59552
diff --git a/dev-java/commons-configuration/Manifest b/dev-java/commons-configuration/Manifest
new file mode 100644
index 000000000000..7bfdc5f593f4
--- /dev/null
+++ b/dev-java/commons-configuration/Manifest
@@ -0,0 +1,4 @@
+AUX commons-configuration-1.6-gentoo.patch 979 BLAKE2B 37076bf72f33c69dd00a0b1715cdff1746c0ccdf6d59dfe11a40960b0c317c280a30ee2a70d5d3534d5eb22edba0d489c186e7a813c455918cde6f81ce32d906 SHA512 6e0e3e69a77b31a39ad2f160a80ff08b9cdac2b0788b58b06e09f9a07a90a36bc1a4171e6bd739495b8e4c6271cc49ffbfe221dda73756f3407cf268dafec5a7
+DIST commons-configuration-1.6-src.tar.gz 559621 BLAKE2B ce6ca821c03b4948796c46fe796684dbcc8eafbc6004e2abace573f8fa316f638056c03684d10d29c0f3126554bc8cf2c9195228044a2db7203f847d2b71b22e SHA512 5d82b844cf39162976820d030d05afeeec1151aa33bf4353f9ca844e552c55ea26daa1b74158baa31d0677e311e9dd83a1d9721c8d5f4e23d21068c4ca2eeb01
+EBUILD commons-configuration-1.6-r2.ebuild 1686 BLAKE2B 693bdb25d448691d9d9e491f94ab0df1b2bbdf864bb34d4fb7847d6bb6609b1e0e6cc038c2df7653900eeb21fe4f9b84c866b354ef9cd83963f91e3fd574ee53 SHA512 73bd9b24c738b0942547cb2df6c78dbab264faa7333955b2aa55a665660bc57bb3398fa64c4ced2b05f44ca50d7828d8882c0988f2420c716031b764ce500ca4
+MISC metadata.xml 429 BLAKE2B 5a7d59e205a26abfec76c9391d4c8b66710b082ba4a9362e70c4b40775d8d448ed531185dd4f65a04fc19643764364e3a885a4215e883127a781c8af39752cf0 SHA512 eda224d5bad6200ce652d798d7ddd2f5f7de3652419728d05068c2bde19caa2486b1060b8d98d9dc5adca2d00014e868b93dac646ee129d57c7239a6917a260e
diff --git a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
new file mode 100644
index 000000000000..811493b46bd9
--- /dev/null
+++ b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Generic interface for reading configuration data from a variety of sources"
+HOMEPAGE="http://commons.apache.org/configuration/"
+SRC_URI="mirror://apache/commons/configuration/source/${P}-src.tar.gz"
+
+# it needs functionality from ant-core, although not providing an ant task
+# the functionality is apparently needed only for 1.4 jdk
+# but I don't feel like adding virtual for this
+CDEPEND="
+	>=dev-java/commons-beanutils-1.7.0:1.7
+	>=dev-java/commons-codec-1.3:0
+	>=dev-java/commons-collections-3.1:0
+	>=dev-java/commons-digester-1.8:0
+	>=dev-java/commons-jxpath-1.2:0
+	>=dev-java/commons-lang-2.4:2.1
+	>=dev-java/commons-logging-1.1.1:0
+	java-virtuals/servlet-api:3.0
+	dev-java/ant-core:0"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+java_prepare() {
+	# Tweak build classpath and don't automatically run tests
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+EANT_GENTOO_CLASSPATH="
+	commons-beanutils-1.7
+	commons-codec
+	commons-collections
+	commons-digester
+	commons-jxpath
+	commons-lang-2.1
+	commons-logging
+	servlet-api-3.0
+	ant-core"
+
+# Would need mockobjects with j2ee support which we don't have
+# Check overlay for ebuild with test support
+RESTRICT="test"
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+	dodoc RELEASE-NOTES.txt || die
+	use doc && java-pkg_dohtml -r dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-configuration/files/commons-configuration-1.6-gentoo.patch b/dev-java/commons-configuration/files/commons-configuration-1.6-gentoo.patch
new file mode 100644
index 000000000000..0cfa8f6511e7
--- /dev/null
+++ b/dev-java/commons-configuration/files/commons-configuration-1.6-gentoo.patch
@@ -0,0 +1,19 @@
+--- build.xml.orig	2006-10-13 00:00:17.000000000 +0200
++++ build.xml	2006-10-13 00:02:37.000000000 +0200
+@@ -97,13 +97,13 @@
+     </copy>

+   </target>

+ 

+-  <target name="jar" description="o Create the jar" depends="compile,test">

++  <target name="jar" description="o Create the jar" depends="compile">

+     <mkdir dir="${classesdir}/META-INF"/>

+     <copy file="LICENSE.txt" todir="${metadir}"/>

+     <copy file="NOTICE.txt" todir="${metadir}"/>

+-    <copy file="${conf.home}/manifest.mf" todir="${defaulttargetdir}" filtering="on"/>

++    <copy file="${conf.home}/MANIFEST.MF" todir="${defaulttargetdir}" filtering="on"/>

+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" basedir="${classesdir}"

+-       manifest="${defaulttargetdir}/manifest.mf" excludes="**/package.html">

++       manifest="${defaulttargetdir}/MANIFEST.MF" excludes="**/package.html">

+     </jar>

+   </target>

+   <target name="clean" description="o Clean up the generated directories">

diff --git a/dev-java/commons-configuration/metadata.xml b/dev-java/commons-configuration/metadata.xml
new file mode 100644
index 000000000000..a4125a7186f5
--- /dev/null
+++ b/dev-java/commons-configuration/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Commons Configuration provides a generic configuration interface
+		which enables an application to read configuration data from
+		a variety of sources.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/commons-daemon-1.0.15 b/dev-java/commons-daemon-1.0.15
deleted file mode 100644
index b3c1586b741f..000000000000
--- a/dev-java/commons-daemon-1.0.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.6 source? ( app-arch/zip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tools to allow Java programs to run as UNIX daemons
-EAPI=5
-HOMEPAGE=http://commons.apache.org/daemon/
-IUSE=kernel_linux elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=82240b5b191a7a37bba20e7cd40032b0
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
new file mode 100644
index 000000000000..74bc09cb6dfb
--- /dev/null
+++ b/dev-java/commons-daemon/Manifest
@@ -0,0 +1,3 @@
+DIST commons-daemon-1.0.15-src.tar.gz 291128 BLAKE2B af874e6a0852c2dc5c84fcbf5e1e443fb880a306b19054263d06e8d83a9b0866a52f2950c457315d80031a58250ec75284fc7839df82b7555b1ff3bd92e67810 SHA512 f20cc8796978fb09b6ecc8d99bb3c8b271b097d74c1f99b286cde213631e7f50a4104f5db2c354f9624ba8b037502d81e327c581b38253b9b216aa2172016e40
+EBUILD commons-daemon-1.0.15.ebuild 1255 BLAKE2B 7dba8b76b4d39cdf13269a5e55babb479aa3bb0645a3d83ec8b80d870834aec80f8245fb5c9a7d8caadb23ac3d660b3db30305d93da18674fd0469a7b8fe23e7 SHA512 9f6b2160da39f474dddeb165397c523764069f1ed4123de817c279ce41ab0b0be3aa8396741f1dd201dff28577d5e39acd18431d94e75f27316b315330606524
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
new file mode 100644
index 000000000000..1b467fb6bde5
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit autotools java-pkg-2 java-ant-2
+
+DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
+SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
+HOMEPAGE="http://commons.apache.org/daemon/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="kernel_linux"
+
+CDEPEND="kernel_linux? ( sys-libs/libcap )"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	cd "${S}/src/native/unix" || die
+	sed -i "s/powerpc/powerpc|powerpc64/g" support/apsupport.m4 || die
+	eautoconf
+}
+
+src_configure() {
+	java-ant-2_src_configure
+	cd "${S}/src/native/unix" || die
+	default
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	cd "${S}/src/native/unix" || die
+	default
+}
+
+src_install() {
+	dobin src/native/unix/jsvc
+	java-pkg_newjar dist/*.jar
+
+	dodoc README RELEASE-NOTES.txt *.html src/native/unix/CHANGES.txt
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use examples && java-pkg_doexamples src/samples
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-daemon/metadata.xml b/dev-java/commons-daemon/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-daemon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-dbcp-2.1 b/dev-java/commons-dbcp-2.1
deleted file mode 100644
index de3a79ecfed4..000000000000
--- a/dev-java/commons-dbcp-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=dev-java/commons-logging-1.1.1 dev-java/commons-pool:2 java-virtuals/transaction-api:0 dev-java/junit:4 >=virtual/jdk-1.7 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Jakarta component providing database connection pooling API
-EAPI=5
-HOMEPAGE=http://commons.apache.org/dbcp/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.7 >=dev-java/commons-logging-1.1.1 dev-java/commons-pool:2 java-virtuals/transaction-api:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=mirror://apache/commons/dbcp/source/commons-dbcp2-2.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5064396b8c30af1b83532f7a1f7d12b7
diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest
new file mode 100644
index 000000000000..a521156102ab
--- /dev/null
+++ b/dev-java/commons-dbcp/Manifest
@@ -0,0 +1,3 @@
+DIST commons-dbcp2-2.1-src.tar.gz 580017 BLAKE2B 5bcc79ace49e57199fc99ea52ffbefc3ec428aff51fab3c08679f851e51fdbc02ac539ebea64eb3f6f8e5cbaf910269630096a4efb27f19cef336beb026cf441 SHA512 830fb550cee5f9c79fad830d8b3e56417aa9dfed26093fd366693260f5b4d821baa592e60c7f5997766276049a90eacd5854b8422803825154fedee56d46409d
+EBUILD commons-dbcp-2.1.ebuild 2222 BLAKE2B c1ea89e044a7f7e1b613010609bb26025721c41fe18ffb121ea8ee50f35d552ffce9772cf1c83b120c816d3f26c3b016e5cb8d7a157e620acda45c8d375a2ce9 SHA512 655d48cdfc6a6ca83fa27f9c35872c91f6cc0eb0f8536d1b2212e5ef03ff90205368fa291c531abb119001dc9681413eaac07779944091327a5b5fd81e90c207
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
new file mode 100644
index 000000000000..b7928a7c40e3
--- /dev/null
+++ b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="${PN}2"
+MY_PV="${PV%_*}"
+MY_P="${MY_PN}-${MY_PV}-src"
+
+DESCRIPTION="Jakarta component providing database connection pooling API"
+HOMEPAGE="http://commons.apache.org/dbcp/"
+SRC_URI="mirror://apache/commons/dbcp/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+CDEPEND=">=dev-java/commons-logging-1.1.1
+	dev-java/commons-pool:2
+	java-virtuals/transaction-api:0
+	dev-java/junit:4"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? ( dev-java/ant-junit:0 )"
+RDEPEND="
+	>=virtual/jdk-1.7
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="commons-logging,commons-pool-2,transaction-api,junit-4"
+EANT_BUILD_TARGET="build-jar"
+
+src_test() {
+	local TESTS_TO_DELETE=()
+
+	function test_to_del() {
+		local TEST_FILE=$1
+		TESTS_TO_DELETE+=(${TEST_FILE})
+	}
+
+	function rm_tests() {
+		for TEST_FILE in ${TESTS_TO_DELETE[@]}; do
+			ebegin "Removing test file ${TEST_FILE}"
+			rm "${TEST_FILE}" || die
+			eend $?
+		done
+	}
+
+	# These tests depend on a geronimo,
+	# which is not packaged yet for Gentoo unfortunately.
+	# See bug #348853.
+	test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
+	test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
+	test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java
+	test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java
+	test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java
+	test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestTransactionContext.java
+
+	# This one fails.
+	test_to_del src/test/java/org/apache/commons/dbcp2/TestJndi.java
+
+	rm_tests
+
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar dist/${MY_PN}-${MY_PV}.jar ${PN}.jar
+	dodoc README.txt RELEASE-NOTES.txt
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-dbcp/metadata.xml b/dev-java/commons-dbcp/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-dbcp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-dbutils-1.6 b/dev-java/commons-dbutils-1.6
deleted file mode 100644
index 0efd3d2feb53..000000000000
--- a/dev-java/commons-dbutils-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/mockito:0 dev-java/ant-junit:0 dev-java/hamcrest-core:1.3 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A small set of classes designed to make working with JDBC easier
-EAPI=5
-HOMEPAGE=http://commons.apache.org/dbutils/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/dbutils/source/commons-dbutils-1.6-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=badcbb5a0e92dadbe94e7eeb54660047
diff --git a/dev-java/commons-dbutils/Manifest b/dev-java/commons-dbutils/Manifest
new file mode 100644
index 000000000000..b1d70630e856
--- /dev/null
+++ b/dev-java/commons-dbutils/Manifest
@@ -0,0 +1,4 @@
+AUX commons-dbutils-1.6-build.xml 11340 BLAKE2B 30ed67c7ccbc3df1818a8705228c92329014a3102f38d8fd5eaa503759f5bb41aea30a5568dacae4a7318fda70e4a3de243587774dd235e01e287298d5717ec6 SHA512 6f16181ab7224e60bc34257668f31c3a2e9939f6d400e7af6e5663586fe160c1eb337c0db36e9f4773be873ab85379b069470e4d5591d48cae1d237fafade6b8
+DIST commons-dbutils-1.6-src.tar.gz 90708 BLAKE2B 0793d19808d7baf492a80df50976b74354bb88768af71bfa5961de0fa8b7f7b4896962b4cf57b1ab2de912dbdf60c4374e2d2b9445b86c5e934c347bf840cb80 SHA512 05aa5fb448d949ac4d5d34f1219539e57cfb550fa423af0691cb35002984036b0de62b8f618199bd2f562a441867c5b7138e9204afc36bd6d0fa2c4c5e9cd2c6
+EBUILD commons-dbutils-1.6.ebuild 1101 BLAKE2B ce1031dd0df8474a51187b7a5c40faa36271022f75bf310b7b3b78d1d8921f0e53ec1f8adbd494fc07a03ae1db7040c881aa28c6e6fc154df4ce622ecf51c05e SHA512 b52607ae1238dcace398131f3fcb96a61f9cad70499b938efec1ce7738f66e7910e2f06fed5168e790339ae1cf7c4bab7842a3575237ed6c39fb579d7d991836
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild b/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild
new file mode 100644
index 000000000000..d50314e58713
--- /dev/null
+++ b/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A small set of classes designed to make working with JDBC easier"
+HOMEPAGE="http://commons.apache.org/dbutils/"
+SRC_URI="mirror://apache/commons/dbutils/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/mockito:0
+		dev-java/ant-junit:0
+		dev-java/hamcrest-core:1.3
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="
+	mockito
+	hamcrest-core-1.3
+"
+
+# Uses a bunch of deprecated methods.
+JAVA_RM_FILES=(
+	src/test/java/org/apache/commons/dbutils/handlers/ArrayHandlerTest.java
+)
+
+java_prepare() {
+	cp "${FILESDIR}"/"${P}-build.xml" build.xml || die
+}
+
+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-dbutils/files/commons-dbutils-1.6-build.xml b/dev-java/commons-dbutils/files/commons-dbutils-1.6-build.xml
new file mode 100644
index 000000000000..725d4eaca036
--- /dev/null
+++ b/dev-java/commons-dbutils/files/commons-dbutils-1.6-build.xml
@@ -0,0 +1,263 @@
+<?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 10/5/15 8:20 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="commons-dbutils-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="commons-dbutils-1.6"/>
+  <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.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"/>
+  <path id="build.test.classpath">
+    <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"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-all/1.3/hamcrest-all-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" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           encoding="iso-8859-1" 
+           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>
+    <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>
+
+  <!-- ====================================================================== -->
+  <!-- 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="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           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>
+    <mkdir dir="${maven.build.testOutputDir}/META-INF"/>
+    <copy todir="${maven.build.testOutputDir}/META-INF">
+      <fileset dir="${maven.build.testResourceDir.1}">
+        <include name="NOTICE.txt"/>
+        <include name="LICENSE.txt"/>
+      </fileset>
+    </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="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/TestBean.java"/>
+          <exclude name="**/BaseTestCase.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/BaseTestCase.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="false" 
+             encoding="iso-8859-1" 
+             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="iso-8859-1" 
+             source="1.6" 
+             linksource="true" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://docs.oracle.com/javaee/6/api/"/>
+    </javadoc>
+  </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="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/commons-dbutils/metadata.xml b/dev-java/commons-dbutils/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/commons-dbutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-digester-1.8.1-r2 b/dev-java/commons-digester-1.8.1-r2
deleted file mode 100644
index 9f9f4e93e289..000000000000
--- a/dev-java/commons-digester-1.8.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects
-EAPI=5
-HOMEPAGE=http://commons.apache.org/digester/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/digester/source/commons-digester-1.8.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f66137a2fbff87bf593c72c95c3fc283
diff --git a/dev-java/commons-digester-2.1-r1 b/dev-java/commons-digester-2.1-r1
deleted file mode 100644
index 82be012c5905..000000000000
--- a/dev-java/commons-digester-2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects
-EAPI=5
-HOMEPAGE=http://commons.apache.org/digester/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.1
-SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5b2b3bbc2c35d4cba73f564cc5bdbd08
diff --git a/dev-java/commons-digester-3.2-r2 b/dev-java/commons-digester-3.2-r2
deleted file mode 100644
index 6f0e292fab0c..000000000000
--- a/dev-java/commons-digester-3.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects
-EAPI=5
-HOMEPAGE=http://commons.apache.org/digester/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.2
-SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e55c359a6450415af0aa4a37ba7ce9a0
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
new file mode 100644
index 000000000000..7853c51edbf2
--- /dev/null
+++ b/dev-java/commons-digester/Manifest
@@ -0,0 +1,9 @@
+AUX 1.8.1-build.xml-jar-target.patch 1099 BLAKE2B e1ce425c943ebb36dd73447aa7d41c3fad20d22c75bc0d63d4137dd8be0afbeed4cf30a6ad48b24e5f3c9c1c018ce091c2a4d107aff8c62c161895c2bb78fcb8 SHA512 f28fd46608ca3817739ac4cdb07bf57ec28e0ebb22c3d086ef36567b44bb595b040dc27bb57a89f55568b8e4966b627f18829171908c14b4cced99787fc623c5
+AUX commons-digester-2.1-build.xml 12816 BLAKE2B 7309479a61897c3ecc28e6394714c1fb4691035f2f57f64f8dcccfab407a681e4ca2076ddf2cd783ec3bb0b726d38033b63c10444169d029fe39613ab0760c4c SHA512 f42f80e68e8b6d31b07add393e1adc1714278e9e8e6ccab08dfb6a131bdafeab1ae5c5859e81dabc5acff88d2151093d82a3e089293f653bcab307451839c0ef
+DIST commons-digester-1.8.1-src.tar.gz 303266 BLAKE2B 618885c812a9bf40c080bc5736b8b4be4e18fe4d2f732d2a44d39369ae6cf3beb3af0cf500da3d103d7aa8c18b41b84d06907b6fc90f7f10d30840d6cfc83012 SHA512 0a39069662b4792d4856b79b5cedc2b44cb70303a19045d21c233d45ae4dde9e80662bd242a381e759d7cdb5adaf0b9fa6206bb8397b53348fa9eac12e9a4e96
+DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88
+DIST commons-digester3-3.2-src.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
+EBUILD commons-digester-1.8.1-r2.ebuild 1334 BLAKE2B 041afef35e29c544ef5a55d636e1567282e9aa88f3777ee092563b0b69587eb73c0cd1a6d613a292d8cf59f79c324cc9239ff80fc0412dae51fb9606b5b447f8 SHA512 e86d5c4195016eccc3a76a78c70d9ced9ff0cb7b7fc5ba1cd49720e84d57f439cc3fb8ea206c7f9bee8cd5e13fbc20da6dcbbb53d8404c875e142cfd5d64eed2
+EBUILD commons-digester-2.1-r1.ebuild 1271 BLAKE2B 627edfe47d49d94e97b2d40773a4a55ccbc885bd95f5889500fd1a6662fb008d5d5efbf4727bec54e04e7a9e6fb6b412bf5425316aaeea5454ac86ff076cc3d6 SHA512 3b6b050868c748e172afcaa91f3f7632f265272cf9cf87a7d8aa24ae044dae92ebb60ab2ba05fc1bc7c5b823d22ea7597d856f7b0151cf4ad4dd2d545a035054
+EBUILD commons-digester-3.2-r2.ebuild 1346 BLAKE2B 569d0a11ac290485043abeaad1f6d5605e23e3c86e2514fddb14c90422499139056ae938d93d1f0c237740e7368844ca9a721f2a36a4c852e65f7d93e353f504 SHA512 380541befcf378f7446af7af0931fb3d95b682400b4fae1beb369a48d1ec807ecfb816a6a120085147924358ed17037027f03f9d9d049659342c3dc7a3882c0e
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
new file mode 100644
index 000000000000..ef48eccd8418
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
+HOMEPAGE="http://commons.apache.org/digester/"
+SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+CDEPEND="dev-java/commons-beanutils:1.7
+	>=dev-java/commons-collections-2.1:0
+	>=dev-java/commons-logging-1.0.2:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+# don't rewrite build.xml in examples
+JAVA_PKG_BSFIX_ALL="no"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-logging"
+
+java_prepare() {
+	epatch "${FILESDIR}/${PV}-build.xml-jar-target.patch"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+
+	dodoc RELEASE-NOTES.txt || die
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/org
+	use examples && java-pkg_doexamples src/examples
+}
diff --git a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
new file mode 100644
index 000000000000..a6546742511c
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
+HOMEPAGE="http://commons.apache.org/digester/"
+SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.1"
+KEYWORDS="amd64 ppc64 x86"
+
+CDEPEND="dev-java/commons-beanutils:1.7
+	>=dev-java/commons-collections-2.1:0
+	>=dev-java/commons-logging-1.0.2:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-logging"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${PN}.jar
+
+	dodoc RELEASE-NOTES.txt
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+	use examples && java-pkg_doexamples src/examples
+}
diff --git a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
new file mode 100644
index 000000000000..c818287d257f
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${PN}3-${PV}-src"
+
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
+HOMEPAGE="http://commons.apache.org/digester/"
+SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="amd64 ppc64 x86"
+
+CDEPEND="dev-java/cglib:3
+	dev-java/commons-beanutils:1.7
+	>=dev-java/commons-logging-1.0.2:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-logging,cglib-3"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}-2.1-build.xml build.xml || die
+
+	# Doesn't work.
+	rm -v src/test/java/org/apache/commons/digester3/Digester153TestCase.java
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${PN}.jar
+
+	dodoc RELEASE-NOTES.txt
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+	use examples && java-pkg_doexamples src/examples
+}
diff --git a/dev-java/commons-digester/files/1.8.1-build.xml-jar-target.patch b/dev-java/commons-digester/files/1.8.1-build.xml-jar-target.patch
new file mode 100644
index 000000000000..ec523a011458
--- /dev/null
+++ b/dev-java/commons-digester/files/1.8.1-build.xml-jar-target.patch
@@ -0,0 +1,27 @@
+--- build.xml.orig	2009-02-15 21:06:33.000000000 +0100
++++ build.xml	2009-02-15 21:07:25.000000000 +0100
+@@ -117,6 +117,7 @@
+     <pathelement location="${jaxp.jaxp.jar}"/>

+     <pathelement location="${jaxp.parser.jar}"/>

+     <pathelement location="${commons-beanutils.jar}"/>

++    <pathelement location="${commons-collections.jar}" />

+     <pathelement location="${commons-logging.jar}"/>

+     <pathelement location="${junit.jar}"/>

+   </path>

+@@ -140,6 +141,7 @@
+     <pathelement location="${junit.jar}"/>

+     <pathelement location="${jaxp.jaxp.jar}"/>

+     <pathelement location="${jaxp.parser.jar}"/>

++    <pathelement location="${commons-collections.jar}" />

+     <pathelement location="${commons-beanutils.jar}"/>

+     <pathelement location="${commons-logging.jar}"/>

+   </path>

+@@ -256,7 +258,7 @@
+     </javadoc>

+   </target>

+ 

+-  <target name="jar" depends="compile, test"

++  <target name="jar" depends="compile"

+    description="Create commons-digester.jar">

+     <mkdir      dir="${dist.home}"/>

+     <jar    jarfile="${dist.home}/commons-${component.name}.jar"

diff --git a/dev-java/commons-digester/files/commons-digester-2.1-build.xml b/dev-java/commons-digester/files/commons-digester-2.1-build.xml
new file mode 100644
index 000000000000..505df88a8abc
--- /dev/null
+++ b/dev-java/commons-digester/files/commons-digester-2.1-build.xml
@@ -0,0 +1,294 @@
+<?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 8/12/13 6:51 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="commons-digester-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="commons-digester"/>
+  <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="."/>
+  <property name="maven.build.resourceDir.1" 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">
+  </path>
+  <path id="build.test.classpath">
+  </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}" 
+           encoding="iso-8859-1" 
+           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>
+    <mkdir dir="${maven.build.outputDir}/META-INF"/>
+    <copy todir="${maven.build.outputDir}/META-INF">
+      <fileset dir="${maven.build.resourceDir.0}">
+        <include name="NOTICE.txt"/>
+        <include name="LICENSE.txt"/>
+      </fileset>
+    </copy>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.1}">
+        <include name="**/*.dtd"/>
+      </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="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}">
+        <include name="**/*.xml"/>
+        <include name="**/*.xsd"/>
+      </fileset>
+    </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="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/TestBean.java"/>
+          <exclude name="**/TestRule.java"/>
+          <exclude name="**/TestRuleSet.java"/>
+          <exclude name="**/Test*$*.java"/>
+		      <exclude name="**/*Abstract*.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/TestBean.java"/>
+          <exclude name="**/TestRule.java"/>
+          <exclude name="**/TestRuleSet.java"/>
+          <exclude name="**/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" 
+             encoding="iso-8859-1" 
+             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" 
+             source="1.5" 
+             linksource="true" 
+             breakiterator="false">
+      <link href="http://java.sun.com/javase/6/docs/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" 
+         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                                           -->
+  <!-- ====================================================================== -->
+
+  <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}/commons-beanutils/commons-beanutils/1.8.3"/>
+    <get src="http://repository.apache.org/snapshots/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar" 
+         dest="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar" 
+         dest="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/commons-logging/commons-logging/1.1.1"/>
+    <get src="http://repository.apache.org/snapshots/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" 
+         dest="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" 
+         dest="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.8.1"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/4.8.1/junit-4.8.1.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.1/junit-4.8.1.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/commons-digester/metadata.xml b/dev-java/commons-digester/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-digester/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-discovery-0.5 b/dev-java/commons-discovery-0.5
deleted file mode 100644
index c03e984e25dd..000000000000
--- a/dev-java/commons-discovery-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Commons Discovery: Service Discovery component
-EAPI=5
-HOMEPAGE=http://commons.apache.org/discovery/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/commons-discovery/commons-discovery/0.5/commons-discovery-0.5-sources.jar -> commons-discovery-0.5.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=edea299e3cdc24952c8b027d38257868
diff --git a/dev-java/commons-discovery/Manifest b/dev-java/commons-discovery/Manifest
new file mode 100644
index 000000000000..ff49e1430757
--- /dev/null
+++ b/dev-java/commons-discovery/Manifest
@@ -0,0 +1,3 @@
+DIST commons-discovery-0.5.jar 81725 BLAKE2B c7324c698199d28d05b4ef24b43b00b572c22a028337ac2d29386b4763ab3de22b194761ea282104704156a3641e79dd1414e07550c142b5343d89e9faab7166 SHA512 348e42df5e4e34fdaa49d638018e654119a9d4e2aad967ed2a6f2706e89ffb2ea5daa9ac86747fa1f6d7b245759fac1a80090c571a057be1cdf8cea3514936f3
+EBUILD commons-discovery-0.5.ebuild 627 BLAKE2B 47ce22a2b1c1ac973f8753234ca93534267e944e71afcc1eae254f8fbfc8bbcbffe7f5b4398efec31817dbd3b9b7cab99390952d797ec90ea3a91f7f2182598a SHA512 e7006ea19ccfefb978cc087f0bf142bf9b494400b5f9a84d56726800b293d28ff908ad55d99a0ed584df24f5d6a1152e92619afd1119e442882c8b6ef0271a2a
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-discovery/commons-discovery-0.5.ebuild b/dev-java/commons-discovery/commons-discovery-0.5.ebuild
new file mode 100644
index 000000000000..50bdebf25fc8
--- /dev/null
+++ b/dev-java/commons-discovery/commons-discovery-0.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Commons Discovery: Service Discovery component"
+HOMEPAGE="http://commons.apache.org/discovery/"
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/commons-logging:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_GENTOO_CLASSPATH="commons-logging"
diff --git a/dev-java/commons-discovery/metadata.xml b/dev-java/commons-discovery/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-discovery/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-el-1.0-r3 b/dev-java/commons-el-1.0-r3
deleted file mode 100644
index 5eaa0d48492d..000000000000
--- a/dev-java/commons-el-1.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=java-virtuals/servlet-api:2.5 >=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=EL is the JSP 2.0 Expression Language Interpreter from Apache
-EAPI=5
-HOMEPAGE=http://commons.apache.org/el/
-IUSE=elibc_FreeBSD source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-1.1
-RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/jakarta/commons/el/source/commons-el-1.0-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4cf831fcaa935ff30a082cb6b86aefd1
diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest
new file mode 100644
index 000000000000..63488d779190
--- /dev/null
+++ b/dev-java/commons-el/Manifest
@@ -0,0 +1,5 @@
+AUX commons-el-1.0-java-1.7-compiler.patch 738 BLAKE2B dd71cf204af414172484d5d537c3bd0acd8d3056eabfff95161d7b30db0490a611cf22cb07c76f8782e4543ab8760602ad391ac6f4de12def16468e096bef7a2 SHA512 b189a50f4de4f3362eec45a7dba4e5d4227aae30723180ddbebaae86949687ebb217d4bf28879723fdbcb1393a54dcbf9e14e543373faaeab3975c02e01e2807
+AUX commons-el-1.0-manifest 557 BLAKE2B 085ab2a725e32c7a277a9713f31f613637ea3be5c43e8e4d3134f0cfd996622b9472fc275776a9c03aa2b58fdeb430ddd7f6179e06a84fce24e209ba4ceadf1c SHA512 6f2eba221225f9842eef312519b8c92532be4e87732202d72ecb8c1182264d5219c70fe5c3517b2df8d43bd4f828e556ae57e7e145a4be811acf914ad6b3314e
+DIST commons-el-1.0-src.tar.gz 64009 BLAKE2B df9f6daa8b5a9d86a43f5fdf0e1608b04a5cb3e78dbf7cdce5ba7e484685c9e4271db22777661d07c89a4c792fc9c519b7efef484a41394ba5f1a3a7e302594c SHA512 51bee4a33816b2c7416f55bd2efe1e663350ca0b30b2b5a8f89154c51596df8481c736fa13576a9dad69b2da113728050c2c9b6f50125d38a36f45e4b82e2e83
+EBUILD commons-el-1.0-r3.ebuild 1204 BLAKE2B bb58285024b5392e4771a834b231c334526395f7c9edf2bd401ec4ac17f72d5cf29837b4e2c3569fa04751046c7684de3fda3785cc638ba0528a5ab0d2aaf660 SHA512 3a9bee59dc8b1c62040d1de1c177b73a55d690e1a6fec5649e7182eccf200f84257b4c3a50acc26758126df5c1d6fb67f590b04f35774a1ed0af3282fb1b1370
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-el/commons-el-1.0-r3.ebuild b/dev-java/commons-el/commons-el-1.0-r3.ebuild
new file mode 100644
index 000000000000..a7b3d71f48c2
--- /dev/null
+++ b/dev-java/commons-el/commons-el-1.0-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="EL is the JSP 2.0 Expression Language Interpreter from Apache"
+HOMEPAGE="http://commons.apache.org/el/"
+SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+COMMON_DEP="
+	java-virtuals/servlet-api:2.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-java-1.7-compiler.patch # BGO 486376
+	# Build.xml is broken, fix it
+	sed -i "s:../LICENSE:./LICENSE.txt:" build.xml || die "sed failed"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="servlet-api-2.5"
+EANT_EXTRA_ARGS="
+	-Dservletapi.build.notrequired=true
+	-Djspapi.build.notrequired=true"
+
+src_install() {
+	java-osgi_dojar-fromfile "dist/${PN}.jar" "${FILESDIR}/${P}-manifest" \
+		"Apache Commons EL"
+
+	dodoc LICENSE.txt RELEASE-NOTES.txt
+	dohtml STATUS.html PROPOSAL.html
+
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch b/dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch
new file mode 100644
index 000000000000..60f94c512a46
--- /dev/null
+++ b/dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch
@@ -0,0 +1,13 @@
+--- ./src/java/org/apache/commons/el/parser/ELParser.java.orig	2003-03-30 20:17:07.000000000 -0500
++++ ./src/java/org/apache/commons/el/parser/ELParser.java	2013-10-13 14:55:24.277749201 -0400
+@@ -1838,8 +1838,8 @@
+         jj_expentry[i] = jj_lasttokens[i];
+       }
+       boolean exists = false;
+-      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
+-        int[] oldentry = (int[])(enum.nextElement());
++      for (java.util.Enumeration enumx = jj_expentries.elements(); enumx.hasMoreElements();) {
++        int[] oldentry = (int[])(enumx.nextElement());
+         if (oldentry.length == jj_expentry.length) {
+           exists = true;
+           for (int i = 0; i < jj_expentry.length; i++) {
diff --git a/dev-java/commons-el/files/commons-el-1.0-manifest b/dev-java/commons-el/files/commons-el-1.0-manifest
new file mode 100644
index 000000000000..86777e8ec2f7
--- /dev/null
+++ b/dev-java/commons-el/files/commons-el-1.0-manifest
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Vendor: %vendorName
+Bundle-Localization: plugin
+Bundle-SymbolicName: org.apache.commons.el
+Bundle-Version: 1.0
+Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commons.el.parser;version="1.0.0"
+Import-Package: javax.servlet;version="2.4",javax.servlet.http;version="2.4",javax.servlet.jsp;version="2.0",
+ javax.servlet.jsp.el;version="2.0",javax.servlet.jsp.resources;version="2.0",
+ javax.servlet.jsp.tagext;version="2.0",javax.servlet.resources;version="2.4"
diff --git a/dev-java/commons-el/metadata.xml b/dev-java/commons-el/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-el/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-email-1.4 b/dev-java/commons-email-1.4
deleted file mode 100644
index f05e7bbe0e2d..000000000000
--- a/dev-java/commons-email-1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/oracle-javamail:0 test? ( dev-java/ant-junit:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Commons Email aims to provide an API for sending email.
-EAPI=5
-HOMEPAGE=http://commons.apache.org/email/
-IUSE=elibc_FreeBSD source doc test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/oracle-javamail:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/commons/email/source/commons-email-1.4-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=38eacc0fd6775f9c96e1f3103a586b2e
diff --git a/dev-java/commons-email/Manifest b/dev-java/commons-email/Manifest
new file mode 100644
index 000000000000..a0e3d4707e60
--- /dev/null
+++ b/dev-java/commons-email/Manifest
@@ -0,0 +1,4 @@
+AUX commons-email-1.4-build.xml 10956 BLAKE2B ed6aca64d4aa19035754ccff5c1acd4a8351d60144b2794c2116e8c0175a3cd1879d25afa97e9ca066d3f525481bd0ecd2ade32c152ec822cd1fe0ced7993cad SHA512 2555322efb15f1f4d26d78bea3638ae20b002c431891ec5ab8a45ef88df23b67f0ac0caf3fbba17e8f32fc2474eb09ae481bed05eb2b612386f31df5b0007cdb
+DIST commons-email-1.4-src.tar.gz 288876 BLAKE2B 17de5c947e68db988b5999ab95f122570a9f52f0557bbdb9a483676576a81d6cfb150058a0ed530bc8dde8732313839e320f4bd7ecfc088b483947dde5760441 SHA512 2a62256e284b9f4f428cf8544e46e81aa521476c41243df1c4f8a9e1bd4bcea3c768346aaab862b8c2a8b271c6012a38164c6d62867d2849a3ee0c2820fe422c
+EBUILD commons-email-1.4.ebuild 1089 BLAKE2B 017b1443086d1eee4e3778a95e8b2bf3ad1f06e5c8146448d57f1ab83917df2631f101f2a20c23d1cdc9e5705939152a7534eaab69f07ceec69c342af7d49799 SHA512 a85d7e3ec14da9425519bf15ba4f4e576fcf9ed0dc5c3482ed9ecde53168ea067b16bf0aef6b06668ff0b6a0a224a20b1943c3a834b73764b870b52676cddb83
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-email/commons-email-1.4.ebuild b/dev-java/commons-email/commons-email-1.4.ebuild
new file mode 100644
index 000000000000..ebcea82ec21e
--- /dev/null
+++ b/dev-java/commons-email/commons-email-1.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="source doc test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons Email aims to provide an API for sending email."
+HOMEPAGE="http://commons.apache.org/email/"
+SRC_URI="mirror://apache/commons/email/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+# Requires a slew of packages we don't ship yet.
+RESTRICT="test"
+
+CDEPEND="dev-java/oracle-javamail:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+	)
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="oracle-javamail"
+EANT_BUILD_TARGET="package"
+
+java_prepare() {
+	cp "${FILESDIR}/${P}-build.xml" build.xml || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "target/${P}.jar" "${PN}.jar"
+	dodoc {NOTICE,README,RELEASE-NOTES}.txt || die
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/commons-email/files/commons-email-1.4-build.xml b/dev-java/commons-email/files/commons-email-1.4-build.xml
new file mode 100644
index 000000000000..9fb5f0e373bf
--- /dev/null
+++ b/dev-java/commons-email/files/commons-email-1.4-build.xml
@@ -0,0 +1,261 @@
+<?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 9/29/15 9:53 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="commons-email-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="commons-email-1.4"/>
+  <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"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+  </path>
+  <path id="build.test.classpath">
+  </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>
+
+  <!-- ====================================================================== -->
+  <!-- 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="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.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>
+    <mkdir dir="${maven.build.testOutputDir}/META-INF"/>
+    <copy todir="${maven.build.testOutputDir}/META-INF">
+      <fileset dir="${maven.build.testResourceDir.1}">
+        <include name="NOTICE.txt"/>
+        <include name="LICENSE.txt"/>
+      </fileset>
+    </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="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="org/apache/commons/mail/mocks/*"/>
+          <exclude name="org/apache/commons/mail/settings/*"/>
+          <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="org/apache/commons/mail/mocks/*"/>
+          <exclude name="org/apache/commons/mail/settings/*"/>
+          <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="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,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="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/commons-email/metadata.xml b/dev-java/commons-email/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/commons-email/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-fileupload-1.3 b/dev-java/commons-fileupload-1.3
deleted file mode 100644
index ffd8cdb114cd..000000000000
--- a/dev-java/commons-fileupload-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=High-performance file upload capability to your servlets and web applications
-EAPI=5
-HOMEPAGE=http://commons.apache.org/fileupload/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/fileupload/source/commons-fileupload-1.3-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=483b6b4739391c1910eefef426937c70
diff --git a/dev-java/commons-fileupload/Manifest b/dev-java/commons-fileupload/Manifest
new file mode 100644
index 000000000000..8654c926c2f7
--- /dev/null
+++ b/dev-java/commons-fileupload/Manifest
@@ -0,0 +1,5 @@
+AUX 0001-Remove-bogous-manifest-entry.patch 744 BLAKE2B 88886753a79a47ed7400de168fe7e560173c3427108f44237c86290551e5abe381f5edf9a86ea506b7dcbdb2de5ce327b21fe89e1c920eec337b138ab51d588a SHA512 a952ea640ca36fd4e4f2fdf13053d4487a88bb5bc95a70909f8202d46dba1cca0d2aacab6d6fbcf3cf8dbc6cd9b3e7b7085963d4ab9b7bb31267a63a5c037db0
+AUX 0002-Fix-running-tests.patch 736 BLAKE2B 71723de12ca1b3f256c6a83357ecf4ca1f69a7aaa42bf822906851893741649a836953cb4067e036c960b4156c17d0efdc21c7f7ad76ac122693e8e69e7e8524 SHA512 c29c2c7d67214b940700cc50905fe879791c451686343a3a52fd840c95d8210663bf667548207d61d53b9967187ca468fa2dc439b56edc6bc137ce0c955fe289
+DIST commons-fileupload-1.3-src.tar.gz 137105 BLAKE2B bfb5a4604aa69d8490fb1e661d0f82c0851ac9281e8e0e43a2e5d68b9cb330556a8df9f67fe9c2b5eaa1f9b871b3fde2b9a8064f94d6d55f7d13f64d5150bce9 SHA512 dbaaef89eb8b4be3555f0736919234b42217e8b6a021dcd99c11d18462b39b10ba92e25bafda51d1b1fcc306c9becf3fb124d03debb66922ab5442197f6360d2
+EBUILD commons-fileupload-1.3.ebuild 1314 BLAKE2B 32d44b8e8567172ff72b79fecb33bee18bc8eff941b47e350b35797a3cc8ee8d151428dbb2803d50d5ec082285503e1743024b547dd0f5762889ec84a0f590f9 SHA512 c4f563ae6d2d0e0f313e2cb637bee659262a2a1929f08c495d4bbeb886fb6a12f387c2c99351e58fd753d9a48168c7c78cb38e7cf0d2a2190bd7967d3336e8cb
+MISC metadata.xml 749 BLAKE2B 88142a38969fdeab7a7ef48a0a72e78a24d3ec386cfcc5f8424833c026c3e2a135f02bad3eacc0fb0860633da5c71f85eda3db9d76ac52076c17cd2724236c56 SHA512 e18d72be4bcc733ced0cec17570803ff311fb9b31f28367ea2094779e0da40b379c20134fe2b4e81e9f21acd0372115671d41b7224c2f4a302123dc58d12a8ba
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
new file mode 100644
index 000000000000..c3bb05e55607
--- /dev/null
+++ b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance file upload capability to your servlets and web applications"
+HOMEPAGE="http://commons.apache.org/fileupload/"
+SRC_URI="mirror://apache/commons/fileupload/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/commons-io:1
+	dev-java/portletapi:1
+	java-virtuals/servlet-api:2.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+java_prepare() {
+	epatch "${FILESDIR}"/0001-Remove-bogous-manifest-entry.patch
+	epatch "${FILESDIR}"/0002-Fix-running-tests.patch
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="commons-io-1,portletapi-1,servlet-api-2.5"
+EANT_EXTRA_ARGS="-Dlibdir=target/lib"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}-SNAPSHOT.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch b/dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch
new file mode 100644
index 000000000000..0c5be867489d
--- /dev/null
+++ b/dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch
@@ -0,0 +1,29 @@
+From 88920db784bbb37c1043371548642a9ad529d600 Mon Sep 17 00:00:00 2001
+From: Ralph Sennhauser <sera@gentoo.org>
+Date: Sat, 20 Apr 2013 09:51:46 +0200
+Subject: [PATCH 1/2] Remove bogous manifest entry
+
+---
+ build.xml | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index b207f76..1e18fec 100644
+--- a/build.xml
++++ b/build.xml
+@@ -252,12 +252,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="${commons.manifestfile}" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+-- 
+1.8.1.5
+
diff --git a/dev-java/commons-fileupload/files/0002-Fix-running-tests.patch b/dev-java/commons-fileupload/files/0002-Fix-running-tests.patch
new file mode 100644
index 000000000000..0eb41212cd29
--- /dev/null
+++ b/dev-java/commons-fileupload/files/0002-Fix-running-tests.patch
@@ -0,0 +1,25 @@
+From ec99347a09caeae147c075813543fc839d5b4562 Mon Sep 17 00:00:00 2001
+From: Ralph Sennhauser <sera@gentoo.org>
+Date: Sat, 20 Apr 2013 09:57:06 +0200
+Subject: [PATCH 2/2] Fix running tests
+
+---
+ build.xml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/build.xml b/build.xml
+index 1e18fec..947f325 100644
+--- a/build.xml
++++ b/build.xml
+@@ -172,6 +172,8 @@
+           <include name="**/*Test.java"/>
+           <include name="**/*TestCase.java"/>
+           <exclude name="**/*Abstract*Test.java"/>
++	  <!-- base class without tests violationg naming scheme -->
++          <exclude name="**/FileUploadTestCase.java"/>
+         </fileset>
+       </batchtest>
+       <batchtest todir="${maven.test.reports}" if="test">
+-- 
+1.8.1.5
+
diff --git a/dev-java/commons-fileupload/metadata.xml b/dev-java/commons-fileupload/metadata.xml
new file mode 100644
index 000000000000..d4924df29b60
--- /dev/null
+++ b/dev-java/commons-fileupload/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Commons FileUpload package makes it easy to add robust,
+		high-performance, file upload capability to your servlets and web
+		applications.
+
+		FileUpload parses HTTP requests which conform to RFC 1867, "Form-based
+		File Upload in HTML". That is, if an HTTP request is submitted using the
+		POST method, and with a content type of "multipart/form-data", then
+		FileUpload can parse that request, and make the results available in a
+		manner easily used by the caller.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/commons-graph-0.1 b/dev-java/commons-graph-0.1
deleted file mode 100644
index e2c94a0fbfac..000000000000
--- a/dev-java/commons-graph-0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A toolkit for managing graphs and graph based data structures
-EAPI=5
-HOMEPAGE=https://commons.apache.org/sandbox/commons-graph/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/commons-graph-0.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3bcc8e0ca50aefdd14f5f8623ea62eb7
diff --git a/dev-java/commons-graph/Manifest b/dev-java/commons-graph/Manifest
new file mode 100644
index 000000000000..a52b50dbc8a0
--- /dev/null
+++ b/dev-java/commons-graph/Manifest
@@ -0,0 +1,4 @@
+AUX commons-graph-0.1-build.xml 11134 BLAKE2B 6a50f6ebc8e4efdf2aec653034d0f448d5e4f7a760d374c0c25a871225ab9f2e5cec1e4c1999b93f53cf16102ea6b15f70b3a94ea37e50b348438d6683e0e624 SHA512 a2ab4d7cccdf79b94ee5af661039cb520d7c16f8a868f00d6e2329286690edad94fd162eafa650daa411912b8f888e81e809184b94124f1c9436d0bdd009b160
+DIST commons-graph-0.1.tar.gz 96009 BLAKE2B 0914bebc5e4748a619396a5abc78c78edfce95d5c475d988185ea9d1735d57145a27b9139e91628e06c28c9adbb174945f1db9f21a605cb4dea305aae2064eaa SHA512 7214fd60eb348a7feee9c194f562e5a7cf1f211ba589d2a85eaae52ed3ced7089842405dfbd99413b1f06f87ea1a19d244989daa1e0f6fb857fa752647d52b16
+EBUILD commons-graph-0.1.ebuild 1104 BLAKE2B aeda64cc1c3b4bcd99ef73d5548e23ed8278328da6dc6fd639ebe6ba9e7d2606c2773174da5648b839f0303dff37833c86c444b26a51c98bb695fffdabd64ab9 SHA512 b15984281bd5662631daef2524984c2a9727f5851170ad17bef8f50fb2234f911584a302bd2ca19933428a4f4e851dafb3ecaa27903430355538ce6a59b24c0c
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-graph/commons-graph-0.1.ebuild b/dev-java/commons-graph/commons-graph-0.1.ebuild
new file mode 100644
index 000000000000..d62104317f83
--- /dev/null
+++ b/dev-java/commons-graph/commons-graph-0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A toolkit for managing graphs and graph based data structures"
+HOMEPAGE="https://commons.apache.org/sandbox/commons-graph/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_TEST_TARGET="test"
+
+# Dubious tests.
+JAVA_RM_FILES=(
+	src/test/java/org/apache/commons/graph/coloring/GraphColoringTestCase.java
+	src/test/java/org/apache/commons/graph/spanning/KruskalTestCase.java
+	src/test/java/org/apache/commons/graph/scc/TarjanTestCase.java
+)
+
+java_prepare() {
+	cp "${FILESDIR}"/"${P}-build.xml" build.xml || die
+}
+
+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-graph/files/commons-graph-0.1-build.xml b/dev-java/commons-graph/files/commons-graph-0.1-build.xml
new file mode 100644
index 000000000000..5c3a9c19cdd4
--- /dev/null
+++ b/dev-java/commons-graph/files/commons-graph-0.1-build.xml
@@ -0,0 +1,258 @@
+<?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 10/6/15 9:24 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="commons-graph-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="commons-graph-0.1"/>
+  <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="."/>
+  <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.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"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/com/carrotsearch/junit-benchmarks/0.3.0/junit-benchmarks-0.3.0-jdk15.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
+    <pathelement location="${maven.repo.local}/com/h2database/h2/1.3.158/h2-1.3.158.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="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>
+    <mkdir dir="${maven.build.outputDir}/META-INF"/>
+    <copy todir="${maven.build.outputDir}/META-INF">
+      <fileset dir="${maven.build.resourceDir.0}">
+        <include name="NOTICE.txt"/>
+        <include name="LICENSE.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="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+    <mkdir dir="${maven.build.testOutputDir}/META-INF"/>
+    <copy todir="${maven.build.testOutputDir}/META-INF">
+      <fileset dir="${maven.build.testResourceDir.1}">
+        <include name="NOTICE.txt"/>
+        <include name="LICENSE.txt"/>
+      </fileset>
+    </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="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+          <exclude name="**/TestRunner.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="false" 
+             encoding="iso-8859-1" 
+             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" 
+             source="1.6" 
+             linksource="true" 
+             breakiterator="false">
+      <link href="http://download.oracle.com/javase/6/docs/api/"/>
+      <link href="http://download.oracle.com/javaee/6/api/"/>
+    </javadoc>
+  </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="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/commons-graph/metadata.xml b/dev-java/commons-graph/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-graph/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-httpclient-3.1-r1 b/dev-java/commons-httpclient-3.1-r1
deleted file mode 100644
index 6542c3fa20e5..000000000000
--- a/dev-java/commons-httpclient-3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) dev-java/commons-logging:0 dev-java/commons-codec:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=The Jakarta Commons HttpClient library
-EAPI=5
-HOMEPAGE=http://hc.apache.org/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/commons-codec:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=3
-SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d209e71ee76f1ca05e8e498bea1d83a1
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
new file mode 100644
index 000000000000..6ad37d5e0003
--- /dev/null
+++ b/dev-java/commons-httpclient/Manifest
@@ -0,0 +1,4 @@
+AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12400 BLAKE2B 76cd9cff541adc08b987119de99e23ae50e2b849432aaab9431a760da67d4cb3ac53199ac7ca74393ee5d55a5d3c2148ffbffbfde005b7ff936da00620b94dac SHA512 3f20161688bcd40497747fc2e5802d12881d10a071c04a151d56b3603f81b4c14f56962b83ee72cc38d1e7a4e7e43e51426f00d06ec983feb23d8771df237c2a
+DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
+EBUILD commons-httpclient-3.1-r1.ebuild 1632 BLAKE2B a584dbf8ce2bacef3cbcb749a8e5d889df7c26cafb2d166d99a6779b1f18ebad39553f2ed6187a845df608f91a523197be993862738311476953e078f0944fd6 SHA512 bea8370ae920285691edec3c10062f585fc5537f3e4a038e79aa6f9fb6d4c23dbebfaf97ca75384467dee96519bd9cd454fa547379b22158783ce1db08357329
+MISC metadata.xml 456 BLAKE2B b4e2261943e4bd92d413eae20f60f23b79e7deb961d9c7e08f855f28cf69f0b45c5113a308138122a9cc4b42da1498e67c8be2093ce0252f60d5ef56ea55e72a SHA512 27c629a07a007dd4336cd50f4ea32156ec301b02f398b008c057532b36bc0698132282e32007ee31f0dd21f3f5664b3d7c9607fe43a4dfbbffb67d3000c3a661
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
new file mode 100644
index 000000000000..9afa77321024
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="The Jakarta Commons HttpClient library"
+HOMEPAGE="http://hc.apache.org/"
+SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+# doesn't work with IBM JDK, bug #176133
+RESTRICT="test"
+
+CDEPEND="dev-java/commons-logging:0
+	dev-java/commons-codec:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )
+	${CDEPEND}"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-logging,commons-codec"
+EANT_BUILD_TARGET="dist"
+EANT_DOC_TARGET="doc"
+
+java_prepare() {
+	# patch against CVE-2012-{5783,6153}. See bug 442292.
+	epatch "${FILESDIR}"/"${P}-SSLProtocolSocketFactory.java.patch"
+
+	# generated docs go into docs/api
+	rm -rf docs/apidocs
+
+	# remove javadoc task from compile task
+	sed -i -e 's/depends="compile,doc"/depends="compile"/' build.xml || die
+	sed -i -e '/link/ d' build.xml || die
+
+	mkdir lib && cd lib
+	java-pkg_filter-compiler jikes
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
+EANT_TEST_TARGET="test"
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	# contains both html docs and javadoc in correct subdir
+	if use doc ; then
+		java-pkg_dojavadoc dist/docs/api
+		java-pkg_dohtml -r dist/docs/*
+	fi
+	use source && java-pkg_dosrc src/java/*
+	use examples && java-pkg_doexamples src/examples
+}
diff --git a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch
new file mode 100644
index 000000000000..45df330092ab
--- /dev/null
+++ b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch
@@ -0,0 +1,369 @@
+--- src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
++++ src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
+@@ -31,10 +31,25 @@
+ package org.apache.commons.httpclient.protocol;
+ 
+ import java.io.IOException;
++import java.io.InputStream;
+ import java.net.InetAddress;
+ import java.net.Socket;
+ import java.net.UnknownHostException;
+-
++import java.security.cert.Certificate;
++import java.security.cert.CertificateParsingException;
++import java.security.cert.X509Certificate;
++import java.util.Arrays;
++import java.util.Collection;
++import java.util.Iterator;
++import java.util.LinkedList;
++import java.util.List;
++import java.util.Locale;
++import java.util.StringTokenizer;
++import java.util.regex.Pattern;
++
++import javax.net.ssl.SSLException;
++import javax.net.ssl.SSLSession;
++import javax.net.ssl.SSLSocket;
+ import javax.net.ssl.SSLSocketFactory;
+ 
+ import org.apache.commons.httpclient.ConnectTimeoutException;
+@@ -55,6 +70,11 @@
+      */
+     private static final SSLProtocolSocketFactory factory = new SSLProtocolSocketFactory();
+     
++    // This is a a sorted list, if you insert new elements do it orderdered.
++    private final static String[] BAD_COUNTRY_2LDS =
++        {"ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info",
++            "lg", "ne", "net", "or", "org"};
++    
+     /**
+      * Gets an singleton instance of the SSLProtocolSocketFactory.
+      * @return a SSLProtocolSocketFactory
+@@ -79,12 +99,14 @@
+         InetAddress clientHost,
+         int clientPort)
+         throws IOException, UnknownHostException {
+-        return SSLSocketFactory.getDefault().createSocket(
++        Socket sslSocket =  SSLSocketFactory.getDefault().createSocket(
+             host,
+             port,
+             clientHost,
+             clientPort
+         );
++        verifyHostName(host, (SSLSocket) sslSocket);
++        return sslSocket;
+     }
+ 
+     /**
+@@ -124,16 +146,19 @@
+         }
+         int timeout = params.getConnectionTimeout();
+         if (timeout == 0) {
+-            return createSocket(host, port, localAddress, localPort);
++            Socket sslSocket =  createSocket(host, port, localAddress, localPort);
++            verifyHostName(host, (SSLSocket) sslSocket);
++            return sslSocket;
+         } else {
+             // To be eventually deprecated when migrated to Java 1.4 or above
+-            Socket socket = ReflectionSocketFactory.createSocket(
++            Socket sslSocket = ReflectionSocketFactory.createSocket(
+                 "javax.net.ssl.SSLSocketFactory", host, port, localAddress, localPort, timeout);
+-            if (socket == null) {
+-                socket = ControllerThreadSocketFactory.createSocket(
++            if (sslSocket == null) {
++            	sslSocket = ControllerThreadSocketFactory.createSocket(
+                     this, host, port, localAddress, localPort, timeout);
+             }
+-            return socket;
++            verifyHostName(host, (SSLSocket) sslSocket);
++            return sslSocket;
+         }
+     }
+ 
+@@ -142,10 +167,12 @@
+      */
+     public Socket createSocket(String host, int port)
+         throws IOException, UnknownHostException {
+-        return SSLSocketFactory.getDefault().createSocket(
++        Socket sslSocket = SSLSocketFactory.getDefault().createSocket(
+             host,
+             port
+         );
++        verifyHostName(host, (SSLSocket) sslSocket);
++        return sslSocket;
+     }
+ 
+     /**
+@@ -157,13 +184,271 @@
+         int port,
+         boolean autoClose)
+         throws IOException, UnknownHostException {
+-        return ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(
++        Socket sslSocket = ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(
+             socket,
+             host,
+             port,
+             autoClose
+         );
++        verifyHostName(host, (SSLSocket) sslSocket);
++        return sslSocket;
++    }
++    
++
++    
++    
++    /**
++     * Verifies that the given hostname in certicifate is the hostname we are trying to connect to
++     * http://www.cvedetails.com/cve/CVE-2012-5783/
++     * @param host
++     * @param ssl
++     * @throws IOException
++     */
++    
++	private static void verifyHostName(String host, SSLSocket ssl)
++			throws IOException {
++		if (host == null) {
++			throw new IllegalArgumentException("host to verify was null");
++		}
++
++		SSLSession session = ssl.getSession();
++		if (session == null) {
++            // In our experience this only happens under IBM 1.4.x when
++            // spurious (unrelated) certificates show up in the server's chain.
++            // Hopefully this will unearth the real problem:
++			InputStream in = ssl.getInputStream();
++			in.available();
++            /*
++                 If you're looking at the 2 lines of code above because you're
++                 running into a problem, you probably have two options:
++
++                    #1.  Clean up the certificate chain that your server
++                         is presenting (e.g. edit "/etc/apache2/server.crt" or
++                         wherever it is your server's certificate chain is
++                         defined).
++
++                                             OR
++
++                    #2.   Upgrade to an IBM 1.5.x or greater JVM, or switch to a
++                          non-IBM JVM.
++              */
++
++            // If ssl.getInputStream().available() didn't cause an exception,
++            // maybe at least now the session is available?
++			session = ssl.getSession();
++			if (session == null) {
++                // If it's still null, probably a startHandshake() will
++                // unearth the real problem.
++				ssl.startHandshake();
++
++                // Okay, if we still haven't managed to cause an exception,
++                // might as well go for the NPE.  Or maybe we're okay now?
++				session = ssl.getSession();
++			}
++		}
++
++		Certificate[] certs = session.getPeerCertificates();
++		verifyHostName(host.trim().toLowerCase(Locale.US),  (X509Certificate) certs[0]);
++	}
++	/**
++	 * Extract the names from the certificate and tests host matches one of them
++	 * @param host
++	 * @param cert
++	 * @throws SSLException
++	 */
++
++	private static void verifyHostName(final String host, X509Certificate cert)
++			throws SSLException {
++        // I'm okay with being case-insensitive when comparing the host we used
++        // to establish the socket to the hostname in the certificate.
++        // Don't trim the CN, though.
++        
++		String cn = getCN(cert);
++		String[] subjectAlts = getDNSSubjectAlts(cert);
++		verifyHostName(host, cn.toLowerCase(Locale.US), subjectAlts);
++
++	}
++
++	/**
++	 * Extract all alternative names from a certificate.
++	 * @param cert
++	 * @return
++	 */
++	private static String[] getDNSSubjectAlts(X509Certificate cert) {
++		LinkedList subjectAltList = new LinkedList();
++		Collection c = null;
++		try {
++			c = cert.getSubjectAlternativeNames();
++		} catch (CertificateParsingException cpe) {
++			// Should probably log.debug() this?
++			cpe.printStackTrace();
++		}
++		if (c != null) {
++			Iterator it = c.iterator();
++			while (it.hasNext()) {
++				List list = (List) it.next();
++				int type = ((Integer) list.get(0)).intValue();
++				// If type is 2, then we've got a dNSName
++				if (type == 2) {
++					String s = (String) list.get(1);
++					subjectAltList.add(s);
++				}
++			}
++		}
++		if (!subjectAltList.isEmpty()) {
++			String[] subjectAlts = new String[subjectAltList.size()];
++			subjectAltList.toArray(subjectAlts);
++			return subjectAlts;
++		} else {
++			return new String[0];
++		}
++	        
++	}
++	/**
++	 * Verifies
++	 * @param host
++	 * @param cn
++	 * @param subjectAlts
++	 * @throws SSLException
++	 */
++
++	private static void verifyHostName(final String host, String cn, String[] subjectAlts)throws SSLException{
++		StringBuffer cnTested = new StringBuffer();
++
++		for (int i = 0; i < subjectAlts.length; i++){
++			String name = subjectAlts[i];
++			if (name != null) {
++				name = name.toLowerCase();
++				if (verifyHostName(host, name)){
++					return;
++				}
++				cnTested.append("/").append(name);
++			}				
++		}
++		if (cn != null && verifyHostName(host, cn)){
++			return;
++		}
++		cnTested.append("/").append(cn);
++		throw new SSLException("hostname in certificate didn't match: <"
++					+ host + "> != <" + cnTested + ">");
++		
++	}		
++	
++	private static boolean verifyHostName(final String host, final String cn){
++		if (doWildCard(cn) && !isIPAddress(host)) {
++			return matchesWildCard(cn, host);
++		} 
++		return host.equalsIgnoreCase(cn);		
++	}
++    private static boolean doWildCard(String cn) {
++		// Contains a wildcard
++		// wildcard in the first block
++    	// not an ipaddress (ip addres must explicitily be equal)
++    	// not using 2nd level common tld : ex: not for *.co.uk
++    	String parts[] = cn.split("\\.");
++    	return parts.length >= 3 &&
++    			parts[0].endsWith("*") &&
++    			acceptableCountryWildcard(cn) &&
++    			!isIPAddress(cn);
+     }
++    
++    
++	private static final Pattern IPV4_PATTERN = 
++			Pattern.compile("^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$");
++
++	private static final Pattern IPV6_STD_PATTERN = 
++			Pattern.compile("^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$");
++
++	private static final Pattern IPV6_HEX_COMPRESSED_PATTERN = 
++			Pattern.compile("^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$");
++
++
++	private static boolean isIPAddress(final String hostname) {
++		return hostname != null
++				&& (
++						IPV4_PATTERN.matcher(hostname).matches()
++						|| IPV6_STD_PATTERN.matcher(hostname).matches() 
++						|| IPV6_HEX_COMPRESSED_PATTERN.matcher(hostname).matches()
++		);
++
++	}
++
++	private static boolean acceptableCountryWildcard(final String cn) {
++		// The CN better have at least two dots if it wants wildcard action,
++		// but can't be [*.co.uk] or [*.co.jp] or [*.org.uk], etc...
++		// The [*.co.uk] problem is an interesting one. Should we just
++		// hope that CA's would never foolishly allow such a
++		// certificate to happen?
++    	
++		String[] parts = cn.split("\\.");
++		// Only checks for 3 levels, with country code of 2 letters.
++		if (parts.length > 3 || parts[parts.length - 1].length() != 2) {
++			return true;
++		}
++		String countryCode = parts[parts.length - 2];
++		return Arrays.binarySearch(BAD_COUNTRY_2LDS, countryCode) < 0;
++	}
++
++	private static boolean matchesWildCard(final String cn,
++			final String hostName) {
++		String parts[] = cn.split("\\.");
++		boolean match = false;
++		String firstpart = parts[0];
++		if (firstpart.length() > 1) {
++			// server∗
++			// e.g. server
++			String prefix =  firstpart.substring(0, firstpart.length() - 1);
++			// skipwildcard part from cn
++			String suffix = cn.substring(firstpart.length()); 
++			// skip wildcard part from host
++			String hostSuffix = hostName.substring(prefix.length());			
++			match = hostName.startsWith(prefix) && hostSuffix.endsWith(suffix);
++		} else {
++			match = hostName.endsWith(cn.substring(1));
++		}
++		if (match) {
++			// I f we're in strict mode ,
++			// [ ∗.foo.com] is not allowed to match [a.b.foo.com]
++			match = countDots(hostName) == countDots(cn);
++		}
++		return match;
++	}
++
++	private static int countDots(final String data) {
++		int dots = 0;
++		for (int i = 0; i < data.length(); i++) {
++			if (data.charAt(i) == '.') {
++				dots += 1;
++			}
++		}
++		return dots;
++	}
++
++	private static String getCN(X509Certificate cert) {
++        // Note:  toString() seems to do a better job than getName()
++        //
++        // For example, getName() gives me this:
++        // 1.2.840.113549.1.9.1=#16166a756c6975736461766965734063756362632e636f6d
++        //
++        // whereas toString() gives me this:
++        // EMAILADDRESS=juliusdavies@cucbc.com        
++		String subjectPrincipal = cert.getSubjectX500Principal().toString();
++		
++		return getCN(subjectPrincipal);
++
++	}
++	private static String getCN(String subjectPrincipal) {
++		StringTokenizer st = new StringTokenizer(subjectPrincipal, ",");
++		while(st.hasMoreTokens()) {
++			String tok = st.nextToken().trim();
++			if (tok.length() > 3) {
++				if (tok.substring(0, 3).equalsIgnoreCase("CN=")) {
++					return tok.substring(3);
++				}
++			}
++		}
++		return null;
++	}
+ 
+     /**
+      * All instances of SSLProtocolSocketFactory are the same.
diff --git a/dev-java/commons-httpclient/metadata.xml b/dev-java/commons-httpclient/metadata.xml
new file mode 100644
index 000000000000..fdd7102a2fc7
--- /dev/null
+++ b/dev-java/commons-httpclient/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Jakarta Commons HttpClient provides an efficient, up-to-date,
+		and feature-rich package implementing the client side of the most
+		recent HTTP standards and recommendations.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/commons-imaging-0.97 b/dev-java/commons-imaging-0.97
deleted file mode 100644
index 8ecb0b8a13e2..000000000000
--- a/dev-java/commons-imaging-0.97
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A minimalistic realtime charting library for Java
-EAPI=5
-HOMEPAGE=https://commons.apache.org/proper/commons-imaging
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/commons/sanselan/source/apache-sanselan-incubating-0.97-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0e0cae9dabdcec1ca49bd8115b1a3bb8
diff --git a/dev-java/commons-imaging/Manifest b/dev-java/commons-imaging/Manifest
new file mode 100644
index 000000000000..b6c759256aa3
--- /dev/null
+++ b/dev-java/commons-imaging/Manifest
@@ -0,0 +1,3 @@
+DIST apache-sanselan-incubating-0.97-src.tar.gz 33317875 BLAKE2B c9db6c30accc308d2c5d5977b84da118ab50b010b3728665a75dab13f9fecb70075e2d2208a62fabc57af7396f7c39b1ec498e0840e5a2c9c8de9b95d2dd597a SHA512 b7e8af01f4b4ca812313bbf573758d9c0e1355266bfb83898336b14c4b492a8979f2a593f00d53c076e83cf807a049df624491a26623cfbceb00560b748f05f2
+EBUILD commons-imaging-0.97.ebuild 1310 BLAKE2B 2afbfb353ca4b79b3213acdd2fb03407f2cd4bec788aaf1be04d1fcefad9c224074e359052972dd962f33a6da9cb66f9806431375fe000278d8e875456e97705 SHA512 c17518c2a4edc116b0311b5a9b97b56b8f6a098448ccea06b15c2b3832f339ff136d897d0c3d120f6deb0fde7947cdce7f40e01ae1c31ddaeb35fa8a87aa35e1
+MISC metadata.xml 1077 BLAKE2B 98e4703f30a0d7d650ced26c26df2ed283f28bf4cf9d208831279a351a4431f749f90ed891090706baa386175cafb67ecbb6dff7d0be39c8ad4910deab5578e5 SHA512 11d7112aa2a3d88305c1c8be811875f75095d60b877f754a6ec85ed763638a110385b18e8f9f9f44dbade41c064e3c5ef163e98de647074cae873a44e65b3705
diff --git a/dev-java/commons-imaging/commons-imaging-0.97.ebuild b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
new file mode 100644
index 000000000000..f8c2ba3f2ef3
--- /dev/null
+++ b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A minimalistic realtime charting library for Java"
+HOMEPAGE="https://commons.apache.org/proper/commons-imaging"
+SRC_URI="mirror://apache/commons/sanselan/source/apache-sanselan-incubating-${PV}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test" # 5/48 failures, dunno why :(
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/sanselan-${PV}-incubator"
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	# Tsk, Windows developers…
+	find src/test/java -name "*.java" -exec sed -i 's:\\:/:g' {} + || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.txt RELEASE_NOTES
+}
+
+src_test() {
+	local DIR="src/test/java"
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
+
+	local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "*BaseTest.java" ! -name SanselanTest.java ! -name ByteSourceTest.java)
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/commons-imaging/metadata.xml b/dev-java/commons-imaging/metadata.xml
new file mode 100644
index 000000000000..8c92e7356d5e
--- /dev/null
+++ b/dev-java/commons-imaging/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>Apache Commons Imaging, previously known as Apache Commons Sanselan, is a library that reads and writes a variety of image formats, including fast parsing of image info (size, color space, ICC profile, etc.) and metadata.
+
+This library is pure Java. Compared to typical image I/O libraries in native code, it's more portable, and should be more reliable and more secure against corrupt/malicious images, yet still performs reasonably well. It's easier to use than ImageIO/JAI/java.awt.Toolkit (Sun/Java's image support), supports more formats (and supports them more correctly). It also provides easy access to metadata.
+
+Imaging was working and was used by a number of projects in production even before version 1.0.</longdescription>
+	<upstream>
+		<remote-id type="github">apache/commons-imaging</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/commons-io-2.4 b/dev-java/commons-io-2.4
deleted file mode 100644
index 40672741a8ee..000000000000
--- a/dev-java/commons-io-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Utility classes, stream implementations, file filters, and endian classes
-EAPI=5
-HOMEPAGE=http://commons.apache.org/io/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://apache/commons/io/source/commons-io-2.4-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=feb908b65673b91e9d738dfab119e2c6
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
new file mode 100644
index 000000000000..988a8396ebad
--- /dev/null
+++ b/dev-java/commons-io/Manifest
@@ -0,0 +1,3 @@
+DIST commons-io-2.4-src.tar.gz 330961 BLAKE2B 1a1ae7c968bfc38b4a4f3c4c131de088c4efdd8fff0858e7493e057909076c74d4b0ebee1999ef01af9636d88600ecca71bb0808686a6f9c1a20f4d7a5cbe6e6 SHA512 69ac5f7b8de952d8b519ad89d4e9a33a9d269af0e68b735c0180ee8853a30e2a09147ceac362626a2fb3a041bd46eca094be2661ff280c1bab54a0548cae0aee
+EBUILD commons-io-2.4.ebuild 1558 BLAKE2B 72e6e2ac3f82e4ec4ae670309b8512cde13af0508e6daf9ab97b015b25aa62ded0f6e23a7242557242ed6d71b8ff64107a9288bb81387aebd9a4ebb78e66e995 SHA512 cb2bedb1bea8e6147bc957d67f6c3aa8ea71c433a2d4bad134bfe71f58cda58f36c0b4eb3b712b9176bac4e0a4ecfc5d6c8f2598f2c9ee8ad0b9631bf3827bde
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
new file mode 100644
index 000000000000..464bb54f6738
--- /dev/null
+++ b/dev-java/commons-io/commons-io-2.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_P=${P}-src
+DESCRIPTION="Utility classes, stream implementations, file filters, and endian classes"
+HOMEPAGE="http://commons.apache.org/io/"
+SRC_URI="mirror://apache/commons/io/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+EANT_EXTRA_ARGS="-Dcomponent.version=${PV}"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+java_prepare() {
+	# Setting java.io.tmpdir doesn't have effect unless we do this because the vm is forked
+	java-ant_xml-rewrite -f build.xml --change -e junit -a clonevm -v "true"
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]] ; then
+		ANT_OPTS="-Dskip.download=1 -Djava.io.tmpdir=${T} -Duser.home=${T}" \
+		ANT_TASKS="ant-junit" \
+			eant test \
+			-Dgentoo.classpath="$(java-pkg_getjars junit-4):${S}/src/test/resources" \
+			-Dlibdir="libdir" \
+			-Djava.io.tmpdir="${T}"
+	else
+		elog "Tests fail unless userpriv is enabled because they test for"
+		elog "file permissions which doesn't work when run as root."
+	fi
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	dodoc RELEASE-NOTES.txt
+	use doc && java-pkg_dojavadoc target/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-io/metadata.xml b/dev-java/commons-io/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-io/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-jelly-1.0-r8 b/dev-java/commons-jelly-1.0-r8
deleted file mode 100644
index 921a66ce6626..000000000000
--- a/dev-java/commons-jelly-1.0-r8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/dom4j:1 dev-java/junit:0 dev-java/jaxen:1.1 dev-java/commons-cli:1 dev-java/commons-lang:0 dev-java/commons-jexl:1.0 dev-java/commons-logging:0 dev-java/commons-discovery:0 dev-java/commons-collections:0 dev-java/commons-beanutils:1.7 dev-java/tomcat-jstl-spec:0 java-virtuals/servlet-api:3.0 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java and XML based scripting and processing engine
-EAPI=5
-HOMEPAGE=http://commons.apache.org/jelly/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/dom4j:1 dev-java/junit:0 dev-java/jaxen:1.1 dev-java/commons-cli:1 dev-java/commons-lang:0 dev-java/commons-jexl:1.0 dev-java/commons-logging:0 dev-java/commons-discovery:0 dev-java/commons-collections:0 dev-java/commons-beanutils:1.7 dev-java/tomcat-jstl-spec:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://apache/jakarta/commons/jelly/source/commons-jelly-1.0-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6e3268e5e735ac7c12bc9ab7b56d1bda
diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest
new file mode 100644
index 000000000000..02c52ccc412c
--- /dev/null
+++ b/dev-java/commons-jelly/Manifest
@@ -0,0 +1,4 @@
+AUX commons-jelly-1.0-gentoo.patch 2224 BLAKE2B bc79266243cf9016690cecfc414076f4aaa67a8b10074ccd77971c4b8f00d251315712d8769ef58c188cb67f3534b16946beabbb3c31d3d2601eb7b018949629 SHA512 726b64273320f1a089ce9d9b8121359cc377e070ce4b49155de52ce31559d0601b137fb6e208b8c5ab696c64224047592c26957ad3d7a49dc390b523c821f7b5
+DIST commons-jelly-1.0-src.tar.gz 174769 BLAKE2B 2dc43eef28c76252976616f0509aacbfed31ec0b99916730d86d084ec54bacc4f49000d04a953002717670d17a4ae2ae7249d57b327258414c3515dbb8abde7f SHA512 a72ae2dc8eea3fc19838f386dca38807a16326a3a93f483219212844f8ec033088b7721c78a4370f78a06cbee0c685144a2b16f171d54134822d06f653bcef35
+EBUILD commons-jelly-1.0-r8.ebuild 1539 BLAKE2B 09c197747867e4ffe01db3ac58a63dbefdb4ade35a1d2ccd10882ce2055e35c23ddde0ef9cbbdffbb51d10fbccce2bb1e8f16aa952d04cd559c81c79c91aff77 SHA512 b6cffabfdb0087b8a42492d19e413093e65d3146f0843ab8246791509376d1870996acabc9dd9e9eb9807993957f962f663b7c03ab779d4fbbfa6663c7a8a504
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
new file mode 100644
index 000000000000..00885443116b
--- /dev/null
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+DESCRIPTION="A Java and XML based scripting and processing engine"
+HOMEPAGE="http://commons.apache.org/jelly/"
+SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/dom4j:1
+	dev-java/junit:0
+	dev-java/jaxen:1.1
+	dev-java/commons-cli:1
+	dev-java/commons-lang:0
+	dev-java/commons-jexl:1.0
+	dev-java/commons-logging:0
+	dev-java/commons-discovery:0
+	dev-java/commons-collections:0
+	dev-java/commons-beanutils:1.7
+	dev-java/tomcat-jstl-spec:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	# disables dependency fetching, and remove tests as a dependency of jar
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dlibdir=."
+EANT_GENTOO_CLASSPATH="
+	commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
+	commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec
+	jaxen-1.1,junit,servlet-api-3.0"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch b/dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch
new file mode 100644
index 000000000000..8fafca81ea79
--- /dev/null
+++ b/dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch
@@ -0,0 +1,59 @@
+diff -ru commons-jelly-1.0-src/build.xml commons-jelly-1.0-src-patched/build.xml
+--- commons-jelly-1.0-src/build.xml	2005-06-16 10:39:44.000000000 -0400
++++ commons-jelly-1.0-src-patched/build.xml	2005-09-04 19:39:19.000000000 -0400
+@@ -37,6 +37,8 @@
+   <property name="proxy.password" value="">

+   </property>

+   <path id="build.classpath">

++	<fileset dir="${libdir}" includes="**/*.jar"/>

++	<!--

+     <pathelement location="${libdir}/servletapi/jars/servletapi-2.3.jar">

+     </pathelement>

+     <pathelement location="${libdir}/commons-cli/jars/commons-cli-1.0.jar">

+@@ -67,6 +69,7 @@
+     </pathelement>

+     <pathelement location="${libdir}/xerces/jars/xerces-2.2.1.jar">

+     </pathelement>

++	-->

+   </path>

+   <target name="init" description="o Initializes some properties">

+     <mkdir dir="${libdir}">

+@@ -92,7 +95,7 @@
+       </and>

+     </condition>

+   </target>

+-  <target name="compile" description="o Compile the code" depends="get-deps">

++  <target name="compile" description="o Compile the code" depends="">

+     <mkdir dir="${classesdir}">

+     </mkdir>

+     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">

+@@ -120,10 +123,12 @@
+     <copy todir="${classesdir}/META-INF" file="${basedir}/LICENSE.txt">

+     </copy>

+   </target>

+-  <target name="jar" description="o Create the jar" depends="compile,test">

++

++  <target name="jar" description="o Create the jar" depends="compile">

+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">

+     </jar>

+   </target>

++

+   <target name="clean" description="o Clean up the generated directories">

+     <delete dir="${defaulttargetdir}">

+     </delete>

+@@ -213,7 +218,7 @@
+       </fileset>

+     </copy>

+   </target>

+-  <target name="javadoc" description="o Generate javadoc" depends="get-deps">

++  <target name="javadoc" description="o Generate javadoc" depends="">

+     <mkdir dir="${javadocdir}">

+     </mkdir>

+     <tstamp>

+@@ -432,4 +437,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">

+     </unjar>

+   </target>

+-</project>
+\ No newline at end of file
++</project>

diff --git a/dev-java/commons-jelly/metadata.xml b/dev-java/commons-jelly/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-jelly/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-jexl-1.1-r1 b/dev-java/commons-jexl-1.1-r1
deleted file mode 100644
index c01ce3313a59..000000000000
--- a/dev-java/commons-jexl-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit ) dev-java/commons-logging dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Expression language engine, can be embedded in applications and frameworks
-EAPI=5
-HOMEPAGE=http://commons.apache.org/jexl/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=mirror://apache/jakarta/commons/jexl/source/commons-jexl-1.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=433e7a610ad54ea8225bc23b3a089bef
diff --git a/dev-java/commons-jexl-2.1.1 b/dev-java/commons-jexl-2.1.1
deleted file mode 100644
index 875def8bfb8a..000000000000
--- a/dev-java/commons-jexl-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/javacc-5 test? ( dev-java/ant-junit:0 ) dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Expression language engine, can be embedded in applications and frameworks
-EAPI=5
-HOMEPAGE=http://commons.apache.org/jexl/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=mirror://apache/commons/jexl/source/commons-jexl-2.1.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=286570409a811a1be618db0ab146fdc1
diff --git a/dev-java/commons-jexl/Manifest b/dev-java/commons-jexl/Manifest
new file mode 100644
index 000000000000..fc83aa01cc88
--- /dev/null
+++ b/dev-java/commons-jexl/Manifest
@@ -0,0 +1,7 @@
+AUX 1.1-test-target.patch 607 BLAKE2B 93abe546683310bb4ac0937a4a1ee9ebe8f7f72e5e21bc6c9fbec16d2bf0c90a1b9e7cb53fa95a77bd759c7caf6f0148ace69a7d381e7c66324ebfe18480eefb SHA512 cd01b044ca4e4671b6419ea17cd6a316ab7ff709a08d2999d8b34881b814a48470fe495b2d6c468a5738f1284dbe9e1aabc8d5effbc0a86f210f9757893a3668
+AUX 2.1.1-build.xml 5742 BLAKE2B 900957b362f993314f47b09cbfd2f86c641b685be795c837e8af676a632b28b6638debaffe6208fc62b87d7f9df7bfb701ce69aaeb6b0c0602b25e1a78e9c16b SHA512 f19df3e608bdb85681e90e3e331b1920e9c9be2fa43da38cb9eecc9c569d0254ed5a75dd10962442477e076495bf63e902204f49545140a86c5392a4c6bd78ad
+DIST commons-jexl-1.1-src.tar.gz 128030 BLAKE2B 9694077640cf54e9621a2860fbfa5eae8c7135447e39b64147180db1b859f68b2fe610f161ceca71a432fe2216ebac2386e00ea3ba7e27bd687736a5aa39e95c SHA512 d403e945060385c4546cf173af9ec4a795c074a9b56aacdf16f301b875c9f78b47a91fdfb84059805a082466d8a4a371bcb6ef6336e6ba806272ad8e2cce9e13
+DIST commons-jexl-2.1.1-src.tar.gz 208559 BLAKE2B 031095ab8549f295e99048873ebc5eee2ebce2e79bdef28afec4ea3adef051cc397ca8740b3d9c2a2c02c51555b3ab3b7c79c0222368fdf6c652e4ed2369d7e4 SHA512 259c0956bb10f102cb3d860b1c99d3d2b2bc5d705e4160f743fa774640ed8c1ee6f3aad518a8a69e8f94a164b21cb2ae26e47cd3e81e92a086a3c3f753befacb
+EBUILD commons-jexl-1.1-r1.ebuild 1085 BLAKE2B 38dcda95f91f900a9d5ab4fafaba57f0840599cfba0741582ab1a78300da4a4f651cf5d1d2e8d176c0f5aa7f5f0abf0d5e48abd7037f74fa90e1093b345cd99b SHA512 96f6a5e42eabac7408059b0fd9fe229135857afc377a9d5b8626cc06bc1ef81c13cc0a7d18377231f3534705a3167538a7e72b480478faaa01a20dffe7f0f240
+EBUILD commons-jexl-2.1.1.ebuild 1563 BLAKE2B 7cae693c0acd225a5e318d0ac191ff24d955ed3cf16ba0ba75f596af07682d32af75331db21017746b16dd61a4527f3bbe31f95f55f1cc72bed4b5bca3e38b27 SHA512 f0a13af541986aa9bb54148d88716f2e8fdb4ed2ce17eca0d163c71e8cc1cca7cab1412ddc768ddc505417e03703bb9a1a5ea177aeefa3c58f54586614c7c266
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
new file mode 100644
index 000000000000..236a5c1dcd70
--- /dev/null
+++ b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Expression language engine, can be embedded in applications and frameworks"
+HOMEPAGE="http://commons.apache.org/jexl/"
+SRC_URI="mirror://apache/jakarta/commons/jexl/source/${P}-src.tar.gz"
+
+CDEPEND="dev-java/commons-logging
+		dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/ant-junit )
+	${CDEPEND}"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	# https://issues.apache.org/jira/browse/JEXL-31
+	epatch "${FILESDIR}/${PV}-test-target.patch"
+
+	mkdir -p target/lib && cd target/lib
+	java-pkg_jar-from junit junit.jar
+	java-pkg_jar-from commons-logging
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}*.jar
+	dodoc RELEASE-NOTES.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc "${S}"/src/java/*
+}
diff --git a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
new file mode 100644
index 000000000000..56f6b9d70a55
--- /dev/null
+++ b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Expression language engine, can be embedded in applications and frameworks"
+HOMEPAGE="http://commons.apache.org/jexl/"
+SRC_URI="mirror://apache/commons/jexl/source/${P}-src.tar.gz"
+
+CDEPEND="dev-java/commons-logging:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	>=dev-java/javacc-5
+	test? ( dev-java/ant-junit:0 )
+	${CDEPEND}"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-logging"
+
+# Dubious tests.
+JAVA_RM_FILES=(
+	src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
+)
+
+java_prepare() {
+	cp "${FILESDIR}"/${PV}-build.xml build.xml || die
+
+	# these two calls is what the "jjtree-javacc" goal in the pom.xml does
+	jjtree -OUTPUT_DIRECTORY="${S}/src/main/java/org/apache/commons/jexl2/parser/" \
+		src/main/java/org/apache/commons/jexl2/parser/Parser.jjt \
+		|| die "Code generation via jjtree failed"
+	javacc -OUTPUT_DIRECTORY="${S}/src/main/java/org/apache/commons/jexl2/parser/" \
+		src/main/java/org/apache/commons/jexl2/parser/Parser.jj \
+		|| die "Parser.java code generation via javacc failed"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	dodoc RELEASE-NOTES.txt NOTICE.txt
+	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
+	use source && java-pkg_dosrc "${S}"/src/main/java/*
+}
diff --git a/dev-java/commons-jexl/files/1.1-test-target.patch b/dev-java/commons-jexl/files/1.1-test-target.patch
new file mode 100644
index 000000000000..54a3d3e9bce0
--- /dev/null
+++ b/dev-java/commons-jexl/files/1.1-test-target.patch
@@ -0,0 +1,12 @@
+diff -ur commons-jexl-1.1-src.old/build.xml commons-jexl-1.1-src/build.xml
+--- commons-jexl-1.1-src.old/build.xml	2006-12-26 19:39:18.000000000 +0200
++++ commons-jexl-1.1-src/build.xml	2006-12-26 19:39:34.000000000 +0200
+@@ -62,7 +62,7 @@
+       </fileset>

+     </copy>

+   </target>

+-  <target name="jar" description="o Create the jar" depends="compile,test">

++  <target name="jar" description="o Create the jar" depends="compile">

+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}" manifest="src/conf/MANIFEST.MF">

+     </jar>

+   </target>

diff --git a/dev-java/commons-jexl/files/2.1.1-build.xml b/dev-java/commons-jexl/files/2.1.1-build.xml
new file mode 100644
index 000000000000..d0bf54ef3571
--- /dev/null
+++ b/dev-java/commons-jexl/files/2.1.1-build.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>

+

+<project name="commons-jexl-from-maven" default="package" basedir=".">

+	<property file="${user.home}/.m2/maven.properties" />

+	<property file="maven-build.properties" />

+

+	<property name="maven.build.finalName" value="commons-jexl" />

+	<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.repo.local" value="${user.home}/.m2/repository" />

+	<property name="maven.settings.offline" value="false" />

+	<property name="maven.settings.interactiveMode" value="true" />

+

+	<path id="build.classpath"/>

+	<path id="build.test.classpath" />

+

+	<target name="clean" description="Clean the output directory">

+		<delete dir="${maven.build.dir}" />

+	</target>

+

+	<target name="compile" description="Compile the code">

+		<mkdir dir="${maven.build.outputDir}" />

+		<javac destdir="${maven.build.outputDir}" encoding="iso-8859-1" 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>

+		<mkdir dir="${maven.build.outputDir}/META-INF" />

+	</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="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>

+		<mkdir dir="${maven.build.testOutputDir}/META-INF" />

+	</target>

+

+	<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" />

+					<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>

+

+	<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="iso-8859-1" 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" source="1.5" linksource="true" breakiterator="false">

+		</javadoc>

+	</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">

+		</jar>

+	</target>

+

+	<target name="jar" depends="package" description="Builds the jar for the application" />

+

+	<target name="test-offline">

+		<condition property="maven.mode.offline">

+			<equals arg1="${maven.settings.offline}" arg2="true" />

+		</condition>

+	</target>

+</project>

diff --git a/dev-java/commons-jexl/metadata.xml b/dev-java/commons-jexl/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-jexl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-jxpath-1.3-r3 b/dev-java/commons-jxpath-1.3-r3
deleted file mode 100644
index d2e10e8a289a..000000000000
--- a/dev-java/commons-jxpath-1.3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/jdom:0 java-virtuals/servlet-api:3.0 dev-java/commons-beanutils:1.7 test? ( dev-java/ant-junit:0 dev-java/commons-logging:0 dev-java/commons-collections:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Applies XPath expressions to graphs of objects of all kinds
-EAPI=5
-HOMEPAGE=http://commons.apache.org/jxpath/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jdom:0 java-virtuals/servlet-api:3.0 dev-java/commons-beanutils:1.7 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz -> commons-jxpath-1.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4894d3e11fd77f06d93164f624fbede9
diff --git a/dev-java/commons-jxpath-1.3-r4 b/dev-java/commons-jxpath-1.3-r4
deleted file mode 100644
index b164c43600ff..000000000000
--- a/dev-java/commons-jxpath-1.3-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/jdom:0 java-virtuals/servlet-api:3.0 dev-java/commons-beanutils:1.7 test? ( dev-java/ant-junit:0 dev-java/commons-logging:0 dev-java/commons-collections:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Applies XPath expressions to graphs of objects of all kinds
-EAPI=6
-HOMEPAGE=https://commons.apache.org/jxpath/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jdom:0 java-virtuals/servlet-api:3.0 dev-java/commons-beanutils:1.7 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz -> commons-jxpath-1.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f2ea76224a3504fc1e3cfbefda21b1e5
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
new file mode 100644
index 000000000000..cccd22fbe07b
--- /dev/null
+++ b/dev-java/commons-jxpath/Manifest
@@ -0,0 +1,4 @@
+DIST commons-jxpath-1.3.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
+EBUILD commons-jxpath-1.3-r3.ebuild 1418 BLAKE2B c79ac6ce0e52a8e9d7742ff1dfb270a500ad79329c8cbbf64d7b6c8c4be773f8b64dcd36520fa1241c92e4151c8b9aa73bbe2853fa5260e73307e3be08824780 SHA512 ce9597f2e492e2d7d346d8ef74f50395c5a40bf0b143a06544f49c2aa3f40832aa5425925b864b425584df7070401ec6777ca05bce4409c94346d93c0960ce37
+EBUILD commons-jxpath-1.3-r4.ebuild 1427 BLAKE2B 080e1600ea5b3733a56b4b455b87892713a81fbf2b5a9d910526ee16cd275259ec81ebeb90bf4888c9033228c32fef719331d01b0977c8bfdb401969a1b6ba48 SHA512 ffc15c19ad39277d0f2d2977985762e4d77dfc92d210eb7fe2cd64215a5e4f3ef4986af21b001cabff21a4e4c97e8648f5a658a3eb12abf5b8514438185bb65a
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
new file mode 100644
index 000000000000..270da007b138
--- /dev/null
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
+HOMEPAGE="http://commons.apache.org/jxpath/"
+SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+S="${WORKDIR}/${P}-src"
+
+CDEPEND="
+	dev-java/jdom:0
+	java-virtuals/servlet-api:3.0
+	dev-java/commons-beanutils:1.7"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/commons-logging:0
+		dev-java/commons-collections:0
+	)
+	>=virtual/jdk-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="jdom,servlet-api-3.0,commons-beanutils-1.7"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-logging,commons-collections,ant-junit"
+ANT_TASKS="ant-junit"
+EANT_TEST_TARGET="test"
+
+# This one needs mockrunner. See #259027.
+JAVA_RM_FILES=(
+	src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
+)
+
+java_prepare() {
+	# Don't automatically run tests.
+	sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild
new file mode 100644
index 000000000000..bc77ab2d8ed2
--- /dev/null
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
+HOMEPAGE="https://commons.apache.org/jxpath/"
+SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+S="${WORKDIR}/${P}-src"
+
+CDEPEND="
+	dev-java/jdom:0
+	java-virtuals/servlet-api:3.0
+	dev-java/commons-beanutils:1.7"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/commons-logging:0
+		dev-java/commons-collections:0
+	)
+	>=virtual/jdk-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="jdom,servlet-api-3.0,commons-beanutils-1.7"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-logging,commons-collections,ant-junit"
+ANT_TASKS="ant-junit"
+EANT_TEST_TARGET="test"
+
+src_prepare() {
+	default
+
+	# Don't automatically run tests.
+	sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
+
+	# This one needs mockrunner. See #259027.
+	rm -v src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-jxpath/metadata.xml b/dev-java/commons-jxpath/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-jxpath/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-lang-2.0-r3 b/dev-java/commons-lang-2.0-r3
deleted file mode 100644
index f00c682eef55..000000000000
--- a/dev-java/commons-lang-2.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Jakarta components to manipulate core java classes
-EAPI=5
-HOMEPAGE=http://commons.apache.org/lang/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/jakarta/commons/lang/source/commons-lang-2.0-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4d97c7f6dca2e4a6f6c38d312a771172
diff --git a/dev-java/commons-lang-2.6-r1 b/dev-java/commons-lang-2.6-r1
deleted file mode 100644
index 58d2c6b51aac..000000000000
--- a/dev-java/commons-lang-2.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Commons components to manipulate core java classes
-EAPI=5
-HOMEPAGE=http://commons.apache.org/lang/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.1
-SRC_URI=mirror://apache/commons/lang/source/commons-lang-2.6-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ef2a6f83437b6f25b8ae7a6ce60bcb2d
diff --git a/dev-java/commons-lang-3.1 b/dev-java/commons-lang-3.1
deleted file mode 100644
index 9227f2d0e69a..000000000000
--- a/dev-java/commons-lang-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Commons components to manipulate core java classes
-EAPI=5
-HOMEPAGE=http://commons.apache.org/lang/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=104e8d9f1183db97fcf2cd8633a51f1d
diff --git a/dev-java/commons-lang-3.3.2 b/dev-java/commons-lang-3.3.2
deleted file mode 100644
index 14c766a6ad00..000000000000
--- a/dev-java/commons-lang-3.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 !ppc? ( !ppc64? ( test? ( dev-java/ant-junit4 dev-java/commons-io:1 dev-java/easymock:3.2 ) ) ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Commons components to manipulate core java classes
-EAPI=5
-HOMEPAGE=http://commons.apache.org/lang/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=ppc? ( test ) ppc64? ( test )
-SLOT=3.3
-SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.3.2-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c76042258b5a2728aefda28543c2bdf6
diff --git a/dev-java/commons-lang-3.4 b/dev-java/commons-lang-3.4
deleted file mode 100644
index f275c239d2a4..000000000000
--- a/dev-java/commons-lang-3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 !ppc? ( !ppc64? ( test? ( dev-java/ant-junit4 dev-java/commons-io:1 dev-java/easymock:3.2 ) ) ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Commons components to manipulate core java classes
-EAPI=5
-HOMEPAGE=http://commons.apache.org/lang/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=ppc? ( test ) ppc64? ( test )
-SLOT=3.4
-SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.4-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7eb0f5a34b832a51d86bbe5da479e649
diff --git a/dev-java/commons-lang-3.6 b/dev-java/commons-lang-3.6
deleted file mode 100644
index 7dffbdbfefa8..000000000000
--- a/dev-java/commons-lang-3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/easymock:3.2 dev-java/commons-io:1 >=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Commons components to manipulate core java classes
-EAPI=6
-HOMEPAGE=http://commons.apache.org/lang
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/easymock:3.2 dev-java/commons-io:1 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.6
-SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.6-src.tar.gz -> commons-lang-3.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d4a2e7d11cc659395d64772e59f2df47
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
new file mode 100644
index 000000000000..aa4399ecf4e2
--- /dev/null
+++ b/dev-java/commons-lang/Manifest
@@ -0,0 +1,13 @@
+DIST commons-lang-2.0-src.tar.gz 440989 BLAKE2B d71d73504c740138bdb9c1e190e0f4e846fb08a35d8ee2430ac2e24b0094e83cfc8cab9eaa44230c0d7fd26ec768bf7b448f04e123467acc20d49af6efe3008b SHA512 aecbbdd8eb2712981dcd8615bac2ec69e3ea7ae137407287d2a9b3eeaddb48e5367bc9c5cb8d232429ac6091548dac8af67e0593366365c04fcfe39984c3e549
+DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87
+DIST commons-lang-3.6.tar.gz 852347 BLAKE2B 4a3ad5f557d27e4a109f6e65f9fe8d792b017376227747669bf949725cdc3817a7f14766e121db099e027fc3c322eeb3f68c41786be9a8d500172cfd3c104c7f SHA512 fb627605154c1b3d4561c27ad931bfcac43303ce98ffca8fca538ce6368506cdd2b80de7f22a93ca628e86804923940dd9909bb884c77ca196b654521febc60a
+DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560
+DIST commons-lang3-3.3.2-src.tar.gz 740462 BLAKE2B dbf8fe7f6a4bb0cf462e2281d709e4ecd65e5fa116bb707af14a2b7b248eb1877f872f937fde2e5743bbe9b4775fabd1d0897ebeb8ebe92af235914cac7dbc2f SHA512 be889e0e9d7aaa7d6635e41c17d19dd1e5f9e03fd78eac61fd5f5483321170b9a72007ad0bfa7023e6ff55ae418b40eaa01dae350641c4e88138ac59d4001667
+DIST commons-lang3-3.4-src.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5
+EBUILD commons-lang-2.0-r3.ebuild 860 BLAKE2B c75078eb5c4b40727ebb7d8767158b6458c3de3e6d7220a32f5426b5d8bc388ddd6f27d036cd5e009c92bd8dd13a6cc5b1bac91ce28402c5f66a2a3e3c1c40cb SHA512 a5343eb554e885fa53d92f388538917d7138ebc083799ddd4b341003ac16fca1df0d756deb0c04f93cb7443458063e697a8d7ca802761f0a5593210a7aefb830
+EBUILD commons-lang-2.6-r1.ebuild 855 BLAKE2B e6c3f943bb7a61064323748ec99c54e44acef2ac7899c864dcc554e66d23a7463d4e1e6e786a3145ebae636bb976896d26a038fedca3c5c195d64139ef8d0e02 SHA512 b3a1a0c9eea0742c8803046880b91784c87d0719bc38121246d143b3de1f1a04ef9ec775692b2862833a0f07f565af1dbd16f750cc439e2a6d69de9d7a455d40
+EBUILD commons-lang-3.1.ebuild 841 BLAKE2B 1de87e9c73eea5aebd3891889025b5a81107ae54d6e8b3e456d66a9519cb87e90412ef16680cdefb06451320bfe021d490b1e42a4d205b9927676a5af2e8e012 SHA512 95de6c0c16b0b07def8cd4d698ec9ab5e79cb2715c658e95be67d9b7f3c28c04f47c5649edfa71be51026fcfa98c618e5283fa031ebcd621a1700dbe1d539c98
+EBUILD commons-lang-3.3.2.ebuild 1112 BLAKE2B 1b45826fa5fb04a270fd93c0b3526223d48fe32289f8a3c9d02b5c99b2997f65eff7d542700c13aafc68cb5c95e7af7cc8d9b7b74840d5a7d4b6c1fe715e3e2f SHA512 dba87629c9c5234c6b29604aa1401a52933644f901005c17f8a3eb4bd68fe5b6b5bc9c45096b7822e95aaedb292cc835604ec31b817c4babcde442cd2e4f11b6
+EBUILD commons-lang-3.4.ebuild 1110 BLAKE2B 3be8caf7bab320369e1ae456305abd79faaed94979835c7677f4c81019ccc0e7ea67fdbafbf839cf1c831cd8ba92730621350357db3f8e01cb84333ce62a0541 SHA512 c59defe42c47944e7ed60ae9bb3d6b52cf9e942617f1191f5f7cb8947b1995ab4e4c8db6cb26d1b1fa6f6edd1da1b355648b5f75ee782c6e8256b1a7d929ab2d
+EBUILD commons-lang-3.6.ebuild 961 BLAKE2B 81c6b5c74172be33876c6b9b6979fa636bf174dfff7987560a51d40c255ebe8f936071dd00eb85015ed69d86887454d8ab2fad9d0954e798ea24dd52430242b9 SHA512 5370bcd4273bf7943d5c1f2ddf3dc512e8d9a4f35299dfc805691fdcfe37e5dfc460c8c5dd995880bdb4eea5c91485a54f25bb02cf505967ae1475d3f189e06c
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
new file mode 100644
index 000000000000..be7a4b9bb238
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Jakarta components to manipulate core java classes"
+HOMEPAGE="http://commons.apache.org/lang/"
+SRC_URI="mirror://apache/jakarta/commons/lang/source/${P}-src.tar.gz"
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.4"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	java-pkg_dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
new file mode 100644
index 000000000000..b108cd7918ee
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons components to manipulate core java classes"
+HOMEPAGE="http://commons.apache.org/lang/"
+SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+SLOT="2.1"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+src_install() {
+	java-pkg_newjar "target/${P}.jar" "${PN}.jar"
+	dodoc RELEASE-NOTES.txt NOTICE.txt || die
+	dohtml *.html || die
+	use doc && java-pkg_dojavadoc target/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-lang/commons-lang-3.1.ebuild b/dev-java/commons-lang/commons-lang-3.1.ebuild
new file mode 100644
index 000000000000..d114a31c54a0
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}3-${PV}"
+
+DESCRIPTION="Commons components to manipulate core java classes"
+HOMEPAGE="http://commons.apache.org/lang/"
+SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz"
+
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND=">=virtual/jre-1.5"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+
+S="${WORKDIR}/${MY_P}-src"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+src_install() {
+	java-pkg_newjar target/${MY_P}.jar ${PN}.jar
+
+	dodoc RELEASE-NOTES.txt NOTICE.txt
+
+	use doc && java-pkg_dojavadoc target/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-lang/commons-lang-3.3.2.ebuild b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
new file mode 100644
index 000000000000..d25470181c51
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}3-${PV}"
+
+DESCRIPTION="Commons components to manipulate core java classes"
+HOMEPAGE="http://commons.apache.org/lang/"
+SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz"
+
+DEPEND=">=virtual/jdk-1.6
+	!ppc? (
+		!ppc64? (
+			test? (
+				dev-java/ant-junit4
+				dev-java/commons-io:1
+				dev-java/easymock:3.2
+			)
+		)
+	)"
+
+RDEPEND=">=virtual/jre-1.6"
+
+LICENSE="Apache-2.0"
+SLOT="3.3"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+RESTRICT="ppc? ( test ) ppc64? ( test )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2,commons-io-1,junit-4"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_install() {
+	java-pkg_newjar target/${MY_P}.jar ${PN}.jar
+
+	dodoc RELEASE-NOTES.txt NOTICE.txt
+
+	use doc && java-pkg_dojavadoc target/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
+
+src_test() {
+	LC_ALL=C java-pkg-2_src_test
+}
diff --git a/dev-java/commons-lang/commons-lang-3.4.ebuild b/dev-java/commons-lang/commons-lang-3.4.ebuild
new file mode 100644
index 000000000000..b6f7bc8b459c
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}3-${PV}"
+
+DESCRIPTION="Commons components to manipulate core java classes"
+HOMEPAGE="http://commons.apache.org/lang/"
+SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz"
+
+DEPEND=">=virtual/jdk-1.6
+	!ppc? (
+		!ppc64? (
+			test? (
+				dev-java/ant-junit4
+				dev-java/commons-io:1
+				dev-java/easymock:3.2
+			)
+		)
+	)"
+
+RDEPEND=">=virtual/jre-1.6"
+
+LICENSE="Apache-2.0"
+SLOT="3.4"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+RESTRICT="ppc? ( test ) ppc64? ( test )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2,commons-io-1,junit-4"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_install() {
+	java-pkg_newjar target/${MY_P}.jar ${PN}.jar
+
+	dodoc RELEASE-NOTES.txt NOTICE.txt
+
+	use doc && java-pkg_dojavadoc target/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
+
+src_test() {
+	LC_ALL=C java-pkg-2_src_test
+}
diff --git a/dev-java/commons-lang/commons-lang-3.6.ebuild b/dev-java/commons-lang/commons-lang-3.6.ebuild
new file mode 100644
index 000000000000..1977332102ba
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}3-${PV}"
+
+DESCRIPTION="Commons components to manipulate core java classes"
+HOMEPAGE="http://commons.apache.org/lang"
+SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+
+CDEPEND="
+	dev-java/easymock:3.2
+	dev-java/commons-io:1"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}-src"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+JAVA_GENTOO_CLASSPATH="
+	easymock-3.2
+	commons-io-1"
+
+DOCS=( CONTRIBUTING.md NOTICE.txt RELEASE-NOTES.txt LICENSE.txt README.md )
+
+src_prepare() {
+	default
+	rm -rv src/test || die
+}
+
+src_install() {
+	einstalldocs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-lang/metadata.xml b/dev-java/commons-lang/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-lang/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-launcher-1.1-r2 b/dev-java/commons-launcher-1.1-r2
deleted file mode 100644
index 2787ba6062c7..000000000000
--- a/dev-java/commons-launcher-1.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library to launch Java classes
-EAPI=5
-HOMEPAGE=http://commons.apache.org/launcher/
-IUSE=elibc_FreeBSD examples doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/launcher/source/commons-launcher-1.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a0aaf546fe4bc6aa5a3035e78d0f1100
diff --git a/dev-java/commons-launcher/Manifest b/dev-java/commons-launcher/Manifest
new file mode 100644
index 000000000000..9d3319c00437
--- /dev/null
+++ b/dev-java/commons-launcher/Manifest
@@ -0,0 +1,3 @@
+DIST commons-launcher-1.1-src.tar.gz 76558 BLAKE2B 23ec27e5ed7d9ab7770da62aa1af69ce8510c67ee5e4f756519a9bc2009c40525b5fa48a1caa8ce5b6062d57dedd469b190cfa7ca9a4ed5a5a72eade40947aed SHA512 87f275ea1dbd08394c173da21023cb761175ff222fbe0ed6553fa6ca34eef775b57561227279216082556a8dd37593c9699a3e0c059bf3da98dbd2f1d3f58ddd
+EBUILD commons-launcher-1.1-r2.ebuild 768 BLAKE2B 16af3718271aed24bf19ac35d2a2e5b32e5a206bdd40abdce1f4a5bcef57b30cdffef171b7e2026a71ef21c8c0dea05ffd0bded1f01865a961291bfa04c7eb50 SHA512 825e40a46611b09e3c43175d348ab51d03b4d792c7d5443ebe4d2ea7fd5ca7c85df5c84ece1b98493b2a99eb0a18fdc531dfd4d2c0640bb2e9ce1663c3b0b718
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild b/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild
new file mode 100644
index 000000000000..a1e7eef39b71
--- /dev/null
+++ b/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="examples doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library to launch Java classes"
+HOMEPAGE="http://commons.apache.org/launcher/"
+SRC_URI="mirror://apache/${PN%%-*}/${PN##*-}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples example
+}
diff --git a/dev-java/commons-launcher/metadata.xml b/dev-java/commons-launcher/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-launcher/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-logging-1.2-r1 b/dev-java/commons-logging-1.2-r1
deleted file mode 100644
index d29de927d22a..000000000000
--- a/dev-java/commons-logging-1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=avalon-framework? ( dev-java/avalon-framework:4.2 ) avalon-logkit? ( dev-java/avalon-logkit:2.0 ) log4j? ( dev-java/log4j:0 ) servletapi? ( java-virtuals/servlet-api:3.1 ) >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An ultra-thin bridge between different Java logging libraries
-EAPI=5
-HOMEPAGE=https://commons.apache.org/logging/
-IUSE=avalon-framework avalon-logkit log4j servletapi test elibc_FreeBSD doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=avalon-framework? ( dev-java/avalon-framework:4.2 ) avalon-logkit? ( dev-java/avalon-logkit:2.0 ) log4j? ( dev-java/log4j:0 ) servletapi? ( java-virtuals/servlet-api:3.1 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!servletapi? ( test )
-SLOT=0
-SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=af1b80eeef5733c1c7b8f006d5c64945
diff --git a/dev-java/commons-logging-1.2-r2 b/dev-java/commons-logging-1.2-r2
deleted file mode 100644
index a83e2c2f4f6a..000000000000
--- a/dev-java/commons-logging-1.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=log4j? ( dev-java/log4j:0 ) servletapi? ( java-virtuals/servlet-api:3.1 ) avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-java/avalon-framework:4.2 ) >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An ultra-thin bridge between different Java logging libraries
-EAPI=6
-HOMEPAGE=https://commons.apache.org/logging/
-IUSE=avalon-framework avalon-logkit log4j servletapi test elibc_FreeBSD doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=log4j? ( dev-java/log4j:0 ) servletapi? ( java-virtuals/servlet-api:3.1 ) avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-java/avalon-framework:4.2 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!servletapi? ( test )
-SLOT=0
-SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ef59853a8021df58ff0d0bb1e760f4aa
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
new file mode 100644
index 000000000000..60ec7a48ebff
--- /dev/null
+++ b/dev-java/commons-logging/Manifest
@@ -0,0 +1,6 @@
+AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
+AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
+DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
+EBUILD commons-logging-1.2-r1.ebuild 2212 BLAKE2B b91b91b4e26f1d9a5aea2a3743f979df0eb0f884ec00b5ac10087d0859828e6ca0b981fdcdcd520272d224b3f0b377eac8cb1da1566fd08671e3c9d6a6343153 SHA512 63621491db41bc2627c1a673c161218c4b999a3b925493f92e2442a053d9c6feffc5bf8a7c35f05d1a7c6f26504e0e87d723829d25496359c5bea71e4cd3d646
+EBUILD commons-logging-1.2-r2.ebuild 2303 BLAKE2B 3c11c135b650f00c703dfad89cb12648dcbe61bf251de7a7428bce266a51c980187cfbc902e4a7500b5d7c2b457c21d556bd547754ec5fc011a4eb5b7cd62830 SHA512 39b7fd0405164b07c062f300b7f0b71e29650b25d06873fb83171f6571dc63852238a47b71a1f1253fe7f3398556a09441f45220ae621dbbde694fe5daece285
+MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd
diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
new file mode 100644
index 000000000000..d31cbb5b606b
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
+HOMEPAGE="https://commons.apache.org/logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="avalon-framework avalon-logkit log4j servletapi test"
+RESTRICT="!servletapi? ( test )"
+
+CDEPEND="avalon-framework? ( dev-java/avalon-framework:4.2 )
+	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
+	log4j? ( dev-java/log4j:0 )
+	servletapi? ( java-virtuals/servlet-api:3.1 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src"
+
+EANT_BUILD_TARGET="compile"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	epatch "${FILESDIR}/${P}-servletapi.patch"
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties
+
+	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
+	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties
+	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties
+	use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties
+}
+
+src_install() {
+	local pkg=org.apache.commons.logging
+	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
+	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml PROPOSAL.html || die
+	use doc && java-pkg_dojavadoc target/docs/
+	use source && java-pkg_dosrc src/main/java/org
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
new file mode 100644
index 000000000000..0f4bba416ed0
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
@@ -0,0 +1,81 @@
+# 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 java-osgi
+
+DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
+HOMEPAGE="https://commons.apache.org/logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="avalon-framework avalon-logkit log4j servletapi test"
+RESTRICT="!servletapi? ( test )"
+
+CDEPEND="
+	log4j? ( dev-java/log4j:0 )
+	servletapi? ( java-virtuals/servlet-api:3.1 )
+	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
+	avalon-framework? ( dev-java/avalon-framework:4.2 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src"
+
+EANT_BUILD_TARGET="compile"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
+
+DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	eapply "${FILESDIR}/${P}-servletapi.patch"
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties || die
+
+	if use avalon-framework; then
+		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
+	fi
+	if use avalon-logkit; then
+		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
+	fi
+	if use log4j; then
+		echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties || die
+	fi
+
+	if use servletapi; then
+		echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die
+	fi
+}
+
+src_install() {
+	local pkg=org.apache.commons.logging
+	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
+	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
+
+	einstalldocs
+	use doc && java-pkg_dojavadoc target/docs/
+	use source && java-pkg_dosrc src/main/java/org
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
new file mode 100644
index 000000000000..a654ce1fc763
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
@@ -0,0 +1,26 @@
+--- a/build.xml
++++ b/build.xml
+@@ -773,4 +773,23 @@
+     </fail>
+   </target>
+ 
++  <target depends="" name="javadoc" description="o Generate javadoc" >
++    <mkdir dir="${build.home}/docs" >
++    </mkdir>
++    <tstamp >
++      <format pattern="2001-yyyy" property="year" >
++      </format>
++    </tstamp>
++    <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation. All Rights Reserved." >
++    </property>
++    <property name="title" value="Logging 1.1 API" >
++    </property>
++    <javadoc use="true" author="true" sourcepath="src/main/java" destdir="${build.home}/docs" version="true" private="true" packagenames="org.apache.commons.logging.*" >
++      <classpath >
++        <path refid="javadoc.classpath" >
++        </path>
++      </classpath>
++    </javadoc>
++  </target>
++
+ </project>
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
new file mode 100644
index 000000000000..a9fccba8d5c1
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
@@ -0,0 +1,42 @@
+--- a/build.xml
++++ b/build.xml
+@@ -279,6 +279,8 @@
+                classpathref="compile.classpath"
+                classname="org.apache.log.Logger"/>
+ 
++    <available classname="javax.servlet.ServletContextEvent" property="servletapi.present" classpathref="compile.classpath" ignoresystemclasses="true" ></available>
++
+     <available property="avalon-framework.present"
+                classpathref="compile.classpath"
+                classname="org.apache.avalon.framework.logger.Logger"/>
+@@ -315,6 +317,13 @@
+     </echo>
+   </target>
+   
++  <target depends="init,discovery" unless="servletapi.present" name="servletapi-warning" >
++    <echo >
++    *** WARNING ***
++    ServletAPI not found: Cannot Build ServletContextCleaner
++	</echo>
++  </target>
++  
+   <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
+     <echo>
+     *** WARNING ***
+@@ -337,7 +346,7 @@
+   </target>
+     
+   <target name='warning' 
+-    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/>
++    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
+ 
+   <target name="compile-only" 
+     depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/>
+@@ -365,6 +374,7 @@
+     
+       <exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
+ 
++	  <exclude unless="servletapi.present" name="org/apache/commons/logging/impl/ServletContextCleaner.java" ></exclude>
+       <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
+                unless="jdk.1.4.present"/>
+       <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
diff --git a/dev-java/commons-logging/metadata.xml b/dev-java/commons-logging/metadata.xml
new file mode 100644
index 000000000000..8661ce26e6c8
--- /dev/null
+++ b/dev-java/commons-logging/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <use>
+    <flag name="avalon-framework">Add optional support for avalon-framework</flag>
+    <flag name="avalon-logkit">Add optional support for avalon-logkit</flag>
+    <flag name="log4j">Add optional support for log4j</flag>
+    <flag name="servletapi">Add optional support for servletapi</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/commons-math-2.1-r2 b/dev-java/commons-math-2.1-r2
deleted file mode 100644
index 483e5d3448d3..000000000000
--- a/dev-java/commons-math-2.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit4 dev-java/hamcrest-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight, self-contained mathematics and statistics components
-EAPI=6
-HOMEPAGE=https://commons.apache.org/math/
-IUSE=elibc_FreeBSD doc test source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=mirror://apache/commons/math/source/commons-math-2.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b249d897dfcce8d9c3884bca3070bc2b
diff --git a/dev-java/commons-math-3.2 b/dev-java/commons-math-3.2
deleted file mode 100644
index ce325fc47947..000000000000
--- a/dev-java/commons-math-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight, self-contained mathematics and statistics components
-EAPI=5
-HOMEPAGE=https://commons.apache.org/math/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3
-SRC_URI=mirror://apache/commons/math/source/commons-math3-3.2-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=60e0dc8a5a0435389b235ebfca97ad38
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
new file mode 100644
index 000000000000..29816a8283d3
--- /dev/null
+++ b/dev-java/commons-math/Manifest
@@ -0,0 +1,7 @@
+AUX commons-math-2.1-r2-buildfixes.patch 770 BLAKE2B 99782f38b6efdfa94b0b69390bc04d487ef20698fe1bea456c8919ea88a635d009b10c8d27e7124f0e4f0bb9a1c97110a959421cbd4f6aee70ebb9f5821bb812 SHA512 75a0174c839425a7f1387ef582a08899b7433dcc2090d773642ea120dc220c69d741fef5b44508ad9fdb3e2f24d8fe2b9dfc92146985f88416dae8178a5d7798
+AUX commons-math-3.2-build.xml 12448 BLAKE2B 04021b793945a00a95152ef98772dfb5735cce14307d33772701a6240a8d5a094b2156faf4fc775454c0c369df066f9404a0d5a5671f809647ae1e5389648ec4 SHA512 7f7d4a469843b218e90e3482360101058f027cf7d2319f1f7a5a4af7c09b6e4b05237c594eb217d5ffc3f07793fcabaa733be52686148af94a12727e4fda89ed
+DIST commons-math-2.1-src.tar.gz 1099423 BLAKE2B 83c52abc10eebb6c749aec218aa435df4cd05106e6bcbead5061df7381d168aa9392ab70dce8eb0b8e254d6d95a372cacddc8f7714198a186a95a04a394bda9d SHA512 53ed8c0400402c588d824c15365ebe60bef41697ff9728270a9fdc3ac30eb60c4c397caf939ccda839eb701453d98af4eac9eae2090575fcfdee4df2d6f6045b
+DIST commons-math3-3.2-src.tar.gz 2602474 BLAKE2B a818ca5ab1b9799359bad1c84d2774329c7c2605aeea3e13769eed9f1578d412555ad90a8de68971daa42b270d4bcd5fbf0fe79714e839d41b08077e32633125 SHA512 132c4725be582e25f67a955c7b3b8c7ef155606d8f4da07770464c422ded6b5e6efd1a13a6e98cff222f4fcac73606d512ee1ab9e3b1c4befcc1ba16ab68787b
+EBUILD commons-math-2.1-r2.ebuild 903 BLAKE2B 2b390b4109fd875bc79f957b2fc22a0e3ce1536476ed331bd57e32d1e90417200002f14045cd7af145f0a1a172e23773531682ac427f0a20e905cb10b8ae305f SHA512 aacd02d27d30d7f27c5bb35cad318b21a4235b0264282527244d892f509e3e0032eaf5407bfbab9b6c4f548c7e9efcbe68629bf0502899c1e9c6d32fb8ad9a4e
+EBUILD commons-math-3.2.ebuild 1315 BLAKE2B a0fe207cc34dae87b52df7709e27f9fc4588e591347d507f8b69cf46ded1eb0b2d23943a93af9997ab215146873fd60479628c80fbcc72dcf8cd1d3c5dc1b72f SHA512 a1f5e7f79e7b36e011a16ed87de7aecf5a9cf8ae8570cdc5fff90a79505bde6120c475df96e188129daec1c436d0409e1260136849c36edafef29e9a70389329
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-math/commons-math-2.1-r2.ebuild b/dev-java/commons-math/commons-math-2.1-r2.ebuild
new file mode 100644
index 000000000000..b18fc803124f
--- /dev/null
+++ b/dev-java/commons-math/commons-math-2.1-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc test source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
+HOMEPAGE="https://commons.apache.org/math/"
+SRC_URI="mirror://apache/commons/math/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit4
+		dev-java/hamcrest-core:0
+	)"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=( "${FILESDIR}"/${PF}-buildfixes.patch )
+
+src_test() {
+	java-pkg_jar-from junit-4
+	java-pkg_jar-from hamcrest-core
+	ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/commons-math/commons-math-3.2.ebuild b/dev-java/commons-math/commons-math-3.2.ebuild
new file mode 100644
index 000000000000..7d4b8f2dc93e
--- /dev/null
+++ b/dev-java/commons-math/commons-math-3.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# Tests are currently broken due to nasty -lib argument.
+JAVA_PKG_IUSE="doc source" # test
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+MY_PN="${PN}3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
+HOMEPAGE="https://commons.apache.org/math/"
+SRC_URI="mirror://apache/commons/math/source/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=virtual/jdk-1.5"
+
+# Tests are currently broken due to nasty -lib argument.
+# test? (
+# 	dev-java/ant-junit4
+# 	dev-java/hamcrest-core:0
+# )"
+
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${MY_P}-src"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	sed -i 's/manifest=".*MANIFEST.MF"//g' build.xml || die
+	sed -i '/name="Main-Class"/d' build.xml || die
+}
+
+# Tests are currently broken due to nasty -lib argument.
+# src_test() {
+# 	java-pkg_jar-from junit-4
+# 	java-pkg_jar-from hamcrest-core
+# 	ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test
+# }
+
+src_install() {
+	java-osgi_newjar target/${MY_P}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/commons-math/files/commons-math-2.1-r2-buildfixes.patch b/dev-java/commons-math/files/commons-math-2.1-r2-buildfixes.patch
new file mode 100644
index 000000000000..6d768969e79c
--- /dev/null
+++ b/dev-java/commons-math/files/commons-math-2.1-r2-buildfixes.patch
@@ -0,0 +1,19 @@
+--- build.xml	2010-10-24 11:20:46.000000000 +0300
++++ build.xml.fixed	2010-10-24 11:25:42.000000000 +0300
+@@ -114,6 +114,7 @@
+     <pathelement location="${build.home}/classes"/>
+     <pathelement location="${build.home}/test-classes"/>
+     <pathelement location="${junit.jar}"/>
++    <pathelement location="hamcrest-core.jar"/>
+     <path refid="downloaded.lib.classpath"/>
+   </path>
+ 
+@@ -232,7 +233,7 @@
+ 
+ <!-- ========== Create Jar ================================================ -->
+ 
+-  <target name="jar" depends="test" description="Create jar file">
++  <target name="jar" depends="compile" description="Create jar file">
+ 
+     <mkdir dir="${build.home}/classes/META-INF"/>
+     <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
diff --git a/dev-java/commons-math/files/commons-math-3.2-build.xml b/dev-java/commons-math/files/commons-math-3.2-build.xml
new file mode 100644
index 000000000000..905d12657e26
--- /dev/null
+++ b/dev-java/commons-math/files/commons-math-3.2-build.xml
@@ -0,0 +1,288 @@
+<?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/29/13 1:59 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="commons-math3-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="commons-math3-3.2"/>
+  <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.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"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.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}" 
+           encoding="UTF-8" 
+           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>
+    <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>
+
+  <!-- ====================================================================== -->
+  <!-- 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="UTF-8" 
+           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>
+    <mkdir dir="${maven.build.testOutputDir}/META-INF"/>
+    <copy todir="${maven.build.testOutputDir}/META-INF">
+      <fileset dir="${maven.build.testResourceDir.1}">
+        <include name="NOTICE.txt"/>
+        <include name="LICENSE.txt"/>
+      </fileset>
+    </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="**/*TestBinary.java"/>
+          <include name="**/*TestPermutations.java"/>
+          <exclude name="**/*AbstractTest.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*AbstractTest.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" 
+             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.5" 
+             linksource="true" 
+             breakiterator="false">
+      <link href="http://download.oracle.com/javase/6/docs/api/"/>
+      <link href="http://download.oracle.com/javaee/6/api/"/>
+    </javadoc>
+  </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" 
+         manifest="/var/tmp/portage/dev-java/commons-math-3.2/work/commons-math3-3.2-src/target/osgi/MANIFEST.MF" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Main-Class"/>
+      </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}/junit/junit/4.10"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/4.10/junit-4.10.jar" 
+         dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.10/junit-4.10.jar" 
+         dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/>
+    <get src="http://repository.apache.org/snapshots/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/commons-math/metadata.xml b/dev-java/commons-math/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/commons-math/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-net-3.2 b/dev-java/commons-net-3.2
deleted file mode 100644
index d9b52c2193b7..000000000000
--- a/dev-java/commons-net-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java library emulating the client side of many basic Internet protocols
-EAPI=5
-HOMEPAGE=http://commons.apache.org/net/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/commons/net/source/commons-net-3.2-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0e18375f63ae6abc8d9d8a8cd398f50b
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
new file mode 100644
index 000000000000..2000ec20a9d8
--- /dev/null
+++ b/dev-java/commons-net/Manifest
@@ -0,0 +1,4 @@
+AUX commons-net-3.2-build.xml 12390 BLAKE2B 849ddf4c6525fdb7e7d8a753c5c0e854471c7f6b257bdc506d89be0dd81bc5c02f69c75e23051e283e74a2e66ac07c77a3432899e3de4e30dc93566a85eed554 SHA512 e4784b083ce86b5a22d5bfba0b0d71d811abf55f8375b9982f5ac1b11bb93f4be15ec0ff4bcb8cac58681a68a03cd6b598c998251097e9bf634674712887bdbe
+DIST commons-net-3.2-src.tar.gz 378351 BLAKE2B f40ad73ef7d9865cdbe9da94a458f0c9ce636b0b71dcab3b48b52716aa141de3215581b75b9283d4d918ad0dbbd2761c9b0d9eee1703a2bbc545718c129511d5 SHA512 2152b0c524320702c336b21308bb8166e00487938430b83e08d65b836ab775c372c9251957c674e0bccff6815fc3ed3bdb7113a0d2a140c53f64c2f557eef2ba
+EBUILD commons-net-3.2.ebuild 1260 BLAKE2B c78c4c247038135b24d70b60d660b5d5bf98df859894e574f149f86ca9dafaaee81439ac394fff5143c732c18e8ca1103200105c135792dc1a0676926e049410 SHA512 f5cae63603d9fc2423431c21913b584103bf1d15a67c744a7012b9b0fc7ae303e51ebdcec162c260f005a58fe1a52a4a9215e801d3944c051f40e8788240de51
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-net/commons-net-3.2.ebuild b/dev-java/commons-net/commons-net-3.2.ebuild
new file mode 100644
index 000000000000..ea92d47ba45c
--- /dev/null
+++ b/dev-java/commons-net/commons-net-3.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# http://issues.apache.org/bugzilla/show_bug.cgi?id=37985
+RESTRICT="test"
+JAVA_PKG_IUSE="doc examples source" # test
+
+inherit eutils java-pkg-2 java-ant-2 java-osgi
+
+MY_P="${P}-src"
+
+DESCRIPTION="Java library emulating the client side of many basic Internet protocols"
+HOMEPAGE="http://commons.apache.org/net/"
+SRC_URI="mirror://apache/commons/net/source/${MY_P}.tar.gz"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+	sed -i 's/depends="compile,test"/depends="compile"/' build.xml || die "Failed to disable junit"
+	sed -i 's/manifest=".*MANIFEST.MF"//g' build.xml || die
+	sed -i '/name="Main-Class"/d' build.xml || die
+}
+
+src_install() {
+	java-osgi_newjar target/${P}.jar ${P} ${P} "Export-Package: ${P}"
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use examples && java-pkg_doexamples src/main/java/examples
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/commons-net/files/commons-net-3.2-build.xml b/dev-java/commons-net/files/commons-net-3.2-build.xml
new file mode 100644
index 000000000000..72cdd404df11
--- /dev/null
+++ b/dev-java/commons-net/files/commons-net-3.2-build.xml
@@ -0,0 +1,285 @@
+<?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/29/13 3:17 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="commons-net-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="commons-net-3.2"/>
+  <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.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"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.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}" 
+           encoding="iso-8859-1" 
+           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>
+    <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>
+
+  <!-- ====================================================================== -->
+  <!-- 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="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>
+    <mkdir dir="${maven.build.testOutputDir}/META-INF"/>
+    <copy todir="${maven.build.testOutputDir}/META-INF">
+      <fileset dir="${maven.build.testResourceDir.1}">
+        <include name="NOTICE.txt"/>
+        <include name="LICENSE.txt"/>
+      </fileset>
+    </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="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*FunctionalTest.java"/>
+          <exclude name="**/*POP3*.java"/>
+          <exclude name="**/TestSetupParameters.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*FunctionalTest.java"/>
+          <exclude name="**/*POP3*.java"/>
+          <exclude name="**/TestSetupParameters.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" 
+             encoding="iso-8859-1" 
+             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" 
+             source="1.5" 
+             linksource="true" 
+             breakiterator="false">
+      <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
+      <link href="http://download.oracle.com/javaee/6/api/"/>
+    </javadoc>
+  </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" 
+         manifest="/var/tmp/portage/dev-java/commons-net-3.2/work/commons-net-3.2-src/target/osgi/MANIFEST.MF" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Main-Class"/>
+      </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}/junit/junit/4.10"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/4.10/junit-4.10.jar" 
+         dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.10/junit-4.10.jar" 
+         dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/>
+    <get src="http://repository.apache.org/snapshots/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/commons-net/metadata.xml b/dev-java/commons-net/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-net/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-pool-1.6 b/dev-java/commons-pool-1.6
deleted file mode 100644
index 8ecc6a15746e..000000000000
--- a/dev-java/commons-pool-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Provides general purpose object pooling API
-EAPI=5
-HOMEPAGE=http://commons.apache.org/pool/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/pool/source/commons-pool-1.6-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=43462b6e4177df27c73c8153af36031f
diff --git a/dev-java/commons-pool-2.2 b/dev-java/commons-pool-2.2
deleted file mode 100644
index d895323ca9c7..000000000000
--- a/dev-java/commons-pool-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/cglib:3 dev-java/asm:4 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Provides general purpose object pooling API
-EAPI=5
-HOMEPAGE=http://commons.apache.org/pool/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/cglib:3 dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=mirror://apache/commons/pool/source/commons-pool2-2.2-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cf02b5994ab214491bc54415f70a1121
diff --git a/dev-java/commons-pool/Manifest b/dev-java/commons-pool/Manifest
new file mode 100644
index 000000000000..a339cb8ee8ec
--- /dev/null
+++ b/dev-java/commons-pool/Manifest
@@ -0,0 +1,5 @@
+DIST commons-pool-1.6-src.tar.gz 321409 BLAKE2B 2ed2bc6d7478217fde271bcc64feefae06aa7f946068e7fa3b2ae055e7c788b2431ba20ce202a2cc879c22d32d6d69cdcc4f8dca6794dc4588b11cda4f665934 SHA512 357dd4b1cab8fccb4116add2bee74036c19cf6102946a1e304dcd3049d3d93f1e405f85349e511a4cc71d0d91382696f97997c9e4014303822b386ac7fbfec93
+DIST commons-pool2-2.2-src.tar.gz 163682 BLAKE2B b9a84b1387cd00eb46cc94726ae3295a73f2f47b824401aca525296eddbf04b6c978a4808014bf7e93c113014e0e2fb0db39d6b9ddb9c651bb385cecd05584a5 SHA512 a9c1a30f497f4a6c28b8b4b82d3b2f801b464fc329d1da4f5087dcd6b923c45bde9ac6f3dc9939025453462f9dfea9fff637db9b4334ed513770a546b4807256
+EBUILD commons-pool-1.6.ebuild 884 BLAKE2B 7751363b2533447a5d9e55034447e8155d7de59dfba492ebf4644273e1edf7f71cd995a37259034a74580486c606a2030bf738460682bc9082452191302f4b1a SHA512 ecc866b7e0761f61354100f4ad11cf93db87832e80e24d55a049fce31396378d9f405f757f0af79d9b9ae3bd336184ddf8e78be42a3402bb13526b1d4af31d3c
+EBUILD commons-pool-2.2.ebuild 1078 BLAKE2B af248d689fc3ed0cbbf84c9bf9650e4aad57e9eae2c67a42cbead532b4be03102e78db9f5305bf894e03e0b7b972ee53467fa009397f6a20fe75bc5684a374be SHA512 3abb6a3aadc14883a683454eade278c3b04cdc0270b52b0e7c798ffb08098792cb771d8d9b072478e0350f837e2fe2178f58779b9fd8808e6ab597341f8bb1b5
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-pool/commons-pool-1.6.ebuild b/dev-java/commons-pool/commons-pool-1.6.ebuild
new file mode 100644
index 000000000000..64c331273099
--- /dev/null
+++ b/dev-java/commons-pool/commons-pool-1.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Provides general purpose object pooling API"
+HOMEPAGE="http://commons.apache.org/pool/"
+SRC_URI="mirror://apache/commons/pool/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:0
+	)"
+
+S="${WORKDIR}/${P}-src"
+
+EANT_BUILD_TARGET="build-jar"
+
+src_test() {
+	ANT_TASKS="ant-junit" eant -Dclasspath="$(java-pkg_getjars junit)" test
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}-SNAPSHOT.jar
+	dodoc README.txt RELEASE-NOTES.txt
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/commons-pool/commons-pool-2.2.ebuild b/dev-java/commons-pool/commons-pool-2.2.ebuild
new file mode 100644
index 000000000000..f494ecaeddc9
--- /dev/null
+++ b/dev-java/commons-pool/commons-pool-2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Provides general purpose object pooling API"
+HOMEPAGE="http://commons.apache.org/pool/"
+SRC_URI="mirror://apache/commons/pool/source/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP="dev-java/cglib:3
+	dev-java/asm:4"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${MY_P}-src"
+
+EANT_BUILD_TARGET="build-jar"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="cglib-3,asm-4"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
+src_test() {
+	ANT_TASKS="ant-junit" java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar dist/${MY_P}-SNAPSHOT.jar ${PN}.jar
+	dodoc README.txt RELEASE-NOTES.txt
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/commons-pool/metadata.xml b/dev-java/commons-pool/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-pool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-primitives-1.0-r3 b/dev-java/commons-primitives-1.0-r3
deleted file mode 100644
index ee62603b5160..000000000000
--- a/dev-java/commons-primitives-1.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=The Jakarta-Commons Primitives Component
-EAPI=5
-HOMEPAGE=http://commons.apache.org/primitives/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://www.apache.org/dist/commons/primitives/source/commons-primitives-1.0-src.tar.gz -> commons-primitives-1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=423de90334f9c7fca3d6052194561c2d
diff --git a/dev-java/commons-primitives/Manifest b/dev-java/commons-primitives/Manifest
new file mode 100644
index 000000000000..2321e0b29386
--- /dev/null
+++ b/dev-java/commons-primitives/Manifest
@@ -0,0 +1,3 @@
+DIST commons-primitives-1.0.tar.gz 172369 BLAKE2B b3641bc163b250997db9897b43af3ab7a1e15eaf34420e92429e321eca43c69bcb094f4b11e9789236d6e24f9c83a5674ad68a33c863fbac12dd72526bfbf4ba SHA512 239752a615f3a88049d6c85326a67462362869eda421ab76975c0906d811c970c871042769d851a4341c8a06b501d6b12fd1feba74d83007b2dd73370c5b3195
+EBUILD commons-primitives-1.0-r3.ebuild 611 BLAKE2B bc715e8459c8a817b8d2ef58f124a54d99f37af06a8b82c5d0c74a084f4f060926bbd10efd70596beb8d6c58e4c9eb36430ea2bb80549e0b1b6d1736b6214c10 SHA512 e051c27374c748042d2a48113f0dd89961fec560a62b61aad99b6b51bfb515d4ad397cb49b9518d3a53f63a2d99b3daae65def9cec175c271320cdcca725e42c
+MISC metadata.xml 594 BLAKE2B 019c3e2a8144043dfa99f87db088bd5ea453f17d8ec2d7023ce911394587bd27d8b595176c923a34a3cb38900a9b3eaa3cf791787e53e9fdeea610a1f54ed2a2 SHA512 575b9c4f8596e075cbefe7ac97e7f1fab1ecdfb38fc4e9e08cdaa23ef8e0ba46d7f3ea5f942aa79699653d7184e00bc2943e446ff737ead6c7984a89065cf334
diff --git a/dev-java/commons-primitives/commons-primitives-1.0-r3.ebuild b/dev-java/commons-primitives/commons-primitives-1.0-r3.ebuild
new file mode 100644
index 000000000000..22a04bf2b76c
--- /dev/null
+++ b/dev-java/commons-primitives/commons-primitives-1.0-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Jakarta-Commons Primitives Component"
+HOMEPAGE="http://commons.apache.org/primitives/"
+SRC_URI="https://www.apache.org/dist/commons/primitives/source/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	rm -rv src/test || die
+}
diff --git a/dev-java/commons-primitives/metadata.xml b/dev-java/commons-primitives/metadata.xml
new file mode 100644
index 000000000000..a10f35ee50c8
--- /dev/null
+++ b/dev-java/commons-primitives/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Apache Jakarta Commons Primitives provides a collection of types and
+		utilities optimized for working with Java primitives (boolean, byte,
+		char, double, float, int, long, short). Generally, the
+		Commons-Primitives classes are smaller, faster and easier to work with
+		than their purely Object based alternatives.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/commons-validator-1.4.0 b/dev-java/commons-validator-1.4.0
deleted file mode 100644
index afa5996b80b6..000000000000
--- a/dev-java/commons-validator-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/junit:0 ) >=virtual/jre-1.4 >=dev-java/commons-digester-1.6:0 >=dev-java/commons-collections-3.1:0 >=dev-java/commons-logging-1.0.4:0 dev-java/commons-beanutils:1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Commons component to validate user input, or data input
-EAPI=5
-HOMEPAGE=http://commons.apache.org/validator/
-IUSE=elibc_FreeBSD examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-digester-1.6:0 >=dev-java/commons-collections-3.1:0 >=dev-java/commons-logging-1.0.4:0 dev-java/commons-beanutils:1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.4.0-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b51c746c7553314eaaa9b603b7018940
diff --git a/dev-java/commons-validator-1.4.1 b/dev-java/commons-validator-1.4.1
deleted file mode 100644
index d8e0b44c2ce5..000000000000
--- a/dev-java/commons-validator-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:0 ) >=virtual/jre-1.6 >=dev-java/commons-digester-1.6:0 >=dev-java/commons-collections-3.1:0 >=dev-java/commons-logging-1.0.4:0 dev-java/commons-beanutils:1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Commons component to validate user input, or data input
-EAPI=5
-HOMEPAGE=http://commons.apache.org/validator/
-IUSE=elibc_FreeBSD examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/commons-digester-1.6:0 >=dev-java/commons-collections-3.1:0 >=dev-java/commons-logging-1.0.4:0 dev-java/commons-beanutils:1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.4.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=75ca5d9fd15d38117739447c7211751f
diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
new file mode 100644
index 000000000000..25e8110e71d6
--- /dev/null
+++ b/dev-java/commons-validator/Manifest
@@ -0,0 +1,6 @@
+AUX validator-1.4.build.xml.patch 676 BLAKE2B 43e8729df9775683413d746756d820bc50f593e8b97dfec0e19bfb543e15b2ed790571d2508247f5f46922be26f2e0e57d7877e390189a6b4ac1380c791d074b SHA512 3b426b65d32799398de59d063f67c840d261593278a48afd81024479171e68483add4c69aeed1e65127812850500ba6ffe24cf31ecda6ad16d3a2df64fb2c218
+DIST commons-validator-1.4.0-src.tar.gz 222421 BLAKE2B 1a83d39be6b2cd8c20cc027cd49b813cd23f65772f17e2c8f1dc7357edd0abf80ce2f76c2c8fb5a5b4acc66eff740925b970cc21ba6a582ecab71f74be84f7bf SHA512 35005d5ada8a1070cdd02f78464886e16157a05f895e3abfe2dcd51fa4b443d9ee359bb54a40e13ed463b757a77a64669c89cd9b914051a4ab1c745be3526d98
+DIST commons-validator-1.4.1-src.tar.gz 244155 BLAKE2B 4d7d63f30bdc9196f73812fa584226f28d9514918c13f0279be74e868f2410e08b2bc2a71a4a54d2b2ba91d580438f3de6fa71afe8dd38838d234723921b6c27 SHA512 e64d16de2481c388c81a488dbe894c4d16a1abad12f841f6f77e2606013edbce75ec7a1371976b7e642adfc7cbc5038ff7271cb4d184fbeb32a635acf6bccb38
+EBUILD commons-validator-1.4.0.ebuild 2655 BLAKE2B 46acd60320b348d2b9e6b1747f781d402482a0ffd83ed04000919b1f5879728f18404fa4a7d943c512dd824cca2d428b3beb7f1fb3e9ccd34d7d2d08ec153bf7 SHA512 3180153f474f63d2d5a137d7a4ba93342bd281172f25ce813ad7d1f7cdcefa502f3f0cc05cea5a2a03f7fbd9cf2acf70ed3e18fd1852c60531634c717956faa2
+EBUILD commons-validator-1.4.1.ebuild 2661 BLAKE2B f49b3f0e370034d7f15f7ad23774356720d72ac54f361b0da8c7f2c16986db949df477e49dff9929bf0425665c23d8b741d01f304d384cdfa33626c467ac13e9 SHA512 c049a29d136eb6ff081959dbf7c97b2fb47a05c7f9913d8c0988fdb7c7b2d3ca4d7330afd68bc5fb7bbab9e6662255c22872ca669b6daff808c1e498bff38a3e
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-validator/commons-validator-1.4.0.ebuild b/dev-java/commons-validator/commons-validator-1.4.0.ebuild
new file mode 100644
index 000000000000..00a7eebf1026
--- /dev/null
+++ b/dev-java/commons-validator/commons-validator-1.4.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="examples source test" # doc
+
+inherit java-pkg-2 java-ant-2
+
+MY_P=${P}-src
+
+DESCRIPTION="Commons component to validate user input, or data input"
+HOMEPAGE="http://commons.apache.org/validator/"
+SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/commons-digester-1.6:0
+	>=dev-java/commons-collections-3.1:0
+	>=dev-java/commons-logging-1.0.4:0
+	dev-java/commons-beanutils:1.7"
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/junit:0 )
+	${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/validator-1.4.build.xml.patch
+
+	JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath
+
+	echo "commons-digester.jar=$(java-pkg_getjars commons-digester)" >> build.properties
+	echo "commons-beanutils.jar=$(java-pkg_getjars commons-beanutils-1.7)" >> build.properties
+	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
+	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" >> build.properties
+}
+
+EANT_JAVA_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-digester,commons-logging,junit"
+
+EANT_BUILD_TARGET="compile"
+EANT_EXTRA_ARGS="-Dskip.download=true"
+
+src_compile() {
+	java-pkg-2_src_compile
+	jar -cf ${PN}.jar -C target/classes/ . || die "Could not create jar."
+
+	if use test ; then
+		eant compile.tests ${EANT_EXTRA_ARGS} -Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${EANT_TEST_GENTOO_CLASSPATH})"
+		jar -cf ${PN}-test.jar -C target/tests/ . || die "Could not create test jar."
+	fi
+}
+
+# Missing test suite org.apache.commons.validator.ValidatorTestSuite; therefore, tests can't be ran.
+# See https://issues.apache.org/jira/browse/VALIDATOR-323 for a bug report about this.
+RESTRICT="test"
+
+src_test() {
+	echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties
+	eant test ${EANT_EXTRA_ARGS} -Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${EANT_TEST_GENTOO_CLASSPATH}):${PN}.jar:${PN}-test.jar"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	dodoc NOTICE.txt RELEASE-NOTES.txt
+
+	# Docs are no longer generated, as they have commented them out;
+	# probably on purpose, since this is the start of a new branch.
+	# use doc && java-pkg_dojavadoc dist/docs/apidocs
+	use examples && java-pkg_doexamples src/example
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-validator/commons-validator-1.4.1.ebuild b/dev-java/commons-validator/commons-validator-1.4.1.ebuild
new file mode 100644
index 000000000000..a7f4bcc21ed6
--- /dev/null
+++ b/dev-java/commons-validator/commons-validator-1.4.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="examples source test" # doc
+
+inherit java-pkg-2 java-ant-2
+
+MY_P=${P}-src
+
+DESCRIPTION="Commons component to validate user input, or data input"
+HOMEPAGE="http://commons.apache.org/validator/"
+SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6
+	>=dev-java/commons-digester-1.6:0
+	>=dev-java/commons-collections-3.1:0
+	>=dev-java/commons-logging-1.0.4:0
+	dev-java/commons-beanutils:1.7"
+
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/junit:0 )
+	${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/validator-1.4.build.xml.patch
+
+	JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath
+
+	echo "commons-digester.jar=$(java-pkg_getjars commons-digester)" >> build.properties
+	echo "commons-beanutils.jar=$(java-pkg_getjars commons-beanutils-1.7)" >> build.properties
+	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
+	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" >> build.properties
+}
+
+EANT_JAVA_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-digester,commons-logging,junit"
+
+EANT_BUILD_TARGET="compile"
+EANT_EXTRA_ARGS="-Dskip.download=true"
+
+src_compile() {
+	java-pkg-2_src_compile
+	jar -cf ${PN}.jar -C target/classes/ . || die "Could not create jar."
+
+	if use test ; then
+		eant compile.tests ${EANT_EXTRA_ARGS} -Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${EANT_TEST_GENTOO_CLASSPATH})"
+		jar -cf ${PN}-test.jar -C target/tests/ . || die "Could not create test jar."
+	fi
+}
+
+# Missing test suite org.apache.commons.validator.ValidatorTestSuite;
+# therefore, tests can't be run.
+
+# See https://issues.apache.org/jira/browse/VALIDATOR-323 for a bug report about this.
+RESTRICT="test"
+
+src_test() {
+	echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties
+	eant test ${EANT_EXTRA_ARGS} -Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${EANT_TEST_GENTOO_CLASSPATH}):${PN}.jar:${PN}-test.jar"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	dodoc NOTICE.txt RELEASE-NOTES.txt
+
+	# Docs are no longer generated, as they have commented them out;
+	# probably on purpose, since this is the start of a new branch.
+	# use doc && java-pkg_dojavadoc dist/docs/apidocs
+	use examples && java-pkg_doexamples src/example
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-validator/files/validator-1.4.build.xml.patch b/dev-java/commons-validator/files/validator-1.4.build.xml.patch
new file mode 100644
index 000000000000..579832bb4a09
--- /dev/null
+++ b/dev-java/commons-validator/files/validator-1.4.build.xml.patch
@@ -0,0 +1,20 @@
+--- build.xml.o	2006-10-21 18:12:49.000000000 +0200

++++ build.xml	2006-10-21 18:29:18.000000000 +0200

+@@ -204,7 +205,7 @@

+   </target>

+ 

+ 

+-  <target name="compile" depends="static"

++  <target name="compile" depends="prepare"

+    description="Compile shareable components">

+     <javac  srcdir="${source.home}"

+            destdir="${build.home}/classes"

+@@ -278,7 +279,7 @@

+     </exec>

+   </target>

+ 

+-  <target name="javadoc" depends="compile, javadoc.js"

++  <target name="javadoc" depends="compile"

+    description="Create component Javadoc documentation">

+     <javadoc sourcepath="${source.home}"

+                 destdir="${dist.home}/docs/apidocs"

diff --git a/dev-java/commons-validator/metadata.xml b/dev-java/commons-validator/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-validator/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-vfs-1.0-r1 b/dev-java/commons-vfs-1.0-r1
deleted file mode 100644
index 92b1d4afefd8..000000000000
--- a/dev-java/commons-vfs-1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/jsch:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A single Java API for accessing various different file systems
-EAPI=6
-HOMEPAGE=https://commons.apache.org/vfs/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/jsch:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/commons/vfs/source/commons-vfs-1.0-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b042b8cfc046879b86e65e47492b1052
diff --git a/dev-java/commons-vfs-2.0-r1 b/dev-java/commons-vfs-2.0-r1
deleted file mode 100644
index 4f5c4f3981eb..000000000000
--- a/dev-java/commons-vfs-2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A single API for accessing various different file systems
-EAPI=5
-HOMEPAGE=http://commons.apache.org/vfs/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1b18fa8a8204962f407af00f6a84ffd6
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
new file mode 100644
index 000000000000..00643efc7003
--- /dev/null
+++ b/dev-java/commons-vfs/Manifest
@@ -0,0 +1,7 @@
+AUX commons-vfs-2.0-build.xml 14505 BLAKE2B adcdc22f6d65d5c98676bde1598d0cfe48c903aa919f0426a699051e6b2a3060a46f87ee33f26579de7b3cdf822f749712234dd1b6482130d3f195b77d606a1e SHA512 a8ec511906b80562ac3f8a8c791703ce06f6fd0861ea5a29684e60716a2dff67ec5f497e11959a3f989fcc538f6c3f6dfebfa0fdaeb316965a2c30ee50001eab
+AUX commons-vfs-2.0-incompatibility.patch 2699 BLAKE2B 09e8762553ce25d02942b2a70780ab68aacb5e6126df3e3f7b9f0bf8feae8e8809653c2a52eb09b58510944b87c1609d0120397ba7ac4f5d68317c18060a7d0b SHA512 ca554a098d4aaa6b8848927bfb4f70707dcaa0ba61d174ac517ac9864aa9b3f3e899e3890eab920582098aeea379cdf9ff1279ee7f8ddd37906fd24260954095
+DIST commons-vfs-1.0-src.tar.gz 278588 BLAKE2B a92be28e02758bd271d7bf76f8b90c741dad0f1c15c71ab3624e16c6c30a47bbe189ef93c99b1f413034c47dbfdefbc155a526abf9897b85cb7352d1a92b4bef SHA512 5826ccd3faf574d7573b22fbab5f7f3ddc83b22504eb0822efbcc4570059db410d1a32811bf411414d275bdeb16ce39fd7cca2150d8537841cd888b1aef2b5a1
+DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
+EBUILD commons-vfs-1.0-r1.ebuild 926 BLAKE2B 015548e9af71869d3fbbcb86fd2b26357c134f9fc0eff582eda19bda7b57252e05242f519e7e62d5f6600e3df27c8a182c415e23dcd9ceb11b6463be1db583ca SHA512 fbb4861ec1710b7de93d5690be2fa91920833b3274f5d47a558c94c95a912083b494f6bc40d5606b4a2c07ce17d10c46d7ef41105034290beaa0cfc3671bb2f7
+EBUILD commons-vfs-2.0-r1.ebuild 1551 BLAKE2B 43e4cb03cff172de62bddc07ccc970de8cfa599084b3588c3cb7564cd1834b3ac8e65e673de534cd21ffdff0b4f5a4b30d1988de9c8e9b9d2952de7417d32530 SHA512 dc4545c9ff8170375a338780e6f7756e99a454e87d5eb9594367c08d1fc36001b681a760f521ff9c48441d337eefff505106e04acfe9cb79cc8dbcb38a52d758
+MISC metadata.xml 522 BLAKE2B b4fa8415246b36a13af5f876f6fb75a49d867247d47d39fa26652917f0dc6e0fd48e99518cb7406375ea9b5715a8beb0f798dd9d95825969fa320aded7da50e3 SHA512 1c1c96edc32537d782e66dcf44b14081f2cdd249e5bb398dcc711b4dabac745db15af7fee7ceaaf0d758738b99f3fee8be7b9e1561887426c3ae8988bc1900a1
diff --git a/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
new file mode 100644
index 000000000000..0387c4902d78
--- /dev/null
+++ b/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
@@ -0,0 +1,39 @@
+# 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="A single Java API for accessing various different file systems"
+HOMEPAGE="https://commons.apache.org/vfs/"
+SRC_URI="https://archive.apache.org/dist/${PN/-//}/source/${P}-src.tar.gz" # Not on Apache mirrors.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+RESTRICT="test" # Some failures, can't figure them out.
+
+CP_DEPEND="
+	dev-java/ant-core:0
+	dev-java/commons-collections:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/commons-net:0
+	dev-java/jsch:0
+"
+
+RDEPEND=">=virtual/jre-1.7
+	${CP_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CP_DEPEND}"
+
+S="${WORKDIR}/${P}-src"
+JAVA_SRC_DIR="core/src/main"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc {NOTICE,RELEASE_NOTES}.txt
+}
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
new file mode 100644
index 000000000000..dfb280409533
--- /dev/null
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A single API for accessing various different file systems"
+HOMEPAGE="http://commons.apache.org/vfs/"
+SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/commons-collections:0
+	dev-java/commons-logging:0
+	dev-java/commons-net:0
+	dev-java/commons-httpclient:3
+	dev-java/jackrabbit-webdav:0
+	dev-java/jsch:0
+	"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}/core"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-incompatibility.patch
+
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	java-ant_rewrite-classpath
+	java-ant_ignore-system-classes
+}
+
+EANT_GENTOO_CLASSPATH="
+	ant-core
+	commons-collections
+	commons-logging
+	commons-net
+	commons-httpclient-3
+	jackrabbit-webdav
+	jsch
+"
+EANT_EXTRA_ARGS="-Dlibdir=${T}"
+
+# The build.xml is generated from maven and can't run the tests properly
+# Use maven test to execute these manually but that means downloading deps from
+# the internet. Also the tests need to login to some ftp servers and samba
+# shares so I doubt they work for everyone.
+#src_test() {
+#	ANT_TASKS="ant-junit" eant test
+#}
+
+src_install() {
+	java-pkg_newjar target/*.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml b/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml
new file mode 100644
index 000000000000..753e93d669f2
--- /dev/null
+++ b/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml
@@ -0,0 +1,298 @@
+<?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/29/13 3:05 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="commons-vfs2-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="commons-vfs2-2.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/java"/>
+  <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.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}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+    <pathelement location="${maven.repo.local}/ant/ant/1.6.2/ant-1.6.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-net/commons-net/2.2/commons-net-2.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-webdav/1.5.2/jackrabbit-webdav-1.5.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.2/jackrabbit-jcr-commons-1.5.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar"/>
+    <pathelement location="${maven.repo.local}/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-api/1.4/maven-scm-api-1.4.jar"/>
+    <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svnexe/1.4/maven-scm-provider-svnexe-1.4.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svn-commons/1.4/maven-scm-provider-svn-commons-1.4.jar"/>
+    <pathelement location="${maven.repo.local}/regexp/regexp/1.3/regexp-1.3.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+    <pathelement location="${maven.repo.local}/ant/ant/1.6.2/ant-1.6.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-net/commons-net/2.2/commons-net-2.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/commons/commons-compress/1.1/commons-compress-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-webdav/1.5.2/jackrabbit-webdav-1.5.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.2/jackrabbit-jcr-commons-1.5.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar"/>
+    <pathelement location="${maven.repo.local}/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-api/1.4/maven-scm-api-1.4.jar"/>
+    <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svnexe/1.4/maven-scm-provider-svnexe-1.4.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svn-commons/1.4/maven-scm-provider-svn-commons-1.4.jar"/>
+    <pathelement location="${maven.repo.local}/regexp/regexp/1.3/regexp-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}" 
+           encoding="iso-8859-1" 
+           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}">
+        <exclude name="**/*.java"/>
+      </fileset>
+    </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>
+
+  <!-- ====================================================================== -->
+  <!-- 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="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>
+    <mkdir dir="${maven.build.testOutputDir}/META-INF"/>
+    <copy todir="${maven.build.testOutputDir}/META-INF">
+      <fileset dir="${maven.build.testResourceDir.1}">
+        <include name="NOTICE.txt"/>
+        <include name="LICENSE.txt"/>
+      </fileset>
+    </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="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/RunTest.java"/>
+          <exclude name="**/*$*"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/RunTest.java"/>
+          <exclude name="**/*$*"/>
+        </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" 
+             encoding="iso-8859-1" 
+             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" 
+             source="1.5" 
+             linksource="true" 
+             breakiterator="false">
+      <link href="http://download.oracle.com/javase/6/docs/api/"/>
+    </javadoc>
+  </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">
+    </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">
+  </target>
+
+</project>
diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch b/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch
new file mode 100644
index 000000000000..298503ec6153
--- /dev/null
+++ b/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch
@@ -0,0 +1,41 @@
+diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
+--- a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java	2013-07-05 15:28:39.072739044 +0200
++++ b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java	2013-07-05 15:30:24.799404027 +0200
+@@ -50,7 +50,7 @@
+         {
+             try
+             {
+-                Element error = davExc.toXml(DomUtil.BUILDER_FACTORY.newDocumentBuilder().newDocument());
++                Element error = davExc.toXml(DomUtil.createDocument());
+                 if (DomUtil.matches(error, DavException.XML_ERROR, DavConstants.NAMESPACE))
+                 {
+                     if (DomUtil.hasChildElement(error, "exception", null))
+diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
+--- a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java	2013-07-05 15:28:39.072739044 +0200
++++ b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java	2013-07-05 15:31:02.449403426 +0200
+@@ -63,6 +63,7 @@
+ import org.apache.jackrabbit.webdav.client.methods.UncheckoutMethod;
+ import org.apache.jackrabbit.webdav.client.methods.VersionControlMethod;
+ import org.apache.jackrabbit.webdav.property.DavProperty;
++import org.apache.jackrabbit.webdav.property.DavPropertyIterator;
+ import org.apache.jackrabbit.webdav.property.DavPropertyName;
+ import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
+ import org.apache.jackrabbit.webdav.property.DavPropertySet;
+@@ -294,7 +294,7 @@
+             DavPropertySet properties = getProperties(fileName, PropFindMethod.PROPFIND_ALL_PROP,
+                     new DavPropertyNameSet(), false);
+             @SuppressWarnings("unchecked") // iterator() is documented to return DavProperty instances
+-            Iterator<DavProperty> iter = properties.iterator();
++            DavPropertyIterator iter = properties.iterator();
+             while (iter.hasNext())
+             {
+                 DavProperty property = iter.next();
+@@ -302,7 +302,7 @@
+             }
+             properties = getPropertyNames(fileName);
+             @SuppressWarnings("unchecked") // iterator() is documented to return DavProperty instances
+-            Iterator<DavProperty> iter2 = properties.iterator();
++            DavPropertyIterator iter2 = properties.iterator();
+             while (iter2.hasNext())
+             {
+                 DavProperty property = iter2.next();
diff --git a/dev-java/commons-vfs/metadata.xml b/dev-java/commons-vfs/metadata.xml
new file mode 100644
index 000000000000..4591b9d5f08b
--- /dev/null
+++ b/dev-java/commons-vfs/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		Commons VFS provides a single API for accessing various different file
+		systems. It presents a uniform view of the files from various different
+		sources, such as the files on local disk, on an HTTP server, or inside
+		a Zip archive.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/constantine-0.7-r1 b/dev-java/constantine-0.7-r1
deleted file mode 100644
index 1f9ac23004a9..000000000000
--- a/dev-java/constantine-0.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Provides Java values for common platform C constants
-EAPI=5
-HOMEPAGE=https://github.com/wmeissner/jnr-constants
-IUSE=elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/constantine-0.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=378570763a3ff27c48f1e392b353f872
diff --git a/dev-java/constantine/Manifest b/dev-java/constantine/Manifest
new file mode 100644
index 000000000000..8cab599dd919
--- /dev/null
+++ b/dev-java/constantine/Manifest
@@ -0,0 +1,3 @@
+DIST constantine-0.7.tar.gz 65563 BLAKE2B 25298a086d05955e5ffaebc705ecf704cb856f6d08740c45618ebb721b2c6344f2be079bf2a4411161ff67584b92454162657adf6e3539474d0dc4500f85dfaf SHA512 2694caae29bae1a3e1d765ac02c4014bc6fd3dac8370feb5d12f43119c057fc2a2e75b0aa37eec0164bf8a82a1bafb0f41565f397b956ae53a52f7cb803508c7
+EBUILD constantine-0.7-r1.ebuild 856 BLAKE2B 8305dcccfc638188bb63cc60695ebf06cd07a77f4676204f66a926d31aec9d5eb5d18b1c2abc5d7c0da0cda8b42208064366a06dbc32a077e376bacae44279cb SHA512 29ce3574c7c6ec10b42121899f1295ef0884e1cab70bdca8da98c3baede8178e596ce28f5b9b8b09bd8d7e6076763c1c47deec10c7ce37257df2f43bac9d9cf4
+MISC metadata.xml 334 BLAKE2B 0c2a22097391d36d74e4aa8dd0c0750027523f99d51524365bfd5eb104ddbedbcc971856644d5b7040450debc5d25a50421e693312381224c9c59805799eaeed SHA512 a4669719091792c9243f012194a0c0c56eebe367deebf09a952f2b98d5545a7996db08b655bcb5e8ec6d962eff67c8a159a0cd7427efc5c7e05e97d67b8a21b9
diff --git a/dev-java/constantine/constantine-0.7-r1.ebuild b/dev-java/constantine/constantine-0.7-r1.ebuild
new file mode 100644
index 000000000000..695a644d81af
--- /dev/null
+++ b/dev-java/constantine/constantine-0.7-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Provides Java values for common platform C constants"
+HOMEPAGE="https://github.com/wmeissner/jnr-constants"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+src_compile() {
+	# ecj doesn't like some cast for some reason
+	java-pkg_force-compiler javac
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	ANT_TASKS="ant-junit4" eant test -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/constantine/metadata.xml b/dev-java/constantine/metadata.xml
new file mode 100644
index 000000000000..321d427eaeba
--- /dev/null
+++ b/dev-java/constantine/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">wmeissner/jnr-constants</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/cortado-0.6.0-r1 b/dev-java/cortado-0.6.0-r1
deleted file mode 100644
index e1c145cef5d2..000000000000
--- a/dev-java/cortado-0.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Multimedia framework for Java written by Fluendo
-EAPI=5
-HOMEPAGE=https://www.theora.org/cortado/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=363c608d0ebc39dce6d5b3e1989025b3
diff --git a/dev-java/cortado/Manifest b/dev-java/cortado/Manifest
new file mode 100644
index 000000000000..f993adefbb82
--- /dev/null
+++ b/dev-java/cortado/Manifest
@@ -0,0 +1,3 @@
+DIST cortado-0.6.0.tar.gz 233854 BLAKE2B 54ace339a6038b46bbf2d993eb911f1845f8717dcf4eeaae0fcd807488a0293bb6618fe72ffa5bc425dc9f7d47f5362ff55168191aab15dbed59547f7c1d72dd SHA512 56113259da05a73f4d4e7aca92d031fa934987ad3607a69b31666c9e452330a95728e7780c45d825ddeb9c0815ace479d7a55df0e68a50e63a76ddf5602c76da
+EBUILD cortado-0.6.0-r1.ebuild 760 BLAKE2B fe0c7962ee3a8e53738663efde1c97fe8d7ef6bc110ac6926fa28c86a142e0466f0f546c0df64182db6d76b2eb574c90f3fc91fd53872f43bc7c3ce08caf2d31 SHA512 22dff7958965edb3f60c0e52ceb71807e31ee3c82689411f4f0e7600a8c975e96eb42ff5ad3a4396edb922357ad441c0458a2bc1081a083b10f16ebc0e9852fe
+MISC metadata.xml 1146 BLAKE2B c423c06402e9a88eb11980fb8404d8207a967bd9306d254aff1cbdae4f7faa64edd20b135f1998b22667a7f6aa1c535eeb507c92a371f7bea9436f33aebcf80b SHA512 3671a67e4e69eb69ab47f587e75ccc5d18cced1f8d018f90e4e0aa7ebe68819cc7b9170d1780339c55b7fe6852805d6c1ad1f0bd6fbdac3bb374eabc6426a2bd
diff --git a/dev-java/cortado/cortado-0.6.0-r1.ebuild b/dev-java/cortado/cortado-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..350b3b47d896
--- /dev/null
+++ b/dev-java/cortado/cortado-0.6.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Multimedia framework for Java written by Fluendo"
+HOMEPAGE="https://www.theora.org/cortado/"
+SRC_URI="https://downloads.xiph.org/releases/cortado/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+EANT_BUILD_TARGET="stripped"
+
+src_prepare() {
+	echo "#!/bin/sh" > scripts/get-revision || die
+	echo "echo ${PV}" >> scripts/get-revision || die
+}
+
+src_install() {
+	java-pkg_newjar "output/dist/applet/${PN}-ovt-stripped-${PV}.jar"
+	dodoc ChangeLog HACKING NEWS README RELEASE TODO \
+		|| die "dodoc failed"
+}
diff --git a/dev-java/cortado/metadata.xml b/dev-java/cortado/metadata.xml
new file mode 100644
index 000000000000..d9a784348941
--- /dev/null
+++ b/dev-java/cortado/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		Cortado is an open-source cross-browser and cross-platform video
+		playback solution based upon Java technology. Leveraging the huge
+		installation base of Java it allows web-authors to deliver Ogg Theora
+		content without having to worry about the media playback setup
+		installed on customers' machines. This enables e.g. Wikipedia to
+		deliver Ogg Theora video content embedded into articles to millions of
+		users. Originally developed at Fluendo, Cortado's latest versions are
+		now maintained by Xiph.org. If you're interested in using free media
+		delivery technology, e.g. to avoid the costs adjunctive to non-free
+		technologies like H.264, and want to reach a big potential user base,
+		Cortado may be the solution you've been looking for. 
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/cpptasks-1.0_beta5 b/dev-java/cpptasks-1.0_beta5
deleted file mode 100644
index a0c5467cabb9..000000000000
--- a/dev-java/cpptasks-1.0_beta5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 dev-java/xerces:2 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Ant-tasks to compile various source languages and produce executables
-EAPI=4
-HOMEPAGE=http://ant-contrib.sourceforge.net/
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-core:0 dev-java/xerces:2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2ea577b41d8f8daec43d867f7dc916ff
diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
new file mode 100644
index 000000000000..e90c6ed5e2ee
--- /dev/null
+++ b/dev-java/cpptasks/Manifest
@@ -0,0 +1,3 @@
+DIST cpptasks-1.0b5.tar.gz 902930 BLAKE2B 02cc20ea8e4316f7d0572cd147868219f1cfa326fd87d2edbea8a9b81c88f83173a373a88149bc2da55099bb9a0ac4d1f8927a6c708e6a5640b56220dbdba006 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c
+EBUILD cpptasks-1.0_beta5.ebuild 1086 BLAKE2B e64dccaa56ccf4293296d7f3e3867cab2f8e42eba14e838208ae1ba462b2f66b51eec1721e7f6aa462412d435d24fca25275abde92999a760d3054c8c656cb6c SHA512 ebd302f4af84c292eb974ab6f1968e702934ef7504458507c54931116af6fdbb640ab143ee061f471bea1b8ac16f23af337087b94a562663c2dd0b4545e4c07a
+MISC metadata.xml 317 BLAKE2B 7a5bf5450578fb6d057233a53ba7f3e7fa6c3f969f7fa0eba8c22ac17b4efa19b270a765043d61635780b0da1f22e8a0d0304f0c15d468f72fafee1341b8131d SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
new file mode 100644
index 000000000000..fd8f96b943c7
--- /dev/null
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/xerces:2"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P/_beta/b}"
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
+EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
+
+src_install() {
+	java-pkg_dojar target/lib/${PN}.jar
+
+	java-pkg_register-ant-task
+
+	dodoc NOTICE
+	use doc && java-pkg_dojavadoc build/api
+	use examples && java-pkg_doexamples src/samples/*
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/cpptasks/metadata.xml b/dev-java/cpptasks/metadata.xml
new file mode 100644
index 000000000000..5c1224a74c63
--- /dev/null
+++ b/dev-java/cpptasks/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ant-contrib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/cssparser-0.9.25 b/dev-java/cssparser-0.9.25
deleted file mode 100644
index 784715918403..000000000000
--- a/dev-java/cssparser-0.9.25
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/sac:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=API for parsing CSS 2 in Java
-EAPI=6
-HOMEPAGE=http://cssparser.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/sac:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/cssparser/cssparser-0.9.25-sources.jar -> cssparser-0.9.25.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=421bd6d26c71e4e83ad7401739c919f1
diff --git a/dev-java/cssparser/Manifest b/dev-java/cssparser/Manifest
new file mode 100644
index 000000000000..c0ef54a580f6
--- /dev/null
+++ b/dev-java/cssparser/Manifest
@@ -0,0 +1,3 @@
+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.25.ebuild b/dev-java/cssparser/cssparser-0.9.25.ebuild
new file mode 100644
index 000000000000..6b38a3223d5f
--- /dev/null
+++ b/dev-java/cssparser/cssparser-0.9.25.ebuild
@@ -0,0 +1,27 @@
+# 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="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/metadata.xml b/dev-java/cssparser/metadata.xml
new file mode 100644
index 000000000000..96a6c7e3b972
--- /dev/null
+++ b/dev-java/cssparser/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cssparser</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/dbus-java-2.7-r1 b/dev-java/dbus-java-2.7-r1
deleted file mode 100644
index 15ee1e2dd91a..000000000000
--- a/dev-java/dbus-java-2.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 app-text/docbook-sgml-utils dev-java/libmatthew-java sys-devel/gettext doc? ( dev-tex/tex4ht dev-texlive/texlive-latexextra ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java bindings for the D-Bus messagebus
-EAPI=2
-HOMEPAGE=https://dbus.freedesktop.org/
-IUSE=debug elibc_FreeBSD doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=|| ( GPL-2 AFL-2.1 )
-RDEPEND=>=virtual/jre-1.5 >=dev-java/libmatthew-java-0.7-r1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9e1b29f504e8a3e618e2278a478d969c
diff --git a/dev-java/dbus-java/Manifest b/dev-java/dbus-java/Manifest
new file mode 100644
index 000000000000..7b2a0b8ab628
--- /dev/null
+++ b/dev-java/dbus-java/Manifest
@@ -0,0 +1,5 @@
+AUX dbus-java-2.5.1-jarfixes.patch 1761 BLAKE2B f91efbc7c0e60a9090fb48f8e789f7f85e3a8e601b1dd4cd576f5b2b8b18221e55c36cb1c53a3764cc37f7ed0a6f719eca8dd1ffccb454753cbc81611394ca6a SHA512 7f16a3cf42296f4c8f0c083f07f7afc664c0c51b78548b05c53ad7537c70f8cfcbf178b4bdf554cd9559edf3ff401fbe73097866ca842030b1619b4c92212df0
+AUX dbus-java-htlatex.patch 638 BLAKE2B f11dd6579e44f0177006139c4f3d35650149375d615d409e68ebc3fee249c7980506e95ffd63d94b4e35b35e102ad3ebaa4dfbcd43a629a0f5f4304a40c775e6 SHA512 d9c86980f9263bac50ba357a9293d3630eadc35e0b67cf4c3547caf96d0b6d9a076dab548b54d43e466f8c77412eec2ed6527de98fe10cfdd7d26645285daede
+DIST dbus-java-2.7.tar.gz 145450 BLAKE2B e854dbd7eefa9b9cef85a96ae0b301c8e51924a240e976841df4fff84c42b20331194d59b21022e3c0a7806f4e652f396f938df3ff8ef156f49937e65b0bf991 SHA512 15b44b877ce123948b07aa67bdf73e1fbf6bf2de89d09647dd11d33fc6beb76509b61b73e8a8c5f6331300ac0d9760d7e715b4b9467307f13cfc94b5c856eaa3
+EBUILD dbus-java-2.7-r1.ebuild 2722 BLAKE2B cc009d0218d632675eff04e9c77441926a88f8100069621dd7a03ba178accb6946d524ec7ceae281e1ef275aad4e7e17d9e9db494a1fd6ca6afb5b95e09b8a6d SHA512 7291603929c3b7d4a8d884055420091a52fa50b4dca63b5980bbbcc503e31426f587efa88a75e666b9426a64fc3811ce9f09c2fd3d05641dff5ea3c3fee76506
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/dbus-java/dbus-java-2.7-r1.ebuild b/dev-java/dbus-java/dbus-java-2.7-r1.ebuild
new file mode 100644
index 000000000000..655984b4b0ae
--- /dev/null
+++ b/dev-java/dbus-java/dbus-java-2.7-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+inherit eutils java-pkg-2
+
+DESCRIPTION="Java bindings for the D-Bus messagebus"
+HOMEPAGE="https://dbus.freedesktop.org/"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus-java/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="debug"
+
+RDEPEND=">=virtual/jre-1.5
+	>=dev-java/libmatthew-java-0.7-r1"
+
+DEPEND=">=virtual/jdk-1.5
+	app-text/docbook-sgml-utils
+	dev-java/libmatthew-java
+	sys-devel/gettext
+	doc? (
+		dev-tex/tex4ht
+		dev-texlive/texlive-latexextra
+	)"
+
+java_prepare() {
+	epatch "${FILESDIR}/${PN}-2.5.1-jarfixes.patch"
+
+	# dev-tex/tex4ht changed htlatex path, see bug #318963
+	if use doc; then
+		epatch "${FILESDIR}/${PN}-htlatex.patch"
+	fi
+}
+
+src_compile() {
+	local debug="disable"
+	use debug && debug="enable"
+	local libdir=$(dirname $(java-pkg_getjar libmatthew-java unix.jar))
+	emake -j1 JCFLAGS="$(java-pkg_javac-args)" \
+		STRIP=echo DEBUG=${debug} JAVAUNIXJARDIR=${libdir} bin || die "emake failed"
+
+	for i in *.sgml; do
+		docbook2man $i || die;
+		mv DBUS-JAVA.1 $(echo $i | sed 's/sgml/1/g') || die;
+	done
+
+	if use doc; then
+		emake doc || die "emake doc failed"
+	fi
+}
+
+src_install() {
+	local debug="disable"
+	use debug && debug="enable"
+	for jar in unix hexdump debug-${debug}; do
+		java-pkg_register-dependency libmatthew-java ${jar}.jar
+	done
+	java-pkg_newjar lib${P}.jar dbus.jar
+	java-pkg_newjar dbus-java-viewer-${PV}.jar dbus-java-viewer.jar
+	java-pkg_newjar dbus-java-bin-${PV}.jar dbus-java-bin.jar
+	local javaargs='-DPid=$$'
+	javaargs="${javaargs} -DVersion=${PV}"
+
+	java-pkg_dolauncher CreateInterface \
+		--main org.freedesktop.dbus.bin.CreateInterface \
+		--java_args "${javaargs}"
+
+	java-pkg_dolauncher DBusViewer \
+		--main org.freedesktop.dbus.viewer.DBusViewer \
+		--java_args "${javaargs}"
+
+	java-pkg_dolauncher ListDBus \
+		--main org.freedesktop.dbus.bin.ListDBus \
+		--java_args "${javaargs}"
+
+	java-pkg_dolauncher DBusDaemon \
+		--main org.freedesktop.dbus.bin.DBusDaemon \
+		--java_args "${javaargs}"
+
+	java-pkg_dolauncher DBusCall \
+		--main org.freedesktop.dbus.bin.Caller \
+		--java_args "${javaargs}"
+
+	doman *.1
+	dodoc INSTALL changelog AUTHORS README || die
+	use source && java-pkg_dosrc org/
+	use doc && java-pkg_dojavadoc doc/api
+	use doc && java-pkg_dohtml doc/dbus-java/*
+}
+
+src_test() {
+	local debug="disable"
+	use debug && debug="enable"
+	local libdir=$(dirname $(java-pkg_getjar libmatthew-java unix.jar))
+	emake -j1 JCFLAGS="$(java-pkg_javac-args) -encoding UTF-8" \
+		DEBUG=${debug} JAVAUNIXJARDIR=${libdir} JAVAUNIXLIBDIR=/usr/lib/libmatthew-java check || die "emake check failed"
+}
diff --git a/dev-java/dbus-java/files/dbus-java-2.5.1-jarfixes.patch b/dev-java/dbus-java/files/dbus-java-2.5.1-jarfixes.patch
new file mode 100644
index 000000000000..cd49726b6403
--- /dev/null
+++ b/dev-java/dbus-java/files/dbus-java-2.5.1-jarfixes.patch
@@ -0,0 +1,25 @@
+diff -Nur dbus-java-2.5.1/Makefile dbus-java-2.5.1_patched/Makefile
+--- dbus-java-2.5.1/Makefile	2008-07-21 13:44:10.000000000 +0300
++++ dbus-java-2.5.1_patched/Makefile	2008-11-28 07:10:30.000000000 +0200
+@@ -87,17 +87,13 @@
+ 	sed -n '/_(/s/.*_("\([^"]*\)").*/\1/p' $^ | sort -u | sed 's/\(.*\)/msgid "\1"\nmsgstr "\1"/' >> $@
+ 
+ libdbus-java-$(VERSION).jar: .classes
+-	echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar ${JAVAUNIXJARDIR}/hexdump.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest
+-	(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class)
++	(cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class)
+ dbus-java-test-$(VERSION).jar: .testclasses
+-	echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest
+-	(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/test/*.class)
++	(cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/test/*.class)
+ dbus-java-viewer-$(VERSION).jar: .viewerclasses
+-	echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest
+-	(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/viewer/*.class)
++	(cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/viewer/*.class)
+ dbus-java-bin-$(VERSION).jar: .binclasses
+-	echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest
+-	(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/bin/*.class)
++	(cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/bin/*.class)
+ dbus.jar: libdbus-java-$(VERSION).jar
+ 	ln -sf $< $@
+ dbus-bin.jar: dbus-java-bin-$(VERSION).jar
diff --git a/dev-java/dbus-java/files/dbus-java-htlatex.patch b/dev-java/dbus-java/files/dbus-java-htlatex.patch
new file mode 100644
index 000000000000..ebb278ad169b
--- /dev/null
+++ b/dev-java/dbus-java/files/dbus-java-htlatex.patch
@@ -0,0 +1,11 @@
+--- Makefile~	2009-11-01 14:53:27.000000000 +0100
++++ Makefile	2010-05-08 16:26:10.000000000 +0200
+@@ -131,7 +131,7 @@
+ 	(cd doc; pdflatex ../dbus-java.tex)
+ doc/dbus-java/index.html: dbus-java.tex .doc
+ 	mkdir -p doc/dbus-java/
+-	(cd doc/dbus-java; TEX4HTENV=/etc/tex4ht/tex4ht.env htlatex ../../dbus-java.tex "xhtml,2" "" "-cvalidate")
++	(cd doc/dbus-java; TEX4HTENV=/etc/tex4ht/tex4ht.env mk4ht htlatex ../../dbus-java.tex "xhtml,2" "" "-cvalidate")
+ 	rm -f doc/dbus-java/*{4ct,4tc,aux,dvi,idv,lg,log,tmp,xref}
+ 	cp doc/dbus-java/dbus-java.html doc/dbus-java/index.html
+ doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc
diff --git a/dev-java/dbus-java/metadata.xml b/dev-java/dbus-java/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/dbus-java/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/dict4j-1.1 b/dev-java/dict4j-1.1
deleted file mode 100644
index d1935a3bd05b..000000000000
--- a/dev-java/dict4j-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Dict protocol implementation in Java
-EAPI=5
-HOMEPAGE=http://dict4j.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/dict4j/dict4j-1.1-src.jar -> dict4j-1.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2c0183c0f6d52cf297e0ef24933d9b87
diff --git a/dev-java/dict4j/Manifest b/dev-java/dict4j/Manifest
new file mode 100644
index 000000000000..5a1b738f5f67
--- /dev/null
+++ b/dev-java/dict4j/Manifest
@@ -0,0 +1,3 @@
+DIST dict4j-1.1.jar 50269 BLAKE2B 70f7a46549384a063e1240bdb375a8c12e81c6a07a4c15bc1abcdb603ac89a2157a2cc2561960e4ab955d079dab3419708ae89e7f59bed51cc1da53649e52714 SHA512 35a6d77d13effa8d5e59ed2c03ff5700ccf2d91673b2bcf420a4f216176ca521dff741ff6660547823d16d06df1dcd2d44be1e90ce293a83ad9fa649b5caf7c6
+EBUILD dict4j-1.1.ebuild 509 BLAKE2B e50616a00e99520e5aa08f605f4d26e40dd013a33b999d531e63d373dd565c6a0e39108e94b65f3d53c34b3781a38a4145662771e436dcfeb024311923fe134c SHA512 9b4eb2d394166ea08010b4343ae7cde4755cb8fbb28468c9013d114198e9c9ab4533dc69d3c5cd8274a5449635d335400a692d9c204c43949e7c252de3b35dbf
+MISC metadata.xml 393 BLAKE2B bfa544c6a81603becaec7d166067461056c23acb35e4b27b2c6ccc15d51e91ddb53b89ce0bbe1ec2747b86881a3bf4a276998ec48038fe26f59c8d30cb069052 SHA512 ef2a5ab9888d298103211edc2a583bd17b0377fe639b23d1bc57f899af4690d59785183fb281286547714ed00240881a02beb6e210d08c1c4fd7ba618f96120b
diff --git a/dev-java/dict4j/dict4j-1.1.ebuild b/dev-java/dict4j/dict4j-1.1.ebuild
new file mode 100644
index 000000000000..70e12c0b2ae4
--- /dev/null
+++ b/dev-java/dict4j/dict4j-1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Dict protocol implementation in Java"
+HOMEPAGE="http://dict4j.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.jar -> ${P}.jar"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+JAVA_SRC_DIR="net"
+JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/dict4j/metadata.xml b/dev-java/dict4j/metadata.xml
new file mode 100644
index 000000000000..182d422e97da
--- /dev/null
+++ b/dev-java/dict4j/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dict4j</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/disruptor-3.2.0 b/dev-java/disruptor-3.2.0
deleted file mode 100644
index 29212a050645..000000000000
--- a/dev-java/disruptor-3.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Performance Inter-Thread Messaging Library
-EAPI=5
-HOMEPAGE=http://lmax-exchange.github.io/disruptor/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://repo1.maven.org/maven2/com/lmax/disruptor/3.2.0/disruptor-3.2.0-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=42d9f64f840ecda95f14b07bf13c0af9
diff --git a/dev-java/disruptor/Manifest b/dev-java/disruptor/Manifest
new file mode 100644
index 000000000000..eb1dbdaac2d0
--- /dev/null
+++ b/dev-java/disruptor/Manifest
@@ -0,0 +1,3 @@
+DIST disruptor-3.2.0-sources.jar 74768 BLAKE2B 3da42b173576bd21d39ad2d22ce04475d1a9bf2133311eafb8e64faf2b6f3708d9a791e7c386b17bcb35c9551982cc30000eb069ae47edde030f662d6c90faec SHA512 9ad2ba752860d68e3a08c46910cd96c2d43a24860cda1fe9f58f86e3de57a90c2abded43a8457a2751a9199fabe40370bbd9ccef0e982913ae8d2127a92e6b2e
+EBUILD disruptor-3.2.0.ebuild 489 BLAKE2B 7ec30d38008df7a1229225c9daf3686a7ff33ecab41d231c4d3545a0f014b7ee9684e1e48fea8b43032027e3653c1fcfddffd3f813c9caffe7769f0012ca5ffc SHA512 31bca6c9563c1d1c0b668255b34b12b33c19aedce560df0b0578281a1f94068a1b8a88c9d98fe3eda5e1473550fd152db09a7a4edd2e2d8fdbc711f940a308aa
+MISC metadata.xml 324 BLAKE2B b62e903351ffab98fca53e46492ef32b8b0a8eb9b9414153c6845cbc52271c39b7dd7d649d956082d9ac84054f11714a67762c24413eebbc0b0f262aabbea9ef SHA512 414a364271c57f6cef970bd8dd480f19f0a56e286311a7cb807517dc7b97724cfc387e3038c7e6df29b351f31ae5190605131f8d12b35cc555d5280cf5252c8d
diff --git a/dev-java/disruptor/disruptor-3.2.0.ebuild b/dev-java/disruptor/disruptor-3.2.0.ebuild
new file mode 100644
index 000000000000..48b4516d9e18
--- /dev/null
+++ b/dev-java/disruptor/disruptor-3.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Performance Inter-Thread Messaging Library"
+HOMEPAGE="http://lmax-exchange.github.io/disruptor/"
+SRC_URI="http://repo1.maven.org/maven2/com/lmax/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/disruptor/metadata.xml b/dev-java/disruptor/metadata.xml
new file mode 100644
index 000000000000..3e80bcd70e82
--- /dev/null
+++ b/dev-java/disruptor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">LMAX-Exchange/disruptor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/dnsjava-2.1.6 b/dev-java/dnsjava-2.1.6
deleted file mode 100644
index 882ec5919ee1..000000000000
--- a/dev-java/dnsjava-2.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An implementation of DNS in Java
-EAPI=5
-HOMEPAGE=http://www.dnsjava.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d45c3ec6b02ded313c621bad616eff28
diff --git a/dev-java/dnsjava-2.1.7 b/dev-java/dnsjava-2.1.7
deleted file mode 100644
index 64b30913a408..000000000000
--- a/dev-java/dnsjava-2.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An implementation of DNS in Java
-EAPI=5
-HOMEPAGE=http://www.dnsjava.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dab6ffde143b324da389ac14eb4b075a
diff --git a/dev-java/dnsjava-2.1.8 b/dev-java/dnsjava-2.1.8
deleted file mode 100644
index ff0352fab4a4..000000000000
--- a/dev-java/dnsjava-2.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An implementation of DNS in Java
-EAPI=6
-HOMEPAGE=http://www.dnsjava.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dfec1a12c4fd08e541c1c2498a26e58b
diff --git a/dev-java/dnsjava/Manifest b/dev-java/dnsjava/Manifest
new file mode 100644
index 000000000000..d14154474da0
--- /dev/null
+++ b/dev-java/dnsjava/Manifest
@@ -0,0 +1,8 @@
+AUX 2.1.6-no-network-tests.patch 1354 BLAKE2B 3990543ea76ae8c2a485b6444e75ceff4abcb7eebb400eabb04b9ccd21560649478a54586c65bd97a4372c2d861d2f2064f2de6e2b3cb48dbdfde0864dd76d58 SHA512 3170ab2f64fdddff5fba26d32b0ce43f08fbef333e14ad1e1b7490e0227cd549febac4506ac5536d96f7f9316ea92d333fb5aee2f82131f90a922e52571ec1d0
+DIST dnsjava-2.1.6.tar.gz 1087908 BLAKE2B af9edda95d8cdd9c02b39c5a86646efc85cef576361d4ab765ce65d8b6e20621bcbdc9e32327f8ae1a3e2cbb83e60d61736ce9d71ae3bd091b0fca306727e158 SHA512 0d30504190aabbb176cc914834eb26a2f5522741c4473dbbf32f16e1d62fe39cf244a3ddd543b88d3a1e595afa9c6509e42d1418205677aa6523c6d11c49f497
+DIST dnsjava-2.1.7.tar.gz 1078980 BLAKE2B 16fd027c6f46463d6b4322bcf88943a3f06186d853a7e5615b8829d93aee897dca489dec00d61af857d58df566905c559e1c8d9922f5592ef2146bc715dc9b0b SHA512 07b11b94833f4a6f5d9bd8e0265444f15704eeba6420b2fa2c4efef46823c2768e8e691d6b101bb6d1ed9ebda1e55dbf518f447d62eb686fdd583c281313afdd
+DIST dnsjava-2.1.8.tar.gz 460532 BLAKE2B 761e99643710aca3aebc50972504284c388685dee12b3fc1fcbe6e4a8698762833dab725ff61395aee2b0292d0f71004eb2247c899c87d01dcc938e4283d31c1 SHA512 d38be6d52b275906b66468cd375ebd46c0d669de2fd06a50253631589a7dd6fbf4e92d4b20778dacd9f19cd489df013e4d42bc16c935581dcaa370ac9ce3c55b
+EBUILD dnsjava-2.1.6.ebuild 969 BLAKE2B af4539556594c58b087a0ac80b72ab06bd385a4964693458e9fa96d4e51e186a758b936d60c3bb79c7a6481f749f79a0a368742cab5cac111df63b6c989b6849 SHA512 e870857f8efd9d839c7ed23d3361b8b7106a309fddd1c25229249044f90e5d1258531788a9b64b33ea28c3405fc239d5273afed4c2cc636b5a91897f03edd43d
+EBUILD dnsjava-2.1.7.ebuild 947 BLAKE2B 2efeb06a288649571c3169350188d44e4017b267ac58ba4980408512152b1cee3f8722c3a3c9373695bb8933b6e52062776554a7564f69b92b45798c85740aad SHA512 c397ce0f0562fc2a9a6e7bded5976a1e670ebbb752e3f1f892a90bd5669d17732e1016b9ae1dde3c4e6430f1f283096c5951ab462494d65e1e8bf6c0de66267a
+EBUILD dnsjava-2.1.8.ebuild 946 BLAKE2B 5d495bbdb2d6479cb3dc581708f1e164403a9aa72a7658aed803876dff462c37a2d065726d559bee02bb9b75a1defde04c9bc27a8b4b2c3600283f4d452fe4d4 SHA512 cb50f8513144de9bba8ac760b637edff739775c75b25de0a0daa1d94d4dd24c7286e17c3932577bf5e8ac14a2e2825d50057a035c69c333a41ec92848dfcfe42
+MISC metadata.xml 765 BLAKE2B 106c05f7c8b1f594e668610ed2e244c395868461cb3cb9908c3956861388a5f37c62363b008c9c1e626b0b191914fe2fa0a03fa8d99dacc4bb7253f9a12b6a74 SHA512 800c2681a0c1fcdfa661d1c1ad996367f88f725e32dac8994b24b3ebd51dad3544c70ddfb009561f7987780cb4237809de3fd58bb642fdd8e1bcd20e239cfdda
diff --git a/dev-java/dnsjava/dnsjava-2.1.6.ebuild b/dev-java/dnsjava/dnsjava-2.1.6.ebuild
new file mode 100644
index 000000000000..b40db04e30e0
--- /dev/null
+++ b/dev-java/dnsjava/dnsjava-2.1.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An implementation of DNS in Java"
+HOMEPAGE="http://www.dnsjava.org/"
+SRC_URI="http://www.dnsjava.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+		test? (
+			dev-java/junit:0
+			dev-java/ant-junit:0
+		)"
+
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="docs"
+EANT_TEST_TARGET="run_tests"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_TEST_GENTOO_CLASSPATH="junit"
+EANT_GENTOO_CLASSPATH_EXTRA="${P}.jar"
+
+java_prepare() {
+	find -name "*.jar" -delete || die
+	epatch "${FILESDIR}"/${PV}-*.patch
+}
+
+src_install() {
+	java-pkg_newjar "${P}.jar"
+
+	dodoc README USAGE || die
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc org/
+}
+
+src_test() {
+	EANT_ANT_TASKS="ant-junit" java-pkg-2_src_test
+}
diff --git a/dev-java/dnsjava/dnsjava-2.1.7.ebuild b/dev-java/dnsjava/dnsjava-2.1.7.ebuild
new file mode 100644
index 000000000000..b2e98f812f19
--- /dev/null
+++ b/dev-java/dnsjava/dnsjava-2.1.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An implementation of DNS in Java"
+HOMEPAGE="http://www.dnsjava.org/"
+SRC_URI="http://www.dnsjava.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+		test? (
+			dev-java/junit:0
+			dev-java/ant-junit:0
+		)"
+
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="docs"
+EANT_TEST_TARGET="run_tests"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_TEST_GENTOO_CLASSPATH="junit"
+EANT_GENTOO_CLASSPATH_EXTRA="${P}.jar"
+
+java_prepare() {
+	java-pkg_clean
+	#epatch "${FILESDIR}"/*.patch
+}
+
+src_install() {
+	java-pkg_newjar "${P}.jar"
+
+	dodoc README USAGE || die
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc org/
+}
+
+src_test() {
+	EANT_ANT_TASKS="ant-junit" java-pkg-2_src_test
+}
diff --git a/dev-java/dnsjava/dnsjava-2.1.8.ebuild b/dev-java/dnsjava/dnsjava-2.1.8.ebuild
new file mode 100644
index 000000000000..9cb312e010d2
--- /dev/null
+++ b/dev-java/dnsjava/dnsjava-2.1.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An implementation of DNS in Java"
+HOMEPAGE="http://www.dnsjava.org/"
+SRC_URI="http://www.dnsjava.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)"
+
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="docs"
+EANT_TEST_TARGET="run_tests"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_TEST_GENTOO_CLASSPATH="junit"
+EANT_GENTOO_CLASSPATH_EXTRA="${P}.jar"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	#epatch "${FILESDIR}"/*.patch
+}
+
+src_install() {
+	java-pkg_newjar "${P}.jar"
+
+	einstalldocs
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc org/
+}
+
+src_test() {
+	EANT_ANT_TASKS="ant-junit" java-pkg-2_src_test
+}
diff --git a/dev-java/dnsjava/files/2.1.6-no-network-tests.patch b/dev-java/dnsjava/files/2.1.6-no-network-tests.patch
new file mode 100644
index 000000000000..1ea9d3929db0
--- /dev/null
+++ b/dev-java/dnsjava/files/2.1.6-no-network-tests.patch
@@ -0,0 +1,44 @@
+diff --git a/dnsjava-2.1.6/tests/org/xbill/DNS/AddressTest.java b/dnsjava-2.1.6/tests/org/xbill/DNS/AddressTest.java
+index 451b262..7ce8029 100644
+--- a/dnsjava-2.1.6/tests/org/xbill/DNS/AddressTest.java
++++ b/dnsjava-2.1.6/tests/org/xbill/DNS/AddressTest.java
+@@ -272,16 +272,19 @@ public class AddressTest extends TestCase
+ 
+     public void test_getByName() throws UnknownHostException
+     {
++/*
+ 	InetAddress out = Address.getByName("128.145.198.231");
+ 	assertEquals("128.145.198.231", out.getHostAddress());
+ 
+ 	out = Address.getByName("serl.cs.colorado.edu");
+ 	assertEquals("epic.cs.colorado.edu", out.getCanonicalHostName());
+ 	assertEquals("128.138.201.71", out.getHostAddress());
++*/
+     }
+ 
+     public void test_getByName_invalid() throws UnknownHostException
+     {
++/*
+ 	try {
+ 	    Address.getByName("example.invalid");
+ 	    fail("UnknownHostException not thrown");
+@@ -294,10 +297,12 @@ public class AddressTest extends TestCase
+ 	}
+ 	catch( UnknownHostException e ){
+ 	}
++*/
+     }
+ 
+     public void test_getAllByName() throws UnknownHostException
+     {
++/*
+ 	InetAddress[] out = Address.getAllByName("128.145.198.231");
+ 	assertEquals(1, out.length);
+ 	assertEquals("128.145.198.231", out[0].getHostAddress());
+@@ -353,5 +358,6 @@ public class AddressTest extends TestCase
+ 	}
+ 	catch( UnknownHostException e ){
+ 	}
++*/
+     }
+ }
diff --git a/dev-java/dnsjava/metadata.xml b/dev-java/dnsjava/metadata.xml
new file mode 100644
index 000000000000..748cb0beb3ab
--- /dev/null
+++ b/dev-java/dnsjava/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		dnsjava is an implementation of DNS in Java. It supports all defined record 
+		ypes (including the DNSSEC types), and unknown types. It can be used for queries,
+		zone transfers, and dynamic updates. It includes a cache which can be used by
+		clients, and a minimal implementation of a server. It supports TSIG authenticated
+		messages, partial DNSSEC verification, and EDNS0.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">https://sourceforge.net/projects/dnsjava/</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/dom4j-1.6.1-r7 b/dev-java/dom4j-1.6.1-r7
deleted file mode 100644
index 2feacb26e81d..000000000000
--- a/dev-java/dom4j-1.6.1-r7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 test? ( dev-java/xalan:0 dev-java/ant-junit:0 dev-java/junitperf:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=XML Java library
-EAPI=6
-HOMEPAGE=http://dom4j.sourceforge.net/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=dom4j
-PDEPEND=dev-java/jaxen:1.1
-RDEPEND=dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://sourceforge/dom4j/dom4j-1.6.1.tar.gz mirror://gentoo/dom4j-1.6.1-java5.patch.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=df221d37e12e4e925646caba43643b28
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
new file mode 100644
index 000000000000..47c5e549ebcf
--- /dev/null
+++ b/dev-java/dom4j/Manifest
@@ -0,0 +1,4 @@
+DIST dom4j-1.6.1-java5.patch.bz2 2900 BLAKE2B cdd7dc901f5292af3ef7f0ea200c3d22bbc8c0adc27606da3c8fbadc44625b114c995321723dca331f0b23d5248e1f9177f0def2f4138eebcbd4aaac0495d4dd SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96
+DIST dom4j-1.6.1.tar.gz 9687211 BLAKE2B 3daa3729ea071aa87c7c1e1e2b91f1635109774dd2bd564a85265a0286f1369373084b945409d9d5213d66a7e14224033d42c58d80125b7982eef8961eb29248 SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94
+EBUILD dom4j-1.6.1-r7.ebuild 1871 BLAKE2B ac9a685c9e4218a5ce85f9f8d2005d6683b4e84c35f09ba27d632208cef47b92b31de3102197077b62ca00aed707f62a50a58537ff8b5a5944e9e9b5486b64cc SHA512 e34d4811f98f27fbbd4153c702f0845c7616801ef620ae800cf2bfb2a21567c402ef6d07e6a5035c34a48d4ff8aa0a4ee2823e313e4d6f735675764889619c3c
+MISC metadata.xml 529 BLAKE2B 27e8a2aa0c95e7690b99386698f800291371b9962a1a667899c425e58ce73c8eb21dac1c589d47449242f0e2522b66c66379d6dd3b01708015e66278d634a480 SHA512 a9845c5229efbf48ac83b5b8fd0a769d90275de1f336b52147330cc2652a858df2689e17895e2fca5af067288413102de67316e49108c7d9eaf232e9dda31bbd
diff --git a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
new file mode 100644
index 000000000000..c3ac813cd529
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="XML Java library"
+HOMEPAGE="http://dom4j.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/dom4j/${P}.tar.gz
+	mirror://gentoo/${P}-java5.patch.bz2"
+
+LICENSE="dom4j"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="
+	dev-java/xpp2:0
+	dev-java/xpp3:0
+	dev-java/xsdlib:0
+	dev-java/relaxng-datatype:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/xalan:0
+		dev-java/ant-junit:0
+		dev-java/junitperf:0
+	)
+	>=virtual/jdk-1.6"
+
+PDEPEND="dev-java/jaxen:1.1"
+
+# Add missing methods to compile on Java 5 #137970
+PATCHES=( "${WORKDIR}/${P}-java5.patch" )
+
+JAVA_RM_FILES=(
+	src/test/org/dom4j/bean/BeansTest.java
+	src/test/org/dom4j/io/StaxTest.java
+	src/test/org/dom4j/rule/RuleTest.java
+	src/test/org/dom4j/ThreadingTest.java
+	src/test/org/dom4j/io/XPP3ReaderTest.java
+)
+
+src_prepare() {
+	default
+
+	# Circular deps with jaxen #212993
+	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
+
+	rm -v "${JAVA_RM_FILES[@]}" || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+EANT_BUILD_TARGET="clean package"
+EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib"
+EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
+EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf,xalan"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "build/${PN}.jar"
+	java-pkg_register-dependency jaxen-1.1
+	use doc && java-pkg_dojavadoc build/doc/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/dom4j/metadata.xml b/dev-java/dom4j/metadata.xml
new file mode 100644
index 000000000000..af2c88427c79
--- /dev/null
+++ b/dev-java/dom4j/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Easy to use, open source library for working with XML, XPath and
+		XSLT on the Java platform using the Java Collections Framework
+		and with full support for DOM, SAX and JAXP.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">dom4j</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/dtdparser-1.21-r2 b/dev-java/dtdparser-1.21-r2
deleted file mode 100644
index aff0e30a7ee0..000000000000
--- a/dev-java/dtdparser-1.21-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java DTD Parser
-EAPI=5
-HOMEPAGE=http://www.wutka.com/dtdparser.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1 Apache-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.21
-SRC_URI=http://www.wutka.com/download/dtdparser-1.21.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=79c69f1cb540858d8a00ffff3a5d1b8d
diff --git a/dev-java/dtdparser/Manifest b/dev-java/dtdparser/Manifest
new file mode 100644
index 000000000000..b2b0461623e1
--- /dev/null
+++ b/dev-java/dtdparser/Manifest
@@ -0,0 +1,3 @@
+DIST dtdparser-1.21.tgz 138335 BLAKE2B e393b93116cc74811198465819cfe4d059a55a05d13117fe14ce0a6fa2ee82c937d6efe4724bbc28ec5b35600eaee046fa8c07c6ab96fcdb79a6935d5c0ba0b7 SHA512 1b96991a2a2486fbbf0a9847fec3f1528153508f5380c3066ba34b410a9d42a480c4b821535ea2304d6c674526229cf74e6d28a32312df431aa852a9436c03aa
+EBUILD dtdparser-1.21-r2.ebuild 602 BLAKE2B 81a45fc20a53523023c99ad04dbfa1918fe791b827d82d16ec1efcfa08acdb8acf1c480c9e33efd189065c6322891651be7d4beac5e6442c5f0ffe662bac67a2 SHA512 d8e863f843e4ecee96e219a3c6df29cee4c442defb71a3df0cc1e036f1e20eb64f5628aabdbf8c543ad068d73447565a6ef613679bb9ba7e6d55cc290cbf2212
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/dtdparser/dtdparser-1.21-r2.ebuild b/dev-java/dtdparser/dtdparser-1.21-r2.ebuild
new file mode 100644
index 000000000000..1c4ef846e1b7
--- /dev/null
+++ b/dev-java/dtdparser/dtdparser-1.21-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java DTD Parser"
+HOMEPAGE="http://www.wutka.com/dtdparser.html"
+SRC_URI="http://www.wutka.com/download/${P}.tgz"
+
+LICENSE="LGPL-2.1 Apache-1.1"
+SLOT="${PV}"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${P}"
+
+JAVA_ENCODING="iso8859-1"
+JAVA_SRC_DIR="source"
+
+java_prepare() {
+	find -name "*.jar" -o -name "*.class" -delete || die
+	rm build.xml || die
+}
diff --git a/dev-java/dtdparser/metadata.xml b/dev-java/dtdparser/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/dtdparser/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/dynalang-0.4-r1 b/dev-java/dynalang-0.4-r1
deleted file mode 100644
index f8c17e2ce70e..000000000000
--- a/dev-java/dynalang-0.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/emma:0 dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Library of interoperable metaobject protocols for dynamic languages
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/dynalang/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/dynalang/dynalang/dynalang-mop-0.4.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=99c5353eb5b9346bbd1ce0540b739b5a
diff --git a/dev-java/dynalang/Manifest b/dev-java/dynalang/Manifest
new file mode 100644
index 000000000000..06fe3daec6f6
--- /dev/null
+++ b/dev-java/dynalang/Manifest
@@ -0,0 +1,4 @@
+AUX build.xml 6721 BLAKE2B 6e3c4e1710cc45640427ec99b1843a1a097b2abae17f90ae0ea0499bf68d1a38c71b0068d0d0dd7324445a1d97df7f55b4cf832815945478586fba1473f9c634 SHA512 e18fcef8b62ef09a55063afed6beeb484fe98e2d3fee904bb68eb776d6d11e8d5055b5b2160ef57576247ee2fcc7e7db059ac3e7c69360b0e27790ad1ffba40e
+DIST dynalang-mop-0.4.tgz 227338 BLAKE2B 91b3316c1c96722d9cc08ecc3894b539626171f7476001ced9972eaec6e49375cc0b283f0fedc1e93624162bde4be85858bef504f5191b6051472f60bf443fb5 SHA512 b7501fbc44ae29e10cf3eb55002420d88d83226f790861f43f59aaddc0cd1bd5021fed207d831d5c3adb14ceab01dc17ff53cd31cb6a93c0fc00240b8e3e9797
+EBUILD dynalang-0.4-r1.ebuild 1377 BLAKE2B 352458538fc04d9cf4225e8f9d2974a64a16ecf2cb4df4dd893c0fff20737154f893b898f7ca1b5045f116692264800cd3f189b11feaa46e9c7813f46665c379 SHA512 d65bce327e3e95e7a210fc5779836942eaea635746cc3aa8b4eb53e600663c8347195b2f9faa3ae9b3e9bd3a5673f03a48b98d0791f726324750c1fd042f56df
+MISC metadata.xml 314 BLAKE2B fae9e5f59b701a754caf714390148921e76c85a050bd6350ac13f855030b6cfbe7030d69b9a8add43437d976b8ff7aca1017610c78052d715e407d5b7513553a SHA512 6c6f4b185b8a3c8c677de4d759060151a07692c0629f7da13601dc082dd18e733e3b956fc34ad4f8d8092aeeecaa5cdefe8e51cbe0ab093e74ab9c11f7dcfa42
diff --git a/dev-java/dynalang/dynalang-0.4-r1.ebuild b/dev-java/dynalang/dynalang-0.4-r1.ebuild
new file mode 100644
index 000000000000..2e6b4bd63b98
--- /dev/null
+++ b/dev-java/dynalang/dynalang-0.4-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+JAVA_PKG_BSFIX="off"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}-mop-${PV}"
+
+DESCRIPTION="Library of interoperable metaobject protocols for dynamic languages"
+HOMEPAGE="https://sourceforge.net/projects/dynalang/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/emma:0
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# This one test fails.
+JAVA_RM_FILES=(
+	testsrc/org/dynalang/mop/impl/test/TestStandardMetaobjectProtocolFactory.java
+)
+
+java_prepare() {
+	cp "${FILESDIR}/build.xml" build.xml || die
+
+	find . -iname '*.jar' -delete
+
+	sed -i -e '/ivy:retrieve/d' build.xml || die
+	sed -i -e 's_\.\./ivy_ivy_' build.xml || die
+	sed -i -e \
+		's/clazz.getConstructors/(Constructor<T>[])clazz.getConstructors/' \
+		src/org/dynalang/mop/beans/BeanMetaobjectProtocol.java || die
+
+	mkdir -p build/lib/test
+}
+
+EANT_DOC_TARGET="doc"
+
+src_test() {
+	java-pkg_jar-from --into build/lib/test emma,junit
+
+	ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	java-pkg_newjar "build/${MY_P}.jar"
+	use doc && java-pkg_dojavadoc build/doc/javadoc
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/dynalang/files/build.xml b/dev-java/dynalang/files/build.xml
new file mode 100644
index 000000000000..d8e5e19954f0
--- /dev/null
+++ b/dev-java/dynalang/files/build.xml
@@ -0,0 +1,179 @@
+<project name="org.dynalang.mop" basedir=".">

+<!--

+   Copyright 2007 Attila Szegedi

+

+   Licensed under the Apache License, Version 2.0 (the "License");

+   you may not use this file except in compliance with the License.

+   You may obtain a copy of the License at

+

+       http://www.apache.org/licenses/LICENSE-2.0

+

+   Unless required by applicable law or agreed to in writing, software

+   distributed under the License is distributed on an "AS IS" BASIS,

+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+   See the License for the specific language governing permissions and

+   limitations under the License.

+-->

+	<property name="project.name" value="JVM Dynamic Languages Metaobject Protocol"/>

+	<property name="artifact.name" value="dynalang-mop"/>

+	<property name="revision" value="0.4"/>

+	<property name="build.dir" location="build"/>

+

+	<target name="clean">

+		<mkdir dir="${build.dir}"/>

+		<delete dir="${build.dir}"/>

+	</target>

+

+        <target name="resolve">

+        </target>

+

+	<path id="compile.classpath">

+                <fileset dir="build/lib/default"/>

+	</path>

+

+	<target name="compile" depends="resolve">

+	        <mkdir dir="build/lib/default"/>

+		<property name="classes.dir" location="${build.dir}/classes"/>

+		<mkdir dir="${classes.dir}"/>

+		<javac srcdir="src" destdir="${classes.dir}" deprecation="off" 

+	               debug="on" optimize="off" target="1.5" source="1.5"

+	               classpathref="compile.classpath"/>

+		<copy toDir="${classes.dir}">

+			<fileset dir="src"

+	            excludes="**/CVS/**,**/*.bak,**/*.java,**/*.jj,**/package.html,overview.html"/>

+		</copy>

+	</target>

+	

+	<target name="jar" depends="compile">

+		<property name="jarfile" location="build/${artifact.name}-${revision}.jar"/>

+		<jar destfile="${jarfile}" basedir="${classes.dir}">

+	        	<manifest>

+	        		<attribute name="Implementation-Vendor" value="Attila Szegedi"/>

+	        		<attribute name="Implementation-Version" value="${revision}"/>

+	        		<attribute name="Implementation-Title" value="${project.name}"/>

+	        		<attribute name="Implementation-URL" value="http://sourceforge.net/projects/dynalang"/>

+	            </manifest>

+		</jar>

+	</target>

+

+	<target depends="" name="doc">

+		<mkdir dir="${build.dir}/doc/javadoc"/>

+		<delete includeEmptyDirs="yes">

+			<fileset dir="${build.dir}/doc/javadoc" includes="**/*" />

+		</delete>

+		<javadoc author="true"

+	                destdir="${build.dir}/doc/javadoc"

+	                doctitle="${project.name} ${revision}"

+	                packagenames="org.dynalang.*"

+	                sourcepath="src"

+	                version="true"

+	                windowtitle="${project.name} ${revision} API"

+			overview="src/overview.html"

+	                use="true">

+		</javadoc>

+		<copy todir="${build.dir}/doc">

+			<fileset dir="src/doc" includes="**/*"/>

+		</copy>

+	</target>

+

+	<target name="coverage-instrument" depends="compile">

+		<property name="coverage.dir" location="${build.dir}/coverage"/>

+		<property name="coverage.classes.dir" location="${build.dir}/coverage/classes"/>

+		<mkdir dir="${coverage.classes.dir}"/>

+		<path id="emma.lib">

+			<pathelement location="build/lib/test/emma.jar" />

+			<pathelement location="build/lib/test/emma_ant.jar" />

+		</path>

+		<taskdef resource="emma_ant.properties" classpathref="emma.lib" />

+		<property name="coverage.instrumentationfile" location="${coverage.dir}/instrumentation"/>

+		<emma enabled="true">

+			<instr 

+	        instrpath="${classes.dir}" outdir="${coverage.classes.dir}" 

+	        outfile="${coverage.instrumentationfile}" mode="copy"/>

+		</emma>

+		<copy todir="${coverage.classes.dir}">

+			<fileset dir="src" excludes="**/*.java"/>

+		</copy>

+		<copy todir="${coverage.classes.dir}">

+			<fileset dir="${classes.dir}"/>

+		</copy>

+		<property name="coverage.outfile" location="${coverage.dir}/coverage"/>

+	</target>

+

+	<target name="test-compile" depends="compile">

+		<property name="test.classes.dir" location="${build.dir}/test/classes"/>

+		<mkdir dir="${test.classes.dir}"/>

+		<javac srcdir="testsrc" destdir="${test.classes.dir}" deprecation="off" 

+	               debug="on" optimize="off" target="1.5" source="1.5">

+			<classpath>

+				<pathelement path="${classes.dir}" />

+				<pathelement path="build/lib/test/junit.jar" />

+			</classpath>

+		</javac>

+		<copy toDir="${test.classes.dir}">

+			<fileset dir="testsrc"

+	            excludes="**/CVS/**,**/*.bak,**/*.java,**/*.jj,**/package.html"/>

+		</copy>

+	</target>

+

+	<target name="test-run" depends="test-compile, coverage-instrument">

+		<junit printsummary="on" fork="true" forkmode="once" 

+			showoutput="true" haltonerror="true" haltonfailure="true">

+			<sysproperty key="emma.coverage.out.file" value="${coverage.outfile}"/>

+			<classpath>

+				<pathelement path="${coverage.classes.dir}" />

+				<pathelement path="${test.classes.dir}" />

+				<pathelement path="build/lib/test/emma.jar"/>

+				<pathelement path="build/lib/test/junit.jar"/>

+			</classpath>

+			<batchtest todir="build/test">

+				<fileset dir="${test.classes.dir}" includes="**/Test*.class"/>

+			</batchtest>

+			<formatter type="plain" usefile="false" />

+			<formatter type="xml"/>

+		</junit>

+		<mkdir dir="build/test/report"/>

+		<junitreport todir="build/test">

+			<fileset dir="build/test" includes="TEST-*.xml"/>

+			<report todir="build/test/report"/>

+		</junitreport>

+	</target>

+

+	<target name="test" depends="test-run">

+		<property name="coverage.report.dir" location="${build.dir}/coverage/report"/>

+		<mkdir dir="${coverage.report.dir}"/>

+		<delete dir="${coverage.report.dir}"/>

+		<mkdir dir="${coverage.report.dir}"/>

+		<emma enabled="true">

+			<report>

+				<fileset dir="${basedir}">

+					<include name="build/coverage/instrumentation"/>

+					<include name="build/coverage/coverage"/>

+				</fileset>

+				<sourcepath>

+					<dirset dir="${basedir}">

+						<include name="src"/>

+					</dirset>

+				</sourcepath>

+				<html outfile="${coverage.report.dir}/index.html"/>

+			</report>

+		</emma>

+	</target>

+	

+	<target name="dist" depends="clean,test-run,jar,doc">

+		<mkdir dir="build/${artifact.name}-${revision}"/>

+		<copy todir="build/${artifact.name}-${revision}">

+			<fileset dir="." excludes="build/**/*"/>

+		</copy>

+		<copy todir="build/${artifact.name}-${revision}">

+			<fileset dir="." 

+				includes="

+					build/doc/**/* 

+					build/${artifact.name}-${revision}.jar"

+			/>

+		</copy>

+		<tar destfile="build/${artifact.name}-${revision}.tgz" 

+			compression="gzip" basedir="build" 

+			includes="${artifact.name}-${revision}/**/*"/>

+	</target>

+</project>

diff --git a/dev-java/dynalang/metadata.xml b/dev-java/dynalang/metadata.xml
new file mode 100644
index 000000000000..47aef07ebea6
--- /dev/null
+++ b/dev-java/dynalang/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dynalang</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/easymock-3.3.1 b/dev-java/easymock-3.3.1
deleted file mode 100644
index 8f8569869430..000000000000
--- a/dev-java/easymock-3.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/junit:4 dev-java/objenesis:0 dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Mock Objects for interfaces in JUnit tests by generating them on the fly
-EAPI=5
-HOMEPAGE=http://www.easymock.org/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=>=virtual/jre-1.6 dev-java/junit:4 dev-java/objenesis:0 dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.2
-SRC_URI=mirror://sourceforge/easymock/EasyMock/3.3.1/easymock-3.3.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d247d44c1a36684014d9adc7f2b3f1f6
diff --git a/dev-java/easymock-classextension-3.2-r1 b/dev-java/easymock-classextension-3.2-r1
deleted file mode 100644
index 86558b3a7e3f..000000000000
--- a/dev-java/easymock-classextension-3.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip dev-java/easymock:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Mock Objects for interfaces in JUnit tests by generating them on the fly
-EAPI=5
-HOMEPAGE=http://www.easymock.org/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=>=virtual/jre-1.5 dev-java/easymock:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.2
-SRC_URI=mirror://sourceforge/easymock/EasyMock%20Class%20Extension/3.2/easymockclassextension-3.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cf4caf79ecb9f26a3ebe8ffe6d08d16d
diff --git a/dev-java/easymock-classextension/Manifest b/dev-java/easymock-classextension/Manifest
new file mode 100644
index 000000000000..0da5b4fcb606
--- /dev/null
+++ b/dev-java/easymock-classextension/Manifest
@@ -0,0 +1,3 @@
+DIST easymockclassextension-3.2.zip 155678 BLAKE2B 5eecb9aabdcb4ef2edd2a2c7bf6b02d1c72c0d15f05ce4c148d646cc980a2358e34c49d7e13f65b31e379d8dbf581fee6c9ebbc1a5753336e251446ec120f476 SHA512 bb6fa5cf69e3b07bb2e7d7d27b7186176a2b34e2250ab2945633ec55e49230ffeabc0dffed64bda84bf7f7e30b5846408536f9902b915b751fa3e3405e4b72b0
+EBUILD easymock-classextension-3.2-r1.ebuild 992 BLAKE2B 332b846e0a61fdde73baaaffa8b6f4c8f3e6318a0f1a9402d71ab3c48672f592e5876d7916bedccd8b4c5fd6f47ee3bea204e914e95c140854551e825aa71b9f SHA512 30e6b1a87ce46c2ea0861501dd3b4fc399cbae2cec77e0d186074b4fe08c4d491a82ab9c3bdeb73397b29e0e03fb3b3416dc61eaa383d6b669a914ecf23c39b6
+MISC metadata.xml 314 BLAKE2B 9af04035962b6d333264caf33b4d16e3099709c9a2069f732333a3ec17812dbd88e9086539ec0de3b5009696b92ccebb52bbaf7bd8d543ba2a52bfe926cd7f50 SHA512 a9461432a42e98c60f9b88b92e9a2a170f7c7263178c884c67463f204dc315b689b6a02fc713c8313583536ef5554bcdbbac7eb32ba98b52ccded6ed1913581f
diff --git a/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild b/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
new file mode 100644
index 000000000000..de49d776a308
--- /dev/null
+++ b/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN=${PN/-}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
+HOMEPAGE="http://www.easymock.org/"
+SRC_URI="mirror://sourceforge/easymock/EasyMock%20Class%20Extension/${PV}/${MY_P}.zip"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="3.2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/easymock:${SLOT}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+JAVA_GENTOO_CLASSPATH="easymock-${SLOT}"
+JAVA_SRC_DIR="src"
+
+src_unpack() {
+	default
+
+	cd "${S}" || die
+	unzip ${MY_P}-sources.jar -d src/ || die
+
+	if use examples; then
+		unzip ${MY_P}-samples.jar -d examples/ || die
+	fi
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/easymock-classextension/metadata.xml b/dev-java/easymock-classextension/metadata.xml
new file mode 100644
index 000000000000..144ebe414735
--- /dev/null
+++ b/dev-java/easymock-classextension/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">easymock</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
new file mode 100644
index 000000000000..2c12a19e56cb
--- /dev/null
+++ b/dev-java/easymock/Manifest
@@ -0,0 +1,4 @@
+AUX 3.3.1-no-android.patch 685 BLAKE2B 30500598f719669c893111aca6afb09a0823343a7813f89c80b12fc41729ab22f0825718f622fe4f6effbaaaf199f599504418cd876a0aae9f64230e86c67f95 SHA512 3ead2f05c122e3e8a3eb1d1748b59c15775fee79e28cf01dba193b8b21aae0039d9608300cbca6e9bdbe291ab15db9f56abe8c2503c6667495f61fccbf3d56ff
+DIST easymock-3.3.1.zip 1015625 BLAKE2B 87e67c6092c3d2276438119a7604a7e5fceb6118f487313bdc706a56678aef56cae44bd9635ade1bb60f0809eddd48a0ddde175d012aa2ac208d3ee47f5ef646 SHA512 0898276df82a99df10e4c91b5b097b6d579914580995b35274ef9d4e0c874266d54c865f96d008becaa210a6307916f6488d0caa205a85caf62920e939becf46
+EBUILD easymock-3.3.1.ebuild 1135 BLAKE2B d8f092f09e77df8292444af389f74b2373781757807182b01318351bcaa1b4f79d0e99e89edb0ee3112b0f705f3fe9d602a978c1181af63abd9949d471a5ca34 SHA512 70ee151dbdc102bf01a1f56191992b078e0ca7870509802f9b6bdb58f27dd6392e2ceaa5c812ccc0c2c77571c3fa596561d6e4d5c0eefc4697282874a0e15a00
+MISC metadata.xml 314 BLAKE2B 9af04035962b6d333264caf33b4d16e3099709c9a2069f732333a3ec17812dbd88e9086539ec0de3b5009696b92ccebb52bbaf7bd8d543ba2a52bfe926cd7f50 SHA512 a9461432a42e98c60f9b88b92e9a2a170f7c7263178c884c67463f204dc315b689b6a02fc713c8313583536ef5554bcdbbac7eb32ba98b52ccded6ed1913581f
diff --git a/dev-java/easymock/easymock-3.3.1.ebuild b/dev-java/easymock/easymock-3.3.1.ebuild
new file mode 100644
index 000000000000..ccb754db050d
--- /dev/null
+++ b/dev-java/easymock/easymock-3.3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
+HOMEPAGE="http://www.easymock.org/"
+SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="3.2"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-java/junit:4
+	dev-java/objenesis:0
+	dev-java/cglib:3
+"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="junit-4,objenesis,cglib-3"
+JAVA_SRC_DIR="src"
+
+src_unpack() {
+	default
+
+	cd "${S}" || die
+	unzip ${P}-sources.jar -d src/ || die
+
+	if use examples; then
+		unzip ${P}-samples.jar -d examples/ || die
+	fi
+}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PV}-no-android.patch
+	rm src/org/easymock/internal/AndroidClassProxyFactory.java || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	if use examples; then
+		java-pkg_doexamples examples
+	fi
+}
diff --git a/dev-java/easymock/files/3.3.1-no-android.patch b/dev-java/easymock/files/3.3.1-no-android.patch
new file mode 100644
index 000000000000..18c4a00dc45f
--- /dev/null
+++ b/dev-java/easymock/files/3.3.1-no-android.patch
@@ -0,0 +1,17 @@
+diff --git a/src/org/easymock/internal/MocksControl.java b/src/org/easymock/internal/MocksControl.java
+index e709dc4..cd9d5a9 100644
+--- a/src/org/easymock/internal/MocksControl.java
++++ b/src/org/easymock/internal/MocksControl.java
+@@ -137,12 +137,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
+             return cached;
+         }
+ 
+-        // ///CLOVER:OFF
+-        if (AndroidSupport.isAndroid()) {
+-            return classProxyFactory = new AndroidClassProxyFactory();
+-        }
+-        // ///CLOVER:ON
+-
+         try {
+             return classProxyFactory = new ClassProxyFactory();
+         } catch (final NoClassDefFoundError e) {
diff --git a/dev-java/easymock/metadata.xml b/dev-java/easymock/metadata.xml
new file mode 100644
index 000000000000..144ebe414735
--- /dev/null
+++ b/dev-java/easymock/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">easymock</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/easyneurons-2.3 b/dev-java/easyneurons-2.3
deleted file mode 100644
index 3a96f4ffa782..000000000000
--- a/dev-java/easyneurons-2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/colt:0 dev-java/appframework:0 dev-java/commons-collections:0 dev-java/absolutelayout:0 dev-java/jung:0 dev-java/xstream:0 ~dev-java/neuroph-2.3 dev-java/javahelp:0 dev-java/appframework:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=GUI neural network editor for neuroph
-EAPI=2
-HOMEPAGE=http://neuroph.sourceforge.net/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/jre-1.6 dev-java/colt:0 dev-java/appframework:0 dev-java/commons-collections:0 dev-java/absolutelayout:0 dev-java/jung:0 dev-java/xstream:0 ~dev-java/neuroph-2.3 dev-java/javahelp:0 dev-java/appframework:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3_nb.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d5962a7235d69d3129c1a29e07e7b092
diff --git a/dev-java/easyneurons/Manifest b/dev-java/easyneurons/Manifest
new file mode 100644
index 000000000000..469f7e54417b
--- /dev/null
+++ b/dev-java/easyneurons/Manifest
@@ -0,0 +1,3 @@
+DIST neuroph_2.3_nb.zip 8257618 BLAKE2B 9b84eb18201f7cd4b35de3bb48b227b5e3579e436870f1bac943cd904b5259fc9107b08df0446958096737f17ff3a83487160c7367b292b0bfd1696d7cbbc849 SHA512 f2d6c87862435fe5217259842b3d9829780fe82dc87a682bc3ce38ecb708968b2458bf2d8631daeba209ccb9ca8e7c74fd1e5dd3c6ca606cf8b9ce4ea23db485
+EBUILD easyneurons-2.3.ebuild 1928 BLAKE2B af032ca76736756228189d23066a01bb5cd38661ac524ed09b260545a65c4ae18fcb898f0cc51ab350afa4a3dafc38f7006a58797ca1491a8f43c4abaa9050db SHA512 7014174aaed8cd6ed227497cd9ec76acccc0606870831d13be162c00223cd595aa49e34aef8b6b6d2eecfa213a87eb7e85ad4d9bcb768c10f1845faea3db8030
+MISC metadata.xml 313 BLAKE2B 83416b0c997a93441ec87b00bffcdca9fd1d633a5b1efc030b7962830518249776d604b7e53f314478b6036210bb3ab3eaf2dbe13ea5205f8b1451aa3316a666 SHA512 a59f20c8be206fd5d02ae1e83919ce976d4b7503167ff41864d294fb92e692beed71a1c55ca76732f30b988393ef7559c3529bf44c186ceee6cf5be76125e39f
diff --git a/dev-java/easyneurons/easyneurons-2.3.ebuild b/dev-java/easyneurons/easyneurons-2.3.ebuild
new file mode 100644
index 000000000000..5914dd899827
--- /dev/null
+++ b/dev-java/easyneurons/easyneurons-2.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="GUI neural network editor for neuroph"
+HOMEPAGE="http://neuroph.sourceforge.net/"
+SRC_URI="mirror://sourceforge/neuroph/neuroph_${PV}_nb.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+COMMON_DEP="dev-java/colt:0
+	dev-java/appframework:0
+	dev-java/commons-collections:0
+	dev-java/absolutelayout:0
+	dev-java/jung:0
+	dev-java/xstream:0
+	~dev-java/neuroph-${PV}
+	dev-java/javahelp:0
+	dev-java/appframework:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/neuroph_${PV}_nb/${PN}"
+
+java_prepare() {
+	rm -R "${S}/../neuroph"
+	mv lib/CopyLibs/*.jar "${T}"/ || die
+
+	find "${WORKDIR}" -iname '*.jar' -delete
+	find "${WORKDIR}" -iname '*.class' -delete
+	mv "${T}"/org*.jar lib/CopyLibs/
+
+	java-pkg_jar-from --into lib commons-collections \
+		commons-collections.jar commons-collections-3.2.1.jar
+	java-pkg_jar-from --into lib appframework appframework.jar
+	java-pkg_jar-from --into lib/swing-app-framework appframework \
+		appframework.jar appframework-1.0.3.jar
+	java-pkg_jar-from --into lib jung jung.jar jung-1.7.6.jar
+	java-pkg_jar-from --into lib absolutelayout \
+		absolutelayout.jar
+	java-pkg_jar-from --into lib xstream xstream.jar \
+		xstream-1.3.1.jar
+	java-pkg_jar-from --into lib javahelp jh.jar
+	mkdir -p ../neuroph/dist
+	java-pkg_jar-from --into ../neuroph/dist neuroph
+}
+
+src_compile() {
+	eant -Dno.deps=True -Dreference.neuroph=lib/neuroph.jar \
+		-Dlibs.swing-app-framework.classpath=lib/appframework.jar \
+		-Dlibs.absolutelayout.classpath=lib/absolutelayout.jar jar
+}
+
+src_install() {
+	java-pkg_newjar "dist/easyNeurons.jar"
+	use source && java-pkg_dosrc src
+
+	java-pkg_dolauncher ${PN} \
+		--main org.neuroph.easyneurons.EasyNeuronsApplication
+
+}
diff --git a/dev-java/easyneurons/metadata.xml b/dev-java/easyneurons/metadata.xml
new file mode 100644
index 000000000000..34e441f73ac8
--- /dev/null
+++ b/dev-java/easyneurons/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">neuroph</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/echo2-2.1.1 b/dev-java/echo2-2.1.1
deleted file mode 100644
index 6061fa75736d..000000000000
--- a/dev-java/echo2-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Echo2 is the next-generation of the Echo Web Framework
-EAPI=2
-HOMEPAGE=http://www.nextapp.com/platform/echo2/echo/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.1
-SRC_URI=http://download.nextapp.com/downloads/echo2/2.1.1/NextApp_Echo2.tgz -> NextApp_Echo2-2.1.1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=16fe0a4aec19e36d40f4249fcf655219
diff --git a/dev-java/echo2/Manifest b/dev-java/echo2/Manifest
new file mode 100644
index 000000000000..222661e99ca8
--- /dev/null
+++ b/dev-java/echo2/Manifest
@@ -0,0 +1,3 @@
+DIST NextApp_Echo2-2.1.1.tgz 5372814 BLAKE2B 3c16154bee1f32ee06d6fa0dca4c6108a3b7cd5be9d689aaff8102815e8f63d7efc2e3a12d9e4637f5fafe98ad6df36be1d9006e0f31db9d05a11b1470b7dfce SHA512 bad6d9a6411c6a6fe24edbd88960a5e1179f65e95a26e51610eb0b601e3941dcc82b052a385c6fd429291c524bb722a081f39bf3704b7b403ad98582c8273f26
+EBUILD echo2-2.1.1.ebuild 1162 BLAKE2B fc69efe240c837f23af0dc1086d94e665326611e7be7dce59d119b81d8f8fa15ed49fcf4b5bdde4a24c49c7a541f7a1672c1465464cbd05d33c637bca61aa3a2 SHA512 82c8371709333ad61e5294062cd2c0fc57caaf49c52d99da0e8ffd1ff13feb0dbfc776e7f46511931010e9d72227ecf65c2abbd31e33deea6d2c3f761ad9987c
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/echo2/echo2-2.1.1.ebuild b/dev-java/echo2/echo2-2.1.1.ebuild
new file mode 100644
index 000000000000..02b9fb84f2da
--- /dev/null
+++ b/dev-java/echo2/echo2-2.1.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+MY_PN="NextApp_Echo2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Echo2 is the next-generation of the Echo Web Framework"
+HOMEPAGE="http://www.nextapp.com/platform/echo2/echo/"
+SRC_URI="http://download.nextapp.com/downloads/echo2/${PV}/${MY_PN}.tgz -> ${MY_P}.tgz"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+SLOT="2.1"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEP="java-virtuals/servlet-api:2.4"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_PN}/
+
+java_prepare() {
+	rm -rfv BinaryLibraries || die
+	echo "servlet.lib.jar=$(java-pkg_getjars servlet-api-2.4)" >> SourceCode/ant.properties || die
+}
+
+src_compile() {
+	cd SourceCode || die
+	eant dist $(use_doc doc.public)
+}
+
+src_install() {
+	java-pkg_dojar SourceCode/dist/lib/*.jar
+	use doc && {
+		cp Documentation/api/public/*.html SourceCode/javadoc/public
+		java-pkg_dojavadoc SourceCode/javadoc/public
+	}
+	use source && java-pkg_dosrc SourceCode/src
+	dodoc ReadMe.txt || die "dodoc failed"
+}
diff --git a/dev-java/echo2/metadata.xml b/dev-java/echo2/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/echo2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ecj-gcj-4.4.2 b/dev-java/ecj-gcj-4.4.2
deleted file mode 100644
index b50ec792e29d..000000000000
--- a/dev-java/ecj-gcj-4.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java app-arch/unzip !dev-java/eclipse-ecj:3.5[gcj] >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/
-IUSE=+native elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-SLOT=4.4
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=06b63e52ae353e4b166fd07062f2d594
diff --git a/dev-java/ecj-gcj/Manifest b/dev-java/ecj-gcj/Manifest
new file mode 100644
index 000000000000..3380c7f2bcb3
--- /dev/null
+++ b/dev-java/ecj-gcj/Manifest
@@ -0,0 +1,4 @@
+AUX ecj-gcj.in 840 BLAKE2B ec5a8f37428c4e9a133898b534eec0d70559dc4bbe1b3aa8ad825bb172c8fbf3e167cee72f7df9a64847d2b299aa53254874f296567df96deb84aaaaa0f6dcd0 SHA512 7ed6620090643f31f33762a1fe8f0024518bb808bf8aa2e8bfc8f9c0475e41f699670939bfa945a48aa5f5fad61b557a9e315c2781103717c2a6a1bd67a048a1
+DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
+EBUILD ecj-gcj-4.4.2.ebuild 2433 BLAKE2B 9606ed88b77a1903a31d191a489c4229bc0982beff5584d5ea2c52146ee473fa42a0881a7ad47bee7fcfc6444de47184fbefcd8dd1fec1d928239fdd4c0a05e6 SHA512 7e84f812d8549a2893acd7494cc5004100810244debf556591029cecfddb3e8c69a232b951e8d3bccebc4932c14ac6155ea2f37fbf758a12baf5db246776b6c7
+MISC metadata.xml 403 BLAKE2B e0bb5fa6775b686338aea038dda01ad0af5e25ed0758ac7c7796ed734a0dd69fd60d069cd0e74cf0513c022d65727bcc460ed95ed98921010c995e668983e014 SHA512 9a887b9b4ae389bddf88e08c0a9ad145dc3fb69340822938fe7fd6fdb02c55c5b87c34742dc4349dae880ea48fd00161ac70d6c5289c23336c1301c561d0c90c
diff --git a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
new file mode 100644
index 000000000000..9f3ec5665c73
--- /dev/null
+++ b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2 prefix toolchain-funcs
+
+MY_PN="ecj"
+DMF="R-${PV}-201502041700"
+
+DESCRIPTION="Subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+SLOT="4.4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+native"
+
+RDEPEND="sys-devel/gcc:*[gcj]
+	app-eselect/eselect-java"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	!dev-java/eclipse-ecj:3.5[gcj]"
+
+JAVA_PKG_WANT_SOURCE=1.6
+JAVA_PKG_WANT_TARGET=1.6
+
+MY_PS="${MY_PN}-${SLOT}"
+S="${WORKDIR}"
+
+java_prepare() {
+	# We don't need the ant adapter here
+	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -r org/eclipse/jdt/internal/antadapter || die
+
+	# upstream build.xml excludes this
+	rm META-INF/eclipse.inf || die
+
+	# these java6 specific classes cannot compile with gcj
+	rm -r org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
+}
+
+src_compile() {
+	local gccbin=$(gcc-config -B)
+	local gcj="${gccbin}/gcj"
+
+	find org/ -name "*.java" > sources.lst || die
+
+	einfo "bootstrapping ${MY_PN} with gcj ..."
+	"${gcj}" -w -C -fsource=${JAVA_PKG_WANT_SOURCE} -d bootstrap @sources.lst || die
+
+	einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
+	"${gccbin}/gij" -cp bootstrap:. org.eclipse.jdt.internal.compiler.batch.Main -nowarn $(java-pkg_javac-args) @sources.lst || die
+	find org/ META-INF/ -type f ! -name "*.java" -exec "${gccbin}/gjar" cf ${MY_PN}.jar {} + || die
+
+	if use native; then
+		einfo "building native ${MY_PS} library, patience needed ..."
+		"${gcj}" ${CFLAGS} ${LDFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \
+			-o ${MY_PS}.so ${MY_PN}.jar || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar ${MY_PN}.jar
+
+	sed -e "s|@SLOT@|${SLOT}|" \
+		"${FILESDIR}/${PN}.in" \
+		> "${T}"/${PN}-${SLOT} || die
+	eprefixify "${T}/${PN}-${SLOT}"
+	dobin  "${T}/${PN}-${SLOT}"
+
+	use native && dolib.so ${MY_PS}.so
+}
+
+pkg_postinst() {
+	if use native; then
+		local dbtool="$(gcc-config -B)/gcj-dbtool"
+
+		"${dbtool}" -a $("${dbtool}" -p) \
+			"${EROOT}usr/share/${PN}-${SLOT}/lib/ecj.jar" \
+			"${EROOT}usr/$(get_libdir)/${MY_PN}-${SLOT}.so"
+	fi
+
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ${PN}-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/ecj-gcj/files/ecj-gcj.in b/dev-java/ecj-gcj/files/ecj-gcj.in
new file mode 100644
index 000000000000..4f838d5de240
--- /dev/null
+++ b/dev-java/ecj-gcj/files/ecj-gcj.in
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# /usr/bin/gij was installed by gcj-jdk in the past and is now handled by
+# gcc-config, fall back to gcc-config to locate the binary should the
+# symlink/wrapper-binary not yet exists.
+GIJ_BIN="@GENTOO_PORTAGE_EPREFIX@/usr/bin/gij"
+if [[ ! -f ${GIJ_BIN} ]]; then
+	GIJ_BIN="$(gcc-config -B)/gij"
+fi
+if [[ ! -f ${GIJ_BIN} ]]; then
+	echo "gij not found! check that gcc is compiled with gcj flag"
+	exit 1
+fi
+# calling java-config would be an unnecessary slowdown here
+
+# we need to append user CLASSPATH otherwise it will be overriden by the -classpath parameter
+# this breaks e.g. bootstrap of ant-core
+ecj_cp="@GENTOO_PORTAGE_EPREFIX@/usr/share/ecj-gcj-@SLOT@/lib/ecj.jar"
+if [[ -n "${CLASSPATH}" ]]; then
+	ecj_cp="${ecj_cp}:${CLASSPATH}"
+fi
+
+${GIJ_BIN} -classpath "${ecj_cp}" org.eclipse.jdt.internal.compiler.batch.Main "${@}"
diff --git a/dev-java/ecj-gcj/metadata.xml b/dev-java/ecj-gcj/metadata.xml
new file mode 100644
index 000000000000..0c0a51809582
--- /dev/null
+++ b/dev-java/ecj-gcj/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<use>
+	<flag name="native">Build a native binary along with the jar. Provides faster execution time, but needs about 1G memory and some patience to compile.</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-java/eclipse-ecj-4.2.1 b/dev-java/eclipse-ecj-4.2.1
deleted file mode 100644
index 9e0b9b4ed773..000000000000
--- a/dev-java/eclipse-ecj-4.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java >=virtual/jdk-1.6 app-arch/unzip userland_GNU? ( sys-apps/findutils ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Eclipse Compiler for Java
-EAPI=4
-HOMEPAGE=http://www.eclipse.org/
-IUSE=+ant userland_GNU elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.2.1 )
-RDEPEND=app-eselect/eselect-java >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
-SLOT=4.2
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bfde68df8f68e6e9f78195bcfe0d8aff
diff --git a/dev-java/eclipse-ecj-4.4.2-r1 b/dev-java/eclipse-ecj-4.4.2-r1
deleted file mode 100644
index 8972822d5b1b..000000000000
--- a/dev-java/eclipse-ecj-4.4.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Eclipse Compiler for Java
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/
-IUSE=+ant elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.4.2 )
-RDEPEND=app-eselect/eselect-java >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.4
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5a628dbffe26a2408960ed4e283a2c88
diff --git a/dev-java/eclipse-ecj-4.5.1 b/dev-java/eclipse-ecj-4.5.1
deleted file mode 100644
index ba5da3159703..000000000000
--- a/dev-java/eclipse-ecj-4.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java >=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Eclipse Compiler for Java
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/
-IUSE=+ant elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.5.1 )
-RDEPEND=app-eselect/eselect-java >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.5
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=51b052d6d74153f2dccb029a59c90883
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
new file mode 100644
index 000000000000..8c17430413f9
--- /dev/null
+++ b/dev-java/eclipse-ecj/Manifest
@@ -0,0 +1,7 @@
+DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
+DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
+DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
+EBUILD eclipse-ecj-4.2.1.ebuild 2770 BLAKE2B 23996155f35ac40c9a44a92f49e794a0f02468c1fd94a4a151f2b5451ac02d22feaa5381d07f8fcf49592b407842aae438c6e0866f7c20ecd7514edf6127e0b1 SHA512 b1e4e064ce41776a958ee2c8290382baaf228d998ea8b1d7db5c036369cff259da43877b1f8e7712678985f2facd0adabc9922c3ecd7072f499f52adc929a9ce
+EBUILD eclipse-ecj-4.4.2-r1.ebuild 1361 BLAKE2B 3f2fea077ce628cb057ee841d6a19b06f9b56344c085a5fd7533fa084d3f7cf92a5ac6edc31632e31c470852f742b383cc913371e927d59aabfbb38e42496f6e SHA512 9a870d4ce61c4a5ed3f9c0e9b7b75f0006a1649269849a08a5b5b809f980abb3773be37338564578e4fc8ee8921e231c93b5cfc0f72e99f71190c7a91ff86eef
+EBUILD eclipse-ecj-4.5.1.ebuild 1628 BLAKE2B 19a0422c19a19998e199dae7170e3b89954d412e62523ec4742fbf514015afdfe01a9c932b044dfd4f6971a96ba1bf3bf98697732b677f567c3d2a83368d575e SHA512 ba5ded5ba46b10e1467c42ad8f63f67f065acd08f3e39541e3794e97a0f8974edc1d4e3eff474916922b83e8fd9656cba6f34b67c3febc4ea15bf08c933ca2ff
+MISC metadata.xml 645 BLAKE2B f774dea11925d1031013a012083f962369714c32d58ce7480f114dd732ec4f19465c174ce4387ce54d138b8a38072c767c18e21ab47e6f92480085f1104a974c SHA512 0ba8d7ccd7280fc72bf485c5450a3e6bcd09713c432867439aaa7ebed6db5530ee15a0687c381a9191b533abebba4a6a06d9fbfa6ee3e01dae9dc2936de6836a
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
new file mode 100644
index 000000000000..ed2ff2427af1
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit java-pkg-2
+
+MY_PN="ecj"
+DMF="R-${PV}-201209141800"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.2"
+IUSE="+ant userland_GNU"
+
+COMMON_DEP="
+	app-eselect/eselect-java"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.6
+	app-arch/unzip
+	userland_GNU? ( sys-apps/findutils )"
+PDEPEND="
+	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+S="${WORKDIR}"
+
+JAVA_PKG_WANT_SOURCE=1.4
+JAVA_PKG_WANT_TARGET=1.4
+
+java_prepare() {
+	# These have their own package.
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -fr org/eclipse/jdt/internal/antadapter || die
+}
+
+src_compile() {
+	local javac_opts javac java jar
+
+	javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
+	javac="$(java-config -c)"
+	java="$(java-config -J)"
+	jar="$(java-config -j)"
+
+	find org/ -path org/eclipse/jdt/internal/compiler/apt -prune -o \
+		-path org/eclipse/jdt/internal/compiler/tool -prune -o -name '*.java' \
+		-print > sources-1.4
+	find org/eclipse/jdt/internal/compiler/{apt,tool} -name '*.java' > sources-1.6
+
+	mkdir -p bootstrap || die
+	cp -pPR org META-INF bootstrap || die
+	cd "${S}/bootstrap" || die
+
+	einfo "bootstrapping ${MY_PN} with ${javac} ..."
+	${javac} ${javac_opts} @../sources-1.4 || die
+	${javac} -encoding ISO-8859-1 -source 1.6 -target 1.6 @../sources-1.6 || die
+
+	find org/ META-INF/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' -o -name '*.inf' -o -name '*.props' \) \
+		-exec ${jar} cf ${MY_PN}.jar {} + || die
+
+	cd "${S}" || die
+	einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
+	${java} -classpath bootstrap/${MY_PN}.jar \
+		org.eclipse.jdt.internal.compiler.batch.Main \
+		${javac_opts} -nowarn @sources-1.4 || die
+	${java} -classpath bootstrap/${MY_PN}.jar \
+		org.eclipse.jdt.internal.compiler.batch.Main \
+		-encoding ISO-8859-1 -source 1.6 -target 1.6 -nowarn @sources-1.6 || die
+
+	find org/ META-INF/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' -o -name '*.inf' -o -name '*.props' \) \
+		-exec ${jar} cf ${MY_PN}.jar {} + || die
+}
+
+src_install() {
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+
+	# disable the class version verify, this has intentionally
+	# some classes with 1.6, but most is 1.4
+	JAVA_PKG_STRICT="" java-pkg_dojar ${MY_PN}.jar
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..ea7d04f5d41a
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="ecj"
+DMF="R-${PV}-201502041700"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.4"
+IUSE="+ant"
+
+COMMON_DEP="
+	app-eselect/eselect-java"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+PDEPEND="
+	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_JAR_FILENAME="${MY_PN}.jar"
+
+java_prepare() {
+	# These have their own package.
+	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -r org/eclipse/jdt/internal/antadapter || die
+
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
new file mode 100644
index 000000000000..5e2a7d0f72aa
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="ecj"
+DMF="R-${PV}-201509040015"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.5"
+IUSE="+ant"
+
+COMMON_DEP="
+	app-eselect/eselect-java"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.7
+	app-arch/unzip"
+PDEPEND="
+	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_JAR_FILENAME="${MY_PN}.jar"
+
+S="${WORKDIR}"
+
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
+java_prepare() {
+	# These have their own package.
+	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -r org/eclipse/jdt/internal/antadapter || die
+
+	# JavaCore is not distributed in the jar
+	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
+		-e 's|JavaCore.getOptions()||g' \
+		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/eclipse-ecj/metadata.xml b/dev-java/eclipse-ecj/metadata.xml
new file mode 100644
index 000000000000..107beb67c406
--- /dev/null
+++ b/dev-java/eclipse-ecj/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription>
+ECJ is the Eclipse Compiler for Java. It's a separate packaging of
+the embedded Java compiler that comes with Eclipse. It can be used
+as a batch-compiler by running the ecj-3.x script, or it can be
+used with Ant by using the -lib option to and and setting
+-Dbuild.compiler=ecj
+</longdescription>
+<use>
+	<flag name="ant">Support using ecj in Ant builds via dev-java/ant-eclipse-ecj</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-java/eclipsito-0_pre20130713 b/dev-java/eclipsito-0_pre20130713
deleted file mode 100644
index 03132b7d26e0..000000000000
--- a/dev-java/eclipsito-0_pre20130713
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A small subset of Eclipse core libraries for modular applications
-EAPI=5
-HOMEPAGE=https://code.google.com/p/eclipsito/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/eclipsito-0_pre20130713.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e543daefe08ec4c5f47812db799b2afb
diff --git a/dev-java/eclipsito/Manifest b/dev-java/eclipsito/Manifest
new file mode 100644
index 000000000000..af3189f7acee
--- /dev/null
+++ b/dev-java/eclipsito/Manifest
@@ -0,0 +1,4 @@
+AUX eclipsito-0_pre20130713-build.xml 1101 BLAKE2B 32c21296648965d9c3abbf47d66ef5d8d70597016b7ba1aab806c548a5d66c12de519cc2f6e48b4401eb177593a9f12c2a424a66a62e85a6434d783ca07cd896 SHA512 015ec8415927e31d672a0daf8ca89ceb0c8202f2ac8556583fef44586eedf6de8abafd3e96b85ece41fd7de7b712c9a18c53fd6184c8cf753a63e9d1c02ad7cd
+DIST eclipsito-0_pre20130713.tar.xz 162972 BLAKE2B 193a3b2c4bee39bfb87c49eb8b077804d26ef1f84a1dc2c3546d235ab6fa8f86340c943b1a5ce1044dcd5681751d856a044d75866717a0c976e82c86ae8a1ab1 SHA512 b238692950bc93059fb16df8e6301669583185976ae4f12519d1917a13fea2b53c5b3462f2da61d63025019eee10037a3a96b2ac742545d61b80f2ab7964d41b
+EBUILD eclipsito-0_pre20130713.ebuild 703 BLAKE2B e71d6f0458bb0565509908be3240791427b7b19051344b8a235b3238027003aa0f473dcc2b95b64cfa8b9beb902f62269cabbee9e768b3aa03c13f2a7a9eaf58 SHA512 50905b910ea794b51dcea6f3b9bd36bc65f8b1b9ce30752780b085c2677f596af7836f131b57c6420682fa4929e55485861a8d784bc0d3e7f3b4856bfbfe0cbf
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild b/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
new file mode 100644
index 000000000000..6625ce2e9267
--- /dev/null
+++ b/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A small subset of Eclipse core libraries for modular applications"
+HOMEPAGE="https://code.google.com/p/eclipsito/"
+SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/${PN}/org.bardsoftware.${PN}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-build.xml
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc apidocs
+	use source && java-pkg_dosrc src/
+}
diff --git a/dev-java/eclipsito/files/eclipsito-0_pre20130713-build.xml b/dev-java/eclipsito/files/eclipsito-0_pre20130713-build.xml
new file mode 100644
index 000000000000..c6055e5525c3
--- /dev/null
+++ b/dev-java/eclipsito/files/eclipsito-0_pre20130713-build.xml
@@ -0,0 +1,36 @@
+diff --git a/build.xml b/build.xml
+index d89485a..7be5431 100644
+--- a/build.xml
++++ b/build.xml
+@@ -17,4 +17,31 @@
+ 	<target depends="build" name="jar">
+       <jar destfile="eclipsito.jar" basedir="bin" compress="yes"/>
+ 	</target>
++
++  <target name="javadoc" description="Generates the Javadoc of the application">
++    <javadoc sourcepath="src" 
++             packagenames="*" 
++             destdir="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.5" 
++             linksource="true" 
++             breakiterator="false">
++    </javadoc>
++  </target>
+ </project>
diff --git a/dev-java/eclipsito/metadata.xml b/dev-java/eclipsito/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/eclipsito/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ecs-1.4.2-r2 b/dev-java/ecs-1.4.2-r2
deleted file mode 100644
index 2248473afa86..000000000000
--- a/dev-java/ecs-1.4.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/xerces:2 dev-java/jakarta-regexp:1.3 source? ( app-arch/zip ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library to generate markup language text such as HTML and XML
-EAPI=5
-HOMEPAGE=https://jakarta.apache.org/ecs
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-1.1
-RDEPEND=dev-java/xerces:2 dev-java/jakarta-regexp:1.3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/jakarta/ecs/source/ecs-1.4.2-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=95ca31f6bc52bd4955614a6b966320a7
diff --git a/dev-java/ecs/Manifest b/dev-java/ecs/Manifest
new file mode 100644
index 000000000000..11306f08e4e1
--- /dev/null
+++ b/dev-java/ecs/Manifest
@@ -0,0 +1,4 @@
+AUX ecs-1.4.2-java7-enum.patch 9655 BLAKE2B 09217f6f889915911ccbc1f228f71445aa91579b1c722d82ac1c161cf766d7259ca476719dd81ef9ded3b89d56b381a886e283dcf93982ccff5ccc811a56b1ec SHA512 9be8efb4762dd88ab9b3a05466ec9085b22e6d4f2c10ba11a57a9411b73edb1c3b6a0f9ba940159a8857087b310b49978885469ce9a7e5f8d964770772c5f4f5
+DIST ecs-1.4.2-src.tar.gz 3435157 BLAKE2B 97719b74c6bda1cbd785f0045aa7686d61e99ef407e2268071f79586f86002f574e9ebfa14f4ec4f053fbc3aa14099b6fe552387bfe5dcbf4ab653ee73135337 SHA512 b7004f9364a24dd9ec8f963f69279471cc2e39fdc81d1c97dc4881cf65ee16f5f4342129b7bdda12994b69edff23944cb12f5d4b4ec140bf962e3a4f9f4e1bb4
+EBUILD ecs-1.4.2-r2.ebuild 806 BLAKE2B c2559e523ea456a14c2f3c39c7b91264f2059be2b10554532e14d91c292e7ce44f712892ec286ea040e44c229853e66743387556c6451344767cd78e6affddd9 SHA512 0e75291744e88d85409f410bea5dd5f8e6a370b458e701c760eb13c191788a9c2f3ece4df36bf7e04b1288f83ee863b2103735f3d997dbe8a696d74cdf8b93f6
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/ecs/ecs-1.4.2-r2.ebuild b/dev-java/ecs/ecs-1.4.2-r2.ebuild
new file mode 100644
index 000000000000..01ab7de4e5d9
--- /dev/null
+++ b/dev-java/ecs/ecs-1.4.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library to generate markup language text such as HTML and XML"
+HOMEPAGE="https://jakarta.apache.org/ecs"
+SRC_URI="mirror://apache/jakarta/${PN}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/xerces:2
+	dev-java/jakarta-regexp:1.3"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="ISO8859-1"
+JAVA_SRC_DIR="src/java"
+
+JAVA_GENTOO_CLASSPATH="xerces-2,jakarta-regexp-1.3"
+
+java_prepare() {
+	java-pkg_clean
+	epatch "${FILESDIR}"/${P}-java7-enum.patch
+}
diff --git a/dev-java/ecs/files/ecs-1.4.2-java7-enum.patch b/dev-java/ecs/files/ecs-1.4.2-java7-enum.patch
new file mode 100644
index 000000000000..08632aef8b9b
--- /dev/null
+++ b/dev-java/ecs/files/ecs-1.4.2-java7-enum.patch
@@ -0,0 +1,217 @@
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/ConcreteElement.java b/ecs-1.4.2-src/src/java/org/apache/ecs/ConcreteElement.java
+index 1138b28..85e7c42 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/ConcreteElement.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/ConcreteElement.java
+@@ -319,11 +319,11 @@ public class ConcreteElement extends ElementAttributes implements Cloneable
+                 if(ce.getTagText() != null)
+                     out.write(ce.getTagText().getBytes(encoding));
+ 
+-                Enumeration enum = ce.registryList.elements();
++                Enumeration enumx = ce.registryList.elements();
+ 
+-                while(enum.hasMoreElements())
++                while(enumx.hasMoreElements())
+                 {
+-                    Object obj = ce.registry.get((String)enum.nextElement());
++                    Object obj = ce.registry.get((String)enumx.nextElement());
+                     if(obj instanceof GenericElement)
+                     {
+                         Element e = (Element)obj;
+@@ -435,10 +435,10 @@ public class ConcreteElement extends ElementAttributes implements Cloneable
+             if(getTagText() != null)
+                 out.write(getTagText());
+ 
+-            Enumeration enum = registryList.elements();
+-			while(enum.hasMoreElements())
++            Enumeration enumx = registryList.elements();
++			while(enumx.hasMoreElements())
+ 			{
+-				Object obj = registry.get((String)enum.nextElement());
++				Object obj = registry.get((String)enumx.nextElement());
+ 				if(obj instanceof GenericElement)
+ 				{
+ 					Element e = (Element)obj;
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/ElementAttributes.java b/ecs-1.4.2-src/src/java/org/apache/ecs/ElementAttributes.java
+index 76eeac0..990e92e 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/ElementAttributes.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/ElementAttributes.java
+@@ -342,12 +342,12 @@ public abstract class ElementAttributes extends GenericElement implements Attrib
+         }
+         out.append(getElementType());
+ 
+-        Enumeration enum = getElementHashEntry().keys();
++        Enumeration enumx = getElementHashEntry().keys();
+         String value = null; // avoid creating a new string object on each pass through the loop
+ 
+-        while (enum.hasMoreElements())
++        while (enumx.hasMoreElements())
+         {
+-            String attr = (String) enum.nextElement();
++            String attr = (String) enumx.nextElement();
+             if(getAttributeFilterState())
+             {
+                 value = getAttributeFilter().process(getElementHashEntry().get(attr).toString());
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/filter/RegexpFilter.java b/ecs-1.4.2-src/src/java/org/apache/ecs/filter/RegexpFilter.java
+index dcd0db0..effcc0d 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/filter/RegexpFilter.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/filter/RegexpFilter.java
+@@ -118,10 +118,10 @@ public class RegexpFilter extends Hashtable implements Filter {
+         }
+         
+         String substituteIn = to_process;
+-        Enumeration enum = keys();
++        Enumeration enumx = keys();
+ 
+-        while (enum.hasMoreElements()) {
+-            RE r = (RE)enum.nextElement();
++        while (enumx.hasMoreElements()) {
++            RE r = (RE)enumx.nextElement();
+             String substitution = (String)get(r);
+             substituteIn = r.subst(substituteIn, substitution);
+         }
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/html/A.java b/ecs-1.4.2-src/src/java/org/apache/ecs/html/A.java
+index 2a30d8d..ac87ae9 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/html/A.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/html/A.java
+@@ -462,13 +462,13 @@ public class A extends MultiPartElement implements Printable, FocusEvents, Mouse
+     */
+     public boolean getNeedLineBreak()
+     {
+-        java.util.Enumeration enum = elements();
++        java.util.Enumeration enumx = elements();
+         int i=0;
+         int j=0;
+-        while(enum.hasMoreElements())
++        while(enumx.hasMoreElements())
+         {
+             j++;
+-            Object obj = enum.nextElement();
++            Object obj = enumx.nextElement();
+             if( obj instanceof IMG )
+                 i++;
+         }
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/html/Select.java b/ecs-1.4.2-src/src/java/org/apache/ecs/html/Select.java
+index f8f71c2..a9c1f4a 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/html/Select.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/html/Select.java
+@@ -219,10 +219,10 @@ public class Select extends MultiPartElement implements
+ 
+     public Select selectOption(int option)
+     {
+-        Enumeration enum = keys();
+-        for(int x = 0; enum.hasMoreElements(); x++)
++        Enumeration enumx = keys();
++        for(int x = 0; enumx.hasMoreElements(); x++)
+         {
+-            ConcreteElement element = (ConcreteElement)getElement((String)enum.nextElement());
++            ConcreteElement element = (ConcreteElement)getElement((String)enumx.nextElement());
+             if(x == option)
+             {
+                 ((Option)element).setSelected(true);
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/html/TD.java b/ecs-1.4.2-src/src/java/org/apache/ecs/html/TD.java
+index 188d5f0..6737648 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/html/TD.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/html/TD.java
+@@ -468,13 +468,13 @@ public class TD extends MultiPartElement implements Printable, MouseEvents, KeyE
+     */
+     public boolean getNeedLineBreak()
+     {
+-        java.util.Enumeration enum = elements();
++        java.util.Enumeration enumx = elements();
+         int i=0;
+         int j=0;
+-        while(enum.hasMoreElements())
++        while(enumx.hasMoreElements())
+         {
+             j++;
+-            Object obj = enum.nextElement();
++            Object obj = enumx.nextElement();
+             if( obj instanceof IMG || obj instanceof A )
+                 i++;
+         }
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/vxml/TestBed2.java b/ecs-1.4.2-src/src/java/org/apache/ecs/vxml/TestBed2.java
+index 42d57a7..cd842db 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/vxml/TestBed2.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/vxml/TestBed2.java
+@@ -158,12 +158,12 @@ public class TestBed2
+ 	
+ 	Menu menu3 = new Menu("true");
+ 	Prompt prompt2 = new Prompt("Welcome Home");
+-	Enumerate enum = new Enumerate();
+-	enum.addElement("For ");
+-	enum.addElement(new Value("_prompt"));
+-	enum.addElement(", press ");
+-	enum.addElement(new Value("_dtmf"));
+-	prompt2.addElement(enum);
++	Enumerate enumx = new Enumerate();
++	enumx.addElement("For ");
++	enumx.addElement(new Value("_prompt"));
++	enumx.addElement(", press ");
++	enumx.addElement(new Value("_dtmf"));
++	prompt2.addElement(enumx);
+ 	menu3.addElement(prompt2);
+ 	Choice choice1 = new Choice("http://www.sports.example/vxml/start.vxml");
+ 	Choice choice2 = new Choice("http://www.weather.example/intro.vxml");
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/a.java b/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/a.java
+index 26add7f..1d0425a 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/a.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/a.java
+@@ -472,13 +472,13 @@ public class a extends MultiPartElement implements Printable, FocusEvents, Mouse
+     */
+     public boolean getNeedLineBreak()
+     {
+-        java.util.Enumeration enum = elements();
++        java.util.Enumeration enumx = elements();
+         int i=0;
+         int j=0;
+-        while(enum.hasMoreElements())
++        while(enumx.hasMoreElements())
+         {
+             j++;
+-            Object obj = enum.nextElement();
++            Object obj = enumx.nextElement();
+             if( obj instanceof img )
+                 i++;
+         }
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/td.java b/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/td.java
+index 8d96259..6bd4b45 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/td.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/xhtml/td.java
+@@ -466,13 +466,13 @@ public class td extends MultiPartElement implements Printable, MouseEvents, KeyE
+     */
+     public boolean getNeedLineBreak()
+     {
+-        java.util.Enumeration enum = elements();
++        java.util.Enumeration enumx = elements();
+         int i=0;
+         int j=0;
+-        while(enum.hasMoreElements())
++        while(enumx.hasMoreElements())
+         {
+             j++;
+-            Object obj = enum.nextElement();
++            Object obj = enumx.nextElement();
+             if( obj instanceof img || obj instanceof a )
+                 i++;
+         }
+diff --git a/ecs-1.4.2-src/src/java/org/apache/ecs/xml/XML.java b/ecs-1.4.2-src/src/java/org/apache/ecs/xml/XML.java
+index 1a03349..f6de10c 100644
+--- a/ecs-1.4.2-src/src/java/org/apache/ecs/xml/XML.java
++++ b/ecs-1.4.2-src/src/java/org/apache/ecs/xml/XML.java
+@@ -193,13 +193,13 @@ public class XML extends MultiPartElement implements Printable
+     public boolean getNeedLineBreak() {
+         boolean linebreak = true;
+ 
+-        java.util.Enumeration enum = elements();
++        java.util.Enumeration enumx = elements();
+ 
+         // if this tag has one child, and it's a String, then don't
+         // do any linebreaks to preserve whitespace
+ 
+-        while (enum.hasMoreElements()) {
+-            Object obj = enum.nextElement();
++        while (enumx.hasMoreElements()) {
++            Object obj = enumx.nextElement();
+             if (obj instanceof StringElement) {
+                  linebreak = false;
+                  break;
diff --git a/dev-java/ecs/metadata.xml b/dev-java/ecs/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/ecs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/edtftpj-2.4.0 b/dev-java/edtftpj-2.4.0
deleted file mode 100644
index a1c14ccc6875..000000000000
--- a/dev-java/edtftpj-2.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=FTP client library written in Java
-EAPI=5
-HOMEPAGE=https://enterprisedt.com/products/edtftpnet
-IUSE=examples elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://www.enterprisedt.com/products/edtftpj/download/edtftpj-2.4.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8eb3cbbf462ada706d084ad2e15383c9
diff --git a/dev-java/edtftpj/Manifest b/dev-java/edtftpj/Manifest
new file mode 100644
index 000000000000..7738ddb2259d
--- /dev/null
+++ b/dev-java/edtftpj/Manifest
@@ -0,0 +1,3 @@
+DIST edtftpj-2.4.0.zip 1592179 BLAKE2B 5e0a4df5b220febedc667d5c3c644a0380b57424c0f6d63d2ae72e33a30e75487df378ceed813456bdc8cef1f50584d83de8d7f4fc4d39cf74049accf0a12448 SHA512 bbcbb35805bd84e76fe15f9b07fb984782cd5838b94ee90af336991f0dfdb9b06028a35614a9accf16eb55151f09501cec5fac41030f847a32a679f9404808b0
+EBUILD edtftpj-2.4.0.ebuild 1103 BLAKE2B 7518d994ff16c763a8f09e239af84e3588efb2fdf67734a4b0bfe58d991ef452d5752401a705dfc1a77d572adea129e45f3ae809dbc2eaef0013962d9f049b5a SHA512 4e5a2f7061e50adda782bfed04c8420c93143019551302a55d9bb0fe3c32bac16e531b3037d422ab359c4f03041b334071cadb97312a82392a0c0edfd855c39c
+MISC metadata.xml 808 BLAKE2B f5a754aacac7c94a462c8ce916028df688a188060a879ea333c61327fe1d5395901f9a0dd65b0e3ea78e8c918dab4e96c129807c08ae5b5c11f1119165a74cd5 SHA512 c256394780ef9ac1e7e2639f4ff4c6780e2059188a4ce1fa8250bcb2c7b12963f7e40c511ade1256955221d8f4ba9fb6122cfee279167ece17873dce394c9c91
diff --git a/dev-java/edtftpj/edtftpj-2.4.0.ebuild b/dev-java/edtftpj/edtftpj-2.4.0.ebuild
new file mode 100644
index 000000000000..9dd3acc178cc
--- /dev/null
+++ b/dev-java/edtftpj/edtftpj-2.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="FTP client library written in Java"
+SRC_URI="https://www.enterprisedt.com/products/edtftpj/download/${P}.zip"
+HOMEPAGE="https://enterprisedt.com/products/edtftpnet"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.7"
+
+EANT_DOC_TARGET="javadocs"
+EANT_BUILD_XML="src/build.xml"
+
+java_prepare() {
+	java-pkg_clean
+
+	# Tests are geared for Windows and sit in the main sources.
+	rm -rv src/com/enterprisedt/net/ftp/test || die
+
+	# Delete Windows .bat files.
+	find -name "*.bat" -delete || die
+
+	# Adjust doc URLs to match our layout.
+	find examples -name "*.html" -exec sed -i 's:/doc/manual/:/manual/:g' {} + || die
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+
+	use doc && java-pkg_dojavadoc build/doc/api
+	use source && java-pkg_dosrc src/*
+
+	docinto html
+	use doc && dodoc -r doc/manual
+	use examples && dodoc -r examples
+}
diff --git a/dev-java/edtftpj/metadata.xml b/dev-java/edtftpj/metadata.xml
new file mode 100644
index 000000000000..1259eb23b982
--- /dev/null
+++ b/dev-java/edtftpj/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		edtFTPj is the first choice of Java developers worldwide
+		for incorporating FTP functionality into their applications.
+		edtFTPj is Open Source, licensed under the LGPL, the GNU
+		Lesser General Public License. This means you can freely
+		embed edtFTPj into your commercial Java applications,
+		subject to the normal LGPL restrictions. Unrestricted
+		(non-GPL) source licenses can be also be purchased. edtFTPj
+		has been downloaded over 100,000 times since its first
+		release, and is in use in thousands of companies worldwide.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/ehcache-1.2.4-r3 b/dev-java/ehcache-1.2.4-r3
deleted file mode 100644
index 72243757935a..000000000000
--- a/dev-java/ehcache-1.2.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Ehcache is a pure Java, fully-featured, in-process cache
-EAPI=5
-HOMEPAGE=http://ehcache.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5e20402210fa69690027c269bcf85f74
diff --git a/dev-java/ehcache-1.2.4-r4 b/dev-java/ehcache-1.2.4-r4
deleted file mode 100644
index 4ae91116b2bd..000000000000
--- a/dev-java/ehcache-1.2.4-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Ehcache is a pure Java, fully-featured, in-process cache
-EAPI=5
-HOMEPAGE=http://ehcache.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9338a39b4af504bf5044370aa0da1c38
diff --git a/dev-java/ehcache/Manifest b/dev-java/ehcache/Manifest
new file mode 100644
index 000000000000..6660722efdb7
--- /dev/null
+++ b/dev-java/ehcache/Manifest
@@ -0,0 +1,4 @@
+DIST ehcache-1.2.4.tgz 1330344 BLAKE2B 60dbf5f3463562f1a326b13ac10d37d5d9fc1d5faa343e4bf5b197adfc45624832d740270753646e2c08be2e661610512f74fa7b6aa8f26ef3afbeee0d89af72 SHA512 a8d3e7c47eeeab568fbe2f4b923db96cf0f93d8ae0f727aa107b0ce5c5abd035a3967ea58617ff10e9c81109dcb8d904cbad86ec2c77d9be159e1a0a2c44d4ed
+EBUILD ehcache-1.2.4-r3.ebuild 943 BLAKE2B b476a05660943b22e8ec6dcdaf6cbc098ff1840b4a2a4f8794c398df587421bb2ab23d979cb6180362c688ccc2086e6061964773edbb16d93a29575fca3fff1f SHA512 6b157bf437c0802af43768a03c773a8d15142c40519dc70e0b0a9c80cfc78f84456cee1627072936ceeb44cea7d41c755d9725d617199bc35717d0ae56e26744
+EBUILD ehcache-1.2.4-r4.ebuild 834 BLAKE2B 27fa18a745995da17f670114564c192d972b5958a447da20b4cb5b74f32dbf4e8a2b10cf891799fe2bb75880e1e66ee306245be352e74d7bec47af2b7ebfce01 SHA512 ca5dd8196d312b67f2ba78f450d904152b0382f8b590c99a23266bf653124fec6139a2dfd6bd6f3121120da125ed1e111cd5273138a70a4fad61e98f65a94f8b
+MISC metadata.xml 313 BLAKE2B d2ded32988d3cb8913c205d47805e270afe93cfd28bd3177dabf0efc3601f052b218f0ca57370435fcbd68f3e6caad88587b0ffc700ee1b969b7d77070f09459 SHA512 6bc82a76cb9ebccb0253e19e3d1f9aa09bd0a3f2aa16e86f61dbbd76449cc77cda7fbca3fe04e8523f5ada48a5d3bfd89b12ba907ae37290bac6b87af2383da6
diff --git a/dev-java/ehcache/ehcache-1.2.4-r3.ebuild b/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
new file mode 100644
index 000000000000..ca21347361af
--- /dev/null
+++ b/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Ehcache is a pure Java, fully-featured, in-process cache"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+HOMEPAGE="http://ehcache.sourceforge.net"
+
+LICENSE="Apache-2.0"
+SLOT="1.2"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-java/commons-collections:0
+	dev-java/commons-logging:0
+	java-virtuals/servlet-api:2.4"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging,servlet-api-2.4"
+
+java_prepare() {
+	unzip -d src ${P}-sources.jar || die
+	rm -rf src/net/sf/ehcache/hibernate || die
+	rm *.jar || die
+}
diff --git a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
new file mode 100644
index 000000000000..561749bb3911
--- /dev/null
+++ b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Ehcache is a pure Java, fully-featured, in-process cache"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+HOMEPAGE="http://ehcache.sourceforge.net"
+
+LICENSE="Apache-2.0"
+SLOT="1.2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+CDEPEND="dev-java/commons-collections:0
+	dev-java/commons-logging:0
+	java-virtuals/servlet-api:2.5"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging,servlet-api-2.5"
+
+java_prepare() {
+	unpack ./${P}-sources.jar
+	rm -vr net/sf/ehcache/hibernate || die
+	java-pkg_clean
+}
diff --git a/dev-java/ehcache/metadata.xml b/dev-java/ehcache/metadata.xml
new file mode 100644
index 000000000000..d5a70d04d0dc
--- /dev/null
+++ b/dev-java/ehcache/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ehcache</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/emma-2.0.5312-r3 b/dev-java/emma-2.0.5312-r3
deleted file mode 100644
index 25395df94f82..000000000000
--- a/dev-java/emma-2.0.5312-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core launcher? ( !sci-biology/emboss ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Free Java code coverage tool
-EAPI=5
-HOMEPAGE=http://emma.sourceforge.net/
-IUSE=+launcher elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=CPL-1.0
-RDEPEND=dev-java/ant-core launcher? ( !sci-biology/emboss ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/emma/emma-2.0.5312-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9ff3793af2032727d7239a1721ef2963
diff --git a/dev-java/emma/Manifest b/dev-java/emma/Manifest
new file mode 100644
index 000000000000..e3dc1ff335c8
--- /dev/null
+++ b/dev-java/emma/Manifest
@@ -0,0 +1,4 @@
+AUX emma-2.0.5312-java15api.patch 841 BLAKE2B b3a03a2f309303e0966703204a66980081778ca261b7ed82d8471ce3a295e4b5f8af0d6a8547f01150930a7c3378f8472ccef3ccb9382b74d9782e246530bc93 SHA512 cd485a0bd9bb157f9a0e420bd3bd8863ae5b1127401b8ff8944459c04fa2f5a7e6b008d9f86affe25cb24cf007d9dfe780f843745c6fcdfcfe1f734e9bb8fd23
+DIST emma-2.0.5312-src.zip 421109 BLAKE2B bca287d7cdd61902fd156eac80596db07801e8dabd342d7cc68d3e0b4c0ff7b4de2b14d8b01d3521a291f7401ddc0ead67db6f9c601b26669ce9265bc28e0209 SHA512 d99b7ff1c4682a97f714f74cc6142bb766cde47bcb33932dc466f1e505e836883f01faa0a959dad77c0837fca3ae744754e0fcdc34d7a8d14720b0b7ce90ee4b
+EBUILD emma-2.0.5312-r3.ebuild 1043 BLAKE2B b93c80ed04f62d0281fc8f70d0b950ffcb238b34f8877a5de2dd19da24d1fcb77c56c416a65c4bba87f911f49bd7a053795546489f3df3286d336864bb25031e SHA512 8e92ba3a851ca3d14de2dc9e93f5d6526002b63f860fee181d6cade4b7f9ade88de92588f370d549c9f733ace9b12e618aeff632df7a4ec8bf8c04b869f58a32
+MISC metadata.xml 859 BLAKE2B d474ccceca08cc1c567c3376a7b07e9d2e353f078774cf852d73d452af719700300cdc5ad2959cd152de9f7e41709d595256de37e02581b638ec7d04cdda6869 SHA512 ac17b5b8a16adcc4eb751c272805edf5e3c25df27615efeffac2b188f689a8e40461d733921868c1a7e52bbf1e99c618cc99a70d921ed51661241c87b46a7a3b
diff --git a/dev-java/emma/emma-2.0.5312-r3.ebuild b/dev-java/emma/emma-2.0.5312-r3.ebuild
new file mode 100644
index 000000000000..7980a191226b
--- /dev/null
+++ b/dev-java/emma/emma-2.0.5312-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Free Java code coverage tool"
+HOMEPAGE="http://emma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+
+IUSE="+launcher"
+
+CDEPEND="
+	dev-java/ant-core
+	launcher? ( !sci-biology/emboss )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+EANT_BUILD_TARGET="build"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-java15api.patch"
+	# bcp mangling unneccessary for 1.4+ and breaks with IBM 1.6 - bug #220463
+	sed -e '/bootclasspathref/d' -e '/extdirs/d' -i build.xml || die
+}
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+	java-pkg_dojar "dist/${PN}_ant.jar"
+	java-pkg_register-ant-task
+
+	use launcher && java-pkg_dolauncher ${PN} --main emmarun
+
+	# One of these does not have java sources
+	use source && java-pkg_dosrc */*/com 2> /dev/null
+}
diff --git a/dev-java/emma/files/emma-2.0.5312-java15api.patch b/dev-java/emma/files/emma-2.0.5312-java15api.patch
new file mode 100644
index 000000000000..e7a28ba2883f
--- /dev/null
+++ b/dev-java/emma/files/emma-2.0.5312-java15api.patch
@@ -0,0 +1,13 @@
+diff --git a/core/java12/com/vladium/emma/rt/InstrClassLoader.java b/core/java12/com/vladium/emma/rt/InstrClassLoader.java
+index 4ea4f80..2c14287 100644
+--- a/core/java12/com/vladium/emma/rt/InstrClassLoader.java
++++ b/core/java12/com/vladium/emma/rt/InstrClassLoader.java
+@@ -343,7 +343,7 @@ final class InstrClassLoader extends URLClassLoader
+         // support ProtectionDomains with non-null class source URLs:

+         // [however, disable anything related to sealing or signing]

+         

+-        final CodeSource csrc = new CodeSource (srcURL, null);

++        final CodeSource csrc = new CodeSource (srcURL, (java.security.cert.Certificate[]) null);

+         

+         // allow getPackage() to return non-null on the class we are about to

+         // define (however, don't bother emulating the original manifest info since

diff --git a/dev-java/emma/metadata.xml b/dev-java/emma/metadata.xml
new file mode 100644
index 000000000000..56c9446606cb
--- /dev/null
+++ b/dev-java/emma/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		EMMA is an open-source toolkit for measuring and reporting Java code
+		coverage. EMMA distinguishes itself from other tools by going after
+		a unique feature combination: support for large-scale enterprise
+		software development while keeping individual developer's work fast
+		and iterative. Every developer on your team can now get code coverage
+		for free and they can get it fast
+	</longdescription>
+	<use>
+		<flag name="launcher">Install /usr/bin/emma. Collides with <pkg>sci-biology/emboss</pkg>.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">emma</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/error-prone-annotations-2.0.14 b/dev-java/error-prone-annotations-2.0.14
deleted file mode 100644
index 99e4fb1a9968..000000000000
--- a/dev-java/error-prone-annotations-2.0.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java annotations for the Error Prone static analysis tool
-EAPI=6
-HOMEPAGE=http://errorprone.info
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/google/error-prone/archive/v2.0.14.tar.gz -> error-prone-2.0.14.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d87f48ac59d68a6f02559f04287df657
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
new file mode 100644
index 000000000000..6f8e725af6b4
--- /dev/null
+++ b/dev-java/error-prone-annotations/Manifest
@@ -0,0 +1,3 @@
+DIST error-prone-2.0.14.tar.gz 677991 BLAKE2B e247249b385b4d5ff46cd9faaeb88b7c2053204c17a2a81846c554e2eb95389a17ca340f02dbab187f7b9e297fb13c030912e49bfbe5b29c7158391b1a7c50da SHA512 0bf2c869638e03fea5395e2b84a690c42df320903e48a171537e68a60ae7a47a8a83de07fa0a8dfb03340c035878b4380fd6677ba3bf1d13eeffcfaee4e63658
+EBUILD error-prone-annotations-2.0.14.ebuild 599 BLAKE2B 11e987bf8062ee9f978620396c3b8a8b5dce81fbe106591387d24432a9683e544d85def6210d8df2defce9c7d25f71f1c4bcbba98625dd73304542e834d1d4bb SHA512 496b67dc1a6ecaf723ffb5264a1867da3d910cb6b0bf93bb9c1c88747edd4400171eddc58e20155e44271dfa977e9d51111c2af3bf7566028f7814131e5bddc9
+MISC metadata.xml 319 BLAKE2B 727cec3df9c56a586a06b2f4ac39febe65520ecdf569e1b0e721dc57d90f3a6103b6de61877c60d8f283dd68644f8832d889c703d8f16a563f936ccec21b1e62 SHA512 0ae8aaa5ccf52264fd07cc4086c8d60eddafca5fa65c1769e5f810a63f5477914ba1f4e27f88836207ebb21cc595f8fa94bcc3e5c955a53b20afea8555ee73f4
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
new file mode 100644
index 000000000000..bde172d25913
--- /dev/null
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN%-annotations}"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java annotations for the Error Prone static analysis tool"
+HOMEPAGE="http://errorprone.info"
+SRC_URI="https://github.com/google/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/annotations"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/error-prone-annotations/metadata.xml b/dev-java/error-prone-annotations/metadata.xml
new file mode 100644
index 000000000000..2411fd6e87c9
--- /dev/null
+++ b/dev-java/error-prone-annotations/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">google/error-prone</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/ezmorph-1.0.6 b/dev-java/ezmorph-1.0.6
deleted file mode 100644
index 0aad8808eaf6..000000000000
--- a/dev-java/ezmorph-1.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/commons-lang:2.1 dev-java/commons-beanutils:1.7 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A simple Java library for transforming an Object to another Object
-EAPI=5
-HOMEPAGE=http://ezmorph.sourceforge.net/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/commons-lang:2.1 dev-java/commons-beanutils:1.7 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/ezmorph/ezmorph-1.0.6-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1f4eaefc31a1ed344d1762e4be2f992d
diff --git a/dev-java/ezmorph/Manifest b/dev-java/ezmorph/Manifest
new file mode 100644
index 000000000000..9a41684efc4b
--- /dev/null
+++ b/dev-java/ezmorph/Manifest
@@ -0,0 +1,3 @@
+DIST ezmorph-1.0.6-sources.jar 68198 BLAKE2B c8df2da6282361932041de5cb7200119dd70279b1b4a0aa0ecdb8b87d5582fddd8716c593850af6d3da972b51dcee9f62eb5bfee83e698a1ce1c3b6f23f359df SHA512 a8f88ff38e2d2815ee64436af87c4dc5a9858edec729c8db3ebda6d64d2fe2644b5e56deafedcf242caffa523643ccb978cd775c85793df6e2e5487c6d878cea
+EBUILD ezmorph-1.0.6.ebuild 960 BLAKE2B 851ce459b6b7c177443be776a96a3e7d7e97c836fa00f0090f0327616031259d731a75a21d72536de434a277db1b1517c1de2e0b0a60743dcaf0631189adf912 SHA512 50abfd78fbe1afa2d6dbceb2f2b0f89ff2a40c1c0462f11581afe964aa7cbeb40565c2a62f5753bcaed768a7b4e2f27a10bcf2ebae4435fbf2de0ab67188f033
+MISC metadata.xml 680 BLAKE2B 9137d55198fb79ceb04257fe148118219677862fe68032439c0564eff62ae82534597572730000e3311b85920275c198221a182621f373335d29e061b2d0e021 SHA512 08bd4ceaa2a3cc59113e92e3f89a39de8cc17677456fc78a2b12aa9de1def12d521cf09d44e9c2369bc3ec4208a7df7cf54ae14757d4d23c3b984c8515871f61
diff --git a/dev-java/ezmorph/ezmorph-1.0.6.ebuild b/dev-java/ezmorph/ezmorph-1.0.6.ebuild
new file mode 100644
index 000000000000..688dca1ce89a
--- /dev/null
+++ b/dev-java/ezmorph/ezmorph-1.0.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A simple Java library for transforming an Object to another Object"
+HOMEPAGE="http://ezmorph.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="dev-java/commons-lang:2.1
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-logging:0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+JAVA_GENTOO_CLASSPATH="
+	commons-lang-2.1
+	commons-beanutils-1.7
+	commons-logging"
+
+RESTRICT=test #564158
+
+java_prepare() {
+	# Don't build tests all the time
+	if ! use test ; then
+		rm -r net/sf/ezmorph/test || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc target/api
+	use source && java-pkg_dosrc net
+}
diff --git a/dev-java/ezmorph/metadata.xml b/dev-java/ezmorph/metadata.xml
new file mode 100644
index 000000000000..c4670b98a2e4
--- /dev/null
+++ b/dev-java/ezmorph/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		EZMorph is simple java library for transforming an Object to another Object.
+
+		EZMorph's key strengths are:
+
+		Supports transformations for primitives and Objects
+		Supports transformations for multidimensional arrays
+		Supports transformations with DynaBeans
+		JDK 1.3.1 compatible
+		Small memory footprint (~76K)
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ezmorph</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/fastinfoset-1.2.11 b/dev-java/fastinfoset-1.2.11
deleted file mode 100644
index c5f8a2363270..000000000000
--- a/dev-java/fastinfoset-1.2.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Specifies a standardized binary encoding for the XML Information Sets
-EAPI=5
-HOMEPAGE=https://fi.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://search.maven.org/remotecontent?filepath=com/sun/xml/fastinfoset/FastInfoset/1.2.11/FastInfoset-1.2.11-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=79d458e29c6e1e67787b4196f2777e0b
diff --git a/dev-java/fastinfoset/Manifest b/dev-java/fastinfoset/Manifest
new file mode 100644
index 000000000000..53dcb4963fce
--- /dev/null
+++ b/dev-java/fastinfoset/Manifest
@@ -0,0 +1,3 @@
+DIST FastInfoset-1.2.11-sources.jar 255054 BLAKE2B b5424f34aff73e6d5510b1ebae537751c84dca4d98c305bc0fea75dee9f8aac1a8e9213b0adfd27b840febcb4001cb1a539f9fddb73fc621efbe0453686eba32 SHA512 a1e850e4b235bf767a168dacdaf61f4e1261b6cb50387c3f3cda575f87bed5cf3974c9d04a273baf1aeb47bfa1851aab95432a3890b8bd99f3672c88f0205e3a
+EBUILD fastinfoset-1.2.11.ebuild 576 BLAKE2B e82254171cd6b284cbffd16497110be0ed270a36328e18dcfff67254ede6f2c14669f69a3f0f2c178f3cbfd41d15f452771a625b05f5b99b34497cf86ce3d7d6 SHA512 8d95577f414b05929170553ded66178519e1a433f1db14e5e3711a51824b236d76db5ebd5ba2db59d631bb999686b6ef9a5f2629e32bd61c2de9a4c5e7c6b0b5
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
new file mode 100644
index 000000000000..d84fbc04414d
--- /dev/null
+++ b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="FastInfoset"
+
+DESCRIPTION="Specifies a standardized binary encoding for the XML Information Sets"
+HOMEPAGE="https://fi.java.net/"
+SRC_URI="http://search.maven.org/remotecontent?filepath=com/sun/xml/${PN}/${MY_PN}/${PV}/${MY_PN}-${PV}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}"
diff --git a/dev-java/fastinfoset/metadata.xml b/dev-java/fastinfoset/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/fastinfoset/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/fastutil-7.0.10 b/dev-java/fastutil-7.0.10
deleted file mode 100644
index fae979dc5c4d..000000000000
--- a/dev-java/fastutil-7.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Provides faster type-specific maps, sets and lists with a small memory footprint
-EAPI=5
-HOMEPAGE=https://github.com/vigna/fastutil
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/vigna/fastutil/archive/7.0.10.zip -> fastutil-7.0.10.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9dfc2cb6d124109a3efe18a4793537dd
diff --git a/dev-java/fastutil/Manifest b/dev-java/fastutil/Manifest
new file mode 100644
index 000000000000..9d3c9b33aadb
--- /dev/null
+++ b/dev-java/fastutil/Manifest
@@ -0,0 +1,3 @@
+DIST fastutil-7.0.10.zip 518168 BLAKE2B 7941e4b6725a45e7e4f08d6c3c2b44fc5940266d0274ea2c8342747e8078024056c4c39e2d64a2f529599b9780b66f1dbd041f5de4e5fec3879c35fc923702c2 SHA512 9345f509243bf91123b4232b95915ae4d6071b5da17948cf62e993e77e9ed947637f02937ccd98edbfd874db7f98c1858357e21721feb338d97041a7bcc3e558
+EBUILD fastutil-7.0.10.ebuild 828 BLAKE2B ddceb91f90c3ef093fef0dc9cbadf98883acb71222b69fbfacb187687f63eedb7035726b9f0410b313d0588b1d28202df4d4b7654e54de2f2c0e7e1f13f88ab5 SHA512 74b0b380bdc479f97b5da50d2dcf2ee114b6a11a168fbca1330827b93467e385a2ebf009d69bb4e924c25de2305ddb277a2859120867461272d605b6357f9a82
+MISC metadata.xml 315 BLAKE2B 182d83d40631234d357d332b8e293c21bb2f3eae973943e9e4bad72d59e6d99beba37ea7040f609490b2f5e9dd9dc6844c29bdcd2067862620b883cd53032e3f SHA512 447055480b194584c2a20458664b53916d198417612b3a084f7d36dc18ea0d4678b93ba916295905059ec37d92a18bfdf2e04b536b5aca378325f38037730ad9
diff --git a/dev-java/fastutil/fastutil-7.0.10.ebuild b/dev-java/fastutil/fastutil-7.0.10.ebuild
new file mode 100644
index 000000000000..0ca7d1ce8a0c
--- /dev/null
+++ b/dev-java/fastutil/fastutil-7.0.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Provides faster type-specific maps, sets and lists with a small memory footprint"
+HOMEPAGE="https://github.com/vigna/fastutil"
+SRC_URI="https://github.com/vigna/fastutil/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+src_compile() {
+	emake sources
+
+	# bug 162650 and #175578
+	java-pkg_init-compiler_
+
+	[[ ${GENTOO_COMPILER} != "javac" ]] && export ANT_OPTS="-Xmx512m"
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_newjar "${P}.jar"
+
+	dodoc CHANGES README.md
+
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/it
+}
diff --git a/dev-java/fastutil/metadata.xml b/dev-java/fastutil/metadata.xml
new file mode 100644
index 000000000000..ef9d3ced77a5
--- /dev/null
+++ b/dev-java/fastutil/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vigna/fastutil</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/fec-1.0.4-r2 b/dev-java/fec-1.0.4-r2
deleted file mode 100644
index c2bc76253b5e..000000000000
--- a/dev-java/fec-1.0.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/log4j:0 >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Forward Error Correction library in Java
-EAPI=5
-HOMEPAGE=https://bitbucket.org/onionnetworks/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=dev-java/log4j:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ff002f56c314f38dcbd602d9b4df1bb6
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
new file mode 100644
index 000000000000..f1bbec4b3383
--- /dev/null
+++ b/dev-java/fec/Manifest
@@ -0,0 +1,7 @@
+AUX fec-1.0.4-build.patch 890 BLAKE2B 58dcca98815ecf53dfee025e1f11ca5a9a86adcfe672561a376c11d14d0635e9a858cb28a88b6f5187d03e1f5cf6412078caf1984ad58b1f46b28be0f1a9c0ea SHA512 d92960acd70d4f494e6875f1f5472d4da889c12a7bf8a232d291a557b0d17160a048290ab9dd9e90746a7954bd71681d36433d9dc422add7b9ea9ab956d8c90e
+AUX fec-1.0.4-libfec8path.patch 1087 BLAKE2B 085c732b1ebf4bd8a6e6d7ddd7f5995c29177e165972360f9cec74dc8bc13f331ec32bf31f531c9efb4f63e796fd91142d87b94695ecff31cf4997e63379f3f1 SHA512 7f46eedf2eb21eff04f0cee30a0e454d4796f29a22df4c33100255133c43cce07ac95e8e7eae5957412a2ce0da626cdbfffc57c5398f9f2c56660000805a60a0
+AUX fec-1.0.4-remove-concurrent-util-imports.patch 3142 BLAKE2B 028451e332afc9ec5d5afdacc9bc75364708dc5700d8691a428fde2e7c24595dba5d1e39901555095aa4577180e884000c21bf2f55a375616de59b82244a3a14 SHA512 195d2d5ec252d9e8c83762de318393b50d08fd50c900a13489e082e6d08bcc6f85b6425dd350fe1d24e2aab5ed8753ce25dc87f35aa8754721cdf5949ad49aa6
+AUX fec-1.0.4-soname.patch 786 BLAKE2B 0037363c6a8a8506f1981980296708cc202815ecb48b0357a71ff2f7a1cb9a6a438974d35b548f10688dffa6cef736f1c24b56ef27a3b6767b63c56b4698d088 SHA512 d75e6198f2f7193fbb65b686118f597c289576726d77ce3d65e122b4d6ca1f790fb8530e42e3e174c97a4b45083f95407478499f11b457d813d06e85b5d21c1d
+DIST fec-1.0.4.tar.gz 449406 BLAKE2B 132bb87ff0da35b9a1830d014c46fb82209b344d159b88c6dbf36c706de668cdb2dfc10894690009e9a47f461100beaf9cf25ad1c75a3b18194e5499457bcb6b SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343
+EBUILD fec-1.0.4-r2.ebuild 1512 BLAKE2B 29fecbf8036b2eb60a998547b17172a814ce73962229ba050350fe8784045936f226eca3ea6c72722013e0419d11b7bba1430d91fecfb6819b7a7f8fe9e7a1a5 SHA512 ca83c503d157a694dfc338a7027dab4a3ef2415ca19f464e9a877c4ca5c938145d140bff18325f3cfc8a56935094120a802e1734545299f4eec05400423e1a01
+MISC metadata.xml 434 BLAKE2B 5d425c2f0f2e1a03b58db97d2a16fe676852acee35af62283445b4046935fe6ade6c2bfabbfeb8fe155ab0eb4bc175bbc45a7a4a2f9af75e56a91177d2acd6a5 SHA512 bdbd0a880e9267ffee492085dd0d6a260e14b9981087cd24cfd2572079ac77b6a629556ca56e08155439f0a37a3bb97e16a2687ebe6ad3aa25340023f7c628f1
diff --git a/dev-java/fec/fec-1.0.4-r2.ebuild b/dev-java/fec/fec-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..e1b2f635b328
--- /dev/null
+++ b/dev-java/fec/fec-1.0.4-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic toolchain-funcs java-pkg-2 java-ant-2
+
+DESCRIPTION="Forward Error Correction library in Java"
+HOMEPAGE="https://bitbucket.org/onionnetworks/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/log4j:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-libfec8path.patch"
+	"${FILESDIR}"/"${P}-build.patch"
+	"${FILESDIR}"/"${P}-soname.patch"
+	"${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch"
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="log4j"
+EANT_BUILD_TARGET="jars"
+
+# There seems to be unit tests, but they are in such a state.
+RESTRICT="test"
+
+java_prepare() {
+	# In fact, we'll wipe tests altogether.
+	rm -rf tests || die
+
+	# Apply patches.
+	epatch "${PATCHES[@]}"
+
+	# Get rid of bundled jars.
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	einfo "Sucessfully compiled Java classes!"
+
+	cd "${S}"/src/csrc || die
+	append-flags -fPIC
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die
+	einfo "Sucessfully compiled C files!"
+}
+
+src_install() {
+	java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar"
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/com
+	dolib.so src/csrc/libfec{8,16}.so || die
+}
diff --git a/dev-java/fec/files/fec-1.0.4-build.patch b/dev-java/fec/files/fec-1.0.4-build.patch
new file mode 100644
index 000000000000..c47eb5459045
--- /dev/null
+++ b/dev-java/fec/files/fec-1.0.4-build.patch
@@ -0,0 +1,30 @@
+--- src/csrc/Makefile.orig	2015-10-18 14:31:56.752486000 +0000
++++ src/csrc/Makefile	2015-10-18 14:33:11.502486000 +0000
+@@ -28,11 +28,8 @@
+ 		-I$(JAVA_HOME)/include/linux fec-jinterf.c \
+ 		-o fec8-jinterf.o
+ 
+-fec8.o: fec.h fec8.S
+-	$(CC) $(CFLAGS) -DGF_BITS=8 -c -o fec8.o fec8.S
+-
+-fec8.S: fec.c Makefile
+-	$(CC) $(CFLAGS) -DGF_BITS=8 -S -o fec8.S fec.c
++fec8.o: fec.h fec.c
++	$(CC) $(CFLAGS) -DGF_BITS=8 -c -o fec8.o fec.c
+ 
+ libfec16.so: fec16.o fec16-jinterf.o
+ 	$(CC) $(LDFLAGS) -shared fec16-jinterf.o fec16.o -o libfec16.so
+@@ -42,11 +39,8 @@
+ 		-I$(JAVA_HOME)/include/linux fec-jinterf.c \
+ 		-o fec16-jinterf.o
+ 
+-fec16.o: fec.h fec16.S
+-	$(CC) $(CFLAGS) -DGF_BITS=16 -c -o fec16.o fec16.S
+-
+-fec16.S: fec.c Makefile
+-	$(CC) $(CFLAGS) -DGF_BITS=16 -S -o fec16.S fec.c
++fec16.o: fec.h fec.c
++	$(CC) $(CFLAGS) -DGF_BITS=16 -c -o fec16.o fec.c
+ 
+ clean:
+ 	- rm -f *.o *.S fec *.so
diff --git a/dev-java/fec/files/fec-1.0.4-libfec8path.patch b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
new file mode 100644
index 000000000000..58eb89efb730
--- /dev/null
+++ b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
@@ -0,0 +1,30 @@
+--- src/com/onionnetworks/fec/Native8Code.java.orig	2015-10-18 14:27:06.160486000 +0000
++++ src/com/onionnetworks/fec/Native8Code.java	2015-10-18 14:30:32.557486000 +0000
+@@ -3,6 +3,7 @@
+ //import java.security.AccessController;
+ //import sun.security.action.*;
+ import com.onionnetworks.util.*;
++import java.io.File;
+ 
+ /**
+  * This class is the frontend for the JNI wrapper for the C implementation of
+@@ -21,15 +22,10 @@
+     final private long code;
+ 
+     static {
+-        String path = NativeDeployer.getLibraryPath
+-            (Native8Code.class.getClassLoader(),"fec8");
+-        if (path != null) {
+-            System.load(path);
+-            initFEC();
+-        } else {
+-            System.out.println("Unable to find native library for fec8 for platform "+NativeDeployer.OS_ARCH);
+-            System.out.println(path);
+-        }
++        File path = new File("/usr/lib/libfec8.so");
++		 System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
++        System.load(path.getAbsolutePath());
++        initFEC();
+     }
+ 
+     public Native8Code(int k, int n) {
diff --git a/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch b/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch
new file mode 100644
index 000000000000..87a9473ed937
--- /dev/null
+++ b/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch
@@ -0,0 +1,101 @@
+--- src/com/onionnetworks/fec/io/FECFile.java.orig	2015-10-18 15:38:26.000000000 +0000
++++ src/com/onionnetworks/fec/io/FECFile.java	2015-10-18 16:06:51.159486000 +0000
+@@ -10,7 +10,9 @@
+ import com.onionnetworks.fec.FECCodeFactory;
+ import com.onionnetworks.io.RAF;
+ import com.onionnetworks.util.*;
+-import EDU.oswego.cs.dl.util.concurrent.*;
++
++import java.util.concurrent.locks.ReadWriteLock;
++import java.util.concurrent.locks.ReentrantReadWriteLock;
+ 
+ /**
+  * This class provides the necessary file IO routines to go along with the raw
+@@ -129,9 +131,9 @@
+         this.raf = new RAF(f,mode); // synched RandomAccessFile        
+ 
+         // Create the locks.
+-        locks = new ReadWriteLock[blockCount];
++        locks = new ReentrantReadWriteLock[blockCount];
+         for (int i=0;i<locks.length;i++) {
+-            locks[i] = new ReentrantWriterPreferenceReadWriteLock();
++            locks[i] = new ReentrantReadWriteLock();
+         }
+ 
+         // add the default exception handler.
+@@ -258,7 +260,7 @@
+         byte[] b = null;
+ 
+         try {
+-            locks[blockNum].readLock().acquire();
++            locks[blockNum].readLock().lock();
+ 	    try {
+ 
+                 // This raf check then pp access is safe because all
+@@ -296,9 +298,9 @@
+                     return;
+                 }
+ 	    } finally {
+-                locks[blockNum].readLock().release();
++                locks[blockNum].readLock().unlock();
+ 	    }
+-	} catch (InterruptedException e) { 
++	} catch (Exception e) { 
+ 	    throw new InterruptedIOException(e.toString());
+ 	}
+         
+@@ -342,13 +344,13 @@
+ 	
+         int result = -1;
+         try {
+-            locks[blockNum].writeLock().acquire();
++            locks[blockNum].writeLock().lock();
+ 	    try {
+                 result = write0(pkt,blockNum,stripeNum);
+ 	    } finally {
+-                locks[blockNum].writeLock().release();
++                locks[blockNum].writeLock().unlock();
+ 	    }
+-	} catch (InterruptedException e) { 
++	} catch (Exception e) { 
+ 	    throw new InterruptedIOException(e.toString());
+ 	}
+ 
+@@ -444,16 +446,16 @@
+ 	}
+ 
+ 	try {
+-	    locks[blockNum].writeLock().acquire();
++	    locks[blockNum].writeLock().lock();
+ 	    try {
+ 		// seek and write the decoded block.
+ 		raf.seekAndWrite(blockNum*blockSize,b,0,b.length);
+ 		// Update the placement to show decoded entries.
+ 		pp.setBlockDecoded(blockNum);
+ 	    } finally {
+-		locks[blockNum].writeLock().release();
++		locks[blockNum].writeLock().unlock();
+ 	    }
+-	} catch (InterruptedException e) { 
++	} catch (Exception e) { 
+ 	    throw new InterruptedIOException(e.toString());
+ 	}
+ 	 
+@@ -468,7 +470,7 @@
+      */
+     public void acquireAllWriteLocks() throws InterruptedException {
+         for (int i=0;i<locks.length;i++) {
+-            locks[i].writeLock().acquire();
++            locks[i].writeLock().lock();
+         }
+     }
+ 
+@@ -479,7 +481,7 @@
+      */
+     public void releaseAllWriteLocks() throws InterruptedException {
+         for (int i=0;i<locks.length;i++) {     
+-            locks[i].writeLock().release();
++            locks[i].writeLock().unlock();
+         }   
+     }
+ 
diff --git a/dev-java/fec/files/fec-1.0.4-soname.patch b/dev-java/fec/files/fec-1.0.4-soname.patch
new file mode 100644
index 000000000000..ae00449ced40
--- /dev/null
+++ b/dev-java/fec/files/fec-1.0.4-soname.patch
@@ -0,0 +1,22 @@
+--- src/csrc/Makefile.bak	2010-02-27 00:51:38.000000000 +1300
++++ src/csrc/Makefile	2010-02-27 00:56:06.000000000 +1300
+@@ -21,7 +21,8 @@
+ 	$(CC) $(CFLAGS) -DGF_BITS=8 -o fec fec8.o test.c
+ 
+ libfec8.so: fec8.o fec8-jinterf.o
+-	$(CC) $(LDFLAGS) -shared fec8-jinterf.o fec8.o -o libfec8.so
++	$(CC) $(LDFLAGS) -shared fec8-jinterf.o fec8.o -o libfec8.so \
++		-Wl,-soname=libfec8.so
+ 
+ fec8-jinterf.o: fec-jinterf.c
+ 	$(CC) $(CFLAGS) -DGF_BITS=8 -c \
+@@ -35,7 +36,8 @@
+ 	$(CC) $(CFLAGS) -DGF_BITS=8 -S -o fec8.S fec.c
+ 
+ libfec16.so: fec16.o fec16-jinterf.o
+-	$(CC) $(LDFLAGS) -shared fec16-jinterf.o fec16.o -o libfec16.so
++	$(CC) $(LDFLAGS) -shared fec16-jinterf.o fec16.o -o libfec16.so \
++		-Wl,-soname=libfec16.so
+ 
+ fec16-jinterf.o: fec-jinterf.c
+ 	$(CC) $(CFLAGS) -DGF_BITS=16 -c \
diff --git a/dev-java/fec/metadata.xml b/dev-java/fec/metadata.xml
new file mode 100644
index 000000000000..78df3f661631
--- /dev/null
+++ b/dev-java/fec/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">onionnetworks</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/felix-bundlerepository-1.6.6 b/dev-java/felix-bundlerepository-1.6.6
deleted file mode 100644
index d0738917631e..000000000000
--- a/dev-java/felix-bundlerepository-1.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/kxml:2 dev-java/xpp3:0 dev-java/felix-shell:0 dev-java/felix-utils:0 dev-java/osgi-core-api:0 dev-java/osgi-obr:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Felix Bundle Repository
-EAPI=5
-HOMEPAGE=http://felix.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/kxml:2 dev-java/xpp3:0 dev-java/felix-shell:0 dev-java/felix-utils:0 dev-java/osgi-core-api:0 dev-java/osgi-obr:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/felix/org.apache.felix.bundlerepository-1.6.6-source-release.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e6e6a5677159fe94aea78de6b95d5131
diff --git a/dev-java/felix-bundlerepository/Manifest b/dev-java/felix-bundlerepository/Manifest
new file mode 100644
index 000000000000..202ecb362b0b
--- /dev/null
+++ b/dev-java/felix-bundlerepository/Manifest
@@ -0,0 +1,4 @@
+AUX felix-bundlerepository-1.6.6-build.xml 9293 BLAKE2B 601e91d713369c89b0e511b8dc7deaf077f118c4d3b41cecff3cdc0bcff72655bc13cf0c9f6c68c99f5900efa6cc5bbd83d621a362c469a293f8972b6155d16e SHA512 23b17058603ab1ceac2af7b88d83d112406036cde05350f9f2d750705040ba9d885c54904dab8c29ee8ffdc506e46cff7eab80d19145a80e437f96034b745414
+DIST org.apache.felix.bundlerepository-1.6.6-source-release.tar.gz 163337 BLAKE2B 9eb4a568de9ffac0f744675a5a4c5f84563054931204575fc447af5c33a5cda124b305beb82c45a44a9764a3a26dd985aaf91e5066f68d32fb79c4e60c70a42a SHA512 a457dacf0b15a54aad9290a3620b4dee503bb7d06eac1e2e9b151613caafdd53b104e8266b10321d04d0fb400df6f9f2131ed03f48bf166205903aa69f260b46
+EBUILD felix-bundlerepository-1.6.6.ebuild 1140 BLAKE2B 5a228484e9ad8d0b5dfe5f69d310283fe707d3b236ce2460a143f61bbb26eee7edc936c53bac660b94466ef8060078823a917b023f6cebcf51930e495580387d SHA512 1a88cbcbc814194830fc54a9e2cce61feb1db710b7453c101dad520980ef60b42383a1c801d4acd6614e47acfc2ce1053c3a92dcb9ef348a7a87d65b5093b805
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/felix-bundlerepository/felix-bundlerepository-1.6.6.ebuild b/dev-java/felix-bundlerepository/felix-bundlerepository-1.6.6.ebuild
new file mode 100644
index 000000000000..52bc02a0e8d1
--- /dev/null
+++ b/dev-java/felix-bundlerepository/felix-bundlerepository-1.6.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="Felix Bundle Repository"
+HOMEPAGE="http://felix.apache.org/"
+LICENSE="Apache-2.0"
+
+MY_PN="org.apache.felix.bundlerepository"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://apache/felix/${MY_P}-source-release.tar.gz"
+SLOT="0"
+KEYWORDS="amd64"
+
+CDEPEND="
+	dev-java/kxml:2
+	dev-java/xpp3:0
+	dev-java/felix-shell:0
+	dev-java/felix-utils:0
+	dev-java/osgi-core-api:0
+	dev-java/osgi-obr:0
+"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	sed -i 's/bestVersion.compareTo(v)/bestVersion.compareTo((Version) v)/g' \
+		src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java \
+		|| die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="osgi-core-api,felix-utils,felix-shell,xpp3,kxml-2,osgi-obr"
+
+src_install() {
+	mv target/{${MY_P},${PN}}.jar || die
+
+	java-osgi_dojar target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
+}
diff --git a/dev-java/felix-bundlerepository/files/felix-bundlerepository-1.6.6-build.xml b/dev-java/felix-bundlerepository/files/felix-bundlerepository-1.6.6-build.xml
new file mode 100644
index 000000000000..0c7398178af1
--- /dev/null
+++ b/dev-java/felix-bundlerepository/files/felix-bundlerepository-1.6.6-build.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.apache.felix.bundlerepository-from-maven" default="package" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+  <property name="maven.build.finalName" value="org.apache.felix.bundlerepository-1.6.6"/>
+  <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"/>
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.utils/1.1.0/org.apache.felix.utils-1.1.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.osgi.service.obr/1.0.2/org.osgi.service.obr-1.0.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.shell/1.4.1/org.apache.felix.shell-1.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/codehaus/woodstox/woodstox-core-asl/4.0.7/woodstox-core-asl-4.0.7.jar"/>
+    <pathelement location="${maven.repo.local}/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/codehaus/woodstox/stax2-api/3.0.1/stax2-api-3.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.utils/1.1.0/org.apache.felix.utils-1.1.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.osgi.service.obr/1.0.2/org.osgi.service.obr-1.0.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.shell/1.4.1/org.apache.felix.shell-1.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/codehaus/woodstox/woodstox-core-asl/4.0.7/woodstox-core-asl-4.0.7.jar"/>
+    <pathelement location="${maven.repo.local}/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/codehaus/woodstox/stax2-api/3.0.1/stax2-api-3.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </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.3" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <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="changelog.txt"/>
+      </fileset>
+    </copy>
+  </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="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.3" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <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>
+  <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="**/*Test.java"/>
+          <include name="**/*TestCase.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>
+  <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>
+  <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">
+    </jar>
+  </target>
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+</project>
diff --git a/dev-java/felix-bundlerepository/metadata.xml b/dev-java/felix-bundlerepository/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/felix-bundlerepository/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/felix-gogo-command-0.12.0 b/dev-java/felix-gogo-command-0.12.0
deleted file mode 100644
index 9a57b27e492f..000000000000
--- a/dev-java/felix-gogo-command-0.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/felix-bundlerepository:0 dev-java/felix-gogo-runtime:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Felix Gogo Command
-EAPI=5
-HOMEPAGE=http://felix.apache.org/site/apache-felix-gogo.html
-IUSE=elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/felix-bundlerepository:0 dev-java/felix-gogo-runtime:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/felix/org.apache.felix.gogo.command-0.12.0-project.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=59ce56d2f1f662d658fea4a67a010a80
diff --git a/dev-java/felix-gogo-command/Manifest b/dev-java/felix-gogo-command/Manifest
new file mode 100644
index 000000000000..ff1b2012bdf3
--- /dev/null
+++ b/dev-java/felix-gogo-command/Manifest
@@ -0,0 +1,4 @@
+AUX felix-gogo-command-0.12.0-build.xml 14407 BLAKE2B ffcc8e547f6e670bcd510e2da8cf036b50400cef62a9527d4e93c27de53871dd4a2ffeddfffca8560822735e8c8a5c4871bd40bfe80e1f0204b96bdfbb81610a SHA512 c99fd734167c6481b0228c3f58d14602f74bd0837fd12f4596314c0a4655b6ec75f15a889fff4872f825eeb447f63aa88ddf678ca1a6276d831f15f8e655204d
+DIST org.apache.felix.gogo.command-0.12.0-project.tar.gz 26454 BLAKE2B 0a0ed6b1ce7e66e90a32c71aa3786d290c907c68124a4056078907d1fe7d85546327d9540c68ee0bf3b90e28ef06fcd286e290d86799b6675fd642fbba30ad9e SHA512 8d7afa4b34be6460df9e1e91ecc42b34ecfc1888f5574add206a3c6fbc54647672e34d4f3a4e59eb39f8b2b9fd94b468647c0e95d5fc04649ab7a283e172a061
+EBUILD felix-gogo-command-0.12.0.ebuild 994 BLAKE2B 580a08305b3a53229e10f4a95f0fd6bcdd060d60133f22a057d6a62deb3486cafe4951a19a00e449ed7b011b716cc74683f4bd6e1639a4019e123ab3d43d04ca SHA512 a7c1453ba38dd8cabaa0b3a6da5a9aa46c5d969b6220046630abf5e9974904481566c86650f73610e2962fd9ed8c81e3413d3dfc3ccc78b56ddd819ffe8dc9a6
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild b/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild
new file mode 100644
index 000000000000..b2f275c09e15
--- /dev/null
+++ b/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="Felix Gogo Command"
+HOMEPAGE="http://felix.apache.org/site/apache-felix-gogo.html"
+LICENSE="Apache-2.0"
+
+MY_PN="org.apache.felix.gogo.command"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://apache/felix/${MY_P}-project.tar.gz"
+SLOT="0"
+KEYWORDS="amd64"
+
+CDEPEND="
+	dev-java/felix-bundlerepository:0
+	dev-java/felix-gogo-runtime:0
+	dev-java/osgi-compendium:0
+	dev-java/osgi-core-api:0
+"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="osgi-core-api,osgi-compendium,felix-gogo-runtime,felix-bundlerepository"
+
+src_install() {
+	mv target/{${MY_P},${PN}}.jar || die
+
+	java-osgi_dojar target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
+}
diff --git a/dev-java/felix-gogo-command/files/felix-gogo-command-0.12.0-build.xml b/dev-java/felix-gogo-command/files/felix-gogo-command-0.12.0-build.xml
new file mode 100644
index 000000000000..b31bcdccdc01
--- /dev/null
+++ b/dev-java/felix-gogo-command/files/felix-gogo-command-0.12.0-build.xml
@@ -0,0 +1,276 @@
+<?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/10/13 7:05 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="org.apache.felix.gogo.command-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="org.apache.felix.gogo.command-0.12.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.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="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.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>
+    <mkdir dir="${maven.build.outputDir}/META-INF"/>
+    <copy todir="${maven.build.outputDir}/META-INF">
+      <fileset dir="${maven.build.resourceDir.1}">
+        <include name="LICENSE*"/>
+        <include name="NOTICE*"/>
+      </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}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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"/>
+  </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/osgi/org.osgi.core/4.3.0"/>
+    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
+    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0"/>
+    <get src="http://repository.apache.org/snapshots/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar" 
+         dest="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar" 
+         dest="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0"/>
+    <get src="http://repository.apache.org/snapshots/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar" 
+         dest="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar" 
+         dest="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.0"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/4.0/junit-4.0.jar" 
+         dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.0/junit-4.0.jar" 
+         dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
+    <get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
+    <get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/felix-gogo-command/metadata.xml b/dev-java/felix-gogo-command/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/felix-gogo-command/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/felix-gogo-runtime-0.10.0 b/dev-java/felix-gogo-runtime-0.10.0
deleted file mode 100644
index 25e8839280fe..000000000000
--- a/dev-java/felix-gogo-runtime-0.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Felix Gogo Runtime
-EAPI=5
-HOMEPAGE=http://felix.apache.org/site/apache-felix-gogo.html
-IUSE=elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/felix/org.apache.felix.gogo.runtime-0.10.0-project.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0db63394cba36f2e7d816544d67b98cf
diff --git a/dev-java/felix-gogo-runtime/Manifest b/dev-java/felix-gogo-runtime/Manifest
new file mode 100644
index 000000000000..7da1c7a321ec
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/Manifest
@@ -0,0 +1,5 @@
+AUX felix-gogo-runtime-0.10.0-build.xml 13681 BLAKE2B 00e73e0f0d429ee6bdff5c9d18c4a6cc277fa7d766de6c0c7cdbe24533fc587aad6afe3ac94aabacf6b1ae0985bc4606901d38bd6b08eeb26fa62f93d08bd03c SHA512 8faf5c3474adfb26aeb4f1cf1edb67c68ac8e8dddad2740cb3e9fe92ab72f374b97a4f4b18f4eac8aaffbbf4cf0e626baec82e417a95135fca2a0df7f0ac8ecd
+AUX felix-gogo-runtime-0.10.0-event-properties-to-map.patch 1072 BLAKE2B 526ee7ecc501589b08d194d5c10e766780cefadb58d8078ef9d854eb2238caabc1b18f6e9af1833f26f81c5969b491f7f35351971df7e15804bfab60f5ba0150 SHA512 b34bdb55d733cde8ccef446632fae9b6cc7022b72e8ff79b023fe713f2bc31a60f839af223bfc517e0cf4d290ee7b239c70cd009a17b9ed8c48b866e56534a66
+DIST org.apache.felix.gogo.runtime-0.10.0-project.tar.gz 69837 BLAKE2B 3ffd6cc308b3125ee8cd467945ca58a9fcf3125d32b23f68065fa7a9266210d186ebf3aba354f64a9d2c38a176ac7a5767e4349707a56dcbd77831eb24df928c SHA512 a71100796e400103cf9d46fcdb7bf45b5d1d180328db27900915c1771650297c9135589dc91e4c2194634b4312ea7c064b71496a7e11e9a3393bdc6eeb70e03d
+EBUILD felix-gogo-runtime-0.10.0.ebuild 1038 BLAKE2B e49ee0a5d05835f4e17d22240817186d47aa35938f92996cd03b5985589f1514fa1b8277176e91df93877bed7dad579b343615578238c78fab89d69d81bbf43d SHA512 f505d46386cebc725779c63745db4f2be6d806e891dd063f72f7434fe83c7efca0209c98e188ea48571751518326fabaa149a4640f1ee9fd29d7404fa39642ab
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild b/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild
new file mode 100644
index 000000000000..f6a9d2f071d3
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="Felix Gogo Runtime"
+HOMEPAGE="http://felix.apache.org/site/apache-felix-gogo.html"
+LICENSE="Apache-2.0"
+
+MY_PN="org.apache.felix.gogo.runtime"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://apache/felix/${MY_P}-project.tar.gz"
+SLOT="0"
+KEYWORDS="amd64"
+
+DEPEND=">=virtual/jdk-1.6
+	dev-java/osgi-compendium:0
+	dev-java/osgi-core-api:0"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	epatch "${FILESDIR}"/${P}-event-properties-to-map.patch
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_compile() {
+	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar)"
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-osgi_newjar "${S}"/target/${MY_P}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
+}
diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml
new file mode 100644
index 000000000000..4bcd4c42ad62
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml
@@ -0,0 +1,294 @@
+<?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/13/13 1:33 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="org.apache.felix.gogo.runtime-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="org.apache.felix.gogo.runtime-0.10.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.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="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.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>
+    <mkdir dir="${maven.build.outputDir}/META-INF"/>
+    <copy todir="${maven.build.outputDir}/META-INF">
+      <fileset dir="${maven.build.resourceDir.1}">
+        <include name="LICENSE*"/>
+        <include name="NOTICE*"/>
+      </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}" 
+           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>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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"/>
+  </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/osgi/org.osgi.core/4.0.0"/>
+    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
+    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.5"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/4.5/junit-4.5.jar" 
+         dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.5/junit-4.5.jar" 
+         dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
+    <get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
+    <get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch
new file mode 100644
index 000000000000..ae2e67cf3abe
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch
@@ -0,0 +1,22 @@
+--- src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java	2013-05-13 13:40:57.071766332 +0200
++++ src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java.2	2013-05-13 13:41:30.725096685 +0200
+@@ -18,7 +18,7 @@
+  */
+ package org.apache.felix.gogo.runtime.activator;
+ 
+-import java.util.Properties;
++import java.util.HashMap;
+ 
+ import org.apache.felix.gogo.api.CommandSessionListener;
+ import org.apache.felix.service.command.CommandSession;
+@@ -43,8 +43,8 @@
+     public void beforeExecute(CommandSession session, CharSequence command) {
+         EventAdmin admin = (EventAdmin) tracker.getService();
+         if (admin != null) {
+-            Properties props = new Properties();
+-            props.setProperty("command", command.toString());
++            HashMap<String, String> props = new HashMap<String, String>();
++            props.put(new String("command"), command.toString());
+             Event event = new Event("org/apache/felix/service/command/EXECUTING", props);
+             admin.postEvent(event);
+         }
diff --git a/dev-java/felix-gogo-runtime/metadata.xml b/dev-java/felix-gogo-runtime/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/felix-shell-1.4.3 b/dev-java/felix-shell-1.4.3
deleted file mode 100644
index c79e28b45057..000000000000
--- a/dev-java/felix-shell-1.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/felix-gogo-runtime:0 dev-java/felix-utils:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Felix Shell
-EAPI=5
-HOMEPAGE=http://felix.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/felix/org.apache.felix.shell-1.4.3-source-release.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=726de66509aa89f3d51e22cd03826d1b
diff --git a/dev-java/felix-shell/Manifest b/dev-java/felix-shell/Manifest
new file mode 100644
index 000000000000..7bc6e7e0dc91
--- /dev/null
+++ b/dev-java/felix-shell/Manifest
@@ -0,0 +1,4 @@
+AUX felix-shell-1.4.3-build.xml 13813 BLAKE2B 02e67a5a77e62124d299356f718347d4d246732f5b85b87a6e3095dab333536639e770bc1828b00b6767e107cef2dca6cfcf296e9136d1078e3346c094bb8ea8 SHA512 324f9a3d1de17756eeff2ed520e3e4639ed371785b3cf422387b75d4dd6790e893d6467308c44b5157a56577a6714c271c6168a9737d7326600f3944fcd4d6be
+DIST org.apache.felix.shell-1.4.3-source-release.tar.gz 75190 BLAKE2B 338658ec6b490bfca2ce6d15089810f8db421ea89a5931201d3ae8de71e7181dead6b811f4ffcf4b876f92362e375715b34dd73e982969a022eae5248a64e562 SHA512 fe1b3927789a18626715e52a634fa069fdd1505f425a48d76ec6abbb181f511ff5a3af176c70f634241830b185d32cd7eb71a271d62a754366141cd959cb54a4
+EBUILD felix-shell-1.4.3.ebuild 1178 BLAKE2B 49cdb2fb88de93e5d96839d65abd16420672f66a5a8181ac13166bfaf41c2d9dced543b245177068323a7369b9f60773d8286f2b08ed54f14da6a0429215a29a SHA512 df389381783d8702f67783b2a1e7c5f9e7a38f540c8377bcc9fecb97b829d78ff864b320b3239352a0472aae711563a468b3cd96779faaf18c8f869713d6e166
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/felix-shell/felix-shell-1.4.3.ebuild b/dev-java/felix-shell/felix-shell-1.4.3.ebuild
new file mode 100644
index 000000000000..2b1ce8e60499
--- /dev/null
+++ b/dev-java/felix-shell/felix-shell-1.4.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="Felix Shell"
+HOMEPAGE="http://felix.apache.org/"
+LICENSE="Apache-2.0"
+
+MY_PN="org.apache.felix.shell"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://apache/felix/${MY_P}-source-release.tar.gz"
+SLOT="0"
+KEYWORDS="amd64"
+
+DEPEND=">=virtual/jdk-1.6
+	dev-java/felix-gogo-runtime:0
+	dev-java/felix-utils:0
+	dev-java/osgi-compendium:0
+	dev-java/osgi-core-api:0"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_compile() {
+	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar):$(java-pkg_getjar --build-only felix-gogo-runtime felix-gogo-runtime.jar):$(java-pkg_getjar --build-only felix-utils felix-utils.jar)"
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	mv "${S}"/target/{${MY_P},${PN}}.jar || die
+
+	java-osgi_dojar "${S}"/target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
+}
diff --git a/dev-java/felix-shell/files/felix-shell-1.4.3-build.xml b/dev-java/felix-shell/files/felix-shell-1.4.3-build.xml
new file mode 100644
index 000000000000..6bab51781bd1
--- /dev/null
+++ b/dev-java/felix-shell/files/felix-shell-1.4.3-build.xml
@@ -0,0 +1,299 @@
+<?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/13/13 2:41 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="org.apache.felix.shell-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="org.apache.felix.shell-1.4.3"/>
+  <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="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.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}" 
+           encoding="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.3" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <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="changelog.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="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.3" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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">
+    </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/osgi/org.osgi.core/4.1.0"/>
+    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
+    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.0"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/4.0/junit-4.0.jar" 
+         dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.0/junit-4.0.jar" 
+         dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
+    <get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
+    <get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/felix-shell/metadata.xml b/dev-java/felix-shell/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/felix-shell/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/felix-utils-1.2.0 b/dev-java/felix-utils-1.2.0
deleted file mode 100644
index e054e98a742d..000000000000
--- a/dev-java/felix-utils-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/felix-gogo-runtime:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Felix Utils
-EAPI=5
-HOMEPAGE=http://felix.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/felix/org.apache.felix.utils-1.2.0-source-release.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c36d676cf72362ef24e36af5eac67811
diff --git a/dev-java/felix-utils/Manifest b/dev-java/felix-utils/Manifest
new file mode 100644
index 000000000000..ae391c7d12db
--- /dev/null
+++ b/dev-java/felix-utils/Manifest
@@ -0,0 +1,5 @@
+AUX felix-utils-1.2.0-build.xml 13825 BLAKE2B 2a3e33af5ecc743605ea5b23bc28c64a235c1d7bc090a321731eda1c4c61b1430ba21fabeb6124220998f9412330b3897dd673e902bc513a9ef79e4befff227c SHA512 0494ca015f38daf3b96758adaba1de71ec82b7ba811507e8b7acf33ff887484481251d6868d98c0b70535f1a5874941d457bf43fb3f8139d698ce3f5ce4ed1da
+AUX felix-utils-1.2.0-java-fixes.patch 1673 BLAKE2B 74f07e3238cc36f1982fed225cde1e9ea26419cd5e0f20ab357857ffa5580b8aa30eee4e945b52723ec54505bfe7d32c02a8c507ec6ab4d2518f3073e2e961cc SHA512 7256b8b9979536d1bc587726f3f4f71d56ec0ed3ba9cbc1229eea2c4d2c0883636bfa4498a59a076b9a06cd21b9fbb2f1ef293425454d3cb3dcb62d9d103cd33
+DIST org.apache.felix.utils-1.2.0-source-release.tar.gz 36109 BLAKE2B 5c7032986ce2e859236fcf9c9d4eefeb03c7bd8bad579c6e37423434f9095f8817d980cb5ddaaa2056632fe4ce9469f2fd955233fdbac7d48cd0fe0502b04904 SHA512 4b3a16abc92963c16c363791423483c14eb02792cc65d58a884777c6be25b05a226492280cf2f77183ad5b86cb5710076a118a58af34f6c717273bfdf93bc171
+EBUILD felix-utils-1.2.0.ebuild 1139 BLAKE2B fd9a0395b6c3235360303cc28ca487cac9a151e0b853e851e5c6be40b959a1320f7268fcb7bc58bd059d7baa22c7510cfc6707d3162b304591e2974c783e0470 SHA512 506c46a344dd788740f5d70927c3c5e97bd76ae52a4df47265277c2f40c7df287dc9fb91cbbc48f72a282bb6cdaee9e9f597904f94c25dbfb7b3086cef95ea63
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/felix-utils/felix-utils-1.2.0.ebuild b/dev-java/felix-utils/felix-utils-1.2.0.ebuild
new file mode 100644
index 000000000000..67872db2be2c
--- /dev/null
+++ b/dev-java/felix-utils/felix-utils-1.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="Felix Utils"
+HOMEPAGE="http://felix.apache.org/"
+LICENSE="Apache-2.0"
+
+MY_PN="org.apache.felix.utils"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://apache/felix/${MY_P}-source-release.tar.gz"
+SLOT="0"
+KEYWORDS="amd64"
+
+DEPEND=">=virtual/jdk-1.6
+	dev-java/felix-gogo-runtime:0
+	dev-java/osgi-compendium:0
+	dev-java/osgi-core-api:0"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	epatch "${FILESDIR}"/${P}-java-fixes.patch
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_compile() {
+	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar):$(java-pkg_getjar --build-only felix-gogo-runtime felix-gogo-runtime.jar)"
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	mv "${S}"/target/{${MY_P},${PN}}.jar || die
+
+	java-osgi_dojar "${S}"/target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
+}
diff --git a/dev-java/felix-utils/files/felix-utils-1.2.0-build.xml b/dev-java/felix-utils/files/felix-utils-1.2.0-build.xml
new file mode 100644
index 000000000000..cfe95ef2c6cf
--- /dev/null
+++ b/dev-java/felix-utils/files/felix-utils-1.2.0-build.xml
@@ -0,0 +1,299 @@
+<?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/13/13 2:09 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="org.apache.felix.utils-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="org.apache.felix.utils-1.2.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.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="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.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}" 
+           encoding="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="jsr14" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <mkdir dir="${maven.build.outputDir}/META-INF"/>
+    <copy todir="${maven.build.outputDir}/META-INF">
+      <fileset dir="${maven.build.resourceDir.1}">
+        <include name="changelog.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="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="jsr14" 
+           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="**/*Test.java"/>
+          <include name="**/*TestCase.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">
+    </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/osgi/org.osgi.core/4.1.0"/>
+    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0"/>
+    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar" 
+         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.0"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/4.0/junit-4.0.jar" 
+         dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.0/junit-4.0.jar" 
+         dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
+    <get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
+    <get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch b/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch
new file mode 100644
index 000000000000..a973ca56a862
--- /dev/null
+++ b/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch
@@ -0,0 +1,47 @@
+--- a/src/main/java/org/apache/felix/utils/filter/FilterImpl.java	2012-06-12 08:56:50.000000000 +0200
++++ b/src/main/java/org/apache/felix/utils/filter/FilterImpl.java	2013-05-13 14:25:58.601527069 +0200
+@@ -25,6 +25,7 @@
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+ import java.util.*;
++import java.util.Map.Entry;
+ 
+ import org.apache.felix.utils.version.VersionTable;
+ import org.osgi.framework.Filter;
+@@ -111,6 +111,19 @@
+         converted = conv;
+     }
+ 
++    @Override
++    public boolean matches(Map<String, ?> map)
++    {
++        Map nonGenericMap = new HashMap();
++
++        for(Entry<String, ?> entry : map.entrySet())
++        {
++            nonGenericMap.put(entry.getKey(), entry.getValue());
++        }
++
++        return match0(nonGenericMap);
++    }
++
+ 
+     /**
+      * Filter using a service's properties.
+@@ -575,13 +587,13 @@
+                 switch (operation) {
+                     case APPROX :
+                     case EQUAL : {
+-                        return ((Version) value1).compareTo(converted) == 0;
++                        return ((Version) value1).compareTo((Version) converted) == 0;
+                     }
+                     case GREATER: {
+-                        return ((Version) value1).compareTo(converted) >= 0;
++                        return ((Version) value1).compareTo((Version) converted) >= 0;
+                     }
+                     case LESS: {
+-                        return ((Version) value1).compareTo(converted) <= 0;
++                        return ((Version) value1).compareTo((Version) converted) <= 0;
+                     }
+                 }
+             } else {
diff --git a/dev-java/felix-utils/metadata.xml b/dev-java/felix-utils/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/felix-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/flyingsaucer-7-r2 b/dev-java/flyingsaucer-7-r2
deleted file mode 100644
index 9b55ec4272e5..000000000000
--- a/dev-java/flyingsaucer-7-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=svg? ( >=virtual/jdk-1.5 ) !svg? ( >=virtual/jdk-1.4 ) app-arch/unzip >=dev-java/itext-2.0.8:0 svg? ( dev-java/svgsalamander:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=100% Java XHTML+CSS renderer
-EAPI=5
-HOMEPAGE=https://xhtmlrenderer.dev.java.net/
-IUSE=minimal svg doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=svg? ( >=virtual/jre-1.5 ) !svg? ( >=virtual/jre-1.4 ) >=dev-java/itext-2.0.8:0 svg? ( dev-java/svgsalamander:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.pdoubleya.com/projects/flyingsaucer/downloads/r7/flyingsaucer-R7final-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=848175e7cc71ff8bd838c2148e699e8c
diff --git a/dev-java/flyingsaucer/Manifest b/dev-java/flyingsaucer/Manifest
new file mode 100644
index 000000000000..3889a0825711
--- /dev/null
+++ b/dev-java/flyingsaucer/Manifest
@@ -0,0 +1,4 @@
+AUX 7-itext-2.0.8.patch 3109 BLAKE2B 721293a5adf776ae0a7be6396b758c174fafa22f3d87fd64bf8b5be3188806f076ddb6fd9164bd0db3cf2c1d145485c511949223025f789766dd8a3bf875440b SHA512 8ee0d072224a24861d8e28caced9224c0390271589b1e07ae88cc4cf4a8fe97f799142140cecd28eab2c641feb0d4d84b18a89674d512069a746561e5ff0ac0f
+DIST flyingsaucer-R7final-src.zip 7058444 BLAKE2B 30c9b13cc376a5ef3c215908cc09a77a00f8d7c3d4217b46591e112dc1803ff3497ce30e1747bf8c97c691162a41276d581138797f862a29243080e8ece9d3f8 SHA512 14c26a10f3493f3b9fc1fe5d3d11591cf4c09d781d1d2cccf5de15d4b5a0108f8780e168c32968338b82c7929cb083cc47aab539c53d140860505ff0e05f9135
+EBUILD flyingsaucer-7-r2.ebuild 1658 BLAKE2B e6632ebeaac32f66c08b12b3cd5e51703a043331783b616d52d7dc4bf497e111358536726220318f2bc1f3f0de73788015bb36c2e7669584ef41e69c546f42b8 SHA512 7db361e7e3da813782c68359d2a16d97718da74202ac30226273e82940246e9608e40a5f5d73735efc2b326fe623633e2df93e1f1b52656bd35d13d864a108e6
+MISC metadata.xml 436 BLAKE2B e403d5f0c18732526da288f0924debc454ef34d4e8164c531fcae4d9f7228962408e4f924b74782e8f36a80e8b1c835c1b6b5971aad448d0645a8b4db710b8f5 SHA512 32df0b15ff43741e3ba4c1af628c46084baed7cfe0d69dc2fb392b60d9e16cb871c2b366d97857dd5f3eb9cbeaa966f0610e6c9f73e3f5ffdc533d71f9c5e842
diff --git a/dev-java/flyingsaucer/files/7-itext-2.0.8.patch b/dev-java/flyingsaucer/files/7-itext-2.0.8.patch
new file mode 100644
index 000000000000..33b4ea37b994
--- /dev/null
+++ b/dev-java/flyingsaucer/files/7-itext-2.0.8.patch
@@ -0,0 +1,61 @@
+diff -u -r src.old/java/org/xhtmlrenderer/pdf/ITextFSImage.java src/java/org/xhtmlrenderer/pdf/ITextFSImage.java
+--- src.old/java/org/xhtmlrenderer/pdf/ITextFSImage.java	2008-10-23 19:46:53.000000000 +0300
++++ src/java/org/xhtmlrenderer/pdf/ITextFSImage.java	2008-10-23 19:48:05.000000000 +0300
+@@ -31,11 +31,11 @@
+     }
+ 
+     public int getWidth() {
+-        return (int)_image.plainWidth();
++        return (int)_image.getPlainWidth();
+     }
+ 
+     public int getHeight() {
+-        return (int)_image.plainHeight();
++        return (int)_image.getPlainHeight();
+     }
+ 
+     public void scale(int width, int height) {
+diff -u -r src.old/java/org/xhtmlrenderer/pdf/ITextRenderer.java src/java/org/xhtmlrenderer/pdf/ITextRenderer.java
+--- src.old/java/org/xhtmlrenderer/pdf/ITextRenderer.java	2008-10-23 19:46:53.000000000 +0300
++++ src/java/org/xhtmlrenderer/pdf/ITextRenderer.java	2008-10-23 19:48:56.000000000 +0300
+@@ -234,7 +234,7 @@
+         
+         _outputDevice.start(_doc);
+         _outputDevice.setWriter(writer);
+-        _outputDevice.initializePage(writer.getDirectContent(), firstPageSize.height());
++        _outputDevice.initializePage(writer.getDirectContent(), firstPageSize.getHeight());
+         
+         _root.getLayer().assignPagePaintingPositions(c, Layer.PAGED_MODE_PRINT);
+         
+@@ -254,7 +254,7 @@
+                 doc.setPageSize(nextPageSize);
+                 doc.newPage();
+                 _outputDevice.initializePage(
+-                        writer.getDirectContent(), nextPageSize.height());
++                        writer.getDirectContent(), nextPageSize.getHeight());
+             }
+         }
+         
+diff -u -r src.old/java/org/xhtmlrenderer/pdf/ITextUserAgent.java src/java/org/xhtmlrenderer/pdf/ITextUserAgent.java
+--- src.old/java/org/xhtmlrenderer/pdf/ITextUserAgent.java	2008-10-23 19:46:53.000000000 +0300
++++ src/java/org/xhtmlrenderer/pdf/ITextUserAgent.java	2008-10-23 19:50:00.000000000 +0300
+@@ -60,8 +60,8 @@
+                         PdfReader reader = _outputDevice.getReader(url);
+                         PDFAsImage image = new PDFAsImage(url);
+                         Rectangle rect = reader.getPageSizeWithRotation(1);
+-                        image.setInitialWidth(rect.width()*_outputDevice.getDotsPerPoint());
+-                        image.setInitialHeight(rect.height()*_outputDevice.getDotsPerPoint());
++                        image.setInitialWidth(rect.getWidth()*_outputDevice.getDotsPerPoint());
++                        image.setInitialHeight(rect.getHeight()*_outputDevice.getDotsPerPoint());
+                         resource = new ImageResource(image);
+                     } else {
+ 	                    Image image = Image.getInstance(url);
+@@ -84,7 +84,7 @@
+     
+     private void scaleToOutputResolution(Image image) {
+         float factor = _sharedContext.getDotsPerPixel();
+-        image.scaleAbsolute(image.plainWidth() * factor, image.plainHeight() * factor);
++        image.scaleAbsolute(image.getPlainWidth() * factor, image.getPlainHeight() * factor);
+     }
+ 
+     public SharedContext getSharedContext() {
diff --git a/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild b/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
new file mode 100644
index 000000000000..f12bb7a33986
--- /dev/null
+++ b/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="100% Java XHTML+CSS renderer"
+HOMEPAGE="https://xhtmlrenderer.dev.java.net/"
+SRC_URI="http://www.pdoubleya.com/projects/${PN}/downloads/r${PV}/${PN}-R${PV}final-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="minimal svg ${JAVA_PKG_IUSE}"
+
+COMMON_DEP="
+	>=dev-java/itext-2.0.8:0
+	svg? ( dev-java/svgsalamander:0 )"
+
+# 1.5 because svgsalamander is 1.5
+RDEPEND="
+	svg? ( >=virtual/jre-1.5 )
+	!svg? ( >=virtual/jre-1.4 )
+	${COMMON_DEP}"
+
+DEPEND="
+	svg? ( >=virtual/jdk-1.5 )
+	!svg? ( >=virtual/jdk-1.4 )
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/7-itext-2.0.8.patch
+
+	# Save lib/minium.jar because it's not publicly available although it's in
+	# public domain, will separate if something else needs it
+	rm -v lib/itext*.jar lib/dev/*.jar lib/dev/*/*.jar || die
+
+	cd lib || die
+	java-pkg_jar-from itext
+
+	if use svg; then
+		java-pkg_jar-from svgsalamander
+		EANT_BUILD_TARGET+=" jar.svg"
+	fi
+
+	use minimal || EANT_BUILD_TARGET=" jar.docbook jar.about jar.browser"
+}
+
+# Investigate building demos/photogallery demos/filebrowser because
+# the files seem to be missing for jar.photogaller jar.filebrowser
+EANT_BUILD_TARGET="jar.core"
+EANT_DOC_TARGET="docs"
+
+RESTRICT="test"
+
+# Needs X11.
+src_test() {
+	eant test -Djava.awt.headless=true
+}
+
+src_install() {
+	java-pkg_dojar build/*.jar lib/minium.jar
+
+	dodoc README || die
+
+	use doc && java-pkg_dojavadoc doc/user/api
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/flyingsaucer/metadata.xml b/dev-java/flyingsaucer/metadata.xml
new file mode 100644
index 000000000000..41a479ba55e2
--- /dev/null
+++ b/dev-java/flyingsaucer/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+
+	<longdescription lang="en">
+		Flying Saucer is a 100% Java XHTML+CSS renderer, including support
+		for table pagination, margin boxes, running elements, named pages,
+		and more.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/fontbox-1.7.1-r1 b/dev-java/fontbox-1.7.1-r1
deleted file mode 100644
index 5da27f3f578d..000000000000
--- a/dev-java/fontbox-1.7.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An open source Java library for parsing font files
-EAPI=6
-HOMEPAGE=https://pdfbox.apache.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.7
-SRC_URI=https://archive.apache.org/dist/pdfbox/1.7.1/pdfbox-1.7.1-src.zip -> fontbox-1.7.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a8b7ac03bdb4d6da39957d4676484953
diff --git a/dev-java/fontbox-1.8.11 b/dev-java/fontbox-1.8.11
deleted file mode 100644
index 9b583d88da54..000000000000
--- a/dev-java/fontbox-1.8.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=dev-java/commons-logging-1.1.1:0 >=virtual/jdk-1.6 app-arch/unzip test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=An open source Java library for parsing font files
-EAPI=5
-HOMEPAGE=https://pdfbox.apache.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/commons-logging-1.1.1:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.8
-SRC_URI=mirror://apache/pdfbox/1.8.11/pdfbox-1.8.11-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c4801fb80e5766d9c5c40970e4a9a9b4
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
new file mode 100644
index 000000000000..3e07f700f48d
--- /dev/null
+++ b/dev-java/fontbox/Manifest
@@ -0,0 +1,6 @@
+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-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-build.xml b/dev-java/fontbox/files/fontbox-1.7.1-build.xml
new file mode 100644
index 000000000000..ccde1983d680
--- /dev/null
+++ b/dev-java/fontbox/files/fontbox-1.7.1-build.xml
@@ -0,0 +1,250 @@
+<?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 8/2/12 1:39 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="fontbox-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="fontbox-1.7.1"/>
+  <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"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.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>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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" 
+             source="1.5" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
+    </javadoc>
+  </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">
+    </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}/junit/junit/4.8.1"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/4.8.1/junit-4.8.1.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.1/junit-4.8.1.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/fontbox/fontbox-1.7.1-r1.ebuild b/dev-java/fontbox/fontbox-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..d2cd213f9ef4
--- /dev/null
+++ b/dev-java/fontbox/fontbox-1.7.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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="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"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+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
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/fontbox/fontbox-1.8.11.ebuild b/dev-java/fontbox/fontbox-1.8.11.ebuild
new file mode 100644
index 000000000000..182cd4100ed7
--- /dev/null
+++ b/dev-java/fontbox/fontbox-1.8.11.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="pdfbox"
+MY_P="${MY_PN}-${PV}"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An open source Java library for parsing font files"
+HOMEPAGE="https://pdfbox.apache.org/"
+SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_P}-src.zip"
+LICENSE="Apache-2.0"
+SLOT="1.8"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-java/commons-logging-1.1.1:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="commons-logging"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.txt
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find ${DIR} -name "*Test.java")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/fontbox/metadata.xml b/dev-java/fontbox/metadata.xml
new file mode 100644
index 000000000000..86f1da025abd
--- /dev/null
+++ b/dev-java/fontbox/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		FontBox is a Java font library used to obtain low level information
+		from font files.
+	</longdescription>
+	<longdescription lang="fi">
+		FontBox on Java-kirjasto alhaisen tason tiedon noutamiseen fontti-
+		tiedostoista.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">apache/pdfbox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/fop-2.0-r3 b/dev-java/fop-2.0-r3
deleted file mode 100644
index 4c7334d902c5..000000000000
--- a/dev-java/fop-2.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/batik:1.9 dev-java/ant-core:0 dev-java/fontbox:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/avalon-framework:4.2 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Formatting Objects Processor is a print formatter driven by XSL
-EAPI=5
-HOMEPAGE=https://xmlgraphics.apache.org/fop/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/batik:1.9 dev-java/ant-core:0 dev-java/fontbox:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/avalon-framework:4.2 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.0-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2d8c5d4af67dab37645f415b73285bfe
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
new file mode 100644
index 000000000000..9356ec9e0115
--- /dev/null
+++ b/dev-java/fop/Manifest
@@ -0,0 +1,4 @@
+AUX headless-launcher.bash 67 BLAKE2B 29ea0750d057e9a914ce26a14f1d6d1c4d49967aa553d6f55b115df0ebf1b77d693e01a7a06dbe92de4a589ff5847b176ccb820c23acde06b336e302a763d089 SHA512 d3a6635105ea62a62f1ff690a457bfbdebe3d15f8fd220f5508a4ec20b8a5c46e66bf9189562661d5053c6ac31a6998d1f4a117e0ac6087b336a0475635d7d3a
+DIST fop-2.0-src.zip 26381859 BLAKE2B 8500de6a23e93c14fdb4f27c59bafba27a64e6aaffb7a761f16de5bd523e2fdb83593ab53a66de79bf7b7d6c2b887ab97a34accb18be416b26448753babe2395 SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a
+EBUILD fop-2.0-r3.ebuild 3071 BLAKE2B 0eac2ff75d934a9e8fde6c4e93fdfbe83dd73107418b94f829e7d6d8aadb3979f82c042d66fb678105d6a58c020e241684ead0858ac790ea2d0b6ad869ae081d SHA512 2c8379748ea5a75274037011089863951d3fbe23d95ac37d22c784f5432774d3f7addb877f21aeafeb73cce21e0a0b5720a82761033c0a69230ba7faf1046e98
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/fop/files/headless-launcher.bash b/dev-java/fop/files/headless-launcher.bash
new file mode 100644
index 000000000000..a01c56f5e6ef
--- /dev/null
+++ b/dev-java/fop/files/headless-launcher.bash
@@ -0,0 +1 @@
+[[ "${!#}" = "-awt" ]] || gjl_java_args="-Djava.awt.headless=true"
diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
new file mode 100644
index 000000000000..308735bc50b0
--- /dev/null
+++ b/dev-java/fop/fop-2.0-r3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
+#       be built as it needs forrest which we do not have
+# TODO: package and use optional dependency jeuclid
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/"
+SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# Tests are broken even in 2.0
+RESTRICT="test"
+
+CDEPEND="
+	dev-java/batik:1.9
+	dev-java/ant-core:0
+	dev-java/fontbox:1.7
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+	java-virtuals/servlet-api:3.0
+	dev-java/avalon-framework:4.2
+	dev-java/xmlgraphics-commons:2
+	dev-java/xml-commons-external:1.3
+	dev-java/qdox:1.12"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+#	test? (
+#		dev-java/ant-junit:0
+#		dev-java/junit:4
+#		dev-java/xmlunit:1
+#		dev-java/mockito:0
+#	)"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+	ant-core
+	batik-1.9
+	fontbox-1.7
+	commons-io-1
+	commons-logging
+	servlet-api-3.0
+	avalon-framework-4.2
+	xmlgraphics-commons-2
+	xml-commons-external-1.3
+"
+
+TARGETS=(
+	resourcegen
+	jar-hyphenation
+	jar-sandbox
+	jar-main
+)
+
+java_prepare() {
+	find "${S}"/lib -type f | xargs rm -v
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=554386
+	# http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
+	java-pkg_jar-from --into lib qdox-1.12 qdox.jar
+	java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar
+	java-pkg_jar-from --into lib commons-logging commons-logging.jar
+	java-pkg_jar-from --into lib commons-io-1 commons-io.jar
+	java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
+	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
+	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
+	java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
+	java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
+
+	for target in ${TARGETS[@]}; do
+		EANT_BUILD_TARGET="${target}" \
+			java-pkg-2_src_compile
+	done
+
+	if use doc; then
+		sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;' ./build.xml
+		EANT_BUILD_TARGET="javadocs" \
+			java-pkg-2_src_compile
+	fi
+}
+
+src_install() {
+	java-pkg_dojar \
+		build/${PN}.jar \
+		build/${PN}-sandbox.jar \
+		build/${PN}-hyph.jar
+
+	java-pkg_dolauncher \
+		${PN} --main org.apache.fop.cli.Main \
+		-pre "${FILESDIR}/headless-launcher.bash"
+
+	dodoc NOTICE README
+
+	if use doc; then
+		java-pkg_dojavadoc \
+			build/javadocs
+	fi
+
+	if use examples; then
+		java-pkg_doexamples \
+			examples/* conf
+	fi
+
+	if use source; then
+		java-pkg_dosrc \
+			src/java/org \
+			src/sandbox/org
+	fi
+}
diff --git a/dev-java/fop/metadata.xml b/dev-java/fop/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/fop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/forehead-1.0_beta5-r2 b/dev-java/forehead-1.0_beta5-r2
deleted file mode 100644
index 01167b584669..000000000000
--- a/dev-java/forehead-1.0_beta5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A framework to assist in controlling the run-time ClassLoader
-EAPI=5
-HOMEPAGE=http://forehead.werken.com
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Werken-1.1.1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/forehead-1.0_beta5.tbz2 -> forehead-1.0_beta5.tbz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d136f356ba290b7088af864e20f9ec40
diff --git a/dev-java/forehead/Manifest b/dev-java/forehead/Manifest
new file mode 100644
index 000000000000..e6f10ddfb0ae
--- /dev/null
+++ b/dev-java/forehead/Manifest
@@ -0,0 +1,3 @@
+DIST forehead-1.0_beta5.tbz2 15665 BLAKE2B d127cdc737301003bbf8b471d7ecea66f3f4a66925b446b7fac9b18e20c4e560ec301ed36b8bb6f17ec1e8adfc742b5127042fdf707ce051293b49a99bdad7bd SHA512 1558b0d26a4df210dfd188839e4feb8a8b2369fb514c82f99fdd337cec3520e3555ce7999e2bb11459de4ea04db0820d729c9ebf762fd5bbd91ef56a30c6f0be
+EBUILD forehead-1.0_beta5-r2.ebuild 546 BLAKE2B 6679c5cc7789ed858eab602220055ffc89c7e504b18355bcf1e767a5b2ac26579c9f6ce19be8fc1fe83a9b7923446910ce4efddc26166101266efe896226323e SHA512 18b4f40ae67f8a6fa282ebe08d44b69a18314cc18ca86001c4043929dd7d8b5c1e0d8245235847e88bea40c69bd569e5270faf383326d3b3cf3b0e988626c1f3
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/forehead/forehead-1.0_beta5-r2.ebuild b/dev-java/forehead/forehead-1.0_beta5-r2.ebuild
new file mode 100644
index 000000000000..abd1975c7854
--- /dev/null
+++ b/dev-java/forehead/forehead-1.0_beta5-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A framework to assist in controlling the run-time ClassLoader"
+HOMEPAGE="http://forehead.werken.com"
+SRC_URI="mirror://gentoo/forehead-${PV}.tbz2 -> ${P}.tbz2"
+
+LICENSE="Werken-1.1.1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_SRC_DIR="src"
diff --git a/dev-java/forehead/metadata.xml b/dev-java/forehead/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/forehead/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphics2d-2.4 b/dev-java/freehep-graphics2d-2.4
deleted file mode 100644
index 23bd622b3490..000000000000
--- a/dev-java/freehep-graphics2d-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/freehep-graphicsbase-2.4:0 >=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Energy Physics Java library - FreeHEP Graphics 2D Library
-EAPI=5
-HOMEPAGE=http://java.freehep.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1
-RDEPEND=~dev-java/freehep-graphicsbase-2.4:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz https://github.com/freehep/freehep-chartable-converter-plugin/archive/freehep-chartable-converter-plugin-2.2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=49881a3443f77ca7c99337d6cd8d9c53
diff --git a/dev-java/freehep-graphics2d/Manifest b/dev-java/freehep-graphics2d/Manifest
new file mode 100644
index 000000000000..c1754f33a302
--- /dev/null
+++ b/dev-java/freehep-graphics2d/Manifest
@@ -0,0 +1,4 @@
+DIST freehep-chartable-converter-plugin-2.2.1.tar.gz 18159 BLAKE2B 3b0c166c00fb2fa86fbb13adf8855ac21907d7397bb62997457e8528c7fd2d88657f7bdd4c820e4561e4303a36730b3826806e0cbc76506d49f27d0a4d528996 SHA512 4caac8b83b9efdee59e2a801bb001fdf7bab144bb5734bdb89ef3e1163bc9ffd05b2c8c59d611665573c432045a854fba28eb4d24260baea5286b34ae298add1
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
+EBUILD freehep-graphics2d-2.4.ebuild 2117 BLAKE2B 6809cc9f158934341aca65775326f5f4a0fd2bd24ffd6ccb107abceba32eb82589aef3a2110a9741ec54fe6beb46ba58a7b4c8a7621f4a393f57a9043ba4f808 SHA512 ffb2db76c69531324a98993d79581b925e3b635072d24aee77d35ccccdaba730d0dee1de6fe9c50cada3a74bd96c32625205b6da0d0591f9f4bd3e5cebc1b3c1
+MISC metadata.xml 331 BLAKE2B b05dee2e48a0495dea84595a536797a1a53dbd82bca89b838b334060e5142ef729f4a3be30e413eaf24a164d3f1998f3197b18bc92eb0e5fe4e1195453869694 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5
diff --git a/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild b/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
new file mode 100644
index 000000000000..97a88563854a
--- /dev/null
+++ b/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+CHARTABLE_PN="freehep-chartable-converter-plugin"
+CHARTABLE_P="${CHARTABLE_PN}-2.2.1"
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Graphics 2D Library"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz
+	https://github.com/freehep/${CHARTABLE_PN}/archive/${CHARTABLE_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="~dev-java/freehep-graphicsbase-${PV}:${SLOT}"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? ( dev-java/junit:4 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-graphicsbase"
+
+src_compile() {
+	# This package uses a custom Maven plugin to generate some
+	# sources. We're not using Maven but we can run it manually. We
+	# could package the plugin separately but it's not used elsewhere.
+
+	local SRC ENC CP="${WORKDIR}"/${CHARTABLE_PN}-${CHARTABLE_P}/src/main/java CLASS=org/freehep/graphics2d/font/encoding/CharTableConverter
+	ejavac "${CP}/${CLASS}.java"
+
+	for SRC in src/main/encoding/{Expert,Symbol,Zapfdingbats}.utf-16; do
+		ebegin "Converting ${SRC}"
+		java -cp "${CP}" ${CLASS} ${JAVA_SRC_DIR} org.freehep.graphics2d.font ${SRC} || die
+		eend $?
+	done
+
+	SRC=src/main/encoding/Latin.utf-16
+
+	for ENC in ISO MAC WIN PDF STD; do
+		ebegin "Converting ${SRC} (${ENC})"
+		java -cp "${CP}" ${CLASS} ${JAVA_SRC_DIR} org.freehep.graphics2d.font ${SRC} ${ENC} || die
+		eend $?
+	done
+
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find ${DIR} -name "Test*.java")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/freehep-graphics2d/metadata.xml b/dev-java/freehep-graphics2d/metadata.xml
new file mode 100644
index 000000000000..696a250adce4
--- /dev/null
+++ b/dev-java/freehep-graphics2d/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsbase-2.4 b/dev-java/freehep-graphicsbase-2.4
deleted file mode 100644
index 2bc6a0bc8e48..000000000000
--- a/dev-java/freehep-graphicsbase-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/freehep-io:0 dev-java/junit:4 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Energy Physics Java library - FreeHEP Graphics Base Library
-EAPI=5
-HOMEPAGE=http://java.freehep.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1
-RDEPEND=dev-java/freehep-io:0 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=db3665902764170bfbc693a6d53b742b
diff --git a/dev-java/freehep-graphicsbase/Manifest b/dev-java/freehep-graphicsbase/Manifest
new file mode 100644
index 000000000000..e7f5e5b3f16d
--- /dev/null
+++ b/dev-java/freehep-graphicsbase/Manifest
@@ -0,0 +1,3 @@
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
+EBUILD freehep-graphicsbase-2.4.ebuild 1208 BLAKE2B b9d6f370046db9792b84496cd930ba0cb14b32205bdcc7731043302696dd0ede7edae631e2caba997578645cf32b121844c7288471e6f41a34beacf08f7b53fb SHA512 30cad1df7b1ac2f00395c4fb3161992ae984c26ae7f2c2e596ffa152365169e08e169ee25bce0a03f91344b173f68bd63f9eaaa6423b1587ed127dfe113878b6
+MISC metadata.xml 331 BLAKE2B b05dee2e48a0495dea84595a536797a1a53dbd82bca89b838b334060e5142ef729f4a3be30e413eaf24a164d3f1998f3197b18bc92eb0e5fe4e1195453869694 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5
diff --git a/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild b/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
new file mode 100644
index 000000000000..75736b878100
--- /dev/null
+++ b/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Graphics Base Library"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/freehep-io:0
+	dev-java/junit:4"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-io,junit-4"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "ExportFileTypeTest.java")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/freehep-graphicsbase/metadata.xml b/dev-java/freehep-graphicsbase/metadata.xml
new file mode 100644
index 000000000000..696a250adce4
--- /dev/null
+++ b/dev-java/freehep-graphicsbase/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-2.4 b/dev-java/freehep-graphicsio-2.4
deleted file mode 100644
index d8eab81a794a..000000000000
--- a/dev-java/freehep-graphicsio-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 dev-java/freehep-io:0 >=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Energy Physics Java library - FreeHEP GraphicsIO Base Library
-EAPI=5
-HOMEPAGE=http://java.freehep.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1
-RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 dev-java/freehep-io:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0dd0734058d76cf6f1bf92505124b8e9
diff --git a/dev-java/freehep-graphicsio-emf-2.4 b/dev-java/freehep-graphicsio-emf-2.4
deleted file mode 100644
index f7152b0c67d8..000000000000
--- a/dev-java/freehep-graphicsio-emf-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 ~dev-java/freehep-graphicsio-2.4:0 dev-java/freehep-io:0 >=virtual/jdk-1.7 test? ( ~dev-java/freehep-graphicsio-tests-2.4:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Energy Physics Java library - FreeHEP Enhanced Metafile Format Driver
-EAPI=5
-HOMEPAGE=http://java.freehep.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1
-RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 ~dev-java/freehep-graphicsio-2.4:0 dev-java/freehep-io:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e54660475680b4b6ec7ef8c3c16ea465
diff --git a/dev-java/freehep-graphicsio-emf/Manifest b/dev-java/freehep-graphicsio-emf/Manifest
new file mode 100644
index 000000000000..11993fbcf533
--- /dev/null
+++ b/dev-java/freehep-graphicsio-emf/Manifest
@@ -0,0 +1,4 @@
+AUX github-30.patch 1643 BLAKE2B dbeeaf08b2a3342c8711d4be892084616e6beece15700633f21f2d56696d2f3408a21afdd18709a2ca86d08f060ba15370af694453841ae17dad666a8a4e9f60 SHA512 63a89ce9bfe23a0c0110e69d34fc76faf2f18c2f2361044fbe426c36f10f596279c958734398efcadc84890a2ecd08dbaf23bdc3c16aa2208fa8b9aab37b4e43
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
+EBUILD freehep-graphicsio-emf-2.4.ebuild 1615 BLAKE2B 83b0378ad394e20aa8eadf5ec7d995cc5f7b06075c53fee8451cd38613bfa96e2d7103f5409df18ea579c9ad096adec823b26d6c66cd72479747c040c199abc3 SHA512 dd0c9cd16357e1c244d1417f63c725a3fa5e3e120fa50c68e4106920a6c348a5c36217af3399c688fcce843e12c92582362d632f3ec644a9d5ea5b6c5d5aa915
+MISC metadata.xml 331 BLAKE2B b05dee2e48a0495dea84595a536797a1a53dbd82bca89b838b334060e5142ef729f4a3be30e413eaf24a164d3f1998f3197b18bc92eb0e5fe4e1195453869694 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5
diff --git a/dev-java/freehep-graphicsio-emf/files/github-30.patch b/dev-java/freehep-graphicsio-emf/files/github-30.patch
new file mode 100644
index 000000000000..c652ec6b861b
--- /dev/null
+++ b/dev-java/freehep-graphicsio-emf/files/github-30.patch
@@ -0,0 +1,34 @@
+https://github.com/freehep/freehep-vectorgraphics/issues/30
+
+diff -Naur freehep-vectorgraphics-freehep-vectorgraphics-2.4.orig/freehep-graphicsio-emf/src/main/java/org/freehep/graphicsio/emf/EMFConverter.java freehep-vectorgraphics-freehep-vectorgraphics-2.4/freehep-graphicsio-emf/src/main/java/org/freehep/graphicsio/emf/EMFConverter.java
+--- freehep-vectorgraphics-freehep-vectorgraphics-2.4.orig/freehep-graphicsio-emf/src/main/java/org/freehep/graphicsio/emf/EMFConverter.java	2014-09-02 09:59:14.000000000 +0100
++++ freehep-vectorgraphics-freehep-vectorgraphics-2.4/freehep-graphicsio-emf/src/main/java/org/freehep/graphicsio/emf/EMFConverter.java	2016-05-25 22:50:41.859734476 +0100
+@@ -4,6 +4,7 @@
+ import org.freehep.graphicsbase.util.export.ExportFileType;
+ 
+ import java.util.List;
++import java.util.Properties;
+ import java.io.FileInputStream;
+ import java.io.File;
+ 
+@@ -64,9 +65,10 @@
+                 destFileName += type.toLowerCase();
+             }
+ 
++            Properties p = new Properties();
++
+             // TODO there is no possibility to use Constants of base class!
+             /* create SVG properties
+-            Properties p = new Properties();
+             p.put(SVGGraphics2D.EMBED_FONTS, Boolean.toString(false));
+             p.put(SVGGraphics2D.CLIP, Boolean.toString(true));
+             p.put(SVGGraphics2D.COMPRESS, Boolean.toString(false));
+@@ -82,7 +84,7 @@
+                new File(destFileName),
+                emfPanel,
+                emfPanel,
+-               null,
++               p,
+                "Freehep EMF converter");
+         } catch (Exception e) {
+             e.printStackTrace();
diff --git a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
new file mode 100644
index 000000000000..597c3c26fadd
--- /dev/null
+++ b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Enhanced Metafile Format Driver"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
+	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
+	~dev-java/freehep-graphicsio-${PV}:${SLOT}
+	dev-java/freehep-io:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? (
+		~dev-java/freehep-graphicsio-tests-${PV}:${SLOT}
+		dev-java/junit:4
+	)"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-graphicsio,freehep-io"
+
+java_prepare() {
+	epatch "${FILESDIR}"/github-30.patch
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-optional-dependency freehep-graphicsio-svg
+	java-pkg_dolauncher emf2svg --main org.freehep.graphicsio.emf.EMF2SVG
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,freehep-graphicsio-tests,${JAVA_GENTOO_CLASSPATH})"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" org.freehep.graphicsio.emf.test.EMFTestSuite
+}
diff --git a/dev-java/freehep-graphicsio-emf/metadata.xml b/dev-java/freehep-graphicsio-emf/metadata.xml
new file mode 100644
index 000000000000..696a250adce4
--- /dev/null
+++ b/dev-java/freehep-graphicsio-emf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-svg-2.4 b/dev-java/freehep-graphicsio-svg-2.4
deleted file mode 100644
index 6b57f4d7a3c6..000000000000
--- a/dev-java/freehep-graphicsio-svg-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 ~dev-java/freehep-graphicsio-2.4:0 dev-java/freehep-io:0 >=virtual/jdk-1.7 test? ( ~dev-java/freehep-graphicsio-tests-2.4:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Energy Physics Java library - FreeHEP Scalable Vector Graphics Driver
-EAPI=5
-HOMEPAGE=http://java.freehep.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1
-RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 ~dev-java/freehep-graphicsio-2.4:0 dev-java/freehep-io:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9a9b67b7f2fa32fe1f1f960d8d10f7f4
diff --git a/dev-java/freehep-graphicsio-svg/Manifest b/dev-java/freehep-graphicsio-svg/Manifest
new file mode 100644
index 000000000000..24e4c78750ea
--- /dev/null
+++ b/dev-java/freehep-graphicsio-svg/Manifest
@@ -0,0 +1,3 @@
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
+EBUILD freehep-graphicsio-svg-2.4.ebuild 1369 BLAKE2B 8afb32aef66918013b0bf312434e06e23244c97e949adef9c1a3330a2c60f85eb18bc92f457ef59b0fb50edd2c565834f002b5d78b19f2a42c8fcb5106d98869 SHA512 f5fb3c5e001380d1b4da636fd122d1f628f040f71fc3ecc514b7a6f69311b2619403232db351fd9a68cf5786476273a951ad77d72377abfc9f6565da966b096a
+MISC metadata.xml 331 BLAKE2B b05dee2e48a0495dea84595a536797a1a53dbd82bca89b838b334060e5142ef729f4a3be30e413eaf24a164d3f1998f3197b18bc92eb0e5fe4e1195453869694 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5
diff --git a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
new file mode 100644
index 000000000000..3524b4c57c9e
--- /dev/null
+++ b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Scalable Vector Graphics Driver"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
+	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
+	~dev-java/freehep-graphicsio-${PV}:${SLOT}
+	dev-java/freehep-io:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? (
+		~dev-java/freehep-graphicsio-tests-${PV}:${SLOT}
+		dev-java/junit:4
+	)"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-graphicsio,freehep-io"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,freehep-graphicsio-tests,${JAVA_GENTOO_CLASSPATH})"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" org.freehep.graphicsio.svg.test.SVGTestSuite
+}
diff --git a/dev-java/freehep-graphicsio-svg/metadata.xml b/dev-java/freehep-graphicsio-svg/metadata.xml
new file mode 100644
index 000000000000..696a250adce4
--- /dev/null
+++ b/dev-java/freehep-graphicsio-svg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-tests-2.4 b/dev-java/freehep-graphicsio-tests-2.4
deleted file mode 100644
index 1c0b7d850a5c..000000000000
--- a/dev-java/freehep-graphicsio-tests-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 ~dev-java/freehep-graphicsio-2.4:0 dev-java/freehep-io:0 dev-java/junit:4 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Energy Physics Java library - FreeHEP GraphicsIO Test Library
-EAPI=5
-HOMEPAGE=http://java.freehep.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1
-RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 ~dev-java/freehep-graphicsio-2.4:0 dev-java/freehep-io:0 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=43aceed558253c473001b76d9b9d387b
diff --git a/dev-java/freehep-graphicsio-tests/Manifest b/dev-java/freehep-graphicsio-tests/Manifest
new file mode 100644
index 000000000000..74e81a1d068b
--- /dev/null
+++ b/dev-java/freehep-graphicsio-tests/Manifest
@@ -0,0 +1,3 @@
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
+EBUILD freehep-graphicsio-tests-2.4.ebuild 1189 BLAKE2B c90904819a9fd86af093596f93bd95c2e5c29fd1a73ef481ae3e10c12252014677c4d251e16e032024eb23067aa5ab310f3cf0e36a2444de63fc4bed1dd652bb SHA512 5d9a5d27759c477e26f1ad4f08843393cdbd22b480e24df55151b77dbed37fd16b84831e119ab2a1f19a69e77892345667ec92168a0834a377da821017397225
+MISC metadata.xml 331 BLAKE2B b05dee2e48a0495dea84595a536797a1a53dbd82bca89b838b334060e5142ef729f4a3be30e413eaf24a164d3f1998f3197b18bc92eb0e5fe4e1195453869694 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5
diff --git a/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild b/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild
new file mode 100644
index 000000000000..6a523d03f9ac
--- /dev/null
+++ b/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP GraphicsIO Test Library"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
+	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
+	~dev-java/freehep-graphicsio-${PV}:${SLOT}
+	dev-java/freehep-io:0
+	dev-java/junit:4"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-graphicsio,freehep-io,junit-4"
+
+java_prepare() {
+	# Avoid additional deps for "extra" tests.
+	sed -i -r "/Test(Histogram|ScatterPlot)/d" \
+		${JAVA_SRC_DIR}/org/freehep/graphicsio/test/TestSuite.java || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
diff --git a/dev-java/freehep-graphicsio-tests/metadata.xml b/dev-java/freehep-graphicsio-tests/metadata.xml
new file mode 100644
index 000000000000..696a250adce4
--- /dev/null
+++ b/dev-java/freehep-graphicsio-tests/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsio/Manifest b/dev-java/freehep-graphicsio/Manifest
new file mode 100644
index 000000000000..06e007ad26e5
--- /dev/null
+++ b/dev-java/freehep-graphicsio/Manifest
@@ -0,0 +1,3 @@
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
+EBUILD freehep-graphicsio-2.4.ebuild 1316 BLAKE2B 0db87b991c786c4c85881e93930e8b173c6a022eb23178c3e9374afce6addd109c22c4f4bf93845053e9a714b56ff169bf1a3ecbc89f8906d382f066dbaceb33 SHA512 633ec6e6dfa0821b414bad3b9ecf2604302a725c3719c9ac1b78fbf40d078a607c9ce9b0cd23ca07b35020efe67a739a36632ed5c4d4a8af0e425e7b3cc18f18
+MISC metadata.xml 331 BLAKE2B b05dee2e48a0495dea84595a536797a1a53dbd82bca89b838b334060e5142ef729f4a3be30e413eaf24a164d3f1998f3197b18bc92eb0e5fe4e1195453869694 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5
diff --git a/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
new file mode 100644
index 000000000000..15b5b40186ca
--- /dev/null
+++ b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP GraphicsIO Base Library"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
+	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
+	dev-java/freehep-io:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? ( dev-java/junit:4 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-io"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find ${DIR} -name "*Test.java")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/freehep-graphicsio/metadata.xml b/dev-java/freehep-graphicsio/metadata.xml
new file mode 100644
index 000000000000..696a250adce4
--- /dev/null
+++ b/dev-java/freehep-graphicsio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/freehep-io-2.2.2 b/dev-java/freehep-io-2.2.2
deleted file mode 100644
index 1ef1ca398562..000000000000
--- a/dev-java/freehep-io-2.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Energy Physics Java library - FreeHEP I/O Library
-EAPI=5
-HOMEPAGE=http://java.freehep.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/freehep/freehep-io/archive/freehep-io-2.2.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=aba2e19090a8092beb57957bef1e3a24
diff --git a/dev-java/freehep-io/Manifest b/dev-java/freehep-io/Manifest
new file mode 100644
index 000000000000..32a84acca697
--- /dev/null
+++ b/dev-java/freehep-io/Manifest
@@ -0,0 +1,3 @@
+DIST freehep-io-2.2.2.tar.gz 76935 BLAKE2B 11468effa883c44f4376bac7282881942209cd5769545083bd761489f31eceec96c909d452f2a056172c8fee65917895acb34c18583d771a258883e4e12c3906 SHA512 1cc7cab3d9648b119aa8c637c84cd985adc0f9dd2cdd153021500831325d719ef5fa41d8964ccbeed3af95b87e09c4886597c0ede1370a209f6807932636b0ee
+EBUILD freehep-io-2.2.2.ebuild 912 BLAKE2B b0af793ed7bcb34527b73c1dd83abc831de9cf17301de21c5f2620b14b891855fb297d4de567bd4e3779f3c2eb028c92ca839c25ecdf4a9be9eaeb554ef059bc SHA512 7ef173a74fadaec2be6d235a01be2da8a5d2f55419ab5f31db04d1cdf1af11a20abd575fb2daaaa6b919fac7e48c0ebf08b0bcea1c350f4243a6db281fac125d
+MISC metadata.xml 319 BLAKE2B ad988afc5f8c9c81de7629530afb00356007d90ecd2aea514a89db270489de30170b11d3aeecc01bde5950759b4a8b62fd459e91102e317fc22395769be71bfe SHA512 4da3787100462ce6feff5ecf42ed8cf70a3c5b5c3ed45d9c9afb88b341c110d230d8b89d911a17eb9d632dcac8eeae44c93468cc518c2ad1b8c972e51ecea5a0
diff --git a/dev-java/freehep-io/freehep-io-2.2.2.ebuild b/dev-java/freehep-io/freehep-io-2.2.2.ebuild
new file mode 100644
index 000000000000..1343d8707ff8
--- /dev/null
+++ b/dev-java/freehep-io/freehep-io-2.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP I/O Library"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${PN}/archive/${P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=">=virtual/jdk-1.7
+	test? ( dev-java/junit:4 )"
+
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="src/main/java"
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
+	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/freehep-io/metadata.xml b/dev-java/freehep-io/metadata.xml
new file mode 100644
index 000000000000..ff99e83575c0
--- /dev/null
+++ b/dev-java/freehep-io/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-io</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/freemarker-2.3.13-r2 b/dev-java/freemarker-2.3.13-r2
deleted file mode 100644
index f038813766d5..000000000000
--- a/dev-java/freemarker-2.3.13-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jython:2.7 java-virtuals/servlet-api:2.3 java-virtuals/servlet-api:2.4 java-virtuals/servlet-api:2.5 dev-java/jaxen:1.1 dev-java/juel:0 >=virtual/jdk-1.6 dev-java/javacc:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=FreeMarker is a tool to generate text output based on templates
-EAPI=5
-HOMEPAGE=http://freemarker.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=freemarker
-RDEPEND=dev-java/jython:2.7 java-virtuals/servlet-api:2.3 java-virtuals/servlet-api:2.4 java-virtuals/servlet-api:2.5 dev-java/jaxen:1.1 dev-java/juel:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.3
-SRC_URI=mirror://sourceforge/freemarker/freemarker-2.3.13.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cc9606b481217142183aea5f4ac2eb87
diff --git a/dev-java/freemarker-2.3.25 b/dev-java/freemarker-2.3.25
deleted file mode 100644
index 6d42864f26d2..000000000000
--- a/dev-java/freemarker-2.3.25
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/avalon-logkit:2.0 dev-java/commons-logging:0 dev-java/dom4j:1 dev-java/jaxen:1.1 dev-java/jython:2.7 dev-java/log4j:0 dev-java/rhino:1.6 dev-java/slf4j-api:0 dev-java/xalan:0 java-virtuals/servlet-api:2.5 >=virtual/jdk-1.7 dev-java/javacc:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java tool to generate text output based on templates
-EAPI=6
-HOMEPAGE=http://freemarker.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/avalon-logkit:2.0 dev-java/commons-logging:0 dev-java/dom4j:1 dev-java/jaxen:1.1 dev-java/jython:2.7 dev-java/log4j:0 dev-java/rhino:1.6 dev-java/slf4j-api:0 dev-java/xalan:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.3
-SRC_URI=https://github.com/apache/incubator-freemarker/archive/v2.3.25.tar.gz -> freemarker-2.3.25.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c7a210a6e0a1720f6d7cc0b445c6926d
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
new file mode 100644
index 000000000000..5535caf07f36
--- /dev/null
+++ b/dev-java/freemarker/Manifest
@@ -0,0 +1,8 @@
+AUX build.xml.patch 2160 BLAKE2B 15221b65f00871e3e01b30b735d9ac3498644eb5570e4d8ac5e75ad4dc995719f40832fe9a58fa367aee8a8a2a0d854ea99370cd1def119c30371c3f503b2a69 SHA512 ae01462ed0a8fc61fc6e34b99b536bf7d36da73744a070ad63f555af07de5dec3a0926b97fc984ab481db7b7c8807db53998f83e17a5717e805c87a49047731a
+AUX freemarker-2.3.13-PyJavaInstance.patch 1064 BLAKE2B 32940a4d64336e1a81a86f5190082c451acd96ef6e24f70cc5adcf59de1ee09c5c62293825fb29a36ae7ee697cb9f355198d426bccd702fe0fe6ea833c629499 SHA512 f53d2ab9818b9851200feaa2b346a877e893b90685926a451eadaaa6fef40de571a67b7b167e56facde077ff295db9ef9adafcd3409663216d27730a61e212df
+AUX freemarker-2.3.13-gentoo.patch 5228 BLAKE2B dc1b63c39247f0c289be0a12c20623feedd424925d2aa6b29fdac133c9e7bc5fd450b24133a9585a3f4b9a45344937ea3a184ba7cef13a4e6b4ca71ded3bd661 SHA512 857762085428fc094522d03a39b57a2fc74c1f7d57afe260383d04caeceea9fc30a5ab45d3a1039a30d8b18597c6b0500a0b998bbacfe746bdfb0902e96c8fbd
+DIST freemarker-2.3.13.tar.gz 2136791 BLAKE2B 6947d99fdca76ad9d38d57f5b982ba63b2b831c026dd5e65af5ea7c9aa816d01d0b477cc46cb6be6a8204953d73464dfc639d134191a72afc43cd4c7e936eaff SHA512 9216bc97e74779617ec91916842185472c3cfd4c5625168ddd2f4404237767df44c62d8308af8bed0ab10d72c8835c97daab7fbc1efa80c3e01c861dd334ec3b
+DIST freemarker-2.3.25.tar.gz 1873971 BLAKE2B 52c64938c67ac0303b07f4aa74c3fc7ccc0be68bd37a7c6c663ac0849acc9f2236d1028abb377efa6fdb518840b1961e71c1a02a37388864f9be14b3b443f28a SHA512 32a41a73a2f71a4e0ae8829da2c09e07204aa2b4a6899e2c7a3db0bde5d3e129ec7b44b7299a20165d7eb88f4f7d1bd9f0b7a1fd116dc11493134bec2306d1ac
+EBUILD freemarker-2.3.13-r2.ebuild 1894 BLAKE2B 4c407e0a16470917d47299cc8ead8ee50d2399a8d6b29256fe3682c560f324e17dac62a28aa90fc682c4e5867eb1b97fa6079f11d6b1badf0cb69aca821f2233 SHA512 a50758e63ea0a2a6a4c2968b56c485cbcd02885176afd6871355579346cefa569a59821e65594dfdf756ff5a1db3e289cba3cb713760f128cc34db99f68c8530
+EBUILD freemarker-2.3.25.ebuild 1526 BLAKE2B 59605716f6bf090c64a9a3431a21e1d2673cee88a768cac0f8980e74343242b1762baf13e50cd4efe6cc1ff5b430f6b1077a3a27a80382bd69841002015ff635 SHA512 43e7d9debfcd4096823b6e2076997b55a3b9a644578e52c0a30c0581dd34f1eb7b333740663165cad5f25d2ae6912c0cf1f85bd0d46437956bc1394125bb619e
+MISC metadata.xml 383 BLAKE2B 37aff0d8a54a89b0cc78ccc0b9f09b86c1cd91f6759511711124cb805bcc61b682111a6664c8ea03d701ad92a0eb72a4108e09bad1a33a4c5dde3d7ed4f1b646 SHA512 2b6f5f22ae11f25aac3cbf3a2c3f3161ab391b932740d964b41bb84d24f54d12a8fa60f11502571b30d5100bd7fc578d82939de0ae7d1bef0d22df910edfed2c
diff --git a/dev-java/freemarker/files/build.xml.patch b/dev-java/freemarker/files/build.xml.patch
new file mode 100644
index 000000000000..33701f89175d
--- /dev/null
+++ b/dev-java/freemarker/files/build.xml.patch
@@ -0,0 +1,60 @@
+diff -Naur a/build.xml b/build.xml
+--- a/build.xml	2016-06-14 19:48:01.000000000 +0100
++++ b/build.xml	2016-12-22 22:41:41.988262564 +0000
+@@ -27,6 +27,10 @@
+   xmlns:u="http://freemarker.org/util"
+ >
+ 
++  <path id="gentoo.classpath">
++    <pathelement path="${gentoo.classpath}/"/>
++  </path>
++
+   <!-- ================================================================== -->
+   <!-- Properties                                                         -->
+   <!-- ================================================================== -->
+@@ -143,13 +147,11 @@
+     />
+ 
+     <mkdir dir="${_javaccOutputDir}" />
+-    <ivy:retrieve conf="parser" pattern="build/javacc-home.tmp/[artifact].[ext]" />
+     <javacc:generate
+       target="src/main/javacc/FTL.jj"
+       outputdirectory="${_javaccOutputDir}"
+       javacchome="build/javacc-home.tmp"
+     />
+-    <delete dir="build/javacc-home.tmp" />
+     
+     <replace
+       file="${_javaccOutputDir}/FMParser.java"
+@@ -271,6 +273,7 @@
+       verify="yes" stubversion="1.2"
+     />
+ 
++<!--
+     <ivy:cachepath conf="build.jsp2.0" pathid="ivy.dep.jsp2.0" />
+     <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" 
+       debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
+@@ -286,6 +289,7 @@
+         freemarker/ext/jsp/FreeMarkerJspFactory21.java,
+         freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
+     />
++!-->
+     
+     <!-- There's no build.jsp2.0, as those classes are part of the common build subset. -->
+     
+@@ -301,6 +305,7 @@
+         freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
+     />
+ 
++<!--
+     <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" />
+     <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" 
+       debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
+@@ -325,6 +330,7 @@
+       includes="
+         freemarker/ext/jython/_Jython22VersionAdapter.java"
+     />
++!-->
+     
+     <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
+     <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" 
diff --git a/dev-java/freemarker/files/freemarker-2.3.13-PyJavaInstance.patch b/dev-java/freemarker/files/freemarker-2.3.13-PyJavaInstance.patch
new file mode 100644
index 000000000000..b0544d170b15
--- /dev/null
+++ b/dev-java/freemarker/files/freemarker-2.3.13-PyJavaInstance.patch
@@ -0,0 +1,22 @@
+--- src/freemarker/ext/jython/JythonModelCache.java.orig	2015-07-05 08:47:07.035000000 +0000
++++ src/freemarker/ext/jython/JythonModelCache.java	2015-07-05 08:49:31.157000000 +0000
+@@ -10,7 +10,7 @@
+ import org.python.core.PyDictionary;

+ import org.python.core.PyFloat;

+ import org.python.core.PyInteger;

+-import org.python.core.PyJavaInstance;

++import org.python.core.PyJavaType;

+ import org.python.core.PyLong;

+ import org.python.core.PyNone;

+ import org.python.core.PyObject;

+@@ -37,8 +37,8 @@
+     protected TemplateModel create(Object obj) {

+         boolean asHash = false;

+         boolean asSequence = false;

+-        if(obj instanceof PyJavaInstance) {

+-            Object jobj = ((PyJavaInstance)obj).__tojava__(java.lang.Object.class);

++        if(obj instanceof PyJavaType) {

++            Object jobj = PyJavaType.wrapJavaObject(obj).__tojava__(Object.class);

+             // FreeMarker-aware, Jython-wrapped Java objects are left intact 

+             if(jobj instanceof TemplateModel) {

+                 return (TemplateModel)jobj; 

diff --git a/dev-java/freemarker/files/freemarker-2.3.13-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.13-gentoo.patch
new file mode 100644
index 000000000000..9eca29a827ad
--- /dev/null
+++ b/dev-java/freemarker/files/freemarker-2.3.13-gentoo.patch
@@ -0,0 +1,126 @@
+diff -Nru freemarker-2.3.13.vanilla/build.xml freemarker-2.3.13/build.xml
+--- freemarker-2.3.13.vanilla/build.xml	2008-06-21 00:46:08.000000000 +0200
++++ freemarker-2.3.13/build.xml	2008-06-21 00:46:48.000000000 +0200
+@@ -69,21 +69,28 @@
+         <pathelement path="${lib.log4j}"/>
+         <pathelement path="${lib.rhino}"/>
+         <pathelement path="${java.class.path}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+     
+     <path id="compile.classpath">
+         <path refid="compile.nojsp.classpath"/>
+         <pathelement path="${lib.jsp21}"/>
++        <fileset dir="lib" includes="*.jar"/>
++		<fileset dir="lib/jsp-2.1" includes="*.jar"/>
+     </path>
+ 
+     <path id="compile.jsp1.classpath">
+         <path refid="compile.nojsp.classpath"/>
+         <pathelement path="${lib.jsp12}"/>
++        <fileset dir="lib" includes="*.jar"/>
++		<fileset dir="lib/jsp-1.2" includes="*.jar"/>
+     </path>
+ 
+     <path id="compile.jsp2.classpath">
+ 	<path refid="compile.nojsp.classpath"/>
+ 	<pathelement path="${lib.jsp20}"/>
++	<fileset dir="lib" includes="*.jar"/>
++	<fileset dir="lib/jsp-2.0" includes="*.jar"/>
+     </path>
+     
+     <path id="compile.classpath.testcases">
+@@ -92,6 +99,7 @@
+         <pathelement path="${lib.jdom}"/>
+         <pathelement path="${lib.servlet}"/>
+         <pathelement path="${lib.jsp20}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+ 
+     <path id="compile.classpath.javadoc">
+@@ -110,12 +118,14 @@
+         <pathelement path="${src.dir}"/>
+         <pathelement path="${build.javacc.dir}"/>
+         <pathelement path="${java.class.path}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+ 
+     <path id="compile.classpath.examples">
+         <pathelement path="${lib.servlet}"/>
+         <pathelement path="${lib.dir}/freemarker.jar"/>
+         <pathelement path="${lib.struts}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+     
+     <path id="full.classpath">
+@@ -131,6 +141,7 @@
+         <pathelement path="${lib.logkit}"/>
+         <pathelement path="${lib.log4j}"/>
+         <pathelement path="${java.class.path}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+     
+     
+@@ -180,7 +191,6 @@
+ 
+     <patternset id="freemarker.compile.jdk15">
+         <include name="freemarker/ext/beans/EnumModels.java"/>
+-        <include name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>

+     </patternset>
+ 
+     <patternset id="freemarker.compile.xalan">
+@@ -311,7 +321,6 @@
+                 <available file="lib/xalan.jar"/>

+             </and>
+         </condition>
+-        <antcall target="fetchlibs"/>
+         <available
+             property="log4j.available"
+             classname="org.apache.log4j.Logger"
+diff -Nru freemarker-2.3.13.vanilla/src/freemarker/ext/jsp/FreeMarkerPageContext21.java freemarker-2.3.13/src/freemarker/ext/jsp/FreeMarkerPageContext21.java
+--- freemarker-2.3.13.vanilla/src/freemarker/ext/jsp/FreeMarkerPageContext21.java	2008-06-21 00:46:08.000000000 +0200
++++ freemarker-2.3.13/src/freemarker/ext/jsp/FreeMarkerPageContext21.java	2008-06-21 00:46:12.000000000 +0200
+@@ -2,11 +2,13 @@
+ 
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
++import java.util.Enumeration;
+ 
+ import javax.el.ELContext;
+ import javax.servlet.jsp.JspApplicationContext;
+ import javax.servlet.jsp.JspContext;
+ import javax.servlet.jsp.JspFactory;
++import javax.servlet.jsp.ErrorData;
+ import javax.servlet.jsp.PageContext;
+ import javax.servlet.jsp.el.ELException;
+ import javax.servlet.jsp.el.ExpressionEvaluator;
+@@ -24,6 +26,9 @@
+ class FreeMarkerPageContext21 extends FreeMarkerPageContext {
+     private static final Logger logger = Logger.getLogger("freemarker.jsp");
+ 
++	public ErrorData getErrorData() { return null; }
++	public Enumeration getAttributeNames() { return getServletContext().getAttributeNames(); }
++
+     static {
+         if(JspFactory.getDefaultFactory() == null) {
+             JspFactory.setDefaultFactory(new FreeMarkerJspFactory21());
+diff -Nru freemarker-2.3.13.vanilla/src/freemarker/ext/jython/JythonHashModel.java freemarker-2.3.13/src/freemarker/ext/jython/JythonHashModel.java
+--- freemarker-2.3.13.vanilla/src/freemarker/ext/jython/JythonHashModel.java	2008-06-21 00:46:08.000000000 +0200
++++ freemarker-2.3.13/src/freemarker/ext/jython/JythonHashModel.java	2008-06-21 00:46:12.000000000 +0200
+@@ -137,7 +137,7 @@
+         {
+             throw new TemplateModelException(e);
+         }
+-        throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.__class__.__name__);
++        throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.getType());
+     }
+ 
+     /**
+@@ -157,6 +157,6 @@
+         {
+             throw new TemplateModelException(e);
+         }
+-        throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.__class__.__name__);
++        throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.getType());
+     }
+ }
diff --git a/dev-java/freemarker/freemarker-2.3.13-r2.ebuild b/dev-java/freemarker/freemarker-2.3.13-r2.ebuild
new file mode 100644
index 000000000000..857f5d7c8520
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.13-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="FreeMarker is a tool to generate text output based on templates"
+HOMEPAGE="http://freemarker.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="freemarker"
+SLOT="2.3"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/jython:2.7
+	java-virtuals/servlet-api:2.3
+	java-virtuals/servlet-api:2.4
+	java-virtuals/servlet-api:2.5
+	dev-java/jaxen:1.1
+	dev-java/juel:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	dev-java/javacc:0"
+
+# [0]: Patch so that we can compile the package
+# against Jython-2.7.
+# [1]: Gentoo specific stuff.
+PATCHES=(
+	"${FILESDIR}"/${P}-PyJavaInstance.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+java_prepare() {
+	# Do away with bundled jar files.
+	java-pkg_clean
+
+	# Apply patches.
+	epatch "${PATCHES[@]}"
+
+	# Weed out comments (some contain UTF-8 chars javac cannnot deal with).
+	sed -i -e '/*/d;' \
+		src/freemarker/template/LocalizedString.java
+
+	# For ecj-3.5.
+	java-ant_rewrite-bootclasspath auto
+}
+
+src_compile() {
+	# BIG FAT WARNING:
+	# clean target removes lib/ directory!!
+	eant clean
+
+	mkdir -p lib/jsp-{1.2,2.0,2.1} || die
+	pushd lib >/dev/null || die
+	java-pkg_jar-from --virtual --into jsp-1.2 servlet-api-2.3
+	java-pkg_jar-from --virtual --into jsp-2.0 servlet-api-2.4
+	java-pkg_jar-from --virtual --into jsp-2.1 servlet-api-2.5
+	java-pkg_jar-from jaxen-1.1
+	java-pkg_jar-from jython-2.7
+	java-pkg_jar-from --build-only javacc
+	java-pkg_jar-from juel
+	popd >/dev/null
+
+	eant jar $(use_doc) -Djavacc.home=/usr/share/javacc/lib
+}
+
+src_install() {
+	java-pkg_dojar "lib/${PN}.jar"
+	dodoc README.txt
+
+	use doc && java-pkg_dojavadoc build/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/freemarker/freemarker-2.3.25.ebuild b/dev-java/freemarker/freemarker-2.3.25.ebuild
new file mode 100644
index 000000000000..cb9e781667ba
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.25.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="incubator-${PN}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java tool to generate text output based on templates"
+HOMEPAGE="http://freemarker.org/"
+SRC_URI="https://github.com/apache/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="dev-java/avalon-logkit:2.0
+	dev-java/commons-logging:0
+	dev-java/dom4j:1
+	dev-java/jaxen:1.1
+	dev-java/jython:2.7
+	dev-java/log4j:0
+	dev-java/rhino:1.6
+	dev-java/slf4j-api:0
+	dev-java/xalan:0
+	java-virtuals/servlet-api:2.5"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.7
+	dev-java/javacc:0"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/build.xml.patch
+)
+
+EANT_BUILD_TARGET="compile"
+EANT_EXTRA_ARGS="-Ddeps.available=true"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_prepare() {
+	default
+
+	rm -rv \
+	   src/main/java/freemarker/ext/jdom \
+	   src/main/java/freemarker/ext/xml/_JdomNavigator.java \
+	   src/main/java/freemarker/ext/beans/JRebelClassChangeNotifier.java || die
+
+	sed -i \
+		-e '/<ivy:cachepath/d' \
+		-e 's/"ivy\.dep[^"]*"/"gentoo.classpath"/g' \
+		-e "s:javacchome=\"[^\"]*\":javacchome=\"${EROOT}usr/share/javacc/lib\":g" \
+		build.xml || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	jar cf ${PN}.jar -C build/classes . || die
+	java-pkg_dojar ${PN}.jar
+
+	dodoc README
+	use doc && java-pkg_dojavadoc build/api
+}
diff --git a/dev-java/freemarker/metadata.xml b/dev-java/freemarker/metadata.xml
new file mode 100644
index 000000000000..62aedeea4e53
--- /dev/null
+++ b/dev-java/freemarker/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freemarker</remote-id>
+		<remote-id type="github">apache/incubator-freemarker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/fscript-1.17-r1 b/dev-java/fscript-1.17-r1
deleted file mode 100644
index f46e14f660b4..000000000000
--- a/dev-java/fscript-1.17-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java based scripting engine designed to be embedded into other Java applications
-EAPI=5
-HOMEPAGE=http://fscript.sourceforge.net/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/fscript/fscript-1.17.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d24c955223f9fed3193e943a90991440
diff --git a/dev-java/fscript/Manifest b/dev-java/fscript/Manifest
new file mode 100644
index 000000000000..717f1eeba126
--- /dev/null
+++ b/dev-java/fscript/Manifest
@@ -0,0 +1,3 @@
+DIST fscript-1.17.tgz 117300 BLAKE2B ffbf993164d822fd8aaa25025c773d98f79127df8cc800d78475be5686a2785e962447f817cd1b705c03350a83b48c5e669b5faaa62649a1b2ead7cd2d4e9288 SHA512 9f4280ab1131f7ccdf2564fdb9bf1b6e91b593b5ef2934203a68aae87c3d89adfd73e82d0409d6cddd8685ee7bddb69dd67532c6f13a046381b12faf97d47e50
+EBUILD fscript-1.17-r1.ebuild 821 BLAKE2B 0e34db18999ad7db5a2c8629b041cf42b6b5f789902471450392e9408a4b751734bbdf1948b199fd5364c57c2fb1ed631df9d93453f28d035fa2c51b2526b6ef SHA512 7b585a2e7ded3b88cfc42c997160f9bee6e435a5b4c3248e5a7f8021523be5db202bea66a0451ccf8dbaf17a2649d5155a244d3d1ff39d32c167f0a044e68790
+MISC metadata.xml 313 BLAKE2B 431a725f648a5ad1c888b84ace78b86e6a78404e57fe3d86662b7b44fe20fab91f5ba8a2aaaf3ef7e868b114ca9a0673ee282d879268bd16dd7c8c24196a27e1 SHA512 3d5ab8833eb9f0fddbe88d26cec561da98211b3db51ad3566b15470b0cc1829db2193afdc8a89c358d4ac2ba2441ec0434c439cfe98b3686bf8dd5d3326004eb
diff --git a/dev-java/fscript/fscript-1.17-r1.ebuild b/dev-java/fscript/fscript-1.17-r1.ebuild
new file mode 100644
index 000000000000..ec3c1c39692d
--- /dev/null
+++ b/dev-java/fscript/fscript-1.17-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java based scripting engine designed to be embedded into other Java applications"
+HOMEPAGE="http://fscript.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+java_prepare() {
+	rm -v "${S}/FScript.jar" || die
+}
+
+EANT_DOC_TARGET="jdoc"
+
+src_test() {
+	eant test
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+
+	dodoc CREDITS README VERSION || die
+	# docs/* contains not only javadoc:
+	use doc && java-pkg_dohtml -r docs/*
+	use examples && java-pkg_doexamples examples/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/fscript/metadata.xml b/dev-java/fscript/metadata.xml
new file mode 100644
index 000000000000..16869cf9dcf0
--- /dev/null
+++ b/dev-java/fscript/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">fscript</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/gcj-jdk-5.4.0-r1 b/dev-java/gcj-jdk-5.4.0-r1
deleted file mode 100644
index d6869498ac91..000000000000
--- a/dev-java/gcj-jdk-5.4.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=dev-java/ecj-gcj:* dev-lang/perl ~sys-devel/gcc-5.4.0[awt?,gcj] >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Java wrappers around GCJ
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-IUSE=awt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-java/ecj-gcj:* dev-lang/perl ~sys-devel/gcc-5.4.0[awt?,gcj] >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-SLOT=0
-_eclasses_=java-vm-2	771452d15e0b51ec559962d22c627449	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f46d2f52bd5860c1666574872420e4b3
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
new file mode 100644
index 000000000000..c88809112acf
--- /dev/null
+++ b/dev-java/gcj-jdk/Manifest
@@ -0,0 +1,3 @@
+AUX javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
+EBUILD gcj-jdk-5.4.0-r1.ebuild 3712 BLAKE2B 1bb67b0f28281f8d213111ff6e3e362199ccf05ae56587b20dcd8975479f284bc0c0aa6850a85a4418b04d9fb7be491ab3c12e174c7680e997e7e3bdda130278 SHA512 1f26adc24f66091ed51890a6fb748f48340670b359be609bb34c55038add83aedf6c060503e232cb5e0749d60685e4b5ef71fba7d0863ef942f9cbab429660ee
+MISC metadata.xml 716 BLAKE2B 1467e6d569030367c7983485d8a2159105c2d69e067878e0fce02e33e6604739cf54f84da3a77852f6722d71d060b2d56745b22f0818d5ba958851e1a5dcff0c SHA512 ccd737b1118329a85ecd3f5b19548bec4a2e425b20955b578287d4f82dce165c31aa016019407e8a5b138a48718b61089ca7f9678c549d29d0bb27cdd9c48e68
diff --git a/dev-java/gcj-jdk/files/javac.in b/dev-java/gcj-jdk/files/javac.in
new file mode 100644
index 000000000000..8eeda68c7a5e
--- /dev/null
+++ b/dev-java/gcj-jdk/files/javac.in
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -w
+use strict;
+use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
+use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
+
+my $ECJ_WARNINGS="-nowarn";
+
+my ( @bcoption, @source15, @target15, @cp );
+push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
+    unless grep {$_ eq '-bootclasspath'} @ARGV;
+push @source15, '-source', '1.5'
+    unless grep {$_ eq '-source'} @ARGV;
+push @target15, '-target', '1.5'
+    unless grep {$_ eq '-target'} @ARGV;  
+push @cp, '-cp', '.'
+    unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
+my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
+
+# Work around ecj's inability to handle duplicate command-line
+# options and unknown javac options.
+sub gen_ecj_opts
+{
+    my @new_args = @{$_[0]};
+
+    for my $opt (NO_DUP_ARGS) 
+    {
+	my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+	if (@indices > 1) {
+	    shift @indices;    # keep last instance only
+	    splice @new_args, $_, 2 for @indices;
+	}
+    }
+
+    for my $opt (STRIP_ARGS) 
+    {
+	my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+	splice @new_args, $_, 1 for @indices;
+    }
+
+    return \@new_args;
+}
+
+sub split_vm_args
+{
+    my @new_args = @{$_[0]};
+
+    my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
+    my @javac_args = grep $_ !~ /^-J/, @new_args;
+
+    return (\@vm_args, \@javac_args);
+}
+
+my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
+my @CLASSPATH = ('@ECJ_JAR@');
+push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
+$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
+exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
diff --git a/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
new file mode 100644
index 000000000000..c56dd496f7c1
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2
+
+DESCRIPTION="Java wrappers around GCJ"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux"
+SLOT="0"
+IUSE="awt"
+
+API_DIFF_PV="4.9.2"
+
+# perl is needed for javac wrapper
+RDEPEND="
+	dev-java/ecj-gcj:*
+	dev-lang/perl
+	~sys-devel/gcc-${PV}[awt?,gcj]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_install() {
+	# jre lib paths ...
+	local libarch="$(get_system_arch)"
+	local gcc_version=${PV}
+	local gccbin=$(gcc-config -B ${gcc_version})
+	gccbin=${gccbin#"${EPREFIX}"}
+	local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1)
+	gcclib=${gcclib#"${EPREFIX}"}
+	local gcjhome="/usr/$(get_libdir)/${P}"
+	local gcjprefix="${EPREFIX}${gcjhome}"
+	local gccchost="${CHOST}"
+	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
+	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
+
+	# links
+	dodir ${gcjhome}/bin
+	dodir ${gcjhome}/jre/bin
+	dosym ${gccbin}/gij ${gcjhome}/bin/java
+	dosym ${gccbin}/gij ${gcjhome}/jre/bin/java
+	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
+	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
+	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
+	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
+	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
+	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
+	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
+	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
+	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
+	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
+	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
+	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
+	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
+	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
+	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
+	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
+	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
+	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
+	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
+
+	dodir ${gcjhome}/jre/lib/${libarch}/client
+	dodir ${gcjhome}/jre/lib/${libarch}/server
+	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
+	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
+	use awt && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
+
+	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
+		${gcjhome}/jre/lib/rt.jar
+	dodir ${gcjhome}/lib
+	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
+		${gcjhome}/lib/tools.jar
+	dosym ${gcclib}/include ${gcjhome}/include
+
+	exeinto ${gcjhome}/bin
+	sed -e "s#@JAVA@#${gcjprefix}/bin/java#" \
+		-e "s#@ECJ_JAR@#${EPREFIX}/usr/share/eclipse-ecj/ecj.jar#" \
+		-e "s#@RT_JAR@#${gcjprefix}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjprefix}/lib/tools.jar#" \
+		"${FILESDIR}"/javac.in \
+	| newexe - javac
+	assert
+
+	java-vm_install-env
+}
+
+pkg_postinst() {
+	# Do not set as system VM (see below)
+	# java-vm-2_pkg_postinst
+
+	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
+	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
+	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
+	ewarn "Check for existing bugs relating to missing APIs and file"
+	ewarn "new ones at https://gcc.gnu.org/bugzilla/"
+	ewarn
+	ewarn "Due to this and limited manpower, we currently cannot support"
+	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
+	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
+	ewarn
+	ewarn "emerge -o icedtea && emerge icedtea"
+}
diff --git a/dev-java/gcj-jdk/metadata.xml b/dev-java/gcj-jdk/metadata.xml
new file mode 100644
index 000000000000..45bb61f874f0
--- /dev/null
+++ b/dev-java/gcj-jdk/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gnu_andrew@member.fsf.org</email>
+		<name>Andrew John Hughes</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
+	<use>
+		<flag name="awt">Install AWT libraries, needed by some GUIs (not needed to build icedtea)</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-java/geoip-java-1.3.0 b/dev-java/geoip-java-1.3.0
deleted file mode 100644
index 51f0752a7b52..000000000000
--- a/dev-java/geoip-java-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library for lookup countries by IP addresses
-EAPI=5
-HOMEPAGE=https://github.com/maxmind
-IUSE=elibc_FreeBSD source doc examples elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/maxmind/geoip-api-java/archive/v1.3.0.zip -> geoip-java-1.3.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=72d8ed996a49f636dc049e5dfdbd4fb1
diff --git a/dev-java/geoip-java/Manifest b/dev-java/geoip-java/Manifest
new file mode 100644
index 000000000000..29f50e2eb408
--- /dev/null
+++ b/dev-java/geoip-java/Manifest
@@ -0,0 +1,3 @@
+DIST geoip-java-1.3.0.zip 138673 BLAKE2B f61c42bad846684a4bfb9952d5b573f1d65aff5b0e7cd2ce0b53c946aecc567cab34d7f171f16b6d531cdc5a6b059747dbd02368d534f31b4894d28433b14938 SHA512 3925a94072a97dac732f4a77f4f141e1484c630b2122b4322cb487c209adbbb30936b782579943c1c766b43ef4ad0db3e264c738ad777656706272ca53ccf85b
+EBUILD geoip-java-1.3.0.ebuild 907 BLAKE2B daf8aaed11cdfa87e603545042c700992286e076e79a7e24b0bbfc1286148f6a66444b9e2e99fafe4aa7d1e6e2bb43cb8aea818c91977cc242dc2edaed16ada4 SHA512 b5581ae1866abc9291f2d26513d41dc15e25481e10c940cf9c79c2a86350bad84dda8c1ede422151af013efe0e974b7e64ff135d5ca5dda5164a67ab90e64147
+MISC metadata.xml 435 BLAKE2B 09488d30596ca7c042f5abfae1fdd4318c4b24b4b65ed16fa33af326c00e514005bcdb8521d7fdd39eb1fa054ace364d23bb50a41dfc8998b59d7bdf75f783eb SHA512 2a178cea68a188ef9557208bd62b049865f060b1a99be03946859eeee07119aed5fcf421b7b192ce2174315dd70e3ef4326dffcf2bd2a6801f5fc7f9acf6ff6e
diff --git a/dev-java/geoip-java/geoip-java-1.3.0.ebuild b/dev-java/geoip-java/geoip-java-1.3.0.ebuild
new file mode 100644
index 000000000000..c127dfa89716
--- /dev/null
+++ b/dev-java/geoip-java/geoip-java-1.3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source doc examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="geoip-api-java"
+
+DESCRIPTION="Java library for lookup countries by IP addresses"
+HOMEPAGE="https://github.com/maxmind"
+SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	rm -rv src/test || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	dodoc README.md Changes.md
+
+	use examples && java-pkg_doexamples examples/*
+}
+
+pkg_postinst() {
+	einfo "Country and City data files can be downloaded here:"
+	einfo "  http://www.maxmind.com/app/geolitecountry"
+	einfo "  http://www.maxmind.com/app/geolitecity"
+}
diff --git a/dev-java/geoip-java/metadata.xml b/dev-java/geoip-java/metadata.xml
new file mode 100644
index 000000000000..16b146cb66aa
--- /dev/null
+++ b/dev-java/geoip-java/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">maxmind/geoip-api-java</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/glassfish-connector-api-1.1.2.2.04 b/dev-java/glassfish-connector-api-1.1.2.2.04
deleted file mode 100644
index aa3f33bdfada..000000000000
--- a/dev-java/glassfish-connector-api-1.1.2.2.04
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Transaction API
-EAPI=2
-HOMEPAGE=https://glassfish.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( CDDL GPL-2 )
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1e9f08225ea8488902775bcf5c44e544
diff --git a/dev-java/glassfish-connector-api/Manifest b/dev-java/glassfish-connector-api/Manifest
new file mode 100644
index 000000000000..66d76a380a82
--- /dev/null
+++ b/dev-java/glassfish-connector-api/Manifest
@@ -0,0 +1,3 @@
+DIST glassfish-v2ur2-b04-src.zip 39817113 BLAKE2B 4aeb0df44f838c91fa8dd52e2a4985e86457f75cec3cd5d527de54f672afcd2824cefaad9d9e67c5ce096515e389bb2fc0874d76ce2ec86a956233f2c3508439 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8
+EBUILD glassfish-connector-api-1.1.2.2.04.ebuild 1078 BLAKE2B 7d58722ae79549f28f79c3e36f882d3007d88733e1bfada43761272153e7b864cd9da6d60702bef4bfb7bbfbe3fff360209ff080d6f7be7d001b90f6cfae72f7 SHA512 fd8c4916848f767854da011218ac456247c78d2566139c07ee121c4914601fac328d9f045fda79c4e8a1dc8b72b0e0c5ae4bdd675c583d9dc8ba19745c290a49
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild b/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild
new file mode 100644
index 000000000000..3ad3ed6feacd
--- /dev/null
+++ b/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Transaction API"
+HOMEPAGE="https://glassfish.dev.java.net/"
+MAJOR=v$(get_version_component_range 3-4)
+MAJOR=$(replace_version_separator 1 ur ${MAJOR})
+MY_PV=${MAJOR}-b$(get_version_component_range 5)
+MY_PN=${PN/-//}
+ZIP="glassfish-${MY_PV}-src.zip"
+SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
+
+LICENSE="|| ( CDDL GPL-2 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_PN}
+
+src_unpack() {
+	unzip -q "${DISTDIR}/${ZIP}" "${MY_PN}/*" "glassfish/bootstrap/*" \
+		|| die "unpacking failed"
+	einfo "${S}"
+}
+
+EANT_BUILD_TARGET="all"
+EANT_EXTRA_ARGS="-Djavaee.jar=\"${S}/${PN}.jar\""
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_dojar *.jar
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/java/javax
+}
diff --git a/dev-java/glassfish-connector-api/metadata.xml b/dev-java/glassfish-connector-api/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/glassfish-connector-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/glassfish-deployment-api-3.1.1 b/dev-java/glassfish-deployment-api-3.1.1
deleted file mode 100644
index b01dba9a3d01..000000000000
--- a/dev-java/glassfish-deployment-api-3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=J2EE Application Deployment Specification V.1.2
-EAPI=5
-HOMEPAGE=https://glassfish.dev.java.net/
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=|| ( CDDL GPL-2 )
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=https://repo1.maven.org/maven2/org/glassfish/javax.enterprise.deploy/3.1.1/javax.enterprise.deploy-3.1.1-sources.jar -> glassfish-deployment-api-3.1.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5d7d9b841d904316193ad2363e8328c9
diff --git a/dev-java/glassfish-deployment-api/Manifest b/dev-java/glassfish-deployment-api/Manifest
new file mode 100644
index 000000000000..47c5cc62a274
--- /dev/null
+++ b/dev-java/glassfish-deployment-api/Manifest
@@ -0,0 +1,3 @@
+DIST glassfish-deployment-api-3.1.1.jar 86511 BLAKE2B 1224261aa87beed9428926409b114b732f24426c2b85c7374d28ebef0a8813cb41fc831f43757b9a007c5c5833444396cb29a784395b476af64de7c1316ce0e3 SHA512 9325d44da2258c84b879360fe92314b49c0b3ca7be2dd3b9016bf884e79ed66f9bf3fcec2b99a7b8baf3847e5d15376d10e3013bd4dd0f0cfaaf7859fa83a6ba
+EBUILD glassfish-deployment-api-3.1.1.ebuild 559 BLAKE2B 93b210dbd034f82e583b04885adb1629439004a536b8b7a961fe1a7af52fcbe1db1aa49d1697c734883edea21c8d37eace55e5810840f6b7a3c165a2b2dd6022 SHA512 49082894425e7021d9cde717556cb8b73d03d232120ceca2a3a8e470606e1b23a9e473cb65026bc47ba570e5926364fa9f22d41f71025e405dba0b31b3714055
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild b/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
new file mode 100644
index 000000000000..0dcfdd9801fe
--- /dev/null
+++ b/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="J2EE Application Deployment Specification V.1.2"
+HOMEPAGE="https://glassfish.dev.java.net/"
+SRC_URI="https://repo1.maven.org/maven2/org/glassfish/javax.enterprise.deploy/${PV}/javax.enterprise.deploy-${PV}-sources.jar -> ${P}.jar"
+
+LICENSE="|| ( CDDL GPL-2 )"
+SLOT="1.2"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	>=virtual/jre-1.6"
diff --git a/dev-java/glassfish-deployment-api/metadata.xml b/dev-java/glassfish-deployment-api/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/glassfish-deployment-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/glassfish-ejb-api-3.2 b/dev-java/glassfish-ejb-api-3.2
deleted file mode 100644
index 40ae9ad2dc0b..000000000000
--- a/dev-java/glassfish-ejb-api-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 java-virtuals/xmlrpc-api:0 java-virtuals/transaction-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Project GlassFish Enterprise JavaBean API
-EAPI=5
-HOMEPAGE=https://glassfish.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 java-virtuals/xmlrpc-api:0 java-virtuals/transaction-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-ejb-api-3.2.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c35cecd5e6ab0c1d335a3795f0121409
diff --git a/dev-java/glassfish-ejb-api/Manifest b/dev-java/glassfish-ejb-api/Manifest
new file mode 100644
index 000000000000..9dd4c219dbdf
--- /dev/null
+++ b/dev-java/glassfish-ejb-api/Manifest
@@ -0,0 +1,3 @@
+DIST glassfish-ejb-api-3.2.tar.xz 37052 BLAKE2B c281a98a98181c5f19d3d11830a4c67b818f1ea43b41f335ffb0181e43e1351d4279462d68151a7cd98ad0a040fa15e3102e7e01b66713ee46198bc2967d9b34 SHA512 1692bbff05242b0af5141b35151ff65f029e19f45c5dac07ed9b706635e3f42d8d512819f38a49b564c9dee51be33c36fb871ea5267000536a0fb1e1b5d6a00a
+EBUILD glassfish-ejb-api-3.2.ebuild 851 BLAKE2B a7165e1e4df20487e70360842e53fb1761deb4f59a3abcc382c671d49242b775ea7f60c8c16025ab0c2545b1f39d11b61b3c5ab560bfc69152e1d47635addd3d SHA512 f9558f5e3a1152d06360c99eb9e7c11772b19489528b0fda91001a7d871858b83e72214edd10431f626eb38fe6f94b06787fe40f95787b8f90888613c5cd37c3
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
new file mode 100644
index 000000000000..b02a9bfeab6f
--- /dev/null
+++ b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+TOMEE_PV="1.5.2"
+
+DESCRIPTION="Project GlassFish Enterprise JavaBean API"
+HOMEPAGE="https://glassfish.java.net/"
+SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="java-virtuals/xmlrpc-api:0
+	java-virtuals/transaction-api:0"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="xmlrpc-api,transaction-api"
+JAVA_PKG_BSFIX_NAME="maven-build.xml"
+
+src_install() {
+	java-pkg_newjar target/javax.ejb-api-${PV}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/javax
+}
diff --git a/dev-java/glassfish-ejb-api/metadata.xml b/dev-java/glassfish-ejb-api/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/glassfish-ejb-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/glassfish-interceptor-api-3.1 b/dev-java/glassfish-interceptor-api-3.1
deleted file mode 100644
index 991b76c48fbc..000000000000
--- a/dev-java/glassfish-interceptor-api-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Project GlassFish Interceptor API
-EAPI=5
-HOMEPAGE=https://glassfish.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-interceptor-api-3.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a2a5d2853eec8cc4ae3eefd2915f6c16
diff --git a/dev-java/glassfish-interceptor-api/Manifest b/dev-java/glassfish-interceptor-api/Manifest
new file mode 100644
index 000000000000..33f596483e64
--- /dev/null
+++ b/dev-java/glassfish-interceptor-api/Manifest
@@ -0,0 +1,4 @@
+AUX glassfish-interceptor-api-3.1-build.xml.patch 376 BLAKE2B 55ee41094ff5877474578e6ed77f1e5c8aae221b1080672de3f7bf2d949fda26f13bf43d891e899b61f1fc65032661831e6c5c2247e47901a07e80e48fd52961 SHA512 9c98831903c3f96df13a5ce0771a1064e9458f12f8e2a898758ccb63f0dbaab6047082dda5fa5a8e111c442536af28681eb712a6f4dc8844b388f721a0101c26
+DIST glassfish-interceptor-api-3.1.tar.xz 14600 BLAKE2B ef46f503a0a44650750f9cc53b51d02219779e2b1891c46179e07566a7ed359cb8ac455d2819bd22c5af7a78f33861a32e26c2cf977ebdac46f172e144c536dd SHA512 674f53d53afb63799c579b0ec177a009178315fb62f027441da14ceb5d6fa07408840ad82aa8fa7be31b53d43b53ff28ffb1617d644c989bc4ac17ce5e626563
+EBUILD glassfish-interceptor-api-3.1.ebuild 842 BLAKE2B a3faf04ee1ee021570566498c5eb713bdd93f6cc1543da35bcf392c1d57d74c6b71bde7a5f7aef8b6c9d55d416292c2da51dd12982c6541373def94c82683f14 SHA512 f4ebd4be93896f145936807b4b3ff68cf62684ffc5334a7e759ddd93cc48bdbe30b1746da312301ce44e3cb3b5e93b9444c74ebdbdf32354655fa03bff4f6fcd
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/glassfish-interceptor-api/files/glassfish-interceptor-api-3.1-build.xml.patch b/dev-java/glassfish-interceptor-api/files/glassfish-interceptor-api-3.1-build.xml.patch
new file mode 100644
index 000000000000..1a912da629c2
--- /dev/null
+++ b/dev-java/glassfish-interceptor-api/files/glassfish-interceptor-api-3.1-build.xml.patch
@@ -0,0 +1,10 @@
+--- a/maven-build.xml
++++ b/maven-build.xml
+@@ -166,7 +166,6 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/tmp/glassfish-interceptor-api-3.1/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html"/>
+   </target>
diff --git a/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild b/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
new file mode 100644
index 000000000000..33ed4ef1f8d2
--- /dev/null
+++ b/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+TOMEE_PV="1.5.2"
+
+DESCRIPTION="Project GlassFish Interceptor API"
+HOMEPAGE="https://glassfish.java.net/"
+SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH=""
+JAVA_PKG_BSFIX_NAME="maven-build.xml"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+}
+
+src_install() {
+	java-pkg_newjar target/javax.interceptor-api-${PV}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/javax
+}
diff --git a/dev-java/glassfish-interceptor-api/metadata.xml b/dev-java/glassfish-interceptor-api/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/glassfish-interceptor-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/glassfish-jms-api-1.1.2.2.04 b/dev-java/glassfish-jms-api-1.1.2.2.04
deleted file mode 100644
index 4efa12307a0f..000000000000
--- a/dev-java/glassfish-jms-api-1.1.2.2.04
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Transaction API
-EAPI=2
-HOMEPAGE=https://glassfish.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 x86
-LICENSE=|| ( CDDL GPL-2 )
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=df957e7ce7abec896bbfb20b3a1ccfa2
diff --git a/dev-java/glassfish-jms-api/Manifest b/dev-java/glassfish-jms-api/Manifest
new file mode 100644
index 000000000000..a1a0c74c4d8a
--- /dev/null
+++ b/dev-java/glassfish-jms-api/Manifest
@@ -0,0 +1,3 @@
+DIST glassfish-v2ur2-b04-src.zip 39817113 BLAKE2B 4aeb0df44f838c91fa8dd52e2a4985e86457f75cec3cd5d527de54f672afcd2824cefaad9d9e67c5ce096515e389bb2fc0874d76ce2ec86a956233f2c3508439 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8
+EBUILD glassfish-jms-api-1.1.2.2.04.ebuild 1235 BLAKE2B 553972605cc58642f29f0445f2a2080416c1cc1c7eb89f8c51f90ce2249205b605cd9d9bfbb329d5fb873ce3629e2373269994f82156d5477d0a741deabcc4a6 SHA512 f3ab5eb4ac6455d0dd577b4b1e295d8fed169e9962472989d816c85d3c3d029cc44d65e28e5e3a7170fe0af88d48e94284bd7596d0bb4d7315f0b18ea5d09446
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild
new file mode 100644
index 000000000000..a19cf3b26787
--- /dev/null
+++ b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Transaction API"
+HOMEPAGE="https://glassfish.dev.java.net/"
+MAJOR=v$(get_version_component_range 3-4)
+MAJOR=$(replace_version_separator 1 ur ${MAJOR})
+MY_PV=${MAJOR}-b$(get_version_component_range 5)
+MY_PN=${PN/-//}
+ZIP="glassfish-${MY_PV}-src.zip"
+SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
+
+LICENSE="|| ( CDDL GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_PN}
+
+src_unpack() {
+	unzip -q "${DISTDIR}/${ZIP}" "${MY_PN}/*" "glassfish/bootstrap/*" \
+		|| die "unpacking failed"
+	einfo "${S}"
+}
+
+EANT_BUILD_TARGET="all"
+EANT_EXTRA_ARGS="-Djavaee.jar=\"${S}/${PN}.jar\""
+EANT_DOC_TARGET=""
+
+src_compile() {
+	java-pkg-2_src_compile
+	if use doc; then
+		javadoc -d javadoc -sourcepath src/java -subpackages javax || die "javadoc failed"
+	fi
+}
+src_install() {
+	java-pkg_dojar *.jar
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/java/javax
+}
diff --git a/dev-java/glassfish-jms-api/metadata.xml b/dev-java/glassfish-jms-api/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/glassfish-jms-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/glassfish-persistence-1.0-r1 b/dev-java/glassfish-persistence-1.0-r1
deleted file mode 100644
index 33fc4a6513a5..000000000000
--- a/dev-java/glassfish-persistence-1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Glassfish implementation of persistence API
-EAPI=4
-HOMEPAGE=https://glassfish.java.net/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=be5a9cf69e89ba3b7e4e5117240d9fe0
diff --git a/dev-java/glassfish-persistence/Manifest b/dev-java/glassfish-persistence/Manifest
new file mode 100644
index 000000000000..1a0d0791c9f0
--- /dev/null
+++ b/dev-java/glassfish-persistence/Manifest
@@ -0,0 +1,4 @@
+AUX glassfish-persistence-1.0-python2.7-sax-parser.patch 286 BLAKE2B 49667ba4e41eadfea73fc8b53cf61f5fafd4654292ecd1b2e2b653411d252b1ff8bc40e6c9e0cd8fdd1375ba86a358495415a68ff1466f857d96cfd90ce5605a SHA512 ba7c32d86991407d45a86d640d95007cc47dcd28c74f441e38840206093653dc31e4824d4986cd9cd60d44fba0c1f4365f9348a9362529531fa9410e9fd5cad1
+DIST glassfish-9_0-b48-src.zip 35162972 BLAKE2B ff96f2135c6bbdc60eadab6a6bd60b623ac1a3635e4465591ee75f6c1229e83f9f6424b46e42eb333eb6edd3ba1aba51897ab80ca5bd5c754e516a27a03381d9 SHA512 512ccd1c89a1bbd88ca1e45b1e60693bd3c4a6c6ffa19376febb786eb73556f27bc0ce4f0e760d6d80b0711206f6701e7c7da70ef3a5e0084ad0482246506a48
+EBUILD glassfish-persistence-1.0-r1.ebuild 810 BLAKE2B 1deaeff209d96ac7c5fccf60e6c5f884e2aa5cccab66b2ca4d8a6e7144b800994e2feba13f878bae0369e439deb70d21b23f528ea9ed2a5c2d1047f82886226f SHA512 a28365904170c86507fc5f3be45de8e805bdfbdd3fe36d06bc7d6d46e332a98996297c3d2e0beb1447a2ebe32eb7e8946e4c6bcd47042d995bd30af04484154a
+MISC metadata.xml 214 BLAKE2B 5452fb11be445b7579865f9777af292067658bf101f6321db48ab1b478101fe031bb7914c6c24215bcdbe369dda396c164fcbbc4253ecb315de82141ee25f8b0 SHA512 d2b6ecfbbd79440de1909d9f195e5d4a6f9886b685ac1e6d7a1db39b8925b29942fac2998cde06040c921f2cc9ef2cbfbf836b60e191d894b00f75628476b1f7
diff --git a/dev-java/glassfish-persistence/files/glassfish-persistence-1.0-python2.7-sax-parser.patch b/dev-java/glassfish-persistence/files/glassfish-persistence-1.0-python2.7-sax-parser.patch
new file mode 100644
index 000000000000..51b1e8af9429
--- /dev/null
+++ b/dev-java/glassfish-persistence/files/glassfish-persistence-1.0-python2.7-sax-parser.patch
@@ -0,0 +1,11 @@
+--- glassfish/bootstrap/build.xml
++++ glassfish/bootstrap/build.xml
+@@ -23,7 +23,7 @@
+ -->
+ 
+ <!DOCTYPE project [
+-  <!ENTITY glassfish SYSTEM "file:./glassfish.xml">
++  <!ENTITY glassfish SYSTEM "file:glassfish.xml">
+ ]>
+ 
+ <project name="Top Level Build" default="all" basedir=".">  
diff --git a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
new file mode 100644
index 000000000000..cbb04e8d159b
--- /dev/null
+++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Glassfish implementation of persistence API"
+HOMEPAGE="https://glassfish.java.net/"
+SRC_URI="http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}/glassfish"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-python2.7-sax-parser.patch #414807
+}
+
+EANT_BUILD_XML="persistence-api/build.xml"
+EANT_BUILD_TARGET="all"
+
+src_install() {
+	cd "${WORKDIR}"/publish/glassfish || die
+	java-pkg_newjar lib/javaee.jar
+
+	insinto /usr/share/${PN}/lib/schemas
+	doins lib/schemas/*.xsd
+}
diff --git a/dev-java/glassfish-persistence/metadata.xml b/dev-java/glassfish-persistence/metadata.xml
new file mode 100644
index 000000000000..33a02ea0f34d
--- /dev/null
+++ b/dev-java/glassfish-persistence/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/glassfish-servlet-api-3.1.1 b/dev-java/glassfish-servlet-api-3.1.1
deleted file mode 100644
index b7c422e8d6b6..000000000000
--- a/dev-java/glassfish-servlet-api-3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Glassfish reference implementation of Servlet API 2.5 and JSP API 2.1
-EAPI=5
-HOMEPAGE=https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1.1
-SRC_URI=http://central.maven.org/maven2/org/glassfish/javax.servlet/3.1.1/javax.servlet-3.1.1-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=758ea5322735561666f7b30ae1c3d613
diff --git a/dev-java/glassfish-servlet-api/Manifest b/dev-java/glassfish-servlet-api/Manifest
new file mode 100644
index 000000000000..e20f3e25d753
--- /dev/null
+++ b/dev-java/glassfish-servlet-api/Manifest
@@ -0,0 +1,3 @@
+DIST javax.servlet-3.1.1-sources.jar 211576 BLAKE2B 5f416fe8f37e1d7b2c6fb43084b21217383157772030e7ec20df0d0326c8d50f881048057a5defd089c1ec199716bf290fb8f78099239b2df145a2dfff60b04e SHA512 7f152a389481e0381f041d97a6774a3e762a86b2a8a5413901c472fc2882b9cabd141dd85b46b8a7006cbe677c29c4caee09f3fc934afae857a6c1362efdc7bc
+EBUILD glassfish-servlet-api-3.1.1.ebuild 608 BLAKE2B 97d0fe7e2d7e3f8ac14b8622c25e378466b1e1d446d6df13e61303ea72c1b36b423738e7ac61fbac542a89c369486c4d5b4ffdc8c211f325179f26c668f677d7 SHA512 68b2bc37b97ee02a51967976f06f72a32b70f6ddce3cc16500287f4721ca48d24dc7be21007edac3afe0ae040865560e26f408bbaead24dccb94a0b9b1285d1e
+MISC metadata.xml 355 BLAKE2B c222865afffbd8128eafea6bcc339f7e2f96422c9553076af8a3fe55d7a22b325454f82a9fd5ff315746f3f0ccf3e064b865a39ffe73e2b9c17f872f8ae270d9 SHA512 b9c26b8c7f6da20985e7efbb24f8bebc579f7df31a75cbdc2e86184c91e56b11dac48314c067d89b09ae40b706284ae798c9bfacaee6ff24cae2250b19e981a6
diff --git a/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
new file mode 100644
index 000000000000..6c68b0fc5c67
--- /dev/null
+++ b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="javax.servlet"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Glassfish reference implementation of Servlet API 2.5 and JSP API 2.1"
+HOMEPAGE="https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html"
+SRC_URI="http://central.maven.org/maven2/org/glassfish/javax.servlet/${PV}/${MY_P}-sources.jar"
+LICENSE="CDDL"
+SLOT="3.1.1"
+KEYWORDS="amd64 ~ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/glassfish-servlet-api/metadata.xml b/dev-java/glassfish-servlet-api/metadata.xml
new file mode 100644
index 000000000000..76401653bada
--- /dev/null
+++ b/dev-java/glassfish-servlet-api/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+	The Glassfish Reference implementation of the Servlet/JSP API
+	specifications.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/glassfish-transaction-api-1.1.2.2.04-r1 b/dev-java/glassfish-transaction-api-1.1.2.2.04-r1
deleted file mode 100644
index 85cbda9c3371..000000000000
--- a/dev-java/glassfish-transaction-api-1.1.2.2.04-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Transaction API
-EAPI=6
-HOMEPAGE=https://glassfish.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=|| ( CDDL GPL-2 )
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c1b19c86026bb1e51a7bd778b0276b0b
diff --git a/dev-java/glassfish-transaction-api/Manifest b/dev-java/glassfish-transaction-api/Manifest
new file mode 100644
index 000000000000..05106b850f35
--- /dev/null
+++ b/dev-java/glassfish-transaction-api/Manifest
@@ -0,0 +1,3 @@
+DIST glassfish-v2ur2-b04-src.zip 39817113 BLAKE2B 4aeb0df44f838c91fa8dd52e2a4985e86457f75cec3cd5d527de54f672afcd2824cefaad9d9e67c5ce096515e389bb2fc0874d76ce2ec86a956233f2c3508439 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8
+EBUILD glassfish-transaction-api-1.1.2.2.04-r1.ebuild 903 BLAKE2B 18b306de152875fbad94346bd36a1073b3f3775ad8fa277a7656f74648a8c61ba500b10a02b730b18cec98ce0c6e0a58bf4ff1521a1f5c1ce4225261f7f2011a SHA512 1afb1d7abe18ede9c9d5aedae753b08c931e5a3eab7bc317716a33f853ab4d9431a636c949e87e92023c5fe1fee99dd7e47f0951b6e044414acfb23e20496e0f
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
new file mode 100644
index 000000000000..4ce2f85f2770
--- /dev/null
+++ b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-pkg-simple
+
+MAJOR=v$(get_version_component_range 3-4)
+MAJOR=$(replace_version_separator 1 ur ${MAJOR})
+MY_PV=${MAJOR}-b$(get_version_component_range 5)
+MY_PN=${PN/-//}
+ZIP="glassfish-${MY_PV}-src.zip"
+
+DESCRIPTION="Java Transaction API"
+HOMEPAGE="https://glassfish.dev.java.net/"
+
+SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
+
+LICENSE="|| ( CDDL GPL-2 )"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_unpack() {
+	default
+	unzip \
+		-q -o -f \
+		"${DISTDIR}/${ZIP}" \
+		"${MY_PN}/*" "glassfish/bootstrap/*" || die "unpacking failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/glassfish-transaction-api/metadata.xml b/dev-java/glassfish-transaction-api/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/glassfish-transaction-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/glassfish-xmlrpc-api-1.1.1 b/dev-java/glassfish-xmlrpc-api-1.1.1
deleted file mode 100644
index 38e2e238bc81..000000000000
--- a/dev-java/glassfish-xmlrpc-api-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Project GlassFish XML RPC API
-EAPI=5
-HOMEPAGE=https://glassfish.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-xmlrpc-api-1.1.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3c5a2c8cab7c937c2d95224f0887d6a0
diff --git a/dev-java/glassfish-xmlrpc-api/Manifest b/dev-java/glassfish-xmlrpc-api/Manifest
new file mode 100644
index 000000000000..d86eb94bccf1
--- /dev/null
+++ b/dev-java/glassfish-xmlrpc-api/Manifest
@@ -0,0 +1,3 @@
+DIST glassfish-xmlrpc-api-1.1.1.tar.xz 35180 BLAKE2B 6121f16400b0aab16c7926636ebcefbd9e363bc5c1d76fde575da468179e32a54722d9ac6d14582a8947c3f990dda50f209c8e09223ea684e0477984fbdcf597 SHA512 7de8d5959c0f9f09cca6a169d4e4293fca378aa497389e9a9a0af953b698322b9bbae6288b8cba2cd34abf58a0d0f4272294dcdf201a84ba5cc14d426843daa8
+EBUILD glassfish-xmlrpc-api-1.1.1.ebuild 802 BLAKE2B 4ffe7e89ee09908477759d19e0b9510f378c9d901f502d17d286ae2d27ba28d77416a5e28cb0944dedf86e91f5b791a36dfea04789c4ff734c1a9614dc11ec9b SHA512 f60e1c459c13a4f9e5978d9915d0b966fb0b614ae65005fdc6b099604c87f8792010f6850440b3a2e483ed5c551cf052eab6addbd915a3f2e96b0e478dc42f4f
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
new file mode 100644
index 000000000000..555477389da7
--- /dev/null
+++ b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+TOMEE_PV="1.5.2"
+
+DESCRIPTION="Project GlassFish XML RPC API"
+HOMEPAGE="https://glassfish.java.net/"
+SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="java-virtuals/servlet-api:3.0"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0"
+JAVA_PKG_BSFIX_NAME="maven-build.xml"
+
+src_install() {
+	java-pkg_newjar target/javax.xml.rpc-api-${PV}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/javax
+}
diff --git a/dev-java/glassfish-xmlrpc-api/metadata.xml b/dev-java/glassfish-xmlrpc-api/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/glassfish-xmlrpc-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/glazedlists-1.8.0-r1 b/dev-java/glazedlists-1.8.0-r1
deleted file mode 100644
index 91f1d8ec51b6..000000000000
--- a/dev-java/glazedlists-1.8.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A toolkit for list transformations
-EAPI=5
-HOMEPAGE=http://www.glazedlists.com/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( LGPL-2.1 MPL-1.1 )
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://java.net/downloads/glazedlists/glazedlists-1.8.0/glazedlists-1.8.0-source_java15.zip -> glazedlists-1.8.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fd7429e80100971ec78d110c3c2aa813
diff --git a/dev-java/glazedlists/Manifest b/dev-java/glazedlists/Manifest
new file mode 100644
index 000000000000..eec14bc9ba86
--- /dev/null
+++ b/dev-java/glazedlists/Manifest
@@ -0,0 +1,3 @@
+DIST glazedlists-1.8.0.zip 1169436 BLAKE2B 3784881079165832a321616e51a344a1c9a7378b8f903e883367739b559b5e3b9e7871d3bee4c6979eb7ce5ded9606fb45bf25310b7314f8dbbb500a8bf9ff93 SHA512 3fc3f339a248a8aad897409d752464d60b504474ae1e4d99fa7fbb41d767928137711d5d9979154b53d677e42746e2df2dfefdc71fa4a8017ec70ab23dc4b6a5
+EBUILD glazedlists-1.8.0-r1.ebuild 562 BLAKE2B 1149a1b88af2d560608c27ae7056cb045422645121b7ac8b42430232d8660bf9bd36fa0fc2abfe8dfc700942ebf798073bc53b951b82b1dc5e79ee39fa7019d2 SHA512 1f213795706916bc791025ad93cf1a00265288c97909bffc728883d13b0e897f0e983bd43b099454f68a1ead8e39fab82b0b486d83b8126906c5fbd412acd16a
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild b/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..d2517cd89f51
--- /dev/null
+++ b/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A toolkit for list transformations"
+HOMEPAGE="http://www.glazedlists.com/"
+SRC_URI="http://java.net/downloads/${PN}/${P}/${P}-source_java15.zip -> ${P}.zip"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_SRC_DIR="source"
+
+JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/glazedlists/metadata.xml b/dev-java/glazedlists/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/glazedlists/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/gnu-classpath-0.98-r6 b/dev-java/gnu-classpath-0.98-r6
deleted file mode 100644
index f872249325cd..000000000000
--- a/dev-java/gnu-classpath-0.98-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=app-arch/zip gtk? ( x11-base/xorg-proto x11-libs/libXrender >=x11-libs/libXtst-1.1.0 ) >=virtual/jdk-1.5 alsa? ( media-libs/alsa-lib ) dssi? ( >=media-libs/dssi-0.9 ) gconf? ( gnome-base/gconf:2= ) gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 ) gmp? ( >=dev-libs/gmp-4.2.4:0= ) gtk? ( >=x11-libs/gtk+-2.8:2= dev-libs/glib:2= media-libs/freetype:2= >=x11-libs/cairo-1.1.9:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango ) xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Free core class libraries for use with Java VMs and compilers
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/classpath
-IUSE=alsa debug doc dssi examples gconf +gjdoc gmp gtk xml elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.5 alsa? ( media-libs/alsa-lib ) dssi? ( >=media-libs/dssi-0.9 ) gconf? ( gnome-base/gconf:2= ) gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 ) gmp? ( >=dev-libs/gmp-4.2.4:0= ) gtk? ( >=x11-libs/gtk+-2.8:2= dev-libs/glib:2= media-libs/freetype:2= >=x11-libs/cairo-1.1.9:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango ) xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 ) >=dev-java/java-config-2.2.0-r3
-REQUIRED_USE=doc? ( gjdoc )
-SLOT=0.98
-SRC_URI=mirror://gnu/classpath/classpath-0.98.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=32d6ab8ed7ae1d21b2c33470d513c1c3
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
new file mode 100644
index 000000000000..4ca56d385d18
--- /dev/null
+++ b/dev-java/gnu-classpath/Manifest
@@ -0,0 +1,4 @@
+AUX gnu-classpath-0.98-freetype-2.5.3-support.patch 1192 BLAKE2B 18a8c2a6516def598c614a50c7c260c13ba7304a1d189ef0d0d7ffbea37b2c8972fdb0449eacfe49deb58c3aaaac44b36593d2b3df745066f64889a957e08d51 SHA512 5832a27caf0a064a29fb00a186d116193af98c0f2a97ef868be7ca0cab1aa51bd32df90f32ee43f9ecdbda52ea3b264f6f3bbd48d8b8f7cb4d1e0a1444f716fb
+DIST classpath-0.98.tar.gz 11021342 BLAKE2B 8bd0c55153569b34dfde767233ed48f6ebf0f507d34d991a410b0e40a2ddfbd20d4568697265f8544823337f568a916288e92c096b39fcd5c67afc82ddfc3cc3 SHA512 0d98f87cd78c166d566ecd8d0372f2d6cdf422e8c4c806ca01d3a77dafbdd80ee936de78a2c5d4226174027efdc053fe92669514bdd8acb3290a7b3ec002d31f
+EBUILD gnu-classpath-0.98-r6.ebuild 2958 BLAKE2B 2a2e72edc149a07ac7175888989a5257dd8f9fb48c719f2570bf18ac429622bf23480b9bf29104482ab08234e38f239e2aca14624f8e4e74a819193fff546f2b SHA512 590dfe5b99b2b61d6123d33795599f02d02fafc02ef6e033d1dcba667e211024db7771165f90ead624a779c9c2816d5af3932a583e9e212a977d065748a1cb15
+MISC metadata.xml 703 BLAKE2B 221917dd1d999eb06d4cd4d896f1ae60f06f425442c27cea566c2f19a4366064fc45545e43dd72983ae3810cb8c8753c128f3b690a5234910828dcda2f03131e SHA512 e97e2eb0800c588b0b50a108559cc164df1ae33f626b089c5ed93476e69ce0dc9d47f043988beed9db9c79e6bc9479f0923f8dfbd61c4a6c619dacc8d7863865
diff --git a/dev-java/gnu-classpath/files/gnu-classpath-0.98-freetype-2.5.3-support.patch b/dev-java/gnu-classpath/files/gnu-classpath-0.98-freetype-2.5.3-support.patch
new file mode 100644
index 000000000000..42828e2a4b8f
--- /dev/null
+++ b/dev-java/gnu-classpath/files/gnu-classpath-0.98-freetype-2.5.3-support.patch
@@ -0,0 +1,32 @@
+--- ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c.orig	2014-03-18 10:35:50.904133661 +0100
++++ ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	2014-03-18 10:37:03.808131298 +0100
+@@ -42,8 +42,9 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #include "jcl.h"
+ #include "gdkfont.h"
+ #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
+--- ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c.orig	2014-03-18 10:37:12.048131031 +0100
++++ ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	2014-03-18 10:37:58.416129528 +0100
+@@ -39,10 +39,11 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttypes.h>
+-#include <freetype/tttables.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TYPES_H
++#include FT_TRUETYPE_TABLES_H
+ #include "gdkfont.h"
+ #include "gtkpeer.h"
+ #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"
\ No newline at end of file
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
new file mode 100644
index 000000000000..9229206c5f76
--- /dev/null
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-2 multilib
+
+MY_P=${P/gnu-/}
+DESCRIPTION="Free core class libraries for use with Java VMs and compilers"
+SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
+HOMEPAGE="https://www.gnu.org/software/classpath"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0.98"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="alsa debug doc dssi examples gconf +gjdoc gmp gtk xml"
+REQUIRED_USE="doc? ( gjdoc )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+		dssi? ( >=media-libs/dssi-0.9 )
+		gconf? ( gnome-base/gconf:2= )
+		gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 )
+		gmp? ( >=dev-libs/gmp-4.2.4:0= )
+		gtk? (
+				>=x11-libs/gtk+-2.8:2=
+				dev-libs/glib:2=
+				media-libs/freetype:2=
+				>=x11-libs/cairo-1.1.9:=
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libX11
+				x11-libs/libXrandr
+				x11-libs/libXrender
+				x11-libs/libXtst
+				x11-libs/pango
+		)
+		xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 )"
+
+DEPEND="app-arch/zip
+		gtk? (
+			x11-base/xorg-proto
+			x11-libs/libXrender
+			>=x11-libs/libXtst-1.1.0
+		)
+		>=virtual/jdk-1.5
+		${RDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-freetype-2.5.3-support.patch
+}
+
+src_configure() {
+	# don't use econf, because it ends up putting things under /usr, which may
+	# collide with other slots of classpath
+	local myconf
+	if use gjdoc; then
+		local antlr=$(java-pkg_getjar antlr antlr.jar)
+		myconf="--with-antlr-jar=${antlr}"
+	fi
+
+	if use doc; then
+		# Avoid a cyclic dependency on gjdoc by building gjdoc before
+		# the docs. First we need to trick configure. Hack alert!
+		echo -e "#!/bin/sh\necho gjdoc 0.8" > tools/gjdoc.build || die
+		chmod 755 tools/gjdoc.build || die
+	fi
+
+	ANTLR= ./configure \
+		$(use_enable alsa) \
+		$(use_enable debug ) \
+		$(use_enable examples) \
+		$(use_enable gconf gconf-peer) \
+		$(use_enable gjdoc) \
+		$(use_enable gmp) \
+		$(use_enable gtk gtk-peer) \
+		$(use_enable xml xmlj) \
+		$(use_enable dssi ) \
+		$(use_with doc gjdoc "${S}/tools/gjdoc.build") \
+		--enable-jni \
+		--disable-dependency-tracking \
+		--disable-plugin \
+		--host=${CHOST} \
+		--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
+		--disable-Werror \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	if use doc; then
+		# Build gjdoc before the docs. We need to hack the real gjdoc
+		# script to run from the build directory instead.
+		sed -r "s:^(tools_dir=).*:\1${S}/tools:" tools/gjdoc > tools/gjdoc.build || die
+		emake -C lib
+		emake -C tools
+	fi
+
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
+	java-pkg_regjar /usr/${P}/share/classpath/glibj.zip
+
+	if use doc; then
+		# Strangely the Makefile doesn't install these.
+		insinto "/usr/${PN}-${SLOT}/share/classpath/api"
+		doins -r doc/api/html/*
+	fi
+}
diff --git a/dev-java/gnu-classpath/metadata.xml b/dev-java/gnu-classpath/metadata.xml
new file mode 100644
index 000000000000..da784f858243
--- /dev/null
+++ b/dev-java/gnu-classpath/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<use>
+		<flag name="alsa">Build with ALSA javax.sound.midi provider</flag>
+		<flag name="dssi">Build with DSSI javax.sound.midi provider</flag>
+		<flag name="gconf">Build with GConf preferences backend</flag>
+		<flag name="gmp">Build with GMP backend for java.math.BigInteger</flag>
+		<flag name="gjdoc">Build GJDoc, a documentation generator</flag>
+		<flag name="gtk">Build with Gtk+ AWT peers</flag>
+		<flag name="xml">Build with native XML backend</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-java/gnu-crypto-2.0.1-r2 b/dev-java/gnu-crypto-2.0.1-r2
deleted file mode 100644
index b815730e9741..000000000000
--- a/dev-java/gnu-crypto-2.0.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=GNU Crypto cryptographic primitives for Java
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/gnu-crypto/
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ee547c3d18484fe869df2f72adc6490a
diff --git a/dev-java/gnu-crypto-2.0.1-r3 b/dev-java/gnu-crypto-2.0.1-r3
deleted file mode 100644
index c6108deca82a..000000000000
--- a/dev-java/gnu-crypto-2.0.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=GNU Crypto cryptographic primitives for Java
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gnu-crypto/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cdc612efe97c59dc62eb1d5e84633bb4
diff --git a/dev-java/gnu-crypto/Manifest b/dev-java/gnu-crypto/Manifest
new file mode 100644
index 000000000000..9854fa901f07
--- /dev/null
+++ b/dev-java/gnu-crypto/Manifest
@@ -0,0 +1,5 @@
+AUX gnu-crypto-2.0.1-jdk15.patch 1551 BLAKE2B 9111fdc0ca8eff845c61a298b92fc1abc39c88caf0cbd04e2adb4ca50aa025a21c3f2694854df54c250505bab580cf40a40db9b67ab0ec881d65aa3baea3ca36 SHA512 f30f33e29bf400eb8bdd465ffd649fd2aec03ab6d3a315c5da2a8b6375524f1cc20f6ec3f813a9940fbdecf4364c8985bed946ada633d73bda9508c0dc198923
+DIST gnu-crypto-2.0.1.tar.bz2 3895714 BLAKE2B 4838f7aa58cbd34d97afb7f503a29b7393ae3085f1b83c8ae65110f20ff7143928351f0aaf2a61a2abb363f764dc67dbd12955fbd0f86dd685dafda550e0e7f1 SHA512 c14aa73fb23663559195e8fc7f85a220b25078fa8ab4e7cf43b84febe96599d990ccf52fcf1f6f66f2b547d9b644bbc99b3d44dc4a777dcb72530e58c8509015
+EBUILD gnu-crypto-2.0.1-r2.ebuild 1134 BLAKE2B 9381cf170ffe744c24f29a9098683d4da17071b5117efa95ea4840ac700e71751cc58d0344dec776adbe1b992c1bb2d49b37b8c66af7b05243cc2d3c37cc21e9 SHA512 34ab8c7a250c6b5e3c18338f53bd0e3ce6cac95fa659b174bf69c751fb764dbff883f55a270d37346f93689763e9c6f4e0e8d85e0e8c6fd526caf5cc5746ae09
+EBUILD gnu-crypto-2.0.1-r3.ebuild 1238 BLAKE2B 301eb79891ff1580da7fdafa88fc44e743a5df88e250d86606dcc02d647db5910bca22511c5875625b1a79bee5ea81b8c33cafc85b66adde0044b26024f54c25 SHA512 01b474db07874cd33fda2671c147c965f445e08c5c51b2ccd34377f34c639bf06fde2875762e1c4166d62de0f450bfac20c56e75d9793bc35b5f6b7bfccd2828
+MISC metadata.xml 535 BLAKE2B 2271d87cef0c6759b2e79d1f22025c8f5899990f5689f9e4343c45e1c039a22a7e242ca0adb95950899e222671dda176c1d5248b8f3d2a9134a58b481b7a5bb2 SHA512 113c98ec48fed10332c9677b90df1803bbcaae3311e5f71be6c681f89bb449618f66b11736bc76bfea5d21828671d30879fe56c49278e9f75b137c62ccb5eb22
diff --git a/dev-java/gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch b/dev-java/gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch
new file mode 100644
index 000000000000..47957cc5ec5f
--- /dev/null
+++ b/dev-java/gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch
@@ -0,0 +1,30 @@
+diff -Nur gnu-crypto-2.0.1/source/gnu/crypto/sasl/ClientMechanism.java gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ClientMechanism.java
+--- gnu-crypto-2.0.1/source/gnu/crypto/sasl/ClientMechanism.java	2003-11-21 10:22:10.000000000 +0100
++++ gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ClientMechanism.java	2005-05-24 16:16:37.493727834 +0200
+@@ -140,9 +140,9 @@
+       return mechanism;

+    }

+ 

+-   public Object getNegotiatedProperty(final String propName) throws SaslException {

++   public Object getNegotiatedProperty(final String propName) {

+       if (!isComplete()) {

+-         throw new IllegalMechanismStateException();

++         throw new IllegalStateException();

+       }

+       if (Sasl.QOP.equals(propName)) {

+          return getNegotiatedQOP();

+diff -Nur gnu-crypto-2.0.1/source/gnu/crypto/sasl/ServerMechanism.java gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ServerMechanism.java
+--- gnu-crypto-2.0.1/source/gnu/crypto/sasl/ServerMechanism.java	2003-11-21 10:26:14.000000000 +0100
++++ gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ServerMechanism.java	2005-05-24 16:16:55.503085024 +0200
+@@ -147,9 +147,9 @@
+       return this.authorizationID;

+    }

+ 

+-   public Object getNegotiatedProperty(final String propName) throws SaslException {

++   public Object getNegotiatedProperty(final String propName) {

+       if (!isComplete()) {

+-         throw new IllegalMechanismStateException();

++         throw new IllegalStateException();

+       }

+       if (Sasl.QOP.equals(propName)) {

+          return getNegotiatedQOP();

diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
new file mode 100644
index 000000000000..a193aa43cf2d
--- /dev/null
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 eutils
+
+DESCRIPTION="GNU Crypto cryptographic primitives for Java"
+HOMEPAGE="https://www.gnu.org/software/gnu-crypto/"
+SRC_URI="ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-jdk15.patch"
+}
+
+src_configure() {
+	# jikes support disabled, doesnt work: #86655
+	econf JAVAC="javac" JAVACFLAGS="$(java-pkg_javac-args)" --with-jce=yes --with-sasl=yes
+}
+
+src_compile() {
+	emake -j1
+	if use doc ; then
+		emake -j1 javadoc
+	fi
+}
+
+src_install() {
+	einstall
+	rm "${ED}"/usr/share/*.jar
+
+	java-pkg_dojar source/gnu-crypto.jar
+	java-pkg_dojar jce/javax-crypto.jar
+	java-pkg_dojar security/javax-security.jar
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc source/* jce/* security/*
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..e717650d7a82
--- /dev/null
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="GNU Crypto cryptographic primitives for Java"
+HOMEPAGE="https://www.gnu.org/software/gnu-crypto/"
+SRC_URI="ftp://ftp.gnupg.org/GnuPG/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+EANT_BUILD_XML="${S}/build.xml"
+EANT_BUILD_TARGET="jar"
+
+EANT_DOC_TARGET="javadoc"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-jdk15.patch"
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	local TEST_TARGETS=(
+		check
+		ent
+	)
+
+	for target in ${TEST_TARGETS[@]}; do
+		EANT_TEST_TARGET=${target} \
+			java-pkg-2_src_test
+	done
+}
+
+src_install() {
+	local GNU_CRYPTO_JARS=(
+		"${PN}"
+		javax-crypto
+		javax-security
+	)
+
+	if use test; then
+		GNU_CRYPTO_JARS=(${GNU_CRYPTO_JARS[@]} "${PN}-test")
+	fi
+
+	for jar in ${GNU_CRYPTO_JARS[@]}; do
+		java-pkg_dojar "lib/${jar}.jar"
+	done
+
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc source/* jce/* security/*
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
diff --git a/dev-java/gnu-crypto/metadata.xml b/dev-java/gnu-crypto/metadata.xml
new file mode 100644
index 000000000000..7f1fbbb089f6
--- /dev/null
+++ b/dev-java/gnu-crypto/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+GNU Crypto, part of the GNU project, released under the aegis of GNU,
+aims at providing free, versatile, high-quality, and provably correct
+implementations of cryptographic primitives and tools in the Java
+programming language for use by programmers and end-users.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/gnu-hylafax-1.0.3-r2 b/dev-java/gnu-hylafax-1.0.3-r2
deleted file mode 100644
index f6b7ff56d306..000000000000
--- a/dev-java/gnu-hylafax-1.0.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/commons-logging:0 dev-java/commons-cli:1 dev-java/oracle-javamail:0 dev-java/java-getopt:1 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java API designed to implement the client protocol portion of the hfaxd server
-EAPI=5
-HOMEPAGE=http://gnu-hylafax.sourceforge.net/
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/commons-cli:1 dev-java/oracle-javamail:0 dev-java/java-getopt:1 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/gnu-hylafax/gnu-hylafax/1.0.3/gnu-hylafax-1.0.3-bin.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9c3f3a282a0e32b335a5c07fcdc2e5b8
diff --git a/dev-java/gnu-hylafax/Manifest b/dev-java/gnu-hylafax/Manifest
new file mode 100644
index 000000000000..e2d57fd3ae83
--- /dev/null
+++ b/dev-java/gnu-hylafax/Manifest
@@ -0,0 +1,4 @@
+AUX gnu-hylafax-1.0.3-ClientPool.patch 1940 BLAKE2B 73c2b714938577e0916839b68d29e3a2b2bdff6eb1890af28f5c977889eb6cf4a10efc5e902361a31a05d0f636a23ead43ea9b06a10766475300a212cb39b1f6 SHA512 3c38ad5ea49b7db4870ed5e5e0742499e540481402d685d3d33f3650b33a6f900dc97a6d253fad5b22c1778c080e613b89671a2cf0a2257a9eaef921414e8597
+DIST gnu-hylafax-1.0.3-bin.tar.gz 1742697 BLAKE2B b17facac17157fddfa27c40f58738d51904e2858a5ec80fe36a39038d7301df8d9cd10bbe5fc537d340e9e3c2e69ae590f92ce2fa7e2b004218bc1fd84013624 SHA512 7af66dac5a1b98eddc3d60aa439809f4e683a39a795ca50d0f99f92d4fb17704ab5c7528218be1f4698bca0749efd46c5ec3510e8a10a68b1b77faf1997dc4a2
+EBUILD gnu-hylafax-1.0.3-r2.ebuild 1050 BLAKE2B 0e79c7203e34a4772880f5577ac0021d275116a062b4727f23ab66610e98bd7acbe5665ad3ec60dc69d214f0b9735e28b33b5b50ed151f1770c2b3f29deef729 SHA512 30f77fbb4e5b22fd18992143d01ce5c84239105bd82f5f0c0b0ce7ce9acc8db497a36188d39a6a17ee767daa4183592b145f54e6321baa2b54e62e015b414203
+MISC metadata.xml 317 BLAKE2B cc9118b2e5a41c9751856bf5bd36f48231440205835fa1dd6efd8dcb61efb4f7421c1b8f4e87e6f5c59fd3465215fbe00d7c22daea0ac41aa4085a124254e389 SHA512 f5e653f1ec56bcd9824f63d24fe9af1cae1ed854a5650ac458912cca536c8f98a64dc40f6563bf0e328020281a65049a52a58bb6b411828e1e23745161c765c4
diff --git a/dev-java/gnu-hylafax/files/gnu-hylafax-1.0.3-ClientPool.patch b/dev-java/gnu-hylafax/files/gnu-hylafax-1.0.3-ClientPool.patch
new file mode 100644
index 000000000000..51bae74646ed
--- /dev/null
+++ b/dev-java/gnu-hylafax/files/gnu-hylafax-1.0.3-ClientPool.patch
@@ -0,0 +1,70 @@
+--- gnu-hylafax-pool/main/java/gnu/hylafax/pool/ClientPool.java.orig	2015-04-14 18:20:17.113435400 +0000
++++ gnu-hylafax-pool/main/java/gnu/hylafax/pool/ClientPool.java	2015-04-14 18:20:58.310438791 +0000
+@@ -32,7 +32,7 @@
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ 
+-import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
++import java.util.concurrent.ConcurrentLinkedQueue;
+ 
+ public class ClientPool implements gnu.hylafax.ClientPool {
+ 
+@@ -42,7 +42,7 @@
+ 
+     private HashMap clientMap;
+ 
+-    private LinkedQueue clients;
++    private ConcurrentLinkedQueue clients;
+ 
+     private ClientPoolConfiguration configuration;
+ 
+@@ -66,7 +66,7 @@
+ 
+     public ClientPool(ClientPoolConfiguration configuration) {
+ 	this.configuration = configuration;
+-	clients = new LinkedQueue();
++	clients = new ConcurrentLinkedQueue();
+ 	clientMap = new HashMap();
+ 	workingClients = new HashSet();
+ 	workingClientsToClose = new HashSet();
+@@ -163,8 +163,7 @@
+ 			    blocked = true;
+ 			}
+ 
+-			client = (PooledClient) clients.poll(getConfiguration()
+-				.getRetryInterval());
++			client = (PooledClient) clients.poll();
+ 			if (client == null)
+ 			    log.warn("No Clients Available.");
+ 			else if (!clientAdded)
+@@ -172,10 +171,10 @@
+ 		    }
+ 
+ 		} else {
+-		    client = (PooledClient) clients.take();
++		    client = (PooledClient) clients.poll();
+ 		}
+ 	    }
+-	} catch (InterruptedException e) {
++	} catch (Exception e) {
+ 	    throw new ClientPoolException(
+ 		    "Interrupted Thread and No Free Connection Available.");
+ 	}
+@@ -294,7 +293,7 @@
+ 		    destroyClient(client);
+ 		    addClient();
+ 		} else {
+-		    clients.put(client);
++		    clients.offer(client);
+ 		    size++;
+ 		}
+ 	    }
+@@ -306,7 +305,7 @@
+ 
+ 	    log.debug("Released Client.");
+ 
+-	} catch (InterruptedException e) {
++	} catch (Exception e) {
+ 	    log.warn("Was Interrupted.", e);
+ 	    destroyClient(client);
+ 	} finally {
diff --git a/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild b/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..31cf502872d3
--- /dev/null
+++ b/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java API designed to implement the client protocol portion of the hfaxd server"
+HOMEPAGE="http://gnu-hylafax.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}-bin.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/commons-logging:0
+		dev-java/commons-cli:1
+		dev-java/oracle-javamail:0
+		dev-java/java-getopt:1
+		dev-java/log4j:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="
+	commons-logging
+	commons-cli-1
+	oracle-javamail
+	java-getopt-1
+	log4j"
+
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}"-ClientPool.patch #546502
+)
+
+java_prepare() {
+	rm -rv "${S}"/lib || die
+	find -name "pom.xml" -delete || die
+
+	# tarball contains the same sources in gnu-.../sources and gnu-.../main/
+	rm -r gnu-hylafax-*/sources || die
+
+	epatch "${PATCHES[@]}"
+}
diff --git a/dev-java/gnu-hylafax/metadata.xml b/dev-java/gnu-hylafax/metadata.xml
new file mode 100644
index 000000000000..84d73dab5436
--- /dev/null
+++ b/dev-java/gnu-hylafax/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gnu-hylafax</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/gnu-jaf-1.1.1 b/dev-java/gnu-jaf-1.1.1
deleted file mode 100644
index 337b72836156..000000000000
--- a/dev-java/gnu-jaf-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=GNU implementation of the JavaBeans Activation Framework
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/classpathx/jaf/jaf.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://gnu/classpathx/activation-1.1.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7df1d1e3c411f41e5dbb9033c4cb9a90
diff --git a/dev-java/gnu-jaf/Manifest b/dev-java/gnu-jaf/Manifest
new file mode 100644
index 000000000000..4972068e1f18
--- /dev/null
+++ b/dev-java/gnu-jaf/Manifest
@@ -0,0 +1,3 @@
+DIST activation-1.1.1.tar.gz 157018 BLAKE2B e9135b4c0996601c7963a46363e8ede3ba81e83e532637a92d83c89586eb52bd11be84ee37f5e8f31e372564f7c14aac4123726ba20712f5cef89a1e4bcd01f3 SHA512 d323644df13a4572bf1c10e7175c1c4cfa3078483886bba7b308989c215a23e12939b054124dbaf0437a4c5fdcb551b4e2189c09afc078218963389e4b3c3b7d
+EBUILD gnu-jaf-1.1.1.ebuild 731 BLAKE2B f2ab23950463b298efd7dbab11f349ca27bae59c50627554e32812fa3116a0e9a87d46afaa6f6f8e23855ef59bd14d282439be0b30fca2af2fbbb5ce024c485a SHA512 1241777ad76d678a5ba360492db4ca0771544a9f57cc41146e1c8813ebc1e8f08856014f850e0512a49f005f7e4c3ff9cbc1e2f06410524b7d7468ae2f734be0
+MISC metadata.xml 1072 BLAKE2B d6b9b7455a12a24c3e64b33f34faa427572e456c0d9c331137790d4db1aaf5bc0d870ff5f1bebf296804549cb69f7484d6536f1b7c4605a66331c08911f18cf5 SHA512 8116cd7f57a163402e1abef43f1abdef212914adda64de9a93585134bb232ad5ac0862f73a5422fa330d761d0c0429511a837ef8ae6b10a203b9de3302b830f3
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
new file mode 100644
index 000000000000..627436bc4b6c
--- /dev/null
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="GNU implementation of the JavaBeans Activation Framework"
+HOMEPAGE="https://www.gnu.org/software/classpathx/jaf/jaf.html"
+SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="1"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/activation-${PV}
+
+EANT_BUILD_TARGET="activation.jar"
+
+src_install() {
+	java-pkg_dojar activation.jar
+	dodoc AUTHORS ChangeLog || die
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc source/*
+}
diff --git a/dev-java/gnu-jaf/metadata.xml b/dev-java/gnu-jaf/metadata.xml
new file mode 100644
index 000000000000..bf709d02eb34
--- /dev/null
+++ b/dev-java/gnu-jaf/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+GNU JAF is a framework for declaring what beans operate on what MIME
+type data. Content handler beans can be defined to handle particular
+MIME content. The JAF unites internet standards for declaring content
+with JavaBeansâ„¢.
+
+The JAF defines two mechanisms within the framework. The first, the
+file type map, specifies the MIME content type for a given file. The
+default implementation of this uses the UNIX mime.types format to map
+filename extensions to MIME types. The second mechanism, the command
+map, specifies the actions that can be applied to a given MIME content
+type. The default implementation of this uses the standard mailcap format
+to map actions to JavaBeanâ„¢ classes. These beans can then view, edit,
+print, or perform whatever other action is required on the underlying
+resource.
+</longdescription>
+
+</pkgmetadata>
diff --git a/dev-java/gnu-regexp-1.1.4-r3 b/dev-java/gnu-regexp-1.1.4-r3
deleted file mode 100644
index aa072f9eed84..000000000000
--- a/dev-java/gnu-regexp-1.1.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/java-getopt:1 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=GNU regular expression package for Java
-EAPI=5
-HOMEPAGE=https://savannah.gnu.org/projects/gnu-regexp
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/java-getopt:1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://gentoo/gnu.regexp-1.1.4.tar.gz -> gnu-regexp-1.1.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8fe63b314a18cde78039058e7ed328ef
diff --git a/dev-java/gnu-regexp/Manifest b/dev-java/gnu-regexp/Manifest
new file mode 100644
index 000000000000..7ccddd7a1fbd
--- /dev/null
+++ b/dev-java/gnu-regexp/Manifest
@@ -0,0 +1,3 @@
+DIST gnu-regexp-1.1.4.tar.gz 164741 BLAKE2B b6183e8b12d283616d55112e0cbc8ca9de069c75b793066066606d2e824c4cd182de1e65c6529bc323a58717a7a72d4a97dc303d5a4572dfc53613c2a06adcad SHA512 4397ecd2a485f67213ee74e1c942a1bfd1af5f261f964546cb3c7bc32fe88702a557d717f07d2a4d7d1db2d684ddc4191c120b35b44d1a68a126f7b81d8b0331
+EBUILD gnu-regexp-1.1.4-r3.ebuild 883 BLAKE2B b15e67d2fc6e088d9858a0f188fabd24477aa1950d38660a269e58e5c0c7c02b3804b035c47f85d9183f5ea51b99bb1db48bd0738e2b3159557294190993e757 SHA512 ff33ca282254adde5c8ab22abf6248ad9423704e122e391af1b9171ea0c247cb3f9690ea46f7962e2ce355d3ec53f9684721578d037f998f751801e5cab9d875
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
new file mode 100644
index 000000000000..8787fe4bd8d8
--- /dev/null
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="gnu.regexp-${PV}"
+
+DESCRIPTION="GNU regular expression package for Java"
+HOMEPAGE="https://savannah.gnu.org/projects/gnu-regexp"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE=""
+
+CDEPEND="dev-java/java-getopt:1"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="java-getopt-1"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" src -name "*.properties"
+}
diff --git a/dev-java/gnu-regexp/metadata.xml b/dev-java/gnu-regexp/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/gnu-regexp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/gradle-bin-3.3 b/dev-java/gradle-bin-3.3
deleted file mode 100644
index 777c7f89110f..000000000000
--- a/dev-java/gradle-bin-3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/zip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A project automation and build tool with a Groovy based DSL
-EAPI=6
-HOMEPAGE=http://www.gradle.org/
-IUSE=source doc examples elibc_FreeBSD
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=3.3
-SRC_URI=http://services.gradle.org/distributions/gradle-3.3-all.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=65cc8ffcef61a9b17d739aeb4455b16a
diff --git a/dev-java/gradle-bin-3.4.1 b/dev-java/gradle-bin-3.4.1
deleted file mode 100644
index c068268685ff..000000000000
--- a/dev-java/gradle-bin-3.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/zip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A project automation and build tool with a Groovy based DSL
-EAPI=6
-HOMEPAGE=http://www.gradle.org/
-IUSE=source doc examples elibc_FreeBSD
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=3.4.1
-SRC_URI=http://services.gradle.org/distributions/gradle-3.4.1-all.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=930ef5ac3c1f13a3b806dcb46b50b2b1
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
new file mode 100644
index 000000000000..99b523216c45
--- /dev/null
+++ b/dev-java/gradle-bin/Manifest
@@ -0,0 +1,5 @@
+DIST gradle-3.3-all.zip 91388147 BLAKE2B 15539ec06cadcdaee9d54928381d5626bf06bae3251eb304fee095e6d0362f23759e99e3841dac2b9a1eed50b6057ecce78230dafb45711bfe764bf107b1f704 SHA512 4b852eaf4030c780516fe9214c289e49fc93fc62672da70b7fd6bbbcd128e6912dd196195ce32570984503ea53b48593a41fbf4ec69b0f18b5e32c2fe9e556b3
+DIST gradle-3.4.1-all.zip 91604607 BLAKE2B 1c4aaae4899f3faa94fc3ead84c4fd4bdb6212c0f579a255c7494896fd2a498890c58e853315892c3c9d78635b58da5423b1b2211b991639474d19eca1f2992f SHA512 bdaabf747e60ae1cf2c9fedb0730a2e3deb914609db05ffc7e4cbd5402bc44e84d2c98154f14fdd7f944c2f49eb5dead0f44c119ac5a16bd7491c3369d784f5c
+EBUILD gradle-bin-3.3.ebuild 1012 BLAKE2B 88db4b90f690e935665f3bcf06a292765ffaa72781fb14be7ee3f64a3f1b8b9dcb6184c8138419d14bc5f9af2ebebf12707582bb8765c33c4e5f37de67e8638e SHA512 a0a9d78d5fa7104f7a720ff7f8125d3b7b81fcfbc481f65c0a6e31fb97e7fcb50ec3b14c40e0262179a9f8175ff2726c2b051284662a7f4251e6f3babb5400f8
+EBUILD gradle-bin-3.4.1.ebuild 1020 BLAKE2B f388743943ab861566d3880d95df439f469b68c975085b167edc5fb99b214a165ecb1399dc5d61fc36d74371471af905f3276f6f14efc60eb8bb35ee164fd23d SHA512 0df5a41dd5f941a4b8058125fbfaed550b900ded90767a5252a236af7477ff5939ce7cc77cd1e171c311305c88b7664a4fcd9d615e43376750d298292a138d9c
+MISC metadata.xml 435 BLAKE2B 22a7527b15ef2974a3e389977eb4056c03f7575ec9866848b90ef9e98bb7d2d645e83408f0ab4cbb139699757e7e3a1b5eb458a389563597ae3fa0ff5c310c0b SHA512 2a8b7c438d8aed952350c0a08660bde349363bb80794de9197c7ac107409021c1e38f0168e13213d730c6251ed9e39f644c42d6de050f0e58e862efaa46b2a43
diff --git a/dev-java/gradle-bin/gradle-bin-3.3.ebuild b/dev-java/gradle-bin/gradle-bin-3.3.ebuild
new file mode 100644
index 000000000000..31bf0e3ac6a9
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-3.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
+HOMEPAGE="http://www.gradle.org/"
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.6"
+
+IUSE="source doc examples"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+
+	dodoc docs/release-notes.html getting-started.html
+
+	insinto "${gradle_dir}"
+
+	# source
+	if use source ; then
+		java-pkg_dosrc src/*
+	fi
+
+	# docs
+	if use doc ; then
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	# examples
+	if use examples ; then
+		java-pkg_doexamples samples
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${MY_PN}"
+}
diff --git a/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild b/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild
new file mode 100644
index 000000000000..c72fd357956f
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
+HOMEPAGE="http://www.gradle.org/"
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.6"
+
+IUSE="source doc examples"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+
+	dodoc docs/release-notes.html getting-started.html
+
+	insinto "${gradle_dir}"
+
+	# source
+	if use source ; then
+		java-pkg_dosrc src/*
+	fi
+
+	# docs
+	if use doc ; then
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	# examples
+	if use examples ; then
+		java-pkg_doexamples samples
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
+}
diff --git a/dev-java/gradle-bin/metadata.xml b/dev-java/gradle-bin/metadata.xml
new file mode 100644
index 000000000000..1b6bfaff005f
--- /dev/null
+++ b/dev-java/gradle-bin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>flo@geekplace.eu</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/groovy-2.4.5 b/dev-java/groovy-2.4.5
deleted file mode 100644
index ccfca0fd7f05..000000000000
--- a/dev-java/groovy-2.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/jansi:0 dev-java/xstream:0 dev-java/commons-cli:1 >=dev-java/asm-5.0.3:4 >=dev-java/antlr-2.7.7-r7:0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A multi-faceted language for the Java platform
-EAPI=5
-HOMEPAGE=http://www.groovy-lang.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jansi:0 dev-java/xstream:0 dev-java/commons-cli:1 >=dev-java/asm-5.0.3:4 >=dev-java/antlr-2.7.7-r7:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/apache/incubator-groovy/archive/GROOVY_2_4_5.zip -> groovy-2.4.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=636deafd57fcfbd6cd82f9dd82ab7929
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
new file mode 100644
index 000000000000..1ba81e219df2
--- /dev/null
+++ b/dev-java/groovy/Manifest
@@ -0,0 +1,4 @@
+AUX groovy-2.4.5-utils.gradle.patch 4345 BLAKE2B ad511b7dacdc57f01b716c8f164b4f3da8d59cc8c211e426f419c8e6448cf6376f9591401f8740c906ad021ee857b6085454302bec225880af09a474026b955d SHA512 81d39c1f7b537260721740cc807b9ffcf16b86b170fbc2bd9697f30ed3d77e995cb8beb35d67476137246882ba6f2962051878f032fe173f56c4db1e370aa6c1
+DIST groovy-2.4.5.zip 10214173 BLAKE2B 3402b93fc151beda7d1f397dcd522a71e3d2daaece12d96a02712ea18050c179ead1af0a4c42d7beb0b09a2db611a5b822220c3f4f103bf54b262bf7f83970a2 SHA512 055b664d2bc9966f9dd5933ec89f22c28c18323b57db66eeec524c88bdc6ea1090f6f1dd866433d7232d837ca31ca83164d8894c0db1d69e72c7d41f20a8382d
+EBUILD groovy-2.4.5.ebuild 3508 BLAKE2B b06e9b0087e75a16ced0a049f4044f8fd657e74688e7a07a07ad116e6ce3cd76eb0d8bfb22450404f1e5ec848da4a2ced9d9f712c8d724404399e072737261fc SHA512 2150e3f9ca4653e60188fa6dcebabbcc7e6f36564490940279be66d00e536de815c040192df963409943200a5322b045a34575e2227e71897b66c51f769ae1bb
+MISC metadata.xml 419 BLAKE2B 66f2e1884aa729905a50cdd56d68cfbadf12bf6c3bd8394e9478b6d43cb995d7322a40b169fdcbcebdb6b598f65601492a348163c2f890573b3514f33faafd78 SHA512 c1f92fe6cd6b5d539f8fe67d0143971ae9c1a228b7b8985fac6b4723482d2770e0b3d89d71b836b487995edb2c0326cc2ca8401bd94d3462c1ea76025150f762
diff --git a/dev-java/groovy/files/groovy-2.4.5-utils.gradle.patch b/dev-java/groovy/files/groovy-2.4.5-utils.gradle.patch
new file mode 100644
index 000000000000..6f4638a1bf1d
--- /dev/null
+++ b/dev-java/groovy/files/groovy-2.4.5-utils.gradle.patch
@@ -0,0 +1,116 @@
+--- gradle/utils.gradle.orig	2015-11-01 21:06:26.246486000 +0000
++++ gradle/utils.gradle	2015-11-01 21:06:57.719486000 +0000
+@@ -16,57 +16,47 @@
+  *  specific language governing permissions and limitations
+  *  under the License.
+  */
+-import org.codehaus.groovy.classgen.AnnotationVisitor
+-import org.objectweb.asm.ClassWriter
+-import org.objectweb.asm.FieldVisitor
+-import org.objectweb.asm.Label
+-import org.objectweb.asm.MethodVisitor
+-
+-import static org.objectweb.asm.Opcodes.*
+-
+-buildscript {
+-    repositories {
+-        mavenCentral()
+-    }
+-    dependencies {
+-        classpath "org.ow2.asm:asm:$asmVersion"
+-    }
+-}
++import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
++import static org.objectweb.asm.Opcodes.ACC_STATIC;
++import static org.objectweb.asm.Opcodes.ACC_SUPER;
++import static org.objectweb.asm.Opcodes.ALOAD;
++import static org.objectweb.asm.Opcodes.ATHROW;
++import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
++import static org.objectweb.asm.Opcodes.RETURN;
++import static org.objectweb.asm.Opcodes.V1_5;
++
++import java.io.File;
++import java.io.FileOutputStream;
++
++import org.objectweb.asm.ClassWriter;
++import org.objectweb.asm.Label;
++import org.objectweb.asm.MethodVisitor;
+ 
+-/**
+- * This tasks generates an utility class which allows sneaky throwing.
+- */
+-task exceptionUtils {
+-    ext.classFiles = [
+-            "${buildDir}/generated-classes/org/codehaus/groovy/runtime/ExceptionUtils.class",
+-            "${compileJava.destinationDir}/org/codehaus/groovy/runtime/ExceptionUtils.class"]
+-    outputs.files classFiles
++public class ExceptionUtils {
++	private final static String gentooClassDestination = "target/classes/org/codehaus/groovy/runtime/ExceptionUtils.class";
+ 
+-    doLast {
++	public static void main(String[] args) {
+         ClassWriter cw = new ClassWriter(0);
+-        FieldVisitor fv;
+         MethodVisitor mv;
+-        AnnotationVisitor av0;
+-
+-        cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, 'org/codehaus/groovy/runtime/ExceptionUtils', null, 'java/lang/Object', null);
+ 
+-        cw.visitSource('ExceptionUtils.java', null);
++        cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, "org/codehaus/groovy/runtime/ExceptionUtils", null, "java/lang/Object", null);
++        cw.visitSource("ExceptionUtils.java", null);	
+ 
+-        mv = cw.visitMethod(ACC_PUBLIC, '<init>', '()V', null, null);
++        mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+         mv.visitCode();
+         Label l0 = new Label();
+         mv.visitLabel(l0);
+         mv.visitLineNumber(18, l0);
+         mv.visitVarInsn(ALOAD, 0);
+-        mv.visitMethodInsn(INVOKESPECIAL, 'java/lang/Object', '<init>', '()V', false);
++        mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+         mv.visitInsn(RETURN);
+         Label l1 = new Label();
+         mv.visitLabel(l1);
+-        mv.visitLocalVariable('this', 'Lorg/codehaus/groovy/runtime/ExceptionUtils;', null, l0, l1, 0);
++        mv.visitLocalVariable("this", "Lorg/codehaus/groovy/runtime/ExceptionUtils;", null, l0, l1, 0);
+         mv.visitMaxs(1, 1);
+         mv.visitEnd();
+ 
+-        mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, 'sneakyThrow', '(Ljava/lang/Throwable;)V', null, null);
++        mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "sneakyThrow", "(Ljava/lang/Throwable;)V", null, null);
+         mv.visitCode();
+         Label l2 = new Label();
+         mv.visitLabel(l2);
+@@ -75,19 +65,21 @@
+         mv.visitInsn(ATHROW);
+         Label l3 = new Label();
+         mv.visitLabel(l3);
+-        mv.visitLocalVariable('e', 'Ljava/lang/Throwable;', null, l2, l3, 0);
++        mv.visitLocalVariable("e", "Ljava/lang/Throwable;", null, l2, l3, 0);
+         mv.visitMaxs(1, 1);
+         mv.visitEnd();
+ 
+         cw.visitEnd();
++        FileOutputStream fos = null;
+ 
+-        logger.lifecycle('Generating ExceptionUtils')
+-        classFiles.each { classFile ->
+-            def output = file(classFile)
+-            output.parentFile.mkdirs()
+-            output.withOutputStream {
+-                it << cw.toByteArray()
+-            }
+-        }
+-    }
++        File f = new File(gentooClassDestination);
++        f.getParentFile().mkdirs();
++        try {
++			fos = new FileOutputStream(f);
++			fos.write(cw.toByteArray());
++			fos.close();
++		} catch (Exception e) {
++			e.printStackTrace();
++		}
++	}
+ }
diff --git a/dev-java/groovy/groovy-2.4.5.ebuild b/dev-java/groovy/groovy-2.4.5.ebuild
new file mode 100644
index 000000000000..1f2ee906e067
--- /dev/null
+++ b/dev-java/groovy/groovy-2.4.5.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple versionator
+
+# Switch to ^^ when we switch to EAPI=6.
+#MY_PN="${PN^^}"
+MY_PN="GROOVY"
+MY_PV="$(replace_all_version_separators _ ${PV})"
+MY_P="${MY_PN}_${MY_PV}"
+
+DESCRIPTION="A multi-faceted language for the Java platform"
+HOMEPAGE="http://www.groovy-lang.org/"
+SRC_URI="https://github.com/apache/incubator-${PN}/archive/${MY_P}.zip -> ${P}.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/jansi:0
+	dev-java/xstream:0
+	dev-java/commons-cli:1
+	>=dev-java/asm-5.0.3:4
+	>=dev-java/antlr-2.7.7-r7:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_GENTOO_CLASSPATH="
+	asm-4
+	antlr
+	jansi
+	xstream
+	commons-cli-1
+"
+
+S="${WORKDIR}/incubator-${PN}-${MY_P}"
+
+# ExceptionUtil filename.
+EU="ExceptionUtils.java"
+
+# List of antlr grammar files.
+ANTLR_GRAMMAR_FILES=(
+	org/codehaus/groovy/antlr/groovy.g
+	org/codehaus/groovy/antlr/java/java.g
+)
+
+# Patches utils.gradle. It basically rewrites ExceptionUtils.
+PATCHES=(
+	"${FILESDIR}"/"${P}-utils.gradle.patch"
+)
+
+# Add target/classes to the CP as we're generating an extra class there.
+JAVA_GENTOO_CLASSPATH_EXTRA="target/classes"
+
+# This function cleans up the source directory.
+# We're ONLY interested in the "src/main" directory content and nothing else.
+# (for the time being).
+groovy_cleanup_source_files() {
+	ebegin "Cleaning up useless files"
+	mv src/main "${T}" || die
+	mv gradle/utils.gradle "${T}" || die
+	rm -rf * || die
+	mv "${T}"/main/* . || die
+	rm -rf "${T}"/main || die
+	eend $?
+}
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+	groovy_cleanup_source_files
+}
+
+# This function generates the ANTLR grammar files.
+generate_antlr_grammar() {
+	for grammar_file in "${@}"; do
+		local my_grammar_file=$(basename ${grammar_file})
+
+		einfo "Generating \"${my_grammar_file}\" grammar file"
+		local my_grammar_dir=$(dirname ${grammar_file})
+
+		cd "${S}/${my_grammar_dir}" || die
+		antlr ${my_grammar_file} || die
+
+		cd "${S}" || die
+	done
+}
+
+# This function generates ExceptionUtils.class.
+# ExceptionUtils is a helper class needed when compiling Groovy 2.x.
+# Normally, this class is generated via a Gradle task at compile time. Since we
+# don't use Gradle here.. we've translated it into a plain Java file and have
+# it generate the same data.
+generate_exceptionutils() {
+	ebegin "Copying ${EU}"
+	mv "${T}/utils.gradle" "${EU}" || die
+	eend $?
+
+	ejavac -classpath "$(java-pkg_getjar --build-only asm-4 asm.jar)" ${EU}
+
+	ebegin "Running ${EU%.java}"
+	$(java-config -J) -classpath "$(java-pkg_getjar --build-only asm-4 asm.jar):." ${EU%.java} || die
+	eend $?
+}
+
+src_compile() {
+	generate_antlr_grammar "${ANTLR_GRAMMAR_FILES[@]}"
+	generate_exceptionutils
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
+	java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
+	java-pkg-simple_src_install
+
+	# TODO: groovy console and groovy shell are parts of the "subprojects"
+	# directory. figure out a way to compile them. :\
+	# java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
+	# java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
+
+	# TODO: grape is written in groovy and to compile it, you need .. groovy.
+	# java-pkg_dolauncher "grape" --main org.codehaus.groovy.tools.GrapeMain
+}
diff --git a/dev-java/groovy/metadata.xml b/dev-java/groovy/metadata.xml
new file mode 100644
index 000000000000..b54150fc69c0
--- /dev/null
+++ b/dev-java/groovy/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">apache/incubator-groovy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/gson-2.3.1 b/dev-java/gson-2.3.1
deleted file mode 100644
index 5843182f1bf0..000000000000
--- a/dev-java/gson-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library to convert JSON to Java objects and vice-versa
-EAPI=5
-HOMEPAGE=https://github.com/google/gson
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.2.2
-SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/code/gson/gson/2.3.1/gson-2.3.1-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e452546422b1109e1631d3e022176d0e
diff --git a/dev-java/gson-2.6.2 b/dev-java/gson-2.6.2
deleted file mode 100644
index 4abb4962bb04..000000000000
--- a/dev-java/gson-2.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library to convert JSON to Java objects and vice-versa
-EAPI=5
-HOMEPAGE=https://github.com/google/gson
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.6
-SRC_URI=https://github.com/google/gson/archive/gson-parent-2.6.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7d63140218bd8ee15c35f50fa5ec344b
diff --git a/dev-java/gson-2.7 b/dev-java/gson-2.7
deleted file mode 100644
index cfdc5c29fbef..000000000000
--- a/dev-java/gson-2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library to convert JSON to Java objects and vice-versa
-EAPI=5
-HOMEPAGE=https://github.com/google/gson
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.7
-SRC_URI=https://github.com/google/gson/archive/gson-parent-2.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=64c9be3fc4727f8cc3d88fb3b4663112
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
new file mode 100644
index 000000000000..438dc209cfe5
--- /dev/null
+++ b/dev-java/gson/Manifest
@@ -0,0 +1,7 @@
+DIST gson-2.3.1-sources.jar 139924 BLAKE2B 11b1bcdad898b6e91e7ed902863be0682b57f7c4a12d93f16e0fe9481af9b1966ed60e03a54c43bade52bf93ca8185ab9809b4b8234d2236c4353a0ca4de95ba SHA512 a0423c03358a1d843806bc9367b1a328c147973247abfa47b956ab0409ae9542199f6402feb93155761fe538e5d0a79a095b8dad3ccd203c5be81e88713469ba
+DIST gson-parent-2.6.2.tar.gz 434949 BLAKE2B 0361c8465f41ff654ef474a54fb786ccd0c50ae7433afdddcc9bb65468ea0692ca20e3eb55ffd5d833dfe7771596fbfbe35828947b67662824609ee5917b73f0 SHA512 e4288b60ffaa3773e8025eb8b80ce08f44a197ebdc0ae767e20ed7b514fbc553abd2eea6eea7f949c01f780632273bb55f08fe1947475797b2135e2046cafaf5
+DIST gson-parent-2.7.tar.gz 437390 BLAKE2B 596331eb829797ecb172c55bef3bca0710c1461f504d1ff6170f332c3a77fbe8cf79b85b8ca16867040b86c46d6dcef09b0bf29d213fa82dfb911feeeeff57eb SHA512 663365566234bff0a94eac6ad4cd6e772b8fd542af2cccba2c2f75081935247eebf1a2502d5ce5dd0a0e75e140e17a689880a3aa04fa7c47a1e7bc834edd415e
+EBUILD gson-2.3.1.ebuild 536 BLAKE2B bc4f2c98f179d2ff4beb3bb099ff966cc2a01f7e9706317374084dbaad6983ba3101866654b11a660c7a6ec8bde345dd0301089b01983747d14443f9c56bedb3 SHA512 466b1580f80012d80b714b82e8ccff880a617bced82410f40c180f073b8f3f085844f7e20157d55df2db9088fd923a68aa9c5bea52044b439c85b4c8c02e5766
+EBUILD gson-2.6.2.ebuild 563 BLAKE2B e49f69a3c0e1148161385f2b0147e873c8fa9b7a8a67ce2b0119be0eebd694680c2b1eab9cfdaf94748f8ad69ba62a195a173cea7a1a14f4b8531a92396a825e SHA512 558bc49650b494ece65a8a2ca5b9b7ad0e1b1c3df2ce7b34e8707dd5449d55682e0de1b75ee563790ad3504b9b1ed24cbce0febc8be6076a28a0f042100923a8
+EBUILD gson-2.7.ebuild 563 BLAKE2B 080983fd859d0ccac5bd7cf006633218abb5c1b509c4f378eea50728d6b285284a653dc6a86f6c92eca4741e8ac8809855afa22c5de0b748fd60c756fbfb9c32 SHA512 f51da2521726272f18ba30950a39261826a2aaeceaee8dadbc3fe0e0ddf146c87cb274909f1a8feb22e7abfa65348e4f3090739b559bc7162275db37aa009161
+MISC metadata.xml 629 BLAKE2B 4e0b0c0f59d898923ef06924e2de1e5bab0cfed3ac891d739ddb16641f927ab878bcea986020c95d8c535114ec232260ddcba2e4100e0a6ff0d92284c66d73ba SHA512 66089434169cfb86acf2e024d61e4cbe90022350223111589d72de9301a6dfc2f3a66596e2e9e4ec4e91ec70932b3aa9ac0fb130f6c1a7ed47efd2e6b81fef76
diff --git a/dev-java/gson/gson-2.3.1.ebuild b/dev-java/gson/gson-2.3.1.ebuild
new file mode 100644
index 000000000000..7f9566410bf6
--- /dev/null
+++ b/dev-java/gson/gson-2.3.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library to convert JSON to Java objects and vice-versa"
+HOMEPAGE="https://github.com/google/gson"
+SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/code/${PN}/${PN}/${PV}/${P}-sources.jar"
+LICENSE="Apache-2.0"
+SLOT="2.2.2"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/gson/gson-2.6.2.ebuild b/dev-java/gson/gson-2.6.2.ebuild
new file mode 100644
index 000000000000..27e3552bd430
--- /dev/null
+++ b/dev-java/gson/gson-2.6.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P="${PN}-parent-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library to convert JSON to Java objects and vice-versa"
+HOMEPAGE="https://github.com/google/gson"
+SRC_URI="https://github.com/google/${PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.6"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+JAVA_SRC_DIR="${PN}/src/main/java"
diff --git a/dev-java/gson/gson-2.7.ebuild b/dev-java/gson/gson-2.7.ebuild
new file mode 100644
index 000000000000..fc8a91b02a0f
--- /dev/null
+++ b/dev-java/gson/gson-2.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P="${PN}-parent-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library to convert JSON to Java objects and vice-versa"
+HOMEPAGE="https://github.com/google/gson"
+SRC_URI="https://github.com/google/${PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.7"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+JAVA_SRC_DIR="${PN}/src/main/java"
diff --git a/dev-java/gson/metadata.xml b/dev-java/gson/metadata.xml
new file mode 100644
index 000000000000..695222f7cadc
--- /dev/null
+++ b/dev-java/gson/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>Gson is a Java library that can be used to convert Java Objects into their JSON representation. It can also be used to convert a JSON string to an equivalent Java object. Gson can work with arbitrary Java objects including pre-existing objects that you do not have source-code of.</longdescription>
+	<upstream>
+		<remote-id type="github">google/gson</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/guava-20.0 b/dev-java/guava-20.0
deleted file mode 100644
index ea1876aa2647..000000000000
--- a/dev-java/guava-20.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/animal-sniffer-annotations:0 dev-java/error-prone-annotations:0 dev-java/jsr305:0 >=virtual/jdk-1.7 dev-java/j2objc-annotations:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A collection of Google's core Java libraries
-EAPI=6
-HOMEPAGE=https://github.com/google/guava
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/animal-sniffer-annotations:0 dev-java/error-prone-annotations:0 dev-java/jsr305:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=20
-SRC_URI=https://github.com/google/guava/archive/v20.0.tar.gz -> guava-20.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2136c02cc697055e2432dec69c974046
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
new file mode 100644
index 000000000000..117986cf2742
--- /dev/null
+++ b/dev-java/guava/Manifest
@@ -0,0 +1,3 @@
+DIST guava-20.0.tar.gz 2522092 BLAKE2B 2ca76a71d0c169b80bfaa3e9847b2e465c57aabc0a67622a69519808fa8455146228747dc20e999ebc20ef7cd5fec1cfa82f6c025e9378011619cfedbc2c7d6c SHA512 e89eee8e66502f208878af286c660393712b12fb37647ec70719ca7c5184686c8dc5fc59d45c1813d792ecad9421e2c077dab075f76b1907c04f9f6e80567ac9
+EBUILD guava-20.0.ebuild 799 BLAKE2B ed6006c171950335d8dff74b33a641c3b409ba03391dc1dcf9821dc4fc0963a9fe7a0b019e89930cb9390f96d55b05da49d792f65bb946239f6d7c5a5cd0ef9b SHA512 cfcc6951ed61d81ebbd234cd5a0dbdd977fa55fedada69d92d10af95c3b1897f04f7dcb59cf72505f1693256a641174da3b0f9d73cfc26cdac3eb066f8fd5079
+MISC metadata.xml 588 BLAKE2B 4a8bbd786c9895bdbd44d2064ea31d6ef148fd2355870498c77c680232e1fcd4d6223b07e9f29dcaf4fa15d38509ba8912e6e15b8129ef7fca72c00a1fc2aad9 SHA512 8fc32c9a79d61e36376e681775094fbe99a378ac43cf7788fd132e2a9400b94b419480e509f55941857f92e99d68b9112889077823da24fa15c8cf0d2531a26d
diff --git a/dev-java/guava/guava-20.0.ebuild b/dev-java/guava/guava-20.0.ebuild
new file mode 100644
index 000000000000..b746ddba6c35
--- /dev/null
+++ b/dev-java/guava/guava-20.0.ebuild
@@ -0,0 +1,35 @@
+# 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="A collection of Google's core Java libraries"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="${PV%.*}"
+KEYWORDS="amd64 ~arm64 x86"
+
+CP_DEPEND="
+	dev-java/animal-sniffer-annotations:0
+	dev-java/error-prone-annotations:0
+	dev-java/jsr305:0
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.7
+	dev-java/j2objc-annotations:0"
+
+S="${WORKDIR}/${P}/${PN}"
+JAVA_SRC_DIR="src"
+
+src_configure() {
+	JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only j2objc-annotations)
+}
diff --git a/dev-java/guava/metadata.xml b/dev-java/guava/metadata.xml
new file mode 100644
index 000000000000..fe1b84dbf810
--- /dev/null
+++ b/dev-java/guava/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">The Guava project contains several of Google's core libraries that we rely on in our Java-based projects: collections, caching, primitives support, concurrency libraries, common annotations, string processing, I/O, and so forth.</longdescription>
+	<upstream>
+		<remote-id type="github">google/guava</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/guice-4.1 b/dev-java/guice-4.1
deleted file mode 100644
index 9a84d095d373..000000000000
--- a/dev-java/guice-4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/aopalliance:1 >=dev-java/asm-5:4 >=dev-java/cglib-3.1:3 dev-java/guava:20 dev-java/javax-inject:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A lightweight dependency injection framework for Java 5 and above
-EAPI=6
-HOMEPAGE=https://github.com/google/guice/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/aopalliance:1 >=dev-java/asm-5:4 >=dev-java/cglib-3.1:3 dev-java/guava:20 dev-java/javax-inject:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=4
-SRC_URI=https://github.com/google/guice/archive/4.1.tar.gz -> guice-4.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=280e009d0e788cb2c20b13e4b57cbca8
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
new file mode 100644
index 000000000000..22404862eb13
--- /dev/null
+++ b/dev-java/guice/Manifest
@@ -0,0 +1,3 @@
+DIST guice-4.1.tar.gz 23212767 BLAKE2B bab34da971c1a154eca468bbae4f32db97c0f7ce88bd66cea9c79ef08871db06877ab1ea6495c920977ae139af0bddef2fa4bef8ff5783d2bd53c736bfa07153 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00
+EBUILD guice-4.1.ebuild 1126 BLAKE2B 3233c7c0a85171eaa6d6a591c2522cc840dc412119a0f570e65cadbd110b77b2b4dce4b54af9ac8ea7b2daab409699975177a97b633bd1161a8c51a7269e5f9a SHA512 141d82a11d83dcca1913e2d573b0de7f9ce0f59e400637e282ef2e5aba39254cb52d20434a959d635730be23735bbb3606c0649d446dd849e5583bd533608bc5
+MISC metadata.xml 370 BLAKE2B 1947f66d04462084f7c9c854ad4b8be47d00994b30cde5b58393a182ca94fe2d5cdb78d9d65c2c3981c019a5fe0c3ad8971faca666f0cc6f5c0f0d8f8717e83f SHA512 609b5eac7886689f76a4ceb3dde48858b270bd66ba3c37129069194875a4f967134b46be02236a3103f159e1a2d591b18aac94351415b9611b25e4730cbb6332
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
new file mode 100644
index 000000000000..f6bb9b557587
--- /dev/null
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A lightweight dependency injection framework for Java 5 and above"
+HOMEPAGE="https://github.com/google/guice/"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="amd64 x86"
+RESTRICT="test"
+
+CP_DEPEND="dev-java/aopalliance:1
+	>=dev-java/asm-5:4
+	>=dev-java/cglib-3.1:3
+	dev-java/guava:20
+	dev-java/javax-inject:0"
+
+RDEPEND=">=virtual/jre-1.7
+	${CP_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CP_DEPEND}"
+
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_prepare() {
+	default
+
+	# Where could we get this FREAKIN jar?
+	java-pkg_clean ! -name "bnd-*.jar"
+}
+
+src_compile() {
+	EANT_BUILD_TARGET="compile manifest" java-pkg-2_src_compile
+	jar cfm ${PN}.jar build/META-INF/MANIFEST.MF -C build/classes . || die
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	dodoc {CONTRIBUTING,README}.md
+	use source && java-pkg_dosrc core/src/*
+}
diff --git a/dev-java/guice/metadata.xml b/dev-java/guice/metadata.xml
new file mode 100644
index 000000000000..e1f6796d80f7
--- /dev/null
+++ b/dev-java/guice/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">google-guice</remote-id>
+		<remote-id type="github">google/guice</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/hamcrest-core-1.1-r1 b/dev-java/hamcrest-core-1.1-r1
deleted file mode 100644
index 36cdc88796ec..000000000000
--- a/dev-java/hamcrest-core-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Library of matchers for building test expressions
-EAPI=5
-HOMEPAGE=https://github.com/hamcrest
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-macos ~x64-solaris
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.1.zip -> hamcrest-core-1.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f37f0ed8f3e982d6fbb7c3d4c6fd0083
diff --git a/dev-java/hamcrest-core-1.3 b/dev-java/hamcrest-core-1.3
deleted file mode 100644
index 9b6e577abce5..000000000000
--- a/dev-java/hamcrest-core-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 ~dev-java/hamcrest-generator-1.3 userland_GNU? ( sys-apps/findutils ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Core library of matchers for building test expressions
-EAPI=5
-HOMEPAGE=https://github.com/hamcrest
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.3
-SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a7697eb8da556cda1145177ba5032d57
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
new file mode 100644
index 000000000000..5741b3122ec3
--- /dev/null
+++ b/dev-java/hamcrest-core/Manifest
@@ -0,0 +1,7 @@
+AUX hamcrest-1.3-empty_generator.patch 1227 BLAKE2B 4e0bc6d085f6d26de9f2da8e09eb061c451a58d99385a2c41be28a137b209783affd76e1e0bd901a5497d40b290ac219d61046fc65931ea056c725ae0f835ee1 SHA512 766f57a449d4535432ab192c40a37ff9a09fe760b06ce5beb6a68b2b804c77ce232e8003fb3f3ef7b71df1cd2ceae7ff13fd3de28d20ec0ced1274c912d414b5
+AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb76d8c1c39266f6fb2f220849eeabec7ce5b084d2411c51102fa5b47853aed66acd6d237497c0c8bb2c688c93b7eb0785e27a3 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3
+DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
+DIST hamcrest-core-1.1.zip 1344232 BLAKE2B de9d346ff12ff29c4d1a13138eb8a80a527865b003f5d738cdfba4927714170720e2a778aecefeb895b82d0c40feeb1980c2ae5ab17a7caf2c27e19a0fcf6188 SHA512 af8d5d3a82df70a446f79f7247252595368820b0b54d8f612aa5b9bb3166c4664b97aaae338278f8f5d84add2d58d9c7a764e5e03a93588d3eba4472eaaa712b
+EBUILD hamcrest-core-1.1-r1.ebuild 726 BLAKE2B 0bf2ceff64edd7c6359d06c2019e34dfea5862c0055f86865162127ed8946dafb71481d7fa37786bc613386cae965df060448841805e8f4c599097e47c09fc9e SHA512 7fa43c784e0ce93356d60704e1e1146fbfb34448252ea9d94849749a6f876a99c830fd3154fa37692fb14b12f2dc67c995b9047e067e968e59ccab04f318dc0c
+EBUILD hamcrest-core-1.3.ebuild 1521 BLAKE2B b3f820d2a13406937497405865c7603d7985740a75f3c40e6ae6a3264d200c3b596921dfa844dbe550b8d0fce15e9318c629ba8658334a22fc9218039fc8139c SHA512 3416e84cda9a2c7939b9e61fcec5ae1663295568b541782f522d82f6ec2a16556416daaf3c31410e2368030c822852d211a86e3095a7406775e742730bdef3ec
+MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch b/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
new file mode 100644
index 000000000000..709bca62c02d
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
@@ -0,0 +1,21 @@
+--- a/build.xml	2012-07-02 21:14:09.000000000 +0200
++++ b/build.xml	2013-06-15 22:00:19.919038284 +0200
+@@ -12,18 +12,6 @@
+     </target>

+ 

+     <target name="generator" description="Build code generator tool">

+-        <java-to-jar srcdir="hamcrest-generator/src/main/java"

+-                     modulename="hamcrest-generator-nodeps"

+-                     classpath="lib/generator/qdox-1.12.jar"/>

+-

+-        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->

+-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>

+-        <jarjar jarfile="build/hamcrest-generator-${version}.jar">

+-            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>

+-            <zipfileset src="lib/generator/qdox-1.12.jar"/>

+-            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>

+-        </jarjar>

+-        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>

+     </target>

+ 

+     <target name="core" depends="generator" description="Build core Hamcrest library">

diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
new file mode 100644
index 000000000000..4f210ca3380a
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
@@ -0,0 +1,49 @@
+--- a/build.xml	2013-06-15 22:29:44.445548674 +0200
+++- b/build.xml	2013-06-15 22:30:45.098876635 +0200
+@@ -132,30 +132,15 @@
+     </target>

+ 

+     <target name="javadoc" description="build javadoc jars">

+-        <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>

+         <java-to-javadoc-jar modulename="hamcrest-core"/>

+-        <java-to-javadoc-jar modulename="hamcrest-library"/>

+-        <java-to-javadoc-jar modulename="hamcrest-integration"/>

+-        <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>

+ 

+         <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"

+                  destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"

+-                 windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">

++                 windowtitle="Hamcrest" source="1.6" failonerror="yes">

+-            <classpath>

+-                <fileset dir="lib/integration">

+-                    <include name="*.jar"/>

+-                </fileset>

+-            </classpath>

+             <packageset dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/>

+-            <packageset dir="build/temp/hamcrest-library-${version}-sources.jar.contents" excludes="org/hamcrest/internal"/>

+-            <packageset dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/>

+             

+             <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>

+             <group title="Matcher Library" packages="org.hamcrest.*"/>

+-            <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>

+-            

+-            <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>

+-            <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>

+         </javadoc>

+         <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">

+             <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>

+@@ -302,14 +287,7 @@
+                      destdir="build/temp/@{modulename}-${version}-javadoc.jar.contents" author="true" version="true" use="true"

+                      windowtitle="Hamcrest" source="1.6" failonerror="yes">

+                 <classpath>

+-                    <fileset dir="lib/integration">

+-                        <include name="*.jar"/>

+-                    </fileset>

+-                    <fileset file="lib/generator/qdox-1.12.jar"/>

+                     <fileset file="build/hamcrest-core-${version}.jar"/>

+-                    <fileset file="build/hamcrest-library-${version}.jar"/>

+-                    <fileset file="build/hamcrest-generator-${version}.jar"/>

+-                    <fileset file="build/hamcrest-integration-${version}.jar"/>

+                 </classpath>

+             </javadoc>

+             <jar jarfile="build/@{modulename}-${version}-javadoc.jar">

diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild
new file mode 100644
index 000000000000..78621915ae72
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Library of matchers for building test expressions"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.zip -> ${P}.zip"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
+
+JAVA_SRC_DIR="${PN}/src"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
new file mode 100644
index 000000000000..24bdc77cad61
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Core library of matchers for building test expressions"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+
+DEPEND=">=virtual/jdk-1.5
+	~dev-java/hamcrest-generator-${PV}
+	userland_GNU? ( sys-apps/findutils )"
+
+RDEPEND=">=virtual/jre-1.5"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
+
+EANT_BUILD_TARGET="core"
+
+java_prepare() {
+	# Empty out the contents of the generator target; it has already been built.
+	epatch "${FILESDIR}/hamcrest-1.3-empty_generator.patch"
+
+	# Fix problems with Javadoc target.
+	epatch "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch"
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
+
+	local cp="build/${P}.jar"
+	cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})"
+	EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
+}
+
+src_install() {
+	java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar
+
+	dodoc README.txt CHANGES.txt
+
+	use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-core/metadata.xml b/dev-java/hamcrest-core/metadata.xml
new file mode 100644
index 000000000000..b09ef005001e
--- /dev/null
+++ b/dev-java/hamcrest-core/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">hamcrest</remote-id>
+		<remote-id type="github">hamcrest/</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/hamcrest-generator-1.1 b/dev-java/hamcrest-generator-1.1
deleted file mode 100644
index 9b9706145a56..000000000000
--- a/dev-java/hamcrest-generator-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 userland_GNU? ( sys-apps/findutils ) dev-java/qdox:1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Code generator for Hamcrest's library of matchers for building test expressions
-EAPI=5
-HOMEPAGE=https://github.com/hamcrest
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.5 dev-java/qdox:1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=64c3adf7407c81579cd8276865bc0e21
diff --git a/dev-java/hamcrest-generator-1.3-r1 b/dev-java/hamcrest-generator-1.3-r1
deleted file mode 100644
index 2a201bfffe12..000000000000
--- a/dev-java/hamcrest-generator-1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 userland_GNU? ( sys-apps/findutils ) >=dev-java/qdox-1.12-r1:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Code generator for Hamcrest's library of matchers for building test expressions
-EAPI=5
-HOMEPAGE=https://github.com/hamcrest
-IUSE=elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.5 >=dev-java/qdox-1.12-r1:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.3
-SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a77cfb889d276a188ac6dbb14862921e
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
new file mode 100644
index 000000000000..85a205910e9f
--- /dev/null
+++ b/dev-java/hamcrest-generator/Manifest
@@ -0,0 +1,7 @@
+AUX 1.1-build.xml.patch 4213 BLAKE2B cf48828ccc8b46ce9488f79462492a03b1a3ec8b5c0b4a1d86b1b8ff2bc605034bfd70e22df09c82044c12d2d59e508e6d8fb775081c017e5b631214bdd6fd78 SHA512 a4b9bcf15588f41ba39ca5f2d9ab70ee1a19eb295904b4da96f3bf66ad83ca14b38f0866de6689e8f1a2cca0530c90301e2ec7d7a172e880f51be34251a3b18a
+AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f
+DIST hamcrest-1.1.tgz 1670123 BLAKE2B 2b1242a782949e084374918778c17f20b3b09746521949c12153cf1e599ab38a2a5a2bf0174d9676a8146cfab1e3f7c91a8a1b3ec829dd617f34f92c6852b931 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595
+DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
+EBUILD hamcrest-generator-1.1.ebuild 1274 BLAKE2B 717dff6fd73252c1c6d347e3aca112a3f6bd998ba06062c793c251356d59a943b43f73cba2410d2e5f22a341ac4836e4cd8ead1014bb07578cd9b4d59f7b4a1d SHA512 377f209ef46d2754954e01dd969ac04226c464584ec8d92ea76d36cc2ce1462ef49af2b7159dd1da82b8a1481b08fdff5f3973aea1b4652964e4d2c0ecfe48d1
+EBUILD hamcrest-generator-1.3-r1.ebuild 1339 BLAKE2B 77616c2e8d04bd08c1128536888bf8cee4c7bcdc025773222846b7924bff417c8657d0241de63d8264ba6b893cc37308db8fbdccb8df86bd55c996f319248404 SHA512 bb6112925539fd5844b85a3d746b095cf6c4583d95b1bc53d5a813790c1e0af120147939b5eb2b1478ae85bf5af1a9ca12f665904e3ecf3d58d8c4d96d8176d9
+MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-generator/files/1.1-build.xml.patch b/dev-java/hamcrest-generator/files/1.1-build.xml.patch
new file mode 100644
index 000000000000..c8f087ba8f12
--- /dev/null
+++ b/dev-java/hamcrest-generator/files/1.1-build.xml.patch
@@ -0,0 +1,93 @@
+diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
+index f819d3d..18fba83 100644
+--- a/hamcrest-1.1/build.xml
++++ b/hamcrest-1.1/build.xml
+@@ -28,18 +28,6 @@
+                      classpath="

+                        lib/generator/qdox-1.6.1.jar;

+                      "/>

+-        <taskdef name="jarjar"

+-                 classname="com.tonicsystems.jarjar.JarJarTask"

+-                 classpath="lib/generator/jarjar-1.0rc3.jar"/>

+-        <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care

+-             about it's existence. Uses JarJar to place classes under a different package

+-             to prevent conflict. -->

+-        <jarjar jarfile="build/hamcrest-generator-${version}.jar">

+-            <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>

+-            <zipfileset src="lib/generator/qdox-1.6.1.jar"/>

+-            <rule pattern="com.thoughtworks.qdox.**"

+-                  result="org.hamcrest.generator.qdox.@1"/>

+-        </jarjar>

+     </target>

+ 

+     <target name="core"

+@@ -94,16 +82,16 @@
+                      classpath="build/hamcrest-core-${version}.jar"/>

+     </target>

+ 

+-    <target name="text"
+-            depends="core, library"
+-            description="Build text pattern matcher">
+-        <java-to-jar srcdir="hamcrest-text/src/main/java"
+-                     destjar="build/hamcrest-text-${version}.jar"
+-                     classpath="
+-                        build/hamcrest-core-${version}.jar;
+-                        build/hamcrest-library-${version}.jar"/>
+-    </target>
+-	
++    <target name="text"

++            depends="core, library"

++            description="Build text pattern matcher">

++        <java-to-jar srcdir="hamcrest-text/src/main/java"

++                     destjar="build/hamcrest-text-${version}.jar"

++                     classpath="

++                        build/hamcrest-core-${version}.jar;

++                        build/hamcrest-library-${version}.jar"/>

++    </target>

++	

+     <target name="integration"

+             depends="core, library"

+             description="Build integration with external tools">

+@@ -121,7 +109,7 @@
+                      destjar="build/hamcrest-unit-test-${version}.jar"

+                      classpath="

+                         build/hamcrest-core-${version}.jar;

+-                        build/hamcrest-library-${version}.jar;
++                        build/hamcrest-library-${version}.jar;

+         				build/hamcrest-text-${version}.jar;

+                         build/hamcrest-integration-${version}.jar;

+                         build/hamcrest-generator-${version}.jar"/>

+@@ -164,7 +152,7 @@
+         <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">

+             <zipfileset src="build/hamcrest-core-${version}.jar"/>

+             <zipfileset src="build/hamcrest-library-${version}.jar"/>

+-            <zipfileset src="build/hamcrest-text-${version}.jar"/>
++            <zipfileset src="build/hamcrest-text-${version}.jar"/>

+             <zipfileset src="build/hamcrest-generator-${version}.jar"/>

+             <zipfileset src="build/hamcrest-integration-${version}.jar"/>

+         </jar>

+@@ -221,7 +209,7 @@
+ 

+ 			<packageset dir="hamcrest-core/src/main/java"/>

+ 			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>

+-			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
++			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>

+ 			<packageset dir="hamcrest-integration/src/main/java"/>

+ 			<packageset dir="build/generated-code"/>

+ 			

+@@ -251,14 +239,10 @@
+                 </classpath>

+             </javac>

+             <copy file="LICENSE.txt" todir="build/temp/@{destjar}.contents"/>

+-            <!-- Put Java source in Jars for user's convenience. -->

+-            <copy todir="build/temp/@{destjar}.contents">

+-                <fileset dir="@{srcdir}"/>

+-            </copy>

+             <jar jarfile="@{destjar}">

+                 <fileset dir="build/temp/@{destjar}.contents"/>

+             </jar>

+         </sequential>

+     </macrodef>

+ 

+-</project>
++</project>

diff --git a/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch b/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch
new file mode 100644
index 000000000000..6cd74732c2c0
--- /dev/null
+++ b/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch
@@ -0,0 +1,16 @@
+--- a/build.xml	2012-07-02 21:14:09.000000000 +0200
++++ b/build.xml	2013-06-15 21:39:55.005813436 +0200
+@@ -16,13 +16,6 @@
+                      modulename="hamcrest-generator-nodeps"

+                      classpath="lib/generator/qdox-1.12.jar"/>

+ 

+-        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->

+-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>

+-        <jarjar jarfile="build/hamcrest-generator-${version}.jar">

+-            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>

+-            <zipfileset src="lib/generator/qdox-1.12.jar"/>

+-            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>

+-        </jarjar>

+         <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>

+     </target>

+ 

diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
new file mode 100644
index 000000000000..19e54674594e
--- /dev/null
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/qdox:1.6"
+
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( sys-apps/findutils )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+EANT_BUILD_TARGET="generator"
+EANT_TEST_TARGET="unit-test"
+EANT_EXTRA_ARGS="-Dversion=${PV}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/temp/${PN}-${PV}-nodeps.jar"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PV}-build.xml.patch
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files"
+
+	# These jars must be symlinked.  Specifying them using gentoo.classpath
+	# does not work.
+	java-pkg_jar-from --into lib/generator qdox-1.6 qdox.jar qdox-1.6.1.jar
+}
+
+src_install() {
+	java-pkg_newjar build/temp/${PN}-${PV}-nodeps.jar ${PN}.jar
+
+	dodoc README.txt CHANGES.txt
+
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
new file mode 100644
index 000000000000..66c19578868e
--- /dev/null
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND=">=dev-java/qdox-1.12-r1:1.12"
+
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( sys-apps/findutils )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+EANT_BUILD_TARGET="generator"
+EANT_EXTRA_ARGS="-Dversion=${PV}"
+
+java_prepare() {
+	# Don't include source in JAR.  If a Gentoo user wants the source the source
+	# USE flag will be enabled.
+	epatch "${FILESDIR}/${P}-no_jarjar.patch"
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files"
+
+	# These jars must be symlinked.  Specifying them using gentoo.classpath
+	# does not work.
+	java-pkg_jar-from --into lib/generator qdox-1.12 qdox.jar qdox-1.12.jar
+}
+
+src_install() {
+	java-pkg_newjar build/${PN}-nodeps-${PV}.jar ${PN}.jar
+
+	dodoc README.txt CHANGES.txt
+
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-generator/metadata.xml b/dev-java/hamcrest-generator/metadata.xml
new file mode 100644
index 000000000000..b09ef005001e
--- /dev/null
+++ b/dev-java/hamcrest-generator/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">hamcrest</remote-id>
+		<remote-id type="github">hamcrest/</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/hamcrest-integration-1.3 b/dev-java/hamcrest-integration-1.3
deleted file mode 100644
index db7214b4ae1b..000000000000
--- a/dev-java/hamcrest-integration-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 userland_GNU? ( sys-apps/findutils ) dev-java/hamcrest-core:1.3 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Integration library of hamcrest
-EAPI=5
-HOMEPAGE=https://github.com/hamcrest
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:1.3 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.3
-SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=506784f7f4caf627bcb75869ac92a9ec
diff --git a/dev-java/hamcrest-integration/Manifest b/dev-java/hamcrest-integration/Manifest
new file mode 100644
index 000000000000..6ffda7fbc575
--- /dev/null
+++ b/dev-java/hamcrest-integration/Manifest
@@ -0,0 +1,4 @@
+AUX 1.3-remove-targets.patch 3721 BLAKE2B 9d7859da4694366577efbb6ef9a485fb40a1be67a0da3144a97fc7dd2e90c07b4d42665e164c3f7b544f21427f12366946fc400ad8484fa796d4afff488e0c89 SHA512 1af75ef60b6a6ac6a24d4725c548b34493968fd67d93c192867d9da6fa79c26a25ee68f1b2987008160100052d22aca5fde9440133566a55d630b241579f2463
+DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
+EBUILD hamcrest-integration-1.3.ebuild 1289 BLAKE2B 244fd2ba21a7f07b0b311a4d8d0ac0543cf94364fd9aadf730cb7a62f71280a44326e9d9d06228adc52b8d7c93d4645811bdaeec69a7a1dd09f5e82174cc4988 SHA512 6c145ecf5215028ec16eb7605182f6ea257427d09e4350f55f8a33b98b5ad65e6db5d5239c3d217df4d2536fe90cb8d34380ce2d8a551d8e971bcf8b8f95ef7a
+MISC metadata.xml 310 BLAKE2B 18f629f94221f2689e8e27ebd26be9a7fcb14a4a5ba2632b59e370dae8a13e25a7cff75b36b4eee5abee203f9c9d8ad012226928ce7300207b2fe7af151934d6 SHA512 04a1836dd5ab9e764bdde86a1944830b3e272ecba3a6ae7ee84e8128edeff96b5936bf3a7dcd133171b97ab1feac4a2ff639951168d0937e7b76a6958e566cef
diff --git a/dev-java/hamcrest-integration/files/1.3-remove-targets.patch b/dev-java/hamcrest-integration/files/1.3-remove-targets.patch
new file mode 100644
index 000000000000..e534eddfb750
--- /dev/null
+++ b/dev-java/hamcrest-integration/files/1.3-remove-targets.patch
@@ -0,0 +1,74 @@
+diff --git a/hamcrest-1.3/build.xml b/hamcrest-1.3/build.xml
+index 1cfd4fb..396ebc5 100644
+--- a/hamcrest-1.3/build.xml
++++ b/hamcrest-1.3/build.xml
+@@ -12,69 +12,14 @@
+     </target>

+ 

+     <target name="generator" description="Build code generator tool">

+-        <java-to-jar srcdir="hamcrest-generator/src/main/java"

+-                     modulename="hamcrest-generator-nodeps"

+-                     classpath="lib/generator/qdox-1.12.jar"/>

+-

+-        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->

+-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>

+-        <jarjar jarfile="build/hamcrest-generator-${version}.jar">

+-            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>

+-            <zipfileset src="lib/generator/qdox-1.12.jar"/>

+-            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>

+-        </jarjar>

+-        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>

+     </target>

+ 

+     <target name="core" depends="generator" description="Build core Hamcrest library">

+-        <java-to-jar srcdir="hamcrest-core/src/main/java" modulename="hamcrest-core"/>

+-

+-        <!-- Generate one class with all static imports -->

+-        <mkdir dir="build/temp/hamcrest-core/generated-code"/>

+-

+-        <java classname="org.hamcrest.generator.config.XmlConfigurator"

+-              fork="yes"

+-              failonerror="yes"

+-              classpath="

+-                build/hamcrest-core-${version}.jar;

+-                build/hamcrest-generator-${version}.jar;

+-              ">

+-            <arg value="core-matchers.xml"/>

+-            <arg value="hamcrest-core/src/main/java"/>

+-            <arg value="org.hamcrest.CoreMatchers"/>

+-            <arg value="build/temp/hamcrest-core/generated-code"/>

+-        </java>

+-        <!-- Append to core jar -->

+-        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"

+-                     modulename="hamcrest-core"

+-                     classpath="build/hamcrest-core-${version}.jar"/>

+     </target>

+ 

+     <target name="library"

+             depends="core,generator"

+             description="Build library of matchers">

+-        <mkdir dir="build/temp/hamcrest-library/generated-code"/>

+-        <java-to-jar srcdir="hamcrest-library/src/main/java"

+-                     modulename="hamcrest-library"

+-                     classpath="build/hamcrest-core-${version}.jar"/>

+-        <!-- Generate one class with all static imports -->

+-        <java classname="org.hamcrest.generator.config.XmlConfigurator"

+-              fork="yes"

+-              failonerror="yes"

+-              classpath="

+-                build/hamcrest-core-${version}.jar;

+-                build/hamcrest-generator-${version}.jar;

+-                build/hamcrest-library-${version}.jar;

+-              ">

+-            <arg value="matchers.xml"/>

+-            <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>

+-            <arg value="org.hamcrest.Matchers"/>

+-            <arg value="build/temp/hamcrest-library/generated-code"/>

+-        </java>

+-        <!-- Append to library jar -->

+-        <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"

+-                     modulename="hamcrest-library"

+-                     classpath="build/hamcrest-core-${version}.jar"/>

+     </target>

+ 

+     <target name="integration" depends="core, library" description="Build integration with external tools">

diff --git a/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild b/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild
new file mode 100644
index 000000000000..bb0548279c9a
--- /dev/null
+++ b/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN=${PN/-integration}
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Integration library of hamcrest"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/hamcrest-core:${SLOT}
+		dev-java/qdox:1.6
+		dev-java/easymock:3.2
+		dev-java/jmock:1.0"
+
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( sys-apps/findutils )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
+
+EANT_GENTOO_CLASSPATH="hamcrest-core:${SLOT},qdox:1.6,easymock:3.2,jmock:1.0"
+EANT_BUILD_TARGET="integration"
+EANT_EXTRA_ARGS="-Dversion=${PV}"
+EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar"
+
+java_prepare() {
+	# remove core+generator target as they are already built.
+	epatch "${FILESDIR}/${PV}-remove-targets.patch"
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-integration/metadata.xml b/dev-java/hamcrest-integration/metadata.xml
new file mode 100644
index 000000000000..7ee93b2f2b47
--- /dev/null
+++ b/dev-java/hamcrest-integration/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hamcrest/</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/hamcrest-library-1.3-r1 b/dev-java/hamcrest-library-1.3-r1
deleted file mode 100644
index b91fffc2422c..000000000000
--- a/dev-java/hamcrest-library-1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 userland_GNU? ( sys-apps/findutils ) dev-java/hamcrest-generator:1.3 dev-java/hamcrest-core:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Core library of matchers for building test expressions
-EAPI=5
-HOMEPAGE=https://github.com/hamcrest
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-generator:1.3 dev-java/hamcrest-core:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.3
-SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=afd7f1e2186c490b1c6aee1b6b57ac7f
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
new file mode 100644
index 000000000000..3256db6d3de8
--- /dev/null
+++ b/dev-java/hamcrest-library/Manifest
@@ -0,0 +1,4 @@
+AUX 1.3-remove-targets.patch 2263 BLAKE2B 17fb19da0f70f8d265a4e68f28ca530748af3372bcace0e7e04e04c46097abe2cf61265dd2b84f56467a83e0dc9c72bda2d94da25fa5abbb88f6f31f04d1321d SHA512 e403068cba91964dc7895c111a292a135ad27790da480c8779961075de559163052fa8ca5a997d3cfc278455ab3b8051bd3d4eb069f850dad2780a7ca974e551
+DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
+EBUILD hamcrest-library-1.3-r1.ebuild 1347 BLAKE2B 968339145ca9c96fefdd00cd2a1dc4653ba4233b2519fe4f95b205be42a941701bb54c4fd25506bca0930632544afcb2baaf0d7ebbdc122327b8c010aa0f4752 SHA512 11d211cdf75a7643d4ef7f856ea9200a6f7a14b3fddccd8704fe75e0b2629e0f7700d75a9f36023ad5d74c4596e4f2a09b60893354faa10db48a21e85b9c2a71
+MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-library/files/1.3-remove-targets.patch b/dev-java/hamcrest-library/files/1.3-remove-targets.patch
new file mode 100644
index 000000000000..6923b0bcc68e
--- /dev/null
+++ b/dev-java/hamcrest-library/files/1.3-remove-targets.patch
@@ -0,0 +1,47 @@
+diff --git a/build.xml b/build.xml
+index 1cfd4fb..185c563 100644
+--- a/build.xml
++++ b/build.xml
+@@ -12,42 +12,9 @@
+     </target>

+ 

+     <target name="generator" description="Build code generator tool">

+-        <java-to-jar srcdir="hamcrest-generator/src/main/java"

+-                     modulename="hamcrest-generator-nodeps"

+-                     classpath="lib/generator/qdox-1.12.jar"/>

+-

+-        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->

+-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>

+-        <jarjar jarfile="build/hamcrest-generator-${version}.jar">

+-            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>

+-            <zipfileset src="lib/generator/qdox-1.12.jar"/>

+-            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>

+-        </jarjar>

+-        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>

+     </target>

+ 

+     <target name="core" depends="generator" description="Build core Hamcrest library">

+-        <java-to-jar srcdir="hamcrest-core/src/main/java" modulename="hamcrest-core"/>

+-

+-        <!-- Generate one class with all static imports -->

+-        <mkdir dir="build/temp/hamcrest-core/generated-code"/>

+-

+-        <java classname="org.hamcrest.generator.config.XmlConfigurator"

+-              fork="yes"

+-              failonerror="yes"

+-              classpath="

+-                build/hamcrest-core-${version}.jar;

+-                build/hamcrest-generator-${version}.jar;

+-              ">

+-            <arg value="core-matchers.xml"/>

+-            <arg value="hamcrest-core/src/main/java"/>

+-            <arg value="org.hamcrest.CoreMatchers"/>

+-            <arg value="build/temp/hamcrest-core/generated-code"/>

+-        </java>

+-        <!-- Append to core jar -->

+-        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"

+-                     modulename="hamcrest-core"

+-                     classpath="build/hamcrest-core-${version}.jar"/>

+     </target>

+ 

+     <target name="library"

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
new file mode 100644
index 000000000000..89a57bc7315f
--- /dev/null
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN=${PN/-library}
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Core library of matchers for building test expressions"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+
+CDEPEND="
+	dev-java/hamcrest-generator:${SLOT}
+	dev-java/hamcrest-core:${SLOT}
+	dev-java/qdox:1.12
+"
+DEPEND=">=virtual/jdk-1.6
+	userland_GNU? ( sys-apps/findutils )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
+EANT_GENTOO_CLASSPATH="hamcrest-generator-${SLOT},hamcrest-core-${SLOT},qdox-1.12"
+EANT_BUILD_TARGET="library"
+EANT_EXTRA_ARGS="-Dversion=${PV}"
+EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar"
+
+java_prepare() {
+	# remove core+generator target as they are already built.
+	epatch "${FILESDIR}/${PV}-remove-targets.patch"
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
+}
+
+src_install() {
+	java-pkg_newjar build/${PN/core/library}-${PV}.jar ${PN/core/library}.jar
+
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-library/metadata.xml b/dev-java/hamcrest-library/metadata.xml
new file mode 100644
index 000000000000..b09ef005001e
--- /dev/null
+++ b/dev-java/hamcrest-library/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">hamcrest</remote-id>
+		<remote-id type="github">hamcrest/</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/hawtjni-runtime-1.10 b/dev-java/hawtjni-runtime-1.10
deleted file mode 100644
index fb344a252a22..000000000000
--- a/dev-java/hawtjni-runtime-1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A JNI code generator based on the generator used by the Eclipse SWT project
-EAPI=5
-HOMEPAGE=https://github.com/fusesource/hawtjni
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=776ac1a8a8f88648986db75a4f71da11
diff --git a/dev-java/hawtjni-runtime/Manifest b/dev-java/hawtjni-runtime/Manifest
new file mode 100644
index 000000000000..11db3db61481
--- /dev/null
+++ b/dev-java/hawtjni-runtime/Manifest
@@ -0,0 +1,3 @@
+DIST hawtjni-project-1.10.tar.gz 1602839 BLAKE2B 7a6a37c4c208906fc7718bbd1aec566bb2392ef0e0dc082aa552127e97af896ad39b2ecfcd124ac370593daecd69185c184838fafc374173320beee72d87fccb SHA512 3bd94d20bf2d8953c60753aa404077c96c93704c2bd5bebfb5fe790fc29e15d97f6172706f06cea13c4806b652405ccfef824cccf76ff018dafb7262ff845490
+EBUILD hawtjni-runtime-1.10.ebuild 698 BLAKE2B 8ebf66fa7c7e975e26cec25542089c005d14ffa03e3d326f9553516caead7d19ca21cab44a46067bf93ac7657c0d0850010c52c97ec30df92bcccc20d117d58f SHA512 c4a8179ea9c77c836118cd1f9d7340b689e840baf497dd23238ba4eb6baa2aa31f0ace2a08bfd9c05f8add8c2803c1c5a7622e0a9b86fee04eeab386376d3141
+MISC metadata.xml 329 BLAKE2B e78188cf60c43c68f0a74c8199be1b9fbca9d8db73a56ec2d7d4e820c4c483e4fe5eb6afe107524ae85960393f9ad5b07227f037ecba8b7562f92fa79af929f2 SHA512 20b714d09dfdd7430599b1d57d3a3831e86a22bbc3fb3b004dea2d0d9c6a230dcb74cbeeeb7301cf48493f0eb55ad736ab10cd247d329da4e4d02fa149566927
diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
new file mode 100644
index 000000000000..a3f08d3ca88e
--- /dev/null
+++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="hawtjni-project-${PV}"
+
+DESCRIPTION="A JNI code generator based on the generator used by the Eclipse SWT project"
+HOMEPAGE="https://github.com/fusesource/hawtjni"
+SRC_URI="https://github.com/fusesource/hawtjni/archive/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/hawtjni-${MY_P}/${PN}/src"
+JAVA_SRC_DIR="main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ../../{changelog,notice,readme}.md
+}
diff --git a/dev-java/hawtjni-runtime/metadata.xml b/dev-java/hawtjni-runtime/metadata.xml
new file mode 100644
index 000000000000..0f5b3e3ef21e
--- /dev/null
+++ b/dev-java/hawtjni-runtime/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fusesource/hawtjni</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/headius-options-1.1 b/dev-java/headius-options-1.1
deleted file mode 100644
index da8742a29e2a..000000000000
--- a/dev-java/headius-options-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A small library for managing sets of JVM properties
-EAPI=5
-HOMEPAGE=https://github.com/headius/options
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/headius/options/archive/options-1.1.tar.gz -> headius-options-1.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=10f0aa8de33acbb25d8a6def7b184f7a
diff --git a/dev-java/headius-options/Manifest b/dev-java/headius-options/Manifest
new file mode 100644
index 000000000000..f8c09b8b3005
--- /dev/null
+++ b/dev-java/headius-options/Manifest
@@ -0,0 +1,4 @@
+AUX headius-options-1.1-build.xml 9534 BLAKE2B 39b450a29528dc4272bf96412cc854da8861e117733671d9de9bee7957ff8ae18b5453004ff16696ce24a20c49148a318c5b92778a0a8822a8c86bd91ec8f87e SHA512 d0ddbef8e5b3cf77d9687e0ed704bea167d8ebe4cc849daf87f0f95a0088548dce21e1104f5aa93fb9049d53cd89327fc8824115d199f2c52886e2b8f854874c
+DIST headius-options-1.1.tar.gz 6590 BLAKE2B 71635dcbd6ee10987ab590edf2918d906b1171a148e7fa60d5be0901b20ecedab7fadf8f3d9e15d7fb61e955b698577501e3383a032c717d01c44942d54fedab SHA512 561be8ecf02e132436a94bf60595d66839c8e86f49c6a121f8714403fea6d22369f46dbfb15b7834a8430ac6aeaddf4e6aca5b0998c51e3b7ad71c60ac6c1bf4
+EBUILD headius-options-1.1.ebuild 993 BLAKE2B 1cf94c504cc09fc3b533cbb10c7b9d68ccd1defc06f8b8f05f6bab32f5becac989f279a98e961b6c7c7f9103704561426220e027491117b4dbd29e2d037293ed SHA512 e78f30288f1a034c6c04555f2eb3e1250f61068583fbee939bd3df8aa67851148a879a77351c89bf54c45df642d4439cc9711ec1fe495ccb6352ca0938595032
+MISC metadata.xml 326 BLAKE2B 672ec3d08fa9e8946820c2ddd4b8ce7cfb740a363a8fdd6a052acd287d1e99fa54e7ee8ab08a2ff5095f6be581a9a7c086d82179b742a637e35bb7940615d41f SHA512 fcdd1c355309839001898fb85882291e093e5cd66429abdd8117ad74478e53df81039f952d89508f0e827bf57b5b14ed40cb7cdff5e0fa54f349afc2b8c34535
diff --git a/dev-java/headius-options/files/headius-options-1.1-build.xml b/dev-java/headius-options/files/headius-options-1.1-build.xml
new file mode 100644
index 000000000000..2b3e6f661127
--- /dev/null
+++ b/dev-java/headius-options/files/headius-options-1.1-build.xml
@@ -0,0 +1,210 @@
+<?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/3/14 9:10 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="options-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="options-1.1"/>
+  <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"/>
+  <path id="build.test.classpath">
+    <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.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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"/>
+  </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}/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/headius-options/headius-options-1.1.ebuild b/dev-java/headius-options/headius-options-1.1.ebuild
new file mode 100644
index 000000000000..afd567018a47
--- /dev/null
+++ b/dev-java/headius-options/headius-options-1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A small library for managing sets of JVM properties"
+HOMEPAGE="https://github.com/headius/options"
+SRC_URI="https://github.com/headius/options/archive/options-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+S="${WORKDIR}/options-options-${PV}"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.7
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_TEST_GENTOO_CLASSPATH="ant-junit junit-4"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/options-${PV}.jar
+
+	dodoc README.md
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/com
+}
diff --git a/dev-java/headius-options/metadata.xml b/dev-java/headius-options/metadata.xml
new file mode 100644
index 000000000000..c44a38d0cd53
--- /dev/null
+++ b/dev-java/headius-options/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">headius/options</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/helpgui-1.1-r2 b/dev-java/helpgui-1.1-r2
deleted file mode 100644
index 50f591c5186d..000000000000
--- a/dev-java/helpgui-1.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=HelpGUI is a simple library which develop a help viewer component
-EAPI=5
-HOMEPAGE=http://helpgui.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/helpgui/helpgui-1.1-src.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a4b0bdb057e9a6871add066b92164699
diff --git a/dev-java/helpgui/Manifest b/dev-java/helpgui/Manifest
new file mode 100644
index 000000000000..9eb604162bf9
--- /dev/null
+++ b/dev-java/helpgui/Manifest
@@ -0,0 +1,3 @@
+DIST helpgui-1.1-src.jar 168356 BLAKE2B 4f14e4b7f7ffa91f80913dfaf5c395ac6f49b847f76a5cd75932ba07c2932aefc6964b907dddb2fcac6e0c888feb4c47dffac8b866922a0820ccafe23863ac3f SHA512 feb76605c841210cd9bfa140d22985a090e72712fad08e23963fee3f6e28cb6c198583bde8eae5999e80ed5e351ed8aa30dc5cd7318bd1817a4ba351a1c99a77
+EBUILD helpgui-1.1-r2.ebuild 701 BLAKE2B e639b3ede8a6e22da48a7915789ca69db1ce0b50bad916b9067778f0f3a160fbaeda72b9f1796298edb5c53614205e87d37d1ca40b2a24f15fcc7bee03eabd4b SHA512 9ab2f72a599679fc60fa36de77e1f8b67f0273a8cff5392c5ebac13ee0551575ab888d0aeb38fb1f94103729039ae4ae9c06b6b25ae0ff38e4def3e8acaa5848
+MISC metadata.xml 313 BLAKE2B 629ad9a15596a24dfacf2458cc4b4ebe8430c9ea47b235e88d5ae588eb7939a699f52ffb09f3a002e7013a118efa23c33b4e4bb53bf8cc6454fdd5aa72a28216 SHA512 c359d2269a1a5b9d1b9987366bbbfb678dfd4d35930b235b3e7463edbb9c90377c06ea23c3702f9d3978128b15b2efc7aa7f3a621ba464ca38e4f1a2f88407cf
diff --git a/dev-java/helpgui/helpgui-1.1-r2.ebuild b/dev-java/helpgui/helpgui-1.1-r2.ebuild
new file mode 100644
index 000000000000..114379b2a443
--- /dev/null
+++ b/dev-java/helpgui/helpgui-1.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="HelpGUI is a simple library which develop a help viewer component"
+HOMEPAGE="http://helpgui.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+EANT_BUILD_TARGET="helpgui_jar"
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+
+	dodoc README || die
+	use doc && java-pkg_dojavadoc build/docs/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/helpgui/metadata.xml b/dev-java/helpgui/metadata.xml
new file mode 100644
index 000000000000..e54689ff7887
--- /dev/null
+++ b/dev-java/helpgui/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">helpgui</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/hessian-4.0.37 b/dev-java/hessian-4.0.37
deleted file mode 100644
index 772725590d27..000000000000
--- a/dev-java/hessian-4.0.37
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=java-virtuals/servlet-api:3.0 >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Binary web service protocol
-EAPI=5
-HOMEPAGE=http://hessian.caucho.com/
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-1.1
-RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.0
-SRC_URI=http://hessian.caucho.com/download/hessian-4.0.37-src.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0c7f4a205359e997e998f9aeaf03e586
diff --git a/dev-java/hessian/Manifest b/dev-java/hessian/Manifest
new file mode 100644
index 000000000000..101b3f170d29
--- /dev/null
+++ b/dev-java/hessian/Manifest
@@ -0,0 +1,3 @@
+DIST hessian-4.0.37-src.jar 388678 BLAKE2B 6cfc347b09dbaf780ad44dde3c951e2e678624944c4c28bf50ae56786c4c99c7821562db391c2735649c1d215635a70cc0a5bec3ef76570b0c9f4ee9958a7518 SHA512 9d03293b596d7e352591a61ad9d464b29502ba6f2f2f9b275b80bfc609aa882a3b7304cdca99ea70c0b011da8acd51ec62e9480e2854a34c7691976e83074aaa
+EBUILD hessian-4.0.37.ebuild 613 BLAKE2B 37f4ea234f201ce8f30c07925df010835d0ea0986029baebcbb89b321caef8ad45d17df4ff6fb560f208ccc6cd494699ef67a5994a45fe19cecc18384a6fba3e SHA512 fe61f654149eb30642d8161b3f3a8ea1eb802c72842a9af52337faecd120f9d904ece2716b276d849b49c712d2ef8315b3c273ffbee7cd399d7bc78df991c6b7
+MISC metadata.xml 565 BLAKE2B d9d98c153a814d0cc7f6c8adaab57f49b948efd7a5203a7dc4a0cc605d2ce56f08f334183afb621d55ce6abaca6ba6b583b4f3229b327e845684e37507029b4d SHA512 272b1fb9ae815fa54ba11ee31b40199822487954ad3e3ed77f227cd736301f9cf5545d551898b963df52f6d3606ac195d077b052e6e314e918a1a9ac2abf7615
diff --git a/dev-java/hessian/hessian-4.0.37.ebuild b/dev-java/hessian/hessian-4.0.37.ebuild
new file mode 100644
index 000000000000..9b56e9f6f31f
--- /dev/null
+++ b/dev-java/hessian/hessian-4.0.37.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Binary web service protocol"
+HOMEPAGE="http://hessian.caucho.com/"
+SRC_URI="http://hessian.caucho.com/download/${P}-src.jar"
+
+LICENSE="Apache-1.1"
+SLOT="4.0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="doc source"
+
+CDEPEND="java-virtuals/servlet-api:3.0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="com"
+JAVA_GENTOO_CLASSPATH="servlet-api-3.0"
diff --git a/dev-java/hessian/metadata.xml b/dev-java/hessian/metadata.xml
new file mode 100644
index 000000000000..b78c29f337fa
--- /dev/null
+++ b/dev-java/hessian/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription>
+The Hessian binary web service protocol makes web services usable without
+requiring a large framework, and without learning yet another alphabet soup
+of protocols. Because it is a binary protocol, it is well-suited to sending
+binary data without any need to extend the protocol with attachments.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/higlayout-1.0-r2 b/dev-java/higlayout-1.0-r2
deleted file mode 100644
index edc4208d4b88..000000000000
--- a/dev-java/higlayout-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Swing layout manager that's powerful and easy to use
-EAPI=5
-HOMEPAGE=http://www.autel.cz/dmi/tutorial.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.autel.cz/dmi/HIGLayout1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8623e7b9fcd7dd820ae90fe3a86f7d77
diff --git a/dev-java/higlayout-1.0-r3 b/dev-java/higlayout-1.0-r3
deleted file mode 100644
index 499342cba34f..000000000000
--- a/dev-java/higlayout-1.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Swing layout manager that's powerful and easy to use
-EAPI=6
-HOMEPAGE=http://www.autel.cz/dmi/tutorial.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/HIGLayout1.0.zip -> higlayout-1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2820547607bbde13e12c200ea6c1605f
diff --git a/dev-java/higlayout/Manifest b/dev-java/higlayout/Manifest
new file mode 100644
index 000000000000..98068978da69
--- /dev/null
+++ b/dev-java/higlayout/Manifest
@@ -0,0 +1,5 @@
+DIST HIGLayout1.0.zip 78855 BLAKE2B 71150d00c8fa01f3820c845abc5fc66b00b9ecb40fec2d70bdd103a39db8857a91b107fc611f486b0d22d6feb9d600841ae02585b20a339a4b6313ac604c7e14 SHA512 13707cee5ba341b8f47bf97525fcecc5ad7d375f5f816f2b2ed6ed38ae398679e39dcf12e4cf135037b46ac94e7ccc17d34ad9c2671b6d4181e3e9cbc50cd58e
+DIST higlayout-1.0.zip 78855 BLAKE2B 71150d00c8fa01f3820c845abc5fc66b00b9ecb40fec2d70bdd103a39db8857a91b107fc611f486b0d22d6feb9d600841ae02585b20a339a4b6313ac604c7e14 SHA512 13707cee5ba341b8f47bf97525fcecc5ad7d375f5f816f2b2ed6ed38ae398679e39dcf12e4cf135037b46ac94e7ccc17d34ad9c2671b6d4181e3e9cbc50cd58e
+EBUILD higlayout-1.0-r2.ebuild 789 BLAKE2B 0b1a134bbb20b7d2d5e5458f826da7e610d601c1d4952746307840d48f4de5e352fa394e62304a9b5af5e4c7a2baa695ea33fd5fc2b54189b052f6dd5c4e457e SHA512 385e04279a658d2a059d4c8574086cb5268e96228073717b8089fa2d644534172ee0c25c1ea0155448c078ef92e834a53e2111d07647f31d310f47de199ba10c
+EBUILD higlayout-1.0-r3.ebuild 751 BLAKE2B 3fce1918ad8cc3b931d285d7de87b76b9234791afa5cec0a384301854660dfadb4fc6bbfca462f5c38c9c515bec3597ba91d7f26c3ad26b2dcda2c632623e200 SHA512 375a1fa95aa2ac538f1c877fc030d805afeee2c5d42f42b6926680cf2dcf732a9560ce5f83aad3c98de28ecbb43f7836c95a00ef8c0eb07b02b3e4e5ffba50be
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/higlayout/higlayout-1.0-r2.ebuild b/dev-java/higlayout/higlayout-1.0-r2.ebuild
new file mode 100644
index 000000000000..e42e005e2433
--- /dev/null
+++ b/dev-java/higlayout/higlayout-1.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Swing layout manager that's powerful and easy to use"
+
+HOMEPAGE="http://www.autel.cz/dmi/tutorial.html"
+SRC_URI="http://www.autel.cz/dmi/HIGLayout${PV}.zip"
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	cd tutorial || die
+	for d in *.GIF;
+	do
+		mv $d $(basename $d .GIF).gif || die
+	done
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+}
diff --git a/dev-java/higlayout/higlayout-1.0-r3.ebuild b/dev-java/higlayout/higlayout-1.0-r3.ebuild
new file mode 100644
index 000000000000..a94242c71e2d
--- /dev/null
+++ b/dev-java/higlayout/higlayout-1.0-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Swing layout manager that's powerful and easy to use"
+HOMEPAGE="http://www.autel.cz/dmi/tutorial.html"
+SRC_URI="mirror://gentoo/HIGLayout${PV}.zip -> ${P}.zip"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+DOCS=( Changes.txt readme.txt )
+
+src_prepare() {
+	default
+	cd tutorial || die
+	for d in *.GIF; do
+		mv "${d}" $(basename ${d} .GIF).gif || die
+	done
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples examples
+	einstalldocs
+}
diff --git a/dev-java/higlayout/metadata.xml b/dev-java/higlayout/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/higlayout/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/hoteqn-4.0.0-r1 b/dev-java/hoteqn-4.0.0-r1
deleted file mode 100644
index 2f817d42824b..000000000000
--- a/dev-java/hoteqn-4.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java applet to view and display LaTeX mathematical equations
-EAPI=5
-HOMEPAGE=http://www.atp.ruhr-uni-bochum.de/VCLab/software/HotEqn/HotEqn.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/hoteqn-4.0.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c5c8730b17b5e42efb869faf368fb104
diff --git a/dev-java/hoteqn/Manifest b/dev-java/hoteqn/Manifest
new file mode 100644
index 000000000000..12c4f2419238
--- /dev/null
+++ b/dev-java/hoteqn/Manifest
@@ -0,0 +1,3 @@
+DIST hoteqn-4.0.0.tar.bz2 98714 BLAKE2B 7b9f7c606475331b1ad1e27ac829bddb15ef2b9bc7bb8b7fa51d7138824914794cf49d8cbba0b5e3529ad44d2244c01cfb2833e636021776e246a9eeeeeef69d SHA512 a0277340bec5ca0c5535d79e091218b88eb7d3c809859fc234de59b65d3b8b6c00fac667e00f3a2f6d0b3613f8a079bdfe7ea7e40a1bf484797a09a59de0323d
+EBUILD hoteqn-4.0.0-r1.ebuild 744 BLAKE2B f85b81b97138f3012d2f73fa0049cdc2de8a1baee744820f11d844dab2278210d9d7795294e50f0241d455f11d435a9e35c05bcb11814503fd19d3c102f5e0b3 SHA512 e40ba28a2e2401ae7ce6160371883381b57070f5d61b12f24b5db5c32e0b62a2eacbb7bfe1f2f4807d7c2c3c163fab12f9fd0bef940ea371cf037e6698651488
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild b/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..be485169ede2
--- /dev/null
+++ b/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java applet to view and display LaTeX mathematical equations"
+HOMEPAGE="http://www.atp.ruhr-uni-bochum.de/VCLab/software/HotEqn/HotEqn.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT=0
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_ENCODING="ISO-8859-1"
+
+S="${WORKDIR}/${P}"
+
+java_prepare() {
+	rm -v mHotEqn.java || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" classes/ -name "*.gif"
+}
diff --git a/dev-java/hoteqn/metadata.xml b/dev-java/hoteqn/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/hoteqn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/htmlcleaner-2.13 b/dev-java/htmlcleaner-2.13
deleted file mode 100644
index bd05a104030a..000000000000
--- a/dev-java/htmlcleaner-2.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/jdom:2 app-arch/unzip dev-java/ant-core:0 test? ( dev-java/junit:4 ) >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=HTML parser written in Java that can be used as a tool, library or Ant task
-EAPI=5
-HOMEPAGE=http://htmlcleaner.sourceforge.net/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-java/jdom:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/htmlcleaner/files/htmlcleaner-2.13-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c838b539b9d9f7822404768a74a60d32
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
new file mode 100644
index 000000000000..92a5d5accd47
--- /dev/null
+++ b/dev-java/htmlcleaner/Manifest
@@ -0,0 +1,3 @@
+DIST htmlcleaner-2.13-src.zip 346998 BLAKE2B 883a2550b9ddc0f56d88b1a412b2d9f809e0bb53d56827104aad99f15b4fc5c7f6c88b37cd10dbea5d05e27bc650d93f038142c66ea97ab0bb1bcea810bb40c5 SHA512 bf9cc014688ebb20b0bafba82fc710f25c1db8c173dd3e9f742c31c64f127c3c89b29b151e64a3368b04d278733cce8828831f297834ca9b872a60951e0a2d47
+EBUILD htmlcleaner-2.13.ebuild 1573 BLAKE2B eb12dab9e8eea8a01dea91730b9ee4c233da3e22c9deb9a566cf39a4abdd435ac4bfc4080d78bcb06938bc671d4c13534a8835ab4c649c1eb9e1fe7f70be4d9f SHA512 c5b00de839e7f61bcf4529266882af9194ad703c54503d8f70361439841fa28ad59f6d9cbd1350d10c35434f4818f0c3c829ee1cadfdebd4e9e1ae1ec9ae8870
+MISC metadata.xml 956 BLAKE2B e9aac65fc4b7ea06f1151cf3f09d1d9363770332ee2d3c711099591edb6d4ee09bd385fadefdd95512ef84f3a870407fae0e2e69bbabd16b24980341095ff7cc SHA512 def5b0f8710cfbd49e0c25f8a5623f0ef7a8e37fab31d4324540d9eeee257423767dd947475fab51f4b84100428c556aa0457c6a8b92076b9f267f35ee9475f0
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
new file mode 100644
index 000000000000..b3b24a805173
--- /dev/null
+++ b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="HTML parser written in Java that can be used as a tool, library or Ant task"
+HOMEPAGE="http://htmlcleaner.sourceforge.net/"
+SRC_URI="mirror://sourceforge/htmlcleaner/files/${P}-src.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/jdom:2"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.5"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	dev-java/ant-core:0
+	test? ( dev-java/junit:4 )
+	>=virtual/jdk-1.5"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="jdom-2"
+
+src_prepare() {
+	# Don't require default.xml to be in the current directory.
+	sed -i "s:\"default\.xml\":\"${JAVA_PKG_SHAREPATH}/default.xml\":g" \
+		src/main/java/org/htmlcleaner/ConfigFileTagProvider.java || die
+}
+
+src_configure() {
+	JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core)
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-ant-task
+	java-pkg_dolauncher ${PN} --main org.${PN}.CommandLine
+
+	insinto "${JAVA_PKG_SHAREPATH}"
+	newins example.xml default.xml
+}
+
+src_test() {
+	local DIR="src/test/java"
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+
+	local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "Abstract*")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/htmlcleaner/metadata.xml b/dev-java/htmlcleaner/metadata.xml
new file mode 100644
index 000000000000..96bf83b724f5
--- /dev/null
+++ b/dev-java/htmlcleaner/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>HtmlCleaner is an open source HTML parser written in Java. HTML found on the Web is usually dirty, ill-formed and unsuitable for further processing. For any serious consumption of such documents, it is necessary to first clean up the mess and bring some order to the tags, attributes and ordinary text. For any given HTML document, HtmlCleaner reorders individual elements and produces well-formed XML. By default, it follows similar rules that the most of web browsers use in order to create the Document Object Model. However, you can provide custom tag and rule sets for tag filtering and balancing.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">htmlcleaner</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/htmlparser-1.4-r1 b/dev-java/htmlparser-1.4-r1
deleted file mode 100644
index 2b462637e4af..000000000000
--- a/dev-java/htmlparser-1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/icu4j:52 dev-java/jchardet:0 dev-java/xom:0 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Implementation of the HTML5 parsing algorithm in Java
-EAPI=5
-HOMEPAGE=https://about.validator.nu/htmlparser/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=W3C
-RDEPEND=dev-java/icu4j:52 dev-java/jchardet:0 dev-java/xom:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://about.validator.nu/htmlparser/htmlparser-1.4.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c70851dfe3f3a65bc9b4e7d75e6ab042
diff --git a/dev-java/htmlparser-org-1.6 b/dev-java/htmlparser-org-1.6
deleted file mode 100644
index d197116c5d0e..000000000000
--- a/dev-java/htmlparser-org-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 test? ( dev-java/junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library used to parse HTML (from htmlparser.org)
-EAPI=5
-HOMEPAGE=http://htmlparser.sourceforge.net/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/htmlparser/htmlparser1_6_20060610.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ee322e7c62f9e2901645381af1f86eb0
diff --git a/dev-java/htmlparser-org/Manifest b/dev-java/htmlparser-org/Manifest
new file mode 100644
index 000000000000..97a67a622ad7
--- /dev/null
+++ b/dev-java/htmlparser-org/Manifest
@@ -0,0 +1,3 @@
+DIST htmlparser1_6_20060610.zip 4346070 BLAKE2B ee24476513969d88a8baa73fbff4a6c5459dc645cf333e78971707d92ccfa0c71c1aa326b9be10160e38a3aa80eba5a64052bb16f9ae13c37a865c725cb5dc5a SHA512 f23d08d9330dc45133a227b8e1a80a515d01298027ccb0ca0863d1b4fab829f52950e3a3ccad057718fd57b05f8c0176786583af8625c70a38a940d3e878cd5f
+EBUILD htmlparser-org-1.6.ebuild 1221 BLAKE2B 617d69ef244bb9cf7fe0a7ad7abacf08b42e8d8edcaa479639aba395b310bbe9dade8ad588d259daa8a8aed54662c012f8ccf483697a0b188d7cd5823eb2aafc SHA512 83f4f4a7cbb11d7ad7e5c3a8741a9f62ec8216e2c082702b35f0822e29b305c862132cb6af7f4c4939045976db07dcb71bbd68d13e96d77e32f6caa94552c889
+MISC metadata.xml 316 BLAKE2B 7b5d7cf07354f01b892bd2ee40053a40d312372ff5272be30c118a3f3aff63ee34d1d52505bb8c92a7241c3ad23fcd6f16a201fe30562dce19f452442d52f323 SHA512 61c706eec499013146ae2ff65a20314fb596763cf501c0873132596e31e3005fbd7fb854cc78ce0995c994d099891f437ec6054187f1c97562df1f73ef27a736
diff --git a/dev-java/htmlparser-org/htmlparser-org-1.6.ebuild b/dev-java/htmlparser-org/htmlparser-org-1.6.ebuild
new file mode 100644
index 000000000000..b4c682b1f8c3
--- /dev/null
+++ b/dev-java/htmlparser-org/htmlparser-org-1.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN=${PN/-org/}
+MY_PV=$(replace_all_version_separators _)
+SRC_VER="20060610"
+
+DESCRIPTION="Java library used to parse HTML (from htmlparser.org)"
+HOMEPAGE="http://htmlparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}${MY_PV}_${SRC_VER}.zip"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}${MY_PV}"
+
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:0 )"
+RDEPEND=">=virtual/jre-1.6"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	unzip src.zip || die
+	rm build.xml lib/* || die
+	mkdir -p src-test/org/htmlparser/tests || die
+	mv src/org/htmlparser/tests/* src-test/org/htmlparser/tests || die
+}
+
+src_test() {
+	mkdir target/tests || die
+	testcp="$(java-pkg_getjars junit):target/tests:${PN}.jar:${JAVA_HOME}/lib/tools.jar"
+	ejavac -cp "${testcp}" -d target/tests $(find src-test/ -name "*.java")
+	tests=$(find target/tests -name "*Test.class" \
+			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+			| grep -vP '\$');
+	ejunit -cp "${testcp}" ${tests}
+}
diff --git a/dev-java/htmlparser-org/metadata.xml b/dev-java/htmlparser-org/metadata.xml
new file mode 100644
index 000000000000..629c69b054c5
--- /dev/null
+++ b/dev-java/htmlparser-org/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">htmlparser</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/htmlparser/Manifest b/dev-java/htmlparser/Manifest
new file mode 100644
index 000000000000..218685411d01
--- /dev/null
+++ b/dev-java/htmlparser/Manifest
@@ -0,0 +1,4 @@
+AUX build.xml 559 BLAKE2B 55a8c70343f90c427568ecb20af3692a9370f8f2d183f6a50b9da428baa3b0ca7590380854ec7b12cd732c08fb7eb458375a20f84498dda969e3915c0313fe39 SHA512 87abca9840918f40261f87f7c157d23fabedb8141c80a097efb874e986bc6da00b319412cfadd41ed781f1d0d4b13259152347eb6d084c73c4fc867e830af65a
+DIST htmlparser-1.4.zip 1425388 BLAKE2B 6987240e5207276935f6c3dbe5dc6e69df683448d9587397913a75c2814efa88afb3cb890a40ac404fefb2be07dc5a0787710438b8d70486486e99f2eabd9cc1 SHA512 eb0587c808b287bbb18acbba11e8efe5bd0dededd96f6bf34ef59b92144227cf8368bf76474a2c1d87a5d6b635a63057faa9d18e2a1a2d7dfeacbfaa64e57700
+EBUILD htmlparser-1.4-r1.ebuild 886 BLAKE2B a9c0aafadb16ae73d416b8a2efb7cb29154dfab6c0ee7f73db61762bf3d1fcfc82a25dd456557b29c796252106747a1279f8f068ff7e6b7e94afe0baceb81ef5 SHA512 aa6f329a85cc7d0ea60417902a41e9f868f07d5bafd1910ac8aa304d41e44852c250f5ccb7792a5c45293c0f023c0cb3ec39806437866d01a8cb27f7f46db5d6
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/htmlparser/files/build.xml b/dev-java/htmlparser/files/build.xml
new file mode 100644
index 000000000000..ad0d4b0c1d09
--- /dev/null
+++ b/dev-java/htmlparser/files/build.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<project name="htmlparser" default="jar">
+	<path id="build.classpath">
+		<fileset dir="lib/">
+			<include name="*.jar"/>
+		</fileset>
+	</path>
+	<target name="compile">
+		<mkdir dir="build"/>
+		<javac srcdir="src" destdir="build" classpathref="build.classpath"/>
+	</target>
+	<target name="jar" depends="compile">
+		<jar destfile="htmlparser.jar" basedir="build"/>
+	</target>
+	<target name="javadoc" depends="compile">
+		<mkdir dir="docs"/>
+		<javadoc sourcepath="src" destdir="docs" classpathref="build.classpath"/>
+	</target>
+</project>
diff --git a/dev-java/htmlparser/htmlparser-1.4-r1.ebuild b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
new file mode 100644
index 000000000000..5696277b333d
--- /dev/null
+++ b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Implementation of the HTML5 parsing algorithm in Java"
+HOMEPAGE="https://about.validator.nu/htmlparser/"
+SRC_URI="https://about.validator.nu/${PN}/${P}.zip"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/icu4j:52
+	dev-java/jchardet:0
+	dev-java/xom:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+java_prepare() {
+	java-pkg_clean
+	mkdir -p build lib || die
+	cp "${FILESDIR}/build.xml" build.xml || die "cp failed"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="icu4j-52,xom,jchardet"
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/htmlparser/metadata.xml b/dev-java/htmlparser/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/htmlparser/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/httpcomponents-client-4.5 b/dev-java/httpcomponents-client-4.5
deleted file mode 100644
index 366bcc262517..000000000000
--- a/dev-java/httpcomponents-client-4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/mockito:0 ) dev-java/ant-junit:0 dev-java/easymock:3.2 dev-java/spymemcached:0 dev-java/osgi-core-api:0 dev-java/osgi-enterprise-api:0 dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcomponents-core:4.4 dev-java/easymock-classextension:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A low level toolset of Java components focused on HTTP and associated protocols
-EAPI=5
-HOMEPAGE=http://hc.apache.org/index.html
-IUSE=elibc_FreeBSD source examples doc test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/ant-junit:0 dev-java/easymock:3.2 dev-java/spymemcached:0 dev-java/osgi-core-api:0 dev-java/osgi-enterprise-api:0 dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcomponents-core:4.4 dev-java/easymock-classextension:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.5
-SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2c8b31d4c4453d34be180112b7d8b807
diff --git a/dev-java/httpcomponents-client/Manifest b/dev-java/httpcomponents-client/Manifest
new file mode 100644
index 000000000000..ec5d11839a33
--- /dev/null
+++ b/dev-java/httpcomponents-client/Manifest
@@ -0,0 +1,8 @@
+AUX httpcomponents-client-fluent-hc-4.5-build.xml 11280 BLAKE2B 05d575820182e0157b2918c9dad9644bac720a3fa01274f5df2fcae82b983c20f1e47ac8e2b8224012d0ed11449d849fa420e801a619f6b450efa38aa3490c12 SHA512 b38ba2d2820d0085a32519fcc904c1c12e513906c50ef18ba14e2872851d05d64848fe4368f4298f79ea0ad2e1871da6b1bb618018f79f8d88570213a06a7c08
+AUX httpcomponents-client-httpclient-4.5-build.xml 11126 BLAKE2B 0a262a63114e9cbc09dfac041c3d241a6bba89a0ce6aa41d8ab990a599dfc1d5343d319591ed70c48928bba6eb88dffe9da26c1f468a1fb990b9ee75ff9c0ea7 SHA512 482be9717420eac69c5c8e82f5024aa478dac23f0c582c2d6000244375f315365009d24ef04f7ffdf53bcaaed97f555cf215090c863c38546155d79ced8193d6
+AUX httpcomponents-client-httpclient-cache-4.5-build.xml 12511 BLAKE2B 09c4611d33a08223a97bd7793ecc1b79ddc9477b0b80148e3534d0fb5f992a3c5f66c15d42a2d4d6fbaa13129b0c8c02b45cdbbff7bcb0fdd7702415e3b99562 SHA512 34bfd58cca0cdb5566e1c8c8f32da169713dfa13142c1e0febb16a2b16288408573fbe795c9a58122c982e932ad9be5cfb544795a820ced3f26bee87eec544a3
+AUX httpcomponents-client-httpclient-osgi-4.5-build.xml 12090 BLAKE2B 0e01c09e1b05fa99c63573adafd4dedef16c836365a799ddc77ae0036ed1e21f1ffa56c0c1dfb2a5bd3b9b85edad59f9c1b7b19da850160c210b151fc704601d SHA512 812e5d1bb9c2a21f8f664abbe22c85a912bc16ba96560d8fd8a246918c4e421d2a2d5e5034d3d832342b5e840ffc0df974abf192039a97ace2aa90021a950721
+AUX httpcomponents-client-httpmime-4.5-build.xml 11026 BLAKE2B 8c4123cafb64b25747e442a8026ff880b352505e247a0173d5c70cc9c82115f717ee255e67b7137165fc226657bddcea60ef884bb7ad587cc83350beec2d4696 SHA512 85d63d766290fc8055d38779167e64b3ee4ceedb98032227bf36ba76b62437929b0925bddfc3754ae37f42f51bd5f2befd46c2c2c0fac094988793a88a07c073
+DIST httpcomponents-client-4.5-src.tar.gz 782815 BLAKE2B ddf08b8ed4451cdf9eb1d58b207c5e80948ba051c92c9e5e3f4fe0e09405ce916fbedf5e70b037880a09b822ffb99395294645d2518282d35f57b0bf64a786df SHA512 a4c3da887a2933ddec0876a3c08903153e34d3dd555dad1be8d9d48ab5dc04f56b3f22eb6f96b407d1ac85c455e33561c7e8625c0a38705bd1e810fd9b6c8517
+EBUILD httpcomponents-client-4.5.ebuild 3479 BLAKE2B 5359b30d45a5c196c1b9d58a5865a068e1b348e510d82f783f4d5d0d93e67f9cce7903eb2c8b688f08962340daadf92cab42812d6c85e20d30a67931edb6f057 SHA512 5b0c334971cddf4fcd0ab05e6db7fd3f51dc3f748ddc4847048b462a7683d1ced3043cd5683e3600974c9fc5da347b1c42b5b1a54d6c60408bf151be17a7999c
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/httpcomponents-client/files/httpcomponents-client-fluent-hc-4.5-build.xml b/dev-java/httpcomponents-client/files/httpcomponents-client-fluent-hc-4.5-build.xml
new file mode 100644
index 000000000000..2464c617d438
--- /dev/null
+++ b/dev-java/httpcomponents-client/files/httpcomponents-client-fluent-hc-4.5-build.xml
@@ -0,0 +1,246 @@
+<?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 6/24/15 9:38 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="fluent-hc-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property name="maven.build.finalName" value="fluent-hc-4.5"/>
+  <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/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5-tests.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.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"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.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}" 
+           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>
+  </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.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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" 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="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" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
+      <link href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"/>
+    </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" 
+         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/httpcomponents-client/files/httpcomponents-client-httpclient-4.5-build.xml b/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-4.5-build.xml
new file mode 100644
index 000000000000..b88c13ea80b7
--- /dev/null
+++ b/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-4.5-build.xml
@@ -0,0 +1,250 @@
+<?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 6/23/15 11:41 PM                      -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="httpclient-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property name="maven.build.finalName" value="httpclient-4.5"/>
+  <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/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.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"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.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}" 
+           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}">
+        <include name="**/*.properties"/>
+      </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}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           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"/>
+        </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="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" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
+    </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" 
+         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/httpcomponents-client/files/httpcomponents-client-httpclient-cache-4.5-build.xml b/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-cache-4.5-build.xml
new file mode 100644
index 000000000000..297c0987b0b1
--- /dev/null
+++ b/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-cache-4.5-build.xml
@@ -0,0 +1,260 @@
+<?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 6/24/15 9:48 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="httpclient-cache-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property name="maven.build.finalName" value="httpclient-cache-4.5"/>
+  <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/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/net/sf/ehcache/ehcache-core/2.6.9/ehcache-core-2.6.9.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jcl/1.7.7/slf4j-jcl-1.7.7.jar"/>
+    <pathelement location="${maven.repo.local}/net/spy/spymemcached/2.11.4/spymemcached-2.11.4.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/net/sf/ehcache/ehcache-core/2.6.9/ehcache-core-2.6.9.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jcl/1.7.7/slf4j-jcl-1.7.7.jar"/>
+    <pathelement location="${maven.repo.local}/net/spy/spymemcached/2.11.4/spymemcached-2.11.4.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"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.5.2/easymock-2.5.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymockclassextension/2.5.2/easymockclassextension-2.5.2.jar"/>
+    <pathelement location="${maven.repo.local}/cglib/cglib-nodep/2.2/cglib-nodep-2.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5-tests.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}" 
+           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>
+  </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.6" 
+           verbose="false" 
+           fork="false" 
+           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"/>
+        </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="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" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
+      <link href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"/>
+    </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" 
+         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/httpcomponents-client/files/httpcomponents-client-httpclient-osgi-4.5-build.xml b/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-osgi-4.5-build.xml
new file mode 100644
index 000000000000..ef588141aac1
--- /dev/null
+++ b/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-osgi-4.5-build.xml
@@ -0,0 +1,255 @@
+<?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 6/24/15 6:17 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="httpclient-osgi-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property name="maven.build.finalName" value="httpclient-osgi-4.5"/>
+  <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/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpmime/4.5/httpmime-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient-cache/4.5/httpclient-cache-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/fluent-hc/4.5/fluent-hc-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.2.0/org.osgi.core-4.2.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.2.0/org.osgi.compendium-4.2.0.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpmime/4.5/httpmime-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient-cache/4.5/httpclient-cache-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/fluent-hc/4.5/fluent-hc-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.2.0/org.osgi.core-4.2.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.2.0/org.osgi.compendium-4.2.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" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           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>
+  </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.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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"/>
+        </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="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" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
+    </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" 
+         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/httpcomponents-client/files/httpcomponents-client-httpmime-4.5-build.xml b/dev-java/httpcomponents-client/files/httpcomponents-client-httpmime-4.5-build.xml
new file mode 100644
index 000000000000..d1f578641165
--- /dev/null
+++ b/dev-java/httpcomponents-client/files/httpcomponents-client-httpmime-4.5-build.xml
@@ -0,0 +1,247 @@
+<?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 6/24/15 5:01 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="httpmime-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property name="maven.build.finalName" value="httpmime-4.5"/>
+  <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/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.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" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           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}">
+        <include name="**/*.properties"/>
+      </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}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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"/>
+        </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="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" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
+    </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" 
+         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/httpcomponents-client/httpcomponents-client-4.5.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild
new file mode 100644
index 000000000000..5dfe16232601
--- /dev/null
+++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source examples doc test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A low level toolset of Java components focused on HTTP and associated protocols"
+HOMEPAGE="http://hc.apache.org/index.html"
+SRC_URI="mirror://apache/${PN/-//http}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.5"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+	dev-java/ant-junit:0
+	dev-java/easymock:3.2
+	dev-java/spymemcached:0
+	dev-java/osgi-core-api:0
+	dev-java/osgi-enterprise-api:0
+	dev-java/commons-codec:0
+	dev-java/commons-logging:0
+	dev-java/httpcomponents-core:4.4
+	dev-java/easymock-classextension:3.2
+"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+		dev-java/mockito:0
+	)
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	commons-codec
+	commons-logging
+	spymemcached
+	osgi-core-api
+	osgi-enterprise-api
+	httpcomponents-core-4.4
+"
+
+# List of modules to compile and test.
+MODULES=(
+	httpclient
+	httpclient-cache
+	httpmime
+	fluent-hc
+	httpclient-osgi
+)
+
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/${MODULES[0]}/target/${MODULES[0]}-${PV}.jar"
+
+java_prepare() {
+	# copy build.xml files to their location.
+	for module in ${MODULES[@]}; do
+		cd "${S}"/"${module}" || die
+		cp "${FILESDIR}"/"${PN}-${module}-${PV}"-build.xml build.xml
+	done
+
+	cd "${S}" || die
+
+	# httpclient:
+	# - copy deprecated sources for compilation
+	cp -r "${S}"/${MODULES[0]}/src/main/java-deprecated/* \
+		"${S}"/${MODULES[0]}/src/main/java/* || die
+
+	# - remove broken tests
+	rm -v ${MODULES[0]}/src/test/java/org/apache/http/client/config/TestRequestConfig.java
+
+	# httpclient-cache:
+	# - copy deprecated sources into main repository
+	cp -r "${S}"/${MODULES[1]}/src/main/java-deprecated/* \
+		"${S}"/${MODULES[1]}/src/main/java || die
+
+	# - remove broken tests
+	rm -v \
+		${MODULES[1]}/src/test/java/org/apache/http/impl/client/cache/TestCachingExec*
+
+	# - disable ehcache support altogether
+	# the version in Portage is very old and compilation chokes on missing imports
+	rm -rf \
+		"${S}"/${MODULES[1]}/src/main/java/org/apache/http/impl/client/cache/ehcache \
+		"${S}"/${MODULES[1]}/src/test/java/org/apache/http/impl/client/cache/ehcache
+
+	# httpmime:
+	# - copy deprecated sources into main repository
+	cp -r "${S}"/${MODULES[2]}/src/main/java-deprecated/* \
+		"${S}"/${MODULES[2]}/src/main/java
+
+	# fluent-hc:
+	# remove broken tests.
+	rm -v ${MODULES[3]}/src/test/java/org/apache/http/client/fluent/TestFluent.java
+}
+
+EANT_TEST_GENTOO_CLASSPATH="
+	${EANT_GENTOO_CLASSPATH}
+	junit-4
+	mockito
+	easymock-3.2
+	easymock-classextension-3.2
+"
+
+src_compile() {
+	for module in ${MODULES[@]}; do
+		EANT_BUILD_XML="${module}/build.xml" \
+			java-pkg-2_src_compile
+	done
+}
+
+src_test() {
+	for module in ${MODULES[@]}; do
+		ANT_TASKS= \
+			EANT_BUILD_XML="${module}/build.xml" \
+			java-pkg-2_src_test
+	done
+}
+
+src_install() {
+	for module in ${MODULES[@]}; do
+		java-pkg_newjar ${module}/target/${module}-${PV}.jar ${module}.jar
+	done
+
+	if use source; then
+
+		java-pkg_dosrc {httpclient,httpclient-cache,httpmime,fluent-hc}/src/main/java/org
+	fi
+
+	if use examples; then
+		for dir in $(find "${S}" -mindepth 3 -maxdepth 4 -name "examples" -type d -print); do
+			java-pkg_doexamples ${dir}/*
+		done
+	fi
+
+	if use doc; then
+		java-pkg_dojavadoc {httpclient,httpclient-cache,httpmime,fluent-hc}/target/site/apidocs/
+	fi
+}
diff --git a/dev-java/httpcomponents-client/metadata.xml b/dev-java/httpcomponents-client/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/httpcomponents-client/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/httpcomponents-core-4.4.1-r1 b/dev-java/httpcomponents-core-4.4.1-r1
deleted file mode 100644
index 34ca2b2f2570..000000000000
--- a/dev-java/httpcomponents-core-4.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=test? ( dev-java/commons-logging:0 dev-java/ant-junit:0 dev-java/mockito:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A low level toolset of Java components focused on HTTP and associated protocols
-EAPI=5
-HOMEPAGE=http://hc.apache.org/index.html
-IUSE=elibc_FreeBSD source examples test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.4
-SRC_URI=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.4.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d9f791b2d967a5a013d9294bc3ede1d8
diff --git a/dev-java/httpcomponents-core/Manifest b/dev-java/httpcomponents-core/Manifest
new file mode 100644
index 000000000000..f1cd67aeac8d
--- /dev/null
+++ b/dev-java/httpcomponents-core/Manifest
@@ -0,0 +1,5 @@
+AUX httpcomponents-core-4.4.1-httpcore-build.xml 10109 BLAKE2B 6dc60391c11190acae50a60d2fa5c6e79dfdc4a54e3e47787fe991bbd12251589da2f95afca627c583191c836e417ee4bcb0423e529a0133f9f4e3718a2bd9e4 SHA512 44cab78a7855d607277d049a906a9ca157cd3f5d491ba7e5c406fda6700d95c6e8aebf0082245fc125bbeb50eea6782a0b70fe69ce5255bad468cf7256245a07
+AUX httpcomponents-core-4.4.1-httpcore-nio-build.xml 10465 BLAKE2B 021f16f8ff3257c291445606577829cd7f15badb1344281751f4ae1adc8f98e5068b33e7fcd5131dde4af1d391ab7d29608b3adc5efc3f4017ff135ba0325821 SHA512 07cf4fe938b802dca43744410d94c6452ac75e9c75aef06f6685597d4f1ec644674c64df4b0cb1c6fd837627059190b1d448e6a3f2df6954f920709bde844377
+DIST httpcomponents-core-4.4.1-src.tar.gz 549481 BLAKE2B b5e84a521d5da16fc0800a2fb4b8ceb304acd409954cbaeac5901bcbb7b00ce1a10c733ae817c1ff7baaefc7a90a7370c74521c2570eaa8c694e90422d68ac35 SHA512 1ccf6233a8b254986712732418fb4e25bbdbcb99c93f55ec7955d956d33c692eff6378ed8d701542272793f05831151ee75f0102cdd3b14a6f7530fcf9639b99
+EBUILD httpcomponents-core-4.4.1-r1.ebuild 2196 BLAKE2B 98dec68cba571cc558a07a89378a2a5b684a4f95586192182136095362f738b224b9116a86106dbaf0d9dd59cac2e6fbebc366c2703d08d497623f3e67332ae1 SHA512 bd6653819b8606d9e5cc99e954fb2f64f5661cdb28593e3220cac5b8eea69573b4e3478da54a91a95202fcb72be7f863332612807baac49ee1fc8210ce6da22f
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/httpcomponents-core/files/httpcomponents-core-4.4.1-httpcore-build.xml b/dev-java/httpcomponents-core/files/httpcomponents-core-4.4.1-httpcore-build.xml
new file mode 100644
index 000000000000..9801665958c8
--- /dev/null
+++ b/dev-java/httpcomponents-core/files/httpcomponents-core-4.4.1-httpcore-build.xml
@@ -0,0 +1,236 @@
+<?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 6/18/15 9:03 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="httpcore-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="httpcore-4.4.1"/>
+  <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"/>
+  <path id="build.test.classpath">
+    <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"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.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}" 
+           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}">
+        <include name="**/*.properties"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          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.6" 
+           verbose="false" 
+           fork="false" 
+           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" 
+          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"/>
+        </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>
+
+  <!-- ====================================================================== -->
+  <!-- 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" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/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" 
+         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/httpcomponents-core/files/httpcomponents-core-4.4.1-httpcore-nio-build.xml b/dev-java/httpcomponents-core/files/httpcomponents-core-4.4.1-httpcore-nio-build.xml
new file mode 100644
index 000000000000..e0ae145072cd
--- /dev/null
+++ b/dev-java/httpcomponents-core/files/httpcomponents-core-4.4.1-httpcore-nio-build.xml
@@ -0,0 +1,241 @@
+<?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 6/18/15 9:04 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="httpcore-nio-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="httpcore-nio-4.4.1"/>
+  <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/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.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"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.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}" 
+           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}">
+        <include name="**/*.properties"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          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.6" 
+           verbose="false" 
+           fork="false" 
+           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"/>
+        </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>
+
+  <!-- ====================================================================== -->
+  <!-- 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" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://hc.apache.org/httpcomponents-core-4.4.x/httpcore/apidocs/"/>
+    </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" 
+         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/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild b/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
new file mode 100644
index 000000000000..3e1a5255b294
--- /dev/null
+++ b/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source examples test"
+
+# "components"
+CMPT=${PN%%-*}
+
+# "core"
+CORE=${PN##*-}
+
+# "httpcore"
+HTTPCORE="http${CORE}"
+
+# "httpcore-nio"
+HTTPNIO="${HTTPCORE}-nio"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A low level toolset of Java components focused on HTTP and associated protocols"
+HOMEPAGE="http://hc.apache.org/index.html"
+SRC_URI="mirror://apache/httpcomponents/${HTTPCORE}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.4"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND="
+	test? (
+		dev-java/commons-logging:0
+		dev-java/ant-junit:0
+		dev-java/mockito:0
+	)
+	>=virtual/jdk-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/${HTTPCORE}/target/${HTTPCORE}-${PV}.jar"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-${HTTPCORE}-build.xml ${HTTPCORE}/build.xml || die
+	cp "${FILESDIR}"/${P}-${HTTPNIO}-build.xml ${HTTPNIO}/build.xml || die
+
+	# Why have these classes been deprecated although other libraries are built
+	# on them (i.e. httpcomponents-client) is mindboggling. See bug 553234.
+	cp -r "${S}"/httpcore/src/main/java-deprecated/* \
+		"${S}"/httpcore/src/main/java/* || die
+	cp -r "${S}"/httpcore-nio/src/main/java-deprecated/* \
+		"${S}"/httpcore-nio/src/main/java/* || die
+}
+
+src_compile() {
+	# first, compile httpcore module
+	EANT_BUILD_XML="${HTTPCORE}/build.xml" java-pkg-2_src_compile
+
+	# then, httpnio module
+	EANT_BUILD_XML="${HTTPNIO}/build.xml" java-pkg-2_src_compile
+}
+
+EANT_TEST_GENTOO_CLASSPATH="
+	commons-logging
+	mockito
+"
+
+src_test() {
+	# run junit tests for httpcore module
+	EANT_BUILD_XML="${HTTPCORE}/build.xml" java-pkg-2_src_test
+
+	# run junit tests for httpcore-nio module
+	EANT_BUILD_XML="${HTTPNIO}/build.xml" java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar ${HTTPCORE}/target/${HTTPCORE}-${PV}.jar ${HTTPCORE}.jar
+	java-pkg_newjar ${HTTPNIO}/target/${HTTPNIO}-${PV}.jar ${HTTPNIO}.jar
+
+	use source && java-pkg_dosrc httpcore{,-nio}/src/main/java
+	use examples && java-pkg_doexamples httpcore{,-nio}/src/examples
+
+	dodoc {README,RELEASE_NOTES,NOTICE}.txt
+}
diff --git a/dev-java/httpcomponents-core/metadata.xml b/dev-java/httpcomponents-core/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/httpcomponents-core/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ical4j-1.0.5 b/dev-java/ical4j-1.0.5
deleted file mode 100644
index 3c461464e997..000000000000
--- a/dev-java/ical4j-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/emma:0 dev-java/commons-logging:0 dev-java/commons-codec:0 dev-java/commons-lang:2.1 dev-java/backport-util-concurrent:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=a Java library for handling iCalendar data streams
-EAPI=5
-HOMEPAGE=http://ical4j.sourceforge.net/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging:0 dev-java/commons-codec:0 dev-java/commons-lang:2.1 dev-java/backport-util-concurrent:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/ical4j/ical4j-1.0.5-src.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=632a1b19bf7daa3089f6e603a8828a93
diff --git a/dev-java/ical4j/Manifest b/dev-java/ical4j/Manifest
new file mode 100644
index 000000000000..f2e61a298140
--- /dev/null
+++ b/dev-java/ical4j/Manifest
@@ -0,0 +1,4 @@
+AUX 1.0.5-build.xml.patch 3196 BLAKE2B 307ce2025eea059b3f18567782978f7a03807179b768fd14c3f72a92d299115fac0cc30db03df01860d6a91d47ef8e379eae487d6a899a4ce7edd2063a68f963 SHA512 888a57e0c2ca9bec191c14dde8b33235b024e5ee764c0fc44e61cd51040f30a8ba4698c5457c1b4acf4180092b152c635ac14521b7bee958c533ce4ad3854e34
+DIST ical4j-1.0.5-src.tar.bz2 9307268 BLAKE2B f72cb77a73e1b1740f52accf5296630ba4e2ef9d4610a384a400ea50e84f245c2d320e05b2702e963ef3d7097e073687343fe2e924eca5e64b80a8f2dc1adcdf SHA512 1c2c1eb6207094fd12036d4eb93afaef820c19c7bce99611ddb9115cd62ece76972b7280364b49643147e4456ef4afca4df23ce4413e0288804183f33c2cc286
+EBUILD ical4j-1.0.5.ebuild 1450 BLAKE2B be13dd724d2f7e22c0ffdf3f8656ea1549d215f3c7b26cef6d14f7edf18e125c313543863a437d9226706ba9acfe9c40dd6649961ffd8edaee92737f5abc2a19 SHA512 5fbd008813eb539e1a83db013355b223ea4db777c30993a4c96f7dbe7741d852857ed31c7023f5665ea6c4513231f602d4e242465276d2179dd7cadd26da1ec6
+MISC metadata.xml 984 BLAKE2B 81e4a28b90f79647765ccb0738a683f1e350450efda561e693332ce39be4291091ac08068135e24c4227ad9151874d6c9177ae8f0088d5aed2a17384eb825537 SHA512 23aa711de73797e43a847aa485a1d652b4b02cc6f37ea0b79ced99e101c332c4dfb3ebd90d65a1057f8dbf0f9090f6a7d5e582c9d6f7cef5c61afb8289cc804a
diff --git a/dev-java/ical4j/files/1.0.5-build.xml.patch b/dev-java/ical4j/files/1.0.5-build.xml.patch
new file mode 100644
index 000000000000..7e68876616d8
--- /dev/null
+++ b/dev-java/ical4j/files/1.0.5-build.xml.patch
@@ -0,0 +1,80 @@
+diff --git a/ical4j-1.0.5/build.xml b/ical4j-1.0.5/build.xml
+index 512738c..be5aac9 100644
+--- a/ical4j-1.0.5/build.xml
++++ b/ical4j-1.0.5/build.xml
+@@ -14,7 +14,7 @@
+ 	<property file="build.properties" />
+ 
+ 	<!-- Project paths -->
+-	<property name="source.dir" location="source" />
++	<property name="source.dir" location="src" />
+ 	<property name="test.source.dir" location="test" />
+ 	<property name="output.dir" location="bin" />
+ 	<property name="package.dir" location="build" />
+@@ -99,7 +99,7 @@
+ 		<echo message="Compiling source from classpath: ${project.classpath}" />
+ 		<mkdir dir="${output.dir}" />
+ 
+-		<copy file="${source.dir}/net/fortuna/ical4j/model/tz.alias" todir="${output.dir}/net/fortuna/ical4j/model" />
++		<copy file="src/main/resources/net/fortuna/ical4j/model/tz.alias" todir="${output.dir}/net/fortuna/ical4j/model" />
+ 
+ 		<javac source="1.4" target="1.4" srcdir="${source.dir}" destdir="${output.dir}" debug="true" debuglevel="lines,source,vars" deprecation="true" classpathref="project.classpath" />
+ 	</target>
+@@ -123,7 +123,7 @@
+ 			<attribute name="Class-Path" value="commons-logging.jar,commons-codec.jar,commons-lang.jar" />
+ 		</manifest>
+ 		<jar basedir="${output.dir}" compress="true" jarfile="${package.dir}/${package.file}" manifest="etc/manifest.mf">
+-			<zipfileset dir="etc/zoneinfo" prefix="zoneinfo" excludes="zones.h,zones.tab" />
++			<zipfileset dir="/usr/share/zoneinfo" prefix="zoneinfo" excludes="zones.h,zones.tab" />
+ 		</jar>
+ 	</target>
+ 
+@@ -187,10 +187,8 @@
+ 			<instr instrpathref="coverage.classpath" destdir="${out.instr.dir}" metadatafile="${coverage.dir}/metadata.emma" merge="true" />
+ 		</emma>
+ 
+-		<junit printsummary="withOutAndErr" showoutput="yes" fork="yes">
+-			<!--
+-            <classpath path="${project.classpath}"/>
+-            -->
++    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
++
+ 			<classpath>
+ 				<pathelement location="${out.instr.dir}" />
+ 				<path refid="coverage.classpath" />
+@@ -198,22 +196,19 @@
+ 			</classpath>
+ 			<jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />
+ 			<jvmarg value="-Demma.coverage.out.merge=false" />
+-			<test name="net.fortuna.ical4j.AllTests" />
+-			<!--
+-            <batchtest>
+-                <fileset dir="${test.source.dir}">
+-                    <include name="**/*Test.java"/>
+-                </fileset>
+-            </batchtest>
+-            -->
+-
+-			<!--
+-            <test name="net.fortuna.ical4j.data.CalendarOutputterTest"/>
+-            <test name="net.fortuna.ical4j.model.component.VTimeZoneTest"/>
+-            <test name="net.fortuna.ical4j.model.component.VEventTest"/>
+-            <test name="net.fortuna.ical4j.data.CalendarBuilderTest"/>
+-            -->
+-		</junit>
++
++
++      <sysproperty key="basedir" value="."/>
++      <formatter type="xml"/>
++      <formatter type="plain" usefile="false"/>
++
++      <batchtest>
++        <fileset dir="${test.source.dir}">
++          <include name="**/*Test.java"/>
++          <exclude name="**/*Abstract*Test.java"/>
++        </fileset>
++      </batchtest>
++    </junit>
+ 
+ 		<emma enabled="${emma.enabled}">
+ 			<report sourcepath="${src.dir}">
diff --git a/dev-java/ical4j/ical4j-1.0.5.ebuild b/dev-java/ical4j/ical4j-1.0.5.ebuild
new file mode 100644
index 000000000000..e82a71816b02
--- /dev/null
+++ b/dev-java/ical4j/ical4j-1.0.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="a Java library for handling iCalendar data streams"
+HOMEPAGE="http://ical4j.sourceforge.net/"
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP="
+	dev-java/commons-logging:0
+	dev-java/commons-codec:0
+	dev-java/commons-lang:2.1
+	dev-java/backport-util-concurrent:0"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/emma:0
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PV}-build.xml.patch
+	rm -v lib/*.jar || die "rm jar failed"
+	#mkdir bin || die "mkdir bin failed"
+	java-pkg_filter-compiler jikes
+}
+
+EANT_ANT_TASKS="emma"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH="commons-logging,commons-codec,commons-lang-2.1,backport-util-concurrent"
+EANT_EXTRA_ARGS="-Demma.dir=/usr/share/emma/lib/ -Dsource.dir=src/main/java"
+
+RESTRICT="test"
+# two tests fail with maven, they work in HEAD
+
+src_install() {
+	java-pkg_dojar build/*.jar
+	dodoc README AUTHORS CHANGELOG etc/FAQ \
+		etc/TODO etc/standard_deviations.txt
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc src/main/java/net
+	use examples && java-pkg_doexamples etc/samples
+}
diff --git a/dev-java/ical4j/metadata.xml b/dev-java/ical4j/metadata.xml
new file mode 100644
index 000000000000..4299d5f0c299
--- /dev/null
+++ b/dev-java/ical4j/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		iCal4j is a Java library used to read and write iCalendar data streams
+		as defined in RFC2445. The iCalendar standard provides a common data
+		format used to store information about calendar-specific data such as
+		events, appointments, to-do lists, etc. All of the popular calendaring
+		tools, such as Lotus Notes, Outlook and Apple's iCal also support the
+		iCalendar standard.
+
+		Providing both a parser and an object model, iCal4j allows you to either
+		modify existing iCalendar data or create new data models. Validation is
+		also provided to ensure the data maintains a state consistent with the
+		specification.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ical4j</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/icedtea-3.8.0 b/dev-java/icedtea-3.8.0
deleted file mode 100644
index 071fe0a17e97..000000000000
--- a/dev-java/icedtea-3.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/icedtea-bin:8 dev-java/icedtea-bin:7 dev-java/icedtea:8 dev-java/icedtea:7 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax_kernel? ( sys-apps/elfix ) >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
-EAPI=6
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +sunec +system-lcms test +webstart zero elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
-RDEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) system-lcms? ( >=media-libs/lcms-2.9:2= ) !dev-java/icedtea:0 !dev-java/icedtea-web:7 >=gnome-base/gsettings-desktop-schemas-3.12.2 virtual/ttf-fonts alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) !headless-awt? ( >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=gtk? ( !headless-awt )
-SLOT=8
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea-3.8.0.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/openjdk.tar.xz -> icedtea-3.8-openjdk-499b993b345a.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/corba.tar.xz -> icedtea-3.8-corba-75fd375dd38a.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/jaxp.tar.xz -> icedtea-3.8-jaxp-2b279bb3475b.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/jaxws.tar.xz -> icedtea-3.8-jaxws-c54a27559acb.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/jdk.tar.xz -> icedtea-3.8-jdk-9c9ff65b03b6.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/hotspot.tar.xz -> icedtea-3.8-hotspot-cb5711bf53d9.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/nashorn.tar.xz -> icedtea-3.8-nashorn-bb3e3345d3ec.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/langtools.tar.xz -> icedtea-3.8-langtools-21524ad5b914.tar.xz shenandoah? ( http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/shenandoah.tar.xz -> icedtea-3.8-shenandoah-c44a9eef4985.tar.xz ) arm? ( http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/aarch32.tar.xz -> icedtea-3.8-aarch32-bd08b7f27e11.tar.xz ) http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aaa27e09ffbbb9c2b8628eabf31f254e
diff --git a/dev-java/icedtea-bin-3.7.0 b/dev-java/icedtea-bin-3.7.0
deleted file mode 100644
index 00069fe52ee4..000000000000
--- a/dev-java/icedtea-bin-3.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
-EAPI=6
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 ~arm ~arm64 ppc64 x86
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
-RDEPEND=>=sys-devel/gcc-6.4.0[multilib?] >=sys-libs/glibc-2.25[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.42:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.11:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/atk-2.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libpng-1.6*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.42:2 >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.6:2 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
-RESTRICT=preserve-libs strip
-SLOT=8
-SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-3.7.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.7.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-x86.tar.xz ) )
-_eclasses_=java-vm-2	771452d15e0b51ec559962d22c627449	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6ed40bbe2cf4bf3dc8ebc7dcadcc1d56
diff --git a/dev-java/icedtea-bin-3.8.0 b/dev-java/icedtea-bin-3.8.0
deleted file mode 100644
index bff24f60a654..000000000000
--- a/dev-java/icedtea-bin-3.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
-EAPI=6
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 ~arm ~arm64 ppc64 ~x86
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
-RDEPEND=>=sys-devel/gcc-6.4.0[multilib?] >=sys-libs/glibc-2.25[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.42:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.11:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/atk-2.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libpng-1.6*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.42:2 >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.9:2 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
-RESTRICT=preserve-libs strip
-SLOT=8
-SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-3.8.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.8.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-x86.tar.xz ) )
-_eclasses_=java-vm-2	771452d15e0b51ec559962d22c627449	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5cc4ff22c0df37c90740b6fcbefbc7e
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
new file mode 100644
index 000000000000..3ea7430c16ea
--- /dev/null
+++ b/dev-java/icedtea-bin/Manifest
@@ -0,0 +1,32 @@
+AUX icedtea-bin.env.sh 1062 BLAKE2B fd3b099ba1cd2d4f817852ad6d5f6ee5690f4c4edf481ecb0e3b6a7ce7893d983405801ac997e7df53048a64c5c8c48b5370710a897aa68a086ec79d316d0026 SHA512 7d85767b6bc1d5761d2dfcdd560199f735bd2514bd1fe78d0a11af4f491c87b89cedb063d72e3170ced9cb01ebb5c40004f23e7b97b0c7e77a4d68c051a62b12
+DIST icedtea-bin-core-3.7.0-amd64.tar.xz 61959572 BLAKE2B f8241b980ac4f8296af0aa58700d23607829c99e0fae7961008d928caaff955e14ab32c4b65305da60c17014ed7dabfd3a4406900ce999354cfbb8991127509c SHA512 680ffb17bec2f8534ce08f6158dd912413fb0ee8afe2186a8a259dfbabee99a7fda8b1b6bd68a8520946f18a482cd370f7ac2a139a34b9409d45bc19dcebacf7
+DIST icedtea-bin-core-3.7.0-arm.tar.xz 58035752 BLAKE2B a745e93a8a794845b25cd08ad1078ddaad6bc5f339dd2123b1c012feaa4aa0f4b6ae170c8691bb2e35052ee7048e33d8076e4532c8796f2813b4f06140ce9058 SHA512 b54ed397da26d9178368e7cb3efff4d43c90b76f3a110bfc29d98493567801d5da3fa7063ca82288bfbc80d9680385ddea8e12fa2d581cbe4ffc5a3b6e4fbb2d
+DIST icedtea-bin-core-3.7.0-arm64.tar.xz 59140980 BLAKE2B 5615ba4c7ff2af6890a2d82a9a58bc896129d4fce362b5fadaaeb4e82203b346c0af6c89191bce3283f8f89f7c00ac728cc9e511d4893d59d48a0ae5efd4da22 SHA512 2d79ab55da14087c51ce997b3bd62b37cc769f1b2a3ead821fed574a3ff3012f0c2c07d2e9f92b385b10478c35def75d2da1226d5874c632dad8711b97e7c8c8
+DIST icedtea-bin-core-3.7.0-ppc64.tar.xz 54288800 BLAKE2B 4858529c37e05158c481f634796202a9cfeb3dcdf0c11dfe3b84d63d238790c714f0f4aaaf37a54d7d13ddbdab7d7a7083d73f9ea684508145ba0c6a725ce346 SHA512 b6411ef98525bd90c42c017b91a2acc3e4a94e9965391b7432b60d24d980667cdda27f527d0dfeb2d60285c3d34b2aaa4e7485b4b8f07e8e47b07bbbf5fd9b94
+DIST icedtea-bin-core-3.7.0-ppc64le.tar.xz 54323992 BLAKE2B eb03570034b7d271974c50c5649891522b89c3bb82437f7feeab12a228685f2d93e827493df7f72235cffa253e6c83ca9c9ae2bd16204987f3b67af452307cff SHA512 593c0947252bc5290684f8056a20ba7ebbe9517e0c118009446df43da15a6e18a1e4593675242bc001edab078e3a914a610a86559e4d7ea20b6d2349cf3977c1
+DIST icedtea-bin-core-3.7.0-x86.tar.xz 61466288 BLAKE2B d63b381f9ad6f1724f9fe549550252b8d298b8c5cbb1351ee13c7ecf9c052fdc1ce0a4d4eac27b9a4a5700bc1734f3d3f985deec0f97f97c473911ac749dabeb SHA512 cbec66498b016daae78a8ed7e8646a844538c0b7d87615aa71dead9539164799991cf8c11f51de8ae438045b2f8ae8a9c99b79c7b0d04e09d97d208d6d544b35
+DIST icedtea-bin-core-3.8.0-amd64.tar.xz 61957580 BLAKE2B 8648338daf7152a0c0317e33fa1433dd44b9e3f712e49ec4e9af907f94063e6c193effd350265ab9b89ab19d3411ac523693d381c0cd7f604f45c241d1843820 SHA512 856a9d2da9b4b1f9400742d17f6f4c0cb43e37c738c5ea8feba763554b8a4ef2f529f59e81fc6919318df7cf7fb1d94a8a682220fcd82b4d723376031b8575ee
+DIST icedtea-bin-core-3.8.0-arm.tar.xz 58006344 BLAKE2B 6792056b8ebe82976dbd288cbf2906b00124aef4958ad2e073d57c746d6fee3e0181c61381744bdeb34daf54524ddebae692e01a52f3a5cb88fc34e1156bc9c1 SHA512 e2025746421ae197f0ecf0702890f3a8be62ac7bd7cf08b35250a88ccf7fa37ab52bfa0c6c09d8801f6c8d4282677f957ccbcf54c7f501b441b196dba7eb9f9c
+DIST icedtea-bin-core-3.8.0-arm64.tar.xz 59142392 BLAKE2B aa653348bb9d76ecccf27c76daac5f25e8bb58e95a0aaca05c233fbdec42f9c0f285cef1397a99cc5f15f154c8d2fcb9c9e36867da369a984692abeba57b711d SHA512 fc6531dec845e8a0dbe2ffafc0f01093ac5ed861b4321825e04f9a72892c0eeebbe5ff36186ef6ad098aed0d6fe79a5324c55e709362cb5f44bdc7d5666a19be
+DIST icedtea-bin-core-3.8.0-ppc64.tar.xz 54282712 BLAKE2B 78f9f9fbbcdb5f36a970497eed6ea77ed142d32beec74caea489ee7105e08151878a622fef5ea66b521103dc5b561203c4bf3fe7ab2b80ac304b5d4bd2d1d84d SHA512 d354b2eeb591dc73c9547a56f1421b034c7789cfb44a7f6b717ebce39113b319b3c3afbc7367e14c86b42a52e2c27fb69a016657581ab7f3586b6a7cc62b0137
+DIST icedtea-bin-core-3.8.0-ppc64le.tar.xz 54314152 BLAKE2B 4a7988672a1bced1bc10c8ca7d6299e27aac624af6f6d1335c1a4722508aadb408e3f210de82491f3acc2873868d7f04bb26840161c56741ffd16c6c43e84430 SHA512 1382711e50f90ab1943c98214fdfdb971129eeb6ebdd710ecc8bf777487ce85aaee0e5c8dd17ac403e00f20a8829c1f1afcdf648794a08da6be9b0500d959815
+DIST icedtea-bin-core-3.8.0-x86.tar.xz 61435788 BLAKE2B 5b4da8a54354287994d249ab2b3d2011ccfc987675e1899789f2a09b709e54fbf586b76a98839acad88b81fdef624b58e3821fbd416ea8bcf710293619ef9941 SHA512 623fc1b1f125b241642219e3060396395a6d802c73b440689c984ea259a1a0bad7b8ae04a300058f0a2815abb590e2b77bcaf3b4cddf2a9ed37a0789b87f25ba
+DIST icedtea-bin-doc-3.7.0.tar.xz 11682076 BLAKE2B 6c4629cfee975532aae9692061037662761ff4a0e3d13e72e167edfa90c81894894b48e97ad0077b38ba9e7081e21d157969f471988150a11f11a0b1ca6bf073 SHA512 e9c9ffe923fd6d6cd2dbb1bed402cba282baf17791c87b6fe12907fb4da3e401f4d101a06e1e6614d1d75d5b49a3e7cc60912a67af4dc25a4351d38c5c8ed391
+DIST icedtea-bin-doc-3.8.0.tar.xz 11683136 BLAKE2B 37fd84b58f6d6934b4775b23c3cfd47dbf275083719361ef74d55dcd2385f822b8cd0257e76cf4a194cc6d555c579a8373b39f72f4a8e80b8511acb5a0b2b537 SHA512 aee063874fa2de7cc7848deb511b1373df14ecb530eb00887920ca82b9af80763616ac4df641cd0debbf08011f71b20e8b250384e9d142387139e7698dece53a
+DIST icedtea-bin-examples-3.7.0-amd64.tar.xz 1856720 BLAKE2B d5e4497f946b48cd5e5a85c770674df5a9976d95fa4a5a562b53b0073ec51d4be3d6a9ca7145b3f79a31f89a3400493efe8c6cf425359d259c78dfa4f384bd6a SHA512 1155b8bf339b04e33ce986f0eb3fd9736e11d55ff2c3f7e515c74e83fe9cdc52e28a156f81b9f76efa769312fdb5a4080725ba7ef3e321e76caf6c911e8b7cd2
+DIST icedtea-bin-examples-3.7.0-arm.tar.xz 1840032 BLAKE2B 3f9ed953df3ea7d47dc43855256cf54c834d4b1ad4cc20114c2ba9cbf02f3cfcc1603da7e17325414368d7acddb717b116433efa52d987aabd5ae2dd8d1d21c5 SHA512 ff21951c7d81819c86366d4b6b450a14de6f45ab7916ae1061a9e7ef631f466df30434ed1f44bf007b7ae6693899e653e36e95c1e9f615e67f66bd4607dc62b3
+DIST icedtea-bin-examples-3.7.0-arm64.tar.xz 1838264 BLAKE2B 00c55e5af20654e3225622e7ccf55fb844870ee7e77683d9bb4b37181aab3ac119d5e7b4418bb0e50ebc87c3eb6ec9f37f745bfc5f0073ce33b8991e2ab20d68 SHA512 deeabd2bfc87eeb7d1f94b73501ec54f3c54a29fb9a857dca5cbe37fde49a63ec81049b62840eb6a36f6313ccffcad0910bd5d75e8de31ebabd59a129d613558
+DIST icedtea-bin-examples-3.7.0-ppc64.tar.xz 1847956 BLAKE2B 25ee12262da772e6fbecb57f67644981603919ce4711319bdcb771f6208109b6ef23ee0b6c5595a9490d1eb8f556303a023caa9d92d4d1059aa4c486f264ea14 SHA512 9f1dd454b3473efb5b32eec1abb5babe0d1fb16baaaa7daf197770add5bb230575b4de5c52b15c0eae65cbda8341a7f5fbb2f4092752e1dfc135cb2eaa77fa43
+DIST icedtea-bin-examples-3.7.0-ppc64le.tar.xz 1845292 BLAKE2B 1e8cdf15a1e4bc641b707f8df0432da83d874e74b41cac81445c3cc32d239d0e1370165ec847dcf4fbea8023fd44980b4b426459b4b4f69d850cd21aacd919da SHA512 a1c71085e8a9053ff8cf0c3c10c901657079a3df631994ce4c621ba25b9e89f211372fcb95c9b0dc1828fe4fa76ee2c0a33716da1b7c0a4af491fd418b799df4
+DIST icedtea-bin-examples-3.7.0-x86.tar.xz 1862536 BLAKE2B 7b033ad8e12cd4bb899acc40803bba9fcad1b5b6761cef65bdbb02b578478e09c64fda815cb4c518608d2a8120683a7d932341cd6d971adf381beb9cea7cbee3 SHA512 b3eb96ce677ee525ff5447e7ec0391e2bf5d79f451c71a3d78923c66664e8fa08008a4a3a90af2ae4c7a65787b86cb2f5a3689393d3548f2e9b229157313e887
+DIST icedtea-bin-examples-3.8.0-amd64.tar.xz 1856688 BLAKE2B c6ab09ae55a2c1ae42485acffa72ed7a16a5a19e5ee105f2e4e856c7929ac9758a5ff04873a5e3114f4fcb84184a85d30503904eeb21c34010b72b23b2b9f98d SHA512 de48a06fc39393e5967cf83565ce42845ce864104038a2094555cee4331ce1dbe1cc7e56668b773581a9f2e8bbd11c23dc77d922d20e0d80251ced09edd509be
+DIST icedtea-bin-examples-3.8.0-arm.tar.xz 1840028 BLAKE2B 9b4023252d5a862d2d769764cffe702ce6fe24c3870554b3c15cf0726435bb079f3c5bd53adcf851aee5af1f3ce9cc9c0d0b5ca53e8902935f88a2a423429a53 SHA512 70b5134bcbf41ace25967a1a75c6d8b55c9bb0f1c72bc4ef3bdb45a18356340b828d0666b1581ab4c2605244256db9acea9a229e53c5bc53e016a32057eb27c1
+DIST icedtea-bin-examples-3.8.0-arm64.tar.xz 1838420 BLAKE2B 6be665c5ee12ab6063fa01f13e4d5cdd957f844a498b6267a585c5f84faaff378661e012b6ef37ffc8e1fd81d14962413308a1717314d0928ae351d6c5de58c2 SHA512 30c32731ba7744d8dd1ea8b09c1540fded244f4fd641b29db441069510ed5691a2937a38821e821f47f73724e1ae3714dc5f9bab766daf1547b1a39ad5a346f1
+DIST icedtea-bin-examples-3.8.0-ppc64.tar.xz 1848128 BLAKE2B 2326df5f72f0c597b547afa06c2b73117b12d2eb96ef190a39c23a3b16e6b792487a077d4f07b00f6cfd446bff6069cc33bdb0635af8503b1ce9e38d5bd4c001 SHA512 266c7def17c119cf1b1f18729a8160a819a578868d73d175a18d486d924a355162a0c74858eb7bb21c75974ab6bc16e9de83d27d519bdc2ebefc9cba88ee669a
+DIST icedtea-bin-examples-3.8.0-ppc64le.tar.xz 1845000 BLAKE2B 1a08259383e40c7759af27b653835c5ece49721b9f12b21b24ec29e9f43d276d4fab616db7270ad9e290f49a08fbb5cf3a8b157bd56391ff1b209507e33df1be SHA512 51d7ac3901126a075825627e48f306b14157abcab82bd0c9989c443892c4fd7743fd37efa9cf6decc5465a1a682e7a0f710713991970a8b99d76619e36fb30dd
+DIST icedtea-bin-examples-3.8.0-x86.tar.xz 1862620 BLAKE2B d7ec2c538708620ce6dac1e09a91054a16e34400a2cd96266044c919d98a6433581089fe2f4d7e79c8253e258a19d4f32c45b10abd204baa43067eb3259e9388 SHA512 e7c6cc7f98f345987e1c003c479d65546deb086c8c281e99e475c448a470423789058575ff366a5b4819fac9115fbf648de686ac393450989e6dee75fd01fc9b
+DIST icedtea-bin-src-3.7.0.tar.xz 45735652 BLAKE2B c972f209e42df27137da8c03bb8555ec5831d49915c7b139578ff5e60efce9a1dbf390682604302d21bbd91f8e41da5079106ca0b016e2211453c5067e3de172 SHA512 67377e2dba3226146f220d7b923ad2a693949241d0c40dfcbceb47f691a6ce4fdedb28cbab3f4f5976029021b918cec49a7e61b373385a4b0514e10761fd3254
+DIST icedtea-bin-src-3.8.0.tar.xz 45741844 BLAKE2B b06e21b2d243a4be4e8328e7551285df9e71697b04b74a98a10293cbc8ee13bb570183e3c15511434e0b21a9052fbf945da8872c5db40fe28564794557f2d67e SHA512 527bbcec8d1c6a638e0861fb8041c94eda4d5d51ecc5a6ecaa615db155ba8cb1563e5009c4031c6b161328ff75654f2b46b09b08279260745288c5876336bd3e
+EBUILD icedtea-bin-3.7.0.ebuild 4356 BLAKE2B bd289cf7f42575d459a230abd0a0222815eb3ae18c79ebb665243840ef0ab6a7bfefbb667fe74da5168d6bad4fb638b16faf30691bc15c73a9d086e1f6096741 SHA512 04ec5586aa23ed5158be531b05dd9b13a9aeb8e057362582c977b8fa90648399d31aa484bf51e29aa7ecd8d16b124e60ebfc37f2f265f9ee2835a45dfa0095c8
+EBUILD icedtea-bin-3.8.0.ebuild 4357 BLAKE2B 333332b4a0d14ccac77464bdf5454ecd74471d8aa5dbf0f78f21a2015c6a8d59ed1dc0e2e29ffff69788af8f49f819bed8bede71507e98b86cc3ec306f26411e SHA512 8d2c6e326dc72070d7a8be2d567fc0fe274e57673e16842cb2e9b3ad4304a46d92d3810cb841e90f35a16c0cdb178eea13f865923216038bfcab70263f15f10c
+MISC metadata.xml 448 BLAKE2B 5bc2cad0b1033c4e9eabfa2f651599c869f5c37f65b391885258063c7f2edcb0dbf6789e60de11302f87765fabf29a7453eb8ee61223c5d9a07a8e5efbd9a9e0 SHA512 4b2db8049d7a61cb4abeab6f602c585ca0841f0943411e14a991ed9d130e3a99997ee0c1c0383f9dc6a5c989292f8be659c70b6162271bc7cf9f6fa5a114d4ba
diff --git a/dev-java/icedtea-bin/files/icedtea-bin.env.sh b/dev-java/icedtea-bin/files/icedtea-bin.env.sh
new file mode 100644
index 000000000000..9734e8a604c0
--- /dev/null
+++ b/dev-java/icedtea-bin/files/icedtea-bin.env.sh
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="IcedTea JDK ${PV}$(multilib_is_native_abi || printf ' ('${ABI}')')"
+JAVA_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf -- -${ABI})"
+JDK_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf -- -${ABI})"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
+MANPATH="${EPREFIX}/opt/icedtea-bin-${PV}/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.${SLOT}"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.7.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.7.0.ebuild
new file mode 100644
index 000000000000..a196cca5d69e
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.7.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Don't block arm. See bug #600134.
+#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
+KEYWORDS="-* amd64 ~arm ~arm64 ppc64 x86"
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+abi_uri() {
+	echo "${2-$1}? (
+			${BASE_URI}/${PN}-core-${PV}-${1}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}-${1}.tar.xz )
+		)"
+}
+
+BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
+	big-endian? ( $(abi_uri ppc64) )
+	!big-endian? ( $(abi_uri ppc64le ppc64) )
+	$(abi_uri amd64)
+	$(abi_uri arm)
+	$(abi_uri arm64)
+	$(abi_uri x86)"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="8"
+
+IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.42:2%
+	>=media-libs/fontconfig-2.11:1.0%
+	>=media-libs/freetype-2.5.5:2%
+	>=media-libs/lcms-2.6:2%
+	>=sys-libs/zlib-1.2.8-r1%
+	virtual/jpeg:62%
+	alsa? ( >=media-libs/alsa-lib-1.0% )
+	cups? ( >=net-print/cups-2.0% )
+	gtk? (
+		>=dev-libs/atk-2.16.0%
+		>=x11-libs/cairo-1.14.2%
+		x11-libs/gdk-pixbuf:2%
+		>=x11-libs/gtk+-2.24:2%
+		>=x11-libs/pango-1.36%
+	)
+	!headless-awt? (
+		media-libs/giflib:0/7%
+		=media-libs/libpng-1.6*%
+		>=x11-libs/libX11-1.6%
+		>=x11-libs/libXcomposite-0.4%
+		>=x11-libs/libXext-1.3%
+		>=x11-libs/libXi-1.7%
+		>=x11-libs/libXrender-0.9.8%
+		>=x11-libs/libXtst-1.2%
+	)"
+
+RDEPEND=">=sys-devel/gcc-6.4.0[multilib?]
+	>=sys-libs/glibc-2.25[multilib?]
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-java )
+	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+	!multilib? ( ${RDEPEND//%/} )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# I wouldn't normally use -f below but symlinks in the arm files
+	# make this fail otherwise and any other approach would be tedious.
+
+	if ! use alsa; then
+		rm -fv */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+}
+
+multilib_src_install() {
+	local dest="/opt/${P}-${ABI}"
+	dest="${dest/%-${DEFAULT_ABI}/}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	if multilib_is_native_abi; then
+		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+		use doc && dodoc -r ${P}/doc/html
+
+		# doins doesn't preserve executable bits.
+		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+		if use examples; then
+			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+		fi
+
+		if use source; then
+			cp ${P}/src.zip "${ddest}" || die
+		fi
+
+		# Use default VMHANDLE.
+		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	else
+		local x native=$(get_system_arch ${DEFAULT_ABI})
+
+		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+			dodir "${dest}"${x%/*}
+			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+		done
+
+		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+			[[ ${x##*/} = ${native} ]] && continue
+			[[ -e "${ddest}"/${x#*/} ]] && continue
+			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+		done
+
+		# Use ABI-suffixed VMHANDLE.
+		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+	if use multilib; then
+		multilib_foreach_abi multilib_src_install
+	else
+		multilib_src_install
+	fi
+
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.8.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.8.0.ebuild
new file mode 100644
index 000000000000..f806f46f1755
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.8.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Don't block arm. See bug #600134.
+#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
+KEYWORDS="-* amd64 ~arm ~arm64 ppc64 ~x86"
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+abi_uri() {
+	echo "${2-$1}? (
+			${BASE_URI}/${PN}-core-${PV}-${1}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}-${1}.tar.xz )
+		)"
+}
+
+BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
+	big-endian? ( $(abi_uri ppc64) )
+	!big-endian? ( $(abi_uri ppc64le ppc64) )
+	$(abi_uri amd64)
+	$(abi_uri arm)
+	$(abi_uri arm64)
+	$(abi_uri x86)"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="8"
+
+IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.42:2%
+	>=media-libs/fontconfig-2.11:1.0%
+	>=media-libs/freetype-2.5.5:2%
+	>=media-libs/lcms-2.9:2%
+	>=sys-libs/zlib-1.2.8-r1%
+	virtual/jpeg:62%
+	alsa? ( >=media-libs/alsa-lib-1.0% )
+	cups? ( >=net-print/cups-2.0% )
+	gtk? (
+		>=dev-libs/atk-2.16.0%
+		>=x11-libs/cairo-1.14.2%
+		x11-libs/gdk-pixbuf:2%
+		>=x11-libs/gtk+-2.24:2%
+		>=x11-libs/pango-1.36%
+	)
+	!headless-awt? (
+		media-libs/giflib:0/7%
+		=media-libs/libpng-1.6*%
+		>=x11-libs/libX11-1.6%
+		>=x11-libs/libXcomposite-0.4%
+		>=x11-libs/libXext-1.3%
+		>=x11-libs/libXi-1.7%
+		>=x11-libs/libXrender-0.9.8%
+		>=x11-libs/libXtst-1.2%
+	)"
+
+RDEPEND=">=sys-devel/gcc-6.4.0[multilib?]
+	>=sys-libs/glibc-2.25[multilib?]
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-java )
+	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+	!multilib? ( ${RDEPEND//%/} )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# I wouldn't normally use -f below but symlinks in the arm files
+	# make this fail otherwise and any other approach would be tedious.
+
+	if ! use alsa; then
+		rm -fv */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+}
+
+multilib_src_install() {
+	local dest="/opt/${P}-${ABI}"
+	dest="${dest/%-${DEFAULT_ABI}/}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	if multilib_is_native_abi; then
+		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+		use doc && dodoc -r ${P}/doc/html
+
+		# doins doesn't preserve executable bits.
+		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+		if use examples; then
+			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+		fi
+
+		if use source; then
+			cp ${P}/src.zip "${ddest}" || die
+		fi
+
+		# Use default VMHANDLE.
+		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	else
+		local x native=$(get_system_arch ${DEFAULT_ABI})
+
+		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+			dodir "${dest}"${x%/*}
+			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+		done
+
+		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+			[[ ${x##*/} = ${native} ]] && continue
+			[[ -e "${ddest}"/${x#*/} ]] && continue
+			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+		done
+
+		# Use ABI-suffixed VMHANDLE.
+		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+	if use multilib; then
+		multilib_foreach_abi multilib_src_install
+	else
+		multilib_src_install
+	fi
+
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
new file mode 100644
index 000000000000..b7ed2bccdce7
--- /dev/null
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+  </maintainer>
+<use>
+  <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
+  <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-java/icedtea-sound-1.0.1 b/dev-java/icedtea-sound-1.0.1
deleted file mode 100644
index f822ed6d926e..000000000000
--- a/dev-java/icedtea-sound-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure preinst prepare setup
-DEPEND=>=virtual/jdk-1.6.0 >=media-sound/pulseaudio-0.9.11:= >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Plugins for javax.sound
-EAPI=5
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+doc test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jdk-1.6.0 >=media-sound/pulseaudio-0.9.11:= >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=540884470887eb0939a7a48c56a3ea63
diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest
new file mode 100644
index 000000000000..2ccfea8b71d1
--- /dev/null
+++ b/dev-java/icedtea-sound/Manifest
@@ -0,0 +1,3 @@
+DIST icedtea-sound-1.0.1.tar.xz 1515308 BLAKE2B 4d9939e1bc0e0b331b032c3a54244960d61354d6b85b83cbbce1aeb96f2748906d5bd0936b36e2aacac526bd7927dbc0686a47a0dd0f41568ca86e3805b943ea SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a
+EBUILD icedtea-sound-1.0.1.ebuild 847 BLAKE2B 0b3d21e190f6c07b74be2cdaef5a3a97947aa335fd29e86f208594b7e9695f66ac649b6412df6769ec7040fd433c185b63942eb8cf6b8d1d5e65b279a5bfb7e1 SHA512 88886e208bc2f62a2b423f642afd868e3809d3298a5a45c315af61ff11ad09736069b1622cc457105c005044272a62827153655dc98bc7e013999a574b61e30d
+MISC metadata.xml 502 BLAKE2B 956158234bf2b4cf3e69d59e5db820789235dba816167c1a64ae1c94e585996f14c75b72526c8344584950336fb273c094176b9dd042fc41baaadfa56f46e2b9 SHA512 2d7a91be3364f491b4402f6cd525ff8e27fd4ed27b89268817ccc9d8318f207a0b315827fdf12bae8a443751469ebc9987e0bd6f08857199f53b62f4db93c00e
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
new file mode 100644
index 000000000000..c663e70656da
--- /dev/null
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+EAPI="5"
+
+inherit eutils java-pkg-2 prefix
+
+DESCRIPTION="Plugins for javax.sound"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.xz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+
+IUSE="+doc test"
+
+COMMON_DEP="
+	>=virtual/jdk-1.6.0
+	>=media-sound/pulseaudio-0.9.11:="
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}"
+
+pkg_setup() {
+	JAVA_PKG_WANT_SOURCE="1.6"
+	JAVA_PKG_WANT_TARGET="1.6"
+
+	java-pkg-2_pkg_setup
+}
+
+src_configure() {
+	econf --with-jdk-home="${JAVA_HOME}" \
+		$(use_enable doc docs) \
+		--htmldir="${EROOT}usr/share/doc/${PF}/html"
+}
+
+src_compile() {
+	default
+}
diff --git a/dev-java/icedtea-sound/metadata.xml b/dev-java/icedtea-sound/metadata.xml
new file mode 100644
index 000000000000..05fd5cab7ec2
--- /dev/null
+++ b/dev-java/icedtea-sound/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gnu_andrew@member.fsf.org</email>
+    <name>Andrew John Hughes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <longdescription>
+    Plugins for javax.sound, including the PulseAudio support formerly bundled with IcedTea.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-java/icedtea-web-1.6.1-r1 b/dev-java/icedtea-web-1.6.1-r1
deleted file mode 100644
index 15f4ccea4824..000000000000
--- a/dev-java/icedtea-web-1.6.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=javascript? ( dev-java/rhino:1.6 ) nsplugin? ( >=dev-libs/glib-2.16:2= ) tagsoup? ( dev-java/tagsoup:0 ) app-arch/zip >=virtual/jdk-1.7 virtual/pkgconfig nsplugin? ( net-misc/npapi-sdk ) test? ( >=dev-java/junit-4.8:4 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=FOSS Java browser plugin and Web Start implementation
-EAPI=5
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=doc javascript nsplugin tagsoup test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86
-LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
-RDEPEND=javascript? ( dev-java/rhino:1.6 ) nsplugin? ( >=dev-libs/glib-2.16:2= ) tagsoup? ( dev-java/tagsoup:0 ) >=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.7 nsplugin? ( !dev-java/oracle-jdk-bin[nsplugin] !dev-java/oracle-jre-bin[nsplugin] ) >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.6.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c7139bfe2bf53f7d6b515d492244d80
diff --git a/dev-java/icedtea-web-1.6.2 b/dev-java/icedtea-web-1.6.2
deleted file mode 100644
index 4368c83e0af5..000000000000
--- a/dev-java/icedtea-web-1.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=javascript? ( dev-java/rhino:1.6 ) nsplugin? ( >=dev-libs/glib-2.16:2= ) tagsoup? ( dev-java/tagsoup:0 ) app-arch/zip >=virtual/jdk-1.7 virtual/pkgconfig nsplugin? ( net-misc/npapi-sdk ) test? ( >=dev-java/junit-4.8:4 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=FOSS Java browser plugin and Web Start implementation
-EAPI=5
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=doc javascript nsplugin tagsoup test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
-RDEPEND=javascript? ( dev-java/rhino:1.6 ) nsplugin? ( >=dev-libs/glib-2.16:2= ) tagsoup? ( dev-java/tagsoup:0 ) >=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.7 nsplugin? ( !dev-java/oracle-jdk-bin[nsplugin] !dev-java/oracle-jre-bin[nsplugin] ) >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.6.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c0972e2ccaea8e3e0c8faea372f2983
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
new file mode 100644
index 000000000000..feddb7bb365b
--- /dev/null
+++ b/dev-java/icedtea-web/Manifest
@@ -0,0 +1,11 @@
+AUX README.gentoo-r1 2328 BLAKE2B 3a9e2be2a241eeebe501c3c97d55c9bd65b3bb1c0b33abeed13dcea238f4c981e3aa173cb385cb15ea184e1ec2d696e630b8b1c497daadb2a79b3e8e287b4600 SHA512 bac787d49827e651fa9a87a2d8a8a64fb714282f569474ebf69712bd2a329c12f7d6fed2b015467c857b66cc0c9e10e7e60ab2186de00f8f3ac6e72353b76628
+AUX icedtea-web-1.6-javadoc.patch 463 BLAKE2B 8c6bd88fb3255acfebf91e764bdf4f1677a12d7ea03dbcdd47514ab2d1b240cbc810b8e670c1bb472176323b346ee3a5ddf9aa359bbc1771848334357ad0cb25 SHA512 faa9b4cd96bd6658a9f55ebf7a5f3b75db65a6a813489739df2b8e903bc62cab2cf222a936a52230ff91943263e3ccc303ed7abe4fe8da7bf89a2eed95b3e66d
+AUX icedtea-web-1.6-launchers.patch 3136 BLAKE2B b11e4cb0c8c53e8509e68d30bc3190d8846e742e725cc4918fa08979102bca5d6ef643bf6a524f596a0ed9e0d98722227824bd39f1e84859c4680fc17228b057 SHA512 585a8e12a438f884f6b3c24aacb04a7330bf65388c18a51697c17041f5dfa3df3a24474d5d6b2dc43886dafabf0a05e525ef40ac8247c726797750dcb25d5d92
+AUX icedtea-web-1.6-no-hg.patch 2254 BLAKE2B 9939f85cc1234056de045ca8d85f256e5315d0c603a5ec8a2dc026b62a1ee1fdc142db832ebab32cea698a17172257e3eb88f427f966f9e385ba626bd257550d SHA512 22e30347bbb759b60b954acafb8a920e23f673915e89eb13ad9917b6669e8059d52aacb0b90874427376730840e8ed954b14e2de65e8b594a10616b999863523
+AUX icedtea-web-1.6-respect-ldflags.patch 667 BLAKE2B 215247a834785e592d66717d9c88bc4c04a5adb93bb026460ca1bf729a692cb675a950e17a665086aa6b3699ef9406fe70d26c5455d44eccd7b6dd542a0f0a58 SHA512 23903931c48e47cd78d1d73cf2bd5e06249e26939bbef4f41f09d3c3d69d0418e65fe83be542807452ed41bebfd88d2081d731f03dfbd4950495fc16dc9edb1e
+AUX icedtea-web-1.6-unused-libs.patch 697 BLAKE2B ea140038785a4954ebfbc8dac7e547b34527c845acf285b4ed1a4c66cbfd48a815391c9662e9a19b7f699199c8d37c160c9452af6e192f9e3c3af8e240d6cbe7 SHA512 215242b418159a8ab3d1523f1ef0765d40212feb572441719a830251fc602620f29a254a5734ab08a6b7a902bc1f27060bbf638826e2291305966edfd3062b74
+DIST icedtea-web-1.6.1.tar.gz 1776222 BLAKE2B e6141303b24e3b4a3a5568562f34c4a512250a1e16234c455d8ca04030324e11eb20134cd352d36c5d2c27769911558e0b739525bba9a58acf892fa5e7bb2b14 SHA512 dae39818f74a098289acd0736d27c2e68b10b603a3fb0a180cf4b6444345cbe71ab1ba77dfb198f053f9567bb18aa96de09049c3b595b3d292d142a7ae7d3ef9
+DIST icedtea-web-1.6.2.tar.gz 1824557 BLAKE2B 897155b528a873b2e0166f47973136c5ccc640fa9da26c934dc93deebacf2b2d714cd70943fc4f7eb2c596542e97656d844638dbd12f407f917d30c9cd75f4d7 SHA512 32c9618a575bf05d3fbe5fec3f8429d55036acde70bf7ccf40b59e14eba775d1f561640acbf673b1737a8c5c3a8eadb74e8f1bef525cfa6060e3f1968d45b3f7
+EBUILD icedtea-web-1.6.1-r1.ebuild 2245 BLAKE2B 86e91baf340e3ac8fd2e88dbc16b3f0d04565a0a5011167be5487676c3821b142b4b187167ee4eebd519310e61c8facfc680413cc3e1bb347f66b08ab4bd020f SHA512 37c9aefae8a58b59e455ae6614d6e57367f5f461f3f71c0bb1cdb8d5988fc3b513ec2977a953af7b1f20e0e4a8322413d8f8dd8feecb576768ec1624d99b8255
+EBUILD icedtea-web-1.6.2.ebuild 2114 BLAKE2B 5eec9454df55c9f027169bcae07e93cfb4e4591467524fd33040b6d44af7f6eb7ee2b2a3a6fbe307cab2fdeb00a6983ebbc3b4f324fa3019892e9225f078fd12 SHA512 5404a85384e133d3125a9305387f7d1808bec43e4d3491916c0ed737d3e31fa679b93a46a2ded1089337420573e75de5dd5c46cfeab7b51e8003ab086bb3bfe3
+MISC metadata.xml 653 BLAKE2B 4b0309721007539cdfcfc155039efd0dfdf2bcfccb1673cc4c930ee4267e73b5aa1c29b777a139dda6bb1c804fe827160366f59709843e9a03f66ecad41b3c8d SHA512 0b0cc5e6a5226dce345c2ebc01df0459ebaf4dc37d5241748bcba81d80e0429f599ab41d7a3e7020c581eb0c40825f07ad37e5340dbf643240ebb9830c0d500c
diff --git a/dev-java/icedtea-web/files/README.gentoo-r1 b/dev-java/icedtea-web/files/README.gentoo-r1
new file mode 100644
index 000000000000..219e14e7f7c3
--- /dev/null
+++ b/dev-java/icedtea-web/files/README.gentoo-r1
@@ -0,0 +1,56 @@
+Browser plugin
+--------------
+
+The IcedTea browser plugin (NPPlugin) is now made immediately
+available to supporting browsers without the need for eselect. Note
+that Chromium-based browsers no longer support NPAPI-based plugins
+since the code was removed in September 2015. The list of supporting
+browsers is shrinking but still includes Firefox as of version 46.
+
+JVM selection
+-------------
+
+By default, IcedTea's browser plugin and Web Start uses the JVM
+selected via eselect or the GENTOO_VM environment variable. Note that
+this doesn't have to be an IcedTea JVM. An Oracle JVM will also
+work. The choice can be overridden using the itweb-settings
+program. Simply blank out the field to restore the default behaviour.
+
+Coexistence with Oracle's plugin
+--------------------------------
+
+The IcedTea browser plugin can no longer be installed alongside
+Oracle's plugin. This used to be possible thanks to eselect
+java-nsplugin but this was removed in an effort to simplify things. No
+one is likely to need both, especially with plugins being all but
+outlawed these days. To avoid any blockers, simply enable the nsplugin
+USE flag on icedtea-web or the Oracle packages, but not both.
+
+If you're wondering why we don't just leave plugin selection to the
+browser, it's because Firefox (and probably others) only allows you to
+disable all the Java plugins together, not individually.
+
+Coexistence with Oracle's Web Start
+-----------------------------------
+
+/usr/bin/javaws, the executable used to launch JNLP files from a
+browser, will always use IcedTea's implementation over Oracle's when
+icedtea-web is installed, regardless of which JVM has been
+selected. This is primarily for consistency with the browser
+plugin. If you want to use Oracle's implementation then simply
+uninstall icedtea-web.
+
+32-bit plugin on 64-bit systems
+-------------------------------
+
+This is no longer supported as the 64-bit plugin can launch a 32-bit
+JVM. Other reasons for running a 32-bit browser on a 64-bit system
+have long passed.
+
+32-bit JVM on 64-bit systems
+----------------------------
+
+The emul-linux-x86-java package was removed in 2015 with the migration
+to full multilib. icedtea-bin now provides this feature via the
+multilib USE flag. Once installed, using the 32-bit variant is simply
+a case of selecting that VM as described above.
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-javadoc.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-javadoc.patch
new file mode 100644
index 000000000000..f69db9b6f582
--- /dev/null
+++ b/dev-java/icedtea-web/files/icedtea-web-1.6-javadoc.patch
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2015-09-11 14:02:04.245280051 +0100
++++ Makefile.am	2016-01-01 14:00:49.857225492 +0000
+@@ -652,7 +652,7 @@
+ 
+ stamps/netx-docs.stamp:
+ if ENABLE_DOCS
+-	$(SYSTEM_JDK_DIR)/bin/javadoc $(JAVADOC_MEM_OPTS) $(	_OPTS) \
++	$(SYSTEM_JDK_DIR)/bin/javadoc $(JAVADOC_MEM_OPTS) $(JAVADOC_OPTS) \
+ 	 -d ${abs_top_builddir}/docs/netx -sourcepath $(NETX_SRCDIR) \
+ 	 -doctitle 'IcedTea-Web: NetX API Specification' \
+ 	 -windowtitle 'IcedTea-Web: NetX ' \
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-launchers.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-launchers.patch
new file mode 100644
index 000000000000..57f793a2ff30
--- /dev/null
+++ b/dev-java/icedtea-web/files/icedtea-web-1.6-launchers.patch
@@ -0,0 +1,79 @@
+--- launcher/launchers.in.orig	2015-09-11 14:02:04.252280131 +0100
++++ launcher/launchers.in	2015-12-18 23:06:35.721135526 +0000
+@@ -7,7 +7,7 @@
+ BINARY_LOCATION=@BIN_LOCATION@
+ SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@
+ PROGRAM_NAME=@PROGRAM_NAME@
+-CP=@JRE@/lib/rt.jar:@JRE@/lib/jfxrt.jar
++CP=$(java-config -r)
+ 
+ CONFIG_HOME=$XDG_CONFIG_HOME
+ if [ "x$CONFIG_HOME" = "x" ] ; then
+--- plugin/icedteanp/IcedTeaNPPlugin.cc.orig	2015-09-11 14:02:04.219279754 +0100
++++ plugin/icedteanp/IcedTeaNPPlugin.cc	2015-12-19 22:35:23.479775591 +0000
+@@ -137,8 +137,7 @@
+ static DIR *data_directory_descriptor;
+ 
+ // Fully-qualified appletviewer default  executable and rt.jar
+-static const char* appletviewer_default_executable = ICEDTEA_WEB_JRE "/bin/java";
+-static const char* appletviewer_default_rtjar = ICEDTEA_WEB_JRE "/lib/rt.jar";
++static const char* appletviewer_default_executable = ICEDTEA_WEB_JAVA;
+ //javaws name and binary
+ static const char* javaws_bin_property = "-Dicedtea-web.bin.location=" JAVAWS_BIN;
+ static const char* javaws_name_property = "-Dicedtea-web.bin.name=" JAVAWS_NAME;
+@@ -298,7 +297,15 @@
+                   PLUGIN_ERROR("Your custom jre (/lib/rt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+             }
+       }
+-      return appletviewer_default_rtjar;      
++      gchar *stdout;
++      if (g_spawn_command_line_sync("java-config -r", &stdout, NULL, NULL, NULL)) {
++          std::string result = g_strchomp(stdout);
++          g_free(stdout);
++          return result;
++      } else {
++          PLUGIN_ERROR("Failed to query jre bootclasspath with java-config.\n");
++          return "";
++      }
+ }
+ 
+ static void cleanUpDir(){
+--- plugin/icedteanp/IcedTeaParseProperties.cc.orig	2015-09-11 14:02:04.220279765 +0100
++++ plugin/icedteanp/IcedTeaParseProperties.cc	2015-12-19 23:06:05.095409132 +0000
+@@ -151,7 +151,15 @@
+ }
+ 
+ string default_java_properties_file(){
+-	return  ICEDTEA_WEB_JRE "/lib/"+default_file_ITW_deploy_props_name;
++	gchar *stdout;
++	if (g_spawn_command_line_sync("java-config -o", &stdout, NULL, NULL, NULL)) {
++		string result = g_strchomp(stdout);
++		g_free(stdout);
++		return result+"/lib/"+default_file_ITW_deploy_props_name;
++	} else {
++		PLUGIN_ERROR("Failed to query jre location with java-config.\n");
++		return "";
++	}
+ }
+ 
+ 
+@@ -224,7 +232,7 @@
+ 				dest = custom_jre_file;
+ 				return true;
+ 			} 
+-		} else {
++		} else if (!default_java_file.empty()) {
+ 			if(IcedTeaPluginUtilities::file_exists(default_java_file)) {
+ 			dest = default_java_file;
+ 			return true;
+--- Makefile.am.orig	2015-09-11 14:02:04.245280051 +0100
++++ Makefile.am	2015-12-19 22:37:35.460518630 +0000
+@@ -353,7 +353,7 @@
+ 	  -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
+ 	  -DPACKAGE_URL="\"$(PACKAGE_URL)\"" \
+ 	  -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
+-	  -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \
++	  -DICEDTEA_WEB_JAVA="\"$(JAVA)\"" \
+ 	  -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \
+ 	  $(GLIB_CFLAGS) \
+ 	  $(MOZILLA_CFLAGS) \
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-no-hg.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-no-hg.patch
new file mode 100644
index 000000000000..a76780e500cb
--- /dev/null
+++ b/dev-java/icedtea-web/files/icedtea-web-1.6-no-hg.patch
@@ -0,0 +1,49 @@
+--- html-gen.sh.orig	2015-09-11 14:02:04.250280108 +0100
++++ html-gen.sh	2016-01-01 14:13:46.693307166 +0000
+@@ -67,13 +67,18 @@
+ if [ -z "$CHANGESETS" ] || [ "$CHANGESETS" -lt 0 ]; then CHANGESETS=10; fi
+ 
+ NEWS_ITEMS=2
+-REPO_URL="$(hg paths default | sed -r 's/.*icedtea.classpath.org\/(.*)/\1/')"
++
++if [ -d .hg ]; then
++    REPO_URL="$(hg paths default | sed -r 's/.*icedtea.classpath.org\/(.*)/\1/')"
++else
++    unset REPO_URL
++fi
+ 
+ start_time="$(date +%s.%N)"
+ 
+ cd html-gen
+ 
+-print_debug "Generating HTML content for javaws -about for $REPO_URL. $CHANGESETS changesets, $NEWS_ITEMS news items"
++print_debug "Generating HTML content for javaws -about${REPO_URL:+ for }$REPO_URL. $CHANGESETS changesets, $NEWS_ITEMS news items"
+ print_debug "Starting sed substitutions"
+ for FILE in NEWS AUTHORS COPYING ChangeLog
+ do
+@@ -99,7 +104,9 @@
+ sed -i '5i <br><img src="jamIcon.jpg" alt="Jam Icon" width="87" height="84"><br><br>' AUTHORS.html
+ echo "</center>" >> AUTHORS.html
+ 
+-REVS=(`hg log -l"$CHANGESETS" | grep 'changeset:' | cut -d: -f3 | tr '\n' ' '`)
++if [ -n "${REPO_URL}" ]; then
++    REVS=(`hg log -l"$CHANGESETS" | grep 'changeset:' | cut -d: -f3 | tr '\n' ' '`)
++fi
+ 
+ print_debug "Done. Starting formatting (bolding, mailto and hyperlink creation)"
+ 
+@@ -132,9 +139,11 @@
+             if [[ "$LINE" =~ $date_regex* ]] # Matches line starting with eg 2013-07-01
+             then
+                 html_space="\&ensp;\&ensp;"
+-                REV="${REVS["$COUNTER"]}"
+-                # Turn the date into a hyperlink for the revision this changelog entry describes
+-                LINE=$(echo "$LINE" | sed -r "s|($date_regex)($html_space.*$html_space.*)|<a href=http://icedtea.classpath.org/$REPO_URL/rev/$REV>\1</a>\2|")
++                if [ -n "${REPO_URL}" ]; then
++                    REV="${REVS["$COUNTER"]}"
++                    # Turn the date into a hyperlink for the revision this changelog entry describes
++                    LINE=$(echo "$LINE" | sed -r "s|($date_regex)($html_space.*$html_space.*)|<a href=http://icedtea.classpath.org/$REPO_URL/rev/$REV>\1</a>\2|")
++                fi
+                 COUNTER="$(( COUNTER + 1 ))"
+             fi
+             if [ "$COUNTER" -gt "$CHANGESETS" ] # Cut to ten changesets
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch
new file mode 100644
index 000000000000..1d03b7c4fd16
--- /dev/null
+++ b/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch
@@ -0,0 +1,20 @@
+--- Makefile.am.orig	2015-09-11 14:02:04.245280051 +0100
++++ Makefile.am	2015-12-18 21:37:43.328862431 +0000
+@@ -344,7 +344,7 @@
+ $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
+ 	mkdir -p $(PLUGIN_DIR) && \
+ 	cd $(PLUGIN_DIR) && \
+-	$(CXX) $(CXXFLAGS) \
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) \
+ 	   $(DEFS) $(VERSION_DEFS) \
+ 	  -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
+ 	  -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
+@@ -362,7 +362,7 @@
+ 
+ $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
+ 	cd $(PLUGIN_DIR) && \
+-	$(CXX) $(CXXFLAGS) \
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) \
+ 	  $(PLUGIN_OBJECTS) \
+ 	  $(GLIB_LIBS) \
+ 	  $(MOZILLA_LIBS) \
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch
new file mode 100644
index 000000000000..b0dc15d32c78
--- /dev/null
+++ b/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2015-09-11 14:02:04.250280108 +0100
++++ configure.ac	2016-02-18 09:36:04.684624293 +0000
+@@ -55,17 +55,6 @@
+ IT_SET_VERSION
+ IT_CHECK_XULRUNNER_VERSION
+ 
+-AC_CHECK_LIB(z, main,, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")])
+-dnl Check for libX11 headers and libraries.
+-PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no])
+-if test "x${X11_FOUND}" = xno
+-then
+-  AC_MSG_ERROR([Could not find x11 - \
+-  Try installing libX11-devel.])
+-fi
+-AC_SUBST(X11_CFLAGS)
+-AC_SUBST(X11_LIBS)
+-
+ dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin
+ dnl IT563 - NetX uses sun.security code
+ dnl IT605 - NetX depends on sun.misc.HexDumpEncoder
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..ce19e653d3c5
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+README_GENTOO_SUFFIX="-r1"
+
+inherit autotools eutils multilib readme.gentoo-r1 java-pkg-2 xdg-utils
+
+DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
+LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc64 x86"
+IUSE="doc javascript nsplugin tagsoup test"
+RESTRICT="test"
+
+CDEPEND="javascript? ( dev-java/rhino:1.6 )
+	nsplugin? ( >=dev-libs/glib-2.16:2= )
+	tagsoup? ( dev-java/tagsoup:0 )"
+
+DEPEND="${CDEPEND}
+	app-arch/zip
+	>=virtual/jdk-1.7
+	virtual/pkgconfig
+	nsplugin? ( net-misc/npapi-sdk )
+	test? (	>=dev-java/junit-4.8:4 )"
+
+RDEPEND="${CDEPEND}
+	>=app-eselect/eselect-java-0.2.0
+	>=virtual/jre-1.7
+	nsplugin? (
+		!dev-java/oracle-jdk-bin[nsplugin]
+		!dev-java/oracle-jre-bin[nsplugin]
+	)"
+
+src_prepare() {
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2779
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2780
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2855
+	epatch "${FILESDIR}"/${PN}-1.6-{javadoc,no-hg,launchers,respect-ldflags,unused-libs}.patch
+
+	if java-pkg_is-vm-version-ge "1.8" ; then
+		sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local tagsoup
+	use tagsoup && tagsoup="$(java-pkg_getjars tagsoup)"
+
+	local config=(
+		# Rename javaws to itweb-javaws as eselect java-vm manages
+		# javaws to prevent a clash with Oracle's implementation.
+		--program-transform-name='s/^javaws$/itweb-javaws/'
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
+		--with-java="${EPREFIX}"/usr/bin/java
+		--with-jdk-home="${JAVA_HOME}"
+		$(use_enable doc docs)
+		$(use_enable nsplugin plugin)
+		$(use_with javascript rhino)
+		$(use_with tagsoup tagsoup "${tagsoup}")
+	)
+
+	# See bug #573060.
+	xdg_environment_reset
+
+	# Rely on the --with-jdk-home option given above.
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf "${config[@]}"
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
new file mode 100644
index 000000000000..8ff8c11bb7d6
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+README_GENTOO_SUFFIX="-r1"
+
+inherit autotools eutils multilib readme.gentoo-r1 java-pkg-2 xdg-utils
+
+DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
+LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+IUSE="doc javascript nsplugin tagsoup test"
+RESTRICT="test"
+
+CDEPEND="javascript? ( dev-java/rhino:1.6 )
+	nsplugin? ( >=dev-libs/glib-2.16:2= )
+	tagsoup? ( dev-java/tagsoup:0 )"
+
+DEPEND="${CDEPEND}
+	app-arch/zip
+	>=virtual/jdk-1.7
+	virtual/pkgconfig
+	nsplugin? ( net-misc/npapi-sdk )
+	test? (	>=dev-java/junit-4.8:4 )"
+
+RDEPEND="${CDEPEND}
+	>=app-eselect/eselect-java-0.2.0
+	>=virtual/jre-1.7
+	nsplugin? (
+		!dev-java/oracle-jdk-bin[nsplugin]
+		!dev-java/oracle-jre-bin[nsplugin]
+	)"
+
+src_prepare() {
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2855
+	epatch "${FILESDIR}"/${PN}-1.6-{launchers,respect-ldflags,unused-libs}.patch
+
+	if java-pkg_is-vm-version-ge "1.8" ; then
+		sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local tagsoup
+	use tagsoup && tagsoup="$(java-pkg_getjars tagsoup)"
+
+	local config=(
+		# Rename javaws to itweb-javaws as eselect java-vm manages
+		# javaws to prevent a clash with Oracle's implementation.
+		--program-transform-name='s/^javaws$/itweb-javaws/'
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
+		--with-java="${EPREFIX}"/usr/bin/java
+		--with-jdk-home="${JAVA_HOME}"
+		$(use_enable doc docs)
+		$(use_enable nsplugin plugin)
+		$(use_with javascript rhino)
+		$(use_with tagsoup tagsoup "${tagsoup}")
+	)
+
+	# See bug #573060.
+	xdg_environment_reset
+
+	# Rely on the --with-jdk-home option given above.
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf "${config[@]}"
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml
new file mode 100644
index 000000000000..50b2caefc775
--- /dev/null
+++ b/dev-java/icedtea-web/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.
+	</longdescription>
+	<use>
+		<flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag>
+		<flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
+		<flag name="tagsoup">Depend on dev-java/tagsoup which allows parsing malformed .jnlp files</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
new file mode 100644
index 000000000000..5faf41a8c35b
--- /dev/null
+++ b/dev-java/icedtea/Manifest
@@ -0,0 +1,17 @@
+AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
+AUX icedtea.env.sh 954 BLAKE2B 4cb0d8baef5f9a6527b8d15e7258805bb859cd79aec1ee0dbbb2aa369d0ecc83cb11a482d6bf5a17a6692da1bdf40ec1544ecdf31d46bcded7a3832d0553ee1a SHA512 80161624e52e705cab16edf04e304906dc0a37b86442e63a9ff8fdda321c4888ab12e8b66dc2f4487fe9bd86bb9f33d597b489d2d486894a36e91ed7563ef23a
+DIST icedtea-3.8-aarch32-bd08b7f27e11.tar.xz 6762428 BLAKE2B d5c6b97ad133faf21f16328e1a86fe22a1e3bdcba73d43728cceddb6341f529661202e5384f3a7bc9f0de4bac9af897b86f942cbfaa310a44b959b0be5b55fde SHA512 99715812bf7b71e2031e96e27b27745d6963ee9749886a61a982628b5d95b9491a7696cf733d06adedef75dbb8dabecf5ffb72531e6b19329121b0e4f1b08afb
+DIST icedtea-3.8-corba-75fd375dd38a.tar.xz 942152 BLAKE2B 86ca4a62d8dfe7b8fec3a90471b48e2d0711fe708654695ddddbbc400bf71f1f3a3926f28989940ff325c0e171989336082d271ab468a13e38dfd93d680437d5 SHA512 a41d53d2d6471b94878ba18caf525f1b64e72c2ae6926a9f1f5dac2e9a9366151d35156fb519cca8aeeda97d8e42cc258a93390170859b3035de4da69e48e321
+DIST icedtea-3.8-hotspot-cb5711bf53d9.tar.xz 6838240 BLAKE2B a2419e93d736458c7853800c0efbd8a5035b2baa2b239e4326bdf70c5b6f08d36a96ae53b29de978e493c40ccf146f2c2115a08413b1fbf25c51850eb83fc4c2 SHA512 8c4b060611b867c43fbe6cac3d2f06f6979950781872b387220e12c7066b3efde24160b7bd03189350a6518615b492703425c2ea67a26c6b4d187f843093a780
+DIST icedtea-3.8-jaxp-2b279bb3475b.tar.xz 2287836 BLAKE2B 3705c8137a29a706aefe3dbb32fb0042e81c50cddcc54c31448d2c6f2c5a27ab3ea7e7f03f82990c379b9f39368aaeb6d8ee8adb56ecbf21faddb35d1727be07 SHA512 3eb04788776612f0de0b058908417c4735e6b1cfb56afaf73748e1f3121b25d6eea710cd1d72ed19f8788c8e00b701265d79237da3542d0947c00d37b4308e9c
+DIST icedtea-3.8-jaxws-c54a27559acb.tar.xz 2270928 BLAKE2B 2c5adb94aabd276fb00840ef6b0dfd04a36d728c603c8281bdbcc3d13b393144fb2336d4da54085ab999ef6725b6f706d727645a36b77f4a1294177947b6059f SHA512 1431e71e2281eef893904e686c8d33587c4332ed7cfacd5fd2e278fe0a4e6f225e03d22b8ca73517b030e3e33ffba964f023bed9b9e4f4a6f14b8cced43ce0a5
+DIST icedtea-3.8-jdk-9c9ff65b03b6.tar.xz 39146448 BLAKE2B 1f9a4efcc5697ce73af9018d39c632cecbca6945c4065f089db027d1fa86b6c315ead93f3acd291615c68edc057b470abe1cd0316300f54113eada7789b3a5cd SHA512 9f6b6e42e8bea6a00c9833bd9775bfa5c63d1126e25fc376f4ba2cf5601dea8ab6a3f1d442d5fb188de3f74ce0a6410dc3a8463f798b1aa23822a272faa5aa73
+DIST icedtea-3.8-langtools-21524ad5b914.tar.xz 2070064 BLAKE2B 5a5dcc0e40e08330e29850d99810fe62fc233390347ebb21fe12f606ddc6e8b5fe2060fe181210626d1e2ddc92828779f8fc138bdfda90f7b66f88e75f80ea43 SHA512 fd57023505d69246593ed24d90ad7052a88362ef7106900eca59e61ad5cadc247215cc9e8d410f9150e33a72126247ce1bb809540985062515b3d31d77d1535e
+DIST icedtea-3.8-nashorn-bb3e3345d3ec.tar.xz 2317148 BLAKE2B 9d85532853dfde6fcbf406d52f29e3b8130e5435e38200a48aadb16b4aa8a9dfe70fe6f7f83c4bd170e25a61fbaf3a8499893ae247239594e004f1a4aa37e708 SHA512 7c6d51a6565fe8c670a59caf001b1c0821b7fb2e42b2bbe24b35e337df4fc664c87868e0c55dcaa168f9c3e973ab9e75bca93d660e242c07d0f21eff83d674b5
+DIST icedtea-3.8-openjdk-499b993b345a.tar.xz 335928 BLAKE2B bb49fd086851110e9beb993167f2cb9b217800086070a1ba04a6b96b9e130157a2d8420a056e2e71e98144cd94454aa4c3a568c038f1b282cbc06b25df49a54c SHA512 e438a7ab0eb4e4374278afdbd40cab66875c9704f80a8963f0c965ce995744bcf23814c734ffd10e95329c7b767337fff18e3478c3f03481f8e15a5a9bfc853f
+DIST icedtea-3.8-shenandoah-c44a9eef4985.tar.xz 6954776 BLAKE2B 348735f8a2ecd656c4d323dd870fa63d028757a57babe0f4ffa0977d0446f17cd80a6709147b98d6712e1b5d26719cfad1ea01536930dddcf7389947b43a7d7d SHA512 2e84c6b398f35e59d3819e5ce23dd573e76c385c47f9971d6b77def1cfc1b19a86288e3cdbd78aa6dcdab068128852f4a1c82cf13229a760b1f625095cd51514
+DIST icedtea-3.8.0.tar.xz 1496972 BLAKE2B 9a376539ca2c4c8560aeaaa2fbc65c61a90519b9c87e924e2d54ef150401676e90df0fb5143fd90e9e4c6d254db56617456a668bf886573854f299402af378d8 SHA512 6336d35c11dbe16c96bc07eaa760fd849a2cd317416aba72b0732f8f1e52c9e3fedde5398d4a7f5a3057d4b6ae229965d597b3f5df09a76b5f31bbad0ad02a9a
+DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
+DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
+EBUILD icedtea-3.8.0.ebuild 13468 BLAKE2B 62e98bbb5ed7e7e70965209ef0b3dd3024251bce50aca508986b17ac93b3a57df1e259a5a2c908c6f3663bc75d68b9b49d4b841a80fd3a9d39aff8abecc09e6d SHA512 9012597152243ebdf9aef973aaac34c0818f4998ef2359e930692ffee304faf1fca970b146dba8468b4ed7d163e60b232fc3f0e8de23d6b15d88d0368c8fb29b
+MISC metadata.xml 2310 BLAKE2B eab8a40ebfc3b3f462fed14a7f21187aa0546e9b3925d8e08951c99ac8ebf846c184d37ed271f07d6bdde6379be92f7fa0244d7be8d0cec29a354c1ac75f69a2 SHA512 e4f1924775a63f058fbc5a385ade16a95115cee0b9ee3c4de05f2e904861e1c3de4f643c4c330da90879ed0a54eed7199b41def3193a494e0eb038ce820e673d
diff --git a/dev-java/icedtea/files/generate-cacerts.pl b/dev-java/icedtea/files/generate-cacerts.pl
new file mode 100644
index 000000000000..17d29b36676d
--- /dev/null
+++ b/dev-java/icedtea/files/generate-cacerts.pl
@@ -0,0 +1,358 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2007, 2008 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# generate-cacerts.pl generates a JKS keystore named 'cacerts' from
+# OpenSSL's certificate bundle using OpenJDK's keytool.
+
+# First extract each of OpenSSL's bundled certificates into its own
+# aliased filename.
+
+# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2
+# Check and prevention of duplicate aliases added by Vlastimil Babka <caster@gentoo.org>
+
+$file = $ARGV[1];
+open(CERTS, $file);
+@certs = <CERTS>;
+close(CERTS);
+
+$pem_file_count = 0;
+$in_cert_block = 0;
+$write_current_cert = 1;
+foreach $cert (@certs)
+{
+    if ($cert =~ /Issuer: /)
+    {
+        $_ = $cert;
+        if ($cert =~ /personal-freemail/)
+        {
+            $cert_alias = "thawtepersonalfreemailca";
+        }
+        elsif ($cert =~ /personal-basic/)
+        {
+            $cert_alias = "thawtepersonalbasicca";
+        }
+        elsif ($cert =~ /personal-premium/)
+        {
+            $cert_alias = "thawtepersonalpremiumca";
+        }
+        elsif ($cert =~ /server-certs/)
+        {
+            $cert_alias = "thawteserverca";
+        }
+        elsif ($cert =~ /premium-server/)
+        {
+            $cert_alias = "thawtepremiumserverca";
+        }
+        elsif ($cert =~ /Class 1 Public Primary Certification Authority$/)
+        {
+            $cert_alias = "verisignclass1ca";
+        }
+        elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/)
+        {
+            $cert_alias = "verisignclass1g2ca";
+        }
+        elsif ($cert =~
+               /VeriSign Class 1 Public Primary Certification Authority - G3/)
+        {
+            $cert_alias = "verisignclass1g3ca";
+        }
+        elsif ($cert =~ /Class 2 Public Primary Certification Authority$/)
+        {
+            $cert_alias = "verisignclass2ca";
+        }
+        elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/)
+        {
+            $cert_alias = "verisignclass2g2ca";
+        }
+        elsif ($cert =~
+               /VeriSign Class 2 Public Primary Certification Authority - G3/)
+        {
+            $cert_alias = "verisignclass2g3ca";
+        }
+        elsif ($cert =~ /Class 3 Public Primary Certification Authority$/)
+        {
+            $cert_alias = "verisignclass3ca";
+        }
+        # Version 1 of Class 3 Public Primary Certification Authority
+        # - G2 is added.  Version 3 is excluded.  See below.
+        elsif ($cert =~
+               /VeriSign Class 3 Public Primary Certification Authority - G3/)
+        {
+            $cert_alias = "verisignclass3g3ca";
+        }
+        elsif ($cert =~
+               /RSA Data Security.*Secure Server Certification Authority/)
+        {
+            $cert_alias = "verisignserverca";
+        }
+        elsif ($cert =~ /GTE CyberTrust Global Root/)
+        {
+            $cert_alias = "gtecybertrustglobalca";
+        }
+        elsif ($cert =~ /Baltimore CyberTrust Root/)
+        {
+            $cert_alias = "baltimorecybertrustca";
+        }
+        elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/)
+        {
+            $cert_alias = "entrustclientca";
+        }
+        elsif ($cert =~ /www.entrust.net\/GCCA_CPS/)
+        {
+            $cert_alias = "entrustglobalclientca";
+        }
+        elsif ($cert =~ /www.entrust.net\/CPS_2048/)
+        {
+            $cert_alias = "entrust2048ca";
+        }
+        elsif ($cert =~ /www.entrust.net\/CPS /)
+        {
+            $cert_alias = "entrustsslca";
+        }
+        elsif ($cert =~ /www.entrust.net\/SSL_CPS/)
+        {
+            $cert_alias = "entrustgsslca";
+        }
+        elsif ($cert =~ /The Go Daddy Group/)
+        {
+            $cert_alias = "godaddyclass2ca";
+        }
+        elsif ($cert =~ /Starfield Class 2 Certification Authority/)
+        {
+            $cert_alias = "starfieldclass2ca";
+        }
+        elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/)
+        {
+            $cert_alias = "valicertclass2ca";
+        }
+        elsif ($cert =~ /GeoTrust Global CA$/)
+        {
+            $cert_alias = "geotrustglobalca";
+        }
+        elsif ($cert =~ /Equifax Secure Certificate Authority/)
+        {
+            $cert_alias = "equifaxsecureca";
+        }
+        elsif ($cert =~ /Equifax Secure eBusiness CA-1/)
+        {
+            $cert_alias = "equifaxsecureebusinessca1";
+        }
+        elsif ($cert =~ /Equifax Secure eBusiness CA-2/)
+        {
+            $cert_alias = "equifaxsecureebusinessca2";
+        }
+        elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/)
+        {
+            $cert_alias = "equifaxsecureglobalebusinessca1";
+        }
+        elsif ($cert =~ /Sonera Class1 CA/)
+        {
+            $cert_alias = "soneraclass1ca";
+        }
+        elsif ($cert =~ /Sonera Class2 CA/)
+        {
+            $cert_alias = "soneraclass2ca";
+        }
+        elsif ($cert =~ /AAA Certificate Services/)
+        {
+            $cert_alias = "comodoaaaca";
+        }
+        elsif ($cert =~ /AddTrust Class 1 CA Root/)
+        {
+            $cert_alias = "addtrustclass1ca";
+        }
+        elsif ($cert =~ /AddTrust External CA Root/)
+        {
+            $cert_alias = "addtrustexternalca";
+        }
+        elsif ($cert =~ /AddTrust Qualified CA Root/)
+        {
+            $cert_alias = "addtrustqualifiedca";
+        }
+        elsif ($cert =~ /UTN-USERFirst-Hardware/)
+        {
+            $cert_alias = "utnuserfirsthardwareca";
+        }
+        elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/)
+        {
+            $cert_alias = "utnuserfirstclientauthemailca";
+        }
+        elsif ($cert =~ /UTN - DATACorp SGC/)
+        {
+            $cert_alias = "utndatacorpsgcca";
+        }
+        elsif ($cert =~ /UTN-USERFirst-Object/)
+        {
+            $cert_alias = "utnuserfirstobjectca";
+        }
+        elsif ($cert =~ /America Online Root Certification Authority 1/)
+        {
+            $cert_alias = "aolrootca1";
+        }
+        elsif ($cert =~ /DigiCert Assured ID Root CA/)
+        {
+            $cert_alias = "digicertassuredidrootca";
+        }
+        elsif ($cert =~ /DigiCert Global Root CA/)
+        {
+            $cert_alias = "digicertglobalrootca";
+        }
+        elsif ($cert =~ /DigiCert High Assurance EV Root CA/)
+        {
+            $cert_alias = "digicerthighassuranceevrootca";
+        }
+        elsif ($cert =~ /GlobalSign Root CA$/)
+        {
+            $cert_alias = "globalsignca";
+        }
+        elsif ($cert =~ /GlobalSign Root CA - R2/)
+        {
+            $cert_alias = "globalsignr2ca";
+        }
+        elsif ($cert =~ /Elektronik.*Kas.*2005/)
+        {
+            $cert_alias = "extra-elektronikkas2005";
+        }
+        elsif ($cert =~ /Elektronik/)
+        {
+            $cert_alias = "extra-elektronik2005";
+        }
+        # Mozilla does not provide these certificates:
+        #   baltimorecodesigningca
+        #   gtecybertrust5ca
+        #   trustcenterclass2caii
+        #   trustcenterclass4caii
+        #   trustcenteruniversalcai
+        else
+        {
+            # Generate an alias using the OU and CN attributes of the
+            # Issuer field if both are present, otherwise use only the
+            # CN attribute.  The Issuer field must have either the OU
+            # or the CN attribute.
+            $_ = $cert;
+            if ($cert =~ /OU=/)
+            {
+                s/Issuer:.*?OU=//;
+                # Remove other occurrences of OU=.
+                s/OU=.*CN=//;
+                # Remove CN= if there were not other occurrences of OU=.
+                s/CN=//;
+                s/\/emailAddress.*//;
+                s/Certificate Authority/ca/g;
+                s/Certification Authority/ca/g;
+            }
+            elsif ($cert =~ /CN=/)
+            {
+                s/Issuer:.*CN=//;
+                s/\/emailAddress.*//;
+                s/Certificate Authority/ca/g;
+                s/Certification Authority/ca/g;
+            }
+            s/\W//g;
+            tr/A-Z/a-z/;
+            $cert_alias = "extra-$_";
+
+        }
+        while (-e "$cert_alias.pem")
+        {
+            $cert_alias = "$cert_alias" . "_";
+        }
+    }
+    # When it attempts to parse:
+    #
+    # Class 3 Public Primary Certification Authority - G2, Version 3
+    #
+    # keytool says:
+    #
+    # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false
+    # Unparseable AuthorityInfoAccess extension due to
+    # java.io.IOException: Invalid encoding of URI
+    #
+    # If we do not exclude this file
+    # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails
+    # on this cert, printing:
+    #
+    # Couldn't verify: java.security.SignatureException: Signature
+    # does not match.
+    #
+    elsif ($cert =~
+           /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/)
+    {
+        $write_current_cert = 0;
+        $pem_file_count--;
+    }
+    elsif ($cert eq "-----BEGIN CERTIFICATE-----\n")
+    {
+        if ($in_cert_block != 0)
+        {
+            die "$file is malformed.";
+        }
+        $in_cert_block = 1;
+        if ($write_current_cert == 1)
+        {
+            $pem_file_count++;
+            if (-e "$cert_alias.pem")
+            {
+                print "$cert_alias";
+                die "already exists"
+            }
+            open(PEM, ">$cert_alias.pem");
+            print PEM $cert;
+        }
+    }
+    elsif ($cert eq "-----END CERTIFICATE-----\n")
+    {
+        $in_cert_block = 0;
+        if ($write_current_cert == 1)
+        {
+            print PEM $cert;
+            close(PEM);
+        }
+        $write_current_cert = 1
+    }
+    else
+    {
+        if ($in_cert_block == 1 && $write_current_cert == 1)
+        {
+            print PEM $cert;
+        }
+    }
+}
+
+# Check that the correct number of .pem files were produced.
+@pem_files = <*.pem>;
+if (@pem_files != $pem_file_count)
+{
+    print "$pem_file_count";
+    die "Number of .pem files produced does not match".
+        " number of certs read from $file.";
+}
+
+# Now store each cert in the 'cacerts' file using keytool.
+$certs_written_count = 0;
+foreach $pem_file (@pem_files)
+{
+    system "$ARGV[0] -noprompt -import".
+        " -alias `basename $pem_file .pem`".
+        " -keystore cacerts -storepass 'changeit' -file $pem_file";
+    unlink($pem_file);
+    $certs_written_count++;
+}
+
+# Check that the correct number of certs were added to the keystore.
+if ($certs_written_count != $pem_file_count)
+{
+    die "Number of certs added to keystore does not match".
+        " number of certs read from $file.";
+}
diff --git a/dev-java/icedtea/files/icedtea.env.sh b/dev-java/icedtea/files/icedtea.env.sh
new file mode 100644
index 000000000000..ac8303bda073
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea.env.sh
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="IcedTea JDK ${PV}"
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}"
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
+MANPATH="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.${SLOT}"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea/icedtea-3.8.0.ebuild b/dev-java/icedtea/icedtea-3.8.0.ebuild
new file mode 100644
index 000000000000..01b3cb086235
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.8.0.ebuild
@@ -0,0 +1,419 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+EAPI="6"
+SLOT="8"
+
+inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
+
+ICEDTEA_VER=$(get_version_component_range 1-3)
+ICEDTEA_BRANCH=$(get_version_component_range 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+
+CORBA_TARBALL="75fd375dd38a.tar.xz"
+JAXP_TARBALL="2b279bb3475b.tar.xz"
+JAXWS_TARBALL="c54a27559acb.tar.xz"
+JDK_TARBALL="9c9ff65b03b6.tar.xz"
+LANGTOOLS_TARBALL="21524ad5b914.tar.xz"
+OPENJDK_TARBALL="499b993b345a.tar.xz"
+NASHORN_TARBALL="bb3e3345d3ec.tar.xz"
+HOTSPOT_TARBALL="cb5711bf53d9.tar.xz"
+SHENANDOAH_TARBALL="c44a9eef4985.tar.xz"
+AARCH32_TARBALL="bd08b7f27e11.tar.xz"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
+AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${SRC_PKG}
+	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
+	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
+	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+alsa cacao +cups doc examples +gtk headless-awt
+	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
+	pulseaudio sctp selinux shenandoah smartcard +source +sunec +system-lcms test +webstart zero"
+
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	>=media-libs/giflib-4.1.6:0=
+	>=media-libs/libpng-1.2:0=
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	x11-libs/libXcomposite"
+X_DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2"
+
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+COMMON_DEP="
+	>=dev-libs/glib-2.26:2=
+	>=dev-util/systemtap-1
+	media-libs/fontconfig:1.0=
+	>=media-libs/freetype-2.5.3:2=
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:0=
+	kerberos? ( virtual/krb5 )
+	sctp? ( net-misc/lksctp-tools )
+	smartcard? ( sys-apps/pcsc-lite )
+	sunec? ( >=dev-libs/nss-3.16.1-r1 )
+	system-lcms? ( >=media-libs/lcms-2.9:2= )"
+
+# Gtk+ will move to COMMON_DEP in time; PR1982
+# gsettings-desktop-schemas will be needed for native proxy support; PR1976
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	!dev-java/icedtea-web:7
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	virtual/ttf-fonts
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )
+	gtk? (
+		>=dev-libs/atk-1.30.0
+		>=x11-libs/cairo-1.8.8
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.8:2
+		>=x11-libs/pango-1.24.5
+	)
+	!headless-awt? ( ${X_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )"
+
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# perl is needed for running the SystemTap tests and the bootstrap javac
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+	|| (
+		dev-java/icedtea-bin:8
+		dev-java/icedtea-bin:7
+		dev-java/icedtea:8
+		dev-java/icedtea:7
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	dev-lang/perl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl:0 )
+	sys-apps/attr
+	sys-apps/lsb-release
+	x11-libs/libXt
+	virtual/pkgconfig
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+# @FUNCTION: get_systemtap_arch
+# @DESCRIPTION:
+# Get arch name used in /usr/share/systemtap/tapset so we can
+# install OpenJDK tapsets.
+
+get_systemtap_arch() {
+	local abi=${1-${ABI}}
+
+	case ${abi} in
+		*_fbsd) get_systemtap_arch ${abi%_fbsd} ;;
+		amd64*) echo x86_64 ;;
+		ppc*) echo powerpc ;;
+		x86*) echo i386 ;;
+		*) echo ${abi} ;;
+	esac
+}
+
+icedtea_check_requirements() {
+	local CHECKREQS_DISK_BUILD
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="9000M"
+	else
+		CHECKREQS_DISK_BUILD="8500M"
+	fi
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	icedtea_check_requirements
+}
+
+pkg_setup() {
+	icedtea_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-8 icedtea-bin-8
+		icedtea-7 icedtea-bin-7"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+src_configure() {
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# gcj-jdk ensures ecj is present.
+	if use jbootstrap || has "${vm}" gcj-jdk; then
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		config+=" --enable-bootstrap"
+	else
+		config+=" --disable-bootstrap"
+	fi
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes"
+	fi
+
+	# Use JamVM if requested
+	if use jamvm; then
+		use_jamvm="yes"
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes"
+	fi
+
+	# Are we on a architecture with a HotSpot port?
+	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+		hotspot_port="yes"
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use Zero for now until alternate VMs are working
+	if test "x${hotspot_port}" != "xyes"; then
+			use_zero="yes"
+	fi
+
+	if use shenandoah; then
+		if { use amd64 || use arm64; }; then
+			hs_config="--with-hotspot-build=shenandoah"
+			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
+		else
+			eerror "Shenandoah can only be built on arm64 and x86_64. Please re-build with USE="-shenandoah""
+		fi
+	else
+		if use arm ; then
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
+		else
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+		fi
+	fi
+
+	# Turn on JamVM if needed (non-HS archs) or requested
+	if test "x${use_jamvm}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-jamvm"'
+		fi
+		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+		jamvm_config="--enable-jamvm"
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-cacao"'
+		fi
+		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+		cacao_config="--enable-cacao"
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+		fi
+		zero_config="--enable-zero"
+	fi
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		config+=" --enable-precompiled-headers"
+	else
+		config+=" --disable-precompiled-headers"
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--with-pkgversion="Gentoo ${PF}" \
+		--disable-ccache \
+		--disable-downloading --disable-Werror --disable-tests \
+		--disable-systemtap-tests --enable-improved-font-rendering \
+		--enable-system-jpeg --enable-system-zlib \
+		$(use_enable headless-awt headless) \
+		$(use_enable !headless-awt system-gif) \
+		$(use_enable !headless-awt system-png) \
+		$(use_enable doc docs) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable system-lcms) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable sctp system-sctp) \
+		$(use_enable smartcard system-pcsc) \
+		$(use_enable sunec) \
+		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
+}
+
+src_compile() {
+	default
+}
+
+src_test() {
+	default
+}
+
+src_install() {
+	default
+
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+	local stapdest="/usr/share/systemtap/tapset/$(get_systemtap_arch)"
+
+	if ! use alsa; then
+		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use examples; then
+		rm -r "${ddest}"/demo "${ddest}"/sample || die
+	fi
+
+	if ! use source; then
+		rm -v "${ddest}"/src.zip || die
+	fi
+
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	# Link SystemTap tapsets into SystemTap installation directory
+	mkdir -p "${ED}/${stapdest}"
+	for tapsets in "${ddest}"/tapset/*.stp; do
+		tapname=$(basename ${tapsets})
+		destname=${tapname/./-${SLOT}.}
+		dosym "${dest}"/tapset/${tapname} ${stapdest}/${destname}
+	done
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	# From 3.4.0 onwards, the arm directory is a symlink to the aarch32
+	# directory. We need to clear the old directory for a clean upgrade.
+	if use arm; then
+		local dir
+		for dir in "${EROOT}usr/$(get_libdir)/icedtea${SLOT}"/{lib,jre/lib}/arm; do
+			if [[ -d ${dir} && ! -L ${dir} ]]; then
+				rm -r "${dir}" || die
+			fi
+		done
+	fi
+
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
new file mode 100644
index 000000000000..31b4e46c9906
--- /dev/null
+++ b/dev-java/icedtea/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>gnu_andrew@member.fsf.org</email>
+  <name>Andrew John Hughes</name>
+</maintainer>
+<maintainer type="person">
+  <email>chewi@gentoo.org</email>
+  <name>James Le Cuirot</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+<maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
+<longdescription>The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription>
+<use>
+  <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
+  <flag name="cups">Link against the CUPS library at compile time, rather than using it dynamically at runtime.</flag>
+  <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
+  <flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
+  <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
+  <flag name="kerberos">Link against Kerberos in order to obtain the cache location.</flag>
+  <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>
+  <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
+  <flag name="pch">Build using pre-compiled headers.</flag>
+  <flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
+  <flag name="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only)</flag>
+  <flag name="smartcard">Build the PCSC driver against pcsc-lite</flag>
+  <flag name="sunec">Build the SunEC provider against system NSS</flag>
+  <flag name="system-lcms">Build against the system LCMS installation rather than the in-tree copy.</flag>
+  <flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag>
+  <flag name="webstart">Enable Web Start support (via NetX).</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-java/icu4j-54.1.1 b/dev-java/icu4j-54.1.1
deleted file mode 100644
index c2868abb6af7..000000000000
--- a/dev-java/icu4j-54.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A set of Java libraries providing Unicode and Globalization support
-EAPI=5
-HOMEPAGE=http://www.icu-project.org/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=icu
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=52
-SRC_URI=http://download.icu-project.org/files/icu4j/54.1.1/icu4j-54_1_1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c28c1e919be8f3b6184776bcd7dad4ca
diff --git a/dev-java/icu4j-55.1 b/dev-java/icu4j-55.1
deleted file mode 100644
index f3331ff7bd06..000000000000
--- a/dev-java/icu4j-55.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A set of Java libraries providing Unicode and Globalization support
-EAPI=5
-HOMEPAGE=http://www.icu-project.org/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=icu
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=55
-SRC_URI=http://download.icu-project.org/files/icu4j/55.1/icu4j-55_1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=354cf3441cd96d928c1ecbb05118282a
diff --git a/dev-java/icu4j-56.1 b/dev-java/icu4j-56.1
deleted file mode 100644
index 12bdce4e34fd..000000000000
--- a/dev-java/icu4j-56.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A set of Java libraries providing Unicode and Globalization support
-EAPI=6
-HOMEPAGE=http://www.icu-project.org/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=icu
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=56
-SRC_URI=http://download.icu-project.org/files/icu4j/56.1/icu4j-56_1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=abe70e3a44a247a7804d7ba8d261564e
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
new file mode 100644
index 000000000000..ea22261325b4
--- /dev/null
+++ b/dev-java/icu4j/Manifest
@@ -0,0 +1,7 @@
+DIST icu4j-54_1_1.tgz 23457651 BLAKE2B f200d170c32065d2f678247d595085283446e401da2c2433b426466fc5c6f93f5ce629bce23d1114cad7d360aa4d127060750d380da8cc3e7fa1e529b454bae9 SHA512 c41f7f9fb0819767da48ac21c4883a628da8397e0ad5b0d75e51d9185b5511608c9a635933c4ae2e0c8911b2cdecf47bc661050935bbae2ba58abfb5ad04dadf
+DIST icu4j-55_1.tgz 23617640 BLAKE2B fe22524761e0c6be4ea440f90ffe5fba8a2f34484207248762ab127c3bb7e4328ced3502a336edd7d3a1026804381cd2b8738b15cd1745af0cee813dc60d7893 SHA512 706daed61d9d3722a0813d175fa66b24570abba492c32704d4df924861e5d2592a4a5ff40fdec2bd3fb662c3679dbc9addd580966c3cc69470d14e3fce27a054
+DIST icu4j-56_1.tgz 23189284 BLAKE2B d53aa869d6cde8cc9c83e66b55986b61736fbaf7a890e3c7bacab5abb23623ec64b5a23fd740dca8e51fd2336ced5e79546b4c08edca25beced22e6560f7814d SHA512 9ecc36c03a6713dbfb909e109b5e982525958b6137bd7006c93ff3b8578d816c59fa331555b43c94248f392ba9b456b1adb37be74e02e9ea818c8a9a7c669f4a
+EBUILD icu4j-54.1.1.ebuild 1213 BLAKE2B d47fef652684c16d29b82b733f31ebfcbcaf983117a4a7034f9b29dbb2dc03a5de7c5c342c0b1f9300fd8c5cc600e45fe3a67ec832fc9b972157ff7d636177d4 SHA512 af5cb4dd46107792562c6c9460a09e728b8c79b0cb974ef90cb58c33cfaba621b38a06099b793d2976f608d1d6308bd8e5184f794f24b4a2ec5f2179733b81df
+EBUILD icu4j-55.1.ebuild 1136 BLAKE2B c942cd5c30cf3f12b10deb63edd95f7680d837a5515130bd5f160311859bfba269fe7376927efa0c07dcd56843a8ca6b134bf94ed77a35215848cc6cdef5508d SHA512 11157e68e4c11522c6af2ec1015ed0b63d0a13ad03a5bffb7296026d66ae6da0fbae153529c7305a8b6dc386366dcab9e35c2b8b9831de0a1c92f20354400cd7
+EBUILD icu4j-56.1.ebuild 1081 BLAKE2B 916737c2e0db890bb1e399629af6f0c6c0cf084cbaa3429388e357942c9ed602d8be0c5584c2f68ceb37e4e5f063da2b6ee66cddbcee6019d0ca847b7cdbffb3 SHA512 77bd9ebfd71a0c7a0ebe6683110246e1ef987a8f77f94ff4bb8e0f892fd2801e4cc4243dada495305a0d22fef13b465e426c04ff4eae7db836c9f2b8a7a7d20f
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/icu4j/icu4j-54.1.1.ebuild b/dev-java/icu4j/icu4j-54.1.1.ebuild
new file mode 100644
index 000000000000..b7808b26f206
--- /dev/null
+++ b/dev-java/icu4j/icu4j-54.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# testdata.jar, icudata.jar and icutzdata.jar do not contain *.class files
+# but *.res files. These *.res data files are needed to build the final jar.
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
+
+LICENSE="icu"
+SLOT="52"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+# Beware of jdk version dependant code #361593
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
+
+EANT_DOC_TARGET="docs"
+EANT_TEST_TARGET="check"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	java-pkg_dojar ${PN}-charset.jar
+	java-pkg_dojar ${PN}-localespi.jar
+
+	dohtml readme.html
+
+	use doc && java-pkg_dojavadoc doc
+	use examples && java-pkg_doexamples demos samples
+	use source && java-pkg_dosrc main/classes/*/src/com
+}
diff --git a/dev-java/icu4j/icu4j-55.1.ebuild b/dev-java/icu4j/icu4j-55.1.ebuild
new file mode 100644
index 000000000000..5c57a734de39
--- /dev/null
+++ b/dev-java/icu4j/icu4j-55.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
+
+LICENSE="icu"
+SLOT="55"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+# Beware of jdk version dependant code #361593
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
+
+EANT_DOC_TARGET="docs"
+EANT_TEST_TARGET="check"
+
+JAVA_RM_FILES=(
+	tools/build/src/com/ibm/icu/dev/tool/docs/ICUTaglet.java
+)
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	java-pkg_dojar ${PN}-charset.jar
+	java-pkg_dojar ${PN}-localespi.jar
+
+	dohtml readme.html
+
+	use doc && java-pkg_dojavadoc doc
+	use examples && java-pkg_doexamples demos samples
+	use source && java-pkg_dosrc main/classes/*/src/com
+}
diff --git a/dev-java/icu4j/icu4j-56.1.ebuild b/dev-java/icu4j/icu4j-56.1.ebuild
new file mode 100644
index 000000000000..3e0a98276d16
--- /dev/null
+++ b/dev-java/icu4j/icu4j-56.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
+
+LICENSE="icu"
+SLOT="56"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
+
+EANT_DOC_TARGET="docs"
+EANT_TEST_TARGET="check"
+
+JAVA_RM_FILES=(
+	tools/build/src/com/ibm/icu/dev/tool/docs/ICUTaglet.java
+)
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	java-pkg_dojar ${PN}-charset.jar
+	java-pkg_dojar ${PN}-localespi.jar
+
+	dodoc readme.html
+
+	use doc && java-pkg_dojavadoc doc
+	use examples && java-pkg_doexamples demos samples
+	use source && java-pkg_dosrc main/classes/*/src/com
+}
diff --git a/dev-java/icu4j/metadata.xml b/dev-java/icu4j/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/icu4j/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/idm-console-framework-1.1.7 b/dev-java/idm-console-framework-1.1.7
deleted file mode 100644
index 289cc03f793d..000000000000
--- a/dev-java/idm-console-framework-1.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java Management Console framework used for remote server management
-EAPI=2
-HOMEPAGE=http://directory.fedoraproject.org/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.1
-SRC_URI=http://directory.fedoraproject.org/sources/idm-console-framework-1.1.7.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c7e5ec6c30a64c35d5cdd1fefdb1dc08
diff --git a/dev-java/idm-console-framework/Manifest b/dev-java/idm-console-framework/Manifest
new file mode 100644
index 000000000000..b99c90b536b9
--- /dev/null
+++ b/dev-java/idm-console-framework/Manifest
@@ -0,0 +1,3 @@
+DIST idm-console-framework-1.1.7.tar.bz2 708770 BLAKE2B 82e69ced74e92bcd0cae30a7c58ba37d890ed56694e23d464dd8ce91be5aab80a2a48ec91608a83a4e8f5892ba242c273e266c431aa00ab172b894fe04d8a841 SHA512 ce4441cbc9917f6ffd0ef6ced44c7ebc542c14db60e7c6eeb844f8c68cbb15fe533916b9ea363d1e865759138d92d38365e9172206c7cd0fa385f4bf443aa739
+EBUILD idm-console-framework-1.1.7.ebuild 1597 BLAKE2B e61a3819ffd6519a2aaf1b67c36c69a09ac8d5a0706f6b478d7f21d9b9b937ffd92c60fba01b4ad64f2fefc16dae9fde8957d24d13c5a8fd5aada236fb84b6ee SHA512 d9a8e630971d16262b9a519f9bc4853fa2676a87c363e944083d9d81e8fc718bb99eadbee679110e9795d711f4e6942520c93dcc6de86294c3301762e9065095
+MISC metadata.xml 571 BLAKE2B 87ece50943597b058ab1fda6f7a96c34ca2ca391d71303da9701baee68c471ceb104633ddf7bd883fdd9a65ff181a4cdfe0b7996a968de389727decd00ba9f11 SHA512 0332dc27ea58f9ab191783fc12ce14e47a7680ef232601901c7b33a10b672c13bbb9c8ba75a0ef0eaac1ce31e4e7d1c62ac3a701160e2ae9aa5de4915cde9b23
diff --git a/dev-java/idm-console-framework/idm-console-framework-1.1.7.ebuild b/dev-java/idm-console-framework/idm-console-framework-1.1.7.ebuild
new file mode 100644
index 000000000000..582a023c2b50
--- /dev/null
+++ b/dev-java/idm-console-framework/idm-console-framework-1.1.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 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 eutils java-ant-2
+
+DESCRIPTION="A Java Management Console framework used for remote server management"
+HOMEPAGE="http://directory.fedoraproject.org/"
+SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-java/jss:3.4
+	dev-java/ldapsdk:4.1"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEPEND}"
+
+src_prepare() {
+	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
+	java-pkg_jar-from jss-3.4 xpclass.jar jss4.jar
+}
+
+src_compile() {
+	eant -Dbuilt.dir="${S}"/build \
+	     -Dldapjdk.local.location="${S}" \
+	     -Djss.local.location="${S}" ${antflags}
+	use doc && eant -Dbuilt.dir="${S}"/build \
+	     -Dldapjdk.local.location="${S}" \
+	     -Djss.local.location="${S}" ${antflags} javadoc
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/build/release/jars/idm-console-mcc-${PV}.jar idm-console-mcc.jar
+	java-pkg_newjar "${S}"/build/release/jars/idm-console-mcc-${PV}_en.jar idm-console-mcc_en.jar
+	java-pkg_newjar "${S}"/build/release/jars/idm-console-nmclf-${PV}.jar idm-console-nmclf.jar
+	java-pkg_newjar "${S}"/build/release/jars/idm-console-nmclf-${PV}_en.jar idm-console-nmclf_en.jar
+	java-pkg_newjar "${S}"/build/release/jars/idm-console-base-${PV}.jar idm-console-base.jar
+
+	use doc && java-pkg_dojavadoc build/doc
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/com
+}
diff --git a/dev-java/idm-console-framework/metadata.xml b/dev-java/idm-console-framework/metadata.xml
new file mode 100644
index 000000000000..b3788377b81e
--- /dev/null
+++ b/dev-java/idm-console-framework/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wibrown@redhat.com</email>
+		<name>William Brown</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>wes@sol1.com.au</email>
+		<name>Wes</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		A Java Management Console framework used for remote server management.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/ini4j-0.5.1 b/dev-java/ini4j-0.5.1
deleted file mode 100644
index e94a24aa1555..000000000000
--- a/dev-java/ini4j-0.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Simple Java API Windows style .ini file handling
-EAPI=5
-HOMEPAGE=http://ini4j.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/org/ini4j/ini4j/0.5.1/ini4j-0.5.1-sources.jar -> ini4j-0.5.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4e57727d6d1179fa2de3452dcedbb991
diff --git a/dev-java/ini4j-0.5.2 b/dev-java/ini4j-0.5.2
deleted file mode 100644
index 8f65cff2c9e5..000000000000
--- a/dev-java/ini4j-0.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Simple Java API Windows style .ini file handling
-EAPI=6
-HOMEPAGE=http://ini4j.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/org/ini4j/ini4j/0.5.2/ini4j-0.5.2-sources.jar -> ini4j-0.5.2.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fc9fe85a1fcc671f3c4cdb4f8013751b
diff --git a/dev-java/ini4j/Manifest b/dev-java/ini4j/Manifest
new file mode 100644
index 000000000000..19d2d3d153b8
--- /dev/null
+++ b/dev-java/ini4j/Manifest
@@ -0,0 +1,7 @@
+AUX ini4j-0.5.1-remove.patch 801 BLAKE2B 2c2ea35db73107056de71dced69f84b6e4c2bf20efe74f99e4dca28a6633d6faf9a8f34bd6146ee80d042673ba52c8b8afebd322a04f38c03568d5b4e5ec2f34 SHA512 e2e2a69311f0efc9887c089bc41ad7921b04d8a32add9bd5eb68ad528d82640bf6bf30b990ba2dba3989140c3d47fa155b81c1cb98260fe2b902dff3e28fef3f
+AUX ini4j-0.5.2-remove.patch 799 BLAKE2B 1ab11eb06ca088b2c021df564af1adaeb51c6879447671466efe8a18002458376770daed5dd0630486c454fb7c12652cfdc38c9483fc312c978f35bd69a0a5a5 SHA512 ed7a49b7475dfe45e0ec2afc1c051bbb48f21e0986177e057d4f21d2185c7befda3fcaa4e36f7578038e76ef02e8b528cf0ea374daaf5dfbbbfb8b69e0bbb4d5
+DIST ini4j-0.5.1.jar 61117 BLAKE2B dedeefed13b66d21f185b786ed9cf5b045a06cf6ab8db108258597ed51e2625ec41e9c23fb032b4d77110f415a10641ad3e673f958842dfcde192bfb9d693d68 SHA512 1c4b5218d092cab9374070c8ae55c7a2483b30893f5af5cfe5d74054b2f5261fe2e1a477a650589d2fc7518b4dcce91a2308ab35bba6b3d918f5e5c19a55eb9a
+DIST ini4j-0.5.2.jar 63258 BLAKE2B 130cf84292295138f8893bcc30aed5b5dcd9eadb6d7f0b984a40388a160ce1f007b4728a13b06cb291a67436fad3bd987b28a068c22cb31e480b35378ff95263 SHA512 eab45f21a9f8f8bc8fdb8654e914ffc9e7eb829169f56a7e1b548a4237eb94e616abe84d78649037ff6254fb00e83b9167bafaf1fe5d97fbf3787838e9bf0fab
+EBUILD ini4j-0.5.1.ebuild 576 BLAKE2B 61babe60b320f38587eb3b4de0438f075a2f9d0ec7bc338358beea6f6c3fbe22bac3e8019bce120f90379d850c7977ad48da158ba9c077b8456f722db6d18211 SHA512 3b428d07dfae00a1db50663df64a647f89b0a8f94bd2856bd2668dda0a8f109d61890eca5c18781c7910f63c53902d21ae612669879667c66b794ae257ed2ffc
+EBUILD ini4j-0.5.2.ebuild 576 BLAKE2B 156100c25e6e71ccd479bd786abc0a8a38a09a8ca43bc216f53b9d43e4069a2cf6f2415732538d505d849af48315cfd6a921bd2aadca7d02104255197af3fe2e SHA512 32bf775cd255c1195056cd2c0c6da3d026fb3eab032a0c001271ce21774acf34edab9430ebcfe9bd4a3f587c399050155101d4b59921d5ff53487f2766b7b82c
+MISC metadata.xml 406 BLAKE2B 078000cb59e2896dd632727b6fcb873dfd63d82f55bdab2c4930d879e0ce7117f0dd08e7b4833569dc270a79abfa045320983bf96e95a87d4872a176e3afb7c8 SHA512 089ac1e2bec5324bf326f74f516e5d60f7019e12598b65a1cbc4004d41bb73bc0b2f0f1934204f3b39b0c92f1dba0a1a6b1c09b9269e03fa7567e0c4b269beee
diff --git a/dev-java/ini4j/files/ini4j-0.5.1-remove.patch b/dev-java/ini4j/files/ini4j-0.5.1-remove.patch
new file mode 100644
index 000000000000..60a1195d4288
--- /dev/null
+++ b/dev-java/ini4j/files/ini4j-0.5.1-remove.patch
@@ -0,0 +1,22 @@
+--- org/ini4j/Profile.java.orig	2015-11-03 22:49:34.854486000 +0000
++++ org/ini4j/Profile.java	2015-11-03 22:49:53.412486000 +0000
+@@ -43,7 +43,7 @@
+ 
+     Section remove(Profile.Section section);
+ 
+-    String remove(Object sectionName, Object optionName);
++    String removeString(Object sectionName, Object optionName);
+ 
+     interface Section extends OptionMap
+     {
+--- org/ini4j/BasicProfile.java.orig	2015-11-03 22:50:28.101486000 +0000
++++ org/ini4j/BasicProfile.java	2015-11-03 22:51:09.338486000 +0000
+@@ -138,7 +138,7 @@
+         return remove((Object) section.getName());
+     }
+ 
+-    @Override public String remove(Object sectionName, Object optionName)
++    @Override public String removeString(Object sectionName, Object optionName)
+     {
+         Section sec = get(sectionName);
+ 
diff --git a/dev-java/ini4j/files/ini4j-0.5.2-remove.patch b/dev-java/ini4j/files/ini4j-0.5.2-remove.patch
new file mode 100644
index 000000000000..444cdb3cd5c0
--- /dev/null
+++ b/dev-java/ini4j/files/ini4j-0.5.2-remove.patch
@@ -0,0 +1,22 @@
+--- a/org/ini4j/Profile.java	2015-11-03 22:49:34.854486000 +0000
++++ b/org/ini4j/Profile.java	2015-11-03 22:49:53.412486000 +0000
+@@ -43,7 +43,7 @@
+ 
+     Section remove(Profile.Section section);
+ 
+-    String remove(Object sectionName, Object optionName);
++    String removeString(Object sectionName, Object optionName);
+ 
+     interface Section extends OptionMap
+     {
+--- a/org/ini4j/BasicProfile.java	2015-11-03 22:50:28.101486000 +0000
++++ b/org/ini4j/BasicProfile.java	2015-11-03 22:51:09.338486000 +0000
+@@ -138,7 +138,7 @@
+         return remove((Object) section.getName());
+     }
+ 
+-    @Override public String remove(Object sectionName, Object optionName)
++    @Override public String removeString(Object sectionName, Object optionName)
+     {
+         Section sec = get(sectionName);
+ 
diff --git a/dev-java/ini4j/ini4j-0.5.1.ebuild b/dev-java/ini4j/ini4j-0.5.1.ebuild
new file mode 100644
index 000000000000..515f27e97129
--- /dev/null
+++ b/dev-java/ini4j/ini4j-0.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple Java API Windows style .ini file handling"
+HOMEPAGE="http://ini4j.sourceforge.net/"
+SRC_URI="http://central.maven.org/maven2/org/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+java_prepare() {
+	epatch "${FILESDIR}"/"${P}-remove.patch"
+}
diff --git a/dev-java/ini4j/ini4j-0.5.2.ebuild b/dev-java/ini4j/ini4j-0.5.2.ebuild
new file mode 100644
index 000000000000..25ecc920c18b
--- /dev/null
+++ b/dev-java/ini4j/ini4j-0.5.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple Java API Windows style .ini file handling"
+HOMEPAGE="http://ini4j.sourceforge.net/"
+SRC_URI="http://central.maven.org/maven2/org/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/"${P}-remove.patch"
+}
diff --git a/dev-java/ini4j/metadata.xml b/dev-java/ini4j/metadata.xml
new file mode 100644
index 000000000000..90b68d528005
--- /dev/null
+++ b/dev-java/ini4j/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">ini4j</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/invokebinder-1.6 b/dev-java/invokebinder-1.6
deleted file mode 100644
index dde7d36ece03..000000000000
--- a/dev-java/invokebinder-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Provide a friendly DSL for binding method handles
-EAPI=5
-HOMEPAGE=https://github.com/headius/invokebinder
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/headius/invokebinder/archive/invokebinder-1.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7adf737eb0720dc8b5f7fc6517a3d30c
diff --git a/dev-java/invokebinder/Manifest b/dev-java/invokebinder/Manifest
new file mode 100644
index 000000000000..0c13be1cbf3e
--- /dev/null
+++ b/dev-java/invokebinder/Manifest
@@ -0,0 +1,4 @@
+AUX invokebinder-1.6-build.xml 9883 BLAKE2B 956e962ef531cfc4e3b90aedb804e709c2528c0c37747a4c897686eb5072e01fc95c4fdf5d88c882412da2131751f312b7fbc3a8c90ab9016bcb3b5d2f312480 SHA512 d498da02a99a4dbbf6c05862a027bca3ed06b8575b8cd7f0c1413750b88b48fe6823ee0c02067a6e476f737b8884a1e7e53bcc9dfe7f74613601bd780c3965a2
+DIST invokebinder-1.6.tar.gz 36027 BLAKE2B b1a676063690500ae0a2c39eed7828d115074fd18ac88338e6078413d837f91e5a1a9a5beb2da976f82315fc6fb63de6f3df47e82c2e7589d4689986d78e3fa1 SHA512 cacdd6dd5fe74bbba940be1b3d53b183adc247b74e89cc0784805b2ad2c63d12ca1abe20bacf0a90ea50db7574e43d4ac52b5a46e61912e5153e2ac2f6bc559a
+EBUILD invokebinder-1.6.ebuild 896 BLAKE2B a009c871e0f31e7c7a3cc529348465d9fc60fd120cdfe46668cfe04caa3927d700d297ebccab61c384117cfbbef4a916d036b217d08b0577d6bdc3b9e4409b2c SHA512 0b26690302f1676e171d618a23c9a3d0de1c2bb9b403c3481fcbf6ac604f1f3e948ba4769632e1efbde3479f2a9aebc8eaff9e6f3adc0762fa33be0a87715817
+MISC metadata.xml 331 BLAKE2B 4edea11b1ef0977f1f26276f424639be6a4eeeb104f0e7f962a75e78525d6eac1b2197d7ac14c44c92957f11c63d4217af354b231a0ee88d4dc2507f5d830853 SHA512 f3e69ac0e7eb827f93dc366045471146598db7454a4bf3eab17611189916f2f668f2d24c4ceab1790d0e67a39adabd9b76e669a52ce96110511a051fcea81fd7
diff --git a/dev-java/invokebinder/files/invokebinder-1.6-build.xml b/dev-java/invokebinder/files/invokebinder-1.6-build.xml
new file mode 100644
index 000000000000..55c846cf0427
--- /dev/null
+++ b/dev-java/invokebinder/files/invokebinder-1.6-build.xml
@@ -0,0 +1,230 @@
+<?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 10/12/15 9:24 PM                      -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="invokebinder-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="invokebinder-1.6"/>
+  <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"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.9/junit-4.9.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.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.7" 
+           verbose="false" 
+           fork="false" 
+           source="1.7">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </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="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.7" 
+           verbose="false" 
+           fork="false" 
+           source="1.7">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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" 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="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"/>
+  </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/invokebinder/invokebinder-1.6.ebuild b/dev-java/invokebinder/invokebinder-1.6.ebuild
new file mode 100644
index 000000000000..6eafa55d1d55
--- /dev/null
+++ b/dev-java/invokebinder/invokebinder-1.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Provide a friendly DSL for binding method handles"
+HOMEPAGE="https://github.com/headius/invokebinder"
+SRC_URI="https://github.com/headius/${PN}/archive/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+LICENSE="Apache-2.0"
+
+S="${WORKDIR}/${PN}-${P}"
+
+DEPEND=">=virtual/jdk-1.7
+	test? (
+		dev-java/ant-junit:0
+	)"
+RDEPEND=">=virtual/jre-1.7"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_TEST_TARGET="test"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "target/${P}.jar" "${PN}.jar"
+	use source && java-pkg_dosrc src/main/java/com
+	if use doc; then
+		java-pkg_dojavadoc target/site/apidocs
+		dodoc README.markdown
+	fi
+}
diff --git a/dev-java/invokebinder/metadata.xml b/dev-java/invokebinder/metadata.xml
new file mode 100644
index 000000000000..08c499458589
--- /dev/null
+++ b/dev-java/invokebinder/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">headius/invokebinder</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/iso-relax-20050331-r4 b/dev-java/iso-relax-20050331-r4
deleted file mode 100644
index 982a90837f58..000000000000
--- a/dev-java/iso-relax-20050331-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Interfaces useful for applications which support RELAX Core
-EAPI=5
-HOMEPAGE=http://iso-relax.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gentoo/iso-relax-20050331-gentoo.tar.bz2 -> iso-relax-20050331.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=421f5b14addbadc2897c423625775a25
diff --git a/dev-java/iso-relax/Manifest b/dev-java/iso-relax/Manifest
new file mode 100644
index 000000000000..20ab8fa62e97
--- /dev/null
+++ b/dev-java/iso-relax/Manifest
@@ -0,0 +1,3 @@
+DIST iso-relax-20050331.tar.bz2 696665 BLAKE2B 4f366818bed5e31fa8fc2f8759a38dddda26b8d379c4ba81ff3679228826890f7383606901440f51d958a2401943822bcb3a03bde9be1a647245563d58316526 SHA512 c327b461785ce647f9913afa6f5b77c41440e806d566884058be76e14a118d14fa305a1bc0157ee150b199b573e75af954311dc79eb8535599544f094526320a
+EBUILD iso-relax-20050331-r4.ebuild 752 BLAKE2B 010d212d282382eceadccd139e830e4be159394239804b8656e9e6512c7b3bfc1da264c05aba5e9414e168e7959fcb710d5dcbb2bedebd1a41aacc2da1521583 SHA512 b90fd47eb568f30cb79d952fda2a0467676571a07759eed91aff177fe4b9cfa1a3756c65a562535fbdceee848d9cb0c9f4f8e94cc8c6dd7fb3af26935a73929d
+MISC metadata.xml 315 BLAKE2B 0c45e5fc5f64ce3a8d20de0be018eda7220ffa15c3880d54e49e8a6ac6cb9de770f5ce66e3e113ee6a6406324b440dee40fa6b98dbf4c2920b8c4c714a891a98 SHA512 08eaff739d58710deda145cdac32ab148112f2364f3f5a898095f0f135bca602354287ebc40ee9ab73d80e344330b810caa87b16b86b3c5696040e16d3a54fd9
diff --git a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild b/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
new file mode 100644
index 000000000000..c82edc65fa0d
--- /dev/null
+++ b/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Interfaces useful for applications which support RELAX Core"
+HOMEPAGE="http://iso-relax.sourceforge.net"
+SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RESTRICT="test"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/iso-relax/metadata.xml b/dev-java/iso-relax/metadata.xml
new file mode 100644
index 000000000000..43d7603d850d
--- /dev/null
+++ b/dev-java/iso-relax/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">iso-relax</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/istack-commons-buildtools-2.22-r1 b/dev-java/istack-commons-buildtools-2.22-r1
deleted file mode 100644
index 92dc09373e2f..000000000000
--- a/dev-java/istack-commons-buildtools-2.22-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/zip dev-java/ant-core:0 dev-java/codemodel:2 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=IStack Commons - Buildtools jar
-EAPI=5
-HOMEPAGE=https://istack-commons.java.net
-IUSE=doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/codemodel:2 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-buildtools/2.22/istack-commons-buildtools-2.22-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0d94f07f235f2a273c6a334e3c506c5e
diff --git a/dev-java/istack-commons-buildtools/Manifest b/dev-java/istack-commons-buildtools/Manifest
new file mode 100644
index 000000000000..d8263ce340c8
--- /dev/null
+++ b/dev-java/istack-commons-buildtools/Manifest
@@ -0,0 +1,3 @@
+DIST istack-commons-buildtools-2.22-sources.jar 12689 BLAKE2B 09edcf7a2a968a960d6ea3556bc081883697149c264798680089ff4916e8dcb30193d32250ad3093b104333f8893c8159a607d9e518987c922511032d6a8ab09 SHA512 6cafd354c51fe1b42bb8a6cf52ddf9f6dd97cfdd16182ed5d1a2db6440d18ab84af4d9136df09aa4703694bad546967d25e828c0e1b21fb802c66630da3f4fe4
+EBUILD istack-commons-buildtools-2.22-r1.ebuild 651 BLAKE2B 55d51ec4488a306761e2c2ad522226d5a5ea51f3c00cd3feda84227ff070ad8461f5bb9d9480d18a3f8cb1538d95e57d9b4eae2f4e9b4627640a1a818706ce5a SHA512 4de4de048de599bc828a973c7ef434a3133a3812bd4ee809f9b142bcac18136b2e1661cea56b4742a610590f0dcafa452d6a4a3ce406be6d02b0a69f1020eb81
+MISC metadata.xml 315 BLAKE2B 31a00a56a66bec7fb42582aaa8bb567420eff725eb8e73314776200b6d42c45d07268439315c4e140e622ac00349a131c3f237d227d91ec5b4b6eef138af7b0d SHA512 86fa3fc78d08380af738187033c0b738c63c943e9d649b91515988da3f2bbc6e4689cca0c67d6d0ffe4bfb524f323e810580d996eb03bfc68893ba0618c20e47
diff --git a/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild b/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild
new file mode 100644
index 000000000000..30069ea5a073
--- /dev/null
+++ b/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+JAVA_PKG_IUSE="doc source"
+
+MY_PN=${PN%%-*}
+
+DESCRIPTION="IStack Commons - Buildtools jar"
+HOMEPAGE="https://istack-commons.java.net"
+SRC_URI="https://maven.java.net/content/repositories/releases/com/sun/${MY_PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc source"
+
+CDEPEND="dev-java/ant-core:0
+	dev-java/codemodel:2"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/zip
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,codemodel-2"
diff --git a/dev-java/istack-commons-buildtools/metadata.xml b/dev-java/istack-commons-buildtools/metadata.xml
new file mode 100644
index 000000000000..01a2a84c7317
--- /dev/null
+++ b/dev-java/istack-commons-buildtools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/istack-commons-runtime-2.22 b/dev-java/istack-commons-runtime-2.22
deleted file mode 100644
index e35c568ac978..000000000000
--- a/dev-java/istack-commons-runtime-2.22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=IStack Commons - Runtime jar
-EAPI=5
-HOMEPAGE=https://istack-commons.java.net
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-runtime/2.22/istack-commons-runtime-2.22-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=385460e0023ee6a1ccceb880ed529ef8
diff --git a/dev-java/istack-commons-runtime/Manifest b/dev-java/istack-commons-runtime/Manifest
new file mode 100644
index 000000000000..6682ac25186b
--- /dev/null
+++ b/dev-java/istack-commons-runtime/Manifest
@@ -0,0 +1,3 @@
+DIST istack-commons-runtime-2.22-sources.jar 33136 BLAKE2B 07c123189f889fc9d92b73e930447630a18a56df7bcc6216763d683f30dacc6ab645e10808aaafc3ccadd619fd6cd617ff256962a75a606dd401d0879a687cab SHA512 cfabed991cadfa3562a2a281f4b3bdabadd753cd3b9ee918b3f89428e416c0d23aed928d5f61bde4f3958d12f4cb63130354cbf6bf14577ed54871a46d703bdd
+EBUILD istack-commons-runtime-2.22.ebuild 496 BLAKE2B 8501c36a360f4a90cbc766a3446bc96da772a2bf37774bcb060f70f42ca0d1c1c19125c5413cf37210053f63b73c0d13f19ba4b711b55ac4f8a127812c6cd0c6 SHA512 1d85ae8c5613c44c9a6bbc0bf7a66eb2494a0b70328d4377b9f92729327f78ec410a26db64a09e0b11ad59d9ffc89d0f151b53abe2ebbb6c194e989b343ea139
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild
new file mode 100644
index 000000000000..9a08bbb3c4ec
--- /dev/null
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN=${PN%%-*}
+
+DESCRIPTION="IStack Commons - Runtime jar"
+HOMEPAGE="https://istack-commons.java.net"
+SRC_URI="https://maven.java.net/content/repositories/releases/com/sun/${MY_PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/istack-commons-runtime/metadata.xml b/dev-java/istack-commons-runtime/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/istack-commons-runtime/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/istack-commons-soimp-2.22 b/dev-java/istack-commons-soimp-2.22
deleted file mode 100644
index f17304015789..000000000000
--- a/dev-java/istack-commons-soimp-2.22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/ant-core:0 dev-java/args4j:2 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=IStack Commons - Soimp jar
-EAPI=5
-HOMEPAGE=https://istack-commons.java.net
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/args4j:2 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-soimp/2.22/istack-commons-soimp-2.22-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0d429c54e030787f6afb85fed9320bec
diff --git a/dev-java/istack-commons-soimp/Manifest b/dev-java/istack-commons-soimp/Manifest
new file mode 100644
index 000000000000..ce74f8489f73
--- /dev/null
+++ b/dev-java/istack-commons-soimp/Manifest
@@ -0,0 +1,3 @@
+DIST istack-commons-soimp-2.22-sources.jar 10208 BLAKE2B 7fa7115a3b0b1b5bf3c51b487ce31db69a7d9bf5b670a99243456aa678645463341987bb68d63b708949ea710268a8f4f61a79d3e3079c271783a98f8ce2f930 SHA512 28b85550dd92b9fac106ecc2173e728adc7180350f1e47cb619e4d1d6f517cf0878cca87dc7242d80fc0dac5e3d683a2a599bbfb4aa147d33a2089e6f0b28a21
+EBUILD istack-commons-soimp-2.22.ebuild 606 BLAKE2B 5d6eae71ef6db2c0097e0dc231d27897eb548fd5ac46d58f413e6e8e5f814f42aae25c8dfad2074d79e5f2923dd8d3ba56678c96065e69066b69147c2bac7b88 SHA512 b8f903c2e6a17341ae927e1e7ea58d6761dc8b16ac80375ab2d2348087576a94cee9a15b72bdd28682c2a5294d30055d5e5cbfacb3e27b80b8e43a21e630e4c1
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/istack-commons-soimp/istack-commons-soimp-2.22.ebuild b/dev-java/istack-commons-soimp/istack-commons-soimp-2.22.ebuild
new file mode 100644
index 000000000000..827c427ff740
--- /dev/null
+++ b/dev-java/istack-commons-soimp/istack-commons-soimp-2.22.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN=${PN%%-*}
+
+DESCRIPTION="IStack Commons - Soimp jar"
+HOMEPAGE="https://istack-commons.java.net"
+SRC_URI="https://maven.java.net/content/repositories/releases/com/sun/${MY_PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/ant-core:0
+	dev-java/args4j:2"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,args4j-2"
diff --git a/dev-java/istack-commons-soimp/metadata.xml b/dev-java/istack-commons-soimp/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/istack-commons-soimp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/itext-2.1.5-r2 b/dev-java/itext-2.1.5-r2
deleted file mode 100644
index 89957a1ceb95..000000000000
--- a/dev-java/itext-2.1.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/bcmail:1.45 dev-java/bcprov:1.45 rups? ( dev-java/dom4j:1 dev-java/pdf-renderer:0 ) >=virtual/jdk-1.5 cjk? ( app-arch/unzip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Generate documents in the Portable Document Format (PDF) and/or HTML
-EAPI=4
-HOMEPAGE=https://itextpdf.com
-IUSE=cjk rtf rups elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MPL-1.1
-RDEPEND=dev-java/bcmail:1.45 dev-java/bcprov:1.45 rups? ( dev-java/dom4j:1 dev-java/pdf-renderer:0 ) >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/itext/iText-src-2.1.5.tar.gz cjk? ( mirror://sourceforge/itext/iTextAsian.jar mirror://sourceforge/itext/iTextAsianCmaps.jar )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0f6b361b9ec84ec0328a603262365be1
diff --git a/dev-java/itext-5.5.4-r2 b/dev-java/itext-5.5.4-r2
deleted file mode 100644
index 018318389caf..000000000000
--- a/dev-java/itext-5.5.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/bcmail:1.52 dev-java/bcpkix:1.52 dev-java/bcprov:1.52 dev-java/xml-security:0 >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Generate documents in the Portable Document Format (PDF) and/or HTML
-EAPI=5
-HOMEPAGE=https://itextpdf.com
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=AGPL-3
-RDEPEND=dev-java/bcmail:1.52 dev-java/bcpkix:1.52 dev-java/bcprov:1.52 dev-java/xml-security:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=5
-SRC_URI=mirror://sourceforge/itext/itext-5.5.4.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ca9f33a0482442803cf22a5d798ad53c
diff --git a/dev-java/itext/Manifest b/dev-java/itext/Manifest
new file mode 100644
index 000000000000..f6215a288159
--- /dev/null
+++ b/dev-java/itext/Manifest
@@ -0,0 +1,8 @@
+AUX itext-5.5.4-OcspClientBouncyCastle.java.patch 1012 BLAKE2B e830632c0cfa5452afdc6d0fdd2b15c2cb53ca20c99770c120acb21a310ee88a57cc4e4fd067b23694e1c32035fa8296fcff70e02067762ae6048d1800f435c2 SHA512 721d4c4917928ce38da2d3f83d19021423dcf6c13ed002c52242e9c22d5289ffa79dcc84421b38c0bb1450a4239496f9f3321ce47fdef45692d14f97ebe249d2
+DIST iText-src-2.1.5.tar.gz 1301652 BLAKE2B f093b505e249373e81587501dcd60e09778b36c6d317e834f902bfcd0fbab015a6e66f346788926a9dfaece83b5b5bd3023316be10015d41ab93ef0fb600455c SHA512 ca6bc9807379923b25e45cf06976c7ddea7ebce5bd418204ca4a6f668cb55fb06ddda2b55d34e78aebd2ae307fc8040bcd702369b5c9da849286dab7f8d474ea
+DIST iTextAsian.jar 329741 BLAKE2B b917a35cc8ba71ff05d9428ea4f586eea4830eac47807fccb5624fcc03b4e5f15d2155cf34e4f44a314990b53ff190a56a2dd4a5468d066111c23687a6a8dee8 SHA512 fad669829efb9b6d3e5de8b8b6b175058e4aedaf310c1f6991487f3ebea15f2979e401b7969e6388bfc8ba456382d452986505abfc431fca714f471faa70933e
+DIST iTextAsianCmaps.jar 1696864 BLAKE2B b2ff3eb843b005decc09e980411210dc315b4969edec758b48959c8bdba417e93c80583a2f16a037fc52d0227e8aa4adffd68a6cc31c031d530823066a567922 SHA512 bc5d9b06f405488075d2027fadee72127fdd81f1f362ec1f59ebbd70da61ea62a8a9f1122eec4a3f030fdc72f0f440bed049ca4c3f91206321ca5cfec79a4a85
+DIST itext-5.5.4.zip 9765296 BLAKE2B a3b99210d8f6b25eafe327c67c33579a5536b0425739d1ffd43fddcb306921f057c648ccd957078e157eae82046666b8ca1622404a84ed4c93ff33884cec1d23 SHA512 bfcbc1de97a94451ac5b486bd02a764ed60d28455aeeecab4e93c6004accd015e61cce2019dc4979e46ef220547e7dfdbbc5d3aaad182f88280cc0053b4681d2
+EBUILD itext-2.1.5-r2.ebuild 1863 BLAKE2B ea0e3ad2de21a0d8aa96082cc99c543c6b9cd24f753ce7e5b42c9e405a69a0d92c76db8b2075424bcc08018a277bf7b78a4b48cd1b5b7f0a010fe237f168fe14 SHA512 9485e0a9ecb84b6ac50e3bae04919dff421d43091ab78a51b821c35f354495d9254e6e17f171329a971a09263262ae3e27493c496571b5134e225c642b51c19d
+EBUILD itext-5.5.4-r2.ebuild 1250 BLAKE2B 74b70db5da873bfae9db37c626151ebef2d104ec8847bd01b7494f2681015122f45abe8d733c6e018426ce7dbb33f5be8d57cf6b35fc3bf8cf19a5b4620da714 SHA512 55cfd50b8119f10b33359005c26a6ce83635248601a85f26f535363c30d102f8f48e6e869d17c3fcb19105a218f9953a0ed51aaee4e2e82489e3968b5add3626
+MISC metadata.xml 974 BLAKE2B 77ceac3f287ac0f776b14b645a74239838e7804c543cf688188a58a39d40e389fe996bfdfc222f6497665e1d9b626ee945fbbcc66f36a07d9b54adbf0117b631 SHA512 b7a686fa65db66466457ad47734c34c7f5bd91f018d13d10385c01a3afd77a3c3fd6384d6e75ff6b68df1a3945742bb8c6ee40e5874eedca33e14a0bdeff5be9
diff --git a/dev-java/itext/files/itext-5.5.4-OcspClientBouncyCastle.java.patch b/dev-java/itext/files/itext-5.5.4-OcspClientBouncyCastle.java.patch
new file mode 100644
index 000000000000..409ea87aa2bd
--- /dev/null
+++ b/dev-java/itext/files/itext-5.5.4-OcspClientBouncyCastle.java.patch
@@ -0,0 +1,15 @@
+--- source/com/itextpdf/text/pdf/security/OcspClientBouncyCastle.java.orig	2015-08-11 10:52:11.031000000 +0000
++++ source/com/itextpdf/text/pdf/security/OcspClientBouncyCastle.java	2015-08-11 10:52:39.070000000 +0000
+@@ -183,9 +183,9 @@
+                     if (status == CertificateStatus.GOOD) {

+                         return basicResponse.getEncoded();

+                     }

+-                    else if (status instanceof org.bouncycastle.ocsp.RevokedStatus) {

+-                        throw new IOException(MessageLocalization.getComposedMessage("ocsp.status.is.revoked"));

+-                    }

++                    //else if (status instanceof org.bouncycastle.ocsp.RevokedStatus) {

++                    //    throw new IOException(MessageLocalization.getComposedMessage("ocsp.status.is.revoked"));

++                    //}

+                     else {

+                         throw new IOException(MessageLocalization.getComposedMessage("ocsp.status.is.unknown"));

+                     }

diff --git a/dev-java/itext/itext-2.1.5-r2.ebuild b/dev-java/itext/itext-2.1.5-r2.ebuild
new file mode 100644
index 000000000000..ac7d777b6210
--- /dev/null
+++ b/dev-java/itext/itext-2.1.5-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DISTFILE="${PN/it/iT}-src-${PV}.tar.gz"
+ASIANJAR="iTextAsian.jar"
+ASIANCMAPSJAR="iTextAsianCmaps.jar"
+
+DESCRIPTION="Generate documents in the Portable Document Format (PDF) and/or HTML"
+HOMEPAGE="https://itextpdf.com"
+SRC_URI="mirror://sourceforge/itext/${DISTFILE}
+	cjk? ( mirror://sourceforge/itext/${ASIANJAR}
+		mirror://sourceforge/itext/${ASIANCMAPSJAR} )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="cjk rtf rups"
+
+BCV="1.45"
+
+COMMON_DEPEND="
+	dev-java/bcmail:${BCV}
+	dev-java/bcprov:${BCV}
+	rups? (
+		dev-java/dom4j:1
+		dev-java/pdf-renderer:0
+	)"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.5
+	cjk? ( app-arch/unzip )"
+
+S="${WORKDIR}/src"
+
+src_unpack() {
+	unpack ${DISTFILE}
+}
+
+java_prepare() {
+	sed -i -e 's|<link href="http://java.sun.com/j2se/1.4/docs/api/" />||' \
+		-e 's|<link href="http://www.bouncycastle.org/docs/docs1.4/" />||' \
+		"${S}/ant/site.xml"
+
+	java-ant_bsfix_files ant/*.xml || die "failed to rewrite build xml files"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_ENCODING="utf8"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH="bcmail-${BCV},bcprov-${BCV}"
+	use rups && EANT_GENTOO_CLASSPATH+=",dom4j-1,pdf-renderer"
+
+	java-pkg-2_src_compile \
+		$(use rtf && echo "jar.rtf") \
+		$(use rups && echo "jar.rups")
+}
+
+src_install() {
+	cd "${WORKDIR}"
+	java-pkg_dojar lib/iText.jar
+	use rtf && java-pkg_dojar lib/iText-rtf.jar
+	use rups && java-pkg_dojar lib/iText-rups.jar
+	if use cjk; then
+		java-pkg_dojar "${DISTDIR}/${ASIANJAR}"
+		java-pkg_dojar "${DISTDIR}/${ASIANCMAPSJAR}"
+	fi
+
+	use source && java-pkg_dosrc src/core/com src/rups/com
+	use doc && java-pkg_dojavadoc build/docs
+}
diff --git a/dev-java/itext/itext-5.5.4-r2.ebuild b/dev-java/itext/itext-5.5.4-r2.ebuild
new file mode 100644
index 000000000000..55b8d3c8fa1d
--- /dev/null
+++ b/dev-java/itext/itext-5.5.4-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Generate documents in the Portable Document Format (PDF) and/or HTML"
+HOMEPAGE="https://itextpdf.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="AGPL-3"
+SLOT="5"
+KEYWORDS="amd64 x86"
+
+BC_SLOT="1.52"
+
+CDEPEND="dev-java/bcmail:${BC_SLOT}
+	dev-java/bcpkix:${BC_SLOT}
+	dev-java/bcprov:${BC_SLOT}
+	dev-java/xml-security:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="
+	bcmail-${BC_SLOT}
+	bcpkix-${BC_SLOT}
+	bcprov-${BC_SLOT}
+	xml-security"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-OcspClientBouncyCastle.java.patch
+)
+
+java_prepare() {
+	mkdir source || die
+
+	for x in *-sources.jar; do
+		unzip -n ${x} -d source || die
+	done
+
+	rm -v *.jar || die
+
+	mkdir target/classes/com/itextpdf/text/pdf/fonts -p || die
+	cp source/com/itextpdf/text/pdf/fonts/*{afm,html,txt} target/classes/com/itextpdf/text/pdf/fonts/ || die
+	mkdir target/classes/com/itextpdf/text/l10n/ -p || die
+	cp -r source/com/itextpdf/text/l10n/* target/classes/com/itextpdf/text/l10n/ || die
+
+	epatch "${PATCHES[@]}"
+}
diff --git a/dev-java/itext/metadata.xml b/dev-java/itext/metadata.xml
new file mode 100644
index 000000000000..b907b9d84d18
--- /dev/null
+++ b/dev-java/itext/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		iText is a library that allows you to generate PDF files on
+		the fly. The iText classes are very useful for people who need
+		to generate read-only, platform independent documents
+		containing text, lists, tables and images. The library is
+		especially useful in combination with Java(TM) technology-based
+		Servlets: The look and feel of HTML is browser dependent; with
+		iText and PDF you can control exactly how your servlet's output
+		will look.
+	</longdescription>
+	<use>
+		<flag name="rtf">Build and provide libraries for rich text format</flag>
+		<flag name="rups">Build and provide GUI for Reading/Updating PDF Syntax</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">itext</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/j2objc-annotations-1.2 b/dev-java/j2objc-annotations-1.2
deleted file mode 100644
index 443a888ef0a1..000000000000
--- a/dev-java/j2objc-annotations-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Annotations for the J2ObjC Java to Objective-C translator
-EAPI=6
-HOMEPAGE=http://j2objc.org
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/google/j2objc/archive/1.2.tar.gz -> j2objc-1.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6e43fdfc245700bcfbd9e46b8b111bfb
diff --git a/dev-java/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest
new file mode 100644
index 000000000000..58985796844e
--- /dev/null
+++ b/dev-java/j2objc-annotations/Manifest
@@ -0,0 +1,3 @@
+DIST j2objc-1.2.tar.gz 9718769 BLAKE2B 370a52fe9821814c12dd7a13072930f178e041d14baa2e912de3379030828ae62114b213f38f849934e68060fa51d8017a28772a794658aa23272ac5d254d933 SHA512 d2b4d12ba8107728ca33cfe18124eae092a2c2b9ce0b588374180d35816d83d6d6c9d029c3524537ac48f052dfa4c88b273405cddf56c54966216b1ed1a160eb
+EBUILD j2objc-annotations-1.2.ebuild 593 BLAKE2B a4bffdd15f2089fda55b038a4a2d89778fa839640ce3eeb8f2470deff4e08c2e558443858921f73c947b447360663e9e0812a757dd8f0ca7da80ed9b25d628b8 SHA512 75a8d461061652252c86a4d433e8089e579463feb565caf5eb341b6ec0876f9c9985dfbb6e3853e4eb3b4c928453aa84082408c2964915dff87042a1ce958040
+MISC metadata.xml 314 BLAKE2B 2101f8ca7fe894128dd8976032ea460eb58477566332a7b95e8e7bdc75938d351542243fac2b40242d11d40020af74829d42c63f7daf95f4f8a094ccda7323cf SHA512 94b8ffdfdd1c9dcba7553bf36af43cc1104ee95d2bff819e14a7e6cbb533f36cbd6e5befe377aa346afef29e54dbccda4a98265a887a5c80cc4e4d1f250c1885
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
new file mode 100644
index 000000000000..03340d482d2e
--- /dev/null
+++ b/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN%-annotations}"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for the J2ObjC Java to Objective-C translator"
+HOMEPAGE="http://j2objc.org"
+SRC_URI="https://github.com/google/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/annotations"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/j2objc-annotations/metadata.xml b/dev-java/j2objc-annotations/metadata.xml
new file mode 100644
index 000000000000..f67ee762cdd1
--- /dev/null
+++ b/dev-java/j2objc-annotations/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">google/j2objc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/j2ssh-0.2.9 b/dev-java/j2ssh-0.2.9
deleted file mode 100644
index 948939f281e4..000000000000
--- a/dev-java/j2ssh-0.2.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 dev-java/ant-core:0 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java implementation of the SSH protocol
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/sshtools/ http://www.sshtools.com/
-IUSE=elibc_FreeBSD source doc examples elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-java/commons-logging:0 dev-java/ant-core:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/sshtools/j2ssh-0.2.9-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=65769b0364e3ee7c0db17f26080b60a9
diff --git a/dev-java/j2ssh/Manifest b/dev-java/j2ssh/Manifest
new file mode 100644
index 000000000000..e07b3fa6a034
--- /dev/null
+++ b/dev-java/j2ssh/Manifest
@@ -0,0 +1,5 @@
+AUX 0.2.9-extras.patch 7597 BLAKE2B a3ff2d110ac76e91a7cc3f5287fd80fcd26ea4f073a42c5c430a961afc4ef36beb53a29303b8646cc19370dd318d67065f901fac78818f9b432e326aea51a502 SHA512 e60f449e7cd39c1cc551a012c97f5b1cca229d6a08c06abfea6c47a0e2577d36887ce5e710dae2a1db5d1436b1eb0a13c5bdcef84555c678d3b54124fe6ce17d
+AUX 0.2.9-no-versioned-jars.patch 2187 BLAKE2B 42409b824c8fae59ecf42a531618432f1fa9ca873388b44e7cbbb94e3ad46dedd460b029e802a39a85f3da0d380e16965089e51e544b97495f72b6679f9c62e2 SHA512 5ef6e3f1f51a241f0a45810a561f4a77ddb2fe706e7ae4d0f6e36c28416435eed50cdec33debf7434f788c28f5b147987df3b1a12e59f8a0fade31183f57332f
+DIST j2ssh-0.2.9-src.tar.gz 2182523 BLAKE2B 1c5424ac99a466d3ac114160c133d8d6daed430f67bce35300290e14bc7540c73d5698f728f2cd43f7050877c2f89978c118a420375ffb5bc6c207c397e5afd2 SHA512 d7720766dcf50205089fa22d026721dc25de5def1d451fcb6680832017becc3fc8d76c2ffb5ed2e2190e08c864da24d2544515478956f78ac4d8cf4126cab6e8
+EBUILD j2ssh-0.2.9.ebuild 1015 BLAKE2B d2d738c77687d999e8b42dc5b20e41dc5fa4f341eff4f7ef59ba53ddfd6b69551ab272fe0d748407ac2f0dfcec7703114cbecf2e258dc8ede965b66ec2b416ef SHA512 0fc3e1efd4406c9d54d481dad30a7fa7b852452955059ee2b4e570fcc6fb1d93b0a734613e968825b36f43929ee749fe1493cc0e3be5c0e22e94bc51a77c7547
+MISC metadata.xml 494 BLAKE2B a9ae8d475130ee65e10ad589ab2a28f974463f20822b7d2bd082cea309f658609375ac0b597801c636d9f27917e94f08c9c65e3b48dda4b5ba3ad803df11ef8f SHA512 dc20b956e35a2a5098710ed97d00cd15979a6da488b4618cd262803f093e9281fdeb00f5a828cc0026c7b809c186d10f77683498b2380ed8c46d519696308b18
diff --git a/dev-java/j2ssh/files/0.2.9-extras.patch b/dev-java/j2ssh/files/0.2.9-extras.patch
new file mode 100644
index 000000000000..d958cba19b97
--- /dev/null
+++ b/dev-java/j2ssh/files/0.2.9-extras.patch
@@ -0,0 +1,201 @@
+diff -ur j2ssh-0.2.9/src/com/sshtools/j2ssh/io/ByteArrayReader.java j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/io/ByteArrayReader.java
+--- j2ssh-0.2.9/src/com/sshtools/j2ssh/io/ByteArrayReader.java	2007-04-28 21:02:54.000000000 +0200
++++ j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/io/ByteArrayReader.java	2008-01-18 19:27:38.000000000 +0100
+@@ -118,7 +118,13 @@
+         byte[] chars = new byte[(int) len];
+         System.arraycopy(data, start + 4, chars, 0, len);
+ 
+-        return new String(chars);
++        try {
++            return new String(chars, "UTF-8");
++        }
++        catch(java.io.UnsupportedEncodingException e) {
++            // This should never happen, UTF-8 is necessarily supported.
++            return new String(chars);
++        }
+     }
+ 
+     /**
+@@ -163,6 +169,12 @@
+         byte[] raw = new byte[(int) len];
+         read(raw);
+ 
+-        return new String(raw);
++        try {
++            return new String(raw, "UTF-8");
++        }
++        catch(java.io.UnsupportedEncodingException e) {
++            // This should never happen, UTF-8 is necessarily supported.
++            return new String(raw);
++        }
+     }
+ }
+diff -ur j2ssh-0.2.9/src/com/sshtools/j2ssh/io/ByteArrayWriter.java j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/io/ByteArrayWriter.java
+--- j2ssh-0.2.9/src/com/sshtools/j2ssh/io/ByteArrayWriter.java	2007-04-29 10:54:48.000000000 +0200
++++ j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/io/ByteArrayWriter.java	2008-01-18 19:30:36.000000000 +0100
+@@ -190,15 +190,15 @@
+         if (str == null) {
+             writeInt(0);
+         } else {
+-            /*
+-            writeInt(str.length());
+-            // don't use US-ASCII by default!
+-            write(str.getBytes());
+-            */
+-            // patch as of version 0.2.9
+-            // for UTF-8 length of string is not necessarily
+-            // equal to number of bytes
+-            byte[] strBytes = str.getBytes();
++            byte[] strBytes;
++            try {
++                strBytes = str.getBytes("UTF-8");
++            }
++            catch(java.io.UnsupportedEncodingException e) {
++                // This should never happen, UTF-8 is necessarily supported.
++                strBytes = str.getBytes();
++            }
++            
+             writeInt(strBytes.length);
+             write(strBytes);
+         }
+diff -ur j2ssh-0.2.9/src/com/sshtools/j2ssh/sftp/SftpFileInputStream.java j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/sftp/SftpFileInputStream.java
+--- j2ssh-0.2.9/src/com/sshtools/j2ssh/sftp/SftpFileInputStream.java	2007-04-28 21:02:54.000000000 +0200
++++ j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/sftp/SftpFileInputStream.java	2008-01-18 19:26:58.000000000 +0100
+@@ -38,7 +38,7 @@
+  */
+ public class SftpFileInputStream extends InputStream {
+     SftpFile file;
+-    UnsignedInteger64 position = new UnsignedInteger64("0");
++    UnsignedInteger64 position;
+ 
+     /**
+      * Creates a new SftpFileInputStream object.
+@@ -48,16 +48,47 @@
+      * @throws IOException
+      */
+     public SftpFileInputStream(SftpFile file) throws IOException {
++		this(file, 0);
++    }
++
++    /**
++     * Creates a new SftpFileInputStream object and sets the file offset to the specified position.
++     *
++     * @param file
++	 * @param position the initial file offset, must be >=0
++     *
++     * @throws IOException
++     */
++    public SftpFileInputStream(SftpFile file, long position) throws IOException {
+         if (file.getHandle() == null) {
+             throw new IOException("The file does not have a valid handle!");
+         }
+-
++        
+         if (file.getSFTPSubsystem() == null) {
+-            throw new IOException(
+-                "The file is not attached to an SFTP subsystem!");
++            throw new IOException("The file is not attached to an SFTP subsystem!");
+         }
+-
++        
+         this.file = file;
++		this.position = new UnsignedInteger64(""+position);
++    }
++
++    /**
++     * Returns the current offset within the file.
++     *
++     * @return the current offset within the file
++     */
++	public long getPosition() {
++        return position.longValue();
++    }
++
++    /**
++     * Sets the current file offset to the given position. 
++     * Subsequent calls to read methods will start reading data at this position.
++     *
++     * @param position the new offset, must be >=0
++     */
++    public void setPosition(long position) {
++        this.position = new UnsignedInteger64(""+position);
+     }
+ 
+     /**
+diff -ur j2ssh-0.2.9/src/com/sshtools/j2ssh/sftp/SftpFileOutputStream.java j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/sftp/SftpFileOutputStream.java
+--- j2ssh-0.2.9/src/com/sshtools/j2ssh/sftp/SftpFileOutputStream.java	2007-04-28 21:02:54.000000000 +0200
++++ j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/sftp/SftpFileOutputStream.java	2008-01-18 19:08:55.000000000 +0100
+@@ -38,7 +38,7 @@
+  */
+ public class SftpFileOutputStream extends OutputStream {
+     SftpFile file;
+-    UnsignedInteger64 position = new UnsignedInteger64("0");
++    UnsignedInteger64 position;
+ 
+     /**
+      * Creates a new SftpFileOutputStream object.
+@@ -48,6 +48,18 @@
+      * @throws IOException
+      */
+     public SftpFileOutputStream(SftpFile file) throws IOException {
++        this(file, 0);
++    }
++
++    /**
++     * Creates a new SftpFileOutputStream object and sets the file offset to the specified position.
++     *
++     * @param file
++	 * @param position the initial file offset, must be >=0
++     *
++     * @throws IOException
++     */
++    public SftpFileOutputStream(SftpFile file, long position) throws IOException {
+         if (file.getHandle() == null) {
+             throw new IOException("The file does not have a valid handle!");
+         }
+@@ -58,6 +70,7 @@
+         }
+ 
+         this.file = file;
++		this.position = new UnsignedInteger64(""+position);
+     }
+ 
+     /**
+diff -ur j2ssh-0.2.9/src/com/sshtools/j2ssh/sftp/SftpSubsystemClient.java j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/sftp/SftpSubsystemClient.java
+--- j2ssh-0.2.9/src/com/sshtools/j2ssh/sftp/SftpSubsystemClient.java	2007-04-28 21:02:54.000000000 +0200
++++ j2ssh-0.2.9_patched/src/com/sshtools/j2ssh/sftp/SftpSubsystemClient.java	2008-01-21 17:48:06.000000000 +0100
+@@ -231,16 +231,28 @@
+     }
+ 
+     /**
++     * Creates the directory with the specified path. The default permissions for the directory are 0755 ("rwxr-xr-x").
+      *
++     * @param path the path to the directory to create
++     * @throws IOException if an error occurs
++     */
++    public synchronized void makeDirectory(String path) throws IOException {
++        makeDirectory(path, 0755);  // default to 755 octal (493 decimal): "rwxr-xr-x"
++    }
++
++    /**
++     * Creates the directory with the specified path and file permissions.  
+      *
+-     * @param path
+-     *
+-     * @throws IOException
++     * @param path the path to the directory to create
++     * @param permissions the file permissions of the new directory
++     * @throws IOException if an error occurs
+      */
+-    public synchronized void makeDirectory(String path)
+-        throws IOException {
++    public synchronized void makeDirectory(String path, int permissions) throws IOException {
+         UnsignedInteger32 requestId = nextRequestId();
+-        SshFxpMkdir msg = new SshFxpMkdir(requestId, path, new FileAttributes());
++        FileAttributes attrs = new FileAttributes();
++        attrs.setPermissions(new UnsignedInteger32(permissions));
++
++        SshFxpMkdir msg = new SshFxpMkdir(requestId, path, attrs);
+         sendMessage(msg);
+         getOKRequestStatus(requestId);
+     }
diff --git a/dev-java/j2ssh/files/0.2.9-no-versioned-jars.patch b/dev-java/j2ssh/files/0.2.9-no-versioned-jars.patch
new file mode 100644
index 000000000000..26d7672a3414
--- /dev/null
+++ b/dev-java/j2ssh/files/0.2.9-no-versioned-jars.patch
@@ -0,0 +1,40 @@
+diff --git a/j2ssh/build.xml b/j2ssh/build.xml
+index 2c867ee..7ba5814 100644
+--- a/j2ssh/build.xml
++++ b/j2ssh/build.xml
+@@ -52,7 +52,7 @@
+          <mkdir dir="${build.dist.lib}"/>
+ 
+          <!-- Build the J2SSH library files -->
+- 	         <jar jarfile="${build.dist.lib}/j2ssh-core-${j2ssh.version.major}.${j2ssh.version.minor}.${j2ssh.version.build}.jar" basedir="${build.dist.classes}">
++ 	         <jar jarfile="${build.dist.lib}/j2ssh-core.jar" basedir="${build.dist.classes}">
+                 <include name="com/sshtools/j2ssh/**/*.class"/>
+                 <manifest>
+                    <attribute name="Product-Version"
+@@ -60,7 +60,7 @@
+                  </manifest>
+              </jar>
+ 
+-             <jar jarfile="${build.dist.lib}/j2ssh-ant-${j2ssh.version.major}.${j2ssh.version.minor}.${j2ssh.version.build}.jar" basedir="${build.dist.classes}">
++             <jar jarfile="${build.dist.lib}/j2ssh-ant.jar" basedir="${build.dist.classes}">
+                 <include name="com/sshtools/ant/**/*.class"/>
+                 <manifest>
+                    <attribute name="Product-Version"
+@@ -68,7 +68,7 @@
+                  </manifest>
+              </jar>
+ 
+-             <jar jarfile="${build.dist.lib}/j2ssh-dameon-${j2ssh.version.major}.${j2ssh.version.minor}.${j2ssh.version.build}.jar" basedir="${build.dist.classes}">
++             <jar jarfile="${build.dist.lib}/j2ssh-dameon.jar" basedir="${build.dist.classes}">
+                 <include name="com/sshtools/daemon/**/*.class"/>
+                 <exclude name="com/sshtools/daemon/windows/**/*.*"/>
+                 <exclude name="com/sshtools/daemon/linux/**/*.*"/>
+@@ -78,7 +78,7 @@
+                  </manifest>
+              </jar>
+              
+-   	         <jar jarfile="${build.dist.lib}/j2ssh-common-${j2ssh.version.major}.${j2ssh.version.minor}.${j2ssh.version.build}.jar" basedir="${build.dist.classes}">
++   	         <jar jarfile="${build.dist.lib}/j2ssh-common.jar" basedir="${build.dist.classes}">
+                 <include name="com/sshtools/common/**/*.class"/>
+                 <include name="com/sshtools/common/**/*.png"/>
+                 <include name="com/sshtools/common/**/*.gif"/>
diff --git a/dev-java/j2ssh/j2ssh-0.2.9.ebuild b/dev-java/j2ssh/j2ssh-0.2.9.ebuild
new file mode 100644
index 000000000000..7d4dd4ea6d5a
--- /dev/null
+++ b/dev-java/j2ssh/j2ssh-0.2.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source doc examples"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java implementation of the SSH protocol"
+HOMEPAGE="https://sourceforge.net/projects/sshtools/ http://www.sshtools.com/"
+SRC_URI="mirror://sourceforge/sshtools/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/commons-logging:0
+	dev-java/ant-core:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="build"
+EANT_GENTOO_CLASSPATH="commons-logging,ant-core"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-no-versioned-jars.patch"
+	epatch "${FILESDIR}/${PV}-extras.patch"
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/dist/lib/*.jar
+
+	use doc && java-pkg_dojavadoc docs/
+	use source && java-pkg_dosrc "${S}"/src/com
+	use examples && java-pkg_doexamples "${S}"/examples/
+}
diff --git a/dev-java/j2ssh/metadata.xml b/dev-java/j2ssh/metadata.xml
new file mode 100644
index 000000000000..6b55c013d0a1
--- /dev/null
+++ b/dev-java/j2ssh/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		SSHTools is a suite of Java SSH applications providing a Java SSH API,
+		SSH Terminal, SSH secured VNC client, SFTP client and SSH Daemon.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">sshtools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jackcess-1.2.14.3 b/dev-java/jackcess-1.2.14.3
deleted file mode 100644
index 302c17009840..000000000000
--- a/dev-java/jackcess-1.2.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 app-arch/unzip >=dev-java/commons-lang-2.6:2.1 >=dev-java/commons-logging-1.1.3:0 >=dev-java/log4j-1.2.7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Pure Java library for reading from and writing to MS Access databases
-EAPI=6
-HOMEPAGE=http://jackcess.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/commons-lang-2.6:2.1 >=dev-java/commons-logging-1.1.3:0 >=dev-java/log4j-1.2.7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://sourceforge/jackcess/jackcess-1.2.14.3-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f8a55d3be9912a5a419d88d569daa72d
diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest
new file mode 100644
index 000000000000..f0a29e39ba6c
--- /dev/null
+++ b/dev-java/jackcess/Manifest
@@ -0,0 +1,3 @@
+DIST jackcess-1.2.14.3-sources.jar 541095 BLAKE2B 60700a7ebb87f371a28d7cfcc588fbd61e28e4744e96a214e0923cd32c1b8e265b87d98048b277e8d9e5f1e582f17dc0962550ec8e5e7ede7adb83d0c417f25a SHA512 a0ccc39187ee94f550760d5640b736cf54d7523bad4eed715166608e18b30acad82a8db2d78f4c9da381c04876571c3d9fdb0418ee2585568c5da18b000f3b1b
+EBUILD jackcess-1.2.14.3.ebuild 765 BLAKE2B 72186e51221b6f8459dcd0965a342555c4a41d41c5cac157961fac0636ab3cca5492a1940de06f1965d1089885bf59fb8ba79341d71e51809406137c9bb9ae15 SHA512 56ee74aee1f86d43eb9356e8a54ccb7664dc6b0e8d6f502a40ed86ef93082d7f0532cf6a7366671efbf5151a562963448b9d5a2706718c4ba80d810561de1c6b
+MISC metadata.xml 447 BLAKE2B 1f2f25d4bb0aac307100f878e24706e8b85f7cfb4a19e612e126859722ccdbff8882da02657b3d1fe190bb3141c85849ff3e57768e5d75159d79e3b528b16a52 SHA512 a9b4f0b7a6f59d972c792a8bdf6320680825c8f1b7bbd0dc83e9ef54abf79dc4f7bab890dadd69484f15434a6414af2909c1dc1978eae9eb21403ed243cbedff
diff --git a/dev-java/jackcess/jackcess-1.2.14.3.ebuild b/dev-java/jackcess/jackcess-1.2.14.3.ebuild
new file mode 100644
index 000000000000..fd69eced5bcd
--- /dev/null
+++ b/dev-java/jackcess/jackcess-1.2.14.3.ebuild
@@ -0,0 +1,32 @@
+# 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="Pure Java library for reading from and writing to MS Access databases"
+HOMEPAGE="http://jackcess.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+CP_DEPEND=">=dev-java/commons-lang-2.6:2.1
+	>=dev-java/commons-logging-1.1.3:0
+	>=dev-java/log4j-1.2.7:0"
+
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CP_DEPEND}"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" .
+}
diff --git a/dev-java/jackcess/metadata.xml b/dev-java/jackcess/metadata.xml
new file mode 100644
index 000000000000..dff9128b4a5b
--- /dev/null
+++ b/dev-java/jackcess/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Lightweight Java cryptography APIs that work with everything
+		from the J2ME to the JDK 1.6
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jackcess</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jackrabbit-webdav-2.10.1 b/dev-java/jackrabbit-webdav-2.10.1
deleted file mode 100644
index 7c62f8fc51e0..000000000000
--- a/dev-java/jackrabbit-webdav-2.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4j-nop:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:2.3 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Fully conforming implementation of the JRC API (specified in JSR 170 and 283)
-EAPI=5
-HOMEPAGE=http://jackrabbit.apache.org/
-IUSE=elibc_FreeBSD doc test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4j-nop:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=aeb82541390a8eef4c1a487a95fc711c
diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
new file mode 100644
index 000000000000..611d0cca4143
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -0,0 +1,6 @@
+AUX jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch 674 BLAKE2B 1d3275a45d9f472f7541a9d8b0d8726b411f633423e546f9f486cf46d3941884dd31c82d1afb14db13bd667d9eedea47f36f6516628dd61a14aee890975e4a30 SHA512 e6b078903c2b50db451a491a48deb515d983537994211d57f16c5259bfb8bda8bd245ceb3a24b355edf430623ff4f38c8e8d2e41580d48de8f5b90f8f328f2be
+AUX jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch 696 BLAKE2B e888cacb419050b6bf412ecd70df42ea13a11937bcf00d7e716e36e1842003a2a53626179a6e642ab2df7aec84a2c7f9bc660754456e0ba4ad4912ea80dc1ffd SHA512 ab32fefc4f24d422eab5c399355e4188c0f8b7171e0e1ad9cacb5d031e1cee01ff3312d0df47cccc15a949d374e7c07749e5dc020a7e6d1e9fab7a86289d0d19
+AUX jackrabbit-webdav-2.10.1-build.xml 17644 BLAKE2B c878975d2f1ffe74752b36873d0625c73605469e5d8a1287568b461fe402e4a91ea0f2c6334514d526a011dbe4311b0b49439d508c9ea99e127cad49abe6ebee SHA512 5b22661e3d36d227edb618b553671964be14f34dd245f1749caf9b6f3c9981fdc9fad11659ae98cdd5fb3b343b6bc450478d3655054b055f7ffb3663378b7a8a
+DIST jackrabbit-2.10.1-src.zip 13437021 BLAKE2B 3542bbe5f7c8ab8feb585fecdaca028a4908eb664d01cb9fb32156c71756973671969b1141e796fbc165f7f6f305db25f74d36657e4d86dac6766e4d79b888dd SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9
+EBUILD jackrabbit-webdav-2.10.1.ebuild 1260 BLAKE2B bcc9f8b594ac6a208edcce6d834ae6068920c5168bc2ed3432a172bb66635f12203223646262ba0414dac94c61aaf3b0f7fa86151495371b1024fac48b6b4fb6 SHA512 0135329c1d74019952200330ed816ef5d1f2c637cec3f287b780e379f0e89327742294f7155e863b27ec081d5891cd1973da554bf8e4f305b4aaa0a89fccbb84
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
new file mode 100644
index 000000000000..4c1f286339b8
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
@@ -0,0 +1,21 @@
+--- src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java.orig	2015-07-03 09:36:45.804000000 +0000
++++ src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java	2015-07-03 09:36:59.498000000 +0000
+@@ -281,6 +281,18 @@
+         public void removeAttribute(String name) {
+ 
+         }
++        public int getRemotePort() {
++            return 0;
++        }
++        public String getLocalName() {
++            return null;
++        }
++        public String getLocalAddr() {
++            return null;
++        }
++        public int getLocalPort() {
++            return 0;
++        }
+         public Locale getLocale() {
+             return null;
+         }
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
new file mode 100644
index 000000000000..d9a2315f19a1
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
@@ -0,0 +1,16 @@
+--- src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java.orig	2015-07-03 09:26:48.578000000 +0000
++++ src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java	2015-07-03 09:27:34.109000000 +0000
+@@ -40,6 +40,13 @@
+             public void setHeader(String name, String value) {
+                 assertTrue(Long.parseLong(value) > Integer.MAX_VALUE);
+             }
++            @Override
++            public void setCharacterEncoding(String name) {
++            }
++            @Override
++            public String getContentType() {
++                return null;
++            }
+         };
+ 
+         OutputContext ctx = new OutputContextImpl(response, null);
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-build.xml b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-build.xml
new file mode 100644
index 000000000000..3c3a41206421
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-build.xml
@@ -0,0 +1,350 @@
+<?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/22/15 2:49 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jackrabbit-webdav-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="jackrabbit-webdav-2.10.1"/>
+  <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}/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar"/>
+    <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar"/>
+    <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar"/>
+    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.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.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>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          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.6" 
+           verbose="false" 
+           fork="false" 
+           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="**/*TestAll.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 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="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" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0/"/>
+    </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" 
+         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                                           -->
+  <!-- ====================================================================== -->
+
+  <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}/biz/aQute/bndlib/1.43.0"/>
+    <get src="http://repository.apache.org/snapshots/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar" 
+         dest="${maven.repo.local}/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repo.maven.apache.org/maven2/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar" 
+         dest="${maven.repo.local}/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6"/>
+    <get src="http://repository.apache.org/snapshots/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar" 
+         dest="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar" 
+         dest="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/javax/servlet/servlet-api/2.3"/>
+    <get src="http://repository.apache.org/snapshots/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" 
+         dest="${maven.repo.local}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repo.maven.apache.org/maven2/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" 
+         dest="${maven.repo.local}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1"/>
+    <get src="http://repository.apache.org/snapshots/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
+         dest="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repo.maven.apache.org/maven2/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
+         dest="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/commons-codec/commons-codec/1.2"/>
+    <get src="http://repository.apache.org/snapshots/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" 
+         dest="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" 
+         dest="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4"/>
+    <get src="http://repository.apache.org/snapshots/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar" 
+         dest="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar" 
+         dest="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.10"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/4.10/junit-4.10.jar" 
+         dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repo.maven.apache.org/maven2/junit/junit/4.10/junit-4.10.jar" 
+         dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/>
+    <get src="http://repository.apache.org/snapshots/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.12"/>
+    <get src="http://repository.apache.org/snapshots/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar" 
+         dest="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repo.maven.apache.org/maven2/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar" 
+         dest="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/ch/qos/logback/logback-core/1.0.12"/>
+    <get src="http://repository.apache.org/snapshots/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar" 
+         dest="${maven.repo.local}/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repo.maven.apache.org/maven2/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar" 
+         dest="${maven.repo.local}/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
new file mode 100644
index 000000000000..369a18bb374a
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="${PN/-*/}"
+
+DESCRIPTION="Fully conforming implementation of the JRC API (specified in JSR 170 and 283)"
+HOMEPAGE="http://jackrabbit.apache.org/"
+SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
+
+CDEPEND="dev-java/bndlib:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-nop:0
+	dev-java/commons-httpclient:3
+	java-virtuals/servlet-api:2.3"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	bndlib
+	commons-httpclient-3
+	servlet-api-2.3
+	slf4j-api
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-OutputContextImplTest.java.patch
+	"${FILESDIR}"/${P}-CSRFUtilTest.java.patch
+)
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+	epatch "${PATCHES[@]}"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="
+	${EANT_GENTOO_CLASSPATH}
+	slf4j-nop
+"
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+}
diff --git a/dev-java/jackrabbit-webdav/metadata.xml b/dev-java/jackrabbit-webdav/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jackson-2.8.5 b/dev-java/jackson-2.8.5
deleted file mode 100644
index 95da0da191ab..000000000000
--- a/dev-java/jackson-2.8.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High-performance JSON processor
-EAPI=6
-HOMEPAGE=https://github.com/FasterXML/jackson-core
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.8.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fcb10c605afc2229e7cdabf220387c09
diff --git a/dev-java/jackson-annotations-2.8.5 b/dev-java/jackson-annotations-2.8.5
deleted file mode 100644
index f37454e83710..000000000000
--- a/dev-java/jackson-annotations-2.8.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Annotations for the Java Jackson data processor
-EAPI=6
-HOMEPAGE=https://github.com/FasterXML/jackson-annotations
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.8.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3bad43db6fe7890cd24e88f196c330b8
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
new file mode 100644
index 000000000000..94f5e365490e
--- /dev/null
+++ b/dev-java/jackson-annotations/Manifest
@@ -0,0 +1,3 @@
+DIST jackson-annotations-2.8.5.tar.gz 44906 BLAKE2B bea484d1b7b7312ff83f87f373fdcecb718b62f1d694ee687df8da7d3f09d70007bc4a6da111a57bed14b2a7921c71825b966f6709f3e143ce9f6fbf6069b45a SHA512 2d98a51c0e3b44e3ac2fe47647b0c7499d7b978cd46df275807e3802ba877717a6c2f620edfe581f31ef947de7096950816104250989eebf029d7a5bf1b53381
+EBUILD jackson-annotations-2.8.5.ebuild 1039 BLAKE2B ec39892afc0cfd82680a94cb84104e60f0a881143000f7ea91cf4ef33dfa87199f2c4f4fe02e64ddc7df77f92cfa246c626ddf6ece32185c9834ca2afe773428 SHA512 c5b3aaa3fdb15c111ced4a3ad2f3f5772a764d3ccc6e8a8f137c7f956a9134379bc8283bceca0eb5108281c1a7e14b5709b0221615a681f973482984cd010eae
+MISC metadata.xml 340 BLAKE2B a9f7d89117ded69cf6f51d86ad904597123d218e694938716deafd4fa66f0308777eaf89a42f1b8c030b0fb23646ddbfd5dfddebe8a17562bc332cf8f174b469 SHA512 52a2836de2359eb77cf2ff83ecc97efb34e19028261cb69655808cb2e939bb1120eaa4e3dcfac242747998ca397caabcf9ca4448e52c8a9772558f3ebf4037f7
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.8.5.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.8.5.ebuild
new file mode 100644
index 000000000000..983a3502db4a
--- /dev/null
+++ b/dev-java/jackson-annotations/jackson-annotations-2.8.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 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="Annotations for the Java Jackson data processor"
+HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.7"
+
+DEPEND=">=virtual/jdk-1.7
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md release-notes/VERSION
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jackson-annotations/metadata.xml b/dev-java/jackson-annotations/metadata.xml
new file mode 100644
index 000000000000..4e2290156ae9
--- /dev/null
+++ b/dev-java/jackson-annotations/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">FasterXML/jackson-annotations</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jackson-databind-2.8.5 b/dev-java/jackson-databind-2.8.5
deleted file mode 100644
index 5c80b3f49844..000000000000
--- a/dev-java/jackson-databind-2.8.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 ~dev-java/jackson-2.8.5:2 ~dev-java/jackson-annotations-2.8.5:2 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Data-binding functionality and tree-model for the Java Jackson data processor
-EAPI=6
-HOMEPAGE=https://github.com/FasterXML/jackson-databind
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 ~dev-java/jackson-2.8.5:2 ~dev-java/jackson-annotations-2.8.5:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2
-SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.8.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=49d389aae3d13dad44cba6c42e95f8c4
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
new file mode 100644
index 000000000000..74a3dd946b28
--- /dev/null
+++ b/dev-java/jackson-databind/Manifest
@@ -0,0 +1,3 @@
+DIST jackson-databind-2.8.5.tar.gz 1093933 BLAKE2B b049cc7752e31171918e35ccb076c0b2e24c3d275f9a23d8fe81bc671721e098ae40a9f98497fef0b3d0ebde487df4f3d0f063f5bb11528d2affec5bab4453a3 SHA512 6935b469804fc14a5d2e562c80449c4e3368256358b8ed2a0d5a0bf2bcea47385ef19a708b94f25e450f42f6f70e868d6fc79f22cdc2fb6f88a4faf35bfc3cb7
+EBUILD jackson-databind-2.8.5.ebuild 1864 BLAKE2B c44c301d10a2ed33b1a5dea51e968f91d2c06664d59fd1b649a4431253fceef60d0710bbe609c00999e44cddbb7d96181c31163c5d4084c6463dd284b3f4d7d0 SHA512 4990afed70541489c06fc01aaa08ade57c266b3353cf8f4cd09f176808326074dc8a6689321ebf222c113ecfa459a8d800fe7469f73bc86259d8b2dbe309f9a8
+MISC metadata.xml 337 BLAKE2B 340ae4a682f341d184b16216d22dd0832f1dcc15df76fe222aa7f5b20917bee659255b3797e4edd1eedc34d8b18fe8e54ea5f82394ac1d6b1c5cdbeccc8a1107 SHA512 1266365fb582e8a7aa2477bad93e7222f03bf656b952bcc0943087884adb0eb4686ceca8feb0ea1912fd81aa62cf89b7949cb69b2a1737d820de0c7ce1c124f3
diff --git a/dev-java/jackson-databind/jackson-databind-2.8.5.ebuild b/dev-java/jackson-databind/jackson-databind-2.8.5.ebuild
new file mode 100644
index 000000000000..b999673fd45c
--- /dev/null
+++ b/dev-java/jackson-databind/jackson-databind-2.8.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 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="Data-binding functionality and tree-model for the Java Jackson data processor"
+HOMEPAGE="https://github.com/FasterXML/jackson-databind"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test" # Missing deps.
+
+CP_DEPEND="~dev-java/jackson-${PV}:${SLOT}
+	~dev-java/jackson-annotations-${PV}:${SLOT}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CP_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CP_DEPEND}
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+
+	sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
+		-e 's:@projectartifactid@:jackson-databind:g' \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
+
+	# Requires newer JScience. Could be any class but they chose this!
+	rm "${S}/src/test/java/com/fasterxml/jackson/databind/introspect/NoClassDefFoundWorkaroundTest.java" || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md release-notes/{CREDITS,VERSION}
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find * -name "Test*.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jackson-databind/metadata.xml b/dev-java/jackson-databind/metadata.xml
new file mode 100644
index 000000000000..ddac6dfb29cc
--- /dev/null
+++ b/dev-java/jackson-databind/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">FasterXML/jackson-databind</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jackson-dataformat-xml-2.8.5 b/dev-java/jackson-dataformat-xml-2.8.5
deleted file mode 100644
index 919ac755d546..000000000000
--- a/dev-java/jackson-dataformat-xml-2.8.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 ~dev-java/jackson-2.8.5:2 ~dev-java/jackson-annotations-2.8.5:2 ~dev-java/jackson-databind-2.8.5:2 ~dev-java/jackson-module-jaxb-annotations-2.8.5:2 dev-java/stax2-api:0 test? ( dev-java/hamcrest-core:1.3 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=XML data format extension for Jackson
-EAPI=6
-HOMEPAGE=https://github.com/FasterXML/jackson-dataformat-xml
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 ~dev-java/jackson-2.8.5:2 ~dev-java/jackson-annotations-2.8.5:2 ~dev-java/jackson-databind-2.8.5:2 ~dev-java/jackson-module-jaxb-annotations-2.8.5:2 dev-java/stax2-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2
-SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.8.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6569ac64c708abc242975c57c1939b33
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
new file mode 100644
index 000000000000..22b214f4386b
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -0,0 +1,3 @@
+DIST jackson-dataformat-xml-2.8.5.tar.gz 98385 BLAKE2B 5648fd1050a8c41da656f3e3399ab7bc58128e7bca8319ef2b6f0b704c18e26c25a581ed9e1386fc1640403adcec67d265e6f139d7dad9de0c918a7fe08d07a5 SHA512 ed93db9a44cacbe1638141b7336798ced03f7009da40e176b1eadcf38c83ac3bde3e2fa98efe3be1286a956db36393f925251b41a4adbc2b95d03ae6ef04b754
+EBUILD jackson-dataformat-xml-2.8.5.ebuild 1883 BLAKE2B 79b971493682c3f78297382c52f01b329e283119c8436ec28d1f261ab701cbe203260a278e043f39821cda88e7c1a4da24d75340bfdf640c022c6fbcecb25482 SHA512 dfd8cdf55948cac019f840be80c2111bb0159480f1c4306ce96db705f5e8011a60a57d1d298dfc392e2e75532f16be3575cef0d9e45821d77feab83878593c82
+MISC metadata.xml 854 BLAKE2B 171d08b86695c1dbe5f08993a38cd6198a4aa381f20574f89332bcedd0577539f8ad5a6caa90a92a4bb50ea16e362ead6a8d57c1baac957ddd5c15da699c0a8d SHA512 a4b26143c0c231ef517dd30f28a76f83afaaee4e42d45bc6337875bf822eb1965c2c093484756b40772fc022d666def4d86bdc2ca3012fb10dc77516131ae561
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.8.5.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.8.5.ebuild
new file mode 100644
index 000000000000..45eb3940f5c7
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.8.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 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="XML data format extension for Jackson"
+HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test" # Lots of failures, new Woodstox needed?
+
+CP_DEPEND="~dev-java/jackson-${PV}:${SLOT}
+	~dev-java/jackson-annotations-${PV}:${SLOT}
+	~dev-java/jackson-databind-${PV}:${SLOT}
+	~dev-java/jackson-module-jaxb-annotations-${PV}:${SLOT}
+	dev-java/stax2-api:0"
+
+RDEPEND=">=virtual/jre-1.7
+	${CP_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CP_DEPEND}
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+
+	sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
+		-e 's:@projectartifactid@:jackson-dataformat-xml:g' \
+		  "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md release-notes/{CREDITS,VERSION}
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find * -name "Test*.java" ! -path "*/failing/*")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jackson-dataformat-xml/metadata.xml b/dev-java/jackson-dataformat-xml/metadata.xml
new file mode 100644
index 000000000000..fc7bd29f5460
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		This projects contains Jackson extension component for reading and writing XML encoded data.
+
+		Further, the goal is to emulate how JAXB data-binding works with "Code-first" approach (that is, no support is added for "Schema-first" approach). Support for JAXB annotations is provided by JAXB annotation module; this module provides low-level abstractions (JsonParser, JsonGenerator, JsonFactory) as well as small number of higher level overrides needed to make data-binding work.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">FasterXML/jackson-dataformat-xml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jackson-dataformat-yaml-2.8.5 b/dev-java/jackson-dataformat-yaml-2.8.5
deleted file mode 100644
index 05c6b4dc7912..000000000000
--- a/dev-java/jackson-dataformat-yaml-2.8.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 ~dev-java/jackson-2.8.5:2 ~dev-java/jackson-databind-2.8.5:2 >=dev-java/snakeyaml-1.16:0 test? ( ~dev-java/jackson-annotations-2.8.5:2 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=YAML data format extension for Jackson
-EAPI=6
-HOMEPAGE=https://github.com/FasterXML/jackson-dataformat-yaml
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 ~dev-java/jackson-2.8.5:2 ~dev-java/jackson-databind-2.8.5:2 >=dev-java/snakeyaml-1.16:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/FasterXML/jackson-dataformat-yaml/archive/jackson-dataformat-yaml-2.8.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7cbf733f75ef21480bfc5e740598d6f7
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
new file mode 100644
index 000000000000..233cb2a56c78
--- /dev/null
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -0,0 +1,3 @@
+DIST jackson-dataformat-yaml-2.8.5.tar.gz 44789 BLAKE2B 65951191331f5560f0ffcdf17686d0c4791bafba7a4c53ab21abc5d3913378d01cc49d18166ae7c893e3af5eaea6171a3a049bf8df05bea11803f3d9c48de078 SHA512 e2c8163150647bf5071aeb4cb38b8273cf9cd1f8ed36bc6dfef4a82ef762f30449aa4b813821648e8216768a2b4c2a00964b86977114ee2a4526cab6a690d9cb
+EBUILD jackson-dataformat-yaml-2.8.5.ebuild 1927 BLAKE2B d9d90e2e863e69466eb93be02e0ef604721b47a73ef19ff566e736b1559b13cbc9f0fa75dab939ef994aad3c0f78f00f55e572380255fc603af20d78446e242a SHA512 228e3bf4db2d83ed62672851db94f13051ad0ed8e5e9bf8215ddb5a168eafd3e4854dbccb5f5fc6cd197f773aa736d63643c3998f6b718a437e4b51f4f68cd63
+MISC metadata.xml 630 BLAKE2B c264792152402c24a793e9235a0e5d1dedbc02b6cef8b0d8a2cfec8421964781abe19bb1e234c9d8ebad4ee21be08790cc2764f62d6368703d15eb6cdba8047b SHA512 40dac5d1eef6e8895c34f8b82c176c192942ddd17228af0c44973675633de349cba1f729b711bf5ff45a4cda98f37d24ecebd685dfc9fe50f3d387a06c0df328
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.8.5.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.8.5.ebuild
new file mode 100644
index 000000000000..d46ab71234e9
--- /dev/null
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.8.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 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="YAML data format extension for Jackson"
+HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-yaml"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CP_DEPEND="~dev-java/jackson-${PV}:${SLOT}
+	~dev-java/jackson-databind-${PV}:${SLOT}
+	>=dev-java/snakeyaml-1.16:0"
+
+RDEPEND=">=virtual/jre-1.7
+	${CP_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CP_DEPEND}
+	test? (
+		~dev-java/jackson-annotations-${PV}:${SLOT}
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+
+	sed -e 's:@package@:com.fasterxml.jackson.dataformat.yaml:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
+		-e 's:@projectartifactid@:jackson-dataformat-yaml:g' \
+		  "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
+
+	# Requires OPS4J Pax Exam, which isn't packaged yet.
+	rm "src/test/java/com/fasterxml/jackson/dataformat/yaml/failsafe/OSGiIT.java" || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md release-notes/{CREDITS,VERSION}
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars jackson-annotations-${SLOT},junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find * -name "*Test*.java" ! -name "*TestBase*" ! -path "*/failing/*")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jackson-dataformat-yaml/metadata.xml b/dev-java/jackson-dataformat-yaml/metadata.xml
new file mode 100644
index 000000000000..0cac4c179933
--- /dev/null
+++ b/dev-java/jackson-dataformat-yaml/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <longdescription>This project contains Jackson extension component for reading and writing YAML encoded data. SnakeYAML library is used for low-level YAML parsing. This project adds necessary abstractions on top to make things work with other Jackson functionality.</longdescription>
+  <upstream>
+    <remote-id type="github">FasterXML/jackson-dataformat-yaml</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jackson-module-jaxb-annotations-2.8.5 b/dev-java/jackson-module-jaxb-annotations-2.8.5
deleted file mode 100644
index eec8d9aaf058..000000000000
--- a/dev-java/jackson-module-jaxb-annotations-2.8.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 ~dev-java/jackson-2.8.5:2 ~dev-java/jackson-annotations-2.8.5:2 ~dev-java/jackson-databind-2.8.5:2 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JAXB alternative to native Jackson annotations
-EAPI=6
-HOMEPAGE=https://github.com/FasterXML/jackson-module-jaxb-annotations
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 ~dev-java/jackson-2.8.5:2 ~dev-java/jackson-annotations-2.8.5:2 ~dev-java/jackson-databind-2.8.5:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/FasterXML/jackson-module-jaxb-annotations/archive/jackson-module-jaxb-annotations-2.8.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f96b3e725f24e09ddf2059e03eadca41
diff --git a/dev-java/jackson-module-jaxb-annotations/Manifest b/dev-java/jackson-module-jaxb-annotations/Manifest
new file mode 100644
index 000000000000..ec01610a149c
--- /dev/null
+++ b/dev-java/jackson-module-jaxb-annotations/Manifest
@@ -0,0 +1,3 @@
+DIST jackson-module-jaxb-annotations-2.8.5.tar.gz 45855 BLAKE2B f122a325e546f958d04ad1ccc9c520efec42e7d6ab258591a8f5d84c61686fb24668d48326c262377a8f3046818f9cf22eb28440cf5564a0bfb06f884dd4822c SHA512 952d7fe785d7393645350a6f5e119a2af142b316b9367a612531a93e7ce3c125d0c520a149d0e032bf876edda179f521c02d76dbd0b2f6b613c9f82e048672df
+EBUILD jackson-module-jaxb-annotations-2.8.5.ebuild 1868 BLAKE2B 860fcf502d72d752974e09a1710f3662920343220fe054ceef462eea99b7362c4dedf353d4173c2b26457fe542ce27285f1c82dc4c673879d13dae546ee9888d SHA512 e0a3ad7674b84f0dd85bab3766cd218a137c71b1fcefd8fcf79e6627d5c9aa02d209d0addc29c3904984760aa36bfbf27e59f3f1e9862c0b0860e2b889813a6d
+MISC metadata.xml 651 BLAKE2B 2120b41a1d0a8fd0e9d1368e5988f4f62c9e770d50719bcd782253687756e1fd2a7587851e8d1b75497ecafed7dffed4f10637317feb1f4ebaa7bafb090796bd SHA512 0d53c3d338f1544d637140952c101ade339acfd8e30a6bf76048ed0e5467f0a35344533186a4232c10a89d47cc46a7eca4b8a55751467d526ab573074a4e5b69
diff --git a/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.8.5.ebuild b/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.8.5.ebuild
new file mode 100644
index 000000000000..8064874cb093
--- /dev/null
+++ b/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.8.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 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="JAXB alternative to native Jackson annotations"
+HOMEPAGE="https://github.com/FasterXML/jackson-module-jaxb-annotations"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CP_DEPEND="~dev-java/jackson-${PV}:${SLOT}
+	~dev-java/jackson-annotations-${PV}:${SLOT}
+	~dev-java/jackson-databind-${PV}:${SLOT}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CP_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CP_DEPEND}
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+
+	sed -e 's:@package@:com.fasterxml.jackson.module.jaxb:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.module:g' \
+		-e 's:@projectartifactid@:jackson-module-jaxb-annotations:g' \
+		  "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jaxb/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jaxb/PackageVersion.java" || die
+
+	# Requires jax-rs, which isn't packaged yet.
+	rm "src/test/java/com/fasterxml/jackson/module/jaxb/introspect"/{Content,TestPropertyVisibility}.java || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md release-notes/{CREDITS,VERSION}
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find * -name "Test*.java" ! -path "*/failing/*")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jackson-module-jaxb-annotations/metadata.xml b/dev-java/jackson-module-jaxb-annotations/metadata.xml
new file mode 100644
index 000000000000..761d7571d394
--- /dev/null
+++ b/dev-java/jackson-module-jaxb-annotations/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <longdescription>This Jackson extension module provides support for using JAXB (javax.xml.bind) annotations as an alternative to native Jackson annotations. It is most often used to make it easier to reuse existing data beans that used with JAXB framework to read and write XML.</longdescription>
+  <upstream>
+    <remote-id type="github">FasterXML/jackson-module-jaxb-annotations</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jackson/Manifest b/dev-java/jackson/Manifest
new file mode 100644
index 000000000000..a82647c4f01c
--- /dev/null
+++ b/dev-java/jackson/Manifest
@@ -0,0 +1,3 @@
+DIST jackson-core-2.8.5.tar.gz 338770 BLAKE2B d02643ecd2fd2528d0fedba7aae54a88ccb223491f1198f3bb8e8f6f70d5a70be3d250e57c9b5b17bfe44c0508eab725fd57cb17a1e2d5224c1ef6dacfdb3795 SHA512 43a2a7959b182ecf3a805d138bb1d49e1dd496d9a36274f5d9f2cdec5f06d02b1cde0e932216768689609faec2bd3f8d7747c61db2a12d0ae68bf22e87a4782c
+EBUILD jackson-2.8.5.ebuild 1474 BLAKE2B 40772d814342eccf87edbae9297477a0c5e7f84cfaeb3e6414f3e66f6e400455c4992e6608dcbaea98c7a4a37f955253e8fc7a945d72f65393b09dd727d2a458 SHA512 5aa8a0f55daab73110fb586370050665dbd22cbeb0cc2323857557a0ad2286a4f779e411646f94cb179c67a38490de873e84f723f20b92e91beaf65939cad52d
+MISC metadata.xml 333 BLAKE2B e99f0c591182d75965d697a1dc4860ed964ac9cac4140b68d9ffc5ae1ae6021027b0514ca3f57520fe948c60388e4670c95f63546f2355d9d81258396a870879 SHA512 c5994d267b092ad22aec1586e2a884ed023f945a005310205e737fdf60648837c15764616bba08c8a69314ebee43fe9940c790c624555ec00c0e3d3d529d3a1e
diff --git a/dev-java/jackson/jackson-2.8.5.ebuild b/dev-java/jackson/jackson-2.8.5.ebuild
new file mode 100644
index 000000000000..c28af8794347
--- /dev/null
+++ b/dev-java/jackson/jackson-2.8.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 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="High-performance JSON processor"
+HOMEPAGE="https://github.com/FasterXML/jackson-core"
+SRC_URI="https://github.com/FasterXML/${PN}-core/archive/${PN}-core-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.7
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${PN}-core-${PN}-core-${PV}"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+
+	sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
+		-e 's:@projectartifactid@:jackson-core:g' \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java" || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md release-notes/{CREDITS,VERSION}
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
+	local TESTS=$(find * -name "Test*.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jackson/metadata.xml b/dev-java/jackson/metadata.xml
new file mode 100644
index 000000000000..ff78e167851c
--- /dev/null
+++ b/dev-java/jackson/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">FasterXML/jackson-core</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jacl-1.4.1-r1 b/dev-java/jacl-1.4.1-r1
deleted file mode 100644
index ed3e9839f000..000000000000
--- a/dev-java/jacl-1.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Jacl is an implementation of Tcl written in Java
-EAPI=5
-HOMEPAGE=http://tcljava.sourceforge.net
-IUSE=doc elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/tcljava/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=95111e60c6decf30e31fca50d5761ad7
diff --git a/dev-java/jacl/Manifest b/dev-java/jacl/Manifest
new file mode 100644
index 000000000000..c0830190e9d6
--- /dev/null
+++ b/dev-java/jacl/Manifest
@@ -0,0 +1,3 @@
+DIST jacl-1.4.1.tar.gz 1921630 BLAKE2B 1b5693aa79fc50b5ff7a1ef86608b640d0bf391ced72dbe5d30f30fb46b26174535aac9d0ec32e1528f16af9e54def344d2fe38602700f921d612761f706fcce SHA512 e4b906efbd3ef4ab9338e8bf2f50c3b820e25b9fbe61f194e90cc0fa128f68d64eb459f7b05171d4b86b4c9635ef483906a02952bdedcee89ccb92256b789247
+EBUILD jacl-1.4.1-r1.ebuild 975 BLAKE2B 6a0183b04ed9e4d0ea797d19e53774653fdb3bac4e9e2039fd8b9f0eee3814c9ae643411e6c00dfd41a4a5cb14cbb98f480a7fb18700aca17147007af3572b02 SHA512 7114f0f2d99e2a06b58eb5f0b9443e69baaeed5fb81ec7ac1c42a3915db12ba773903536677cdae93aa8a956b87911b8d08291ab9fb4087bcc651d005e0aa4eb
+MISC metadata.xml 2116 BLAKE2B 5dd3d0eaa2e83ff6b387c77b1b4a156502925bf37334b7b7ffabb7ed7ba6368cdada2f61881812225215233acd2df7cc9a611b377188e1f67c2960f60c1e616f SHA512 221bd082cf7a036c0417d003a216bd919f8d6391211da62abaf57c560f192bbe27dba23c260a4d731e09e46dd0e30b4a185a45ccf7375908b947667bf5df7966
diff --git a/dev-java/jacl/jacl-1.4.1-r1.ebuild b/dev-java/jacl/jacl-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..2a090c5d697a
--- /dev/null
+++ b/dev-java/jacl/jacl-1.4.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${P//-}"
+
+DESCRIPTION="Jacl is an implementation of Tcl written in Java"
+HOMEPAGE="http://tcljava.sourceforge.net"
+SRC_URI="mirror://sourceforge/tcljava/${MY_P}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="doc"
+
+CDEPEND=">=dev-lang/tcl-8.4.5:*"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CRDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	rm -rf src/{Test.java,empty,tests,janino} || die
+	java-pkg-simple_src_compile
+	mv src/jacl/tcl src/ || die
+	java-pkg_addres "${PN}.jar" src/ -name "*.tcl"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher jaclsh --main tcl.lang.Shell
+	dodoc README ChangeLog known_issues.txt || die
+}
diff --git a/dev-java/jacl/metadata.xml b/dev-java/jacl/metadata.xml
new file mode 100644
index 000000000000..3b8f63c2a9f6
--- /dev/null
+++ b/dev-java/jacl/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+The Tcl/Java project's goal is to make integrating the Java platform and the
+Tcl scripting language as easy as possible. The project actually consists of
+two distinct packages, called Tcl Blend and Jacl. It is important to
+understand what each package provides and in what situations one might choose
+to use Jacl or Tcl Blend.
+
+Tcl Blend is a Tcl extension that makes use of JNI to facilitate communication
+between a Java interpreter and a Tcl interpreter. Tcl Blend is typically used
+to load a Java interpreter into an existing Tcl process, so that functionality
+implemented in Java can be accessed via Tcl. One can also load Tcl Blend and
+Tcl into a Java process, which is a great way to add scripting functionality
+to an existing Java application. Because Tcl Blend is a normal Tcl extension,
+one can use it with other popular Tcl extensions like Tk, Expect, and Itcl.
+
+Jacl is a self-contained implementation of a Tcl interpreter, written entirely
+in Java. Jacl also includes features that facilitate communication between a
+Java interpreter and a Tcl interpreter. Jacl is typically used to incorporate
+scripting functionality into an existing Java application. For users who want
+to avoid adding any native code to their Java applications, Jacl is the ideal
+solution.
+
+Tcl Blend and Jacl define both a Tcl API and a Java API that make it easy to
+call Java code from Tcl or call Tcl code from Java. For example, one could
+allocate a Java object in a Tcl script and interactively invoke Java methods
+on the object. It is also easy to use the supplied API to evaluate a Tcl
+procedure from a Java method or implement Tcl procudures in Java. The flexible
+API and wealth of implementation options provided by the Tcl/Java project make
+integrating Tcl and Java easy.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">tcljava</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jacoco-0.7.5 b/dev-java/jacoco-0.7.5
deleted file mode 100644
index ed7066f18240..000000000000
--- a/dev-java/jacoco-0.7.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/ant-core:0 dev-java/asm:4 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Code Coverage library.
-EAPI=5
-HOMEPAGE=https://eclemma.org/jacoco/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=EPL-1.0
-RDEPEND=dev-java/ant-core:0 dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.5.201505241946/org.jacoco.report-0.7.5.201505241946-sources.jar -> jacoco-0.7.5-report.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.7.5.201505241946/org.jacoco.agent-0.7.5.201505241946-sources.jar -> jacoco-0.7.5-agent.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.5.201505241946/org.jacoco.core-0.7.5.201505241946-sources.jar -> jacoco-0.7.5-core.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.ant/0.7.5.201505241946/org.jacoco.ant-0.7.5.201505241946-sources.jar -> jacoco-0.7.5-ant.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b5785fb3698aa4445a0678d8ec6eab0b
diff --git a/dev-java/jacoco-0.7.9 b/dev-java/jacoco-0.7.9
deleted file mode 100644
index c9f3c32327ad..000000000000
--- a/dev-java/jacoco-0.7.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/ant-core:0 dev-java/asm:4 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Code Coverage library
-EAPI=6
-HOMEPAGE=https://eclemma.org/jacoco/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=dev-java/ant-core:0 dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar -> jacoco-0.7.9-report.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.7.9/org.jacoco.agent-0.7.9-sources.jar -> jacoco-0.7.9-agent.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar -> jacoco-0.7.9-core.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.ant/0.7.9/org.jacoco.ant-0.7.9-sources.jar -> jacoco-0.7.9-ant.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=913446f0ed5e2d566a22a8fd27f5fd7e
diff --git a/dev-java/jacoco/Manifest b/dev-java/jacoco/Manifest
new file mode 100644
index 000000000000..db0d18793d7c
--- /dev/null
+++ b/dev-java/jacoco/Manifest
@@ -0,0 +1,11 @@
+DIST jacoco-0.7.5-agent.jar 4078 BLAKE2B ca2f7a06f69ad682ab69baf959367c45fae4e1d5d32936a83bc631e9cf53945871c88db7954e2c5ebfe3266c1f2e703887dd03ba2282f308f04b645c3b903ec9 SHA512 bb374677679bb00de2029a0247af0117393bf691b1ad54f43756e6a17dfb5745f90a3c4d6470278f56e6dfde24e54e45663938d037cd3aeb0d24780b17575e56
+DIST jacoco-0.7.5-ant.jar 18060 BLAKE2B c7a04d127b2a65b5661f54786e51a2ec81589cbaecf54e02a804ed262fd4e857a51a269ef1728d81418c86e1897e54674eb3dc73ec735e84502848cdf5fe691a SHA512 1404727c1ebd9af8f6be47e0b7dc0b717a8f235a10e0fcb9d0472b8286a6a0c719877947cefe472fecdf2388b46810668650fed5567038310cec37f7f11c04c6
+DIST jacoco-0.7.5-core.jar 111749 BLAKE2B 96321d0c51aee10b71ca9c29bd22947c7befecdff42619d3eebe1b2a99eb4f2aa96062468e014ed53e956312751abdd1d7a253e3bc47ea87d55d957aee9fdea0 SHA512 7dfb16ff621b8eca76cfaeb468f9448b7c1f2bf2cffd324a5069822a03d6b70a7b9e63a08f78dc0bad7c6854e8b1059f36095a01e155f1767da6ca88913c3989
+DIST jacoco-0.7.5-report.jar 112315 BLAKE2B 88ed31eef647742c2a4b114c83aac7f31de68ffd854e0140f9d2775d2ffc9791245da54a839978b28423c887b00b39cf4680cee056f21356a353034a0858a67f SHA512 3347130757022da94b41a6b0d001d8b59e000630834de7972248ce53b447f28aeaf902226acf2485e8afbd797b84af00fdd1ea2c6f24d93ec60407e229f8a796
+DIST jacoco-0.7.9-agent.jar 4078 BLAKE2B 40d44cbbaecdd4613abed5c065c2ee320208fb1bc7e8b0a5b1e65f2ce59424967c49ee3c286ab59adc504efd2f8dac0a08c2716b400b9dae63ce5cb583a4ac1c SHA512 b0dc423039bd03bbccb62667c5dd6e2838bf75a8d98b0bb5eb51c6ebfbe3fbc6cdda86ac9e15cd2e06165202d40ddfdcc5a8553681d78026fc766ebe2f81f17e
+DIST jacoco-0.7.9-ant.jar 18096 BLAKE2B 08b5831a0321ee5620d71fbdb397bb1854c1fbd8d3d134ef8b924c67d4aff21c84875df8c2e6ec16d4a658a79ebeeb6af0ab5d653bfa87498221c38d163ce681 SHA512 8238cf2ee6233199280eaa271db8a189c33c9bef3508a7bdffc9363e6afaba90ed38d9d53eb2a88ddc3b214f1f25d7f872d6109942de7a8987e84392fb958f72
+DIST jacoco-0.7.9-core.jar 117366 BLAKE2B 2c0278cc688a26f429d78066d76148ac94b2af8bcad4631666a53b4977f136c9379e8fcc817dfede088f3df0b179220eb8d9d915d599b0a076edc0d9e86a2638 SHA512 7ac184a92aa0054eb44bfadd54c42de238da6193e9536b26fe67c2d4b65398e9ed7c471daa69a98d7138fc0ee5035a8ef40731e45363435cd30df959eb80e5f6
+DIST jacoco-0.7.9-report.jar 112521 BLAKE2B 9faaf71d98b4b0ee19f78785218de47f2a5ac52bfddf80256ff00ef3786177a3f37e53aa75dd8d373a247019a3a989532eb1a5337f7af4006e2d4133c3a834c4 SHA512 128b254767d627a185e5794b3c0ea479628e2eba05a4188c613c4661da99f3330d4491640860a0ce33fe2663ff7c218772d09dc22237c00f78f60f6b9dcc0990
+EBUILD jacoco-0.7.5.ebuild 1071 BLAKE2B a4f038760d5c0e9118a7c37ccd6f067894dbe0495fe871bb86e76016454153dfa6b7aae20c242c3744ec1ead41d3ca59a53731a144b01849ff7efa706f332130 SHA512 2a92294479b4d60ea71fd8f77cc0bfa6d3f128f635e9ff65b690683b3fce1b617b0ad31a9efcb8ab9acd307dffa880169c18adad3b7bed0c480d36e3351defd0
+EBUILD jacoco-0.7.9.ebuild 966 BLAKE2B a61994796ac232d7c576a267d4e469ef07ef84943d3c0f3906625982297827f6ff3bff5f1456cc20265744724e83c8e53a832178ea499bc426e235501535e1a7 SHA512 dfd92e0c5731f1ad906e78c58299bf4875de0a2c45bd3f095b4ee4a68eab4953ccfaa80b590f69bc8bea3ca1f44609d414f2a1e2e13e2d474df954d94431943f
+MISC metadata.xml 325 BLAKE2B 7ebc2e3092ef5e2b25c1595945fe58586c4b0b5f5861e1067ff13aecee628bebb958c2f5856ae9d92652417a42abca8383ba7168069c8367a9cfc1d68cdd3bd9 SHA512 0c1d295350f6e39939497eb52d79cd0ddc917c417600170d725ea49405f2c5c4378f86798b9b1fa421f6e0d06055abd68bad27ff104fa05b5cf179415ef2f536
diff --git a/dev-java/jacoco/jacoco-0.7.5.ebuild b/dev-java/jacoco/jacoco-0.7.5.ebuild
new file mode 100644
index 000000000000..01911e7ac908
--- /dev/null
+++ b/dev-java/jacoco/jacoco-0.7.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DATE="201505241946"
+
+DESCRIPTION="Java Code Coverage library."
+HOMEPAGE="https://eclemma.org/jacoco/"
+SRC_URI="
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.report/${PV}.${DATE}/org.${PN}.report-${PV}.${DATE}-sources.jar -> ${P}-report.jar
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.agent/${PV}.${DATE}/org.${PN}.agent-${PV}.${DATE}-sources.jar -> ${P}-agent.jar
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.core/${PV}.${DATE}/org.${PN}.core-${PV}.${DATE}-sources.jar -> ${P}-core.jar
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.ant/${PV}.${DATE}/org.${PN}.ant-${PV}.${DATE}-sources.jar -> ${P}-ant.jar"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/asm:4"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	asm-4
+	ant-core
+"
diff --git a/dev-java/jacoco/jacoco-0.7.9.ebuild b/dev-java/jacoco/jacoco-0.7.9.ebuild
new file mode 100644
index 000000000000..34d19717a0af
--- /dev/null
+++ b/dev-java/jacoco/jacoco-0.7.9.ebuild
@@ -0,0 +1,38 @@
+# 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="Java Code Coverage library"
+HOMEPAGE="https://eclemma.org/jacoco/"
+
+SRC_URI="
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.report/${PV}/org.${PN}.report-${PV}-sources.jar -> ${P}-report.jar
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.agent/${PV}/org.${PN}.agent-${PV}-sources.jar -> ${P}-agent.jar
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.core/${PV}/org.${PN}.core-${PV}-sources.jar -> ${P}-core.jar
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.ant/${PV}/org.${PN}.ant-${PV}-sources.jar -> ${P}-ant.jar"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/asm:4"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	asm-4
+	ant-core
+"
diff --git a/dev-java/jacoco/metadata.xml b/dev-java/jacoco/metadata.xml
new file mode 100644
index 000000000000..2c99ae733818
--- /dev/null
+++ b/dev-java/jacoco/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+<maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/jade-3.3-r3 b/dev-java/jade-3.3-r3
deleted file mode 100644
index 8884bc7743da..000000000000
--- a/dev-java/jade-3.3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JADE is FIPA-compliant Java Agent Development Environment
-EAPI=5
-HOMEPAGE=http://jade.cselt.it/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/JADE-src-3.3.zip -> jade-3.3.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=facde30a70c588fbc4dab74518aa299e
diff --git a/dev-java/jade/Manifest b/dev-java/jade/Manifest
new file mode 100644
index 000000000000..62f7b0c383d0
--- /dev/null
+++ b/dev-java/jade/Manifest
@@ -0,0 +1,3 @@
+DIST jade-3.3.zip 1677444 BLAKE2B 5503102ac3e17031b873900a1b279eba1749a25d93c901c98e04c93ee7218f7a52e1fc9408c91a730c36f7daf4709d381f2321a0cfb8a93f8fe86e56b495a870 SHA512 b191de5d5406276cc5ad382f4b0627f2f2b9eef3aba46d8c23e3bb4f6489808450755e6f360a2d39a1eed88c22cd4dd2d35ab140e55ffe8f021e89709a094562
+EBUILD jade-3.3-r3.ebuild 554 BLAKE2B 16149163ed0ab6dfaea673da497d86cac681c174e9ab9cb2b8fe4eea682bbf69c9322ef27316aa8d95b3de0d6a7da51020f47e9c491d7e6d6da94c4675e96b71 SHA512 77f33b4fa9e87653dce0c95b0849e56ded4e4f9f16881dde290c1eccd5fd782f34fd87fa8983b928f10a96289f71d4848926ee56db3fe5c93fc637f43a8abac7
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jade/jade-3.3-r3.ebuild b/dev-java/jade/jade-3.3-r3.ebuild
new file mode 100644
index 000000000000..6c7939efd089
--- /dev/null
+++ b/dev-java/jade/jade-3.3-r3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JADE is FIPA-compliant Java Agent Development Environment"
+HOMEPAGE="http://jade.cselt.it/"
+SRC_URI="mirror://gentoo/JADE-src-${PV}.zip -> ${P}.zip"
+
+LICENSE="LGPL-2"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="src"
diff --git a/dev-java/jade/metadata.xml b/dev-java/jade/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jade/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jakarta-oro-2.0.8-r3 b/dev-java/jakarta-oro-2.0.8-r3
deleted file mode 100644
index f5e1cd3af55d..000000000000
--- a/dev-java/jakarta-oro-2.0.8-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A set of text-processing Java classes
-EAPI=5
-HOMEPAGE=http://jakarta.apache.org/oro/index.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.0
-SRC_URI=http://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5e09cc59e91608f09a5e5fba4f1630f2
diff --git a/dev-java/jakarta-oro-2.0.8-r4 b/dev-java/jakarta-oro-2.0.8-r4
deleted file mode 100644
index 49afa7b4b47d..000000000000
--- a/dev-java/jakarta-oro-2.0.8-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A set of text-processing Java classes
-EAPI=5
-HOMEPAGE=http://jakarta.apache.org/oro/index.html
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.0
-SRC_URI=http://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=16198316b5f2b5e6a925369946e9abed
diff --git a/dev-java/jakarta-oro/Manifest b/dev-java/jakarta-oro/Manifest
new file mode 100644
index 000000000000..7fb9219c3254
--- /dev/null
+++ b/dev-java/jakarta-oro/Manifest
@@ -0,0 +1,4 @@
+DIST jakarta-oro-2.0.8.tar.gz 345304 BLAKE2B a52b14f2753cb5ce07d16d417e943009dbb9268fddc62850daebb703ba2da3d83a3d05828479c89cab96174582514af75efedc73050a5f933cc0b26fbd51c948 SHA512 a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920
+EBUILD jakarta-oro-2.0.8-r3.ebuild 1023 BLAKE2B 8994de05a1a2f24bf4a3f32e8152b3b15c2f801fde2e9c63d39ada08bc75f8c7cc59f12ce55348957b13b57d0e01f64ef7300077a1065b1ffcad651239cbdb6f SHA512 9c0582f359a973d97dcc8dae6632bb23d977671f03d9d0c22d6964121e0c3be5e471c156805aa1609052ff654fdaffa1aacf45ff4718ee1e3af94c5ce9465905
+EBUILD jakarta-oro-2.0.8-r4.ebuild 846 BLAKE2B b62c9f3e1ea2cafaf8f510d1ee8a80d2e6c92088600c1d42897f77eec741abb8330f29bb9ffc318f13eb4537cefb0f2c879cb85bc9eced647358b033f10c000e SHA512 744f0f3f6e48d5d1714e68c2f3730bd66fe538426ece8c2883b699780f9cee7227ed55047a6083d0ebb8e53ba557fac0dae5adda63e41e597a190c7de65f0007
+MISC metadata.xml 513 BLAKE2B 7c56f359436aaddf4ef061d969a24d623a5706526c5c2f7ebdcdf287898271bc40dadf7a0940e2d6bee0c96e53f2d828c9e7030f2b6b9102cbb50daca9ce3e50 SHA512 759a7e18395261364c71cb38e5ff76196588d16913f0992611c952bc0b5ed6dbd47e9a28a51b6ae74ab04b4c548ebbb773d1d813b1dd06a0c8b786cd381e43d2
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
new file mode 100644
index 000000000000..6cd4191d288c
--- /dev/null
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_J=${PN%%-*}
+MY_O=${PN##*-}
+
+DESCRIPTION="A set of text-processing Java classes"
+HOMEPAGE="http://jakarta.apache.org/oro/index.html"
+SRC_URI="http://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.class' -delete
+}
+
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_newjar ${P}.jar ${PN}.jar
+
+	dodoc CHANGES CONTRIBUTORS ISSUES README STYLE TODO
+
+	if use doc; then
+		java-pkg_dojavadoc docs/api
+		dohtml -r -A gif docs/*.html docs/images
+	fi
+	use examples && java-pkg_doexamples src/java/examples
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
new file mode 100644
index 000000000000..bb4bd7f86dad
--- /dev/null
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_J=${PN%%-*}
+MY_O=${PN##*-}
+
+DESCRIPTION="A set of text-processing Java classes"
+HOMEPAGE="http://jakarta.apache.org/oro/index.html"
+SRC_URI="http://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+	mv src/java/examples examples || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/jakarta-oro/metadata.xml b/dev-java/jakarta-oro/metadata.xml
new file mode 100644
index 000000000000..a41bfd7d3c29
--- /dev/null
+++ b/dev-java/jakarta-oro/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		A set of text-processing Java classes that provide Perl5 compatible
+		regular expressions, AWK-like regular expressions, glob expressions,
+		and utility classes for performing substitutions, splits, filtering
+		filenames, etc.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jakarta-regexp-1.3-r5 b/dev-java/jakarta-regexp-1.3-r5
deleted file mode 100644
index 6b1f14f174e1..000000000000
--- a/dev-java/jakarta-regexp-1.3-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=100% Pure Java Regular Expression package
-EAPI=5
-HOMEPAGE=http://jakarta.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.3
-SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7df958b6f799f4fcf64701454100f9fc
diff --git a/dev-java/jakarta-regexp-1.4-r2 b/dev-java/jakarta-regexp-1.4-r2
deleted file mode 100644
index 94b32fcc9dee..000000000000
--- a/dev-java/jakarta-regexp-1.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=100% Pure Java Regular Expression package
-EAPI=5
-HOMEPAGE=http://jakarta.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.4
-SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7df958b6f799f4fcf64701454100f9fc
diff --git a/dev-java/jakarta-regexp-1.5 b/dev-java/jakarta-regexp-1.5
deleted file mode 100644
index 13181627e014..000000000000
--- a/dev-java/jakarta-regexp-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=100% Pure Java Regular Expression package
-EAPI=5
-HOMEPAGE=http://jakarta.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.5
-SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7df958b6f799f4fcf64701454100f9fc
diff --git a/dev-java/jakarta-regexp/Manifest b/dev-java/jakarta-regexp/Manifest
new file mode 100644
index 000000000000..2b2d6618db0a
--- /dev/null
+++ b/dev-java/jakarta-regexp/Manifest
@@ -0,0 +1,7 @@
+DIST jakarta-regexp-1.3.tar.gz 127069 BLAKE2B c6bb7383459a4cacc3af40ec65d83f7d16ae723585fee06b4c874995455924e000d8bdc0b07615028f81fc7d6ba2927755e11bc9e7a726ffb4adf34be034ce63 SHA512 20e932856a2e761ac2c8b62617a0e661eb9ef309230ea8379cf3582a1a9308b50334bea66405fa47fade9b92a3cf9609c0a3e42cb7db85af4af63acaec553112
+DIST jakarta-regexp-1.4.tar.gz 137768 BLAKE2B f6732f6a856736d1394b429453fd8958deb9f3f651f24accf641fee8b5ccc39e9807510135b07452f80fff55423406afc1aed88cef7d80e16ac013a1436b2649 SHA512 209b3f960cd16f05d3fd609b3b6ddb119e056f428b831788caaed6ebcb64c00279b18484845456dd07b8b761a7181f6772dbe9fd578f0401a5d8b1dcf98afc35
+DIST jakarta-regexp-1.5.tar.gz 170142 BLAKE2B f245a3d53eb0be3ed2494269eee956aec7a7459872219f1bb8ecb3e5f544070b0792a690b4a52f70f0e2ba6963842868cfcbf40cdfea0155831f216636d943cf SHA512 428e5971140dd29246ec41e698813d244efc0e871c69d2d83685d8ae3691f0e20ac44aedad3c59f3c356d24384461de83921e40f0cc4d69c95813f02e8aaba82
+EBUILD jakarta-regexp-1.3-r5.ebuild 653 BLAKE2B 8145e0dbb90652da7689ef4bdf2d79a2edba5a19079af1c3bd1e2c9adb910df15320c591bcccedf3f783b9da912c6f5c309ee59b9fbeb48e5761d88dbd3b4971 SHA512 8d7e0e05770e1b4eafcfe8d3ea7927bb929d177adb3c4cffa6ff56b179ed66baa0812acd61d9396cd6db7118ec29a3eb8895e20ce38e82d2cfc9a36753302212
+EBUILD jakarta-regexp-1.4-r2.ebuild 653 BLAKE2B 8145e0dbb90652da7689ef4bdf2d79a2edba5a19079af1c3bd1e2c9adb910df15320c591bcccedf3f783b9da912c6f5c309ee59b9fbeb48e5761d88dbd3b4971 SHA512 8d7e0e05770e1b4eafcfe8d3ea7927bb929d177adb3c4cffa6ff56b179ed66baa0812acd61d9396cd6db7118ec29a3eb8895e20ce38e82d2cfc9a36753302212
+EBUILD jakarta-regexp-1.5.ebuild 653 BLAKE2B 8145e0dbb90652da7689ef4bdf2d79a2edba5a19079af1c3bd1e2c9adb910df15320c591bcccedf3f783b9da912c6f5c309ee59b9fbeb48e5761d88dbd3b4971 SHA512 8d7e0e05770e1b4eafcfe8d3ea7927bb929d177adb3c4cffa6ff56b179ed66baa0812acd61d9396cd6db7118ec29a3eb8895e20ce38e82d2cfc9a36753302212
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
new file mode 100644
index 000000000000..c510ef52deba
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="100% Pure Java Regular Expression package"
+SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/"
+
+SLOT="${PV}"
+IUSE=""
+LICENSE="Apache-1.1"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/java"
+
+java_prepare() {
+	java-pkg_clean
+	rm build.xml || die
+}
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
new file mode 100644
index 000000000000..c510ef52deba
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="100% Pure Java Regular Expression package"
+SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/"
+
+SLOT="${PV}"
+IUSE=""
+LICENSE="Apache-1.1"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/java"
+
+java_prepare() {
+	java-pkg_clean
+	rm build.xml || die
+}
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
new file mode 100644
index 000000000000..c510ef52deba
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="100% Pure Java Regular Expression package"
+SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/"
+
+SLOT="${PV}"
+IUSE=""
+LICENSE="Apache-1.1"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/java"
+
+java_prepare() {
+	java-pkg_clean
+	rm build.xml || die
+}
diff --git a/dev-java/jakarta-regexp/metadata.xml b/dev-java/jakarta-regexp/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jakarta-regexp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jal-20031117-r5 b/dev-java/jal-20031117-r5
deleted file mode 100644
index 7fc4ee458993..000000000000
--- a/dev-java/jal-20031117-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Partial port of the C++ Standard Template Library
-EAPI=6
-HOMEPAGE=http://vigna.dsi.unimi.it/jal
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=HPND
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/jal-20031117.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4901a412bc8debbdef1627ef2e2cfe34
diff --git a/dev-java/jal/Manifest b/dev-java/jal/Manifest
new file mode 100644
index 000000000000..b4b9f1b01039
--- /dev/null
+++ b/dev-java/jal/Manifest
@@ -0,0 +1,3 @@
+DIST jal-20031117.tar.gz 48793 BLAKE2B b7cb51f5adb2b0f2fc4e03c9adf826519accee43aee3d98be0139439408527618af9e30b63c1e439a5defe4c74a0185ea48e9fd24235a319e9571fb8764e080f SHA512 0cb6cbd5e80d38dfbf57417b756dbc3bdddb2a28c4cbec292799ee71ac86cff3121f1e09e86f976f6562dafac54835bdd58780e4f1ffe733897b6d6ef053f95e
+EBUILD jal-20031117-r5.ebuild 1079 BLAKE2B 139496cd711ac7f710d391445fe7f0dd9e579ea61a5654a4a4be9af2c597b62bd8b098a6b0a38a8496742b7806ded4620bc909a9f8fea43fb4520b9aed3f3e03 SHA512 ad0c21c2c75426e8e37b59682da2f6e79f45317232ba15229193e30d0d0cfc1f7838c507255889525fd1808a8a7802e7e6a4c9f8f4deadb6ae9a38a725c72688
+MISC metadata.xml 548 BLAKE2B 98ab8d85352d8f9b31d0ee52c91ab1d1d3904e1f23296a10999ed62c566ea701dda4e4453391ba8845816bb38b440a53c274897d7999707a698a526ad2596619 SHA512 68e3dde016ecf0b0b8cd8c5802450b316ca2a523e9b36f1c88412bbb91396df16a754d730a2eedab1452c63dc543297ab654c7aa77638f40d9e6de41f49b5c1b
diff --git a/dev-java/jal/jal-20031117-r5.ebuild b/dev-java/jal/jal-20031117-r5.ebuild
new file mode 100644
index 000000000000..f3d33be5161f
--- /dev/null
+++ b/dev-java/jal/jal-20031117-r5.ebuild
@@ -0,0 +1,50 @@
+# 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="Partial port of the C++ Standard Template Library"
+HOMEPAGE="http://vigna.dsi.unimi.it/jal"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+JAVA_SRC_DIR="src/jal"
+
+src_prepare() {
+	default
+
+	# Generate sources.
+	./instantiate -n byte bytes || die
+	./instantiate -n short shorts || die
+	./instantiate -n char chars || die
+	./instantiate -n int ints || die
+	./instantiate -n long longs || die
+	./instantiate -n float floats || die
+	./instantiate -n double doubles || die
+	./instantiate Object objects || die
+	./instantiate String strings || die
+
+	mkdir -p src/jal || die
+	mv bytes shorts chars ints longs floats doubles objects strings src/jal || die
+}
diff --git a/dev-java/jal/metadata.xml b/dev-java/jal/metadata.xml
new file mode 100644
index 000000000000..6cf26e42b5b0
--- /dev/null
+++ b/dev-java/jal/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+Jal is a partial port of the STL by the C++ Standard Template Library, done by
+Matthew Austern and Alexander Stepanov.
+
+It contains several useful algorithms that cannot be found elsewhere (e.g.,
+linear-time n-th order statistics and sorting arrays using arbitrary
+predicates).
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jama-1.0.3-r1 b/dev-java/jama-1.0.3-r1
deleted file mode 100644
index 257857b827e8..000000000000
--- a/dev-java/jama-1.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java Matrix Package
-EAPI=5
-HOMEPAGE=https://math.nist.gov/javanumerics/jama/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://math.nist.gov/javanumerics/jama/Jama-1.0.3.tar.gz -> jama-1.0.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=66441fe706e4a95b7476de8bb3bacf5a
diff --git a/dev-java/jama/Manifest b/dev-java/jama/Manifest
new file mode 100644
index 000000000000..99419a355669
--- /dev/null
+++ b/dev-java/jama/Manifest
@@ -0,0 +1,3 @@
+DIST jama-1.0.3.tar.gz 82188 BLAKE2B 35de815f770b192cd1b86a56ddf1919e12675d898ec4473489d3ce2c3899185f9d96eda39b6f7520fc67edfd17fe58b585f788f6a6967220150fc9a334b219ea SHA512 9bedf8f35ea1d400194b5a3b49914ebd04b5a31247959886f1967d062ceffae30993d34cd2f15d3942285a45c6930e2d4518f4ed0cc013ce853cc26aca021b0d
+EBUILD jama-1.0.3-r1.ebuild 557 BLAKE2B 1e2d29785a4ef7fab835f29e78a6a0604c91cddc963e81cc3c1967df1fc5c2d4f406078c79b726641a8c383bb5f7dfb0128bc60cad5bd2088a313272b41f7acc SHA512 03451f7a89f194fc5feed9ae19dbb83c243c1fdc84738e85041e675275ccbf83276f33b924f83f604412fb76af5eb0fbd18d2b5b133ad654e69204431937ef73
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jama/jama-1.0.3-r1.ebuild b/dev-java/jama/jama-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..c3d99e6cda66
--- /dev/null
+++ b/dev-java/jama/jama-1.0.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="Jama"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Java Matrix Package"
+HOMEPAGE="https://math.nist.gov/javanumerics/jama/"
+SRC_URI="https://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/jama/metadata.xml b/dev-java/jama/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jama/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jamon-2.81 b/dev-java/jamon-2.81
deleted file mode 100644
index 28b85c643e22..000000000000
--- a/dev-java/jamon-2.81
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/log4j:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 www-servers/tomcat:7 >=virtual/jdk-1.7 test? ( dev-db/hsqldb:0 dev-java/assertj-core:2 dev-java/junit:4 dev-java/mockito:0 dev-java/objenesis:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java API to monitor production applications
-EAPI=5
-HOMEPAGE=http://www.jamonapi.com/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-java/log4j:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 www-servers/tomcat:7 >=virtual/jre-1.7 dev-db/hsqldb:0 dev-java/jakarta-oro:2.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/stevensouza/jamonapi/archive/v2_81.tar.gz -> jamonapi-2_81.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0dc6fea4fe09b0fed823b3db68c08076
diff --git a/dev-java/jamon/Manifest b/dev-java/jamon/Manifest
new file mode 100644
index 000000000000..3c3e0f30be2d
--- /dev/null
+++ b/dev-java/jamon/Manifest
@@ -0,0 +1,3 @@
+DIST jamonapi-2_81.tar.gz 23149879 BLAKE2B 1e21c6ae849a1fec74b87614594007653ccb573b450c495396951532dfe713ab47944425f421b212e052153c84163f79f376413946d16917e0900ec5fe64be8b SHA512 09fba65aec2754f8a1b85dd7f5691b8bae5c4f1c852dd69cddb3642a594bb44baa5b6a3c611657041d6ce2cc37c824a111adeaa929761e3983d43d7080ce05b1
+EBUILD jamon-2.81.ebuild 2127 BLAKE2B f596cadc1b44a6c37b41ef0e53e1f9f4c4bd601f18b69e56a74528b5b39bfe9810ede3e7e33d9490155917cd8f186fbc377779292eec5cba77021c946d8c38ae SHA512 8fd75fc92760bc7b32be9b06481491bcdcec606771952c323a7161bf56762ed35776f014b20afa2a38c845924769af244284d6567609725ea0cf4c5758b14a25
+MISC metadata.xml 536 BLAKE2B 9dc1bf087206fa0f3490ea7dd9dfb057107dbed6bfd89ebe7c6164eea017914a34dd839cef1963dd0db71d14836a056627fcc4bb1119e601b1cb085de8dcc06f SHA512 f0a085f6e20c4f486c0a06b802030c285cf0ee5af593b4d17ae4e05a27fa63afc7e202b8a170113add4a4af82af95af0a69d01e0abf46cb8dbf5b7e136807b6b
diff --git a/dev-java/jamon/jamon-2.81.ebuild b/dev-java/jamon/jamon-2.81.ebuild
new file mode 100644
index 000000000000..e506a3e9809c
--- /dev/null
+++ b/dev-java/jamon/jamon-2.81.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PN="${PN}api"
+MY_PV="${PV//./_}"
+MY_P="${MY_PN}-${MY_PV}"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java API to monitor production applications"
+HOMEPAGE="http://www.jamonapi.com/"
+SRC_URI="https://github.com/stevensouza/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/log4j:0
+	java-virtuals/interceptor-api:0
+	java-virtuals/servlet-api:3.0
+	www-servers/tomcat:7"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7
+	dev-db/hsqldb:0
+	dev-java/jakarta-oro:2.0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? (
+		dev-db/hsqldb:0
+		dev-java/assertj-core:2
+		dev-java/junit:4
+		dev-java/mockito:0
+		dev-java/objenesis:0
+	)"
+
+S="${WORKDIR}/${MY_P}"
+JAVA_GENTOO_CLASSPATH="interceptor-api,log4j,servlet-api-3.0,tomcat-7"
+JAVA_SRC_DIR="${PN}/src/main/java"
+WAR_DIR="jamon_war/src/main/webapp"
+
+java_prepare() {
+	# No Jetty or Hazelcast packaged right now and Spring is ancient.
+	find \( -name "*Jetty*.java" -o -name "*Hazelcast*.java" \) -exec rm -v {} + || die
+	rm -rv ./jamon/src/test/java/com/jamonapi/distributed/JamonDataPersisterFactoryTest.java \
+		./jamon/src/{main,test}/java/com/jamonapi/aop/spring || die
+
+	# Keep fdsapi and xss-html-filter bundled as we lack packages.
+	rm -v ${WAR_DIR}/WEB-INF/lib/{hsqldb,jakarta-oro}*.jar || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	jar cf ${PN}.war -C ${WAR_DIR} . || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dowar ${PN}.war
+	dodoc designnotes.txt README.md
+
+	# hsqldb used by JSP files, oro used by fdsapi.
+	java-pkg_register-dependency hsqldb,jakarta-oro-2.0
+}
+
+src_test() {
+	cd jamon/src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars assertj-core-2,hsqldb,junit-4,mockito,objenesis,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jamon/metadata.xml b/dev-java/jamon/metadata.xml
new file mode 100644
index 000000000000..5256079650cb
--- /dev/null
+++ b/dev-java/jamon/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+	A free, simple, high performance, thread safe, Java API that allows
+	developers to easily monitor production applications
+	</longdescription>
+	<upstream>
+		<remote-id type="github">stevensouza/jamonapi</remote-id>
+		<remote-id type="sourceforge">jamonapi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jamvm-2.0.0-r1 b/dev-java/jamvm-2.0.0-r1
deleted file mode 100644
index fc8e989c2f0c..000000000000
--- a/dev-java/jamvm-2.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare prerm setup
-DEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* ) libffi? ( virtual/libffi ) ppc64? ( virtual/libffi ) sparc? ( virtual/libffi ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An extremely small and specification-compliant virtual machine
-EAPI=5
-HOMEPAGE=http://jamvm.sourceforge.net/
-IUSE=debug libffi
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* ) libffi? ( virtual/libffi ) ppc64? ( virtual/libffi ) sparc? ( virtual/libffi ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-SLOT=0
-SRC_URI=mirror://sourceforge/jamvm/jamvm-2.0.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-vm-2	771452d15e0b51ec559962d22c627449	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=da533340fee43eee318c7b76810c59e6
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
new file mode 100644
index 000000000000..64450cad29c2
--- /dev/null
+++ b/dev-java/jamvm/Manifest
@@ -0,0 +1,7 @@
+AUX jamvm-2.0.0-classes-location.patch 1276 BLAKE2B 7e7fd91a3dcdc1eeea665517043a856bf8ab3e76d6dd91a27ea91c422555fde0c0bc853a4410bc4feb6552efae1d9ba577e39f5f9774aa2b2f601dfcb251826c SHA512 c399cb8ebce0556a778a1511fec43eeedc2e8d4b1ca732ebd201faf49d6a607baef914fb54e34f2c5b494ace6f5c072d296fb30c65038461e97a518c9e1924bd
+AUX jamvm-2.0.0-env.file 544 BLAKE2B 25197538a4c10d6ae1b0038113c094cdbca9a1a22b2b8dbca5bc228163ba786e8187dd3f98259fc77ced451464dd8dfe383052a374f49c6c134edde0a56847fd SHA512 bf79384865e1bcaeff6c9b11d4b7d2cbd3740e87e83470f62c5ecc69029d3eaa876c5d69a376175f703d6a169041589b8c552cfe9f136be4d3050ea1888a771a
+AUX jamvm-2.0.0-javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
+AUX jamvm-2.0.0-noexecstack.patch 1387 BLAKE2B afd020772bf627c3dbd6b5da9e03d3b03e8f5c9dc3844279fe325183819cb11deadaedb4920ebfb0c6b25321daeee9f0e4fff45addd162e2b6c02e3f3ea12d31 SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a
+DIST jamvm-2.0.0.tar.gz 741459 BLAKE2B 9b8b0f8cfd8f56c0b835144c07aaca709ef466fdfe5df18438d05c66cd8a07fecfebf27e1581c67658feb3674a96c2e916b85f13dc434baf2db9be4e4fbfd0cf SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d
+EBUILD jamvm-2.0.0-r1.ebuild 3701 BLAKE2B 22026d1c5487c76207fe309aad02dedece43e952f4d1324e34ce54ef855309aa2dc988be0b95d9ccaa5bd4eb562fb222e24ed8e0d70d797d75fc1b45601dd995 SHA512 96967a52414796749f5bce41695d8db746d2bbe720c968c15a3db6977d9b2ac4a72de508a2512457d04a9326af5d9cb2ceecd707427a845a17a651e39a4d07d9
+MISC metadata.xml 311 BLAKE2B f89901d2404c3d1004a7b53345d8e533059995634d1109f620d6685de9defd6126dc1e619f8c8ba0d8f53d57a1d7b1f2f51b0f93fc12b1afb179385b30b4d514 SHA512 3c73e7134e8adf35e0a1418dfcb0215082b5cfc7e3baabc11d89fb1044996a382c551309e5c04dbc54257a65173384b690ad951ceaec2b8569d89bb8a5e757ee
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
new file mode 100644
index 000000000000..6cf7611f1f35
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
@@ -0,0 +1,27 @@
+diff -Nru jamvm-2.0.0.old/configure.ac jamvm-2.0.0/configure.ac
+--- jamvm-2.0.0.old/configure.ac	2014-06-10 21:33:37.000000000 +0100
++++ jamvm-2.0.0/configure.ac	2014-11-28 19:22:12.183091414 +0000
+@@ -236,6 +236,7 @@
+     install_dir=$prefix
+ fi
+ AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)])
++AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)])
+ 
+ AC_ARG_ENABLE(zip,
+     [AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,)
+diff -Nru jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c jamvm-2.0.0/src/classlib/gnuclasspath/class.c
+--- jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c	2012-05-17 22:01:47.000000000 +0100
++++ jamvm-2.0.0/src/classlib/gnuclasspath/class.c	2014-11-28 19:23:27.312108240 +0000
+@@ -110,10 +110,10 @@
+    separate class files in a directory structure */
+ 
+ #ifdef USE_ZIP
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
++#define JAMVM_CLASSES PKGDATADIR"/classes.zip"
+ #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
+ #else
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
++#define JAMVM_CLASSES PKGDATADIR"/classes"
+ #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
+ #endif
+ 
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-env.file b/dev-java/jamvm/files/jamvm-2.0.0-env.file
new file mode 100644
index 000000000000..1b92cd02bb79
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-2.0.0-env.file
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="JamVM JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk"
+BOOTCLASSPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@/classes.zip:${JAVA_HOME}/lib/rt.jar"
+JAVAC="${JAVA_HOME}/bin/javac"
+PATH="${JAVA_HOME}/bin"
+ROOTPATH="${JAVA_HOME}/bin"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.5"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JAVAC PATH"
+LDPATH="${JAVA_HOME}/lib"
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-javac.in b/dev-java/jamvm/files/jamvm-2.0.0-javac.in
new file mode 100644
index 000000000000..8eeda68c7a5e
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-2.0.0-javac.in
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -w
+use strict;
+use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
+use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
+
+my $ECJ_WARNINGS="-nowarn";
+
+my ( @bcoption, @source15, @target15, @cp );
+push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
+    unless grep {$_ eq '-bootclasspath'} @ARGV;
+push @source15, '-source', '1.5'
+    unless grep {$_ eq '-source'} @ARGV;
+push @target15, '-target', '1.5'
+    unless grep {$_ eq '-target'} @ARGV;  
+push @cp, '-cp', '.'
+    unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
+my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
+
+# Work around ecj's inability to handle duplicate command-line
+# options and unknown javac options.
+sub gen_ecj_opts
+{
+    my @new_args = @{$_[0]};
+
+    for my $opt (NO_DUP_ARGS) 
+    {
+	my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+	if (@indices > 1) {
+	    shift @indices;    # keep last instance only
+	    splice @new_args, $_, 2 for @indices;
+	}
+    }
+
+    for my $opt (STRIP_ARGS) 
+    {
+	my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+	splice @new_args, $_, 1 for @indices;
+    }
+
+    return \@new_args;
+}
+
+sub split_vm_args
+{
+    my @new_args = @{$_[0]};
+
+    my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
+    my @javac_args = grep $_ !~ /^-J/, @new_args;
+
+    return (\@vm_args, \@javac_args);
+}
+
+my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
+my @CLASSPATH = ('@ECJ_JAR@');
+push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
+$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
+exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch
new file mode 100644
index 000000000000..2a0f14c71a1e
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch
@@ -0,0 +1,48 @@
+diff --git a/src/os/linux/arm/callNative.S b/src/os/linux/arm/callNative.S
+index 245afd1..1583023 100644
+--- a/src/os/linux/arm/callNative.S
++++ b/src/os/linux/arm/callNative.S
+@@ -36,3 +36,7 @@
+ #include "callNativeOABI.S"
+ #endif
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git a/src/os/linux/mips/callNative.S b/src/os/linux/mips/callNative.S
+index cede343..90d9163 100644
+--- a/src/os/linux/mips/callNative.S
++++ b/src/os/linux/mips/callNative.S
+@@ -184,3 +184,7 @@ return:
+ 	j $31
+ 	.end callJNIMethod
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git a/src/os/linux/powerpc/callNative.S b/src/os/linux/powerpc/callNative.S
+index aa47f6a..763dc0a 100644
+--- a/src/os/linux/powerpc/callNative.S
++++ b/src/os/linux/powerpc/callNative.S
+@@ -281,3 +281,7 @@ return:
+         mr 1,11
+         blr
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git a/src/os/linux/x86_64/callNative.S b/src/os/linux/x86_64/callNative.S
+index 26404e6..9fb5cdf 100644
+--- a/src/os/linux/x86_64/callNative.S
++++ b/src/os/linux/x86_64/callNative.S
+@@ -267,3 +267,7 @@ float_ret:
+     addq    $8, %rcx
+     jmp     return
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..b418c899262f
--- /dev/null
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib java-vm-2 autotools
+
+DESCRIPTION="An extremely small and specification-compliant virtual machine"
+HOMEPAGE="http://jamvm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug libffi"
+
+DEPEND="dev-java/gnu-classpath:0.98
+	|| ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* )
+	libffi? ( virtual/libffi )
+	ppc64? ( virtual/libffi )
+	sparc? ( virtual/libffi )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-classes-location.patch"
+	"${FILESDIR}"/"${P}-noexecstack.patch"
+)
+
+src_prepare() {
+	# without this patch, classes.zip is not found at runtime
+	epatch "${PATCHES[@]}"
+	eautoreconf
+
+	# These come precompiled.
+	# configure script uses detects the compiler
+	# from PATH. I guess we should compile this from source.
+	# Then just make sure not to hit
+	# https://bugs.gentoo.org/show_bug.cgi?id=163801
+	#
+	#rm -v lib/classes.zip || die
+}
+
+src_configure() {
+	filter-flags "-fomit-frame-pointer"
+
+	if use ppc64 || use sparc || use libffi; then
+		append-cflags "$(pkg-config --cflags-only-I libffi)"
+	fi
+
+	local fficonf="--enable-ffi"
+	if { ! use ppc64 && ! use sparc; }; then
+		fficonf="$(use_enable libffi ffi)"
+	fi
+
+	econf ${fficonf} \
+		--disable-dependency-tracking \
+		$(use_enable debug trace) \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--includedir="${EPREFIX}"/usr/include/${PN} \
+		--with-classpath-install-dir=/usr
+}
+
+create_launcher() {
+	local script="${D}/${INSTALL_DIR}/bin/${1}"
+	cat > "${script}" <<-EOF
+		#!/bin/sh
+		exec /usr/bin/jamvm \
+			-Xbootclasspath/p:/usr/share/classpath/tools.zip" \
+			gnu.classpath.tools.${1}.Main "\$@"
+	EOF
+	chmod +x "${script}" || die
+}
+
+src_install() {
+	local libdir=$(get_libdir)
+	local CLASSPATH_DIR=/usr/libexec/gnu-classpath-0.98
+	local JDK_DIR=/usr/${libdir}/${PN}-jdk
+
+	emake DESTDIR="${D}" install
+
+	dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
+
+	set_java_env "${FILESDIR}/${P}-env.file"
+
+	dodir ${JDK_DIR}/bin
+	dosym /usr/bin/jamvm ${JDK_DIR}/bin/java
+	for files in ${CLASSPATH_DIR}/g*; do
+		if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then
+			dosym $files ${JDK_DIR}/bin/javadoc || die
+		else
+			dosym $files \
+				${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die
+		fi
+	done
+
+	dodir ${JDK_DIR}/jre/lib
+	dosym /usr/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
+	dodir ${JDK_DIR}/lib
+	dosym /usr/share/classpath/tools.zip ${JDK_DIR}/lib/tools.jar
+
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${JDK_DIR}/bin
+	sed -e "s#@JAVA@#/usr/bin/jamvm#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#/usr/share/classpath/glibj.zip#" \
+		-e "s#@TOOLS_JAR@#/usr/share/classpath/tools.zip#" \
+		"${FILESDIR}"/"${P}-javac.in" | newexe - javac
+
+	local libarch="${ARCH}"
+	[ ${ARCH} == x86 ] && libarch="i386"
+	[ ${ARCH} == x86_64 ] && libarch="amd64"
+	dodir ${JDK_DIR}/jre/lib/${libarch}/client
+	dodir ${JDK_DIR}/jre/lib/${libarch}/server
+	dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so
+	dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so
+	dosym /usr/${libdir}/classpath/libjawt.so ${JDK_DIR}/jre/lib/${libarch}/libjawt.so
+
+	# Can't use java-vm_set-pax-markings as doesn't work with symbolic links
+	# Ensure a PaX header is created.
+	local pax_markings="C"
+	# Usally disabeling MPROTECT is sufficent.
+	local pax_markings+="m"
+	# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
+	use x86 && pax_markings+="sp"
+
+	pax-mark ${pax_markings} "${ED}"/usr/bin/jamvm
+}
diff --git a/dev-java/jamvm/metadata.xml b/dev-java/jamvm/metadata.xml
new file mode 100644
index 000000000000..991f28de07c6
--- /dev/null
+++ b/dev-java/jamvm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jamvm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/janino-2.7.0 b/dev-java/janino-2.7.0
deleted file mode 100644
index ecc5d8e7f739..000000000000
--- a/dev-java/janino-2.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/ant-core:0 dev-java/unkrig-nullanalysis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=An embedded compiler for run-time compilation purposes
-EAPI=5
-HOMEPAGE=http://janino.net/
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/unkrig-nullanalysis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://janino.net/download/janino-2.7.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d3481284a365744490f18ddf2d709a57
diff --git a/dev-java/janino/Manifest b/dev-java/janino/Manifest
new file mode 100644
index 000000000000..6243be6ba3db
--- /dev/null
+++ b/dev-java/janino/Manifest
@@ -0,0 +1,3 @@
+DIST janino-2.7.0.zip 992669 BLAKE2B cc9ba79d0fc9af5bbe73f167dee6d15619b40b75852fcc227eaf5399e427cde2aeca4b6ef3ff21f303b71dbc21f432cc3e844583cafce3cb073eec1a1498c45a SHA512 0fe0faf16c9d7c63ed14b156bbf75b1ce6deebda24fc0eb0176e96693de9877187694dfb39e748523329430332a36017b2d7d04b2b26ef0847fde7396106185f
+EBUILD janino-2.7.0.ebuild 1102 BLAKE2B c4e84bc87ec98018dd9ecd818f92d923fc25fbc5fbc752fca9f104441df1d11c0fbf3cd6d15045789f8a485533bc67c1f8ae643dde79da10c18d061f2a2d5219 SHA512 c7b00f2b4f3901003d17ac36fb8ac1230e72d75eaa44396bd05e2e5706a7965d2d35f9fc84f27ef9d2905043cd9c14dec7fdc2a487c6be5f88ec54f924c74d89
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/janino/janino-2.7.0.ebuild b/dev-java/janino/janino-2.7.0.ebuild
new file mode 100644
index 000000000000..c4ef9b3b80de
--- /dev/null
+++ b/dev-java/janino/janino-2.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An embedded compiler for run-time compilation purposes"
+HOMEPAGE="http://janino.net/"
+SRC_URI="http://janino.net/download/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+CDEPEND="dev-java/ant-core:0
+	dev-java/unkrig-nullanalysis:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="ant-core,unkrig-nullanalysis"
+
+java_prepare() {
+	unzip "${S}"/janino-src.zip -d ${JAVA_SRC_DIR} && \
+	unzip "${S}"/commons-compiler-src.zip -d ${JAVA_SRC_DIR} || die
+	find -iname '*.jar' -delete || die
+
+	mkdir -p target/classes && \
+		mv src/org.codehaus.commons.compiler.properties target/classes || die
+
+	mkdir examples || die
+	mv src/org/codehaus/commons/compiler/samples/* examples/ || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples examples/
+}
diff --git a/dev-java/janino/metadata.xml b/dev-java/janino/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/janino/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jansi-1.11-r1 b/dev-java/jansi-1.11-r1
deleted file mode 100644
index d0698f0d3da0..000000000000
--- a/dev-java/jansi-1.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jansi-native:0 test? ( dev-java/ant-junit4:0 dev-java/junit:4 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A library that allows you to use ANSI escape sequences in your console output
-EAPI=5
-HOMEPAGE=http://jansi.fusesource.org/
-IUSE=elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.11
-SRC_URI=https://github.com/fusesource/jansi/tarball/jansi-project-1.11 -> jansi-1.11.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=47beae57040ccbb54dd6a23f7a1fc3e7
diff --git a/dev-java/jansi-1.5-r2 b/dev-java/jansi-1.5-r2
deleted file mode 100644
index db3db113dd13..000000000000
--- a/dev-java/jansi-1.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/jansi-native:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library to output ANSI escape sequences in console
-EAPI=6
-HOMEPAGE=http://jansi.fusesource.org/
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/fusesource/jansi/archive/jansi-1.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ef302a4c9731c9b1d182b24603e35f12
diff --git a/dev-java/jansi-native-1.5 b/dev-java/jansi-native-1.5
deleted file mode 100644
index 80625eaa3cce..000000000000
--- a/dev-java/jansi-native-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=dev-java/hawtjni-runtime:0 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Native JNI component for dev-java/jansi
-EAPI=5
-HOMEPAGE=http://jansi.fusesource.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/hawtjni-runtime:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/fusesource/jansi-native/tarball/jansi-native-1.5 -> jansi-native-1.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e64ed6d7bf89ebf88cfef2fa7ffc75f8
diff --git a/dev-java/jansi-native/Manifest b/dev-java/jansi-native/Manifest
new file mode 100644
index 000000000000..d383924d8f3a
--- /dev/null
+++ b/dev-java/jansi-native/Manifest
@@ -0,0 +1,3 @@
+DIST jansi-native-1.5.tar.gz 205008 BLAKE2B 94f46527165e1956640ceabf10ea6ae90fb461e331389823ebd9f86b2b0cadd0ed777e20787fd5bcc9388fc250be1d5415feefe4953fba9a5610870409940060 SHA512 29d178f013701b7e7844f899530f51486037e3a1403018ba4a41475ceb8d58afec768d177f64cbedd41adfb681ba08e578c2e18d956770bc039dfece8602a212
+EBUILD jansi-native-1.5.ebuild 792 BLAKE2B b0738fa53a01e60725efac9edf8ad846139572e843838ce0a7a71bc01c88a8b326b35232e55f67646c4f858280a4241235616dd08c427c3490387dea8fa7a8a9 SHA512 8af851e639ac7096c28992ee4dd3880e7295c84aa4e2afd5254b84f203b4ef73de8135977c96395c270f6275704bf0aa1a3dbb22285988722a9089d03767a963
+MISC metadata.xml 334 BLAKE2B 344c274ef2a08d05c659d652711ca3d89e4f8d0fe067cf6dbf024e1ff1c5f3f7228773dee36f57c341ddfef60dfd6c4dd5da1a7bfbef9bb70a3ded7c5412f364 SHA512 0b5b8c67251d880d3a5702dbe70472234f6c83deb557597d6160b5321b1d187fd2752879215c65dd34f8ad6ccfc3fe2ade25804b29a46a584464940942e3ace0
diff --git a/dev-java/jansi-native/jansi-native-1.5.ebuild b/dev-java/jansi-native/jansi-native-1.5.ebuild
new file mode 100644
index 000000000000..c8f3b978c70f
--- /dev/null
+++ b/dev-java/jansi-native/jansi-native-1.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit vcs-snapshot java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Native JNI component for dev-java/jansi"
+HOMEPAGE="http://jansi.fusesource.org/"
+SRC_URI="https://github.com/fusesource/${PN}/tarball/${P} -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+
+CDEPEND="dev-java/hawtjni-runtime:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="hawtjni-runtime"
+
+java_prepare() {
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	dodoc {changelog,readme}.md
+}
diff --git a/dev-java/jansi-native/metadata.xml b/dev-java/jansi-native/metadata.xml
new file mode 100644
index 000000000000..b36bdf3cdd22
--- /dev/null
+++ b/dev-java/jansi-native/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fusesource/jansi-native</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
new file mode 100644
index 000000000000..b232999b34b1
--- /dev/null
+++ b/dev-java/jansi/Manifest
@@ -0,0 +1,6 @@
+AUX jansi-1.11-build.xml 14529 BLAKE2B ea9358a4a64e077ba9173f6f0d0548647489980cff2626760b6c92df9774117bc6ff32f4647c8b89b21b4e37722f018e4f1fd0ca2cfa5915a83e253f9c18d250 SHA512 cc60a9f48f220ee13a22ed814409126524d22f2329c574e61974e26fd70b9a53f703ade06bb6921c13f370016be79c00d111368018132abee20780e99096c0a5
+DIST jansi-1.11.tar.gz 252095 BLAKE2B 72b22392fa6731f49ebb5c2e94cdf7918ca37d5c73ccb14d8810402c9ec120b1220a739e54516eeb5355ad4dd74d01ae398a6003679c60b1dd6f1648691b2efa SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1
+DIST jansi-1.5.zip 211616 BLAKE2B 754105218e62d095f9f070ba7f66b68dd2cfbf1b7d8f95ea6dc40f01e536fd8997e2bfca481a4c57cafabc6fe044de5de171b51429e07081ebe1824a5cd5d3d0 SHA512 784c01b7ab48307cf881439d5c3531949a6459e8a90667f1ee7a73f9cbce72710fcf4af8b4cae610d15085641567c0d51cab487488daa0c1b0a4605864de2775
+EBUILD jansi-1.11-r1.ebuild 1127 BLAKE2B 36c514f4e6797c2ac98e7d98ac7ad671f87613afad98083dcdbc0dcea883e14b47d0d7a3170f5177d783eea89849d2167f70695e06396654a6f84c870d7aa93a SHA512 127446458448ddb88333e4425b28475e6e9dd31f1dd7e90bd6e6b7aeec9040deafd96fae931064e922fc478f9d0cde33649da99787287c74b6de464863908434
+EBUILD jansi-1.5-r2.ebuild 674 BLAKE2B bd3b686e6c35721f33d73357434a37800519b0b370edeb97288be68a98e95b04045c397700fbf78e0d3aa4dad82da714e20dcc30f0bcde1fdd9f666fbd302b19 SHA512 07dd8bc9d822b963be6db3ca5e39bc160ace104741ef0786de3a8482eeb7f075c67fbc60d4f6e5cc46c4ef58f4263960f796c1c0373c07baa0149f09cace0910
+MISC metadata.xml 491 BLAKE2B 57979797604525188358a5e2bbf92bd7cc40e9513710d9907302df960f0fb0961b3c8eca15bc09b53cae259dbe3b512d149a4e9fb2bb5e3b1ad6a13700af3c4b SHA512 46a12388363e4b59001bf8cf67923a4f38d8a4409fe158a813c9403e0da6067a8aff418cda7e0d02dc905e38591ded15e46b8f8095acb62d0a83a65146550669
diff --git a/dev-java/jansi/files/jansi-1.11-build.xml b/dev-java/jansi/files/jansi-1.11-build.xml
new file mode 100644
index 000000000000..058559ce0847
--- /dev/null
+++ b/dev-java/jansi/files/jansi-1.11-build.xml
@@ -0,0 +1,298 @@
+<?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 6/4/13 7:11 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jansi-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="jansi-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.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/fusesource/hawtjni/hawtjni-runtime/1.8/hawtjni-runtime-1.8.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-windows32.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-windows64.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-osx.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-linux32.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-linux64.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/fusesource/hawtjni/hawtjni-runtime/1.8/hawtjni-runtime-1.8.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-windows32.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-windows64.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-osx.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-linux32.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-linux64.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.7/junit-4.7.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}" 
+           encoding="UTF-8" 
+           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>
+  </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="UTF-8" 
+           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"/>
+          <exclude name="**/Abstract*.java"/>
+          <exclude name="**/Test*.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/Abstract*.java"/>
+          <exclude name="**/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" 
+             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" 
+             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>
+      </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/fusesource/hawtjni/hawtjni-runtime/1.8"/>
+    <get src="http://repo.maven.apache.org/maven2/org/fusesource/hawtjni/hawtjni-runtime/1.8/hawtjni-runtime-1.8.jar" 
+         dest="${maven.repo.local}/org/fusesource/hawtjni/hawtjni-runtime/1.8/hawtjni-runtime-1.8.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5"/>
+    <get src="http://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5.jar" 
+         dest="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5"/>
+    <get src="http://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-windows32.jar" 
+         dest="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-windows32.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5"/>
+    <get src="http://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-windows64.jar" 
+         dest="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-windows64.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5"/>
+    <get src="http://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-osx.jar" 
+         dest="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-osx.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5"/>
+    <get src="http://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-linux32.jar" 
+         dest="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-linux32.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5"/>
+    <get src="http://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-linux64.jar" 
+         dest="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-linux64.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.7"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.7/junit-4.7.jar" 
+         dest="${maven.repo.local}/junit/junit/4.7/junit-4.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/jansi/jansi-1.11-r1.ebuild b/dev-java/jansi/jansi-1.11-r1.ebuild
new file mode 100644
index 000000000000..521a8813c78f
--- /dev/null
+++ b/dev-java/jansi/jansi-1.11-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# TODO: Get doc (missing classpath entries) working.
+JAVA_PKG_IUSE="source test"
+
+inherit vcs-snapshot java-pkg-2 java-ant-2
+
+DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output"
+HOMEPAGE="http://jansi.fusesource.org/"
+SRC_URI="https://github.com/fusesource/${PN}/tarball/${PN}-project-${PV} -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.11"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/jansi-native:0"
+
+DEPEND="${CDEPEND}
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+	)
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+S="${WORKDIR}/${P}/jansi"
+
+EANT_GENTOO_CLASSPATH="jansi-native"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
+
+src_test() {
+	EANT_EXTRA_ARGS="-Djunit.present=true"
+
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/jansi/jansi-1.5-r2.ebuild b/dev-java/jansi/jansi-1.5-r2.ebuild
new file mode 100644
index 000000000000..42ff134dafcb
--- /dev/null
+++ b/dev-java/jansi/jansi-1.5-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library to output ANSI escape sequences in console"
+HOMEPAGE="http://jansi.fusesource.org/"
+SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+
+CDEPEND="dev-java/jansi-native:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_GENTOO_CLASSPATH="jansi-native"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	default
+	rm -rv src/test || die
+}
diff --git a/dev-java/jansi/metadata.xml b/dev-java/jansi/metadata.xml
new file mode 100644
index 000000000000..c609e5e96c84
--- /dev/null
+++ b/dev-java/jansi/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+	Jansi is a small java library that allows you to use ANSI escape sequences to format your console output which works even on windows.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">fusesource/jansi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/japitools-0.9.7-r4 b/dev-java/japitools-0.9.7-r4
deleted file mode 100644
index 029f08dca97b..000000000000
--- a/dev-java/japitools-0.9.7-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java API compatibility testing tools
-EAPI=6
-HOMEPAGE=http://sab39.netreach.com/japi/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-java/ant-core:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.kaffe.org/~stuart/japi/japitools-0.9.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=afe0177420d765fbe9b51a633b0905fe
diff --git a/dev-java/japitools/Manifest b/dev-java/japitools/Manifest
new file mode 100644
index 000000000000..eab9938b7d1c
--- /dev/null
+++ b/dev-java/japitools/Manifest
@@ -0,0 +1,3 @@
+DIST japitools-0.9.7.tar.gz 92537 BLAKE2B 00dd8f7586cbf08aab0bfce9eda477d37798dae17f5d517b1e6ba091604cc2eb6216bd9a9f84be9ccec147cc4f366172a86d8b53f276a3dc33f414ea67d74d2b SHA512 28e2ecb76d8b180134904ec7aef5b15c60b02be32ef2519886eb38bb468f80ab59abb7ce27752ddbd380a3ef580e8435a983cc17797f3147933894786fd8e52d
+EBUILD japitools-0.9.7-r4.ebuild 897 BLAKE2B 1b51b53ee6bed382ad5edb6bdc20389ab95e116a3586aa56e04fbfcc0514e6d8a44d02fa2e6175020c98179cb4263d849e8e9ff9429689c4b0eabe6ad678f050 SHA512 14179276f3df2934ac8eaafc136808ec0e56a00da3ba6c7ebac55fd600344329b8b5f4481776ef0ec683bd7b620cc2a445aeac80e7a76d383983f32ab7a00f2f
+MISC metadata.xml 566 BLAKE2B 82235344744651fbe502c987cccf6f285f1074eeac226de22fc315cb81408e8ff9922ba96abb9e41bbe4a85f619ea363b17abcbb9f854321f8f275f68226fda4 SHA512 5698677c3bce76843a148c771e9c0d66012a642fe4c2c378eed27ffe0f4fb914ef5596a2ab1895167ae8637306c912b8e4f78d764c8b705c194327e6ff2c601f
diff --git a/dev-java/japitools/japitools-0.9.7-r4.ebuild b/dev-java/japitools/japitools-0.9.7-r4.ebuild
new file mode 100644
index 000000000000..a8dd8eb2d0b6
--- /dev/null
+++ b/dev-java/japitools/japitools-0.9.7-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 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="Java API compatibility testing tools"
+HOMEPAGE="http://sab39.netreach.com/japi/"
+SRC_URI="http://www.kaffe.org/~stuart/japi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="test"
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND="
+	dev-lang/perl
+	${CDEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.7"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	default
+
+	rm bin/*.bat || die
+	sed -e "s:\.\./share/java:../share/${PN}/lib:" -i bin/* \
+		|| die "Failed to correct the location of the jar file in perl scripts."
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	dobin bin/*
+
+	java-pkg-simple_src_install
+	java-pkg_register-ant-task
+}
diff --git a/dev-java/japitools/metadata.xml b/dev-java/japitools/metadata.xml
new file mode 100644
index 000000000000..d3913f579046
--- /dev/null
+++ b/dev-java/japitools/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+Japitools consists of two simple tools designed to test for compatibility
+between Java APIs. They were originally designed for testing free implementations
+of Java itself for compatibility with Sun's JDK, but they can also be used for
+testing backward compatibility between versions of any API.
+</longdescription>
+
+</pkgmetadata>
diff --git a/dev-java/jarbundler-1.8.1-r2 b/dev-java/jarbundler-1.8.1-r2
deleted file mode 100644
index ff62fc034208..000000000000
--- a/dev-java/jarbundler-1.8.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Jar Bundler Ant Task
-EAPI=5
-HOMEPAGE=http://www.loomcom.com/jarbundler/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jarbundler/jarbundler-1.8.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=604efa718fb813941e554cc7f432d387
diff --git a/dev-java/jarbundler-2.3.1 b/dev-java/jarbundler-2.3.1
deleted file mode 100644
index 1e475479cfcb..000000000000
--- a/dev-java/jarbundler-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Jar Bundler Ant Task
-EAPI=5
-HOMEPAGE=http://www.loomcom.com/jarbundler/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.6 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/jarbundler/JarBundler/v2.3.1/jarbundler.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9e5f0098d42f148a36869dfc16bcbe73
diff --git a/dev-java/jarbundler/Manifest b/dev-java/jarbundler/Manifest
new file mode 100644
index 000000000000..38840df8c1e6
--- /dev/null
+++ b/dev-java/jarbundler/Manifest
@@ -0,0 +1,5 @@
+DIST jarbundler-1.8.1.tar.gz 132101 BLAKE2B 0cd223ca9a63604f93d6bb2d6e89d0e48b48b43befaf510181fc8f435dc2f61388995f11c9efe4439e784b66c60a1395a43ef2041c690967b226a0212e77ef68 SHA512 f18657aaaae749846544fc35b65fe5e548a0471d85bf4e1d671bf1c7309f2392487069e880ce5f9c1a0e076637dddd9274d536969a9df5401331835f881553b4
+DIST jarbundler.zip 159874 BLAKE2B dbfa00a930a0f1e4c26e4372254f380d67279edbb6bc885db2a964f7fda744a68b9c6dc0a088ca851e62ed55048d33413186f6f340b5c80b52b8d9b4c589a355 SHA512 8b8b45533c601d10b6f986b913b824bb05617ac0901f178ee3fcfbdffa41ca060325228f71e62c4dfade778d50dd2040504eabf49311d386d75b82f77a535280
+EBUILD jarbundler-1.8.1-r2.ebuild 877 BLAKE2B e64f08cc3af09cc74ecab1318f827fcf9bb10908f022a154b172654bec234a3f654d3efaacc3a6f8ccacede12991e4712da98a37deefafb8f2eb315b1f2848b4 SHA512 29b33f54bf27ae9116394810a90cd304eaa967c5431eefbbce87939f1080d2c71510440fe583a9af7ae50d82fbd7b7afcb1c8395fc965e27e6879dd322984c6d
+EBUILD jarbundler-2.3.1.ebuild 920 BLAKE2B 51d7c5820840764ea32110d98783f07d49ead2226fa3f3f91cfcaecd1e04f249ba1695a5dc728462086ab7b194a90a2e40d2596d8e0b7b0077fa4769e6fd40f6 SHA512 8eccb4613bac9817affe001452285718b6ff6d9c40d2f59b2a174201bb56f494467f090d4de6c680f8828d5be00b1b7283c2b8eeee73dca13a168f3646e7eb2f
+MISC metadata.xml 316 BLAKE2B 208d43f0211b3f7f9322075e73673b35e703b2a5ecd4f66e2b066879792275fa7eeb03b287cef2f886157f5e3a12b5a64bc30b006b2fca4d488ce2d5eaf97414 SHA512 c52e5fd2674ee9b2eac940e7c0a92540a12e76297216d4915ab899922eb77c0f9f8125193dbc42ea3d924dbb60dceb2c6d55e35afe31eaf864ffae6ddb82a60c
diff --git a/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild b/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
new file mode 100644
index 000000000000..209a6407a5ca
--- /dev/null
+++ b/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Jar Bundler Ant Task"
+HOMEPAGE="http://www.loomcom.com/jarbundler/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+COMMON_DEP="
+	>=dev-java/xerces-2.8.1:2"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4
+	>=dev-java/ant-core-1.7:0"
+
+java_prepare() {
+	find -name '*.jar' -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_newjar "build/${P}.jar"
+	java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc javadoc/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jarbundler/jarbundler-2.3.1.ebuild b/dev-java/jarbundler/jarbundler-2.3.1.ebuild
new file mode 100644
index 000000000000..2cfb7f543659
--- /dev/null
+++ b/dev-java/jarbundler/jarbundler-2.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Jar Bundler Ant Task"
+HOMEPAGE="http://www.loomcom.com/jarbundler/"
+SRC_URI="http://downloads.sourceforge.net/project/jarbundler/JarBundler/v${PV}/${PN}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+COMMON_DEP="
+	>=dev-java/xerces-2.8.1:2"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.6"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6
+	>=dev-java/ant-core-1.7:0"
+
+java_prepare() {
+	find -name '*.jar' -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_newjar "build/${P}.jar"
+	java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc javadoc/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jarbundler/metadata.xml b/dev-java/jarbundler/metadata.xml
new file mode 100644
index 000000000000..2b139b37e27a
--- /dev/null
+++ b/dev-java/jarbundler/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jarbundler</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jargs-1.0 b/dev-java/jargs-1.0
deleted file mode 100644
index 7d371d6c4dbe..000000000000
--- a/dev-java/jargs-1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Command-line argument parsing library in Java
-EAPI=5
-HOMEPAGE=https://github.com/purcell/jargs
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/jargs/jargs-1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=51675f9ee4eba29a5f3d82f71cd21212
diff --git a/dev-java/jargs/Manifest b/dev-java/jargs/Manifest
new file mode 100644
index 000000000000..b6aafc8dd3f8
--- /dev/null
+++ b/dev-java/jargs/Manifest
@@ -0,0 +1,3 @@
+DIST jargs-1.0.zip 202051 BLAKE2B dbf74d90a5c229f9ca1ba42c8d0b3b35404b3eb7c5dc7af0a76fc222465707b9dbfe44fef63cb1ffbc64821fa2f0c7e8144466e44de9bbf84cf198f5a107e31c SHA512 c121a8850c43fda1561df2ead211d526596b3aa8d01074df86ef0fa68eab83021fbb99ba16f05a0a20185b027f820643189c591bc8b79fb29d579eff4745b359
+EBUILD jargs-1.0.ebuild 556 BLAKE2B 6003311771e030c4f2dadff72c08aa22c0b984a72786d2bb61d07beb22796aad8127a242591e944fc56604387f0c9072dffdf404431eadfe2bd38e18c3fd474a SHA512 4312ddf7383efa9b098e7f9c6746f49bdd77242bf910f6196eedfed2c7531f8b23f7f3b6fa9fe32dd420a60787e85222bf60618373ae371602950e4db95328e1
+MISC metadata.xml 376 BLAKE2B 28627c0b5a5b855f815a0a1d0d5546ee392dee917be5819e1a9dd5094bb782a511402135a4b56f91e41b71b8f86dea1925d0b363cea9b6d53b5247e76e87e895 SHA512 6dce1f0c46259c53b16a7d846ec695d2969815566641e15efa3949304a0e534f78b2981673f71af5c851feb5976999fb7c846356448942feee7a57446abfb3f4
diff --git a/dev-java/jargs/jargs-1.0.ebuild b/dev-java/jargs/jargs-1.0.ebuild
new file mode 100644
index 000000000000..41dfa42c8715
--- /dev/null
+++ b/dev-java/jargs/jargs-1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Command-line argument parsing library in Java"
+HOMEPAGE="https://github.com/purcell/jargs"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf src/jargs/{examples,test} || die
+}
diff --git a/dev-java/jargs/metadata.xml b/dev-java/jargs/metadata.xml
new file mode 100644
index 000000000000..bd60fb04a3db
--- /dev/null
+++ b/dev-java/jargs/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">purcell/jargs</remote-id>
+    <remote-id type="sourceforge">jargs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jarjar-1.4 b/dev-java/jarjar-1.4
deleted file mode 100644
index 86cce4c15939..000000000000
--- a/dev-java/jarjar-1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/asm:4 dev-java/gnu-regexp:1 dev-java/java-getopt:1 dev-java/ant-core:0 >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tool for repackaging third-party jars
-EAPI=5
-HOMEPAGE=http://jarjar.sourceforge.net
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=dev-java/asm:4 dev-java/gnu-regexp:1 dev-java/java-getopt:1 dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1
-SRC_URI=https://jarjar.googlecode.com/files/jarjar-src-1.4.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7c1a1790c23757584418afd752b09a64
diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest
new file mode 100644
index 000000000000..75b92639f7a0
--- /dev/null
+++ b/dev-java/jarjar/Manifest
@@ -0,0 +1,5 @@
+AUX 0.9-bootclasspath.patch 630 BLAKE2B a4f65fe4d76ca51c5b5f41b707c52e9dcbb579d08d50eb63be54e7ce15ad0516847f1bc0e1d84ee0767ee068d9a5863e93d8bd5ce20d563a4e3b2ce7c340a43c SHA512 07225e41b1497c369fcd924ea6ff612388c020f89181e583bd5dc55d5219fe81a196c76df3bf5b8bdf882bf3a25b5b874110d231c5a3e5d387bdff16b2d0cc27
+AUX 0.9-system-jars.patch 790 BLAKE2B 702240e131e2e22fe5b32e52493d87e6f88c9025f782cc74579f2027b20f6bc44dc2e229dfd8cbd20fcc8bb9310bc87d24d04b9db779059c0a599e329989fb98 SHA512 6dfcd74af809b85e11a4f9c0cf5aea176ef1dff86705346e26a0f4be6f2b9f45dba82d304d83dd5be6e8def37947217bcebe408fd7627f9a1511a3d6d721d992
+DIST jarjar-src-1.4.zip 339014 BLAKE2B 88694826dad529396cd4471aab135782aca7455daa56f2f8d66dbcef2630466b1f3030c95c79ba8cb054f44bbf5dca39652283c41e982eb63f264d5d163ff1d2 SHA512 62af4f07c3fe2b887da959b8251a94fbd1c142e56b3332ad81865eef9ba32ded47883fc37d943c0081a4496ab71ef044022d13f21ccdb8db690638c26fc52c31
+EBUILD jarjar-1.4.ebuild 1242 BLAKE2B 7abfc5cb95ddde03bc4241a2317c21b9d2108527d07bb45a7406f63bc9a6f29dfb1df540247ab2afc5f4a2e9208e9bc628953ce472153753368ddac172af8865 SHA512 0036720b57b00a730ba1f67084205851a5234f179e07e018dadf1098edadbac44d76552ddf5ca588c1084a55763bfe38dceccb6e62b97e89a72db019c0377b10
+MISC metadata.xml 312 BLAKE2B bc12f682c75d74033efbbf7b5a286d8903c59e78bf0733416c29a3d6190c1c95538ce72158ab3a0d1d6c3e644ee8f221ffdc01b25b180c10be2606c682e869c3 SHA512 6e73ffaf397ce44fbfc20a9d676eb0e751da1a48e8c1e6d7bd074704b647cb7f7f87464023d71fc4f27e2cb3468b729aeb005f5d0c66e94a6bde035eeebfb211
diff --git a/dev-java/jarjar/files/0.9-bootclasspath.patch b/dev-java/jarjar/files/0.9-bootclasspath.patch
new file mode 100644
index 000000000000..6a46d1afbd5a
--- /dev/null
+++ b/dev-java/jarjar/files/0.9-bootclasspath.patch
@@ -0,0 +1,11 @@
+--- build.xml	2008-09-13 13:55:40.000000000 +0200
++++ build.xml	2009-10-06 20:51:53.000000000 +0200
+@@ -48,7 +48,7 @@
+             </copy>
+             <javac srcdir="src/@{module}" destdir="build/@{module}"
+               source="${compile.source}"
+-              target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}"
++              target="${compile.target}" extdirs="${compile.extdirs}"
+               debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}">
+                  <classpath refid="@{refid}"/>
+                  <compilerarg value="-Xlint"/>
diff --git a/dev-java/jarjar/files/0.9-system-jars.patch b/dev-java/jarjar/files/0.9-system-jars.patch
new file mode 100644
index 000000000000..c2fcf98f27e7
--- /dev/null
+++ b/dev-java/jarjar/files/0.9-system-jars.patch
@@ -0,0 +1,20 @@
+Index: build.xml
+===================================================================
+--- build.xml	(revision 90)
++++ build.xml	(working copy)
+@@ -93,6 +93,15 @@
+         </jarjar>
+     </target>
+ 
++    <target name="jar-nojarjar" depends="compile" description="Create Jar Without running JarJar task on it">
++        <mkdir dir="dist"/>
++        <jar jarfile="${jarfile}" basedir="build/main/">
++            <manifest>
++                <attribute name="Main-Class" value="com.tonicsystems.jarjar.Main"/>
++                <attribute name="Implementation-Version" value="${version}"/>
++            </manifest>
++        </jar>
++    </target>
+     <target name="jar-util" depends="compile" description="Create utility Jar">
+         <mkdir dir="dist"/>
+         <jar jarfile="${jarfile.util}">
diff --git a/dev-java/jarjar/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
new file mode 100644
index 000000000000..51487a4f2fa2
--- /dev/null
+++ b/dev-java/jarjar/jarjar-1.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Tool for repackaging third-party jars"
+SRC_URI="https://jarjar.googlecode.com/files/${PN}-src-${PV}.zip"
+HOMEPAGE="http://jarjar.sourceforge.net"
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE=""
+RESTRICT="test"
+
+CDEPEND="
+	dev-java/asm:4
+	dev-java/gnu-regexp:1
+	dev-java/java-getopt:1
+	dev-java/ant-core:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="jar-nojarjar"
+EANT_GENTOO_CLASSPATH="
+	asm-4
+	gnu-regexp-1
+	java-getopt-1
+	ant-core
+"
+
+ANT_TASKS="none"
+
+PATCHES=(
+	"${FILESDIR}/0.9-system-jars.patch"
+	"${FILESDIR}/0.9-bootclasspath.patch"
+)
+
+JAVA_RM_FILES=(
+	src/main/com/tonicsystems/jarjar/JarJarMojo.java
+)
+
+java_prepare() {
+	java-pkg_clean
+	epatch "${PATCHES[@]}"
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+	java-pkg_register-ant-task
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/jarjar/metadata.xml b/dev-java/jarjar/metadata.xml
new file mode 100644
index 000000000000..a3e6de3368a5
--- /dev/null
+++ b/dev-java/jarjar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jarjar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/java-apicheck-0_p20150907 b/dev-java/java-apicheck-0_p20150907
deleted file mode 100644
index 9a98e2b4f198..000000000000
--- a/dev-java/java-apicheck-0_p20150907
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Command line tool to check Java packages for API compatibility
-EAPI=5
-HOMEPAGE=https://github.com/gentoo/java-apicheck/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-java/japitools dev-java/java-config
-SLOT=0
-SRC_URI=https://github.com/gentoo/java-apicheck/archive/0_p20150907.tar.gz -> java-apicheck-0_p20150907.tar.gz
-_md5_=ec2abe84c6585f61f67841324d147a3c
diff --git a/dev-java/java-apicheck/Manifest b/dev-java/java-apicheck/Manifest
new file mode 100644
index 000000000000..1e53b3be02cd
--- /dev/null
+++ b/dev-java/java-apicheck/Manifest
@@ -0,0 +1,3 @@
+DIST java-apicheck-0_p20150907.tar.gz 1550 BLAKE2B 75d53337c6ead56927897ec26f7c475296564e737eb91c66f330aefed8f0675b27c23cbbf34a27d15e42e3e3a74ac078465b7dd6030faf1fe3d09cd1f45d7255 SHA512 68a3a5443ea26840a526c2e53451e47e441f6ec15b2ddffef8f5d63a50f1129d18cd65506ecfe0bbf3f9829514697648eff8f64e558f0bd5376b0bf2add70b70
+EBUILD java-apicheck-0_p20150907.ebuild 477 BLAKE2B 32e9f43fda75b74d809e0ee11040e52a7581e9e641cf88571bf778257e3cc1e22e45e1ae5d506e6ad98c9322bb947bd38688a277d5024786a385da0d70c6a79e SHA512 b72df259425ea2b1d0639529b94ead9a14a5ad7a6428fa99109487744913f68388af7158d6fd015c30f53572f1f81765f4b511f4a1b7ceb64b1e46653f9fbaff
+MISC metadata.xml 321 BLAKE2B 9ba073b5557e0361276f4c358f11fff5572ee1c5e837532cfe22689e399a70fad2c2fe69bd2ee3d3097ddb6898dcb7b56150523ba20ba9ae3d9dd0cd522e3d32 SHA512 d3931e2b6d1400823ab3f80a6aa28ab7ce773da8b6cb71c3661affdb32a35282c4aac3189e13dc1cfd049f1dabe0ccb321416804f90e04de87d1307fdee9b9b3
diff --git a/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild b/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
new file mode 100644
index 000000000000..2e81654149b2
--- /dev/null
+++ b/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Command line tool to check Java packages for API compatibility"
+HOMEPAGE="https://github.com/gentoo/java-apicheck/"
+SRC_URI="https://github.com/gentoo/java-apicheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-java/japitools
+	dev-java/java-config
+	"
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/dev-java/java-apicheck/metadata.xml b/dev-java/java-apicheck/metadata.xml
new file mode 100644
index 000000000000..df2d24fb7ca7
--- /dev/null
+++ b/dev-java/java-apicheck/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gentoo/java-apicheck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/java-config-2.2.0-r4 b/dev-java/java-config-2.2.0-r4
deleted file mode 100644
index afcf46118eee..000000000000
--- a/dev-java/java-config-2.2.0-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Java environment configuration query tool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=2
-SRC_URI=https://dev.gentoo.org/~sera/distfiles/java-config-2.2.0.tar.bz2
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c0099d8dd305aa6e0d8cd598b0d13f4e
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
new file mode 100644
index 000000000000..702491bd50be
--- /dev/null
+++ b/dev-java/java-config/Manifest
@@ -0,0 +1,4 @@
+AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
+DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
+EBUILD java-config-2.2.0-r4.ebuild 1090 BLAKE2B 70acd02e5f352e21994971306284950949791531f979751daef89e270d7f7709e3e119d39adf0ab0e1673b17b23f38171a897c8baf197ed56118ce2fb51b2f77 SHA512 046161fcc2afe66dcd832e86f37fc44fcb268410d3b01cf0f424214142df1dbd4a9ca8c83bf94c3468c33a60c68b53e862a3c3c3fc56c7d8469f8a264a5f51c0
+MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/files/java-config-2.2.0-prefix.patch b/dev-java/java-config/files/java-config-2.2.0-prefix.patch
new file mode 100644
index 000000000000..068538a69f91
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.2.0-prefix.patch
@@ -0,0 +1,15 @@
+Wait for the java team to upstream this patch.
+Bug: 591156
+--- /setup.py	2013-02-15 07:12:09.000000000 +0900
++++ /setup.py.new	2016-08-13 16:38:22.000000000 +0900
+@@ -87,8 +87,8 @@
+ 		elif arch in ['hpux']:
+ 			defaults = '*= hp-jdk-bin'
+ 
+-		os.mkdir(self.root + '/usr/share/java-config-2/config/')
+-		with open(self.root + '/usr/share/java-config-2/config/jdk-defaults.conf', 'w') as f:
++		os.mkdir(self.root + eprefix + '/usr/share/java-config-2/config/')
++		with open(self.root + eprefix + '/usr/share/java-config-2/config/jdk-defaults.conf', 'w') as f:
+ 			f.write("# This files contain the default support jdk's\n")
+ 			f.write(defaults + "\n")
+ 
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
new file mode 100644
index 000000000000..2d0a08658067
--- /dev/null
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+IUSE="test"
+
+DEPEND="test? (
+		|| (
+			sys-apps/portage[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)"
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+	!dev-java/java-config-wrapper
+	sys-apps/baselayout-java
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.0-prefix.patch )
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# This replaces the file installed by java-config-wrapper.
+	dosym java-config-2 /usr/bin/java-config
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-java/java-config/metadata.xml b/dev-java/java-config/metadata.xml
new file mode 100644
index 000000000000..fb57516300d3
--- /dev/null
+++ b/dev-java/java-config/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		java-config is used to configure the Java subsystem on your Gentoo
+		installation. In particular, it can be used to configure system-wide and
+		per-user default JVMs, construct classpath env vars from installed java
+		packages and be used to query for the path to various JDK tools.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/java-dep-check-0.3-r1 b/dev-java/java-dep-check-0.3-r1
deleted file mode 100644
index d2b860b117a0..000000000000
--- a/dev-java/java-dep-check-0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 dev-java/commons-cli:1 dev-java/asm:3 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java Dependency checker
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 dev-java/commons-cli:1 dev-java/asm:3 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=28add8ad94aa7dd5bbec987318af7fae
diff --git a/dev-java/java-dep-check-0.4 b/dev-java/java-dep-check-0.4
deleted file mode 100644
index 514a5250686d..000000000000
--- a/dev-java/java-dep-check-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.8 dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java Dependency checker
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.8 dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4ed42693cd6c88a80edefb95bb405a23
diff --git a/dev-java/java-dep-check/Manifest b/dev-java/java-dep-check/Manifest
new file mode 100644
index 000000000000..ed962d282c1e
--- /dev/null
+++ b/dev-java/java-dep-check/Manifest
@@ -0,0 +1,5 @@
+AUX Main-0.3.java 11702 BLAKE2B f0f67f098fdf20cb6ad78ec6f0e20afa29cae2c7b62bbafea7a0e6ec5c3ab83029e7929d1e7d78b93b7551c62802a5b2a9f7ba40e16d99c7037ebcb8d2d71e1a SHA512 a70c0161fe72e8f4b4476cbdad5ae3074fbb7321214723a7b1b7778fd06de4eb616479de2b5d6ce9a6dab2e919d721ce2b177a515039a0b9592aa2b5e1017e88
+AUX Main-0.4.java 14943 BLAKE2B ec9f08f76a38e16f17e68e05e06985f11700532c6f6827518cd8303635d240f7c425a205dbc2c41df870b1029d83a3b04b5d20a76f10275786a8d7c457472501 SHA512 340e6912285ee5c61116cd838c2abf68c573e57053d0b923fcd3929e19253d7cf29a281b226a3624a69b358f112bdf4a554b6c23b850933d60d7a1fd059f7a1e
+EBUILD java-dep-check-0.3-r1.ebuild 645 BLAKE2B 06181b8bd751a72d4a2876d4d44dbce6a037abcc23a09b9e91994a3987a03442dd58d6b191ea9ead5d2187254455c625c6cca587d61136ae236148e28eb92505 SHA512 6da35a65c72ef3d61f4544d49fadac6d743d8b348130ae811b620d62b428227ad4a8cc889d78dd409291dc59a621f459c27993033d7daa2eee5f23ce4d786ebe
+EBUILD java-dep-check-0.4.ebuild 642 BLAKE2B adffd940e68f3e7653a1b723acb360b31d7d402e3415649608d161c0c5dfa7cbc0ca476ac47b284d2af5f76632300f96d77350e130e8839aad36dd0520b9a842 SHA512 61463bfcced95396791da6dcd12135c0724294956c74743492c4fb8a21199aa855250797e6aa6a5b34ad4a5b2e6c0bc34bd77745e4769f4aae6335821ce048e1
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/java-dep-check/files/Main-0.3.java b/dev-java/java-dep-check/files/Main-0.3.java
new file mode 100644
index 000000000000..e1f02a024eef
--- /dev/null
+++ b/dev-java/java-dep-check/files/Main-0.3.java
@@ -0,0 +1,335 @@
+/*
+ * Main.java The main application class.
+ *
+ * Created on May 1, 2007, 6:32 PM
+ *
+ * Copyright (C) 2007,2008 Petteri Räty <betelgeuse@gentoo.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package javadepchecker;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.commons.EmptyVisitor;
+
+/**
+ *
+ * @author betelgeuse
+ * @author serkan
+ */
+public final class Main extends EmptyVisitor {
+
+    static private String image = "";
+    private Set<String> deps = new HashSet<String>();
+    private Set<String> current = new HashSet<String>();
+
+    /** Creates a new instance of Main */
+    public Main() {
+    }
+
+    private static Collection<String> getPackageJars(String pkg) {
+        ArrayList<String> jars = new ArrayList<String>();
+        try {
+            Process p = Runtime.getRuntime().exec("java-config -p " + pkg);
+            p.waitFor();
+            BufferedReader in;
+            in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+            String output = in.readLine();
+            if (output!=null/* package somehow missing*/ && !output.trim().equals("")) {
+                for (String jar : output.split(":")) {
+                    jars.add(jar);
+                }
+            }
+        } catch (InterruptedException ex) {
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (IOException ex) {
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        return jars;
+    }
+
+    public void processJar(JarFile jar) throws IOException {
+        for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) {
+            JarEntry entry = e.nextElement();
+            String name = entry.getName();
+            if (!entry.isDirectory() && name.endsWith(".class")) {
+                this.current.add(name);
+                InputStream stream = jar.getInputStream(entry);
+                new ClassReader(stream).accept(this, 0);
+            }
+        }
+    }
+
+    private static boolean depNeeded(String pkg, Collection<String> deps) throws IOException {
+        Collection<String> jars = getPackageJars(pkg);
+        // We have a virtual with VM provider here
+        if (jars.size() == 0) {
+            return true;
+        }
+        for (String jarName : jars) {
+            JarFile jar = new JarFile(jarName);
+            for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) {
+                String name = e.nextElement().getName();
+                if (deps.contains(name)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static boolean depsFound(Collection<String> pkgs, Collection<String> deps) throws IOException {
+        boolean found = true;
+        Collection<String> jars = new ArrayList<String>();
+        String[] bootClassPathJars = System.getProperty("sun.boot.class.path").split(":");
+        // Do we need "java-config -r" here?
+        for (String jar : bootClassPathJars) {
+            File jarFile = new File(jar);
+            if (jarFile.exists()) {
+                jars.add(jar);
+            }
+        }
+        for (Iterator<String> pkg = pkgs.iterator(); pkg.hasNext();) {
+            jars.addAll(getPackageJars(pkg.next()));
+        }
+
+        if (jars.size() == 0) {
+            return false;
+        }
+        ArrayList<String> jarClasses = new ArrayList<String>();
+        for (String jarName : jars) {
+            JarFile jar = new JarFile(jarName);
+            for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) {
+                jarClasses.add(e.nextElement().getName());
+            }
+        }
+        for (String dep : deps) {
+            if (!jarClasses.contains(dep)) {
+                if (found) {
+                    System.out.println("Class files not found via DEPEND in package.env");
+                }
+                System.out.println("\t" + dep);
+                found = false;
+            }
+        }
+        return found;
+    }
+
+    private static boolean checkPkg(File env) {
+        boolean needed = true;
+        boolean found = true;
+        HashSet<String> pkgs = new HashSet<String>();
+        Collection<String> deps = null;
+
+        BufferedReader in = null;
+        try {
+            Pattern dep_re = Pattern.compile("^DEPEND=\"([^\"]*)\"$");
+            Pattern cp_re = Pattern.compile("^CLASSPATH=\"([^\"]*)\"$");
+
+            String line;
+            in = new BufferedReader(new FileReader(env));
+            while ((line = in.readLine()) != null) {
+                Matcher m = dep_re.matcher(line);
+                if (m.matches()) {
+                    String atoms = m.group(1);
+                    for (String atom : atoms.split(":")) {
+                        String pkg = atom;
+                        if (atom.contains("@")) {
+                            pkg = atom.split("@")[1];
+                        }
+                        pkgs.add(pkg);
+                    }
+                    continue;
+                }
+                m = cp_re.matcher(line);
+                if (m.matches()) {
+                    Main classParser = new Main();
+                    for (String jar : m.group(1).split(":")) {
+                        if (jar.endsWith(".jar")) {
+                            classParser.processJar(new JarFile(image + jar));
+                        }
+                    }
+                    deps = classParser.getDeps();
+                }
+            }
+
+            for (String pkg : pkgs) {
+                if (!depNeeded(pkg, deps)) {
+                    if (needed) {
+                        System.out.println("Possibly unneeded dependencies found");
+                    }
+                    System.out.println("\t" + pkg);
+                    needed = false;
+                }
+            }
+            found = depsFound(pkgs, deps);
+
+        } catch (IOException ex) {
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+        } finally {
+            try {
+                in.close();
+            } catch (IOException ex) {
+                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+            }
+        }
+        return needed && found;
+    }
+
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) throws IOException {
+        int exit = 0;
+        try {
+            CommandLineParser parser = new PosixParser();
+            Options options = new Options();
+            options.addOption("h", "help", false, "print help");
+            options.addOption("i", "image", true, "image directory");
+            options.addOption("v", "verbose", false, "print verbose output");
+            CommandLine line = parser.parse(options, args);
+            String[] files = line.getArgs();
+            if (line.hasOption("h") || files.length == 0) {
+                HelpFormatter h = new HelpFormatter();
+                h.printHelp("java-dep-check [-i <image>] <package.env>+", options);
+            } else {
+                image = line.getOptionValue("i", "");
+
+                for (String arg : files) {
+                    if (line.hasOption('v')) {
+                        System.out.println("Checking " + arg);
+                    }
+                    if (!checkPkg(new File(arg))) {
+                        exit = 1;
+                    }
+                }
+            }
+        } catch (ParseException ex) {
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        System.exit(exit);
+    }
+
+    private void addDep(String dep) {
+        deps.add(dep + ".class");
+    }
+
+    private void addDep(Type dep) {
+        if (dep.getSort() == Type.ARRAY) {
+            addDep(dep.getElementType());
+        }
+        if (dep.getSort() == Type.OBJECT) {
+            addDep(dep.getInternalName());
+        }
+    }
+
+    private Collection<String> getDeps() {
+        ArrayList<String> result = new ArrayList<String>();
+        for (String s : deps) {
+            if (!current.contains(s)) {
+                result.add(s);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+        if(superName != null) {
+            addDep(superName);
+        }
+        for (String iface : interfaces) {
+            addDep(iface);
+        }
+    }
+
+    @Override
+    public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
+        addDep(Type.getType(desc));
+        return null;
+    }
+
+    @Override
+    public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+        for (Type param : Type.getArgumentTypes(desc)) {
+            addDep(param);
+        }
+
+        if (exceptions != null) {
+            for (String exception : exceptions) {
+                addDep(exception);
+            }
+        }
+        addDep(Type.getReturnType(desc));
+        return new EmptyVisitor() {
+            @Override
+            public void visitLocalVariable(String name, String desc, String signature, Label start, Label end, int index) {
+                addDep(Type.getType(desc));
+            }
+
+            @Override
+            public void visitFieldInsn(int opcode, String owner, String name, String desc) {
+                addDep(Type.getObjectType(owner));
+                addDep(Type.getType(desc));
+            }
+
+            @Override
+            public void visitMethodInsn(int opcode, String owner, String name, String desc) {
+                addDep(Type.getObjectType(owner));
+            }
+
+            @Override
+            public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) {
+                return Main.this.visitAnnotation(desc, visible);
+            }
+        };
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+        addDep(Type.getType(desc));
+        return null;
+    }
+}
diff --git a/dev-java/java-dep-check/files/Main-0.4.java b/dev-java/java-dep-check/files/Main-0.4.java
new file mode 100644
index 000000000000..ea877e92fce8
--- /dev/null
+++ b/dev-java/java-dep-check/files/Main-0.4.java
@@ -0,0 +1,436 @@
+/**
+ * This file is part of javadepchecker
+ *
+ * Copyright (C) 2016 Gentoo Foundation
+ *
+ * javadepchecker is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package javadepchecker;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.Properties;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+/**
+ * Main Class of javadepchecker
+ * Gentoo Java Utility to scan class files for unneeded dependencies and 
+ * ophaned class files
+ *
+ * @author Petteri Räty <betelgeuse@gentoo.org>
+ * @author Serkan Kaba <serkan@gentoo.org>
+ * @author William L. Thomson Jr., <wlt@o-sinc.com>
+ */
+public final class Main extends ClassVisitor {
+
+    static private String image = "";
+    private Set<String> mDeps = new HashSet<>();
+    private Set<String> mCurrent = new HashSet<>();
+
+    /**
+     * Empty Constructor, sets ASM op code version
+     */
+    public Main() {
+        super(Opcodes.ASM5);
+    }
+
+    /**
+     * Get jar names from the Gentoo package and store in a collection
+     *
+     * @param pkg Gentoo package name
+     * @return a collection of jar names
+     */
+    private static Collection<String> getPackageJars(String pkg) {
+        ArrayList<String> jars = new ArrayList<>();
+        try {
+            Process p = Runtime.getRuntime().exec("java-config -p " + pkg);
+            p.waitFor();
+            BufferedReader in;
+            in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+            String output = in.readLine();
+            if (output!=null/* package somehow missing*/ &&
+                !output.trim().isEmpty()) {
+                jars.addAll(Arrays.asList(output.split(":")));
+            }
+        } catch (InterruptedException | IOException ex) {
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        return jars;
+    }
+
+    /**
+     * Scan jar for classes to be processed by ASM
+     *
+     * @param jar jar file to be processed
+     * @throws IOException
+     */
+    public void processJar(JarFile jar) throws IOException {
+        Collections.list(jar.entries())
+                   .stream()
+                   .filter((JarEntry entry) -> (!entry.isDirectory() && entry.getName().endsWith("class")))
+                   .forEach((JarEntry entry) -> {
+            InputStream is = null;
+            try {
+                Main.this.mCurrent.add(entry.getName());
+                is = jar.getInputStream(entry);
+                new ClassReader(is).accept(Main.this, 0);
+            } catch (IOException ex) {
+                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+            } finally {
+                try {
+                    if(is!=null)
+                        is.close();
+                } catch (IOException ex) {
+                    Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+                }
+            }
+        });
+    }
+
+    /**
+     * Check if a dependency is needed by a given package
+     *
+     * @param pkg Gentoo package name
+     * @param deps collection of dependencies for the package
+     * @return boolean if the dependency is needed or not
+     * @throws IOException
+     */
+    private static boolean depNeeded(String pkg,
+                                     Collection<String> deps) throws IOException {
+        Collection<String> jars = getPackageJars(pkg);
+
+        // We have a virtual with VM provider here
+        if (jars.isEmpty()) {
+            return true;
+        }
+        for (String jarName : jars) {
+            JarFile jar = new JarFile(jarName);
+            for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) {
+                String name = e.nextElement().getName();
+                if (deps.contains(name)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check for orphaned class files not owned by any package in dependencies
+     *
+     * @param pkg Gentoo package name
+     * @param deps collection of dependencies for the package
+     * @return boolean if the dependency is found or not
+     * @throws IOException
+     */
+    private static boolean depsFound(Collection<String> pkgs,
+                                     Collection<String> deps) throws IOException {
+        boolean found = true;
+        Collection<String> jars = new ArrayList<>();
+        String[] bootClassPathJars = System.getProperty("sun.boot.class.path").split(":");
+        // Do we need "java-config -r" here?
+        for (String jar : bootClassPathJars) {
+            File jarFile = new File(jar);
+            if (jarFile.exists()) {
+                jars.add(jar);
+            }
+        }
+        pkgs.forEach((String pkg) -> {
+            jars.addAll(getPackageJars(pkg));
+        });
+
+        if (jars.isEmpty()) {
+            return false;
+        }
+        ArrayList<String> jarClasses = new ArrayList<>();
+        jars.forEach((String jarName) -> {
+            try {
+                JarFile jar = new JarFile(jarName);
+                Collections.list(jar.entries()).forEach((JarEntry entry) -> {
+                    jarClasses.add(entry.getName());
+                });
+            } catch (IOException ex) {
+                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+            }
+        });
+        for (String dep : deps) {
+            if (!jarClasses.contains(dep)) {
+                if (found) {
+                    System.out.println("Class files not found via DEPEND in package.env");
+                }
+                System.out.println("\t" + dep);
+                found = false;
+            }
+        }
+        return found;
+    }
+
+    /**
+     * Core method, this one fires off all others and is the one called from
+     * Main. Check this package for unneeded dependencies and orphaned class
+     * files
+     *
+     * @param env
+     * @return 
+     */
+    private static boolean checkPkg(File env) {
+        boolean needed = true;
+        boolean found = true;
+        HashSet<String> pkgs = new HashSet<>();
+        Collection<String> deps = null;
+        InputStream is = null;
+
+        try {
+            // load package.env
+            Properties props = new Properties();
+            is = new FileInputStream(env);
+            props.load(is);
+
+            // load package deps, add to hashset if exist
+            String depend = props.getProperty("DEPEND");
+            if(depend!=null &&
+               !depend.isEmpty()) {
+                for (String atom : depend.replaceAll("\"","").split(":")) {
+                    String pkg = atom;
+                    if (atom.contains("@")) {
+                        pkg = atom.split("@")[1];
+                    }
+                    pkgs.add(pkg);
+                }
+            }
+
+            // load package classpath
+            String classpath = props.getProperty("CLASSPATH");
+            if(classpath!=null &&
+               !classpath.isEmpty()) {
+                Main classParser = new Main();
+                for (String jar : classpath.replaceAll("\"","").split(":")) {
+                    if (jar.endsWith(".jar")) {
+                        classParser.processJar(new JarFile(image + jar));
+                    }
+                }
+                deps = classParser.getDeps();
+            }
+
+            for (String pkg : pkgs) {
+                if (!depNeeded(pkg, deps)) {
+                    if (needed) {
+                        System.out.println("Possibly unneeded dependencies found");
+                    }
+                    System.out.println("\t" + pkg);
+                    needed = false;
+                }
+            }
+            found = depsFound(pkgs, deps);
+
+        } catch (IOException ex) {
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+        } finally {
+            try {
+                if(is!=null)
+                    is.close();
+            } catch (IOException ex) {
+                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+            }
+        }
+        return needed && found;
+    }
+
+    /** Main method, parse command line opts, invoke the package checker
+     * @param args the command line arguments
+     * @throws java.io.IOException
+     */
+    public static void main(String[] args) throws IOException {
+        int exit = 0;
+        try {
+            CommandLineParser parser = new PosixParser();
+            Options options = new Options();
+            options.addOption("h", "help", false, "print help");
+            options.addOption("i", "image", true, "image directory");
+            options.addOption("v", "verbose", false, "print verbose output");
+            CommandLine line = parser.parse(options, args);
+            String[] files = line.getArgs();
+            if (line.hasOption("h") || files.length == 0) {
+                HelpFormatter h = new HelpFormatter();
+                h.printHelp("java-dep-check [-i <image>] <package.env>+", options);
+            } else {
+                image = line.getOptionValue("i", "");
+
+                for (String arg : files) {
+                    if (line.hasOption('v')) {
+                        System.out.println("Checking " + arg);
+                    }
+                    if (!checkPkg(new File(arg))) {
+                        exit = 1;
+                    }
+                }
+            }
+        } catch (ParseException ex) {
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        System.exit(exit);
+    }
+
+    /**
+     * Add dependency to deps hashset
+     *
+     * @param dep dependent class name
+     */
+    private void addDep(String dep) {
+        mDeps.add(dep + ".class");
+    }
+
+    /**
+     * Add dependency type to deps hashset
+     *
+     * @param dep dependent class name
+     */
+    private void addDep(Type dep) {
+        if (dep.getSort() == Type.ARRAY) {
+            addDep(dep.getElementType());
+        }
+        if (dep.getSort() == Type.OBJECT) {
+            addDep(dep.getInternalName());
+        }
+    }
+    
+    /**
+     * Get deps not contained in the current hashset
+     *
+     * @return a collection of deps
+     */
+    private Collection<String> getDeps() {
+        ArrayList<String> result = new ArrayList<>();
+        mDeps.stream().filter((s) -> (!mCurrent.contains(s))).forEach((s) -> {
+            result.add(s);
+        });
+        return result;
+    }
+
+    @Override
+    public void visit(int version,
+                      int access,
+                      String name,
+                      String signature,
+                      String superName,
+                      String[] interfaces) {
+        if(superName != null) {
+            addDep(superName);
+        }
+        for (String iface : interfaces) {
+            addDep(iface);
+        }
+    }
+
+    @Override
+    public FieldVisitor visitField(int access,
+                                   String name,
+                                   String desc,
+                                   String signature,
+                                   Object value) {
+        addDep(Type.getType(desc));
+        return null;
+    }
+
+    @Override
+    public MethodVisitor visitMethod(int access,
+                                     String name,
+                                     String desc,
+                                     String signature,
+                                     String[] exceptions) {
+        for (Type param : Type.getArgumentTypes(desc)) {
+            addDep(param);
+        }
+
+        if (exceptions != null) {
+            for (String exception : exceptions) {
+                addDep(exception);
+            }
+        }
+        addDep(Type.getReturnType(desc));
+        return new MethodVisitor(Opcodes.ASM5) {
+            @Override
+            public void visitLocalVariable(String name,
+                                           String desc,
+                                           String signature,
+                                           Label start,
+                                           Label end,
+                                           int index) {
+                addDep(Type.getType(desc));
+            }
+
+            @Override
+            public void visitFieldInsn(int opcode,
+                                       String owner,
+                                       String name,
+                                       String desc) {
+                addDep(Type.getObjectType(owner));
+                addDep(Type.getType(desc));
+            }
+
+            @Override
+            public void visitMethodInsn(int opcode,
+                                        String owner,
+                                        String name,
+                                        String desc,
+                                        boolean itf) {
+                addDep(Type.getObjectType(owner));
+            }
+
+            @Override
+            public AnnotationVisitor visitParameterAnnotation(int parameter,
+                                                              String desc,
+                                                              boolean visible) {
+                return Main.this.visitAnnotation(desc, visible);
+            }
+        };
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+        addDep(Type.getType(desc));
+        return null;
+    }
+}
diff --git a/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild b/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild
new file mode 100644
index 000000000000..54d806570f99
--- /dev/null
+++ b/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Dependency checker"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP="
+	dev-java/commons-cli:1
+	dev-java/asm:3"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+JAVA_GENTOO_CLASSPATH="asm-3,commons-cli-1"
+
+src_unpack() {
+	cp "${FILESDIR}/Main-${PV}.java" Main.java || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main javadepchecker.Main
+}
diff --git a/dev-java/java-dep-check/java-dep-check-0.4.ebuild b/dev-java/java-dep-check/java-dep-check-0.4.ebuild
new file mode 100644
index 000000000000..b9acd52392e4
--- /dev/null
+++ b/dev-java/java-dep-check/java-dep-check-0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Dependency checker"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="
+	dev-java/commons-cli:1
+	dev-java/asm:4"
+RDEPEND=">=virtual/jre-1.8
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.8
+	${COMMON_DEP}"
+
+JAVA_GENTOO_CLASSPATH="asm-4,commons-cli-1"
+
+src_unpack() {
+	cp "${FILESDIR}/Main-${PV}.java" Main.java || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main javadepchecker.Main
+}
diff --git a/dev-java/java-dep-check/metadata.xml b/dev-java/java-dep-check/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/java-dep-check/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/java-getopt-1.0.14 b/dev-java/java-getopt-1.0.14
deleted file mode 100644
index d7c41f649e68..000000000000
--- a/dev-java/java-getopt-1.0.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java command line option parser
-EAPI=5
-HOMEPAGE=http://www.urbanophile.com/arenn/hacking/download.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=http://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.14.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=85208ad4b9a4c677ce17f6eadd272083
diff --git a/dev-java/java-getopt/Manifest b/dev-java/java-getopt/Manifest
new file mode 100644
index 000000000000..1574036b21ef
--- /dev/null
+++ b/dev-java/java-getopt/Manifest
@@ -0,0 +1,3 @@
+DIST java-getopt-1.0.14.tar.gz 45561 BLAKE2B d82234c2e49f6f556ddabd38cd283a63c2f6365ed23c227c42c48c75d834ce7de6a3fdc84c890762f05a63d4e09bab7e584f1cb9d17ef0a4784cd36c62f3128e SHA512 611a08b60ed787eaa1bf6bf6ce45075ed2bd75d7eead941879e019ef12cb4fcd7a196d0e64e9a75adaf35240c872f14590d7afa4e2dda03016fa970bd2e2dc25
+EBUILD java-getopt-1.0.14.ebuild 862 BLAKE2B f84c185cbe343483e770700b9dd783fd2dffde9ceae47079009030249145bf73ff8012869309eac9b16a4b092b5fa22230d350eb73a75ad8c660a5a78c221dc8 SHA512 132efc32f672e5e5f0c0404016f64a64fcab479e23284d44f919597f06aeeec8ac77b315820c97034d58dfc66e480a2c30e59932dd3058273bdf0ae4421d7d7e
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/java-getopt/java-getopt-1.0.14.ebuild b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
new file mode 100644
index 000000000000..a7baab751965
--- /dev/null
+++ b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java command line option parser"
+HOMEPAGE="http://www.urbanophile.com/arenn/hacking/download.html"
+SRC_URI="http://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	mv gnu/getopt/buildx.xml build.xml || die
+}
+
+src_install() {
+	java-pkg_dojar build/lib/gnu.getopt.jar
+	dodoc gnu/getopt/COPYING.LIB gnu/getopt/ChangeLog gnu/getopt/README || die
+	use doc && java-pkg_dojavadoc build/api
+	use source && java-pkg_dosrc gnu
+}
diff --git a/dev-java/java-getopt/metadata.xml b/dev-java/java-getopt/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/java-getopt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/java-sdk-docs-1.8.0.172 b/dev-java/java-sdk-docs-1.8.0.172
deleted file mode 100644
index 1eeb74f613a8..000000000000
--- a/dev-java/java-sdk-docs-1.8.0.172
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
-EAPI=6
-HOMEPAGE=http://download.oracle.com/javase/8/docs/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=oracle-java-documentation-8
-RESTRICT=fetch
-SLOT=1.8
-SRC_URI=jdk-8u172-docs-all.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=417814d8953c535e88d2b4dc12178ea0
diff --git a/dev-java/java-sdk-docs-9.0.4 b/dev-java/java-sdk-docs-9.0.4
deleted file mode 100644
index 1120d791b6b0..000000000000
--- a/dev-java/java-sdk-docs-9.0.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
-EAPI=6
-HOMEPAGE=https://docs.oracle.com/javase/9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=oracle-java-documentation-9
-RESTRICT=fetch
-SLOT=9
-SRC_URI=jdk-9.0.4_doc-all.zip
-_md5_=505fa318939ea09fe21ad0826ddb798e
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
new file mode 100644
index 000000000000..73c60c6f432d
--- /dev/null
+++ b/dev-java/java-sdk-docs/Manifest
@@ -0,0 +1,5 @@
+DIST jdk-8u172-docs-all.zip 93491812 BLAKE2B 7d670aa054a73c9711b78b6094a8e4f8c8b8b774543a9b067acce7cb2e572d6536ad0c525d1ac112f2585a648b3209ac63df0d3ac85bf8c23ec91937b70add01 SHA512 6b1157822fd7d25bd4bb56394e8243e3e315ce772a908bb05fe260b5f1d6506f336b8afca6febef7caafcbf9463b4713fb27b657726ee4b6578d2e6732b9a2fe
+DIST jdk-9.0.4_doc-all.zip 70500089 BLAKE2B 549da2c6baf1b39082f05d42d0fd02f7682a765c1d43a605063b155b3b3e2e20053b4044a238afb41c758700efa5de9ec53c29e2e8be1d682c2e9e7b221c0875 SHA512 7d8b40499a0ea91ac922c6916b19a061b39e73e54e123a943fcaa75fcfe66672ad445dbd789c2c9448c8cee0e7f72974ca6ad53bcaa5667547feca5791dab92b
+EBUILD java-sdk-docs-1.8.0.172.ebuild 1444 BLAKE2B ac3a3567183b958e4c4d56ba8ea0e61ca844ffecd76d19f536f3fb1598f987173fe3075ad2b015f2763406f59700cdf5b82b2e33ded6d49f917084b83d591592 SHA512 208368ba6143f60dbcce2d7e0098be90294470d5c539a69c3003ca9e514e35755ec6c3f50b4dec590fe11eb77ca3b7e2f082530e32b11c3146eb0a2a11e4cbe9
+EBUILD java-sdk-docs-9.0.4.ebuild 1277 BLAKE2B 0e2610b8541e0470b9ca4d093ffdf46dd244694b13f23aa5ad7e139a9b5085795efba9553bf1cbfe68b64ff1bed3b8eec51b27c1f106da69b964aaa17fb8d84e SHA512 7772dd3232e6ed790570c82cf23a67006944cdd7676d4e4d6ce69e19ee9f8f3c4cf4fc18cff85bb68c0f50173bc92bb5442ac0050b73aebe662b819e7866d532
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.172.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.172.ebuild
new file mode 100644
index 000000000000..1791bdf62037
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.172.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk8-doc-downloads-2133158.html"
+
+[[ "$(get_version_component_range 4)" == 0 ]] \
+	|| MY_PV_EXT="u$(get_version_component_range 4)"
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="http://download.oracle.com/javase/8/docs/"
+SRC_URI="jdk-${MY_PV}-docs-all.zip"
+LICENSE="oracle-java-documentation-8"
+SLOT="1.8"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+RESTRICT="fetch"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+	einfo "Please download ${SRC_URI} from"
+	einfo "${DOWNLOAD_URL}"
+	einfo "by agreeing to the license and place it in your distfiles directory."
+	einfo ""
+	einfo "If you find the file on the download page replaced with a higher"
+	einfo "version, please report it in bug #67266 (link below)."
+	einfo ""
+	einfo "If emerge fails because of a checksum error, it is possible that"
+	einfo "the upstream release changed without renaming. Try downloading the file"
+	einfo "again (or a newer revision if available). Otherwise report this to"
+	einfo "https://bugs.gentoo.org/67266 and we will make a new revision."
+}
+
+src_install() {
+	insinto /usr/share/doc/${PN}-${SLOT}/html
+	doins -r index.html */
+}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
new file mode 100644
index 000000000000..35edb42957fb
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk9-doc-downloads-3850606.html"
+
+SLOT="${PV%%.*}"
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="https://docs.oracle.com/javase/${SLOT}"
+SRC_URI="jdk-${PV}_doc-all.zip"
+LICENSE="oracle-java-documentation-${SLOT}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+RESTRICT="fetch"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+	einfo "Please download ${SRC_URI} from"
+	einfo "${DOWNLOAD_URL}"
+	einfo "by agreeing to the license and place it in your distfiles directory."
+	einfo ""
+	einfo "If you find the file on the download page replaced with a higher"
+	einfo "version, please report it in bug #67266 (link below)."
+	einfo ""
+	einfo "If emerge fails because of a checksum error, it is possible that"
+	einfo "the upstream release changed without renaming. Try downloading the file"
+	einfo "again (or a newer revision if available). Otherwise report this to"
+	einfo "https://bugs.gentoo.org/67266 and we will make a new revision."
+}
+
+src_install() {
+	insinto /usr/share/doc/${PN}-${SLOT}/html
+	doins -r index.html */
+}
diff --git a/dev-java/java-sdk-docs/metadata.xml b/dev-java/java-sdk-docs/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/java-sdk-docs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/java-service-wrapper-3.5.25-r1 b/dev-java/java-service-wrapper-3.5.25-r1
deleted file mode 100644
index e290dc8fbe52..000000000000
--- a/dev-java/java-service-wrapper-3.5.25-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A wrapper that makes it possible to install a Java Application as daemon
-EAPI=5
-HOMEPAGE=http://wrapper.tanukisoftware.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=tanuki-community
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://wrapper.tanukisoftware.org/download/3.5.25/wrapper_3.5.25_src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=de5d68acf18bde177cdac36fd88b917c
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
new file mode 100644
index 000000000000..14cc5924947f
--- /dev/null
+++ b/dev-java/java-service-wrapper/Manifest
@@ -0,0 +1,6 @@
+AUX java-service-wrapper-3.5.25-as-needed.patch 6957 BLAKE2B 9e6aa50657ad0833ea4adc08bd5f6b71695df6369a12d0a0c91f62d587cb7e619a8337cfe6c34e5d278eed5bf5e060355751b2b61c891bdabd59b142865893b1 SHA512 f45dcda4ff87b98cf60d3db5bbd98b6f0dfced2d784076d49f0e29997b25f9f3eefe8b7d3410ff2df3e8cff11910a226996763982193d44b5c99aa03ade8aaef
+AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1256 BLAKE2B d1da7d6f8f195d690d687f4d1f48f302b45dd2a12612c75fcce5fae3881469a1dd237baedef5846861deb4c8c697633de3b24598f62ca650deb339f6f2dbb219 SHA512 907f07bcf3debd45d07639ea8b60c21be1190cb7939b28c05eaebdd8713e818402d8da9722be09a7d20fb5598a44d0682bb32a6897b97ef7faf2bd74ca9f8824
+AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227d2eb0edede37650bb8dfa1c7a8e9a18109f34eabfb5ddc7b9db67c2922403b0448997cc96d8e83c96b62974b25da22a624d91dc500cf SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91
+DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
+EBUILD java-service-wrapper-3.5.25-r1.ebuild 1476 BLAKE2B 8e3b5226a58ba3c6eda8edb566460b34744edfb11abb31f768ff949e7a4759660c9e3bfa578bb2c68c62a183ba108052635049f8725a011c6f1f1dfd1fccd3ba SHA512 ed5b5d2fdb8de0f97e617dc387fd42ea9e310841bb45dc5c17b38057743ed91a6b862b83aaaaaded5d5a4a85ba67ca30fbc1364c55f8c94428f51bb33122d10e
+MISC metadata.xml 639 BLAKE2B 835791890bc6ee84347d2fd82601698b2c1c516b46971df7b567f2000b41ed065bc3bcf3fafb1a97a15ae6ef3c37397580079de48ca56523779f055a99eea8d6 SHA512 4df27ebd9d7503edc1c62e311dbf564bb991963820753df523459baf8e0d65e7464e6b42dbbe1ee6649791c66dae552991eed3cfa1e8e2d100ffe512a8e0df6f
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
new file mode 100644
index 000000000000..d956ff0b0043
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
@@ -0,0 +1,156 @@
+
+--- src/c/Makefile-linux-armel-32.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-armel-32.make	2014-07-21 10:50:11.000000000 +0200
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+ 	tr ' ' '\012' < .deps/$(*F).pp \
+ 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+--- src/c/Makefile-linux-armhf-32.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-armhf-32.make	2014-07-21 10:51:05.000000000 +0200
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+ 	tr ' ' '\012' < .deps/$(*F).pp \
+ 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+--- src/c/Makefile-linux-ia-64.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-ia-64.make	2014-07-21 10:51:37.000000000 +0200
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+ 	tr ' ' '\012' < .deps/$(*F).pp \
+ 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+--- src/c/Makefile-linux-ppc-32.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-ppc-32.make	2014-07-21 10:52:05.000000000 +0200
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+ 	tr ' ' '\012' < .deps/$(*F).pp \
+ 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+--- src/c/Makefile-linux-ppc-64.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-ppc-64.make	2014-07-21 10:52:45.000000000 +0200
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+ 	tr ' ' '\012' < .deps/$(*F).pp \
+ 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+--- src/c/Makefile-linux-x86-32.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-x86-32.make	2014-07-21 10:53:39.000000000 +0200
+@@ -36,17 +36,17 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ 
+ testsuite: $(testsuite_SOURCE)
+-	$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+ 	tr ' ' '\012' < .deps/$(*F).pp \
+ 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+--- src/c/Makefile-linux-x86-64.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-x86-64.make	2014-07-21 10:54:16.000000000 +0200
+@@ -36,17 +36,17 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ 
+ testsuite: $(testsuite_SOURCE)
+-	$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c 
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+ 	tr ' ' '\012' < .deps/$(*F).pp \
+ 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
new file mode 100644
index 000000000000..34e94bb77ed6
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
@@ -0,0 +1,25 @@
+|Original version of this patch by Ralph Sennhauser <sera@gentoo.org>
+|Updated version for 3.5.25 by tomboy64 <tomboy64@sina.cn>
+|
+|Added in 3.5.4, make false default for Gentoo
+|
+|* Add a new wrapper.java.command.resolve property to control whether or not the
+|  Wrapper tries to resolve any symbolic links in the Java command, specified
+|  with the wrapper.java.command property.  Historically, it has always done so,
+|  but some jvm started applications like run-java-tool on Gentoo will fail if
+|  it is run directly as they have a check to make sure it is launched via a
+|  symbolic link.
+|
+
+--- src/c/wrapper.c.old	2014-07-21 09:12:55.000000000 +0200
++++ src/c/wrapper.c	2014-07-21 09:13:22.000000000 +0200
+@@ -4908,7 +4908,7 @@
+     if (!path) {
+         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);
+     } else {
+-        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE);
++        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE);
+         if (replacePath == TRUE) {
+             free(*para);
+             *para = malloc((_tcslen(path) + 1) * sizeof(TCHAR));
+
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch
new file mode 100644
index 000000000000..d279cdf0f4ea
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch
@@ -0,0 +1,12 @@
+diff -u -r wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make
+--- wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make	2014-09-06 00:06:05.730644375 +0200
++++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make	2014-09-06 00:06:51.130013387 +0200
+@@ -23,7 +23,7 @@
+ LIB = ../../lib
+ TEST = ../../test
+ 
+-all: init wrapper libwrapper.so testsuite
++all: init wrapper libwrapper.so
+ 
+ clean:
+ 	rm -f *.o
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
new file mode 100644
index 000000000000..bb42be142af4
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="wrapper"
+MY_P="${MY_PN}_${PV}_src"
+DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
+HOMEPAGE="http://wrapper.tanukisoftware.org/"
+SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="tanuki-community"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.4"
+DEPEND="
+	>=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch
+	"${FILESDIR}"/${P}-testsuite.patch
+)
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+
+	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
+}
+
+src_compile() {
+	tc-export CC
+	BITS="32"
+	use amd64 && BITS="64"
+	eant -Dbits=${BITS} jar compile-c
+	if use doc; then
+		ejavadoc -d api -sourcepath src/java/ -subpackages org \
+			|| die "javadoc	failed"
+	fi
+}
+
+src_test() {
+	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test
+}
+
+src_install() {
+	java-pkg_dojar lib/wrapper.jar
+	java-pkg_doso lib/libwrapper.so
+
+	dobin bin/wrapper
+	dodoc README*.txt || die
+	dodoc doc/revisions.txt || die
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/java-service-wrapper/metadata.xml b/dev-java/java-service-wrapper/metadata.xml
new file mode 100644
index 000000000000..20395dafad7c
--- /dev/null
+++ b/dev-java/java-service-wrapper/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		The Java Service Wrapper is an application which has evolved out of a desire
+		to solve a number of problems common to many Java applications:
+
+		* Run as a Windows Service or Unix Daemon
+		* Application Reliability
+		* Standard, Out of the Box Scripting
+		* On Demand Restarts
+		* Flexible Configuration
+		* Ease Application Installations
+		* Logging
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/javacc-5.0-r3 b/dev-java/javacc-5.0-r3
deleted file mode 100644
index a963a58c2772..000000000000
--- a/dev-java/javacc-5.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/junit:0 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Compiler Compiler - The Java Parser Generator
-EAPI=6
-HOMEPAGE=https://javacc.java.net/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-java/junit:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3aadeb6eeb7c37040354e22335019fa0
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
new file mode 100644
index 000000000000..3972d994a225
--- /dev/null
+++ b/dev-java/javacc/Manifest
@@ -0,0 +1,4 @@
+AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
+DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
+EBUILD javacc-5.0-r3.ebuild 1394 BLAKE2B 473d5547e934a2bbb07f11b93c473288bb86f47fa9fd1e559b831aaeba14588c6e8c19987722928924e35c4911aac3dbb2c0246f3d090487bf88220307d50f1d SHA512 8d9a3d455ee51ab568e6b91f1aed6160abad1d93f45e8edbe99bedbcc24de12c567d3b1f7f5730789cd5fd5ec987dcd4559e4240df72494bbdd01191e04eced6
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/javacc/files/javacc-4.0-javadoc.patch b/dev-java/javacc/files/javacc-4.0-javadoc.patch
new file mode 100644
index 000000000000..41093de26566
--- /dev/null
+++ b/dev-java/javacc/files/javacc-4.0-javadoc.patch
@@ -0,0 +1,14 @@
+diff -ru javacc/build.xml javacc-patched/build.xml
+--- javacc/build.xml	2003-08-11 15:16:01.000000000 -0400
++++ javacc-patched/build.xml	2005-06-25 00:37:53.000000000 -0400
+@@ -150,5 +150,10 @@
+   	<arg line="${version}" />
+   </exec>
+   </target>
++   <target name="javadoc" depends="compile">
++      <javadoc destdir="doc/api" source="1.4">
++      	<packageset dir="src"/>
++      </javadoc>
++   </target>
+ 
+ </project>
diff --git a/dev-java/javacc/javacc-5.0-r3.ebuild b/dev-java/javacc/javacc-5.0-r3.ebuild
new file mode 100644
index 000000000000..455204cb8ba3
--- /dev/null
+++ b/dev-java/javacc/javacc-5.0-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.java.net/"
+SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+CDEPEND="dev-java/junit:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (	dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-javadoc.patch
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="junit"
+
+src_prepare() {
+	default
+
+	rm -v lib/junit*/*.jar || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "bin/lib/${PN}.jar"
+
+	if use doc; then
+		java-pkg_dohtml -r www/*
+		java-pkg_dojavadoc doc/api
+	fi
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/*
+
+	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc || die
+	doenvd "${T}"/22javacc
+
+	echo "export VERSION=${PV}" > "${T}"/pre || die
+
+	local launcher
+	for launcher in javacc jjdoc jjtree; do
+		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
+	done
+
+	einstalldocs
+}
diff --git a/dev-java/javacc/metadata.xml b/dev-java/javacc/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/javacc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/javacsv-2.1 b/dev-java/javacsv-2.1
deleted file mode 100644
index b5f51b0293ab..000000000000
--- a/dev-java/javacsv-2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java library for reading and writing CSV and plain delimited text files
-EAPI=5
-HOMEPAGE=https://www.csvreader.com/java_csv.php
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/javacsv/javacsv2.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=25c76f0667c0e65afb56e8887f9208f1
diff --git a/dev-java/javacsv/Manifest b/dev-java/javacsv/Manifest
new file mode 100644
index 000000000000..5823f9347d66
--- /dev/null
+++ b/dev-java/javacsv/Manifest
@@ -0,0 +1,3 @@
+DIST javacsv2.1.zip 89333 BLAKE2B b13970211056f8c3dbd96a358fe945d3a0221be2fa57a60a7b196b9ba15721445312be2b4a97015cd7609d3cce9c77936b2e899aeef6fa3f5afe205ebf70557b SHA512 beefeae1306163a21d4237dc3cccde9ffba0435fa898d95a77f33ec45f383e81e7a804d33918ba2a47fb004ed6f8734b8567d11a3ad63d1be3f9d1fa53e153ee
+EBUILD javacsv-2.1.ebuild 878 BLAKE2B 41e84c7e2e52672680cebcc18e621dcde46f322d8ab7dac75132b0f6e7e508e162a33b8ce1af06d36b2b04d5d32cdd89faabd8ec407e84acd66f25cbf516f7e5 SHA512 33cd6033ddc54bffc3f864ac26569f5799df58ca4972d0ced6674b79002eb371c08b6767e49a4467057b535d0d398362a832984bcb54a2619e1120ba6baadff5
+MISC metadata.xml 425 BLAKE2B a0eec617af8311b6dbe9f1faf313c9b22687b68ad97d922394d5803f02ae0ad29882aa0158fd3478034387d97ed82f131d094a626e837b01dc7c8f5a2756b471 SHA512 b67be9d1ae7101c8c600a86d93cf6d4db67a995293da28df016ab2da205465fcb05787f8a32474496e9f0fb950d9c0585bee842c2351e2a1da98145d7906b6dd
diff --git a/dev-java/javacsv/javacsv-2.1.ebuild b/dev-java/javacsv/javacsv-2.1.ebuild
new file mode 100644
index 000000000000..a72dd3b86e3c
--- /dev/null
+++ b/dev-java/javacsv/javacsv-2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+RESTRICT="test"
+
+DESCRIPTION="Java library for reading and writing CSV and plain delimited text files"
+HOMEPAGE="https://www.csvreader.com/java_csv.php"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/}.zip"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	rm -rfv doc "${PN}".jar || die "error cleaning up"
+	mv -v src/AllTests.java . || die "error moving tests"
+}
+
+EANT_BUILD_TARGET="dist"
+EANT_DOC_TARGET=""
+
+src_compile() {
+	java-pkg-2_src_compile
+	use doc && eant -f "${S}"/javadoc.xml
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc src
+}
diff --git a/dev-java/javacsv/metadata.xml b/dev-java/javacsv/metadata.xml
new file mode 100644
index 000000000000..238d27a99f06
--- /dev/null
+++ b/dev-java/javacsv/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">javacsv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/javacup-0.11b_p20151001 b/dev-java/javacup-0.11b_p20151001
deleted file mode 100644
index d1b1ec0c5163..000000000000
--- a/dev-java/javacup-0.11b_p20151001
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/ant-core-1.7.0:0 >=dev-java/jflex-1.6.1:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=CUP Parser Generator for Java
-EAPI=5
-HOMEPAGE=http://www2.cs.tum.edu/projects/cup/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=80c3668002f51409b0bf1d207c28b137
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
new file mode 100644
index 000000000000..4bc1966ed590
--- /dev/null
+++ b/dev-java/javacup/Manifest
@@ -0,0 +1,4 @@
+AUX javacup-0.11b_beta20150326-build-xml-svn.patch 1385 BLAKE2B 43ed5b0c75aa308f2301d8e7d633ca69689a1772a7d8f0f7dbd6f914f1bbf571dcef0ac9fb9cacbe07aaa8c50fca69f0fa95f661314dfab2c16ac96ad50f11f7 SHA512 211157370c61995a05ce45e70941d99da9031174fae2b6e4bbacfdd0c402c451009eb5952a8c3cf8a586402aa138e70733dfd46ce9cf6b5fb680edf65657506c
+DIST java-cup-src-11b-20151001.tar.gz 313405 BLAKE2B 126944916d120dd2150e4a665fea6d216f3d55e002a72b581621df726e4bf0e0664f9ff925189c97162582277c08a4f121e056299ea5a3f5c10cc31d7c0feb9c SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e
+EBUILD javacup-0.11b_p20151001.ebuild 2813 BLAKE2B b4a86c461fbee7fdac2a5413e88c333e01ba4fbbaef709b55db89e0bd976aaf4c740e1df91905857fc339c4686091d2d975478a42f5cf42bb4cd3edd1202cd5d SHA512 cc39cff092b0b3abdc5706ee85a30024d03fcdc2424bc845331bb486f78c192625321b0a44f932bf8e5df9b14d0cc12a482ac7218578ae0c8d8a09d5a78aa4d4
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch
new file mode 100644
index 000000000000..d5a14af3587b
--- /dev/null
+++ b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch
@@ -0,0 +1,44 @@
+From 1a908a86fa6c253332b673ecc98e4ec8dffcdca2 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 8 Aug 2015 14:49:02 +0200
+Subject: [PATCH] No longer query subversion revision
+
+There is not .svn folder shipped anyway
+---
+ build.xml | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 33f0c60..860bbb5 100644
+--- a/build.xml
++++ b/build.xml
+@@ -18,17 +18,6 @@
+     <mkdir dir="${classes}" />
+     <mkdir dir="${dist}" />
+     <loadfile property="cupversion" srcFile="version.txt"/>
+-    <exec executable="svn" outputproperty="svnversion">
+-      <arg value="info"/>
+-      <redirector>
+-	<outputfilterchain>
+-	  <linecontains>
+-	    <contains value="Revision"/>
+-	  </linecontains>
+-	  <deletecharacters chars="Revision: "/>
+-        </outputfilterchain>
+-      </redirector>
+-    </exec>
+   </target>
+ 
+   <property environment="env" />
+@@ -67,7 +56,7 @@
+     <copy todir="${java}"><fileset dir="${src}"></fileset></copy>
+     <replace file="${java}/java_cup/version.java"
+        token="+ version_str"
+-       value='+ "v0.11b ${cupversion} (SVN rev ${svnversion})"'>
++       value='+ "v0.11b ${cupversion}"'>
+     </replace>
+     <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.5" target="1.5">
+       <classpath refid="libraries"/>
+-- 
+2.5.0
+
diff --git a/dev-java/javacup/javacup-0.11b_p20151001.ebuild b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
new file mode 100644
index 000000000000..bd0ec5820966
--- /dev/null
+++ b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV=${PV/_beta/-}
+MY_PV=${MY_PV/_p/-}
+MY_PV=${MY_PV#0.}
+MY_P=java-cup-${MY_PV%-*}
+
+DESCRIPTION="CUP Parser Generator for Java"
+HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
+SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.7
+	>=dev-java/ant-core-1.7.0:0
+	>=dev-java/jflex-1.6.1:0"
+
+RDEPEND=">=virtual/jre-1.7"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" taskdef"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	# Bizarrely, you can't build from the tarball without this patch.
+	epatch "${FILESDIR}"/${PN}-0.11b_beta20150326-build-xml-svn.patch
+
+	# The JFlex package name has changed to lower case.
+	sed -i "s/JFlex\./jflex./g" build.xml || die
+
+	# Remove the bundled JFlex.
+	rm -v bin/JFlex.jar || die
+}
+
+src_configure() {
+	EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core,jflex)
+	java-ant-2_src_configure
+}
+
+src_compile() {
+	# Annoyingly javacup bundles an older version of itself that will
+	# break jflex if that has already been built against this newer
+	# version beforehand. Even more annoyingly, the binary download is
+	# built with Java 8, which isn't much use to us. We therefore use
+	# any installed javacup that is newer than the bundled version where
+	# possible. If this approach turns out to be unworkable then we may
+	# just have to use the bundled jflex for bootstrapping.
+	if has_version \>=${CATEGORY}/${PN}-0.11b:${SLOT}; then
+		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
+		# thanks to has_version above. This is Portage-specific but
+		# showing the warning elsewhere isn't the end of the world.
+		einfo "Bootstrapping with installed javacup ..."
+		EANT_GENTOO_CLASSPATH_EXTRA+=":$(PORTAGE_QUIET=1 java-pkg_getjars --build-only javacup)" eant
+	else
+		einfo "Bootstrapping with bundled javacup ..."
+		EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/bin/${MY_P:0:-1}.jar" eant
+	fi
+
+	# Clean everything except the new jar.
+	rm -rv java/ classes/ || die
+
+	einfo "Recompiling with newly built javacup ..."
+	EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/dist/${MY_P}.jar" eant
+
+	use doc && ejavadoc -sourcepath src/ -d javadoc java_cup
+}
+
+src_install() {
+	java-pkg_newjar dist/${MY_P}.jar
+	java-pkg_newjar dist/${MY_P}-runtime.jar ${PN}-runtime.jar
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar
+	java-pkg_register-ant-task
+
+	dodoc changelog.txt
+	docinto html
+	dodoc manual.html
+
+	use source && java-pkg_dosrc java/*
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/javacup/metadata.xml b/dev-java/javacup/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/javacup/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/javahelp-2.0.05_p20170719 b/dev-java/javahelp-2.0.05_p20170719
deleted file mode 100644
index 85c83bee9bfe..000000000000
--- a/dev-java/javahelp-2.0.05_p20170719
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=The JavaHelp system online help system
-EAPI=6
-HOMEPAGE=https://javaee.github.io/javahelp/
-IUSE=elibc_FreeBSD examples source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/javaee/javahelp/archive/3ca862d8626096770598a3a256886d205246f4a4.tar.gz -> javahelp-2.0.05_p20170719.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fc158ab53b8cc291c77342229e713d76
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
new file mode 100644
index 000000000000..6d07e4e086c8
--- /dev/null
+++ b/dev-java/javahelp/Manifest
@@ -0,0 +1,3 @@
+DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
+EBUILD javahelp-2.0.05_p20170719.ebuild 1653 BLAKE2B 9988bdfdc76560c9178c23380f48b93b9286c0a9a65d87088900a950e48ea3a324ec6650052a7d857f0a2692ef7bcdffb39e197a128f978f130de78fd4363c5a SHA512 40de8fa2d8c38c88cee306a34c3aad81742cc54dc8c2b29a10ae2b928bb13f9502fe165f434d546566f610a1f4616f4812eb13088e708d4b7047a6e1b7f32447
+MISC metadata.xml 624 BLAKE2B 0c06c71189c699c3baf3f8d307f8b077ec8e6e03acb4e0ede09c7537354ab6b7bc043824fa6052be49ccbd6f0debc1cbf2b1e46f42f69a95a1906be6e43639b8 SHA512 bd475a0c41855b34bb58ae6d6a3e2d164abbb97348d809f2fc305e77ca80495bccb4d71ad0aeb0b5586565c71649c6e3775b83c92272dbe8518949864120f484
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
new file mode 100644
index 000000000000..0caa6c36ddf8
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT="3ca862d8626096770598a3a256886d205246f4a4"
+JAVA_PKG_IUSE="examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The JavaHelp system online help system"
+HOMEPAGE="https://javaee.github.io/javahelp/"
+SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+CDEPEND="java-virtuals/servlet-api:2.4"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+_eant() {
+	local \
+		servlet_jar=$(java-pkg_getjar --virtual servlet-api-2.4 servlet-api.jar) \
+		jsp_jar=$(java-pkg_getjar --virtual servlet-api-2.4 jsp-api.jar)
+
+	eant \
+		-f javahelp_nbproject/build.xml \
+		-Dfile.reference.servlet-api.jar="${servlet_jar}" \
+		-Dfile.reference.jsp-api.jar="${jsp_jar}" \
+		-Dservlet-jar="${servlet_jar}" \
+		-Djsp-jar="${jsp_jar}" \
+		-Dservlet-jar-present=true \
+		-Djsp-jar-present=true \
+		-Dtomcat-zip-present=true \
+		${@}
+}
+
+src_compile() {
+	_eant release
+}
+
+#Does not actually run anything
+#src_test() {
+#	_eant test
+#}
+
+src_install() {
+	java-pkg_dojar javahelp_nbproject/dist/lib/*.jar
+
+	java-pkg_dolauncher jhsearch \
+		--main com.sun.java.help.search.QueryEngine
+	java-pkg_dolauncher jhindexer \
+		--main com.sun.java.help.search.Indexer
+
+	use source && java-pkg_dosrc \
+		jhMaster/JSearch/*/com \
+		jhMaster/JavaHelp/src/*/{javax,com}
+
+	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
+}
diff --git a/dev-java/javahelp/metadata.xml b/dev-java/javahelp/metadata.xml
new file mode 100644
index 000000000000..ab6ba2ec6094
--- /dev/null
+++ b/dev-java/javahelp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		The JavaHelp system is an online help system that developers can
+		use to add online help to their Java platform applications. The
+		JavaHelp system is both a JCP specification (JSR 97) and a reference
+		implementation of that specification. The JavaHelp system open source
+		project includes the source to the reference implementation.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/javassist-2.6-r2 b/dev-java/javassist-2.6-r2
deleted file mode 100644
index 7a5980981a1a..000000000000
--- a/dev-java/javassist-2.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Javassist makes Java bytecode manipulation simple
-EAPI=5
-HOMEPAGE=http://www.csg.is.titech.ac.jp/~chiba/javassist/
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=mirror://sourceforge/jboss/javassist-2.6.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4c2caa6cfd54a279ed75cafa487c5ac4
diff --git a/dev-java/javassist-3.18.2 b/dev-java/javassist-3.18.2
deleted file mode 100644
index 781189b047fc..000000000000
--- a/dev-java/javassist-3.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Javassist makes Java bytecode manipulation simple
-EAPI=5
-HOMEPAGE=http://www.csg.is.titech.ac.jp/~chiba/javassist/
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3
-SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_18_2_ga_build.tar.gz -> javassist-3.18.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6ab849afdf27fb0534670ee931656517
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
new file mode 100644
index 000000000000..e89945661460
--- /dev/null
+++ b/dev-java/javassist/Manifest
@@ -0,0 +1,5 @@
+DIST javassist-2.6.zip 1143271 BLAKE2B 05f4e5ebc47420054d4c3d2f77cde33b92e616f3c6740fc030e69b90a697bfbb67be300375d9efc1929a2acfe3493f427222f8a7b1e3137d8bc42f749e51f840 SHA512 8a6da5e2a44cc3bc5b87538a4eda56808d13998d8c9932153f9bb42a1c7844d1a1c7311eb22b0b4ad04649bb7c22156acf851bee638cffbd3328bcef1d2a9f37
+DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
+EBUILD javassist-2.6-r2.ebuild 756 BLAKE2B 42f0ab587abaa592c82da66bca499abca1c726ed39b9588a8cdfe3a74c78a8d1c30982aaaa8c754af53c9728e0f341b4c4ec7b189249ac161ae63bd220c6a738 SHA512 58373704cb574b16a6bae4c2a1788c565fdfc83eaa6774a21f6dcae1814fd0be1c9306209b08d8aec801e5d4e34ef6a0f190cfa6ff410515230ef626c439c50f
+EBUILD javassist-3.18.2.ebuild 978 BLAKE2B ab7462cb7e09179b4ccf61bce4cb9b17188d72a00413777e6d1e0f724919a301bf6c1cd3c673040fa278c65492b101938b7cf9e7d300b7a7d24fe33ec9686d8d SHA512 c6cbd4ce4f9fb179a49a7d2f18bd9f8fc06b66b2ba7d0a3631d681d1802b71d20c54e0e07b4ce47bfb9687afc37afab1c5d03bc8ebc985405423f906495d9f1b
+MISC metadata.xml 376 BLAKE2B 4f31c9b79818bbba1a766800296ce4cdfa81b1a7f10d4c6cf18b59d99e6e59071552a85ae216f6383b2ed5356f433d029be4ce8e9d6f6575adc60b2dfcb8ee07 SHA512 ebd682e2a4913e15c4c93c7f22c10e8f540fb377f2d90f137291bedd1ed7410b5af36215e94543f6e048803bd4475ee69371ff00255f227c4f2df9432f118ba3
diff --git a/dev-java/javassist/javassist-2.6-r2.ebuild b/dev-java/javassist/javassist-2.6-r2.ebuild
new file mode 100644
index 000000000000..01083b6a1505
--- /dev/null
+++ b/dev-java/javassist/javassist-2.6-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Javassist makes Java bytecode manipulation simple"
+SRC_URI="mirror://sourceforge/jboss/${P}.zip"
+HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
+
+LICENSE="MPL-1.1"
+SLOT="2"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+S="${WORKDIR}"
+
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	java-pkg_dohtml *.html
+	use doc && java-pkg_dojavadoc html
+	use source && java-pkg_dosrc src/main/javassist
+	use examples && java-pkg_doexamples sample/*
+}
diff --git a/dev-java/javassist/javassist-3.18.2.ebuild b/dev-java/javassist/javassist-3.18.2.ebuild
new file mode 100644
index 000000000000..9233b253e3ef
--- /dev/null
+++ b/dev-java/javassist/javassist-3.18.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Javassist makes Java bytecode manipulation simple"
+HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
+SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga_build.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="3"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}-rel_${PV//./_}_ga_build"
+
+EANT_DOC_TARGET="javadocs"
+JAVA_ANT_REWRITE_CLASSPATH=y
+EANT_NEEDS_TOOLS="yes"
+
+java_prepare() {
+	find -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	dohtml Readme.html || die
+	use doc && java-pkg_dojavadoc html
+	use source && java-pkg_dosrc src/main/javassist
+	use examples && java-pkg_doexamples sample/*
+}
diff --git a/dev-java/javassist/metadata.xml b/dev-java/javassist/metadata.xml
new file mode 100644
index 000000000000..4369baa505f5
--- /dev/null
+++ b/dev-java/javassist/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jboss</remote-id>
+		<remote-id type="github">jboss-javassist/javassist</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/javatoolkit-0.3.0-r9 b/dev-java/javatoolkit-0.3.0-r9
deleted file mode 100644
index 306a3f510e1d..000000000000
--- a/dev-java/javatoolkit-0.3.0-r9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Collection of Gentoo-specific tools for Java
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/javatoolkit-0.3.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d9c9ad22d5b6e20ed3b2a38b763174d1
diff --git a/dev-java/javatoolkit-0.6.0 b/dev-java/javatoolkit-0.6.0
deleted file mode 100644
index 52a1536f3266..000000000000
--- a/dev-java/javatoolkit-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Collection of Gentoo-specific tools for Java
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.0.tar.bz2
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91fba0e416ce9b2303476265038225ad
diff --git a/dev-java/javatoolkit-9999 b/dev-java/javatoolkit-9999
deleted file mode 100644
index eb1e92df5110..000000000000
--- a/dev-java/javatoolkit-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Collection of Gentoo-specific tools for Java
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=37a1d7946cd012caaa682714db6f5e86
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
new file mode 100644
index 000000000000..73eb27070df2
--- /dev/null
+++ b/dev-java/javatoolkit/Manifest
@@ -0,0 +1,8 @@
+AUX javatoolkit-0.3.0-no-pyxml.patch 1128 BLAKE2B f0bad195ad20c5158f1ec84269b421f8664e46d43cff7548ab65139c9078a933d9039422be6c6c8048baec1ccdd352a9ee97e575940359a95fbc49e2690f70bd SHA512 edb135c6008a24d22bf5116bc73944fddf5a8c44354b80800425457c9c9ee8ef4f55413ca88507c991ed835945bc7d162f6b1b3a30c57fc5f41f278e0c5afe16
+AUX javatoolkit-0.3.0-python2.6.patch 413 BLAKE2B 0520b5ee7ebed18e0c3531d99d89a790d68277003713ff8dc9034adc2f4756b5f514ffcb464eb52ed827ad9d2e61d54ad5e4f401af4e7084c2a41fa591801ff0 SHA512 54df3c263a4b8f42457eb848f3fd79ef83953cfc1069c9229e339a178d2363bdaa636ec11ea49dbf5693c5eafe4d123942bf06f3b77b80b0cd8de2177045952c
+DIST javatoolkit-0.3.0.tar.bz2 16823 BLAKE2B a19307053e0ae4e2415449470c16fced90440fbc9f36d250be3c22a82b901b7f46486c8c7512784f9fe462bf3ab3109ecd7482bff13737a1c7dda57ef0aaf3eb SHA512 e7bbe04e39ab277d0aab89f0eea963c4b0341a336660dab08bfad0510ad1b2b49ce7410a2363bcf9ebad5f8757ee254ddc27af642b4bfb374db52d82cf02c3b1
+DIST javatoolkit-0.6.0.tar.bz2 26009 BLAKE2B d99695ee6dd9df2eef3612418aee4b28acfef06042e633abd05d8876d054c25499f4fcc15f2446adb28c08d4715cf1c1425c358324a7c323604b9f218aba5db2 SHA512 ab17ce59032286af30f238a3f0b37b5ebee2bcfbf4029239fce5f691265f87dfec3a7b29972a3d03aebe79ec22c435c2e37ca0e009fd8d53a58e7424a5e61409
+EBUILD javatoolkit-0.3.0-r9.ebuild 892 BLAKE2B d482eafeef50138a13c9f26c954d64a1dc342bed789c116fdd7d3fe76123d1fbf1c0b052d94a5457bbfb0e0eae4af079c58299b608271bde9399f106da6b0f49 SHA512 a0e91098feee018748081220a78ffbd3e59bc85bba891037a954d4e39e238bed64cbd356c324e90a13823b07bb86a984712db5b6e2dc1e375f138cc7a25b5201
+EBUILD javatoolkit-0.6.0.ebuild 837 BLAKE2B 5421371c1f81b71810b3d64dcf38d7d4d755bb6b852f6a0c65404bec5861c3ce24bcae0e3ab6974e15ab9c2f1a136e6d57a8563a09a6333759a1d7964827cfe0 SHA512 192f7c45fc04250098e460ad3ca08cadcc590d2e02c1f4abf9f36454662af7fb264b5280d67defa326264203f4952104337d6f8734a3ab023287b8258cb8e722
+EBUILD javatoolkit-9999.ebuild 681 BLAKE2B daddf6a3cecd684ea63cdf8c0a56e9e3562c58ef47263289360b63b818c5f2fb323880e13f7ca3b174ef2d9841b1162c8d7c9b9e7ca6a35fb108a2157bf3b25d SHA512 696e6bcdcea76d9b59a65a80a79cf78e1e9634d0a7eba18dd5700edb328b2773399b1dd8c973d19b0aac3c31953015bc0dee37861ee44f551108310fc249997d
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch b/dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch
new file mode 100644
index 000000000000..3218d1702033
--- /dev/null
+++ b/dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch
@@ -0,0 +1,29 @@
+Index: src/py/javatoolkit/xml/DomRewriter.py
+===================================================================
+--- src/py/javatoolkit/xml/DomRewriter.py	(revision 8310)
++++ src/py/javatoolkit/xml/DomRewriter.py	(working copy)
+@@ -78,7 +78,6 @@
+ 
+ 
+     def write(self,stream):
+-        from xml.dom.ext import PrettyPrint
+-        PrettyPrint(self.document,stream)
++        stream.write(self.document.toxml("utf-8"))
+ 
+ # vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:
+Index: src/py/javatoolkit/maven/MavenPom.py
+===================================================================
+--- src/py/javatoolkit/maven/MavenPom.py	(revision 8310)
++++ src/py/javatoolkit/maven/MavenPom.py	(working copy)
+@@ -185,10 +185,7 @@
+                     for build_node in build_nodes:
+                         build_node.appendChild(plugins_node.cloneNode(deep=True))
+ 
+-        from xml.dom.ext import PrettyPrint
+-        self.write = self.__write
+-        PrettyPrint(xmldoc,self)
+-        self.write = None
++        self.__write(xmldoc.toxml("utf-8"))
+ 
+ 
+     def create_element(self,xmldoc,element_name,text_value=None):
diff --git a/dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch b/dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch
new file mode 100644
index 000000000000..d73c94bb6683
--- /dev/null
+++ b/dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch
@@ -0,0 +1,12 @@
+diff -uNr py.orig/maven-helper.py py/maven-helper.py
+--- src/py.orig/maven-helper.py	2009-03-07 10:36:10.000000000 -0430
++++ src/py/maven-helper.py	2009-03-07 10:35:25.000000000 -0430
+@@ -21,7 +21,7 @@
+ import sys
+ import StringIO
+ from optparse import OptionParser, make_option
+-from javatoolkit.maven import MavenPom
++from javatoolkit.maven.MavenPom import MavenPom
+ 
+ __version__ = "$Revision: 1.1 $"[11:-2]
+ 
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
new file mode 100644
index 000000000000..8452d0182b88
--- /dev/null
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 eutils multilib prefix
+
+DESCRIPTION="Collection of Gentoo-specific tools for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-python2.6.patch"
+		"${FILESDIR}/${P}-no-pyxml.patch"
+	)
+	hprefixify src/py/buildparser src/py/findclass setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--install-scripts="${EPREFIX}"/usr/$(get_libdir)/${PN}/bin
+}
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.0.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.0.ebuild
new file mode 100644
index 000000000000..7ba41de80a3c
--- /dev/null
+++ b/dev-java/javatoolkit/javatoolkit-0.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multilib prefix
+
+DESCRIPTION="Collection of Gentoo-specific tools for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+python_prepare_all() {
+	hprefixify src/py/buildparser src/py/findclass setup.py
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--install-scripts="${EPREFIX}"/usr/$(get_libdir)/${PN}/bin
+}
diff --git a/dev-java/javatoolkit/javatoolkit-9999.ebuild b/dev-java/javatoolkit/javatoolkit-9999.ebuild
new file mode 100644
index 000000000000..60ab2e825142
--- /dev/null
+++ b/dev-java/javatoolkit/javatoolkit-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multilib prefix git-r3
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/javatoolkit.git"
+SRC_URI=""
+KEYWORDS=""
+
+DESCRIPTION="Collection of Gentoo-specific tools for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+python_prepare_all() {
+	hprefixify src/py/buildparser src/py/findclass setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--install-scripts="${EPREFIX}"/usr/$(get_libdir)/${PN}/bin
+}
diff --git a/dev-java/javatoolkit/metadata.xml b/dev-java/javatoolkit/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/javatoolkit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/javax-inject-1-r2 b/dev-java/javax-inject-1-r2
deleted file mode 100644
index 9de33000cfc7..000000000000
--- a/dev-java/javax-inject-1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Dependency injection for Java (JSR-330)
-EAPI=5
-HOMEPAGE=https://code.google.com/p/atinject/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=87a123a0652152ec469cccf81591362a
diff --git a/dev-java/javax-inject-1-r3 b/dev-java/javax-inject-1-r3
deleted file mode 100644
index 898d57cdfd5d..000000000000
--- a/dev-java/javax-inject-1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Dependency injection for Java (JSR-330)
-EAPI=6
-HOMEPAGE=https://code.google.com/p/atinject/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar -> javax-inject-1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d792b82e19281f86c431741cfe621ed8
diff --git a/dev-java/javax-inject/Manifest b/dev-java/javax-inject/Manifest
new file mode 100644
index 000000000000..212f2e2702da
--- /dev/null
+++ b/dev-java/javax-inject/Manifest
@@ -0,0 +1,5 @@
+DIST javax-inject-1.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a1619711837e329dc682aae4e204bc1d6733c9e7dac3fa978ddc183bf6d9833f5d0524d31c1ac95db8c81f2648 SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b
+DIST javax.inject-1-sources.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a1619711837e329dc682aae4e204bc1d6733c9e7dac3fa978ddc183bf6d9833f5d0524d31c1ac95db8c81f2648 SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b
+EBUILD javax-inject-1-r2.ebuild 578 BLAKE2B 060433c8a619ebb3d2538115922820f85a1c63d19998a345160a83d07bc1afde5593de92f60f165acab4bd61d9f60f3281e11a9b29b202a2ac54da905e3853de SHA512 411f1bec81aaf28f8f94fdc42325a71c30bf33a57c872b3fd34184a5603866b15c8f17cfce7727f623e8223086babed3654860449e8ed73dadd1555d05f503b5
+EBUILD javax-inject-1-r3.ebuild 554 BLAKE2B b04cb19f7c7faa1f077585385cebef61b56bd28bec8b690408f7b8ebf7c21e0bde328a0b80be666b8d070d9b155e3fa3ea83de0d30cfff164d8260fcbffcef74 SHA512 3b643fe363571bc0d0fcac2e122f671d8d1e7295c9101863c8ffbb9b96e21660baa7f069c2660039692870bc952eba6e45170d7ce8a3b756756943b634d773a4
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/javax-inject/javax-inject-1-r2.ebuild b/dev-java/javax-inject/javax-inject-1-r2.ebuild
new file mode 100644
index 000000000000..146f331c8330
--- /dev/null
+++ b/dev-java/javax-inject/javax-inject-1-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN/-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Dependency injection for Java (JSR-330)"
+HOMEPAGE="https://code.google.com/p/atinject/"
+SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE=""
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/javax-inject/javax-inject-1-r3.ebuild b/dev-java/javax-inject/javax-inject-1-r3.ebuild
new file mode 100644
index 000000000000..92989f88e4ee
--- /dev/null
+++ b/dev-java/javax-inject/javax-inject-1-r3.ebuild
@@ -0,0 +1,22 @@
+# 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
+
+MY_PN="${PN/-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Dependency injection for Java (JSR-330)"
+HOMEPAGE="https://code.google.com/p/atinject/"
+SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/javax-inject/metadata.xml b/dev-java/javax-inject/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/javax-inject/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/javolution-4.0.2-r1 b/dev-java/javolution-4.0.2-r1
deleted file mode 100644
index 8ad1cdef09fa..000000000000
--- a/dev-java/javolution-4.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Solution for Real-Time and Embedded Systems
-EAPI=5
-HOMEPAGE=http://javolution.org
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4
-SRC_URI=http://javolution.org/javolution-4.0.2-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4405b9dc1094e9afc3ffc96c3eec51d8
diff --git a/dev-java/javolution-6.0.0 b/dev-java/javolution-6.0.0
deleted file mode 100644
index e36a056d3776..000000000000
--- a/dev-java/javolution-6.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Solution for Real-Time and Embedded Systems
-EAPI=5
-HOMEPAGE=http://javolution.org
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=6
-SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0.tar.xz https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0-build.xml.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=968a2a8c9811c7e2096307d8bd05290c
diff --git a/dev-java/javolution/Manifest b/dev-java/javolution/Manifest
new file mode 100644
index 000000000000..4db58e6ec72d
--- /dev/null
+++ b/dev-java/javolution/Manifest
@@ -0,0 +1,8 @@
+AUX 4.0.2-fix-java7.patch 1066 BLAKE2B 4ee9987e936138594bab0f033ce684e082271fc0cdb1abc0504cf86f25b2d18f34181ccdde5e45976def75a0b92b74cf9daa43060e30edc76304d266cb93a666 SHA512 11a9e64002486a52ef4aa35ab0d4e5faf370b2d7e6e16534e2429ddc32ce6213075c9190c06e441fdfd15d0a330826c457cc5c26b2a24ce59540c31da8021e66
+AUX javolution-6.0.0-javadoc-fix.patch 788 BLAKE2B 6b8407412e6825fba02b252568ab1c81b50988b185e1d53ca9018e6690f6f3c2976b41950488aa487909d0b085762e7a54877053650d5576ba3d918dde79a3fb SHA512 244d561628e7444c4ab22f8bf3a4241d67aba6dd6ce593f02647e3023c81b36e83322bb7adf40a277e63165246265870de8654e5bd826564e58af37f71fd1824
+DIST javolution-4.0.2-src.zip 556097 BLAKE2B 83f009a60e2b981d488b0b5f95572d3f88f724388b0d09eee10d7f1555379b2b51cf1d2f0f0af74d6944718b7e4b2f609f7866a747c19001edb2466611a6192a SHA512 562e0d364aa6b564341ce197941aaaf51e286712e6b71459ac12eccffbdf1d440f1910826cebf088176562b5dccb865f5d0e652a519814e1357094e253ee2efd
+DIST javolution-6.0.0-build.xml.tar.xz 2696 BLAKE2B 825899c903300dd7d031ab372c85f2824b796305dcf56ea9fc162d883a09f2feedc7498d13b6c803ad43d876dcf3dc457704cf834ff9d48411a67e0bec0a28f9 SHA512 5861e462f24817efec24a784625e240fd4e08117c7b11bf7145f8dae35bb90b0b9fc1e431895ef5d868a1f1d57d96967fd9f39a9b821b51875814f6e118dbdab
+DIST javolution-6.0.0.tar.xz 1308148 BLAKE2B 148bd28e7cd9a0fe16d657cb61fd870e92180f4ad64fb9b1a37fa953309a80c1f3b3b9edbe0c7defa2a3a73ba8d3cf200ee29737769cc31fe87300fbc40f2111 SHA512 86a7a19b13b74cca6ab4871e725a1143d6a1401cc7265390ee66b83f8a9b48f7879b8ccc2d7a3d660e523b64e3779eaf372519ee98268f1bf55df1d7b5a7f034
+EBUILD javolution-4.0.2-r1.ebuild 862 BLAKE2B ce8525edd225cfc331137a736f0629a7baa25a91ffcff2b61ae20c82fb64ca60a9e7cba2ff83562b6684a6747b0af34eacfd9adaa7e76c1697a370342b067f73 SHA512 57633a2a5818ec60a00697ccfae762beb908dceed175e7446fc194bf4e096493aec2e70daa8a7ef9f67f865bf471921736cc882f6d826fca81529d9b6ea7c808
+EBUILD javolution-6.0.0.ebuild 1359 BLAKE2B a03bb5a832d6381b6cea9c55bdbe00d7f4393bb3bb9967d2be57f1c6d9ff844c08cd671459986cd2c53a2adc32a9e55d1f8ea1b9f77246a738ba6f16247d1ac3 SHA512 9719d2ad63d57e897fae5692a08e67cc91da5a89a9e5dfbaf8b9a27dd6dfe07e186791bb4d88ae4ef5d59da58daf80e1a11d4b5da60e31e2d2c8872e97945a4b
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javolution/files/4.0.2-fix-java7.patch b/dev-java/javolution/files/4.0.2-fix-java7.patch
new file mode 100644
index 000000000000..19d2275b8e0c
--- /dev/null
+++ b/dev-java/javolution/files/4.0.2-fix-java7.patch
@@ -0,0 +1,38 @@
+diff --git a/javolution-4.0/src/javolution/io/Struct.java b/javolution-4.0/src/javolution/io/Struct.java
+index 5198030..3def806 100644
+--- a/javolution-4.0/src/javolution/io/Struct.java
++++ b/javolution-4.0/src/javolution/io/Struct.java
+@@ -134,7 +134,7 @@ public class Struct {
+ 	/**
+ 	 * Holds the outer struct if any.
+ 	 */
+-	private Struct _outer;
++	Struct _outer;
+ 
+ 	/**
+ 	 * Holds the byte buffer backing the struct (top struct).
+@@ -145,7 +145,7 @@ public class Struct {
+ 	 * Holds the offset of this struct relative to the outer struct or
+ 	 * to the byte buffer if there is no outer.
+ 	 */
+-	private int _outerOffset;
++	int _outerOffset;
+ 
+ 	/**
+ 	 * Holds the number of bits currently used (for size calculation).
+@@ -155,7 +155,7 @@ public class Struct {
+ 	/**
+ 	 * Holds this struct alignment (largest alignment of its members).
+ 	 */
+-	private int _alignment = 1;
++	int _alignment = 1;
+ 
+ 	/**
+ 	 * Holds the current bit index position (during construction).
+@@ -1607,4 +1607,4 @@ public class Struct {
+ 			}
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}
diff --git a/dev-java/javolution/files/javolution-6.0.0-javadoc-fix.patch b/dev-java/javolution/files/javolution-6.0.0-javadoc-fix.patch
new file mode 100644
index 000000000000..24530ef6b251
--- /dev/null
+++ b/dev-java/javolution/files/javolution-6.0.0-javadoc-fix.patch
@@ -0,0 +1,13 @@
+--- a/core-java/maven-build.xml
++++ b/core-java/maven-build.xml
+@@ -180,9 +180,8 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="javadoc" description="Generates the Javadoc of the application">
+-    <javadoc sourcepath="/var/tmp/portage/dev-java/javolution-6.0.0/work/javolution-6.0.0/core-java/target/colorized" 
++    <javadoc sourcepath="/var/tmp/portage/dev-java/javolution-6.0.0/work/javolution-6.0.0/core-java/" 
+              destdir="${maven.reporting.outputDirectory}/apidocs" 
+-             overview="/var/tmp/portage/dev-java/javolution-6.0.0/work/javolution-6.0.0/core-java/target/colorized/javolution/doc-files/overview.html" 
+              access="protected" 
+              old="false" 
+              verbose="false" 
diff --git a/dev-java/javolution/javolution-4.0.2-r1.ebuild b/dev-java/javolution/javolution-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..80255b4d8561
--- /dev/null
+++ b/dev-java/javolution/javolution-4.0.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
+SRC_URI="http://javolution.org/${P}-src.zip"
+HOMEPAGE="http://javolution.org"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/javolution-${PV%.*}"
+
+EANT_BUILD_TARGET="clean _init_1.5 _compile jar"
+EANT_DOC_TARGET="doc"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PV}*.patch
+}
+
+src_test() {
+	java -jar "${PN}.jar" test || die "test failed"
+}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+
+	dodoc doc/coding_standard.txt
+	dohtml index.html
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc "${S}/src/${PN}"
+}
diff --git a/dev-java/javolution/javolution-6.0.0.ebuild b/dev-java/javolution/javolution-6.0.0.ebuild
new file mode 100644
index 000000000000..c289d27fec73
--- /dev/null
+++ b/dev-java/javolution/javolution-6.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# Documentation generation is broken.
+JAVA_PKG_IUSE="source" # doc
+
+inherit java-pkg-2 java-ant-2 unpacker
+
+DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
+SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz
+	https://dev.gentoo.org/~tomwij/files/dist/${P}-build.xml.tar.xz"
+HOMEPAGE="http://javolution.org"
+
+LICENSE="BSD"
+SLOT="6"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/osgi-core-api:0
+	dev-java/osgi-compendium:0"
+
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+EANT_BUILD_TARGET="package"
+JAVA_PKG_BSFIX_NAME="build.xml maven-build.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="osgi-core-api,osgi-compendium"
+
+src_unpack() {
+	unpacker ${P}.tar.xz
+	cd "${S}" || die
+	unpacker ${P}-build.xml.tar.xz
+}
+
+java_prepare() {
+	# Remove bundled libraries.
+	find . -name '*.jar' -print -delete || die
+	find . -name '*.class' -print -delete || die
+
+	epatch "${FILESDIR}"/${P}-javadoc-fix.patch
+}
+
+src_install() {
+	java-pkg_newjar core-java/target/${PN}-core-java-${PV}.jar
+
+	dohtml index.html
+
+	# Documentation generation is broken.
+	#use doc && java-pkg_dojavadoc core-java/target/site/apidocs
+	use source && java-pkg_dosrc core-java/src/main/java/${PN}
+}
diff --git a/dev-java/javolution/metadata.xml b/dev-java/javolution/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/javolution/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jaxen-1.1.4-r1 b/dev-java/jaxen-1.1.4-r1
deleted file mode 100644
index e9a1ae8e08ba..000000000000
--- a/dev-java/jaxen-1.1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 test? ( dev-java/ant-junit:0 ) >=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java XPath Engine
-EAPI=5
-HOMEPAGE=http://jaxen.org
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=JDOM
-RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.1
-SRC_URI=http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.4-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b5aeecab33f5759c327d8dd6d27c6b46
diff --git a/dev-java/jaxen-1.1.6 b/dev-java/jaxen-1.1.6
deleted file mode 100644
index 63ddeafd9d46..000000000000
--- a/dev-java/jaxen-1.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java XPath Engine
-EAPI=5
-HOMEPAGE=https://github.com/codehaus
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=JDOM
-RDEPEND=dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.1
-SRC_URI=https://repo1.maven.org/maven2/jaxen/jaxen/1.1.6/jaxen-1.1.6-sources.jar -> jaxen-1.1.6.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b510acf3b3cd34f078dd2e29a52e5f83
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
new file mode 100644
index 000000000000..f03dd90bdd34
--- /dev/null
+++ b/dev-java/jaxen/Manifest
@@ -0,0 +1,6 @@
+AUX jaxen-1.1.4_maven1-build.xml 13148 BLAKE2B c5f6421878e732db00b2d5daede8d93cdf1d349c1dfdbb6f83a607d734dc05f0847ce5f8cc86ec1a2be5855d96dfc1a3128c0811846f4a5c7679dd60ad730c12 SHA512 2f3625a2a14066289b20e1118a87168e6cf1ce252becdccbc6f4eeefac446e528298e1e6af7d1304ff9d1d4ee8c394c2cf67f6799d3062091d53cce7ff5b1e42
+DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690 SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031
+DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
+EBUILD jaxen-1.1.4-r1.ebuild 1090 BLAKE2B c28b7b787c6ea71c7d8a571196be139f1808584d79c986f634663d3aaf4d71917706f74a064c5811d9341734bdb47e02a48836379e90bc7fad5f7f4dc489052e SHA512 26f400c5aedc4449ff42ab48f503c28997e45d99cf76b8c8c18dd1378c19cf9df9c032c968faa47e7cc0a5b02410a115002a1f74ca0d1ef2b8aae186b652fbf8
+EBUILD jaxen-1.1.6.ebuild 613 BLAKE2B 7f5654f3b927954ff7511664248e6083fa7b3019e1fa893e356175a27fd40d812f8ef0470fbf9c1cff8906e87048b9d808c9d377f8c7e872662339ce821b2690 SHA512 4bb8b4f2c124f9eac8e96ce99cb32d39dd04c46e6e17b7217f8791d417ce8dc87067d611df50967a2caec67265fdb14aac9d0f28a57c4bfe88f941bd860bf91e
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml b/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml
new file mode 100644
index 000000000000..efbdd2074bb2
--- /dev/null
+++ b/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--build.xml generated by maven from project.xml version 1.1.4
+  on date October 14 2012, time 0755-->
+<project default="jar" name="jaxen" basedir=".">
+  <!--Load local and user build preferences-->
+  <property file="build.properties"></property>
+  <property file="${user.home}/build.properties"></property>
+  <!--Build properties-->
+  <property name="defaulttargetdir" value="${basedir}/target"></property>
+  <property name="libdir" value="${user.home}/.maven/repository"></property>
+  <property name="classesdir" value="${basedir}/target/classes"></property>
+  <property name="testclassesdir" value="${basedir}/target/test-classes"></property>
+  <property name="testreportdir" value="${basedir}/target/test-reports"></property>
+  <property name="distdir" value="${basedir}/dist"></property>
+  <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
+  <property name="final.name" value="jaxen-1.1.4"></property>
+  <property name="proxy.host" value=""></property>
+  <property name="proxy.port" value=""></property>
+  <property name="proxy.username" value=""></property>
+  <property name="proxy.password" value=""></property>
+  <path id="build.classpath">
+    <pathelement location="${libdir}/dom4j/jars/dom4j-1.6.1.jar"></pathelement>
+    <pathelement location="${libdir}/jdom/jars/jdom-1.0.jar"></pathelement>
+    <pathelement location="${libdir}/xml-apis/jars/xml-apis-1.3.02.jar"></pathelement>
+    <pathelement location="${libdir}/xerces/jars/xercesImpl-2.6.2.jar"></pathelement>
+    <pathelement location="${libdir}/xom/jars/xom-1.0.jar"></pathelement>
+    <pathelement location="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar"></pathelement>
+    <pathelement location="${libdir}/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar"></pathelement>
+  </path>
+  <target name="init" description="o Initializes some properties">
+    <condition property="noget">
+      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
+    </condition>
+    <!--Test if JUNIT is present in ANT classpath-->
+    <available property="Junit.present" classname="junit.framework.Test"></available>
+    <!--Test if user defined a proxy-->
+    <condition property="useProxy">
+      <and>
+        <isset property="proxy.host"></isset>
+        <not>
+          <equals trim="true" arg2="" arg1="${proxy.host}"></equals>
+        </not>
+      </and>
+    </condition>
+  </target>
+  <target name="compile" description="o Compile the code" depends="get-deps">
+    <mkdir dir="${classesdir}"></mkdir>
+    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+      <src>
+        <pathelement location="${basedir}/src/java/main"></pathelement>
+      </src>
+      <classpath refid="build.classpath"></classpath>
+    </javac>
+  </target>
+  <target name="jar" description="o Create the jar" depends="compile,test">
+    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
+  </target>
+  <target name="clean" description="o Clean up the generated directories">
+    <delete dir="${defaulttargetdir}"></delete>
+    <delete dir="${distdir}"></delete>
+  </target>
+  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
+    <mkdir dir="dist"></mkdir>
+    <copy todir="dist">
+      <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
+      <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
+    </copy>
+  </target>
+  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
+    <fail message="There were test failures."></fail>
+  </target>
+  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
+    <mkdir dir="${testreportdir}"></mkdir>
+    <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+      <sysproperty key="basedir" value="."></sysproperty>
+      <formatter type="xml"></formatter>
+      <formatter usefile="false" type="plain"></formatter>
+      <classpath>
+        <path refid="build.classpath"></path>
+        <pathelement path="${testclassesdir}"></pathelement>
+        <pathelement path="${classesdir}"></pathelement>
+      </classpath>
+      <batchtest todir="${testreportdir}">
+        <fileset dir="${basedir}/src/java/test">
+          <include name="**/*Test.java"></include>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="junit-present" unless="Junit.present" depends="init">
+    <echo>================================= WARNING ================================</echo>
+    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
+    <mkdir dir="${testclassesdir}"></mkdir>
+    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+      <src>
+        <pathelement location="${basedir}/src/java/test"></pathelement>
+      </src>
+      <classpath>
+        <path refid="build.classpath"></path>
+        <pathelement path="${classesdir}"></pathelement>
+      </classpath>
+    </javac>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="${javadocdir}"></mkdir>
+    <tstamp>
+      <format pattern="2001-yyyy" property="year"></format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Codehaus. All Rights Reserved."></property>
+    <property name="title" value="jaxen 1.1.4 API"></property>
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java/main" packagenames="org.jaxen.*">
+      <classpath>
+        <path refid="build.classpath"></path>
+      </classpath>
+    </javadoc>
+  </target>
+  <target name="get-dep-dom4j.jar" description="o Download the dependency : dom4j.jar" unless="dom4j.jar" depends="init,setProxy,noProxy,get-custom-dep-dom4j.jar">
+    <mkdir dir="${libdir}/dom4j/jars/"></mkdir>
+    <get dest="${libdir}/dom4j/jars/dom4j-1.6.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/dom4j/jars/dom4j-1.6.1.jar"></get>
+    <get dest="${libdir}/dom4j/jars/dom4j-1.6.1.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//dom4j/jars/dom4j-1.6.1.jar"></get>
+  </target>
+  <target name="get-custom-dep-dom4j.jar" if="dom4j.jar" depends="init,setProxy,noProxy">
+    <mkdir dir="${libdir}/dom4j/jars/"></mkdir>
+    <get dest="${libdir}/dom4j/jars/dom4j-1.6.1.jar" usetimestamp="true" ignoreerrors="true" src="${dom4j.jar}"></get>
+  </target>
+  <target name="get-dep-jdom.jar" description="o Download the dependency : jdom.jar" unless="jdom.jar" depends="init,setProxy,noProxy,get-custom-dep-jdom.jar">
+    <mkdir dir="${libdir}/jdom/jars/"></mkdir>
+    <get dest="${libdir}/jdom/jars/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/jdom/jars/jdom-1.0.jar"></get>
+    <get dest="${libdir}/jdom/jars/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//jdom/jars/jdom-1.0.jar"></get>
+  </target>
+  <target name="get-custom-dep-jdom.jar" if="jdom.jar" depends="init,setProxy,noProxy">
+    <mkdir dir="${libdir}/jdom/jars/"></mkdir>
+    <get dest="${libdir}/jdom/jars/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${jdom.jar}"></get>
+  </target>
+  <target name="get-dep-xml-apis.jar" description="o Download the dependency : xml-apis.jar" unless="xml-apis.jar" depends="init,setProxy,noProxy,get-custom-dep-xml-apis.jar">
+    <mkdir dir="${libdir}/xml-apis/jars/"></mkdir>
+    <get dest="${libdir}/xml-apis/jars/xml-apis-1.3.02.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/xml-apis/jars/xml-apis-1.3.02.jar"></get>
+    <get dest="${libdir}/xml-apis/jars/xml-apis-1.3.02.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//xml-apis/jars/xml-apis-1.3.02.jar"></get>
+  </target>
+  <target name="get-custom-dep-xml-apis.jar" if="xml-apis.jar" depends="init,setProxy,noProxy">
+    <mkdir dir="${libdir}/xml-apis/jars/"></mkdir>
+    <get dest="${libdir}/xml-apis/jars/xml-apis-1.3.02.jar" usetimestamp="true" ignoreerrors="true" src="${xml-apis.jar}"></get>
+  </target>
+  <target name="get-dep-xercesImpl.jar" description="o Download the dependency : xercesImpl.jar" unless="xercesImpl.jar" depends="init,setProxy,noProxy,get-custom-dep-xercesImpl.jar">
+    <mkdir dir="${libdir}/xerces/jars/"></mkdir>
+    <get dest="${libdir}/xerces/jars/xercesImpl-2.6.2.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/xerces/jars/xercesImpl-2.6.2.jar"></get>
+    <get dest="${libdir}/xerces/jars/xercesImpl-2.6.2.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//xerces/jars/xercesImpl-2.6.2.jar"></get>
+  </target>
+  <target name="get-custom-dep-xercesImpl.jar" if="xercesImpl.jar" depends="init,setProxy,noProxy">
+    <mkdir dir="${libdir}/xerces/jars/"></mkdir>
+    <get dest="${libdir}/xerces/jars/xercesImpl-2.6.2.jar" usetimestamp="true" ignoreerrors="true" src="${xercesImpl.jar}"></get>
+  </target>
+  <target name="get-dep-xom.jar" description="o Download the dependency : xom.jar" unless="xom.jar" depends="init,setProxy,noProxy,get-custom-dep-xom.jar">
+    <mkdir dir="${libdir}/xom/jars/"></mkdir>
+    <get dest="${libdir}/xom/jars/xom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/xom/jars/xom-1.0.jar"></get>
+    <get dest="${libdir}/xom/jars/xom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//xom/jars/xom-1.0.jar"></get>
+  </target>
+  <target name="get-custom-dep-xom.jar" if="xom.jar" depends="init,setProxy,noProxy">
+    <mkdir dir="${libdir}/xom/jars/"></mkdir>
+    <get dest="${libdir}/xom/jars/xom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${xom.jar}"></get>
+  </target>
+  <target name="get-dep-maven-cobertura-plugin.jar" description="o Download the dependency : maven-cobertura-plugin.jar" unless="maven-cobertura-plugin.jar" depends="init,setProxy,noProxy,get-custom-dep-maven-cobertura-plugin.jar">
+    <mkdir dir="${libdir}/maven-plugins/plugins/"></mkdir>
+    <get dest="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar"></get>
+    <get dest="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//maven-plugins/plugins/maven-cobertura-plugin-1.3.jar"></get>
+  </target>
+  <target name="get-custom-dep-maven-cobertura-plugin.jar" if="maven-cobertura-plugin.jar" depends="init,setProxy,noProxy">
+    <mkdir dir="${libdir}/maven-plugins/plugins/"></mkdir>
+    <get dest="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar" usetimestamp="true" ignoreerrors="true" src="${maven-cobertura-plugin.jar}"></get>
+  </target>
+  <target name="get-dep-maven-findbugs-plugin.jar" description="o Download the dependency : maven-findbugs-plugin.jar" unless="maven-findbugs-plugin.jar" depends="init,setProxy,noProxy,get-custom-dep-maven-findbugs-plugin.jar">
+    <mkdir dir="${libdir}/maven-plugins/plugins/"></mkdir>
+    <get dest="${libdir}/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar"></get>
+    <get dest="${libdir}/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar"></get>
+  </target>
+  <target name="get-custom-dep-maven-findbugs-plugin.jar" if="maven-findbugs-plugin.jar" depends="init,setProxy,noProxy">
+    <mkdir dir="${libdir}/maven-plugins/plugins/"></mkdir>
+    <get dest="${libdir}/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar" usetimestamp="true" ignoreerrors="true" src="${maven-findbugs-plugin.jar}"></get>
+  </target>
+  <target name="get-deps" unless="noget"></target>
+  <target name="setProxy" if="useProxy" depends="init">
+    <!--Proxy settings works only with a JDK 1.2 and higher.-->
+    <echo>Proxy used :</echo>
+    <echo>Proxy host [${proxy.host}]</echo>
+    <echo>Proxy port [${proxy.port}]</echo>
+    <echo>Proxy user [${proxy.username}]</echo>
+    <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}"></setproxy>
+  </target>
+  <target name="noProxy" unless="useProxy" depends="init">
+    <echo>Proxy not used.</echo>
+  </target>
+  <target name="install-maven">
+    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
+    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
+  </target>
+</project>
diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..c9891f11b423
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java XPath Engine"
+HOMEPAGE="http://jaxen.org"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
+
+LICENSE="JDOM"
+SLOT="1.1"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="
+	dev-java/xom:0
+	dev-java/jdom:0
+	dev-java/dom4j:1"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.4"
+
+DEPEND="
+	${CDEPEND}
+	test? ( dev-java/ant-junit:0 )
+	>=virtual/jdk-1.4"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="dom4j-1,jdom,xom"
+EANT_TEST_EXTRA_ARGS="-DJunit.present=true"
+
+java_prepare() {
+	cp -v "${FILESDIR}"/${P}_maven1-build.xml build.xml || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "target/${P}.jar"
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use examples && java-pkg_doexamples src/java/samples
+	use source && java-pkg_dosrc src/java/main/*
+}
diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild b/dev-java/jaxen/jaxen-1.1.6.ebuild
new file mode 100644
index 000000000000..77b073b118a4
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.1.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java XPath Engine"
+HOMEPAGE="https://github.com/codehaus"
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="JDOM"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/dom4j:1
+	dev-java/jdom:0
+	dev-java/xom:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	xom
+	jdom
+	dom4j-1
+"
diff --git a/dev-java/jaxen/metadata.xml b/dev-java/jaxen/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/jaxen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jazzy-0.5.2-r1 b/dev-java/jazzy-0.5.2-r1
deleted file mode 100644
index 46049aab140b..000000000000
--- a/dev-java/jazzy-0.5.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Spell Check API
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/jazzy
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jazzy/jazzy-0.5.2.src.zip -> jazzy-0.5.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=efc31ab48dcfa7a9bb6b44d3b90e6ca5
diff --git a/dev-java/jazzy/Manifest b/dev-java/jazzy/Manifest
new file mode 100644
index 000000000000..813fdc2a5d57
--- /dev/null
+++ b/dev-java/jazzy/Manifest
@@ -0,0 +1,3 @@
+DIST jazzy-0.5.2.zip 235936 BLAKE2B 92495e93fe347e2bfd0c4a9307d00fabc137a65af3dd8b002d097f294e3400ab306ea092ed181244b5bb4b69e46f1a75a76675511511d7799a18d0830fcd14e4 SHA512 6d20f9bc133c03049c4c2a5c8612a52ef9fa09bc7510fb762c1ba9de479b1ce9319633ae2e78d3a1dd63900198d4e2468887113d034d95ba3e05bc631cc2de5e
+EBUILD jazzy-0.5.2-r1.ebuild 754 BLAKE2B 53929ec42dc00eae2d697d075e01620f2c273968689294585347fc8e66d929701cad295fb74a5a87032fcf199c6ce58a2a3d1b4843d80695cf88bbf5ab0948ef SHA512 a1f225de43806718f360e24b629430be1e23fcc983c88c598e6a81e7ff16b884690599e2160d5d5698a44f99c4cc75dea02def0901ab4ebca3e69ea3046c6a3d
+MISC metadata.xml 311 BLAKE2B 28d266904d9a67fd9ad9d868d9501641603779dc753e8272e3fa41690262cebb9bcb7ef733bccdacb72e3e258fde00e069a4d13c857ea5665f944ebe7f069418 SHA512 12012dcf6a6f4fa2d6aeb8ee76d2c8aba28babb31e776c07e85d0277e7fa07c09eb7b0daa6994167b264745d1bc1b4e37df81f9f85e3280b156505bd7ab9682e
diff --git a/dev-java/jazzy/jazzy-0.5.2-r1.ebuild b/dev-java/jazzy/jazzy-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..6b6f0aaa786d
--- /dev/null
+++ b/dev-java/jazzy/jazzy-0.5.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Spell Check API"
+HOMEPAGE="https://sourceforge.net/projects/jazzy"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.zip -> ${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6
+		app-arch/unzip"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf src/com/swabunga/test || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	use doc && dodoc README.txt
+	use examples && java-pkg_doexamples --subdir \
+		com/swabunga/spell/examples \
+		src/com/swabunga/spell/examples
+}
diff --git a/dev-java/jazzy/metadata.xml b/dev-java/jazzy/metadata.xml
new file mode 100644
index 000000000000..c810ed5fc80e
--- /dev/null
+++ b/dev-java/jazzy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jazzy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jbitcollider-core-0.8 b/dev-java/jbitcollider-core-0.8
deleted file mode 100644
index 037321d8ce90..000000000000
--- a/dev-java/jbitcollider-core-0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Core classes of jBitcollider: org.bitpedia.collider.core
-EAPI=4
-HOMEPAGE=http://bitcollider.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/bitcollider/jBitcollider-0.8.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6e561116ca9fa076ab4eabc2578cbe0d
diff --git a/dev-java/jbitcollider-core/Manifest b/dev-java/jbitcollider-core/Manifest
new file mode 100644
index 000000000000..38ada41316be
--- /dev/null
+++ b/dev-java/jbitcollider-core/Manifest
@@ -0,0 +1,3 @@
+DIST jBitcollider-0.8.zip 1192489 BLAKE2B cf30002394c83b6748d1a24f92148da46fdb1e84dc14f3b673ed8d3bd6ff2719b5530c890f21cc9e7af9a4553cfbb9cb606799606ea88b40e5b96e768b1c11cc SHA512 272e9e0e6e66d3ac9d17e17d8fcbed82b508e512c5cdada7f18c2920597f31ae5968509c9814c5530ee7c5bea9f3d1b049b922d55056637642bcb515b890a9f7
+EBUILD jbitcollider-core-0.8.ebuild 855 BLAKE2B 9e054a14a2334104483ab65aa63701e51a055537b50b8c6212a7cebf543117bdef459734eaa9f6684558a9378b654be319cfbf0ae2756f8ed67f0ad10dbb6903 SHA512 fafce74a6d67a07fa646f9c45fedc10bee0ce0e2a211a8d841b169c48d18a73dfa7fd1383acc80447c476f4a30bb5724b41db907d25f754a38b1ce6d2ece3018
+MISC metadata.xml 337 BLAKE2B 53a438406066fb18a0dfe2c9fc73241de197b084079231d4e22aa1eeb1874b306720d19b31369a716a78326518b926d1b35eb4e2541eb4412cb31eccf5eeac78 SHA512 0efda2836e8f84a62c04efad27a95620f4c91221be25ddc101852a7a2965e173bf728ad9474451b945d333990267f8aec331512bcfb32cf5a002164b01d9e296
diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
new file mode 100644
index 000000000000..5ac725f32594
--- /dev/null
+++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+JAVA_PKG_IUSE="doc source"
+
+MY_PN="jBitcollider"
+MY_P="${MY_PN}-${PV}"
+JAVA_SRC_DIR="plugins/org.bitpedia.collider.core/src"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core classes of jBitcollider: org.bitpedia.collider.core"
+HOMEPAGE="http://bitcollider.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bitcollider/${MY_P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	rm -v lib/*.jar || die
+	rm -v plugins/*/lib/*.jar || die
+	rm -v plugins/org.bitpedia.collider.*/bin/org/bitpedia/collider/*/*.class || die
+	rm -v plugins/org.bitpedia.collider.core/bin/org/bitpedia/util/*.class || die
+	java-pkg-2_src_prepare
+}
diff --git a/dev-java/jbitcollider-core/metadata.xml b/dev-java/jbitcollider-core/metadata.xml
new file mode 100644
index 000000000000..f159ea74cc27
--- /dev/null
+++ b/dev-java/jbitcollider-core/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">bitcollider</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jboss-logging-3.1.4 b/dev-java/jboss-logging-3.1.4
deleted file mode 100644
index 94a1b1782b9a..000000000000
--- a/dev-java/jboss-logging-3.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/jboss-logmanager:0 >=dev-java/slf4j-api-1.7.7 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JBoss logging framework
-EAPI=5
-HOMEPAGE=http://www.jboss.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/jboss-logmanager:0 >=dev-java/slf4j-api-1.7.7 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jboss-logging/jboss-logging/archive/3.1.4.GA.tar.gz -> jboss-logging-3.1.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a548ecc9765dfdc7b16f751cf815f35a
diff --git a/dev-java/jboss-logging/Manifest b/dev-java/jboss-logging/Manifest
new file mode 100644
index 000000000000..647c1b40c0f7
--- /dev/null
+++ b/dev-java/jboss-logging/Manifest
@@ -0,0 +1,5 @@
+AUX jboss-logging-3.1.4-MDC.patch 5607 BLAKE2B 9ea9acc22592ac5a4fa573cf9b06d473b266e8919bd34a98fb8e4290a3c1ff226e2a432ee774cc98514d1ee3868160329da9494a130ca2e61efcc4c1296d5dae SHA512 74ece235664dc49db51e4026902a67773e87655edd1879137da0b0d1cb0fefe20c4e67e3ba0625214d6c85b7f036e07732d07c842947bf312a2ed505c05ab535
+AUX jboss-logging-3.1.4-build.xml 9295 BLAKE2B aada8601b25a428a6049ded0143ebd508d50743d677f869a88a69d9ac6956ad0bf0174b88618d14f6e3928504b0979601903dad2996f0441a0e579bbdaf3a5e1 SHA512 a4d1a44ee69d48686ff9d4d32540c74ea3dd0b8198f8bd04e5cf1572db5ae596bdf95bc0bd091cb19dc00b248f5f1a41f4f51271be9bb27be72420cc425d2a14
+DIST jboss-logging-3.1.4.tar.gz 25018 BLAKE2B abc91a70cd75132621dffa44c4c2314635e0009f8eaff96c97cd6f95869a078672eac452ce4d5fb2791785d01d7fc4af208d34f4f00d635e496022792d1c14f9 SHA512 633b18b079089444a5f7406a6a2b29100abd2c752306ada4fda0c15f07a60a363d67616e2521ec079f1df37ecdadcbb46e26819a9f5647e3d1a18219c494b73a
+EBUILD jboss-logging-3.1.4.ebuild 1357 BLAKE2B 2c27bb856afde649be7ac997fb9fab16711dcfd6600b69f3fe74c3f3587043daa7aa9e371746a65a10aeebe0134fb068797922d0552a6eedfb5ef0d191f22bdb SHA512 3052c73492bb17b1032f5805b1d298b0b4d38b13f361a91bd6cb3969030263529aed262a7030ec99a437c888a976130db4f8321721fe81318fd5b4168fb6eede
+MISC metadata.xml 328 BLAKE2B bf2ad3aca2591452aa1578a2c32db911530ca47fcbbc7ad5199b57e4ded87d513c63f8c79c1bdcd0cb39bb38dc11bd038a43e7bafc4bea35fd78f633aefdb135 SHA512 acbf51ab138d93d7b6d137542047e019fd30e7230ba9e0ecabfac72faa1ebea3419fd8531ab9f1304ca1d735bf2082994ac4ab57e87e6febcf30588d4a0f91da
diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch b/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
new file mode 100644
index 000000000000..e8a3a50a41fd
--- /dev/null
+++ b/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
@@ -0,0 +1,152 @@
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java.orig	2015-05-17 20:55:35.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java	2015-05-17 20:58:00.000000000 +0000
+@@ -23,27 +23,27 @@
+ 
+ abstract class AbstractMdcLoggerProvider extends AbstractLoggerProvider {
+ 
+-    private final ThreadLocal<Map<String, Object>> mdcMap = new ThreadLocal<Map<String, Object>>();
++    private final ThreadLocal<Map<String, String>> mdcMap = new ThreadLocal<Map<String, String>>();
+ 
+     public Object getMdc(String key) {
+         return mdcMap.get() == null ? null : mdcMap.get().get(key);
+     }
+ 
+-    public Map<String, Object> getMdcMap() {
++    public Map<String, String> getMdcMap() {
+         return mdcMap.get();
+     }
+ 
+-    public Object putMdc(String key, Object value) {
+-        Map<String, Object> map = mdcMap.get();
++    public Object putMdc(String key, String value) {
++        Map<String, String> map = mdcMap.get();
+         if (map == null) {
+-            map = new HashMap<String, Object>();
++            map = new HashMap<String, String>();
+             mdcMap.set(map);
+         }
+         return map.put(key, value);
+     }
+ 
+     public void removeMdc(String key) {
+-        Map<String, Object> map = mdcMap.get();
++        Map<String, String> map = mdcMap.get();
+         if (map == null)
+             return;
+         map.remove(key);
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Log4jLoggerProvider.java.orig	2015-05-17 20:16:57.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Log4jLoggerProvider.java	2015-05-17 21:21:25.157000000 +0000
+@@ -34,11 +34,11 @@
+     }
+ 
+     @SuppressWarnings("unchecked")
+-    public Map<String, Object> getMdcMap() {
++    public Map<String, String> getMdcMap() {
+         return MDC.getContext();
+     }
+ 
+-    public Object putMdc(String key, Object val) {
++    public Object putMdc(String key, String val) {
+         try {
+             return MDC.get(key);
+         } finally {
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java.orig	2015-05-17 20:44:24.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java	2015-05-17 21:22:05.205000000 +0000
+@@ -33,14 +33,14 @@
+         return new Slf4jLogger(name, l);
+     }
+ 
+-    public Object putMdc(final String key, final Object value) {
++    public Object putMdc(final String key, final String value) {
+         try {
+             return MDC.get(key);
+         } finally {
+             if (value == null) {
+                 MDC.remove(key);
+             } else {
+-                MDC.put(key, String.valueOf(value));
++                MDC.put(key, value);
+             }
+         }
+     }
+@@ -54,7 +54,7 @@
+     }
+ 
+     @SuppressWarnings({ "unchecked" })
+-    public Map<String, Object> getMdcMap() {
++    public Map<String, String> getMdcMap() {
+         return MDC.getCopyOfContextMap();
+     }
+ }
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JDKLoggerProvider.java.orig	2015-05-17 21:19:12.964000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JDKLoggerProvider.java	2015-05-17 21:22:41.639000000 +0000
+@@ -23,4 +23,9 @@
+     public Logger getLogger(final String name) {
+         return new JDKLogger(name);
+     }
++
++    @Override
++    public Object putMdc(String key, String value) {
++        return null;
++    }
+ }
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JBossLogManagerProvider.java.orig	2015-05-17 20:15:41.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JBossLogManagerProvider.java	2015-05-17 21:20:42.844000000 +0000
+@@ -59,8 +59,8 @@
+         }
+     }
+ 
+-    public Object putMdc(final String key, final Object value) {
+-        return MDC.put(key, String.valueOf(value));
++    public Object putMdc(final String key, final String value) {
++        return MDC.put(key, value);
+     }
+ 
+     public Object getMdc(final String key) {
+@@ -72,7 +72,7 @@
+     }
+ 
+     @SuppressWarnings({ "unchecked" })
+-    public Map<String, Object> getMdcMap() {
++    public Map<String, String> getMdcMap() {
+         // we can re-define the erasure of this map because MDC does not make further use of the copy
+         return (Map)MDC.copy();
+     }
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/MDC.java.orig	2015-05-17 19:12:40.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/MDC.java	2015-05-17 21:22:27.689000000 +0000
+@@ -25,7 +25,7 @@
+     private MDC() {
+     }
+ 
+-    public static Object put(String key, Object val) {
++    public static Object put(String key, String val) {
+         return LoggerProviders.PROVIDER.putMdc(key, val);
+     }
+ 
+@@ -37,7 +37,7 @@
+         LoggerProviders.PROVIDER.removeMdc(key);
+     }
+ 
+-    public static Map<String, Object> getMap() {
++    public static Map<String, String> getMap() {
+         return LoggerProviders.PROVIDER.getMdcMap();
+     }
+ }
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/LoggerProvider.java.orig	2015-05-17 19:06:30.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/LoggerProvider.java	2015-05-17 21:21:43.083000000 +0000
+@@ -23,13 +23,13 @@
+ public interface LoggerProvider {
+     Logger getLogger(String name);
+ 
+-    Object putMdc(String key, Object value);
++    Object putMdc(String key, String value);
+ 
+     Object getMdc(String key);
+ 
+     void removeMdc(String key);
+ 
+-    Map<String, Object> getMdcMap();
++    Map<String, String> getMdcMap();
+ 
+     void clearNdc();
+ 
diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml b/dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml
new file mode 100644
index 000000000000..35bbf84f9c39
--- /dev/null
+++ b/dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml
@@ -0,0 +1,202 @@
+<?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/8/14 3:59 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jboss-logging-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="jboss-logging-3.1.4.GA"/>
+  <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/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"/>
+    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"/>
+    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.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}" 
+           nowarn="true" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <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}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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">
+      <doctitle>&lt;![CDATA[JBoss Logging 3.1.4.GA]]&gt;</doctitle>
+      <header>&lt;![CDATA[JBoss Logging 3.1.4.GA]]&gt;</header>
+      <footer>&lt;![CDATA[JBoss Logging 3.1.4.GA]]&gt;</footer>
+      <bottom>&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2012 Red Hat, Inc.&lt;/i&gt;]]&gt;</bottom>
+      <link href="http://java.sun.com/javase/6/docs/api/"/>
+      <doclet name="net.gleamynode.apiviz.APIviz" 
+               path="${maven.repo.local}/org/jboss/apiviz/apiviz/1.2.5.GA/apiviz-1.2.5.GA.jar"/>
+    </javadoc>
+  </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="true" 
+         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                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+</project>
diff --git a/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
new file mode 100644
index 000000000000..9beb6d61f3e8
--- /dev/null
+++ b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JBoss logging framework"
+HOMEPAGE="http://www.jboss.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.GA.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="dev-java/jboss-logmanager:0
+	>=dev-java/slf4j-api-1.7.7
+	dev-java/log4j:0"
+
+RDEPEND=">=virtual/jre-1.6
+		${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+		${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}.GA/"
+
+EANT_GENTOO_CLASSPATH="jboss-logmanager,slf4j-api,log4j"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	# https://github.com/qos-ch/slf4j/blob/master/slf4j-api/src/main/java/org/slf4j/MDC.java#L226
+	# MDC returns a Map<String, String>
+	# https://github.com/jboss-logging/jboss-logging/blob/master/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java#L57
+	# Yet, for some reason, the JBoss folks have decided that it should return a Map<String, Object> :|
+	# This patch mends this mistake.
+	epatch "${FILESDIR}"/"${P}"-MDC.patch
+}
+
+src_install() {
+	java-pkg_newjar target/${PN}-3.1.4.GA.jar
+
+	if use doc; then
+		java-pkg_dojavadoc target/site/apidocs
+	fi
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/jboss-logging/metadata.xml b/dev-java/jboss-logging/metadata.xml
new file mode 100644
index 000000000000..75c29510cedb
--- /dev/null
+++ b/dev-java/jboss-logging/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jboss-logging/jboss-logging</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jboss-logmanager-1.5.1 b/dev-java/jboss-logmanager-1.5.1
deleted file mode 100644
index 324e4730fe52..000000000000
--- a/dev-java/jboss-logmanager-1.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 dev-java/jboss-modules:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JBoss logging framework
-EAPI=5
-HOMEPAGE=http://www.jboss.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/jboss-modules:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jboss-logging/jboss-logmanager/archive/1.5.1.Final.tar.gz -> jboss-logmanager-1.5.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=054fcb20584315fb7d20741059963104
diff --git a/dev-java/jboss-logmanager/Manifest b/dev-java/jboss-logmanager/Manifest
new file mode 100644
index 000000000000..039495e6d8da
--- /dev/null
+++ b/dev-java/jboss-logmanager/Manifest
@@ -0,0 +1,3 @@
+DIST jboss-logmanager-1.5.1.tar.gz 132910 BLAKE2B ebca4f63801e539c53bc5a00f76189b8ef9acadcbd1bff07bfc572350b3af3d65c80ac314130ab592f8655d849cefa8cc046ddddd237198f00654973c0e1f29d SHA512 a586f3619c90390d38c0355024f1d711b11e06efa35b3da9f12f7d98e04debad5250ef30ec9b869d27ffc60d9e5d5c8e690cc4a2b0a71553a2a994cfdef89768
+EBUILD jboss-logmanager-1.5.1.ebuild 667 BLAKE2B f6604c44a7ff47651887741a47cbedbf40ea2e3991b8234c9a4996f3ceb55619a10535c6504309f3034a75704f7ac7accbcbb17b9e8975a9aa5d79af6782dee5 SHA512 958d8d75d155743827e6e805bf5df15317b92dead065f2fd0447a37affb348b82725dc0125b9844e0768d207e3493bd96c67c053d92e64f97244b2b5df015e78
+MISC metadata.xml 331 BLAKE2B 77ed3ea318e75a2565d7690936371d0b89083b31da0322848ef4f2d5f7f57d006dca2118343f98a29d81488bafdad4fd33633e0fd338dc30b8109c29f226b2e3 SHA512 253e11bb23b5321b44483a7880aeb28747d3bee372fbfae830ff95d1e80d24049e8378750d9a84b931f08830e95d24991b999fb42df9b4a576e6397f4487a0d7
diff --git a/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild b/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild
new file mode 100644
index 000000000000..8954daf2f2b1
--- /dev/null
+++ b/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JBoss logging framework"
+HOMEPAGE="http://www.jboss.org/"
+SRC_URI="https://github.com/${PN/logmanager/logging}/${PN}/archive/${PV}.Final.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/jboss-modules:0"
+RDEPEND=">=virtual/jre-1.5
+		${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+		${CDEPEND}"
+
+S="${WORKDIR}/${P}.Final/"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="jboss-modules"
+
+java_prepare() {
+	rm pom.xml || die
+}
diff --git a/dev-java/jboss-logmanager/metadata.xml b/dev-java/jboss-logmanager/metadata.xml
new file mode 100644
index 000000000000..10cbaa482e79
--- /dev/null
+++ b/dev-java/jboss-logmanager/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jboss-logging/jboss-logmanager</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jboss-marshalling-1.3.0 b/dev-java/jboss-marshalling-1.3.0
deleted file mode 100644
index 099d011e883b..000000000000
--- a/dev-java/jboss-marshalling-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 dev-java/jboss-modules:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Compatible alternative to the JDK serialization API
-EAPI=5
-HOMEPAGE=http://jbossmarshalling.jboss.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/jboss-modules:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://download.jboss.org/jbossmarshalling/jboss-marshalling-1.3.0.CR9-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=be63a66965a364867d76dfb669e3a887
diff --git a/dev-java/jboss-marshalling-1.3.0-r1 b/dev-java/jboss-marshalling-1.3.0-r1
deleted file mode 100644
index f6dff2b6d908..000000000000
--- a/dev-java/jboss-marshalling-1.3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/jboss-modules:0 >=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Compatible alternative to the JDK serialization API
-EAPI=5
-HOMEPAGE=http://jbossmarshalling.jboss.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jboss-modules:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://download.jboss.org/jbossmarshalling/jboss-marshalling-1.3.0.CR9-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=552907a2fc946b347aec546a333b60ce
diff --git a/dev-java/jboss-marshalling-river-1.3.0 b/dev-java/jboss-marshalling-river-1.3.0
deleted file mode 100644
index d76563c66e80..000000000000
--- a/dev-java/jboss-marshalling-river-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=~dev-java/jboss-marshalling-1.3.0:0 >=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=River protocol implementation for JBoss Marshalling
-EAPI=5
-HOMEPAGE=http://jbossmarshalling.jboss.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=~dev-java/jboss-marshalling-1.3.0:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://download.jboss.org/jbossmarshalling/jboss-marshalling-river-1.3.0.CR9-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3f89ba5674e996a26801bed48dba38eb
diff --git a/dev-java/jboss-marshalling-river/Manifest b/dev-java/jboss-marshalling-river/Manifest
new file mode 100644
index 000000000000..a7c99bc12cbb
--- /dev/null
+++ b/dev-java/jboss-marshalling-river/Manifest
@@ -0,0 +1,3 @@
+DIST jboss-marshalling-river-1.3.0.CR9-sources.jar 45310 BLAKE2B 87eced675dbdb0d645ae4f3321954142922053008a650a9604b32c5e850c280c16d941997874c420e48e894e9f63c6441e6b3cd629fcfe7ad31ae13abb6f41e7 SHA512 0ff0ba48f8e4c1e76d378843aeae4793992fc200cf6d5aeeeec7341ddcd6bc3c93915ccb2bddbf3996661ff21e3a992e232c0721ec4469c5347811afabec4351
+EBUILD jboss-marshalling-river-1.3.0.ebuild 680 BLAKE2B a1eb8ceaea2619e1b2b863582d5dafac52c591815758db678e872ccb1a0997d49744c03663ef3cff34d37d1280bb1d4a54dd18e5632c3b0281173da326afb8f2 SHA512 8c9fec3951b2f720a6cbb0ebf06254536180cc5588f907713b8dc04867f39129df738c3dcb0380eeef9dccb417cd99da05df7a5ef5dab91204e9b2bba83bc40e
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild b/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild
new file mode 100644
index 000000000000..75313bf84754
--- /dev/null
+++ b/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="River protocol implementation for JBoss Marshalling"
+HOMEPAGE="http://jbossmarshalling.jboss.org/"
+SRC_URI="http://download.jboss.org/jbossmarshalling/${P}.CR9-sources.jar"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="~dev-java/jboss-marshalling-${PV}:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="jboss-marshalling"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar .
+}
diff --git a/dev-java/jboss-marshalling-river/metadata.xml b/dev-java/jboss-marshalling-river/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jboss-marshalling-river/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jboss-marshalling-serial-1.3.0 b/dev-java/jboss-marshalling-serial-1.3.0
deleted file mode 100644
index c915f9e728ac..000000000000
--- a/dev-java/jboss-marshalling-serial-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=~dev-java/jboss-marshalling-1.3.0:0 >=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Serial protocol implementation for JBoss Marshalling
-EAPI=5
-HOMEPAGE=http://jbossmarshalling.jboss.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=~dev-java/jboss-marshalling-1.3.0:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://download.jboss.org/jbossmarshalling/jboss-marshalling-serial-1.3.0.CR9-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=858d43f3a3a786bee2ef8c6296c9f6d9
diff --git a/dev-java/jboss-marshalling-serial/Manifest b/dev-java/jboss-marshalling-serial/Manifest
new file mode 100644
index 000000000000..2f8c67afc14c
--- /dev/null
+++ b/dev-java/jboss-marshalling-serial/Manifest
@@ -0,0 +1,3 @@
+DIST jboss-marshalling-serial-1.3.0.CR9-sources.jar 33627 BLAKE2B 76a6d6656c456ef5b4a4acbb659f52280d63b48aea46ff4fd190f8a9b5852157e37ce511a1af87007b04f03401082dd5e9a0d540ba27ac02567e7e50f04ebc33 SHA512 23343b43d2d81fb3f9d22e82d04e3c215cf0357fe369ac316a602b4599f84602bdd38fd50c8378050b1d031db2ad31405fc38bc93ef7a9327d63a29dd73ee144
+EBUILD jboss-marshalling-serial-1.3.0.ebuild 681 BLAKE2B 3d73a06ced906f541d70235d50b684d73de8eca26c214f52cec4af35a3d9770df1f338256ed0e4634f76b44d9dcbb4ed073dc6808504c41a063dadd84afab4b9 SHA512 7999b5669cab82c6fac7d537bed15f20bf66e89417db3d286dcde9a42d4c4b820edd9da67e2236e10102d7c14dfb8fffa844cba23233eae06ab80473daeac9bd
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild b/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild
new file mode 100644
index 000000000000..0117913853ea
--- /dev/null
+++ b/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Serial protocol implementation for JBoss Marshalling"
+HOMEPAGE="http://jbossmarshalling.jboss.org/"
+SRC_URI="http://download.jboss.org/jbossmarshalling/${P}.CR9-sources.jar"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="~dev-java/jboss-marshalling-${PV}:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="jboss-marshalling"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar .
+}
diff --git a/dev-java/jboss-marshalling-serial/metadata.xml b/dev-java/jboss-marshalling-serial/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jboss-marshalling-serial/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jboss-marshalling/Manifest b/dev-java/jboss-marshalling/Manifest
new file mode 100644
index 000000000000..dd0b1bb692ba
--- /dev/null
+++ b/dev-java/jboss-marshalling/Manifest
@@ -0,0 +1,4 @@
+DIST jboss-marshalling-1.3.0.CR9-sources.jar 174155 BLAKE2B 1c1a25910eb9d9d40f4f3cbb8bb6d7d59272e4806a39b602e1e336269eb3fa95d83a89b46967919d2e02b5647f43e42495f36777d82e706f1853b717f3e0e44e SHA512 d7a1ae24ec50acf20f8150cf6e741a846e9a5837f9d8e4c06d8429793f69b95a7c03449ba5a6debb00bd22b596b6f801e25e0f38ccce7ac25cafd601e2ef7058
+EBUILD jboss-marshalling-1.3.0-r1.ebuild 588 BLAKE2B 8fac0c5ad50ea655f1f11c8620cfd28dc8254926e9ad4b67662cf9dc443166002432105597f222e6ac41dd1c17f4d7f2d34e9cacf53cb54e66777bc36be6088a SHA512 7f517568ba25e4661a5c58f0eb64b9438d71e750aca3ef2c265a61ae40bbc07edc0816e55f08c3f1a66eb54d7bb0f8166de1f4dc93e89b326783ebac35e10311
+EBUILD jboss-marshalling-1.3.0.ebuild 606 BLAKE2B c7da32dfa5bae1633f678ee6f0ddc1bca320ef225228b37f58a8963caf94de293ef42eba656fe20dacd332e82f737a74acef260038af35272e0c3cae939c4492 SHA512 12589e07068598074c588c73e944b6f985b74361b2fc5d737c427c951d6253469a0f2616353e0e50055ede05dc578bd7146bf985864a06ddad9ba67210b60758
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r1.ebuild b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..8aec3b3085ba
--- /dev/null
+++ b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Compatible alternative to the JDK serialization API"
+HOMEPAGE="http://jbossmarshalling.jboss.org/"
+SRC_URI="http://download.jboss.org/jbossmarshalling/${P}.CR9-sources.jar"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="dev-java/jboss-modules:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="jboss-modules"
diff --git a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild
new file mode 100644
index 000000000000..8c31574bdf5e
--- /dev/null
+++ b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+HOMEPAGE="http://jbossmarshalling.jboss.org/"
+SRC_URI="http://download.jboss.org/jbossmarshalling/jboss-marshalling-${PV}.CR9-sources.jar"
+DESCRIPTION="Compatible alternative to the JDK serialization API"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+CDEPEND="dev-java/jboss-modules:0"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+
+JAVA_SRC_DIR="org"
+JAVA_GENTOO_CLASSPATH="jboss-modules"
diff --git a/dev-java/jboss-marshalling/metadata.xml b/dev-java/jboss-marshalling/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jboss-marshalling/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jboss-modules-1.3.0 b/dev-java/jboss-modules-1.3.0
deleted file mode 100644
index 876696b67d3f..000000000000
--- a/dev-java/jboss-modules-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JBoss modular classloading system
-EAPI=5
-HOMEPAGE=http://www.jboss.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jboss-modules/jboss-modules/archive/1.3.0.Final.tar.gz -> jboss-modules-1.3.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b3e4f8d2f5662a7ce10996c3b5c763c5
diff --git a/dev-java/jboss-modules-1.3.3 b/dev-java/jboss-modules-1.3.3
deleted file mode 100644
index 99d5524cba66..000000000000
--- a/dev-java/jboss-modules-1.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JBoss modular classloading system
-EAPI=5
-HOMEPAGE=http://www.jboss.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jboss-modules/jboss-modules/archive/1.3.3.Final.tar.gz -> jboss-modules-1.3.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ec08d0a7f5ea7b6b1428cb818201550a
diff --git a/dev-java/jboss-modules/Manifest b/dev-java/jboss-modules/Manifest
new file mode 100644
index 000000000000..cf4b942fbd3f
--- /dev/null
+++ b/dev-java/jboss-modules/Manifest
@@ -0,0 +1,5 @@
+DIST jboss-modules-1.3.0.tar.gz 187838 BLAKE2B 80190bf98c95edafd9b786ea6db64825bc8682c11fdeb86a2fe6c17bcd2c7fa949771b98e69d1bd0e48606357e1103149a9ed159d7f7dca91b3f068d272f4daa SHA512 407858cec3a82ad81262ef1feb28e3c3c259b23f3ed768f8714b28dcb8e2cc6bd68a47f82c8422d2c40ee9d0777a14c968c432a5f10f852bbd08ae434e249e56
+DIST jboss-modules-1.3.3.tar.gz 189899 BLAKE2B 127477514543540665c326494088f3a3637b6e5e50710403c915bb473725dd04cf79880721a2e4ecc617c1d608f35f15c1b9d37a70ac01fb16b264a44e7f27a3 SHA512 2d95d8f2661250fe3458feed9d1edc810abc5741ef0b631336927817820ec92b8f5b4ee0a329392c6ad82c68f67c5f831b294ca44dbf66bb9ca866e8ad70b535
+EBUILD jboss-modules-1.3.0.ebuild 650 BLAKE2B 4b7be841fe89388d329cbc0f5e2b3a263083ee4c8cc3012b60c750e35b1385c1beda955ce83f4b7daf4d2b13d45fa73ec5c4f6bd3b31af535d74c0e26fa77348 SHA512 8204523c0301788c5be83b0420c0994495a7139ddbf97b45eb3830bcf06f86fc31733a87236b32c4d26600abe20abb383d8ad751fe7548f0f889b8aae6414e49
+EBUILD jboss-modules-1.3.3.ebuild 665 BLAKE2B bfedf4a4dce0d91cc0cad12c5959e0f59cbd1f416dfac84408e0acc517a8bd164e9b917b1224a2c41d25a2337c9936585ab9c80c2c8a763c5a6d4aeef3165129 SHA512 a38305bf2c7e704a1c75ed52d7585474e442507bca09d5d033d4344ae43379abb4a702d83977c83bfa1cfe53f4fd9f02cc14139e437b66c344b8fd704b8057f1
+MISC metadata.xml 328 BLAKE2B 70528967605fb41f0541ebc752a11e64f759840e46d6489d8da3c532b3fc253e3e2ff7807bc625a7e2c6150c7e2688059e240df8dc58a161764af0404d9c1400 SHA512 56f41e4a3acd01abe24d0ad6211e1b5f1822462ed8a3724a26fffa4e9631f310888c0b8b213d71cbe1804ac524a637e5e02cb5d4f99d2414debc560cfba5a86a
diff --git a/dev-java/jboss-modules/jboss-modules-1.3.0.ebuild b/dev-java/jboss-modules/jboss-modules-1.3.0.ebuild
new file mode 100644
index 000000000000..9e346706f5cd
--- /dev/null
+++ b/dev-java/jboss-modules/jboss-modules-1.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JBoss modular classloading system"
+HOMEPAGE="http://www.jboss.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.Final.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.7"
+
+S="${WORKDIR}/${P}.Final/"
+
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	rm pom.xml || die
+	mkdir -p target/classes || die
+	cp -vr "${S}"/src/main/resources/* target/classes/ || die
+}
diff --git a/dev-java/jboss-modules/jboss-modules-1.3.3.ebuild b/dev-java/jboss-modules/jboss-modules-1.3.3.ebuild
new file mode 100644
index 000000000000..5038df77e9c1
--- /dev/null
+++ b/dev-java/jboss-modules/jboss-modules-1.3.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source" # doc (needs APIviz)
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JBoss modular classloading system"
+HOMEPAGE="http://www.jboss.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.Final.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.7"
+
+S="${WORKDIR}/${P}.Final/"
+
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	rm pom.xml || die
+	mkdir -p target/classes || die
+	cp -vr "${S}"/src/main/resources/* target/classes/ || die
+}
diff --git a/dev-java/jboss-modules/metadata.xml b/dev-java/jboss-modules/metadata.xml
new file mode 100644
index 000000000000..2613932cec31
--- /dev/null
+++ b/dev-java/jboss-modules/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jboss-modules/jboss-modules</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jcalendar-1.4 b/dev-java/jcalendar-1.4
deleted file mode 100644
index 6bbc0774e492..000000000000
--- a/dev-java/jcalendar-1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jgoodies-looks:2.6 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java date chooser bean for graphically picking a date
-EAPI=5
-HOMEPAGE=http://www.toedter.com/en/jcalendar/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.2
-SRC_URI=http://www.toedter.com/download/jcalendar-1.4.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3794a92463f8704139567c381e170be9
diff --git a/dev-java/jcalendar/Manifest b/dev-java/jcalendar/Manifest
new file mode 100644
index 000000000000..039d1f508b65
--- /dev/null
+++ b/dev-java/jcalendar/Manifest
@@ -0,0 +1,3 @@
+DIST jcalendar-1.4.zip 982517 BLAKE2B f82ba64d26aefe44a197d78998427af2173c41d1843e080f12c35984c18be58235ca115bc1f53d17a035e4c1ab7bd590b4993b0509e7408a4af50f4ec4b4697e SHA512 aeab6f98451f4fa8718e127de6c0af345410bebbd1de4fa1ca4b9e7f5a22908f9e455ba96da34ef9e8691b4d462e8a01dbd7881b6565a0f3a65d18fe58b68d9c
+EBUILD jcalendar-1.4.ebuild 901 BLAKE2B 090da23a2a72cab5251805ff7d50a5ec85f7de27e71e9a9687e512df4950d512fef715bc66f8fe6fb9acf96789d2321e0736c6e793a3894fffede13bca1382fe SHA512 12165e035a51dd4f3a6916e0cfbfbfe054749eb33c4b28440ba10f7960099f4945b077f2955b1c3b98437fee1e270d9dbc85520ff26995002a8e667188aac859
+MISC metadata.xml 642 BLAKE2B bd2da2ac1eaab103f97768ab71b9be02767fa85e6c123e97245e1ee707216e9d964ba9613806a36c79c01894bd7a4ee6052a97e3087479e543750a3db0a29154 SHA512 8622bd7dd4a96498c662b03c6510360fca1d3f99fefe51e1c1cd54d7ec2e254fa815088cfd68f4a7250c8f2d6c189e000a7a19506371b9e274deb446010c9290
diff --git a/dev-java/jcalendar/jcalendar-1.4.ebuild b/dev-java/jcalendar/jcalendar-1.4.ebuild
new file mode 100644
index 000000000000..1833038cc4a9
--- /dev/null
+++ b/dev-java/jcalendar/jcalendar-1.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java date chooser bean for graphically picking a date"
+HOMEPAGE="http://www.toedter.com/en/jcalendar/"
+SRC_URI="http://www.toedter.com/download/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/jgoodies-looks:2.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}"
+
+RESTRICT="test"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="jgoodies-looks-2.6"
+EANT_BUILD_XML="src/build.xml"
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET=""
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg_newjar lib/${P}.jar
+
+	dodoc readme.txt
+
+	use doc && java-pkg_dohtml -r doc/*
+	use source && java-pkg_dosrc src/com
+}
diff --git a/dev-java/jcalendar/metadata.xml b/dev-java/jcalendar/metadata.xml
new file mode 100644
index 000000000000..dbd25f9b805c
--- /dev/null
+++ b/dev-java/jcalendar/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+
+JCalendar is a Java date chooser bean for graphically picking a date. JCalendar
+is composed of several other Java beans, a JDayChooser, a JMonthChooser and a
+JYearChooser. All these beans have a locale property, provide several icons
+(Color 16x16, Color 32x32, Mono 16x16 and Mono 32x32) and their own locale
+property editor. So they can easily be used in GUI builders.
+
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jchardet-1.1-r1 b/dev-java/jchardet-1.1-r1
deleted file mode 100644
index ff18b61d8d2a..000000000000
--- a/dev-java/jchardet-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java port of Mozilla's Automatic Charset Detection algorithm
-EAPI=5
-HOMEPAGE=http://jchardet.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jchardet/jchardet/jchardet-1.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a7f32751743bcde69edf9bff122d4465
diff --git a/dev-java/jchardet/Manifest b/dev-java/jchardet/Manifest
new file mode 100644
index 000000000000..318b039902a8
--- /dev/null
+++ b/dev-java/jchardet/Manifest
@@ -0,0 +1,3 @@
+DIST jchardet-1.1.zip 82782 BLAKE2B 08ceb3119615ab25a43030392ce0114a03b00ae7dd5488cbafac66f36e8963cc200f3c80afff6a99cf0a1f6bdfac8c22a27a5f0d2e4a217443916eda75752cac SHA512 3a6141b1783286adfc072075f46da8f6e719361425cb2cbcd1c4c4dd82a6ef834a9f6f1aad8126d663dcfa12ad20cc362566dc2095ea95e01bd95adfae20bc28
+EBUILD jchardet-1.1-r1.ebuild 556 BLAKE2B 99804c82f24dc9aa341886d55ce7a53a01363ee78f59fc5500f4259782e50d30266a06beca56ae6525051b8e399953f46b742a4a92bef1bf7ccc06231c8ed5ae SHA512 4feafe3e025905bf329c8c7c858a76a314b59228928451ebb352ed520c15a86d52972926e57a30f156ee2ca6f2829b0b936e0895d0faa73791edce123e4c17e3
+MISC metadata.xml 314 BLAKE2B 9d0ebd4ae6fd36b2d06419f9e5e12481aa35e1b56046ec56c3d639e419487c01e573582d4e426e1dd139fd20a7e8a86f1db04413da2e2800ddccfae8d8593db0 SHA512 0c6a938f70239755c4847299f7e3c7203b2a7b3ef451aed965782e5a6df1dde4b4f2b2700aaa8e1e09d1fcf543f71b6c105747eb628af953a927faff4b2d3a50
diff --git a/dev-java/jchardet/jchardet-1.1-r1.ebuild b/dev-java/jchardet/jchardet-1.1-r1.ebuild
new file mode 100644
index 000000000000..d566bb21eb07
--- /dev/null
+++ b/dev-java/jchardet/jchardet-1.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java port of Mozilla's Automatic Charset Detection algorithm"
+HOMEPAGE="http://jchardet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.zip"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/jchardet/metadata.xml b/dev-java/jchardet/metadata.xml
new file mode 100644
index 000000000000..f09f6c745f30
--- /dev/null
+++ b/dev-java/jchardet/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jchardet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jchart2d-3.2.2 b/dev-java/jchart2d-3.2.2
deleted file mode 100644
index 04b8b9fbd5e1..000000000000
--- a/dev-java/jchart2d-3.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A minimalistic realtime charting library for Java
-EAPI=5
-HOMEPAGE=http://jchart2d.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=virtual/jre-1.6 dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/jchart2d/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=893245b4f3d4480fd82b0dc3d00f1ab4
diff --git a/dev-java/jchart2d/Manifest b/dev-java/jchart2d/Manifest
new file mode 100644
index 000000000000..b93032bec311
--- /dev/null
+++ b/dev-java/jchart2d/Manifest
@@ -0,0 +1,3 @@
+DIST jchart2d-eclipse-project-3.2.2.zip 3203952 BLAKE2B 99f3058184e02b682e288675edd68c7f53f2961a1888d096c7834d011ce279b9cfc8228f801e8fc4d3b20250875c5db59cc945ab46ae62c28b85545082e684ca SHA512 aa369b78aced9f7884d51f5298a6772d00cd4003d970e0bb401b717b4bdd2fdd543cf9a382edf7c9a6d1837cedb483a04aa89aac1e66d6e365655e99c76ee812
+EBUILD jchart2d-3.2.2.ebuild 912 BLAKE2B 1d03ce8959dd57b2d714e8afec81d740054a8b113c1564e80ec37e720c5d1907a9acdb21f9f1cc168a173f42f2e83c813d1485f0ff4aea3838d29f85f606f95e SHA512 abf365afbd13a3f2ccc937ff68926ad9abf0e53deb8c96b24b3dbf0a8c361813e51d4e9b0cc95a0fa145062c36a51b412c0d037b75fcc8442df4250002e1ab49
+MISC metadata.xml 887 BLAKE2B 95100127e8f7a23358acddced99ca959b027276068f46dbb44f98fa86f0a3ea889e2bbf9b73bf369fa295b2f3e93e5c36fe34e02d526470bfaae3747569aa003 SHA512 a6e967cc43fc7e346a28b9a9be8d66e361ede6843ce7cf32c2e7bb1cb1abf147f68722d5de9e76699bdc51150f1833153b49655bc3292f81b05c1dda2d287396
diff --git a/dev-java/jchart2d/jchart2d-3.2.2.ebuild b/dev-java/jchart2d/jchart2d-3.2.2.ebuild
new file mode 100644
index 000000000000..4e3f1e632d16
--- /dev/null
+++ b/dev-java/jchart2d/jchart2d-3.2.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A minimalistic realtime charting library for Java"
+HOMEPAGE="http://jchart2d.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/sources/${PN}-eclipse-project-${PV}.zip"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # Even the headless tests need a display!?
+
+CDEPEND="dev-java/jide-oss:0
+	dev-java/xmlgraphics-commons:2"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="jide-oss,xmlgraphics-commons-2"
+JAVA_SRC_DIR="src"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	rm -rv ext/* || die
+
+	# Ant tries and fails to build these outdated bug
+	# demonstrations. Did Ant's globbing behaviour change?
+	rm -v src/*.java || die
+}
diff --git a/dev-java/jchart2d/metadata.xml b/dev-java/jchart2d/metadata.xml
new file mode 100644
index 000000000000..306a65a8731f
--- /dev/null
+++ b/dev-java/jchart2d/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>JChart2D is an minimalistic realtime charting library published under the OSI approved GNU LESSER GENERAL PUBLIC LICENSE. It is designed for displaying multiple traces consisting of tracepoints. JChart2D is centered around a single configureable swing widget: the Chart2D. It is a JComponent one can add to a java swing user interface. Therefore basic knowledge of java awt and swing and the information provided on this site is helpful. If no basic knowledge of swing and awt is given, the example code will give a quick entry as well.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jchart2d</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jcifs-1.3.17-r2 b/dev-java/jcifs-1.3.17-r2
deleted file mode 100644
index ff5e4b326286..000000000000
--- a/dev-java/jcifs-1.3.17-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=java-virtuals/servlet-api:3.0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Library that implements the CIFS/SMB networking protocol in Java
-EAPI=6
-HOMEPAGE=https://jcifs.samba.org/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.1
-SRC_URI=https://jcifs.samba.org/src/jcifs-1.3.17.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e6a1f44f09d51ec1db6e7c5e2934f3ab
diff --git a/dev-java/jcifs/Manifest b/dev-java/jcifs/Manifest
new file mode 100644
index 000000000000..4ac531b334e0
--- /dev/null
+++ b/dev-java/jcifs/Manifest
@@ -0,0 +1,3 @@
+DIST jcifs-1.3.17.tgz 862091 BLAKE2B 67605ebd810caf097a9172c17f31d39c9e16af5885c706f7d8c2c2cff9b8e6a643174c9aaa8bd6aa06c816e312b7170a5aa06535f823a5c5b182e97beecccd0d SHA512 2fa1950f9ab6f0f3d45fd9b7866cc94993d1135f48d78ce357dca1d872746d22bff6097da8c418d0d11fd71d86b3fdc79b23195bcbab5bc460d8d0cca87efedc
+EBUILD jcifs-1.3.17-r2.ebuild 794 BLAKE2B 4da988b2dc46f9b33b84a6a18b3309c40cb775c7c5faa6312d89d0ee7444e69831cfccb62d4c4f99713c7c98b1755732cd50234aba5f4429f68a5fb449144c49 SHA512 5fa03afb1988311c5398d01ef9af4618260af25ebc0deafb204378553037eb0243051c14bc372484e2b0995a1791d6352f7eba956b564748e03d48f8c604141b
+MISC metadata.xml 547 BLAKE2B 654c37f05e5dd6b09b76c364070d1fe0f60fb0c9adcbc4c111a900cff3f7a0d1320ae934ee1290d015f64eb59bbe18d6965af52a7be69db16461908cd6d5087a SHA512 5783f25610ce9cf8db737748ca4f493d62e22ac5014de06d8e051d114b8aad73484e496b0ca10216462c8f68125ec501f604168fa1957306b8a2ceaed64d42ae
diff --git a/dev-java/jcifs/jcifs-1.3.17-r2.ebuild b/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
new file mode 100644
index 000000000000..5a4129393d4c
--- /dev/null
+++ b/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library that implements the CIFS/SMB networking protocol in Java"
+SRC_URI="https://jcifs.samba.org/src/${P}.tgz"
+HOMEPAGE="https://jcifs.samba.org/"
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+
+KEYWORDS="amd64 ppc64 x86"
+
+CDEPEND="java-virtuals/servlet-api:3.0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="servlet-api-3.0"
+
+JAVA_SRC_DIR="src"
+
+DOCS=( README.txt )
+
+S="${WORKDIR}/${P/-/_}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples examples
+	einstalldocs
+}
diff --git a/dev-java/jcifs/metadata.xml b/dev-java/jcifs/metadata.xml
new file mode 100644
index 000000000000..6f51fe18f381
--- /dev/null
+++ b/dev-java/jcifs/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+
+JCIFS is an Open Source client library that implements the CIFS/SMB networking
+protocol in 100% Java. CIFS is the standard file sharing protocol on the
+Microsoft Windows platform (e.g. Map Network Drive ...). This client is used
+extensively in production on large Intranets.
+
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jcip-annotations-1.0.1 b/dev-java/jcip-annotations-1.0.1
deleted file mode 100644
index dcf596f53e4a..000000000000
--- a/dev-java/jcip-annotations-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Clean room implementation of the JCIP Annotations
-EAPI=5
-HOMEPAGE=https://github.com/stephenc/jcip-annotations
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/stephenc/jcip-annotations/archive/jcip-annotations-1.0-1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=405cbba190600574bf7ce5b27660c741
diff --git a/dev-java/jcip-annotations/Manifest b/dev-java/jcip-annotations/Manifest
new file mode 100644
index 000000000000..b3a1a34eb99e
--- /dev/null
+++ b/dev-java/jcip-annotations/Manifest
@@ -0,0 +1,3 @@
+DIST jcip-annotations-1.0-1.tar.gz 7524 BLAKE2B cd31ecf1fe1ef4d78a9624cd92b9837acaccc35b1edfe5fbfac517d94edada03b5f7ac065ba21b26b43e6a8a6aef70434f3dfb7a76bb866ef4e3e25467ff1c01 SHA512 22eb285a445b25a718846dad45581dbe7a324a2d670bd05f4b2aa5e850ae34af6bcedbf143e17a7cd6cf7e510e0dd447992ba1d5316432e8a8db5584a1e1973e
+EBUILD jcip-annotations-1.0.1.ebuild 705 BLAKE2B ca622855bb77890a79f336fa709c7e6550f114ed072bb2d3f7eab2c1bb0231c06bdf1cf5ec7a07e527590b2c865ff32b735ad45cd55212b371519b523d518dcb SHA512 9ee18887230329c7149ad8b5d3e81eb57bacb059f7535a9c1ca92c1818edfdf224cd991d8056f1034247a7a717f3373bbe7fae1b973c8c5cc74ce6025e740038
+MISC metadata.xml 583 BLAKE2B c986afba09f7a872552a05f62fc20280ccbbecdc50c2b8ea158d87b160630c643610e431f4ed0202d90c485c40a5947027691639b9b0c8dd90fb1483f2e9c9f2 SHA512 d05c3ee0c0349388f4504ad9b04c17f92659317878215b49f133cc8f9871ccb9cc23625b6d476b88a255c5a452a5c5d82545fb5ef79d8f08b297298d7be92bc4
diff --git a/dev-java/jcip-annotations/jcip-annotations-1.0.1.ebuild b/dev-java/jcip-annotations/jcip-annotations-1.0.1.ebuild
new file mode 100644
index 000000000000..4eca0bce1671
--- /dev/null
+++ b/dev-java/jcip-annotations/jcip-annotations-1.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-$(replace_version_separator $(get_last_version_component_index) -)"
+
+DESCRIPTION="Clean room implementation of the JCIP Annotations"
+HOMEPAGE="https://github.com/stephenc/jcip-annotations"
+SRC_URI="https://github.com/stephenc/${PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/${PN}-${MY_P}/src"
+JAVA_SRC_DIR="main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ../README.md
+}
diff --git a/dev-java/jcip-annotations/metadata.xml b/dev-java/jcip-annotations/metadata.xml
new file mode 100644
index 000000000000..31c9027a8769
--- /dev/null
+++ b/dev-java/jcip-annotations/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <longdescription>The JCIP Annotations are really useful, however they are released under the Creative Commons Attribution License, which is not recommended for licensing software and may therefore cause issues for some people.</longdescription>
+  <upstream>
+    <remote-id type="github">stephenc/jcip-annotations</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jclasslib-3.1 b/dev-java/jclasslib-3.1
deleted file mode 100644
index 7e5308ff2b6e..000000000000
--- a/dev-java/jclasslib-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java bytecode viewer
-EAPI=6
-HOMEPAGE=https://github.com/ingokegel/jclasslib
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/ingokegel/jclasslib/archive/3.1.tar.gz -> jclasslib-3.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=43a18d81a9af39c5d3a0587c57c100bc
diff --git a/dev-java/jclasslib/Manifest b/dev-java/jclasslib/Manifest
new file mode 100644
index 000000000000..41dc56b11912
--- /dev/null
+++ b/dev-java/jclasslib/Manifest
@@ -0,0 +1,3 @@
+DIST jclasslib-3.1.tar.gz 4630493 BLAKE2B 2dbede05833a6f7ff0f32194ea91aeb071615ee8562541d1b5abc2fc61c3f393bd93f5e444110a6a72df161d488cf21551af8208b1f391951b5ae7002ceb6ef3 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc
+EBUILD jclasslib-3.1.ebuild 776 BLAKE2B 29602b4386651dd5edaeb924ce4b56125554159e448b649ecb99cbd3a0ea0dabd1d0fd0d7714a070d078aaefed44e93991671a1c98f92809c249dc32d077c652 SHA512 91d0ebeffa9539c9e6aeae71951d9cd89f1c1aa2c701a086c3bcc904f8692af6cbd3038c63faa40c918bc64af4cb6fc15b1dd26347df0a96d3c8ca3b045e1cb6
+MISC metadata.xml 374 BLAKE2B e0919272ff6e152907ffa22c7bc8778201b38ae1f53a553cc66ccc4d13095ec1ed7044c4fc3eab3eb4aecdb6667bbf4701b6934d06f0eb01519b01fc9aec4145 SHA512 7f7c3383fdc738b2e67837e024d23c6b9fc4a3288b443ecac539c69766b94769a60a0bc0e1b271d6698266fe3c7f3fee81444e36c4e6dd57e8568c51cea140ca
diff --git a/dev-java/jclasslib/jclasslib-3.1.ebuild b/dev-java/jclasslib/jclasslib-3.1.ebuild
new file mode 100644
index 000000000000..5a0c811e7b02
--- /dev/null
+++ b/dev-java/jclasslib/jclasslib-3.1.ebuild
@@ -0,0 +1,34 @@
+# 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-ant-2
+
+DESCRIPTION="Java bytecode viewer"
+HOMEPAGE="https://github.com/ingokegel/jclasslib"
+SRC_URI="https://github.com/ingokegel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+src_install() {
+	java-pkg_dojar "build/${PN}.jar"
+
+	java-pkg_dolauncher "${PN}" \
+		--main org.gjt.jclasslib.browser.BrowserApplication
+
+	use doc && java-pkg_dohtml -r doc/*
+	use source && java-pkg_dosrc src/*
+}
+
+pkg_postinst() {
+	elog "jclasslib uses Firefox by default."
+	elog "Set the BROWSER environment at your discretion."
+}
diff --git a/dev-java/jclasslib/metadata.xml b/dev-java/jclasslib/metadata.xml
new file mode 100644
index 000000000000..f860d915bfe9
--- /dev/null
+++ b/dev-java/jclasslib/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jclasslib</remote-id>
+		<remote-id type="github">ingokegel/jclasslib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jcmdline-1.0.2-r2 b/dev-java/jcmdline-1.0.2-r2
deleted file mode 100644
index 0be15cac5538..000000000000
--- a/dev-java/jcmdline-1.0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Library for parsing/handling of command line parameters
-EAPI=5
-HOMEPAGE=http://jcmdline.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=mirror://sourceforge/jcmdline/jcmdline-1.0.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=42ec54722bba09657be42910b5eb9dc2
diff --git a/dev-java/jcmdline-2.0.0 b/dev-java/jcmdline-2.0.0
deleted file mode 100644
index a1bd63336ec9..000000000000
--- a/dev-java/jcmdline-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Library for parsing/handling of command line parameters
-EAPI=5
-HOMEPAGE=http://jcmdline.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jcmdline/jcmdline-2.0.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ce07028ea8fb54c97d457a423b0f3a25
diff --git a/dev-java/jcmdline/Manifest b/dev-java/jcmdline/Manifest
new file mode 100644
index 000000000000..9ec9f9ad379f
--- /dev/null
+++ b/dev-java/jcmdline/Manifest
@@ -0,0 +1,6 @@
+AUX jcmdline-1.0.2-gentoo.patch 934 BLAKE2B a7e94aeeb042722c1feae194e396a7083095a017d8dc77d45035c515ac27c5bb8dd54e66fe02158a0154ab7cda964aa2568b844824df48c0586cda2f84bf24b7 SHA512 1326e1867b6fcc0ad37e0f0d557f518c5df5b8a2d87be91c66c2d9e72c044221713df5a864f5500e3820f853b415bea0612f02d8e30525d28aa10bb5002d2608
+DIST jcmdline-1.0.2.zip 397472 BLAKE2B 6c40c27397b11d21400d9e251cb4a84f13281fa8aaa0a772390724fed0fbbad7613a0c13f6dda1b53acb311be37a3a5ed63a4475a271d63d48322572d5215a2b SHA512 b261856eed9426257fd6391d45760f96f0085a40167632bfb2f85d35071e58d766553819bc0f8022b92fa193d47464928d09d2b0772a08ba484dd954b6206fd7
+DIST jcmdline-2.0.0.zip 395547 BLAKE2B 0dd00785a970fe614aef86e0d1fc8a465c9cffc96d2e157a03ed7e68e4f471a6cfdef8d7af5d90171da1fdeb6130f9a5f34b5dfb8765463e2ee7fdcfdd2991b1 SHA512 cbd5fcfa01b733ed1904bf56fa509dbf6d6764091902b31d2a620ba1e302d1ebac8c54d20ebc9031d7724aa1578cc6ca5befb6f38625780fd021e1b002674cb9
+EBUILD jcmdline-1.0.2-r2.ebuild 753 BLAKE2B 053caec253c6d244b6344b18621bddfe08c8595166ec8374218e86b4ee822d3a36c89d0cc0e350a2b8e6b9b2df8a3b52dfb2f0c0bb5ffc9ada7dda63cabaa18b SHA512 8cce1e6185e352cdafcc3704d8eedf7248fc4a19f15b0ef49de53bdcff5e14fbd8318efb3f30162a422a3443d4f636ad85f8fca210a7c411911cfe7aed9029a8
+EBUILD jcmdline-2.0.0.ebuild 545 BLAKE2B 98674e04b67b757aeb7f1d18de9e9ef07d346f633fe50a338e7e50f880cfa65da759829a079214bb640a007fc0e018c02596f22ea449b7f03060d22e10d366b6 SHA512 2a148a9d420453e550e7343037d7e607835a539904b53c08ca9d57b32ec09335efb4b9683099a6d6e0d93fb0bd5eefff5836c980ad7d3c5917f45ce4d4b5da01
+MISC metadata.xml 489 BLAKE2B 141339c5c28f928c1dbc166edb8ccb77078b7a5ce578ae4af3188c4f6a39c165cf784774c2916c7ae127e7f71a25a23953917b47646e28854e4a950435754044 SHA512 c332bc5180c891457f2cd34ea744b01771ff771b0ad4b1138ce01a0563d82212fa9f2988967ab0c1b7e41947bf25d8c0f627732dea9dda728fd887c287206430
diff --git a/dev-java/jcmdline/files/jcmdline-1.0.2-gentoo.patch b/dev-java/jcmdline/files/jcmdline-1.0.2-gentoo.patch
new file mode 100644
index 000000000000..c0e593eca335
--- /dev/null
+++ b/dev-java/jcmdline/files/jcmdline-1.0.2-gentoo.patch
@@ -0,0 +1,23 @@
+--- build.xml.orig	2005-02-04 22:07:21.800581304 +0100
++++ build.xml	2005-02-04 22:11:43.734761256 +0100
+@@ -170,6 +170,11 @@
+         <echo message="jcmdline Unit Test docs have been written to ${docdir}/jcmdline/utapi" />
+     </target>
+ 
++    <target name="jar" depends="build"> 
++	    <jar jarfile="${basedir}/jcmdline.jar" 
++             basedir="${builddir}/classes" />
++    </target>
++     
+     <!-- Don't distribute anything that will not pass UTs -->
+     <target name="dist" depends="clean, ut, doc"
+             description="prepare distribution files">
+@@ -203,8 +208,6 @@
+         </copy>
+ 
+       <!-- add the jar =====================================================-->
+-        <jar jarfile="${tmpDistBuildDir}/${projRelease}.jar" 
+-             basedir="${builddir}/classes" />
+ 
+       <!-- create a gzipped tarball for the Unix crowd =====================-->
+         <tar tarfile="${distdir}/${projRelease}.tar" 
diff --git a/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild b/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..02429bede5f1
--- /dev/null
+++ b/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Library for parsing/handling of command line parameters"
+HOMEPAGE="http://jcmdline.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jcmdline/${P}.zip"
+LICENSE="MPL-1.1"
+SLOT="1.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+EANT_DOC_TARGET="doc"
+
+java_prepare() {
+	find -name "*.jar" -delete || die
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	dodoc CHANGES CREDITS README
+	use doc && java-pkg_dojavadoc doc/jcmdline/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jcmdline/jcmdline-2.0.0.ebuild b/dev-java/jcmdline/jcmdline-2.0.0.ebuild
new file mode 100644
index 000000000000..d31750c15e5e
--- /dev/null
+++ b/dev-java/jcmdline/jcmdline-2.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library for parsing/handling of command line parameters"
+HOMEPAGE="http://jcmdline.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jcmdline/${P}.zip"
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf testsrc || die
+}
diff --git a/dev-java/jcmdline/metadata.xml b/dev-java/jcmdline/metadata.xml
new file mode 100644
index 000000000000..5f0350538012
--- /dev/null
+++ b/dev-java/jcmdline/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		This package facilitates parsing/handling of command line parameters
+		with an aim at adding consistency across various applications.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jcmdline</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jcodings-1.0.11 b/dev-java/jcodings-1.0.11
deleted file mode 100644
index fb4365719382..000000000000
--- a/dev-java/jcodings-1.0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Byte-based encoding support library for Java
-EAPI=5
-HOMEPAGE=https://github.com/codehaus
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=https://github.com/jruby/jcodings/archive/jcodings-1.0.11.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ed5ec9c10cc126d0031db83f2e45fa21
diff --git a/dev-java/jcodings-1.0.5 b/dev-java/jcodings-1.0.5
deleted file mode 100644
index be03b543e1c3..000000000000
--- a/dev-java/jcodings-1.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Byte-based encoding support library for Java
-EAPI=4
-HOMEPAGE=https://github.com/codehaus
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jruby/jcodings/tarball/1.0.5 -> jcodings-1.0.5-git.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ea49a050de2fb4e9c7884391e7c2f264
diff --git a/dev-java/jcodings/Manifest b/dev-java/jcodings/Manifest
new file mode 100644
index 000000000000..b5bfd2841668
--- /dev/null
+++ b/dev-java/jcodings/Manifest
@@ -0,0 +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.5-git.tar.gz 90788 BLAKE2B f1a72a1879e89c60bbb1537d5a6dd174b9f0a2bb4a3eb80520a2b4f7ddae5da359f11ba220b4f64db0413fd423c31623a0863cedbf62f7efd83ce73952557b35 SHA512 a0122eea18077daefdcf38ec9e6f12b000c558837835fe900f6e0c282fdfcf95dbb10652b4cfeb32e556ae8ebe1aec8c10e4a352cdb565837b2f16335140f8e3
+EBUILD jcodings-1.0.11.ebuild 828 BLAKE2B 555aa132da6212e4c772b3500ddfb54e584afc004c2082716defabee2af6d4c9cf4721e5e28c4b3daf9a91715462829828ff14fadda3aefec5257b461cdc27a7 SHA512 f4495874eda08d74cb2639c5a584ef789344d54a3ea6684d96c15df960ef54fb155d3a2ad7ad342d495435e406931550a63f69dd3dafbe51af333a85a5b4ea9c
+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/files/maven-build.xml b/dev-java/jcodings/files/maven-build.xml
new file mode 100644
index 000000000000..c09847a4fa00
--- /dev/null
+++ b/dev-java/jcodings/files/maven-build.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="jcodings-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="jcodings"/>
+  <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"/>
+  <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="test"/>
+  <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"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.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>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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" 
+         manifest="MANIFEST.MF" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </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">
+  </target>
+
+</project>
diff --git a/dev-java/jcodings/jcodings-1.0.11.ebuild b/dev-java/jcodings/jcodings-1.0.11.ebuild
new file mode 100644
index 000000000000..0800cfad7b1d
--- /dev/null
+++ b/dev-java/jcodings/jcodings-1.0.11.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Byte-based encoding support library for Java"
+HOMEPAGE="https://github.com/codehaus"
+SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+java_prepare() {
+	cp "${FILESDIR}"/maven-build.xml build.xml || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jcodings/jcodings-1.0.5.ebuild b/dev-java/jcodings/jcodings-1.0.5.ebuild
new file mode 100644
index 000000000000..3d8343932380
--- /dev/null
+++ b/dev-java/jcodings/jcodings-1.0.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+src_unpack() {
+	default
+	mv jruby-${PN}-* ${P} || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/maven-build.xml build.xml || die
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jcodings/metadata.xml b/dev-java/jcodings/metadata.xml
new file mode 100644
index 000000000000..0214918aa8e0
--- /dev/null
+++ b/dev-java/jcodings/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jruby/jcodings</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jcommander-1.48 b/dev-java/jcommander-1.48
deleted file mode 100644
index dbf2ffd737c7..000000000000
--- a/dev-java/jcommander-1.48
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Command line parsing framework for Java
-EAPI=5
-HOMEPAGE=https://github.com/cbeust/jcommander
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cbeust/jcommander/archive/jcommander-1.48.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1d42990a88c54b9a16ce747edbd9d151
diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest
new file mode 100644
index 000000000000..2e7597a1d2e4
--- /dev/null
+++ b/dev-java/jcommander/Manifest
@@ -0,0 +1,3 @@
+DIST jcommander-1.48.tar.gz 64544 BLAKE2B 29ed81d5f9a7e4ec193c8fa03cdd67481e9904898bee2730c585be6b6beb2e0ec37b31634513095b660655b8202c42077361318a83c1e016c9450d7d7ff30244 SHA512 1304bb14ecb89f9945e8219f3229941e556c7cccef52a2eb4e4663da9dbf9fa5ecec4914275a743fb7d90ca301153284dc76dd380903aac93db1507894d72a6e
+EBUILD jcommander-1.48.ebuild 542 BLAKE2B fde8c8a9b2e403eb3e52f38ac9f3390999ed2cb1016c5233ce3fe623f20ae6aa296516c3989654d03e1b6c57446dd9d5671805b42d9fd564ab3f3eb5d05194bd SHA512 f7f001bc32768c38926da521bc2851973726b12f12d6309a8fb3d0ebc7b86af60fed88a2dfb83e5ec3b007e9d1a751dd78fdd67bf7b0e89af63e97c59d3e687a
+MISC metadata.xml 328 BLAKE2B ede90240c79475742ad49d46837f55550c6b827f0e243ea6e3445908f4ef15cc8f8752505b5e60b50b0e361f88947df964916ceedb37c3d2a99856decf85d552 SHA512 6f2e953c14b69de907b9dce573cfa0e9fcb1d4197b25881efbddc9e4983222265f27679f25a307d7acd90bd29e8a1f7f1b3332f6699c0169817dedef08576e17
diff --git a/dev-java/jcommander/jcommander-1.48.ebuild b/dev-java/jcommander/jcommander-1.48.ebuild
new file mode 100644
index 000000000000..1c8d4e5af4a8
--- /dev/null
+++ b/dev-java/jcommander/jcommander-1.48.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Command line parsing framework for Java"
+HOMEPAGE="https://github.com/cbeust/jcommander"
+SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${P}"
+
+RESTRICT="test"
+
+java_prepare() {
+	rm -rf src/test || die
+}
diff --git a/dev-java/jcommander/metadata.xml b/dev-java/jcommander/metadata.xml
new file mode 100644
index 000000000000..9469008de1b0
--- /dev/null
+++ b/dev-java/jcommander/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">cbeust/jcommander</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jcommon-1.0.23 b/dev-java/jcommon-1.0.23
deleted file mode 100644
index ebcca152fefb..000000000000
--- a/dev-java/jcommon-1.0.23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A collection of useful classes used by JFreeChart, JFreeReport and others
-EAPI=5
-HOMEPAGE=http://www.jfree.org/jcommon
-IUSE=debug elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=mirror://sourceforge/jfreechart/jcommon-1.0.23.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4850f5b75a4aab0b2c486ecafcad7c89
diff --git a/dev-java/jcommon/Manifest b/dev-java/jcommon/Manifest
new file mode 100644
index 000000000000..eedf61e4f561
--- /dev/null
+++ b/dev-java/jcommon/Manifest
@@ -0,0 +1,3 @@
+DIST jcommon-1.0.23.zip 1373666 BLAKE2B 23c87cd18339ea8f5991933c1430464ca5a408d4d4afb42847ee8c3b941d8fd7ed9695af74ec9ff7fc5867758b826d49b5def73923e893910efc0a0d77f26f75 SHA512 c358239da8b1ddf53ce94bebb00b6518456aa921dd3aa84fc6a23144d499f14a85ba421cd71f3880e8d10153a6ab816f54c1fa872a4ab694ce3c7b8d69bc2a4b
+EBUILD jcommon-1.0.23.ebuild 1383 BLAKE2B 67fc5f1f71d9915e062ab99ef5be7196aec2a50a95159fe5384ce0d61683caea394e5dc3528673145e37873b7331a170fbc76326ed056a3d1ede36cbcf51d42c SHA512 e2d8b97a0503ea3cffb721208e698ba1347dd3c0a354efdc323bc81bafaec425d26aeadbd65c254cbb8c7889a34c6afe80d0d028fe6375ef96688d0a029cad73
+MISC metadata.xml 316 BLAKE2B a255fcd49db48318dbbe5e223eefb578f2d68535e239999075ad55de972afe80b62a85f2bffffb217b9bbfc41b86839daf0ccc077992778bcb87db3e3d71baed SHA512 23acc79c59e65a77790ff6b915c2727b53352e6c989aaa5d5936cc1a09fea10c15dc35e5133ef142da97af85770b44c3b33e28cefc4437de86afa5f3b3cf90fd
diff --git a/dev-java/jcommon/jcommon-1.0.23.ebuild b/dev-java/jcommon/jcommon-1.0.23.ebuild
new file mode 100644
index 000000000000..208f734743d6
--- /dev/null
+++ b/dev-java/jcommon/jcommon-1.0.23.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_P=${PN}-$(replace_version_separator 3 -)
+DESCRIPTION="A collection of useful classes used by JFreeChart, JFreeReport and others"
+HOMEPAGE="http://www.jfree.org/jcommon"
+SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.zip"
+
+LICENSE="LGPL-2"
+SLOT="1.0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	app-arch/unzip
+	test? ( dev-java/junit:4 )"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"/"${MY_P}"
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.jar' -print -delete || die
+
+	if ! use debug; then
+		antflags="-Dbuild.debug=false -Dbuild.optimize=true"
+	fi
+}
+
+src_compile() {
+	if ! use debug; then
+		antflags="-Dbuild.debug=false -Dbuild.optimize=true"
+	fi
+	eant -f ant/build.xml compile $(use_doc) $antflags
+}
+
+# No tests defined in build.xml. Let's turn them off.
+# src_test() {
+# 	java-pkg_jar-from --into lib junit-4
+# 	eant -f ant/build.xml compile-junit-tests
+# 	ejunit4 -cp "./lib/${P}-junit.jar:$(java-pkg_getjars junit-4)" \
+# 		org.jfree.junit.JCommonTestSuite
+# }
+
+src_install() {
+	java-pkg_newjar ${P}.jar ${PN}.jar
+	dodoc README.md
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/main/java/com src/main/java/org
+}
diff --git a/dev-java/jcommon/metadata.xml b/dev-java/jcommon/metadata.xml
new file mode 100644
index 000000000000..ba2158636f7e
--- /dev/null
+++ b/dev-java/jcommon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jfreechart</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jcs-2.0 b/dev-java/jcs-2.0
deleted file mode 100644
index 1a53f07ce4ed..000000000000
--- a/dev-java/jcs-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) dev-java/jisp:2.5 dev-db/hsqldb:0 dev-java/log4j:0 dev-java/xmlrpc:3 dev-java/commons-lang:0 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-logging:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A distributed caching system for server-side Java applications
-EAPI=5
-HOMEPAGE=http://commons.apache.org/jcs/
-IUSE=admin elibc_FreeBSD test doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/jisp:2.5 dev-db/hsqldb:0 dev-java/log4j:0 dev-java/xmlrpc:3 dev-java/commons-lang:0 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-logging:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.0
-SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-beta-1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=36d7df7251e39aa88991defd284a2ad2
diff --git a/dev-java/jcs/Manifest b/dev-java/jcs/Manifest
new file mode 100644
index 000000000000..fe4f88c844ae
--- /dev/null
+++ b/dev-java/jcs/Manifest
@@ -0,0 +1,4 @@
+AUX jcs-2.0-build.xml 16360 BLAKE2B b7243d8bcc5aade6b9b609298d1f552f0fad8bf3f9dd0edf3cadea376dc9543579d45d3a813886c51872d6aac501b4cbeeea8c3d4700e2e1f0017449e595c6ba SHA512 8b11500fb24f7166475b3bb37b210884d8203bb73879649bcbeb4f892059c16bc20a9871b7d306c119efa7033e91a64ee77c5244a2adb460c4d63473de0f9b33
+DIST commons-jcs-dist-2.0-beta-1-src.tar.gz 825048 BLAKE2B e99ed509d790e600bed762358f1f52779daec1a1dc2b6245ed9a39660400be0cea8546f02e6478bfeefdd2476409efeeed012cba705eeb0f71a31668f242284a SHA512 56d68807de6d47debc893584a738bc797c2a150503ae460dc1444e9434b438926f6ad9fe8c1292250f6a0b2936210084cbd512083b5a8cc4f20e692b759a314f
+EBUILD jcs-2.0.ebuild 2482 BLAKE2B 44cec6d92defa8f83cfaecb2a2dc3b2217b011ec4f2e4e150c5345cf60ab4aabc13be345b2ef65c6127ae365b58af3ed48100b49a05202d869e1a510071b4423 SHA512 b6134c8f7af9b2ab8a5194028f92b46ffbe30c2baa472bfe2df558d87e79a8d23ba58277a8823e67805780dfa3ef6b67e8a3e51d1869d37548e1217683b26008
+MISC metadata.xml 315 BLAKE2B 1b2549bc29a6fc50390237d4f2bc151e8ad3a7096fd5697eb96b9902fa50bf3a2a9c619a8941dc2189292a0d690157fb1a106ebf8771d47a7b12e26fe121b30a SHA512 d9bd0e859afd4cf87e40f48facb8fc28df61d841277eec0df36d3173ec6b10af0017bd7eae5b0b31bb4ec16f051a24b64bc45b27cf22c720f2a6fcbb4add21de
diff --git a/dev-java/jcs/files/jcs-2.0-build.xml b/dev-java/jcs/files/jcs-2.0-build.xml
new file mode 100644
index 000000000000..04c4dae81729
--- /dev/null
+++ b/dev-java/jcs/files/jcs-2.0-build.xml
@@ -0,0 +1,306 @@
+<?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 6/14/15 12:02 AM                      -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="commons-jcs-core-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="commons-jcs-core-2.0-beta-1"/>
+  <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/test-conf"/>
+  <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}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/>
+    <pathelement location="${maven.repo.local}/commons-pool/commons-pool/1.6/commons-pool-1.6.jar"/>
+    <pathelement location="${maven.repo.local}/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar"/>
+    <pathelement location="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
+    <pathelement location="${maven.repo.local}/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
+    <pathelement location="${maven.repo.local}/commons-chain/commons-chain/1.1/commons-chain-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar"/>
+    <pathelement location="${maven.repo.local}/dom4j/dom4j/1.1/dom4j-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/oro/oro/2.0.8/oro-2.0.8.jar"/>
+    <pathelement location="${maven.repo.local}/sslext/sslext/1.2-0/sslext-1.2-0.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar"/>
+    <pathelement location="${maven.repo.local}/antlr/antlr/2.7.2/antlr-2.7.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
+    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/>
+    <pathelement location="${maven.repo.local}/commons-pool/commons-pool/1.6/commons-pool-1.6.jar"/>
+    <pathelement location="${maven.repo.local}/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/commons/commons-collections4/4.0/commons-collections4-4.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"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar"/>
+    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar"/>
+    <pathelement location="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
+    <pathelement location="${maven.repo.local}/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
+    <pathelement location="${maven.repo.local}/commons-chain/commons-chain/1.1/commons-chain-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar"/>
+    <pathelement location="${maven.repo.local}/dom4j/dom4j/1.1/dom4j-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/oro/oro/2.0.8/oro-2.0.8.jar"/>
+    <pathelement location="${maven.repo.local}/sslext/sslext/1.2-0/sslext-1.2-0.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar"/>
+    <pathelement location="${maven.repo.local}/antlr/antlr/2.7.2/antlr-2.7.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
+    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.5/servlet-api-2.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>
+    <mkdir dir="${maven.build.outputDir}//var/tmp/portage/dev-java/jcs-2.0/work/commons-jcs-dist-2.0-beta-1-src/commons-jcs-core/target/classes"/>
+    <copy todir="${maven.build.outputDir}//var/tmp/portage/dev-java/jcs-2.0/work/commons-jcs-dist-2.0-beta-1-src/commons-jcs-core/target/classes">
+      <fileset dir="${maven.build.resourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           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.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}">
+        <include name="**/*.properties"/>
+        <include name="**/*.ccf"/>
+      </fileset>
+    </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="**/*UnitTest.java"/>
+          <exclude name="**/BlockDiskElementDescriptorUnitTest.java"/>
+          <exclude name="**/HSQLDiskCacheConcurrentUnitTest.java"/>
+          <exclude name="**/HSQLDiskCacheUnitTest.java"/>
+          <exclude name="**/IndexedDiskCacheOptimizationUnitTest.java"/>
+          <exclude name="**/TestTCPLateralUnitTest.java"/>
+          <exclude name="**/UDPDiscoveryUnitTest.java"/>
+          <exclude name="**/UDPDiscoverySenderUnitTest.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/BlockDiskElementDescriptorUnitTest.java"/>
+          <exclude name="**/HSQLDiskCacheConcurrentUnitTest.java"/>
+          <exclude name="**/HSQLDiskCacheUnitTest.java"/>
+          <exclude name="**/IndexedDiskCacheOptimizationUnitTest.java"/>
+          <exclude name="**/TestTCPLateralUnitTest.java"/>
+          <exclude name="**/UDPDiscoveryUnitTest.java"/>
+          <exclude name="**/UDPDiscoverySenderUnitTest.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="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/6/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" 
+         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/jcs/jcs-2.0.ebuild b/dev-java/jcs/jcs-2.0.ebuild
new file mode 100644
index 000000000000..f79f0dded211
--- /dev/null
+++ b/dev-java/jcs/jcs-2.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="test doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="commons-${PN}-dist-${PV}-beta-1-src"
+JCS_CORE="commons-${PN}-core"
+
+DESCRIPTION="A distributed caching system for server-side Java applications"
+HOMEPAGE="http://commons.apache.org/jcs/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/${PN}/source/commons-${PN}-dist-${PV}-beta-1-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.0"
+KEYWORDS="amd64 x86"
+IUSE="admin"
+
+CDEPEND="dev-java/jisp:2.5
+	dev-db/hsqldb:0
+	dev-java/log4j:0
+	dev-java/xmlrpc:3
+	dev-java/commons-lang:0
+	dev-java/commons-dbcp:0
+	dev-java/commons-pool:0
+	dev-java/commons-logging:0
+	dev-java/commons-httpclient:3
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	xmlrpc-3
+	hsqldb
+	jisp-2.5
+	log4j
+	commons-lang
+	commons-pool
+	commons-dbcp
+	commons-logging
+	commons-httpclient-3
+	servlet-api-3.0
+"
+
+EANT_BUILD_XML="${JCS_CORE}/build.xml"
+EANT_BUILD_TARGET="package"
+
+java_prepare() {
+	cp "${FILESDIR}/${P}-build.xml" ${JCS_CORE}/build.xml
+
+	# Disable the velocity-tools dep.
+	rm -v \
+		${JCS_CORE}/src/main/java/org/apache/commons/jcs/admin/servlet/JCSAdminServlet.java
+
+	if use test; then
+		# Make use of commons-collections4 not yet packaged in Gentoo
+		rm -v \
+			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java \
+			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java
+
+		# Fails for some reason.
+		rm -v \
+			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java \
+			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/auxiliary/disk/LRUMapJCSUnitTest.java \
+			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java \
+			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/utils/struct/DoubleLinkedListUnitTest.java
+	fi
+}
+
+EANT_TEST_TARGET="test"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local target="${JCS_CORE}"/target
+	java-pkg_newjar "${target}"/"${JCS_CORE}-${PV}"-beta-1.jar "${JCS_CORE}".jar
+
+	if use doc; then
+		java-pkg_dojavadoc "${target}"/site/apidocs
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${JCS_CORE}"/src
+	fi
+}
diff --git a/dev-java/jcs/metadata.xml b/dev-java/jcs/metadata.xml
new file mode 100644
index 000000000000..4946ed2f4b77
--- /dev/null
+++ b/dev-java/jcs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <use>
+    <flag name="admin">Enable JCS Admin servlets</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/jdbc-informix-3.00.3 b/dev-java/jdbc-informix-3.00.3
deleted file mode 100644
index 33079b2cf2b0..000000000000
--- a/dev-java/jdbc-informix-3.00.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst setup
-DEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-DESCRIPTION=JDBC Type 4 Drivers for Informix
-EAPI=0
-HOMEPAGE=http://www.ibm.com/software/data/informix/tools/jdbc/
-IUSE=elibc_FreeBSD doc examples
-KEYWORDS=amd64 x86
-LICENSE=informix-jdbc
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-RESTRICT=fetch
-SLOT=0
-SRC_URI=JDBC.3.00.JC3.tar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9901b5c9b7d132a520782454aa8273b6
diff --git a/dev-java/jdbc-informix/Manifest b/dev-java/jdbc-informix/Manifest
new file mode 100644
index 000000000000..65d3061ae77f
--- /dev/null
+++ b/dev-java/jdbc-informix/Manifest
@@ -0,0 +1,3 @@
+DIST JDBC.3.00.JC3.tar 18447872 BLAKE2B 61951967bf1d9bd21583fd4270ccd5b177613896f4864a0bcbd9ecaf995e8a097238cb0f4b1f9f65f8012344b88bbd5b91440507192f2e2a63a39f0595a28ce9 SHA512 1f5d0848964b6e805ea735745e8af94664b55dcdf8de664d649b0b261eeac5f36ed0a6cff9bbfdd70b3b574c28b988013c97b1c2011fbcb51f21262f8dda0525
+EBUILD jdbc-informix-3.00.3.ebuild 1657 BLAKE2B 0f6bab8a986d17acdd12f6580506dd16bcea0cac5e21cd7d62e083316091ed133ae1f19ef18d56b1bee2caea748bf91e31059eff22a13d5662fa2576185c27ae SHA512 d38636f0e423c13da399a5d4a20c11fb262ae30adbfcdd7a911c2c7b7502f65280bdcde0fd4faff01ab8c05e61e1d3feb20acd540388bda0ae03ee55ce310d22
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild b/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
new file mode 100644
index 000000000000..6cfbbfbeffee
--- /dev/null
+++ b/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc examples"
+
+inherit versionator java-pkg-2
+
+MY_PV="$(replace_version_separator 2 .JC)"
+
+At="JDBC.${MY_PV}.tar"
+DESCRIPTION="JDBC Type 4 Drivers for Informix"
+SRC_URI="${At}"
+HOMEPAGE="http://www.ibm.com/software/data/informix/tools/jdbc/"
+DOWNLOADPAGE="http://www14.software.ibm.com/webapp/download/search.jsp?go=y&rs=ifxjdbc"
+KEYWORDS="amd64 x86"
+LICENSE="informix-jdbc"
+SLOT="0"
+DEPEND=">=virtual/jre-1.4"
+RDEPEND=">=virtual/jre-1.4"
+RESTRICT="fetch"
+IUSE=""
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	elog "Due to licensing restrictions, you need to download the distfile manually."
+	elog "Please navigate to ${DOWNLOADPAGE}"
+	elog "Click on the 'Informix JDBC Driver' link, version ${MY_PV}"
+	elog "Sign up with your IBM account (you need to register)."
+	elog "Go through the license agreement and survey."
+	elog "Download ${At} and place it into ${DISTDIR}"
+	elog "And restart the installation."
+}
+
+src_compile() {
+	einfo "Performing silent installation"
+	addpredict /root/vpd.properties
+	java -jar setup.jar -P product.installLocation=. -silent
+	if use examples; then
+		einfo "Cleaning compiled examples"
+		find demo \( -name \*.so -o -name \*.class -o -name \*.dll \) -delete
+	fi
+}
+
+src_install() {
+	java-pkg_dojar lib/*.jar
+
+	# these are to be copied to app server as servlets
+	insinto /usr/share/${PN}/
+	doins -r proxy
+
+	if use doc; then
+		java-pkg_dojavadoc doc/javadoc
+		dodoc doc/release/jdbc4pg.pdf doc/release/sqlj/ifxsqljug.pdf || die
+		dohtml -r doc/release/* || die
+	fi
+
+	use examples && java-pkg_doexamples demo
+}
diff --git a/dev-java/jdbc-informix/metadata.xml b/dev-java/jdbc-informix/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jdbc-informix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jdbc-mssqlserver-6.2.2 b/dev-java/jdbc-mssqlserver-6.2.2
deleted file mode 100644
index 9ade748ed201..000000000000
--- a/dev-java/jdbc-mssqlserver-6.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=JDBC driver for Microsoft SQL Server
-EAPI=6
-HOMEPAGE=https://github.com/Microsoft/mssql-jdbc
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=4.2
-SRC_URI=https://github.com/Microsoft/mssql-jdbc/releases/download/v6.2.2/mssql-jdbc-6.2.2.jre8.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=60d23fe0793e1b886f4272e2b4fae806
diff --git a/dev-java/jdbc-mssqlserver/Manifest b/dev-java/jdbc-mssqlserver/Manifest
new file mode 100644
index 000000000000..743dab430c97
--- /dev/null
+++ b/dev-java/jdbc-mssqlserver/Manifest
@@ -0,0 +1,3 @@
+DIST mssql-jdbc-6.2.2.jre8.jar 825389 BLAKE2B 3b3290e80652e1085729f7a3391bea7f3542af6598ea855c6e1430fef2b12009dbfccc761d347491ea85c22d2acfa12d5a55e79b44f23306b6c4f4b6a5aa2ebb SHA512 e381fe9444c706a8a019c5006fe5d238065c20387d3c5b9a4c632ff30033596cea26036b804fc4f6610ad1418bb7d94b024871c7deb865028f5770ffca353d49
+EBUILD jdbc-mssqlserver-6.2.2.ebuild 530 BLAKE2B 16bd266a4b9d91e5564725345f6111cb9fbdce0822e7717281f88230407f5aa9161ec75d5fc1f52d2b12207c6fc381948d828aaf1225c59571adcd43cbd9d01d SHA512 ffcb2821a2ce4bf670360e07550930b4655f3ec57827e0932f87e224d74fb93b950bd29b91a0d6bc2e5fd52e30801380fab6d7ff9ecba1f6b4448a5c553fad57
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-6.2.2.ebuild b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-6.2.2.ebuild
new file mode 100644
index 000000000000..4dbbc416dc05
--- /dev/null
+++ b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-6.2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 versionator
+
+DESCRIPTION="JDBC driver for Microsoft SQL Server"
+HOMEPAGE="https://github.com/Microsoft/mssql-jdbc"
+SRC_URI="https://github.com/Microsoft/mssql-jdbc/releases/download/v${PV}/mssql-jdbc-${PV}.jre8.jar"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="4.2"
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}/${A}"
+}
diff --git a/dev-java/jdbc-mssqlserver/metadata.xml b/dev-java/jdbc-mssqlserver/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jdbc-mssqlserver/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jdbc-mysql-5.1.26 b/dev-java/jdbc-mysql-5.1.26
deleted file mode 100644
index 16e8b5d1a0d9..000000000000
--- a/dev-java/jdbc-mysql-5.1.26
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/slf4j-api:0 log4j? ( dev-java/log4j:0 ) c3p0? ( dev-java/c3p0:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/gnu-classpath-0.98-r1:0.98 >=dev-java/ant-core-1.8.2:0 dev-java/ant-contrib >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=MySQL JDBC driver
-EAPI=5
-HOMEPAGE=http://www.mysql.com/products/connector/j/
-IUSE=c3p0 log4j elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2-with-MySQL-FLOSS-exception
-RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 log4j? ( dev-java/log4j:0 ) c3p0? ( dev-java/c3p0:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/gnu-classpath-0.98-r1:0.98
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.26.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cb8e43735788bd05b9e88df48ca237d7
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
new file mode 100644
index 000000000000..4a845e440ea2
--- /dev/null
+++ b/dev-java/jdbc-mysql/Manifest
@@ -0,0 +1,6 @@
+AUX 5.0.5-dist-target-depends.patch 380 BLAKE2B 2e4d8a025c986dd6bbd1e97b629875614ea9be28c0fc51bc24dca85244fc089798c09f3fdb125bbc94ba19355b133b2119e5e4e1573990616d1dc960fd2dacfa SHA512 407ba02b1e2b3a514a9e270356a15f97eaa19197117a9f2752ee6b78fba0dd7cab150f7eaac02f8d6cb9d3bfe6d0edd3e68f38457310d69123c97b9231d621c4
+AUX 5.0.5-remove-jboss-dependency-from-tests.patch 1541 BLAKE2B 17c84606f144c3aedc6b61986f9f7d215ac539b044d2745682e9f98b22bd6a86996cdb693762b375fd57de21bbe09afeef4ed8a5e91d124a28ecd157a2761a3a SHA512 43e91aa4ff599cb958cb6c098cbc1a28511b2fe12ea44dcee20fffe0efbfd1ce31bb29dfc9330a30d99174ed80abbb8512a0cdf3b4155fbf3d78ef776a5ebcb5
+AUX 5.1.14-java6.patch 1301 BLAKE2B 605199c02b040a07306a26f1701ce3fb317ae7af41480329ae79491f0896847c143ae0e2c04358e291b9288c29a0eeebc613bee9d6b150a6993f6282fc8e7713 SHA512 1b630781201478dee6da3d2322755ff87b2e2c9c1cd49a127bbcd56a0cc25e7bed06ed5f0758709c2e120fc85273755ee28c7ba21ac7b75e97ac6043216413a1
+DIST mysql-connector-java-5.1.26.tar.gz 3724076 BLAKE2B b5477e0f86a04b2135a47e3551cc89fa5f63f46faaccbf1e4473eb59e6d266d22d76a5c256d125feeeccd4625c22bcedaa9e21e613bf9759459e106b7d30db5f SHA512 93b882f5262dc991aa885ed9ae7fead02b9d28431022c86c6724272b508e78eee3df7310e9964e60f68953ed56f4fcdf9159a90f463eb39aea65af2453371879
+EBUILD jdbc-mysql-5.1.26.ebuild 1883 BLAKE2B 3794714e2120f69740b16a9c32ec19cbfe349caed449582cfe92e9a36192fd3aa5c80767bc5df822781f570b12f67c193060d542c6e65df7b0078555981cb906 SHA512 0e3f1135e8f19888853a76f5fab00c2fca122707affabbf2b08569b71aa03bdf0a15b25288c5d550a8c0b6b13cff11b1c64bccf1f173a3eeb53bc28b1a053638
+MISC metadata.xml 358 BLAKE2B 634f9354e5f680e4313debca5f05fc117b44f1a43b018b3d71d92430cb8253a9da018f74e888bf535e0dbc64e79d240d4f5748d945a5caa14eba874b9e38dca9 SHA512 4db9ea2f30ecc92b4b97e5159d4338b73c59e3f8640336764d2766a1ca33760b7c0fa6caaac90125102555a5128fff3b2d95e20d92df22e705623f0e2b7914e9
diff --git a/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch b/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch
new file mode 100644
index 000000000000..28ffc7ad0dab
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch
@@ -0,0 +1,11 @@
+--- build.xml.orig	2007-05-07 19:59:49.000000000 +0300
++++ build.xml	2007-05-07 20:01:21.000000000 +0300
+@@ -291,7 +291,7 @@
+ 		</if>
+ 	</target>
+ 
+-	<target name="dist" depends="init, compile">
++	<target name="dist" depends="init, compile-driver,compile.integration">
+ 
+ 		<delete file="${buildDir}/${fullProdName}-bin.jar" />
+ 		<delete file="${distDir}/${fullProdName}.jar" />
diff --git a/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch b/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch
new file mode 100644
index 000000000000..394830701fee
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch
@@ -0,0 +1,39 @@
+--- mysql-connector-java-5.0.5/src/testsuite/regression/DataSourceRegressionTest.java	2007-03-01 17:48:47.000000000 +0100
++++ mysql-connector-java-5.0.5-no-jboss-test/src/testsuite/regression/DataSourceRegressionTest.java	2007-04-12 09:53:05.000000000 +0200
+@@ -52,7 +52,6 @@
+ import testsuite.simple.DataSourceTest;
+ 
+ import com.mysql.jdbc.NonRegisteringDriver;
+-import com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker;
+ import com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource;
+ import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
+ import com.mysql.jdbc.jdbc2.optional.MysqlDataSourceFactory;
+@@ -315,28 +314,6 @@
+ 		assertEquals(testIntFlag, thawedDs.getBlobSendChunkSize());
+ 	}
+ 	
+-	/**
+-	 * Tests fix for BUG#20242 - MysqlValidConnectionChecker for JBoss doesn't
+-	 * work with MySQLXADataSources.
+-	 * 
+-	 * @throws Exception if the test fails.
+-	 */
+-	public void testBug20242() throws Exception {
+-		if (versionMeetsMinimum(5, 0)) {
+-			try {
+-				Class.forName("org.jboss.resource.adapter.jdbc.ValidConnectionChecker");
+-			} catch (Exception ex) {
+-				return; // class not available for testing
+-			}
+-			
+-			MysqlXADataSource xaDs = new MysqlXADataSource();
+-			xaDs.setUrl(dbUrl);
+-			
+-			MysqlValidConnectionChecker checker = new MysqlValidConnectionChecker();
+-			assertNull(checker.isValidConnection(xaDs.getXAConnection().getConnection()));
+-		}	
+-	}
+-	
+ 	private void bindDataSource(String name, DataSource ds) throws Exception {
+ 		this.ctx.bind(this.tempDir.getAbsolutePath() + name, ds);
+ 	}
diff --git a/dev-java/jdbc-mysql/files/5.1.14-java6.patch b/dev-java/jdbc-mysql/files/5.1.14-java6.patch
new file mode 100644
index 000000000000..49343706ad80
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/5.1.14-java6.patch
@@ -0,0 +1,34 @@
+--- build.xml.orig	2010-01-20 19:45:30.000000000 +0100
++++ build.xml	2010-02-13 00:34:30.000000000 +0100
+@@ -131,7 +131,7 @@
+ 		</if>	
+ 	</target>
+ 
+-	<target name="init" depends="-compiler-check, -init-copy, -init-no-crypto">
++	<target name="init" depends="-init-copy, -init-no-crypto">
+		<!-- We need the following for source distributions as there we
+             can't dynamically alter the classpath, and not having this
+		     directory present causes the build to fail -->
+@@ -746,7 +746,8 @@
+ 		<javac sourcepath="" srcdir="${buildDir}/${fullProdName}" 
+ 			destdir="${compiler.output}" 
+ 			deprecation="off" 
+-			debug="${debug.enable}">
++			debug="${debug.enable}"
++			bootclasspath="${gentoo.bootclasspath}">
+ 			<include name="**/*.java" />
+ 			<exclude name="testsuite/**" />
+ 			<exclude name="com/mysql/jdbc/integration/**" />
+@@ -763,11 +764,7 @@
+ 		<javac destdir="${compiler.output}" 
+ 			deprecation="off" 
+ 			debug="${debug.enable}"
+-			fork="yes"
+-			executable="${com.mysql.jdbc.java6.javac}"
+-			compiler="modern"
+-			sourcepath="" srcdir="${buildDir}/${fullProdName}"
+-			bootclasspath="${com.mysql.jdbc.java6.rtjar}">
++			sourcepath="" srcdir="${buildDir}/${fullProdName}">
+ 			<include name="**/JDBC4*.java" />
+ 			<include name="com/mysql/jdbc/exceptions/jdbc4/*" />
+ 			
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
new file mode 100644
index 000000000000..dde4a01e1dc4
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+WANT_ANT_TASKS="ant-contrib"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="mysql-connector-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MySQL JDBC driver"
+HOMEPAGE="http://www.mysql.com/products/connector/j/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/${MY_P}.tar.gz"
+
+LICENSE="GPL-2-with-MySQL-FLOSS-exception"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE="c3p0 log4j"
+
+COMMON_DEP="
+	dev-java/slf4j-api:0
+	log4j? ( dev-java/log4j:0 )
+	c3p0? ( dev-java/c3p0:0 )"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch"
+
+	# http://bugs.mysql.com/bug.php?id=28286
+	epatch "${FILESDIR}/5.0.5-dist-target-depends.patch"
+
+	# Use java6 for everything except jdbc3 - #283848
+	epatch "${FILESDIR}/5.1.14-java6.patch"
+
+	find . -name '*.jar' -print -delete || die
+
+	cd src/lib
+	java-pkg_jar-from slf4j-api
+	use log4j && java-pkg_jar-from log4j
+	use c3p0 && java-pkg_jar-from c3p0
+}
+
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_BUILD_TARGET="dist"
+
+src_compile() {
+	# Cannot use rewrite-bootclasspath because of the jdbc4 part.
+	java-pkg-2_src_compile \
+		-Dgentoo.bootclasspath="$(java-pkg_get-bootclasspath 1.5)"
+}
+
+# Tests need a mysql DB to exist.
+RESTRICT="test"
+
+src_test() {
+	cd src/lib
+	java-pkg_jar-from junit
+
+	cd "${S}"
+	ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true
+}
+
+src_install() {
+	# Skip bytecode check because we want two versions there
+	JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar
+
+	dodoc README CHANGES
+	dohtml docs/*.html
+
+	use source && java-pkg_dosrc src/com src/org
+}
diff --git a/dev-java/jdbc-mysql/metadata.xml b/dev-java/jdbc-mysql/metadata.xml
new file mode 100644
index 000000000000..a285c6ded942
--- /dev/null
+++ b/dev-java/jdbc-mysql/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <use>
+    <flag name="c3p0">Enable c3p0 support</flag>
+    <flag name="log4j">Enable log4 support</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/jdbc-postgresql-9.2_p1003 b/dev-java/jdbc-postgresql-9.2_p1003
deleted file mode 100644
index 07bf78021fa6..000000000000
--- a/dev-java/jdbc-postgresql-9.2_p1003
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) test? ( dev-java/ant-junit dev-db/postgresql[server] ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JDBC Driver for PostgreSQL
-EAPI=5
-HOMEPAGE=https://jdbc.postgresql.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=POSTGRESQL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1003.src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ecafbb464bd36a03f196d08a6d407adb
diff --git a/dev-java/jdbc-postgresql-9.2_p1004 b/dev-java/jdbc-postgresql-9.2_p1004
deleted file mode 100644
index f377aaaa9412..000000000000
--- a/dev-java/jdbc-postgresql-9.2_p1004
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) test? ( dev-java/ant-junit dev-db/postgresql[server] ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JDBC Driver for PostgreSQL
-EAPI=5
-HOMEPAGE=https://jdbc.postgresql.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=POSTGRESQL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1004.src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=350390cc71e457245bd83f558453d66c
diff --git a/dev-java/jdbc-postgresql-9.3_p1100 b/dev-java/jdbc-postgresql-9.3_p1100
deleted file mode 100644
index 14a9d44d5ae7..000000000000
--- a/dev-java/jdbc-postgresql-9.3_p1100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) test? ( dev-java/ant-junit dev-db/postgresql[server] ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JDBC Driver for PostgreSQL
-EAPI=5
-HOMEPAGE=https://jdbc.postgresql.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=POSTGRESQL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-9.3-1100.src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=350390cc71e457245bd83f558453d66c
diff --git a/dev-java/jdbc-postgresql-9.4_p1205 b/dev-java/jdbc-postgresql-9.4_p1205
deleted file mode 100644
index 552f7b83f492..000000000000
--- a/dev-java/jdbc-postgresql-9.4_p1205
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) test? ( >=dev-db/postgresql-9.3[server] dev-java/ant-junit dev-java/junit:4 dev-java/xml-commons ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JDBC Driver for PostgreSQL
-EAPI=5
-HOMEPAGE=https://jdbc.postgresql.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=POSTGRESQL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1205.src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=985370d9d78137686d40158383120e51
diff --git a/dev-java/jdbc-postgresql-9.4_p1206 b/dev-java/jdbc-postgresql-9.4_p1206
deleted file mode 100644
index 38c880994551..000000000000
--- a/dev-java/jdbc-postgresql-9.4_p1206
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) test? ( >=dev-db/postgresql-9.3[server] dev-java/ant-junit dev-java/junit:4 dev-java/xml-commons ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JDBC Driver for PostgreSQL
-EAPI=5
-HOMEPAGE=https://jdbc.postgresql.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=POSTGRESQL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1206.src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9dfcf21018db9588a7cf2ffe63abb3d9
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
new file mode 100644
index 000000000000..2ae5e3906ad2
--- /dev/null
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -0,0 +1,13 @@
+AUX jdbc-postgresql-9.4_p1201-remove-osgi.patch 1629 BLAKE2B f358ab6ac9296ade9eb7603dc03367f984622207c259df68c3029464197b47e052b69a369889e174cc0543d51a1d07c4134e8530bab0e80de4d5f38e79557486 SHA512 dcb831f6828980b5ada1158cb80c2e5c8d6921b24b69cd0f40faec9b8d41bdaa468ca995e4a804282b816ab8b0120e371e5f21a2aff7fee6068f13affc6b097a
+AUX jdbc-postgresql-9.4_p1204-remove-sspi.patch 6853 BLAKE2B 243b64279b501b417a5570d41010decd4edb55ca11a14c1a927698ee3795b2d7e7fc9c5c6fcd95b6210bd26c3938795fcbbce1b1c4dafe259197b0db8eb60701 SHA512 17d6a1514fc824008c8f0464c4af30d038a379ade44120dc24d8f9a4f495393c6e75e82f8e9da1e51c6d22c2301ec83a842d0db6e22842661b4dda97b8335dc6
+DIST postgresql-jdbc-9.2-1003.src.tar.gz 1843082 BLAKE2B 35f6e4738e5340373ccb3cbe516f2e8f4a391b6e200b88c6adff7112b28f077c6e4108329c962b98dd2ee21e9e3db81521a324b036cc5d0d6ec9859f660bce60 SHA512 f91d9617726722998a51275c625f6ea89dfe0ac7ce415cc6fa76302b13762bcf825cd61ec69d25d0199ca21de8a24286eeffb843ad59c06fd3049a289ac2b702
+DIST postgresql-jdbc-9.2-1004.src.tar.gz 1842921 BLAKE2B 4cf0cb6da5749a9da194b9174db82289c3521edb7b7fd57d112883c185e0b80fd6feb70852eb54d7fe53d439817643bc608e9cdb3a9d9b2d43fd134031c770e9 SHA512 6e218b7df3d772e4fb9053672f5f77f6012fe6e652a536dfe171408e957465520b05994d4fa13c4d478b595a55b8068da663b9f3dcb544a46fcf91d71ba8fdf5
+DIST postgresql-jdbc-9.3-1100.src.tar.gz 1852465 BLAKE2B a81f385ff23679a1e6b268b53ea72dda744c50d043d02fe50a88421c43561a8fc63c849a974e84e1f1caa93ab20c01cc58cc9abe96f5567f5ac626263f402126 SHA512 43968a62f9443739721016ede186b2f41fa6db2d1ef319cd65059f8715e90eda7c7f568995b293578c39e04d43085cfdfece587500f99ed1a49964c12d8c747a
+DIST postgresql-jdbc-9.4-1205.src.tar.gz 2028968 BLAKE2B d4f55bc7c173795202f9eed58a67effba747b56f8dc5aaeeb2941532b3d0ce3f66ed113c38af9c2c40998191fd15d2828d05a1b693eb13a78a3d39b9fe6667b5 SHA512 ebb46c0cfcabc34083e6f481bc97536fba98d082462670d39efdd75e6463f1286db6fa07cd35546c749e456f1c06fb1d022cbc9f5cace2a1b968fab76a57d281
+DIST postgresql-jdbc-9.4-1206.src.tar.gz 2029837 BLAKE2B b222a0b2f8f99becaf0ae350407fafeb23d9d4bdb130c17996373b4211e0d56d1a76bc5737401dc6fc6618d2a891943d096b0f60f0770ff6ce859ade3e7a178d SHA512 b16816f1afd3ee5986fca197bd7608c2e2f334054e41a8c541c47985827f4f59d7691d23983bdac01c85fc364cd001c991ac6b4e8567429b9d1f4161388dd6bd
+EBUILD jdbc-postgresql-9.2_p1003.ebuild 1954 BLAKE2B 8e10a598948bfd92c0fbbf7baab34c4987fe77bca32852353c8e477cc290f0b7fb9c538da6f488a857b9085d2da86a3a35e7000ee845f30b48cc65a5fe6ddb51 SHA512 760f4705c00ac28155f1f36802dacc6e700aa55fbe5fcc753f5bc46b7847324a20c002670c8544a384ee2f98f70c4495253e5245d7d7773a8937db5eb142f9d6
+EBUILD jdbc-postgresql-9.2_p1004.ebuild 1957 BLAKE2B 6c9ca6191a38cac848393a98a23ad0bdeed90f139410abf5c8503ede4fca407af90b1a91a2fff8f91792117e1db8bb7d39a40c51a908fe6b51c4c60a6a0f9448 SHA512 c5a6ec3669bff3bc9e16c3c2ff472a6ba743cc78fc682d7f3d79c59f4db3569691d2baaaa906638c37118f945f6c3883a4753efeda00bc01bac6a21a0005fe54
+EBUILD jdbc-postgresql-9.3_p1100.ebuild 1957 BLAKE2B 6c9ca6191a38cac848393a98a23ad0bdeed90f139410abf5c8503ede4fca407af90b1a91a2fff8f91792117e1db8bb7d39a40c51a908fe6b51c4c60a6a0f9448 SHA512 c5a6ec3669bff3bc9e16c3c2ff472a6ba743cc78fc682d7f3d79c59f4db3569691d2baaaa906638c37118f945f6c3883a4753efeda00bc01bac6a21a0005fe54
+EBUILD jdbc-postgresql-9.4_p1205.ebuild 3127 BLAKE2B becf3c1a4b1b487f6d98e1488271767e9ef93a34d5c2f5f53e6276692f5a72bbe88314f2f8d0730c3e29299495e0639afd82ebbd1ec3bf0478d3ddd185ee17aa SHA512 74098a2f42506e87d322d11912aebf5d434887775c484c017142daf04c74df91541915858bbbeb4c76418999f76f30c74113ca3f83dc3d7fdd49dee9cd9a20e8
+EBUILD jdbc-postgresql-9.4_p1206.ebuild 3124 BLAKE2B 6a55d4555ebd5eb675ca261d893496319dc9399621f9e5457dc3e176270adac3a760cc31999399827f2c76d0b13ae09079b023de8ce7274270e2010bc110b585 SHA512 4e686cf33aa5933556ccc19ae4b059aa58dec11036991d5dd944c7c1262c7c41cf78944cc2e0ce8a94ae22255c9d871fc9ded491b9727d3dc707e4d675d40cc5
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-osgi.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-osgi.patch
new file mode 100644
index 000000000000..15b1860d2aa7
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-osgi.patch
@@ -0,0 +1,37 @@
+--- a/build.xml	2015-02-18 17:44:58.000000000 +0100
++++ b/build.xml	2015-03-23 02:19:03.951945663 +0100
+@@ -403,34 +403,6 @@
+         <attribute name="Implementation-Vendor" value="PostgreSQL Global Development Group" />
+       </manifest>
+     </jar>
+-
+-    <!-- add OSGi meta information -->
+-    <property name="osgidir" value="${builddir}/osgi"/>
+-    <mkdir dir="${osgidir}"/>
+-
+-    <!--   create a bnd file named after the JAR file so that bnd wrap tool find it -->
+-    <echo file="${osgidir}/${artifact.version.string}.bnd">
+-Bundle-ManifestVersion: 2
+-
+-Bundle-Name: PostgreSQL JDBC Driver ${jdbc.version.upper}
+-Bundle-SymbolicName: org.postgresql.${jdbc.version}
+-Bundle-Version: ${osgi.version}
+-
+-Bundle-Vendor: PostgreSQL Global Development Group
+-Bundle-Copyright: Copyright (c) 2003-2015, PostgreSQL Global Development Group
+-Bundle-License: http://www.postgresql.org/about/licence/
+-Bundle-DocURL: http://jdbc.postgresql.org/
+-
+-Bundle-Classpath: .
+-Bundle-Activator: org.postgresql.osgi.PGBundleActivator
+-Require-Capability: osgi.ee;filter:="(&amp;(|(osgi.ee=J2SE)(osgi.ee=JavaSE))(version>=${java.specification.version}))"
+-Export-Package: org.postgresql*; version=${fullversion}
+-Import-Package: javax.sql, javax.transaction.xa, javax.naming, *;resolution:=optional
+-    </echo>
+-
+-    <!--   run wrap task from bnd -->
+-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="dependency.build.classpath"/> 
+-    <bndwrap jars="${artifact.jar.build}" output="${artifact.jar}" definitions="${osgidir}"/>
+   </target>
+ 
+   <!-- create a distribution with docs, dependencies, and driver jar -->
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch
new file mode 100644
index 000000000000..16996892b192
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch
@@ -0,0 +1,138 @@
+--- a/org/postgresql/core/v3/ConnectionFactoryImpl.java	2015-10-09 20:55:53.000000000 +0200
++++ b/org/postgresql/core/v3/ConnectionFactoryImpl.java	2015-10-14 20:42:48.816753341 +0200
+@@ -32,7 +32,6 @@
+ import org.postgresql.hostchooser.HostChooserFactory;
+ import org.postgresql.hostchooser.HostRequirement;
+ import org.postgresql.hostchooser.HostStatus;
+-import org.postgresql.sspi.SSPIClient;
+ import org.postgresql.util.GT;
+ import org.postgresql.util.HostSpec;
+ import org.postgresql.util.MD5Digest;
+@@ -394,11 +393,7 @@
+         // or an authentication request
+ 
+         String password = PGProperty.PASSWORD.get(info);
+-        
+-        /* SSPI negotiation state, if used */
+-        SSPIClient sspiClient = null;
+ 
+-        try {
+ 	        authloop:
+ 	        while (true)
+ 	        {
+@@ -514,88 +509,16 @@
+                     case AUTH_REQ_SSPI:
+                         /* 
+                          * Use GSSAPI if requested on all platforms, via JSSE.
+-                         *
+-                         * For SSPI auth requests, if we're on Windows attempt native SSPI
+-                         * authentication if available, and if not disabled by setting a
+-                         * kerberosServerName. On other platforms, attempt JSSE GSSAPI
+-                         * negotiation with the SSPI server.
+-                         *
+-                         * Note that this is slightly different to libpq, which uses SSPI
+-                         * for GSSAPI where supported. We prefer to use the existing Java
+-                         * JSSE Kerberos support rather than going to native (via JNA) calls
+-                         * where possible, so that JSSE system properties etc continue
+-                         * to work normally.
+-                         *
+-                         * Note that while SSPI is often Kerberos-based there's no guarantee
+-                         * it will be; it may be NTLM or anything else. If the client responds
+-                         * to an SSPI request via GSSAPI and the other end isn't using Kerberos
+-                         * for SSPI then authentication will fail.
+                          */
+-                        final String gsslib = PGProperty.GSS_LIB.get(info);
+-                        final boolean usespnego = PGProperty.USE_SPNEGO.getBoolean(info);
+-                        
+-                        boolean useSSPI = false;
++                        org.postgresql.gss.MakeGSS.authenticate(pgStream, host,
++                                user, password, 
++                                PGProperty.JAAS_APPLICATION_NAME.get(info),
++                                PGProperty.KERBEROS_SERVER_NAME.get(info),
++                                logger,
++                                PGProperty.USE_SPNEGO.getBoolean(info));
++
++                        break;
+ 
+-                        /* 
+-                         * Use SSPI if we're in auto mode on windows and have a
+-                         * request for SSPI auth, or if it's forced. Otherwise
+-                         * use gssapi. If the user has specified a Kerberos server
+-                         * name we'll always use JSSE GSSAPI.
+-                         */
+-                        if (gsslib.equals("gssapi"))
+-                            logger.debug("Using JSSE GSSAPI, param gsslib=gssapi");
+-                        else if (areq == AUTH_REQ_GSS && !gsslib.equals("sspi"))
+-                            logger.debug("Using JSSE GSSAPI, gssapi requested by server and gsslib=sspi not forced");
+-                        else
+-                        {
+-                            /* Determine if SSPI is supported by the client */
+-                            sspiClient = new SSPIClient(pgStream,
+-                                    PGProperty.SSPI_SERVICE_CLASS.get(info),
+-                                    /* Use negotiation for SSPI, or if explicitly requested for GSS */
+-                                    areq == AUTH_REQ_SSPI || (areq == AUTH_REQ_GSS && usespnego),
+-                                    logger);
+-                            
+-                            useSSPI = sspiClient.isSSPISupported();
+-                            logger.debug("SSPI support detected: " + useSSPI);
+-                        
+-                            if (!useSSPI) {
+-                                /* No need to dispose() if no SSPI used */
+-                                sspiClient = null;
+-                                
+-                                if (gsslib.equals("sspi"))
+-                                    throw new PSQLException("SSPI forced with gsslib=sspi, but SSPI not available; set loglevel=2 for details", 
+-                                            PSQLState.CONNECTION_UNABLE_TO_CONNECT);
+-                            }
+-                            
+-                            logger.debug("Using SSPI: " + useSSPI + ", gsslib="+gsslib+" and SSPI support detected");
+-                        }
+-
+-                        if (useSSPI)
+-                        {
+-                            /* SSPI requested and detected as available */
+-    	                	sspiClient.startSSPI();
+-                        }
+-                        else
+-                        {
+-                            /* Use JGSS's GSSAPI for this request */
+-                            org.postgresql.gss.MakeGSS.authenticate(pgStream, host,
+-                                    user, password, 
+-                                    PGProperty.JAAS_APPLICATION_NAME.get(info),
+-                                    PGProperty.KERBEROS_SERVER_NAME.get(info),
+-                                    logger,
+-                                    usespnego);
+-                        }
+-                        
+-	                	break;
+-	                
+-	                case AUTH_REQ_GSS_CONTINUE:
+-	                	 /* 
+-	                	  * Only called for SSPI, as GSS is handled by an inner loop
+-	                	  * in MakeGSS.
+-	                	  */
+-	                	sspiClient.continueSSPI(l_msgLen - 8);
+-	                	break;
+-	                	
+ 	                case AUTH_REQ_OK:
+ 	                    /* Cleanup after successful authentication */
+ 	                    if (logger.logDebug())
+@@ -616,18 +539,6 @@
+ 	                throw new PSQLException(GT.tr("Protocol error.  Session setup failed."), PSQLState.PROTOCOL_VIOLATION);
+ 	            }
+ 	        }
+-        } finally {
+-        	/* Cleanup after successful or failed authentication attempts */
+-        	if (sspiClient != null)
+-        	{
+-        		try {
+-        			sspiClient.dispose();
+-        		} catch (RuntimeException ex) {
+-        			logger.log("Unexpected error during SSPI context disposal", ex);
+-        		}
+-        		
+-        	}
+-        }
+         
+     }
+ 
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
new file mode 100644
index 000000000000..276db9dd4d51
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="https://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="https://jdbc.postgresql.org/"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="test"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	test? (
+		dev-java/ant-junit
+		dev-db/postgresql[server]
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
+
+java_prepare() {
+	find -name "*.class" -type f -exec rm -v {} + || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_DOC_TARGET="publicapi"
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	# There is a task that creates this doc but I didn't find a way how to use system catalog
+	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
+	if use doc; then
+		mkdir -p "${S}/build/doc"
+		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+			"${S}/doc/pgjdbc.xml"
+	fi
+}
+
+src_test() {
+	einfo "In order to run the tests successfully, you have to have:"
+	einfo "1) PostgreSQL server running"
+	einfo "2) database 'test' defined with user 'test' with password 'password'"
+	einfo "   as owner of the database"
+	einfo "3) plpgsql support in the 'test' database"
+	einfo
+	einfo "You can find a general info on how to perform these steps at"
+	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
+
+	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit)
+}
+
+src_install() {
+	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
+
+	if use doc ; then
+		java-pkg_dojavadoc build/publicapi
+		dohtml build/doc/pgjdbc.html
+	fi
+
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
new file mode 100644
index 000000000000..85728f172373
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="https://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="https://jdbc.postgresql.org/"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	test? (
+		dev-java/ant-junit
+		dev-db/postgresql[server]
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
+
+java_prepare() {
+	find -name "*.class" -type f -exec rm -v {} + || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_DOC_TARGET="publicapi"
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	# There is a task that creates this doc but I didn't find a way how to use system catalog
+	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
+	if use doc; then
+		mkdir -p "${S}/build/doc"
+		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+			"${S}/doc/pgjdbc.xml"
+	fi
+}
+
+src_test() {
+	einfo "In order to run the tests successfully, you have to have:"
+	einfo "1) PostgreSQL server running"
+	einfo "2) database 'test' defined with user 'test' with password 'password'"
+	einfo "   as owner of the database"
+	einfo "3) plpgsql support in the 'test' database"
+	einfo
+	einfo "You can find a general info on how to perform these steps at"
+	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
+
+	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit)
+}
+
+src_install() {
+	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
+
+	if use doc ; then
+		java-pkg_dojavadoc build/publicapi
+		dohtml build/doc/pgjdbc.html
+	fi
+
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
new file mode 100644
index 000000000000..85728f172373
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="https://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="https://jdbc.postgresql.org/"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	test? (
+		dev-java/ant-junit
+		dev-db/postgresql[server]
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
+
+java_prepare() {
+	find -name "*.class" -type f -exec rm -v {} + || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_DOC_TARGET="publicapi"
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	# There is a task that creates this doc but I didn't find a way how to use system catalog
+	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
+	if use doc; then
+		mkdir -p "${S}/build/doc"
+		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+			"${S}/doc/pgjdbc.xml"
+	fi
+}
+
+src_test() {
+	einfo "In order to run the tests successfully, you have to have:"
+	einfo "1) PostgreSQL server running"
+	einfo "2) database 'test' defined with user 'test' with password 'password'"
+	einfo "   as owner of the database"
+	einfo "3) plpgsql support in the 'test' database"
+	einfo
+	einfo "You can find a general info on how to perform these steps at"
+	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
+
+	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit)
+}
+
+src_install() {
+	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
+
+	if use doc ; then
+		java-pkg_dojavadoc build/publicapi
+		dohtml build/doc/pgjdbc.html
+	fi
+
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
new file mode 100644
index 000000000000..7d5e2a0e06f3
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="https://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="https://jdbc.postgresql.org/"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	test? (
+		>=dev-db/postgresql-9.3[server]
+		dev-java/ant-junit
+		dev-java/junit:4
+		dev-java/xml-commons
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+RESTRICT="test" # Requires external postgresql server setup
+
+S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_DOC_TARGET="publicapi"
+
+java_prepare() {
+	# Strip build.xml of maven deps
+	sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
+	sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
+	sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die
+	sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die
+	sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die
+
+	# Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
+	sed -i -e '/<include.*sspi/c\' build.xml || die
+	rm -vrf org/postgresql/sspi || die "Error removing sspi"
+	epatch "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch
+
+	# FIXME @someone who cares: enable through osgi flag?
+	sed -i -e '/<include.*osgi/c\' build.xml || die
+	sed -i -e '/<test.*osgi/c\' build.xml || die
+	rm -vrf org/postgresql/osgi || die "Error removing osgi"
+	rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
+	epatch "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
+
+	java-pkg_clean
+}
+
+src_compile() {
+	EANT_BUILD_TARGET="release-version jar"
+	java-pkg-2_src_compile
+
+	# There is a task that creates this doc but I didn't find a way how to use system catalog
+	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
+	if use doc; then
+		mkdir -p "${S}/build/doc" || die
+		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+			"${S}/doc/pgjdbc.xml" || die
+	fi
+}
+
+src_test() {
+	einfo "In order to run the tests successfully, you have to have:"
+	einfo "1) PostgreSQL server running"
+	einfo "2) database 'test' defined with user 'test' with password 'test'"
+	einfo "   as owner of the database"
+	einfo "3) plpgsql support in the 'test' database"
+	einfo
+	einfo "You can find a general info on how to perform these steps at"
+	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
+
+	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "junit-4,xml-commons")
+}
+
+src_install() {
+	java-pkg_newjar build/jars/postgresql*.jar jdbc-postgresql.jar
+
+	if use doc ; then
+		java-pkg_dojavadoc build/publicapi
+		dohtml build/doc/pgjdbc.html
+	fi
+
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
new file mode 100644
index 000000000000..d15404c14f40
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="https://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="https://jdbc.postgresql.org/"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="test"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	test? (
+		>=dev-db/postgresql-9.3[server]
+		dev-java/ant-junit
+		dev-java/junit:4
+		dev-java/xml-commons
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+RESTRICT="test" # Requires external postgresql server setup
+
+S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_DOC_TARGET="publicapi"
+
+java_prepare() {
+	# Strip build.xml of maven deps
+	sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
+	sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
+	sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die
+	sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die
+	sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die
+
+	# Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
+	sed -i -e '/<include.*sspi/c\' build.xml || die
+	rm -vrf org/postgresql/sspi || die "Error removing sspi"
+	epatch "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch
+
+	# FIXME @someone who cares: enable through osgi flag?
+	sed -i -e '/<include.*osgi/c\' build.xml || die
+	sed -i -e '/<test.*osgi/c\' build.xml || die
+	rm -vrf org/postgresql/osgi || die "Error removing osgi"
+	rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
+	epatch "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
+
+	java-pkg_clean
+}
+
+src_compile() {
+	EANT_BUILD_TARGET="release-version jar"
+	java-pkg-2_src_compile
+
+	# There is a task that creates this doc but I didn't find a way how to use system catalog
+	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
+	if use doc; then
+		mkdir -p "${S}/build/doc" || die
+		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+			"${S}/doc/pgjdbc.xml" || die
+	fi
+}
+
+src_test() {
+	einfo "In order to run the tests successfully, you have to have:"
+	einfo "1) PostgreSQL server running"
+	einfo "2) database 'test' defined with user 'test' with password 'test'"
+	einfo "   as owner of the database"
+	einfo "3) plpgsql support in the 'test' database"
+	einfo
+	einfo "You can find a general info on how to perform these steps at"
+	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
+
+	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "junit-4,xml-commons")
+}
+
+src_install() {
+	java-pkg_newjar build/jars/postgresql*.jar jdbc-postgresql.jar
+
+	if use doc ; then
+		java-pkg_dojavadoc build/publicapi
+		dohtml build/doc/pgjdbc.html
+	fi
+
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/jdbc-postgresql/metadata.xml b/dev-java/jdbc-postgresql/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jdbc-postgresql/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jdbc2-stdext-2.0-r3 b/dev-java/jdbc2-stdext-2.0-r3
deleted file mode 100644
index 33c995291cb9..000000000000
--- a/dev-java/jdbc2-stdext-2.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A standard set of libs for Server-Side JDBC support
-EAPI=5
-HOMEPAGE=http://www.oracle.com/technetwork/java/index.html
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=~amd64
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=fetch
-SLOT=0
-SRC_URI=jdbc2_0-stdext-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bec5e47bbf4c177b05574192aca193e5
diff --git a/dev-java/jdbc2-stdext/Manifest b/dev-java/jdbc2-stdext/Manifest
new file mode 100644
index 000000000000..e57235924670
--- /dev/null
+++ b/dev-java/jdbc2-stdext/Manifest
@@ -0,0 +1,3 @@
+DIST jdbc2_0-stdext-src.zip 21642 BLAKE2B 475892fc77247a93eaaf400e48c585832df843cedcd1ff2f8de364f6895fc9661d1d2241969b126fbb056b23be78085317fbb14c69c349612d39b700913a5b72 SHA512 5157a5835983c094b13d947a39311d08ea57cd8e60197176681289d41a209f3f8b464e1e0dd97ed714534ba5afb749807e02efb3edba4e2c91e273e71f6f1ce3
+EBUILD jdbc2-stdext-2.0-r3.ebuild 1523 BLAKE2B a5ec3bd1adcda9a4317a01539a68ff4148f56a2e0bfe62aaacb57e3a8ae1a344c2f1f74437f26347e206703374ae4d742d27efa4d5ef83acb04dc9d07bb383c8 SHA512 1532f846d6ce1e2287d28e963b68ef689b2572f0eea2c795b97f22ef373eee2a4b5b618f4442221b5f8704fb8eba111618c38417d749735aefa911a145afda30
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
new file mode 100644
index 000000000000..f49f640216bc
--- /dev/null
+++ b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2
+
+stdext_src="jdbc2_0-stdext-src.zip"
+stdext_jar="jdbc2-stdext.jar"
+
+DESCRIPTION="A standard set of libs for Server-Side JDBC support"
+HOMEPAGE="http://www.oracle.com/technetwork/java/index.html"
+SRC_URI="${stdext_src}"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="fetch"
+
+RDEPEND="
+	>=virtual/jre-1.4"
+
+DEPEND="
+	>=virtual/jdk-1.4
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	local download_url="http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-database-419422.html#7099-jdbc-2.0-src-oth-JPR"
+
+	einfo
+	einfo " Due to license restrictions, we cannot fetch the"
+	einfo " distributables automagically."
+	einfo
+	einfo " 1. Visit ${download_url}"
+	einfo " 2. Select 'JDBC Standard Extension Source 2.0'"
+	einfo " 3. Download ${stdext_src}"
+	einfo " 4. Move to ${DISTDIR}"
+	einfo
+	einfo " Run emerge on this package again to complete"
+	einfo
+}
+
+src_unpack() {
+	mkdir src || die
+	cd src || die
+	unpack ${A}
+}
+
+src_compile() {
+	mkdir classes || die
+	ejavac -d classes src/javax/sql/*.java
+	jar cf "${stdext_jar}" -C classes/ . || die "jar failed"
+
+	if use doc; then
+		javadoc -d api -source $(java-pkg_get-source) -sourcepath src/ \
+			javax.sql || die "javadoc failed"
+	fi
+}
+
+src_install() {
+	java-pkg_dojar "${stdext_jar}"
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jdbc2-stdext/metadata.xml b/dev-java/jdbc2-stdext/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jdbc2-stdext/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jdbm-0.12-r2 b/dev-java/jdbm-0.12-r2
deleted file mode 100644
index e67701b9d67a..000000000000
--- a/dev-java/jdbm-0.12-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.3 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Jdbm aims to be for Java what GDBM is for Perl, Python, C, ...
-EAPI=0
-HOMEPAGE=http://jdbm.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://sourceforge/jdbm/jdbm-0.12-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=54ad1751c0030b90e8a0e278d16ee1e3
diff --git a/dev-java/jdbm/Manifest b/dev-java/jdbm/Manifest
new file mode 100644
index 000000000000..259e015ff65e
--- /dev/null
+++ b/dev-java/jdbm/Manifest
@@ -0,0 +1,4 @@
+AUX jdbm-0.12-buildfile.patch 2260 BLAKE2B 8eb654c83944cd2b1ba53d65cd0ba1d99a41e017e18c847b44d0c1775b04138e33de9681e3aa6e178ecb7080c3b857f880720930ee8e8c0ee2ef546814cc5b46 SHA512 22a86d1d647bac6d384fcf69cfb17013396235c113d40c5c38cfa05702ab38e2540d5bd38921d0975f4cac0f22d717b550417569a8dc9a4442abb392e9865565
+DIST jdbm-0.12-src.zip 969490 BLAKE2B c40ec523c0dfbfe617ffb8b6bb91a1c43cc65d735c9e80970ebfc765c4ef304fa71497670b747c42db55b067a6b0600b184f2ca060089ccfd289849c4f515fc4 SHA512 cf65a89d1b3262aba40a2b10cdf3bbc1ed75fd60facfbd22baad2cfbcf81b5d67d3b7a372c7018907eedbcbb0114ddbb8d13b6cb7bc47896c47997996b0d57ec
+EBUILD jdbm-0.12-r2.ebuild 879 BLAKE2B ff0b3495b8dd43d2511553dbb144931c21595b08e810c0e4e1ede122dcef2dc2b2e9e98e59421e7422075aeb75ca5fbc6948a14c2790e7603486784b67eb0bbc SHA512 5c825d35e96b4a86322ea751c2300d22f43c5b532305ea410f438f474f43c8eb266aaeb170f5e3c39f7660bee0a3dd7074b4e44c393bd8fc39505773d67e9373
+MISC metadata.xml 310 BLAKE2B 39f67322e71ef31c835b666cf49f3e80d6c16b122d878ac9f19217664f518f69f64cfcd395f5c61512be2e4362117902feb3c661a9596c15c97934e0aee31445 SHA512 2a8c6e7833374873e0087786096a22d53369de951067051786d9d11fb657c8285d1f3dfc1c5b77a12f3172096eef2cfe4129477990806c7f193dad47a068e724
diff --git a/dev-java/jdbm/files/jdbm-0.12-buildfile.patch b/dev-java/jdbm/files/jdbm-0.12-buildfile.patch
new file mode 100644
index 000000000000..23957e131c50
--- /dev/null
+++ b/dev-java/jdbm/files/jdbm-0.12-buildfile.patch
@@ -0,0 +1,53 @@
+--- build.xml.orig	2005-02-05 23:34:43.000000000 +0100
++++ build.xml	2005-02-06 00:02:39.392389088 +0100
+@@ -1,9 +1,9 @@
+-<project name="JDBM" default="main" basedir=".">

++<project name="JDBM" default="main" basedir="..">

+ 

+   <target name="init">

+     <property name="project" value="jdbm" />

+     <property name="source" value="./src" />

+-    <property name="main" value="${source}/main" />

++    <property name="main.src" value="${source}/main" />

+     <property name="etc" value="${source}/etc" />

+     <property name="build" value="build" />

+     <property name="classes" value="${build}/classes" />

+@@ -16,7 +16,7 @@
+     <property name="build.compiler" value="classic" />

+     <property name="deprecation" value="true" />

+     <property file="VERSION" />

+-    <property name="archive" value="${project}-${version}" />

++    <property name="archive" value="${project}" />

+   </target>

+ 

+ 

+@@ -46,7 +46,7 @@
+ 

+ 

+   <!-- Prepare target directories -->

+-  <target name="prepare">

++  <target name="prepare" depends="init">

+     <mkdir dir="${build}"/>

+     <mkdir dir="${classes}"/>

+     <mkdir dir="${dist}"/>

+@@ -61,8 +61,9 @@
+ 

+   <!-- Build all the sources with debug and deprecation -->

+   <target name="main" depends="prepare">

+-    <javac srcdir="${main}" destdir="${classes}" excludes="**/package.html"

+-           classpath="${classpath}" debug="on" deprecation="${deprecation}" />

++	  <javac srcdir="${source}/main" destdir="${classes}" excludes="**/package.html"

++		  classpath="${classpath}" debug="on" deprecation="${deprecation}" 

++		  target="1.3" source="1.3" />

+   </target>

+ 

+   <!-- Same as main, but also cleans and additional targets -->

+@@ -131,7 +132,7 @@
+     <mkdir    dir="${build}/doc/javadoc" />

+     <property name="copyright"

+               value="Cees de Groot (C) 2000-2001. All rights reserved  http://jdbm.sourceforge.net" />

+-    <javadoc  sourcepath="${main}" destdir="${build}/doc/javadoc" dir="."

++      <javadoc  sourcepath="${source}/main" destdir="${build}/doc/javadoc" 

+               doctitle="JDBM JavaDoc" windowtitle="JDBM JavaDoc" bottom="${copyright}"

+               package="true" author="true" version="true" noindex="true"

+               packagenames="jdbm.*" />

diff --git a/dev-java/jdbm/jdbm-0.12-r2.ebuild b/dev-java/jdbm/jdbm-0.12-r2.ebuild
new file mode 100644
index 000000000000..1b4cb774349c
--- /dev/null
+++ b/dev-java/jdbm/jdbm-0.12-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Jdbm aims to be for Java what GDBM is for Perl, Python, C, ..."
+HOMEPAGE="http://jdbm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# Needs to depend on 1.3 because this uses assert
+# so we need -source 1.3 here.
+RDEPEND=">=virtual/jre-1.3"
+DEPEND=">=virtual/jdk-1.3
+	app-arch/unzip"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}/src"
+	epatch "${FILESDIR}/${P}-buildfile.patch"
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+}
+
+src_compile() {
+	cd "${S}/src"
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use doc && java-pkg_dojavadoc build/doc/javadoc
+	use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/jdbm/metadata.xml b/dev-java/jdbm/metadata.xml
new file mode 100644
index 000000000000..a0bbdd29a363
--- /dev/null
+++ b/dev-java/jdbm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jdbm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jdepend-2.9-r5 b/dev-java/jdepend-2.9-r5
deleted file mode 100644
index 89fa8cd5b2f7..000000000000
--- a/dev-java/jdepend-2.9-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=app-arch/unzip-5.50-r1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Traverses Java class file directories and generates design quality metrics
-EAPI=5
-HOMEPAGE=http://www.clarkware.com/software/JDepend.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.clarkware.com/software/jdepend-2.9.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=125d82afc050bdbf5e66ec30e03cdb4e
diff --git a/dev-java/jdepend/Manifest b/dev-java/jdepend/Manifest
new file mode 100644
index 000000000000..f3e645be52ab
--- /dev/null
+++ b/dev-java/jdepend/Manifest
@@ -0,0 +1,3 @@
+DIST jdepend-2.9.zip 302836 BLAKE2B dcf3b9c37037926d3792932327ddeb1e95fbbc47beaffb2197653b32bb919a0f3bb4d80c3b32d8e8d83f58e3c216ae5ae6e7ad923971adb460ef0d7fd6036149 SHA512 93ae1ca82422be0dce9794f25ad98c078da7437bca59c697405806a462f81b52028e0536075e2a2f428d8f8c5a27ae50fa7a580b75edbd4e8c9c750315b1c919
+EBUILD jdepend-2.9-r5.ebuild 867 BLAKE2B 4746955577691bea512a8e5294e14769b85d522342f4220a4bccd8589da1b81876cfa0d493906057360dae73355271ffdf62ace15b3e3e7f59dcd2578a344d2a SHA512 5ee63dee5b8a989c727dfea01f0c8306a8d61cf49a4702b71b4f6827f2595d0eaae39be518b5fbd217e14369e16bc5acfeecc1b707520087bcbba48029b5b980
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdepend/jdepend-2.9-r5.ebuild b/dev-java/jdepend/jdepend-2.9-r5.ebuild
new file mode 100644
index 000000000000..0874404b4dec
--- /dev/null
+++ b/dev-java/jdepend/jdepend-2.9-r5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Traverses Java class file directories and generates design quality metrics"
+HOMEPAGE="http://www.clarkware.com/software/JDepend.html"
+SRC_URI="http://www.clarkware.com/software/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	>=app-arch/unzip-5.50-r1"
+RDEPEND=">=virtual/jre-1.4"
+
+java_prepare() {
+	rm -v "${S}"/lib/*.jar || die
+}
+
+src_install() {
+	java-pkg_newjar dist/jdepend-2.9.jar
+	dodoc README || die
+	dohtml -r docs/* || die
+	use doc && java-pkg_dojavadoc build/docs/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jdepend/metadata.xml b/dev-java/jdepend/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jdepend/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jdom-1.0-r4 b/dev-java/jdom-1.0-r4
deleted file mode 100644
index e033228e5557..000000000000
--- a/dev-java/jdom-1.0-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java API to manipulate XML data
-EAPI=0
-HOMEPAGE=http://www.jdom.org
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=JDOM
-PDEPEND=~dev-java/jdom-jaxen-1.0
-RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=http://www.jdom.org/dist/source/archive/jdom-1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3bcea5ca8aaa37a62ae230634c1e95f4
diff --git a/dev-java/jdom-1.1.3 b/dev-java/jdom-1.1.3
deleted file mode 100644
index 6ab7b0fb5fe8..000000000000
--- a/dev-java/jdom-1.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java API to manipulate XML data
-EAPI=5
-HOMEPAGE=http://www.jdom.org
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=JDOM
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=38a316984f1744a845187ef80af3f7cc
diff --git a/dev-java/jdom-2.0.6-r4 b/dev-java/jdom-2.0.6-r4
deleted file mode 100644
index c9dbfa0371e2..000000000000
--- a/dev-java/jdom-2.0.6-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/xalan:0 dev-java/jaxen:1.1 dev-java/iso-relax:0 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java API to manipulate XML data
-EAPI=5
-HOMEPAGE=http://www.jdom.org
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-1.1
-RDEPEND=dev-java/xalan:0 dev-java/jaxen:1.1 dev-java/iso-relax:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=07e6a0339f0650a8ffceb89b2ff929d4
diff --git a/dev-java/jdom-jaxen-1.0-r1 b/dev-java/jdom-jaxen-1.0-r1
deleted file mode 100644
index b479c3f8b866..000000000000
--- a/dev-java/jdom-jaxen-1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip ~dev-java/jdom-1.0 =dev-java/jaxen-1.1* dev-java/saxpath >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-DESCRIPTION=Jaxen binding for jdom
-EAPI=0
-HOMEPAGE=http://www.jdom.org
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=JDOM
-RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0 =dev-java/jaxen-1.1* dev-java/saxpath >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-SLOT=1.0
-SRC_URI=http://www.jdom.org/dist/source/jdom-1.0.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a1dc31a87a16cf07d872cdede806e42a
diff --git a/dev-java/jdom-jaxen/Manifest b/dev-java/jdom-jaxen/Manifest
new file mode 100644
index 000000000000..e30caa25cbd1
--- /dev/null
+++ b/dev-java/jdom-jaxen/Manifest
@@ -0,0 +1,3 @@
+DIST jdom-1.0.tar.gz 3571788 BLAKE2B f411941b333cb0876a2a88828a8938a346d1a008764638f58723634f24c48a843b71db1c8ddbbc62bc07bba825d5d3f24ae438668ce99389d10415ac5d1a64a8 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24
+EBUILD jdom-jaxen-1.0-r1.ebuild 1178 BLAKE2B 96efb11d3a4595cb0fd854857c67a93404f91adfd5dad2502901c47a247a748485505915ec3b6f976c28b94707448337ac58d93bd739ccd099b2df56313826ee SHA512 943a4be36844ca39ca04d173b284de1d1e74a1bfc9b7163c1c61a808d70e1f1130ce01422816b8613853d2b511caafa1eb0cc3039ed44e8aebc970187c276948
+MISC metadata.xml 354 BLAKE2B 2e90828664feb3fefdad2c5e38a1b12bade88a67bb53e746d947c82277685961a44fb35b562df996d9fadfa0fa3310a1539abc834469d2f656b9d5720fb7812b SHA512 8576436758389c1f32c253956f783ec2ca0a6b2cc5825a373fc7107a74d7910d718dcc9fb803162500edab7d01d2f068fce61398119bf23da3fd6099eb695d3b
diff --git a/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild b/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild
new file mode 100644
index 000000000000..23aa620ab074
--- /dev/null
+++ b/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE=""
+
+inherit base java-pkg-2
+
+MY_PN="jdom"
+
+DESCRIPTION="Jaxen binding for jdom"
+HOMEPAGE="http://www.jdom.org"
+SRC_URI="http://www.jdom.org/dist/source/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE=""
+
+COMMON_DEP="~dev-java/jdom-${SLOT}
+			=dev-java/jaxen-1.1*
+			dev-java/saxpath"
+
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	cd "${S}/src/java/org/jdom/xpath/"
+	mv JaxenXPath.java JaxenXPath.java.bak
+	sed 's/SAXPathException/Exception/g' JaxenXPath.java.bak > JaxenXPath.java
+
+	cd "${S}"
+
+	mkdir -p "${S}/build/org/jdom/xpath" || die "Unable to create dir."
+	ejavac -d "${S}/build/" \
+		-classpath $(java-config -p jdom-${SLOT},jaxen-1.1,saxpath) \
+		src/java/org/jdom/xpath/JaxenXPath.java
+
+	jar cf jdom-jaxen.jar -C build org || die "Failed to create jar."
+}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+}
diff --git a/dev-java/jdom-jaxen/metadata.xml b/dev-java/jdom-jaxen/metadata.xml
new file mode 100644
index 000000000000..393226d80add
--- /dev/null
+++ b/dev-java/jdom-jaxen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription lang="en">
+Jaxen binding for jdom.  Split from jdom to resolve circular dependencies.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
new file mode 100644
index 000000000000..00285e885c33
--- /dev/null
+++ b/dev-java/jdom/Manifest
@@ -0,0 +1,8 @@
+AUX build-xml-2.patch 1529 BLAKE2B 37aee7dc0ab5b130c16a67b2470e8e3d4052b73c9cc944fc5f1e6cf5b1c8d57d046260829f7a785a0f7b35240318fc9bbcb28fc10b245981dd36957637084fa3 SHA512 210f0fa113a75a0bb2f34b50e3893df69e5b7f02174f7f10ea981cd16371da515a6c8514c2f82045c3a6a64c5a11874b2f81e5ad975270f11eb8c12fa707f563
+DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
+DIST jdom-1.0.tar.gz 3571788 BLAKE2B f411941b333cb0876a2a88828a8938a346d1a008764638f58723634f24c48a843b71db1c8ddbbc62bc07bba825d5d3f24ae438668ce99389d10415ac5d1a64a8 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24
+DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
+EBUILD jdom-1.0-r4.ebuild 1365 BLAKE2B 362d41c64040b187d6245444f30e73e06b7a0f959fe5d9aaa6cf2a44bf443a3ea1a32a29b0d73e332dfdf924a551232d3bd587968d4c0166ba3f15fca5e407c9 SHA512 abcf550b34518e4c4873b4ef5a90682a7ecece474ffe5cdd02c14176169e27a913b43171eb606c9f25ceaf107e165d0987341664beca4da5443e40516ab68bc5
+EBUILD jdom-1.1.3.ebuild 1257 BLAKE2B 9d7d93ab036539abbe0d945e7b7f0767b0e7d0a3f39ec68f7bb20047ad5182bb283160e9fe3484d5cad853b17479947ae3e1edfb1113c76483b8c4da4d70fa84 SHA512 91cbb5345d46dcd100384da0f249749dc840aaddc90f4d525ae14dc22e2dcff06d8649713d343e81de1c5d9cb99c5559adcd23156a7be33e6be5ac428ab6be41
+EBUILD jdom-2.0.6-r4.ebuild 1358 BLAKE2B a55b3a295f11d855d15cd2ab4f91a0fc8805aa8881cf2f374d970c4b43ef829add955b283ba410202d370c0eb53777f87e943d54868d2ff0c0e327c6160cdf11 SHA512 32aaaca3059544b6aaae40545f3350799efd730cf790d5acb101886b3534f6b21d75df5bfc9e2addb0964cf5466a5f527a0ea127eeab2045b70ebbda9d488b01
+MISC metadata.xml 318 BLAKE2B cbcc3f9c0ce67aa9619d21197006bffc71f6ae3d0707a5bdd3902a0d51f90724f3ce81e21c80f6a011885cd036f397d2cb679335d05a0e1bf7e4bff3470c9019 SHA512 1587f961d80cba775d94e97a9c41516766d6a502f9b144f401ebcd0ee0b21b2e04220730c03a44986af8bc860a0311acdd6e721d4de201defcbc89599df5803b
diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
new file mode 100644
index 000000000000..2e3cb94ef1d2
--- /dev/null
+++ b/dev-java/jdom/files/build-xml-2.patch
@@ -0,0 +1,36 @@
+--- build.xml.orig	2015-02-15 02:58:04.000000000 +0000
++++ build.xml	2015-08-27 23:11:09.807800249 +0100
+@@ -267,7 +267,7 @@
+ 		</javac>

+ 	</target>

+ 	

+-	<target name="compile" depends="compile.core, compile.junit, compile.contrib, compile.samples"

++	<target name="compile" depends="compile.core, compile.contrib, compile.samples"

+ 	 		description="Compiles all JDOM code (core, samples, junit, contrib)" />

+ 

+ 	<!-- =================================================================== -->

+@@ -296,7 +296,7 @@
+ 	<!-- =================================================================== -->

+ 	<!-- Creates the jars                                           -->

+ 	<!-- =================================================================== -->

+-	<target name="jars" depends="compile, javadoc"

++	<target name="jars" depends="compile"

+ 	    description="Builds the Jars">

+ 		<fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>

+ 		<fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>

+@@ -320,6 +320,7 @@
+ 			<fileset dir="${contrib.build}" includes="**/*" />

+ 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />

+ 		</jar>

++<!--

+ 		<jar jarfile="${package}/${jarbase}-junit.jar" >

+ 			<fileset dir="${junit.build}" includes="**/*" />

+ 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />

+@@ -332,6 +333,7 @@
+ 			<fileset dir="${contrib.src}" includes="**/*" />

+ 		</jar>

+ 	    	    

++-->

+ 	</target>

+ 	

+ 	<target name="androidtests" depends="jars">

diff --git a/dev-java/jdom/jdom-1.0-r4.ebuild b/dev-java/jdom/jdom-1.0-r4.ebuild
new file mode 100644
index 000000000000..124849d18db7
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/source/archive/${P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+COMMON_DEP="dev-java/saxpath
+		>=dev-java/xerces-2.7"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+PDEPEND="~dev-java/jdom-jaxen-${PV}"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v build/*.jar lib/*.jar || die
+	rm -rf build/{apidocs,samples} || die
+
+	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+		|| die "Unable to remove Jaxen Binding class."
+
+	cd "${S}"/lib
+	java-pkg_jar-from saxpath,xerces-2
+}
+
+src_compile() {
+	# to prevent a newer jdom from going into cp
+	# (EANT_ANT_TASKS doesn't work with none)
+	ANT_TASKS="none" eant package $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar build/*.jar
+
+	java-pkg_register-dependency "jdom-jaxen-${SLOT}"
+
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
new file mode 100644
index 000000000000..50b12a26e0cf
--- /dev/null
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	java-pkg_clean
+
+	rm -r build/apidocs || die
+
+	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+		|| die "Unable to remove Jaxen Binding class."
+
+	sed -i -e 's|${name}-${version.impl}|${name}|g' \
+		-e 's|<jar jarfile="${build.dir}/${name}-sources|<!-- <jar jarfile="${build.dir}/${name}-sources|' \
+		-e 's|build.javadocs}" />|build.javadocs}" /> -->|' \
+		"${S}"/build.xml || die
+
+	if ! use doc; then
+		sed -i -e 's|depends="compile,javadoc"|depends="compile"|' \
+			"${S}"/build.xml || die
+	fi
+}
+
+EANT_BUILD_TARGET="package"
+
+src_install() {
+	java-pkg_dojar build/*.jar
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
new file mode 100644
index 000000000000..d93a466620b3
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P="JDOM-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="Apache-1.1"
+SLOT="2"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="test"
+
+CDEPEND="
+	dev-java/xalan:0
+	dev-java/jaxen:1.1
+	dev-java/iso-relax:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="jars"
+EANT_TEST_TARGET="junit"
+EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.1,xalan"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/build-xml-2.patch"
+)
+
+java_prepare() {
+	java-pkg_clean
+
+	epatch "${PATCHES[@]}"
+
+	# Remove Android stuff to avoid junit RDEPEND.
+	rm -vr contrib/src/java/org/jdom2/contrib/android || die
+}
+
+src_install() {
+	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
+	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
+
+	dodoc {CHANGES,COMMITTERS,README,TODO}.txt
+	use doc && java-pkg_dojavadoc build/apidocs
+	use source && java-pkg_dosrc {contrib,core}/src/java/*
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/jdom/metadata.xml b/dev-java/jdom/metadata.xml
new file mode 100644
index 000000000000..ea64c2542284
--- /dev/null
+++ b/dev-java/jdom/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hunterhacker/jdom</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jdynamite-1.2-r1 b/dev-java/jdynamite-1.2-r1
deleted file mode 100644
index d9085cb791db..000000000000
--- a/dev-java/jdynamite-1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/gnu-regexp:1 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Dynamic Template in Java
-EAPI=5
-HOMEPAGE=http://jdynamite.sourceforge.net/doc/jdynamite.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-java/gnu-regexp:1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jdynamite/jdynamite1_2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6591e25c0cd34754b8ebf14fa6c0bb7e
diff --git a/dev-java/jdynamite/Manifest b/dev-java/jdynamite/Manifest
new file mode 100644
index 000000000000..5eacef73ac05
--- /dev/null
+++ b/dev-java/jdynamite/Manifest
@@ -0,0 +1,3 @@
+DIST jdynamite1_2.tar.gz 216501 BLAKE2B d945ad40e7b174722dc81b23f50f02c67e92f5ca274a0e6de48e80921d6f3081a4fc41b977ee457e0184d1c628e67702ef93da0440744fe392399e3f65265f14 SHA512 922dc3755fc673d228edcbb7d20084a7d2123b936b5c38514781bd0c5eeef4a6420a4ca7256fb3ca8796fb057b854c49c6bacd9ca76ac9fdb24b3d3404ea4aea
+EBUILD jdynamite-1.2-r1.ebuild 703 BLAKE2B d9e9c3c480f6bd93f5eb7ae47ab84a03a25b2898cb7c2e03b3de3649a3a918720e2f3411707d902267467d698b1839e07f72efac60c720ddead0c1f05ecf0842 SHA512 0a874cd9a657e9bc6b43345146094770c28f8854a9af17ca98e03707f8df8585e5d0f4acf34b2bd9c0d5263760e19cff40b3759083c255b30cf580fd17012b75
+MISC metadata.xml 315 BLAKE2B f772efc2a7254e127d399ba5c70c23524ecb7dbea42b8e039a1aac2d2ced8a7cc3ec436202f8fedad89cb8e0675cae91da0e14e7e7ee8bcfaccfc2757f798d19 SHA512 4cedb3a84f7a4de55bc8059324b56b70019f8a95ce578180a8bc3c73f4f25528a58be4c08a22308f6db43b0f224bfaa6b1cdc701b5aebc499da83dc6db6a010a
diff --git a/dev-java/jdynamite/jdynamite-1.2-r1.ebuild b/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
new file mode 100644
index 000000000000..484edc88acf1
--- /dev/null
+++ b/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV="${PV/./_}"
+DESCRIPTION="Dynamic Template in Java"
+HOMEPAGE="http://jdynamite.sourceforge.net/doc/jdynamite.html"
+SRC_URI="mirror://sourceforge/${PN}/${PN}${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/gnu-regexp:1"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}${PV}"
+
+JAVA_GENTOO_CLASSPATH="gnu-regexp-1"
+JAVA_SRC_DIR="src/cb/jdynamite"
+
+java_prepare() {
+	rm -fvr "${S}"/{lib/*,cb,src/gnu,build.xml} || die
+}
diff --git a/dev-java/jdynamite/metadata.xml b/dev-java/jdynamite/metadata.xml
new file mode 100644
index 000000000000..4503586e61d9
--- /dev/null
+++ b/dev-java/jdynamite/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jdynamite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jebl-2013.02.18 b/dev-java/jebl-2013.02.18
deleted file mode 100644
index ad9584044f31..000000000000
--- a/dev-java/jebl-2013.02.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Evolutionary Biology Library
-EAPI=5
-HOMEPAGE=http://jebl.sourceforge.net/
-IUSE=elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/jebl-2013.02.18.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7f09f4583807b47004872a3b3b71933b
diff --git a/dev-java/jebl/Manifest b/dev-java/jebl/Manifest
new file mode 100644
index 000000000000..38016cd27871
--- /dev/null
+++ b/dev-java/jebl/Manifest
@@ -0,0 +1,3 @@
+DIST jebl-2013.02.18.tar.xz 306444 BLAKE2B d30a2fa1701cbb87c21a33745e081dbe2f56f823e4127d3f4326bdaeefb636352d4df5efa1576569949badd1e8b9a149a468da56bcbeef4a8df6ce7445e00918 SHA512 2f18ebbe30efbaab879a290a771a6e3d8fd1ba8afb6b8e0b3e9fb36252a4f65adf0929b77ef6922def61f9430ffcfc8486d822cd463f7ca6752418139d41aafb
+EBUILD jebl-2013.02.18.ebuild 683 BLAKE2B 4f76dbda747dff3f2ec87edce29110a3fe06de5a97c0d61edcb52d688ccb8eb3ce719c4424f1d83d30cf7adfc4e29dbaaa7e2ff885a5a07d66f48df0649347d3 SHA512 60f1e9eb39b5d5e2b96e726dd2788208a05c5ec5aeeab3e9b3195a70db87832d5dc5c39774dd0891b5af5825b1c0ae6451ca8ffbcb65fd99ed5f581ab23fe194
+MISC metadata.xml 310 BLAKE2B e652da023e0cc28b4612ff556fe46459b5f9758ce3f24623434c2b74e2461bcf37a34049235797dc22928e8740f186a0fba7f67d79e717545334a83c84755b47 SHA512 658351d53da5fe4c1409376f11154e1efbedf0563253af62356e7c63589973fcfc6c1fabd1d8951b2f40029b8da9e900b5dd5edc29d9f18d184f3bfb6aa35dbc
diff --git a/dev-java/jebl/jebl-2013.02.18.ebuild b/dev-java/jebl/jebl-2013.02.18.ebuild
new file mode 100644
index 000000000000..63fb36ae0fed
--- /dev/null
+++ b/dev-java/jebl/jebl-2013.02.18.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Evolutionary Biology Library"
+HOMEPAGE="http://jebl.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+KEYWORDS="amd64 x86"
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+EANT_BUILD_TARGET="dist"
+EANT_DOC_TARGET="document"
+
+java_prepare() {
+	rm -rf "${S}/src/org/virion/jam/maconly" || die
+}
+
+src_install() {
+	java-pkg_dojar dist/jebl.jar || die
+	java-pkg_dojar dist/jam.jar || die
+	use doc && java-pkg_dojavadoc doc/api
+}
diff --git a/dev-java/jebl/metadata.xml b/dev-java/jebl/metadata.xml
new file mode 100644
index 000000000000..e2a8a649349e
--- /dev/null
+++ b/dev-java/jebl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jebl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jempbox-1.7.1 b/dev-java/jempbox-1.7.1
deleted file mode 100644
index de19120ef558..000000000000
--- a/dev-java/jempbox-1.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An open source Java library for parsing font files
-EAPI=4
-HOMEPAGE=http://pdfbox.apache.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.7
-SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9401cece3744665a72abd9c618145b89
diff --git a/dev-java/jempbox-1.8.11 b/dev-java/jempbox-1.8.11
deleted file mode 100644
index 1661df53ed9b..000000000000
--- a/dev-java/jempbox-1.8.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=An open source Java library for working with XMP metadata
-EAPI=5
-HOMEPAGE=http://pdfbox.apache.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.8
-SRC_URI=mirror://apache/pdfbox/1.8.11/pdfbox-1.8.11-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3c62aa15ab1b8dca99efc201e87a2f36
diff --git a/dev-java/jempbox/Manifest b/dev-java/jempbox/Manifest
new file mode 100644
index 000000000000..1973b7ac7082
--- /dev/null
+++ b/dev-java/jempbox/Manifest
@@ -0,0 +1,6 @@
+AUX jempbox-1.7.1_maven-build.xml 10502 BLAKE2B 041be81aaf3b81969ad26926a3f2eac7b4655c17b3ba925b6ec2b16ddf49bcf7d87fc32655e3e357f274acc16a052afbc8010c6e0fc06f8e51770d68478e2efd SHA512 230436b03ddd8146f6aca41b26f54c0beba208eed9836aaf12e1326de75f226572e473e28c3d313c49a53266d3a827ee62097a49849d1782c546fe9e8bc1d269
+DIST pdfbox-1.7.1-src.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
+DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
+EBUILD jempbox-1.7.1.ebuild 874 BLAKE2B 28f129024f2e1d52d3120857ae09c24857ab5743a047ff454a575ae2a7c9fb4a043735efa0ece97aaa35e30d46e08dad0d8cbaa3a5ba46dbfd2907f40d0fa534 SHA512 543459515df66a6315938c6a5fb7a9c4dfdbd7ab56de552bb84da1bb6f6ec5aa59dee390e3afb479b477cb79d2e011b9fe1787b16329fd7a283d1f3463d29857
+EBUILD jempbox-1.8.11.ebuild 1017 BLAKE2B 3b08bb9827e2ff319f3885c24defb4456b13c391bbcb97787d7a5f45fed2edb494ec8b1ddf41fbba9f4a47115386d3dd82ea2231cf2915951d6a086ac74e8499 SHA512 7d31ea467b558f892ed798df1dd87bcd4d0f1a8869a3a8655162036bcafc8641c7f797edabffdf3be0d2382e6a96bac8a0d67f7e09dcfacb95f9a4a239081754
+MISC metadata.xml 314 BLAKE2B 4b4abd03c1f6ec6ebdacfd3f11f8365a9a867f9a4ad809998242c822dee13b75e35dcb44603c51f4b9f57828f71e0d8b09bfef83c3a9ad01111c2bd9410a1695 SHA512 3b771fec64eb63ed8b1de377745aa069c22e8cae003bf4155729ab8cb5c6a1ed5ca70cb977de152bfc926c2c4f6e94db6efc6498091736e0aa5304675b5019e7
diff --git a/dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml b/dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml
new file mode 100644
index 000000000000..453f9f69f665
--- /dev/null
+++ b/dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml
@@ -0,0 +1,247 @@
+<?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 8/2/12 4:32 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jempbox-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="jempbox-1.7.1"/>
+  <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"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.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>
+  </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>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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" 
+             source="1.5" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
+    </javadoc>
+  </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">
+    </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}/junit/junit/4.8.1"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/4.8.1/junit-4.8.1.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.1/junit-4.8.1.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/jempbox/jempbox-1.7.1.ebuild b/dev-java/jempbox/jempbox-1.7.1.ebuild
new file mode 100644
index 000000000000..d5f8087253ab
--- /dev/null
+++ b/dev-java/jempbox/jempbox-1.7.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN=pdfbox
+
+DESCRIPTION="An open source Java library for parsing font files"
+HOMEPAGE="http://pdfbox.apache.org/"
+SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
+
+LICENSE="BSD"
+SLOT="1.7"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5
+	app-arch/unzip
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
+
+java_prepare() {
+	cp -v "${FILESDIR}"/${P}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/jempbox/jempbox-1.8.11.ebuild b/dev-java/jempbox/jempbox-1.8.11.ebuild
new file mode 100644
index 000000000000..7653bdb73e99
--- /dev/null
+++ b/dev-java/jempbox/jempbox-1.8.11.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="pdfbox"
+MY_P="${MY_PN}-${PV}"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An open source Java library for working with XMP metadata"
+HOMEPAGE="http://pdfbox.apache.org/"
+SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_P}-src.zip"
+LICENSE="Apache-2.0"
+SLOT="1.8"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.txt
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
+	local TESTS=$(find ${DIR} -name "*Test.java")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jempbox/metadata.xml b/dev-java/jempbox/metadata.xml
new file mode 100644
index 000000000000..fac651d95a59
--- /dev/null
+++ b/dev-java/jempbox/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">apache/pdfbox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jettison-1.3.7 b/dev-java/jettison-1.3.7
deleted file mode 100644
index 2a4f20562a7a..000000000000
--- a/dev-java/jettison-1.3.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/wstx:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A JSON StAX implementation
-EAPI=5
-HOMEPAGE=https://github.com/codehaus/jettison
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/codehaus/jettison/archive/jettison-1.3.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e26111e976bf5541e0dfd87dd3c370cf
diff --git a/dev-java/jettison/Manifest b/dev-java/jettison/Manifest
new file mode 100644
index 000000000000..9b7c69b2c05f
--- /dev/null
+++ b/dev-java/jettison/Manifest
@@ -0,0 +1,3 @@
+DIST jettison-1.3.7.tar.gz 63200 BLAKE2B b33f53a1605b0fa4acd0204602193e4fb7a994c777accf2e64dd77f865501be648aff0d3293730348b9f0c2812c39e74c776adc20780bb902e6f75a538a764a2 SHA512 c669d0c1c4605c683d1d726ea7eea0f0079cd5fdddc40f4bc4e08b20b7ef7df414f4b2265fd91e1c34e30809c78f9e8690382c51a1ba6653a6fd688b22c07cd4
+EBUILD jettison-1.3.7.ebuild 942 BLAKE2B 2576951d9de8e864935b877396bb69803ac020347e477e907beca9d46508b821d8f7c504e472e2b8ae0e9d7275ccfd8d13d7899c6457c6573d6d28c5e7b7af6f SHA512 09604f1cad60d54a76e01d6a8fcb601cd47ae4d42fd28c721af30917c34929ac5e5d148852da9284757cda4224be2193d8fbccf9bc732e9a0baa6bd67b634cf1
+MISC metadata.xml 607 BLAKE2B 39b24dd0be0b0264413e3b4ca99b7e1989d36004b289f3f243d1fc69894e47ac61340ea521acc9061c5bac7862f08b4e9dd2b1f6857e4ddea4884d73b4787e74 SHA512 1dc350358996542f846e7d41e4348efba367610a1905c0f40992b2cf9eaeccab077eabc7f11cd38730579e4bcbd8f32630c825c79a1214d77153c65f81c2337c
diff --git a/dev-java/jettison/jettison-1.3.7.ebuild b/dev-java/jettison/jettison-1.3.7.ebuild
new file mode 100644
index 000000000000..c02d303d2230
--- /dev/null
+++ b/dev-java/jettison/jettison-1.3.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A JSON StAX implementation"
+HOMEPAGE="https://github.com/codehaus/jettison"
+SRC_URI="https://github.com/codehaus/${PN}/archive/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+		dev-java/wstx:3.2 )"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="${S}/src/main/java"
+
+src_test() {
+	cd src/test/java || die
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4,wstx-3.2)"
+
+	local TESTS=$(find * -name "*Test.java" ! -name "DOMTest.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jettison/metadata.xml b/dev-java/jettison/metadata.xml
new file mode 100644
index 000000000000..9a6adedc8b13
--- /dev/null
+++ b/dev-java/jettison/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		Jettison is a collection of Java APIs (like STaX and DOM) which read and
+		write JSON. This allows nearly transparent enablement of JSON based web
+		services in services frameworks like CXF or XML serialization frameworks
+		like XStream.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">codehaus/jettison</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jetty-alpn-api-1.1.2 b/dev-java/jetty-alpn-api-1.1.2
deleted file mode 100644
index 40a73b1ca099..000000000000
--- a/dev-java/jetty-alpn-api-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Jetty's ALPN API
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/jetty/documentation/current/alpn-chapter.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/eclipse/jetty.alpn/archive/alpn-api-1.1.2.v20150522.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e9134e0546ab2e44901f183d2ade342b
diff --git a/dev-java/jetty-alpn-api/Manifest b/dev-java/jetty-alpn-api/Manifest
new file mode 100644
index 000000000000..4e76cae9ef1c
--- /dev/null
+++ b/dev-java/jetty-alpn-api/Manifest
@@ -0,0 +1,3 @@
+DIST alpn-api-1.1.2.v20150522.tar.gz 4246 BLAKE2B 20c23033f2afb14b24ec28dc05c308f4363d0a398a25aa88e28b90e92a49c36e78450b71279e96da5d5d8047facf12f3f699743a623b6d293e8d74f3ccd1707a SHA512 5c7cedf80bf7b3e27fe365df2fb1a2b0f4eb5d94416f54565c960036c73a79aaee50fb7d00a0a856f2808be7dafa921b8ad89772101ff7bd97fe452a0e395e79
+EBUILD jetty-alpn-api-1.1.2.ebuild 608 BLAKE2B 53924240ae6fa8769767f968dee9e42739499d65c1b4e564e652e19501d0ca5ec00ccef1e4eddf3fd313266b2ac86bb8f555a97f5a1912d7fc23a55234a8fe02 SHA512 1a15814152bf068dd1773d8e4493167ffe9da0824efd57eaa2955ea383d4276f1938a7e915ce1a14365c8003958382c6e74837e640032d9ca3f8dc7f481270fd
+MISC metadata.xml 1029 BLAKE2B 266579d645a1af7055babed34e0413f5e03af1031659315e0520df3908505915139215eef7473a6ba6162f259c71b07ba8f11b132719ff5773d9cea7ef0ea399 SHA512 4debed277a9f8f6666d0595342533f6727ca7a2a5bc03f3b2828bc2523cba306b6c280bcaa275ac33726322df2de09871c5ff5a71aa3157a138372d44514293c
diff --git a/dev-java/jetty-alpn-api/jetty-alpn-api-1.1.2.ebuild b/dev-java/jetty-alpn-api/jetty-alpn-api-1.1.2.ebuild
new file mode 100644
index 000000000000..0bcb4940d608
--- /dev/null
+++ b/dev-java/jetty-alpn-api/jetty-alpn-api-1.1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="${PN/jetty-/}"
+MY_PV="${PV}.v20150522"
+MY_P="${MY_PN}-${MY_PV}"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jetty's ALPN API"
+HOMEPAGE="http://www.eclipse.org/jetty/documentation/current/alpn-chapter.html"
+SRC_URI="https://github.com/eclipse/jetty.alpn/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.7"
+
+DEPEND=">=virtual/jdk-1.7"
+
+S="${WORKDIR}/${PN//-/.}-${MY_P}"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/jetty-alpn-api/metadata.xml b/dev-java/jetty-alpn-api/metadata.xml
new file mode 100644
index 000000000000..e7ff4b83b664
--- /dev/null
+++ b/dev-java/jetty-alpn-api/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse/jetty.alpn.api</remote-id>
+	</upstream>
+	<longdescription>
+		The Jetty project provides an implementation of the TLS extension for ALPN for OpenJDK 7 and OpenJDK 8. ALPN allows the application layer to negotiate which protocol to use over the secure connection.
+
+		Any protocol can be negotiated by ALPN within a TLS connection. The protocols that are most commonly negotiated are HTTP/2 (for browsers that support it) and, historically, SPDY. The ALPN implementation is therefore not HTTP/2 or SPDY specific in any way. Jetty's ALPN implementation, although hosted under the umbrella of the Jetty project, is independent of Jetty (the Servlet Container); you can use the ALPN implementation in any other Java network server.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jetty-npn-api-1.1.1 b/dev-java/jetty-npn-api-1.1.1
deleted file mode 100644
index 644c7a76822e..000000000000
--- a/dev-java/jetty-npn-api-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Jetty's NPN API
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/jetty/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/org/eclipse/jetty/npn/npn-api/1.1.1.v20141010/npn-api-1.1.1.v20141010-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4c247b4d54668ce38c2ff6300684f680
diff --git a/dev-java/jetty-npn-api/Manifest b/dev-java/jetty-npn-api/Manifest
new file mode 100644
index 000000000000..71cf5499d3c7
--- /dev/null
+++ b/dev-java/jetty-npn-api/Manifest
@@ -0,0 +1,3 @@
+DIST npn-api-1.1.1.v20141010-sources.jar 3078 BLAKE2B 7326eff6ba762c6f345ceeffe12885c5f6a05ab7856ae76a5be5538689a65cae243514581d1206f06831e21106d0ccac3e4f715b67aa0fae84ceb5ca81a5d1df SHA512 8ae7847dfae1e2f0561f976ed887eeadcf62594c88df6400a79cd5f02b877e83016ade6f93153a9c31eb2ba41ea436c1c4faa960713f72c0d2bfa818c96cc13b
+EBUILD jetty-npn-api-1.1.1.ebuild 551 BLAKE2B ba0c214ee25940a7ca5998b66780685c3e0035c245705738f9e529b0145384c51ab853be31ab32638c50f1c6fdb6e8353fd5d0b87565812a8e34c2a29c869101 SHA512 e223b56b00565ce7db96e0fc1f8e4ab871430336396c204f06d68c9bbee653ddf79d635772e008e85a564e4d492efb8c8672d465a7dfd3870ec873c75d34c3d5
+MISC metadata.xml 849 BLAKE2B 16578097f3b77ead7a5d0ae5b1152f1616f0cc6aea45ea2e5b941d50bd542dd34628ca0b6c88554490e6e4a897101f27c155862d0a6b6304fda7d3db137bae69 SHA512 3b2d209b4efb73e5bffb93cdcc41d587cdd70f9f8a459031fe0b42e3cecd64c125be99cb9c5e2efe48d6d7d8710a59327abd15875d20fce89f36186b82474814
diff --git a/dev-java/jetty-npn-api/jetty-npn-api-1.1.1.ebuild b/dev-java/jetty-npn-api/jetty-npn-api-1.1.1.ebuild
new file mode 100644
index 000000000000..73640e0131bc
--- /dev/null
+++ b/dev-java/jetty-npn-api/jetty-npn-api-1.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="${PN/jetty-/}"
+MY_PV="${PV}.v20141010"
+MY_P="${MY_PN}-${MY_PV}"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jetty's NPN API"
+HOMEPAGE="http://www.eclipse.org/jetty/"
+SRC_URI="http://central.maven.org/maven2/org/eclipse/jetty/npn/${MY_PN}/${MY_PV}/${MY_P}-sources.jar"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.7"
+
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip"
diff --git a/dev-java/jetty-npn-api/metadata.xml b/dev-java/jetty-npn-api/metadata.xml
new file mode 100644
index 000000000000..df60d53575e0
--- /dev/null
+++ b/dev-java/jetty-npn-api/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Jetty project provides an implementation of the Next Protocol Negotiation TLS Extension (NPN) for OpenJDK 7 or greater. NPN allows the application layer to negotiate which protocol to use over the secure connection.
+
+		NPN currently negotiates using SPDY as an application level protocol on port 443, and also negotiates the SPDY version. However, NPN is not SPDY specific in any way. Jetty's NPN implementation, although hosted under the umbrella of the Jetty project, is independent of Jetty (the servlet container); you can use it in any other Java network server.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jexcelapi-2.6.8-r2 b/dev-java/jexcelapi-2.6.8-r2
deleted file mode 100644
index acc6e76d2db3..000000000000
--- a/dev-java/jexcelapi-2.6.8-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/log4j:0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java API to read, write, and modify Excel spreadsheets
-EAPI=5
-HOMEPAGE=http://jexcelapi.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/log4j:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jexcelapi/jexcelapi_2_6_8.tar.gz -> jexcelapi-2.6.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9dd84c629d56d37cc67cc4a46b4e3949
diff --git a/dev-java/jexcelapi/Manifest b/dev-java/jexcelapi/Manifest
new file mode 100644
index 000000000000..892e3c499619
--- /dev/null
+++ b/dev-java/jexcelapi/Manifest
@@ -0,0 +1,3 @@
+DIST jexcelapi-2.6.8.tar.gz 1925926 BLAKE2B 72e11a9805d75bbf7a34e31f741ecb081770c44e165e4f20d48c85d8eb8a36c24a3118fb918f16ddad1262f0380e87d3e732e30130624605589c51d12823893c SHA512 c649dcff8647530ca719f3e546d45ac585fed46d0a220763848f6d97b3f42c871b6520aee3575202598c7aba3391f647690075b6d9d52d1c2920817ff69548c1
+EBUILD jexcelapi-2.6.8-r2.ebuild 831 BLAKE2B 8b220819ad67ec7dfc5a1a0a84e0c0e2d28a61f3d6d3388ab8fb8380cef916546d569d2578b6e712a464fef438e77006c7558a6eb8d44195f4061cbc7c0c69ab SHA512 114772ccf3ad6806115123fcd66de70ce14a291482d4a7729c5357565e82ab46b3ee46742e8a930558793e108a075b07229e01a47492d1b91427b209f21a2bd7
+MISC metadata.xml 667 BLAKE2B fb5f2fdffcec384b1d69a8d9f467641381a7fdeb746e6266d1f64b80f9975e4354f60d2d99a447ee3664355f202917daf769f4eb3ea1230dfa24f20f448b3731 SHA512 90d7da9fba907cd18ce204c107c4c2ec4472c740847a6da9987690a3138519224e3614f017e388ba13cfafa97ab620533ae042f9456b98fc347852cd74dedd43
diff --git a/dev-java/jexcelapi/jexcelapi-2.6.8-r2.ebuild b/dev-java/jexcelapi/jexcelapi-2.6.8-r2.ebuild
new file mode 100644
index 000000000000..2fefc655acf5
--- /dev/null
+++ b/dev-java/jexcelapi/jexcelapi-2.6.8-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${P//-/_}"
+MY_P="${MY_P//./_}"
+
+DESCRIPTION="A Java API to read, write, and modify Excel spreadsheets"
+HOMEPAGE="http://jexcelapi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jexcelapi/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/log4j:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="log4j"
+
+JAVA_RM_FILES=(
+	src/common/log/Log4jLoggerName.java
+	src/common/log/SimpleLoggerName.java
+)
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/jexcelapi/metadata.xml b/dev-java/jexcelapi/metadata.xml
new file mode 100644
index 000000000000..3d1e38d960d1
--- /dev/null
+++ b/dev-java/jexcelapi/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Java Excel API is a mature, open source java API enabling developers to read, write, and modifiy Excel spreadsheets dynamically. Now java developers can read Excel spreadsheets, modify them with a convenient and simple API, and write the changes to any output stream (e.g. disk, HTTP, database, or any socket).
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jexcelapi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jffi-1.2.9 b/dev-java/jffi-1.2.9
deleted file mode 100644
index 9b687caf0c0e..000000000000
--- a/dev-java/jffi-1.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=virtual/libffi:0 >=virtual/jdk-1.6 virtual/pkgconfig test? ( dev-java/ant-junit4:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An optimized Java interface to libffi
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jffi
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=virtual/libffi:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.2
-SRC_URI=https://github.com/jnr/jffi/archive/1.2.9.tar.gz -> jffi-1.2.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9620f611fff14aac068786dabf4e6c9c
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
new file mode 100644
index 000000000000..8fbe06c446b0
--- /dev/null
+++ b/dev-java/jffi/Manifest
@@ -0,0 +1,6 @@
+AUX jffi-1.2.8-junit-4.11.patch 700 BLAKE2B 4533e3a8d6a5921b1e39ea20c9b4dcbbc66d08a3d0ce2494ed22e5af753f0cbfbc5fa064f19877816e2cc44c666c48aa5a1f8be44fe8dcc7a9368f033acf8828 SHA512 9cc2d41665ec3c2271d6c1c2e66dbfb506922a290e906df51fa66c61c918e1835dcb93313077fac92a8a622f132dfee08cf3b79ebce0be3a4b104c1cbcda5ea9
+AUX jffi-1.2.8-makefile.patch 1443 BLAKE2B 9accbdcd70c1c76e3f94a2131728fa83f7c988b5ce52aa7874d012700cfa4ed1cf3c3c2a281ce18c74776639e653f5a18e9c4b1d86baeaa9d10e577ca067e8eb SHA512 02f28b00e1ca6d16046c5f25c38268f78a41b5b202c4f284e8dac10dc245ad150f4639849c0af8c20f50dc3e7cf715bee6dfd2f1edc48496f822d78aaef01b39
+AUX jffi_maven-build.xml 11287 BLAKE2B 01ef4db6fef9d963bd52e0c15317ae836b629d9b22987c2d69a393d5513ab60bf2b062a083bb5b1a04301493c982f3926d5c9225972f7861e4ad668c9fc7a1f1 SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7
+DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
+EBUILD jffi-1.2.9.ebuild 3133 BLAKE2B 1008f67f92a9a34efdc0d3c2236383702554ee83bc4d327de61557a7d70dab9bca2d1745807498e9b69e7a2f9221380f21090df11a60424bf2548d4865161d9d SHA512 d19837738e4db90dc762ea76e6e067e6270d6d11d8f50d72c52c18c542cac2a07bda089935fccd1c0392eff1b056097e5d3a1bf18e10a08de8bd0ced188bdd2b
+MISC metadata.xml 319 BLAKE2B 999865e43b7f7ecf6784131fc903f80f208bf39dc54e96f6f80bd991998ab9694fb92ce8cd5e998a2e0800b64e47068859a7c63d46ea74294f1da77f1a18c46a SHA512 ed411e700c518b64ce76a437771c3a4779ebf47207d839924220ae6174ab7fd9cde92cd347c93b1916849cc2fb7fd4a5e5c29911420bc3485cb2916034d3f71b
diff --git a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch b/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch
new file mode 100644
index 000000000000..ac3843a0053a
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch
@@ -0,0 +1,14 @@
+--- a/src/test/java/com/kenai/jffi/NumberTest.java
++++ b/src/test/java/com/kenai/jffi/NumberTest.java
+@@ -234,9 +234,8 @@
+     private void returnF32(InvokerType type) {
+         LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class, type);
+         float[] values = { 0f, 1.0f, -2.0f };
+-        for (int i = 0; i < values.length; ++i) {
+-            assertEquals("Value not returned correctly", values[i], lib.ret_float(values[i]), 0.1f);
+-        }
++        float[] lib_values = { lib.ret_float(0f), lib.ret_float(1.0f), lib.ret_float(-2.0f) };
++        assertArrayEquals("Value not returned correctly", values, lib_values, 0.1f);
+     }
+ 
+     @Test public void returnDefaultF64() {
diff --git a/dev-java/jffi/files/jffi-1.2.8-makefile.patch b/dev-java/jffi/files/jffi-1.2.8-makefile.patch
new file mode 100644
index 000000000000..7f9f07a500c5
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.2.8-makefile.patch
@@ -0,0 +1,52 @@
+--- jni/GNUmakefile
++++ jni/GNUmakefile
+@@ -41,6 +41,7 @@
+ JFFI_BUILD_DIR = $(BUILD_DIR)/jffi
+ 
+ ifeq ($(USE_SYSTEM_LIBFFI),1)
++  LIBFFI =
+   LIBFFI_LIBS ?= $(shell pkg-config --libs libffi)
+   LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi)
+ else
+@@ -64,9 +65,8 @@
+ OFLAGS = -O2 $(JFLAGS)
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+-WERROR = -Werror
+ ifneq ($(OS),darwin)
+-  WFLAGS += -Wundef $(WERROR)
++  WFLAGS += -Wundef
+ endif
+ WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
+ PICFLAGS = -fPIC
+@@ -279,7 +279,7 @@
+ 	@echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)"
+ 	@echo "OBJS=$(OBJS)"
+ 
+-$(LIBJFFI):  $(OBJS) $(LIBFFI_LIBS)
++$(LIBJFFI):  $(OBJS) $(LIBFFI)
+ 	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
+ 	$(STRIP) $@
+ 
+@@ -291,7 +291,7 @@
+ 	@mkdir -p $(@D)
+ 	@$(CC) $(CFLAGS) -o $@ -c $<
+ 
+-$(OBJS) : $(LIBFFI_LIBS)
++$(OBJS) : $(LIBFFI)
+ 
+ ifeq ($(OS), darwin)
+ build_ffi = \
+--- libtest/GNUmakefile
++++ libtest/GNUmakefile
+@@ -44,8 +44,8 @@
+ # Compiler/linker flags from:
+ #   http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
+ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
+-OFLAGS = -O2 $(JFLAGS)
+-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
++OFLAGS = $(JFLAGS)
++WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
+ PICFLAGS = -fPIC
+ SOFLAGS = -shared -Wl,-O1
+ LDFLAGS += $(SOFLAGS)
diff --git a/dev-java/jffi/files/jffi_maven-build.xml b/dev-java/jffi/files/jffi_maven-build.xml
new file mode 100644
index 000000000000..d8114185ee41
--- /dev/null
+++ b/dev-java/jffi/files/jffi_maven-build.xml
@@ -0,0 +1,259 @@
+<?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 1/9/12 9:52 AM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jffi-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="jffi-1.0.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.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"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.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.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </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.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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"/>
+  </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}/junit/junit/4.8.2"/>
+    <get src="http://repository.jboss.com/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://snapshots.jboss.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repository.jboss.org/maven2//junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repository.jboss.org/nexus/content/groups/public-jboss//junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
new file mode 100644
index 000000000000..51bc215bdac7
--- /dev/null
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.2"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="virtual/libffi:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.8-makefile.patch
+	"${FILESDIR}"/${PN}-1.2.8-junit-4.11.patch
+)
+
+RESTRICT="test"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+
+	epatch "${PATCHES[@]}"
+
+	# misc fixes for Darwin
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local uarch
+		# don't do multiarch
+		# avoid using Xcode stuff
+		# use Prefix' headers
+		# don't mess with deployment target
+		# set install_name
+		use x64-macos && uarch=x86_64
+		use x86-macos && uarch=i386
+		use ppc-macos && uarch=ppc
+		sed -i \
+			-e "/ARCHES +=/s/=.*$/= ${uarch}/" \
+			-e "/XCODE=/s:=.*$:=${EPREFIX}:" \
+			-e "/MACSDK/s/^/#/" \
+			-e "/MACOSX_DEPLOYMENT_TARGET=/s/MAC/NOMAC/" \
+			-e "/SOFLAGS =/s:=.*:= -install_name ${EPREFIX}/usr/lib/jffi-${SLOT}/libjffi-${SLOT}.jnilib:" \
+			jni/GNUmakefile || die
+	fi
+
+	find "${WORKDIR}" -iname '*.jar' -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+src_compile() {
+	# generate Version.java
+	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
+		package com.kenai.jffi;
+		public final class Version {
+			private Version() {}
+			public static final int MAJOR = $(get_version_component_range 1);
+			public static final int MINOR = $(get_version_component_range 2);
+			public static final int MICRO = $(get_version_component_range 3);
+		}
+	EOF
+
+	java-pkg-2_src_compile
+
+	# generate headers
+	mkdir -p build/jni
+	javah -d build/jni -classpath target/classes \
+		com.kenai.jffi.Foreign \
+		com.kenai.jffi.ObjectBuffer \
+		com.kenai.jffi.Version \
+		|| die
+
+	#build native library.
+	local args=(
+		SRC_DIR=jni
+		JNI_DIR=jni
+		BUILD_DIR=build/jni
+		VERSION=$(get_version_component_range 1-2)
+		USE_SYSTEM_LIBFFI=1
+		CCACHE=
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
+
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djffi.boot.library.path=${S}/build/jni" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	local libname=".so"
+
+	[[ ${CHOST} == *-darwin* ]] && libname=.jnilib
+	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname}
+
+	# must by after _doso to have JAVA_PKG_LIBDEST set
+	cat > boot.properties <<-EOF
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf target/${PN}.jar boot.properties || die
+
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jffi/metadata.xml b/dev-java/jffi/metadata.xml
new file mode 100644
index 000000000000..d78b07b4d6bb
--- /dev/null
+++ b/dev-java/jffi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jnr/jffi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jflex-1.6.1 b/dev-java/jflex-1.6.1
deleted file mode 100644
index 79b48b71f854..000000000000
--- a/dev-java/jflex-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JFlex is a lexical analyzer generator for Java
-EAPI=5
-HOMEPAGE=http://www.jflex.de/
-IUSE=examples test vim-syntax elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-PDEPEND=>=dev-java/javacup-0.11b_p20151001:0
-RDEPEND=>=virtual/jre-1.6 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://jflex.de/jflex-1.6.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3f3dfb1f1807888b408b931236dd9483
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
new file mode 100644
index 000000000000..69bb1b8f4c3a
--- /dev/null
+++ b/dev-java/jflex/Manifest
@@ -0,0 +1,4 @@
+AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6
+DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
+EBUILD jflex-1.6.1.ebuild 3536 BLAKE2B e05d525af00a7154238def050204aed0ab16991358714a4a7536be6a50adc89d651c6526c6e2563255ec1f8dcfb81b1431037fcbcbdd3831ce99367511938f41 SHA512 145ae0fe9106a6835070faf0a83bae46a8e46842ef2c8041e5f8bb9fbecd94051f8e252248434cefb2b82344a448e7b8886becb925673f072c85145ac43989a9
+MISC metadata.xml 365 BLAKE2B 59ac73e145626ce1448d4edef5ad2b115fcf762d368131b3b59438e3d21a8f4aaee0d56723a3c79539b7806caa8c456acf0554ce22333b097caf9f3f07dc8014 SHA512 cb20e2901f90975ffa7722c69edbc884b0f6ebc7500636e6ea41668754e8d8dd4732a71774dbb74a7d38240b2fbd6c1941adfc092fe83154e1ee70f6ab89e379
diff --git a/dev-java/jflex/files/icedtea-arm.patch b/dev-java/jflex/files/icedtea-arm.patch
new file mode 100644
index 000000000000..acefd9b553e2
--- /dev/null
+++ b/dev-java/jflex/files/icedtea-arm.patch
@@ -0,0 +1,18 @@
+http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678
+
+diff -Naur jflex-1.6.1.orig/src/main/java/jflex/Emitter.java jflex-1.6.1/src/main/java/jflex/Emitter.java
+--- jflex-1.6.1.orig/src/main/java/jflex/Emitter.java	2015-03-16 17:27:31.000000000 +0000
++++ jflex-1.6.1/src/main/java/jflex/Emitter.java	2015-10-25 23:33:35.784487747 +0000
+@@ -1304,8 +1304,10 @@
+     
+     for (int i = 0; i < dfa.numStates;  i++) {
+       char j = 0;
+-      while ( !isTransition[i] && j < dfa.numInput )
+-        isTransition[i] = dfa.table[i][j++] != DFA.NO_TARGET;
++      while ( !isTransition[i] && j < dfa.numInput ) {
++        isTransition[i] = dfa.table[i][j] != DFA.NO_TARGET;
++        j++;
++      }
+     }
+   }
+   
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
new file mode 100644
index 000000000000..e5f745463c4c
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+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="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples test vim-syntax"
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND=">=virtual/jre-1.6
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )
+	${CDEPEND}"
+
+PDEPEND=">=dev-java/javacup-0.11b_p20151001:0"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	# See below for details.
+	epatch "${FILESDIR}/icedtea-arm.patch"
+
+	# We need the bundled jflex.jar.
+	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
+
+	# Remove the bundled java-cup.jar if unneeded.
+	if has_version ${PDEPEND}; then
+		rm -v lib/java-cup-*.jar || die
+	fi
+}
+
+src_configure() {
+	# javacup is a cyclic dependency. Use the package if we have it,
+	# otherwise use the bundled version and install the package later.
+	if has_version ${PDEPEND}; then
+		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
+		# thanks to has_version above. This is Portage-specific but
+		# showing the warning elsewhere isn't the end of the world.
+		JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar)
+	else
+		JAVACUP=$(echo lib/java-cup-*.jar)
+	fi
+
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}"
+}
+
+jflex_compile() {
+	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_compile() {
+	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die
+
+	# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
+	# jflex. We have patched jflex to fix it but we have to run the
+	# bundled version first. -Xint works around the problem. See
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
+	use arm && local JFLEX_ARGS="-Xint"
+
+	# First compile (without doc/source) using the bundled jflex.
+	JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
+
+	# Then recompile using the fresh jflex.
+	jflex_compile -cp "${PN}.jar:${JAVACUP}"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main ${PN}.Main
+
+	java-pkg_register-dependency javacup javacup-runtime.jar
+	java-pkg_register-ant-task
+
+	use examples && java-pkg_doexamples examples
+	dodoc {changelog,README}.md
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto html
+		dodoc doc/*.{css,html,png} doc/COPYRIGHT
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins lib/${PN}.vim
+	fi
+}
+
+src_test() {
+	if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then
+		# This results in a StackOverflowError as of 1.8.0.65 but works
+		# fine on icedtea:7. Don't know about icedtea:8 yet.
+		rm -v src/test/java/jflex/EmitterTest.java || die
+	fi
+
+	local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)"
+
+	local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find src/test/java -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jflex/metadata.xml b/dev-java/jflex/metadata.xml
new file mode 100644
index 000000000000..ac2a2c1b2b7b
--- /dev/null
+++ b/dev-java/jflex/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription lang="en">
+JFlex is a lexical analyzer generator (also known as scanner generator) for
+Java(tm).
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jformatstring-2.0.3 b/dev-java/jformatstring-2.0.3
deleted file mode 100644
index fcfdd95fd4df..000000000000
--- a/dev-java/jformatstring-2.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Compile time checking for Java format strings
-EAPI=5
-HOMEPAGE=https://code.google.com/p/j-format-string
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e0fbc4fea60468f05f99ba648a302d97
diff --git a/dev-java/jformatstring/Manifest b/dev-java/jformatstring/Manifest
new file mode 100644
index 000000000000..d8658bac2bda
--- /dev/null
+++ b/dev-java/jformatstring/Manifest
@@ -0,0 +1,3 @@
+DIST findbugs-3.0.1-source.zip 9625065 BLAKE2B 26c940ac0eaec16de89ffbbe26d16b0b5c2883a6131a8b3ce93b9a35014a42c221456f977e581d2f4f1b8d9333237c24ac6d5ad8fc2ba6bb018c333b6a09f4eb SHA512 d967769f2356f28b34d92c7451cf3e2ac004e667bfc3b049b5b10b1c19d7be2cfa0db132a77698d042300330f77a2bb5dd8c4baa0d67c37b7e5ae6da9e83a64f
+EBUILD jformatstring-2.0.3.ebuild 742 BLAKE2B 9690cf96d791d2697b1c8076627ba61e24ab67891622b91d5f8065a2a7e3b1fa969e16000c6305537feacafeccff96687e1e92867077305d811faa3c07c07ef7 SHA512 e8bad5064a97d7306b5197bad4a00308c6da9a72360660b505fc4f828abcb0bcb801bd3be00f2ba2d5d5283760d5ef17514da7ec56d8a839d555603960042e5a
+MISC metadata.xml 565 BLAKE2B a9dd51e1767f5e5244f848a899e891b3a0cf7cffe44af9246a92c7a5c319ba1e64aed570431137ef013c0113128abac9c30a38e7cf9b4a40075d8a9b9c90ff8e SHA512 7e8464b49caa095274ccb367f36b78267accaff8af30b88148cb5f91b32e84b28069445c3fc84338b9276308ff487662f070e8f9f82d167f586f264ac0a31501
diff --git a/dev-java/jformatstring/jformatstring-2.0.3.ebuild b/dev-java/jformatstring/jformatstring-2.0.3.ebuild
new file mode 100644
index 000000000000..2aaf83dfdd53
--- /dev/null
+++ b/dev-java/jformatstring/jformatstring-2.0.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+FINDBUGS_PV="3.0.1"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Compile time checking for Java format strings"
+SRC_URI="mirror://sourceforge/findbugs/findbugs-${FINDBUGS_PV}-source.zip"
+HOMEPAGE="https://code.google.com/p/j-format-string"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+src_unpack() {
+	unzip -qoj "${DISTDIR}/findbugs-${FINDBUGS_PV}-source.zip" "findbugs-${FINDBUGS_PV}/lib/jFormatString.jar" || die
+	unpack ./jFormatString.jar
+}
+
+java_prepare() {
+	find -name "*.class" -delete || die
+}
diff --git a/dev-java/jformatstring/metadata.xml b/dev-java/jformatstring/metadata.xml
new file mode 100644
index 000000000000..84f3814eccb9
--- /dev/null
+++ b/dev-java/jformatstring/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>This code is designed to allow for compile time checking of Java format strings. It can check that the format string is valid, that the proper number of arguments are supplied and that they are of the correct type.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">findbugs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jfreechart-1.0.19-r1 b/dev-java/jfreechart-1.0.19-r1
deleted file mode 100644
index 662c133f9a13..000000000000
--- a/dev-java/jfreechart-1.0.19-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jfreesvg:2.1 >=dev-java/jcommon-1.0.23:1.0 java-virtuals/servlet-api:3.0 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JFreeChart is a free Java class library for generating charts
-EAPI=5
-HOMEPAGE=http://www.jfree.org/jfreechart
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/jfreesvg:2.1 >=dev-java/jcommon-1.0.23:1.0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.0
-SRC_URI=mirror://sourceforge/jfreechart/jfreechart-1.0.19.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b98cb85a0de0f2ad8cee7d9c164bada2
diff --git a/dev-java/jfreechart/Manifest b/dev-java/jfreechart/Manifest
new file mode 100644
index 000000000000..fb03dc9b1653
--- /dev/null
+++ b/dev-java/jfreechart/Manifest
@@ -0,0 +1,5 @@
+AUX jfreechart-1.0.19-build.xml.patch 1017 BLAKE2B 4faf9ade4a2bbbc7a2ede0931ad69886629ce331281dd2c4ca03d16ae1bed4f2e1bfe4a64bddb7bfca8fe4735736be194a6f512960cadf7032865668f5807e82 SHA512 e48ce320ea75e95ba099bc39b98b32841925128fbbcf3790496030df7270b671a2b0cb681db017e7c7d3eb73269911f6ec51d6c18b0813af7e86acb194be736a
+AUX jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch 1155 BLAKE2B 381068c60444b0c4aa5417a025eb87cd535c3a3c6fd25381c32e5536bb9a092ef7b91c9ac00c97f91e55196a5b2cc704d5658ef11970d05e34892846756e1619 SHA512 013941c364512e576ba10f3227b4d5ea57c31fcb22290a62b9bdcfeb3636b638f7be7653399bab026c69dc456cb66eb13b03d6cb580aaf5d4e1212a2640a3cad
+DIST jfreechart-1.0.19.zip 8050676 BLAKE2B be5ac67befd6a16c9771f50bca59c3543251984b60e00e8aef350cadb1121caf391a8dddc383fa08ed89b0346e2a057a8da6a70b224d7f843f19535a4df873b2 SHA512 6345e6a6b4a82862f3908794efb70a6f5413f313ba5bcff1dfb713d21948034d80c743a0cea61be81921c62736b07209ed4b942fedca0c76226b1202a4596b31
+EBUILD jfreechart-1.0.19-r1.ebuild 1360 BLAKE2B ff7781238a54c1639477c9ce66386eeb75fff8b35581692b28ebb509136fd288672b85a3af973be38c61db8e416fc0827b1506649ee93c52454e4a040685917b SHA512 90b7ccd6c7b58d13e8622501d5b3bb4111d202ea064fc1deefabe8a9e7d70086f232fb0975652e0f1d5d06756d8117f867aa9a700af1b60809aa7569a7237104
+MISC metadata.xml 316 BLAKE2B a255fcd49db48318dbbe5e223eefb578f2d68535e239999075ad55de972afe80b62a85f2bffffb217b9bbfc41b86839daf0ccc077992778bcb87db3e3d71baed SHA512 23acc79c59e65a77790ff6b915c2727b53352e6c989aaa5d5936cc1a09fea10c15dc35e5133ef142da97af85770b44c3b33e28cefc4437de86afa5f3b3cf90fd
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.19-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.19-build.xml.patch
new file mode 100644
index 000000000000..ffe657b89c9d
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.19-build.xml.patch
@@ -0,0 +1,25 @@
+--- a/ant/build.xml	2011-11-20 22:40:13.000000000 +0100
++++ b/ant/build.xml	2013-03-09 14:10:53.987970148 +0100
+@@ -40,10 +40,9 @@
+         <available classname="java.lang.Annotation" property="src.version" value="1.5"/>
+         <available classname="java.lang.Annotation" property="target.version" value="1.5"/>
+         <path id="build.classpath">
+-            <fileset dir="${basedir}/lib/">
+-                <include name="${jcommon.name}-${jcommon.version}.jar"/>
+-                <include name="servlet.jar"/>
+-            </fileset>
++            <pathelement location="${jcommon.jar}"/>
++            <pathelement location="${servlet.jar}"/>
++            <pathelement location="${gnujaxp.jar}"/>
+         </path>
+ 
+     </target>
+@@ -321,7 +320,7 @@
+ 
+     <!-- COMPILE THE JUNIT TESTS. -->
+     <target name="compile-tests"
+-            depends="compile,compile-experimental"
++            depends="initialise"
+             description="Compile the test code">
+ 
+         <mkdir dir="${basedir}/build-tests"/>
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch b/dev-java/jfreechart/files/jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch
new file mode 100644
index 000000000000..ebb6c4aeffa0
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch
@@ -0,0 +1,24 @@
+--- a/tests/org/jfree/data/time/TimeSeriesCollectionTest.java	2011-11-20 22:40:13.000000000 +0100
++++ b/tests/org/jfree/data/time/TimeSeriesCollectionTest.java	2013-05-21 00:18:03.840041846 +0200
+@@ -339,6 +339,10 @@
+      * java.util.List, boolean)} method.
+      */
+     public void testFindDomainBounds() {
++        // store the current time zone
++        TimeZone saved = TimeZone.getDefault();
++        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
++
+         TimeSeriesCollection dataset = new TimeSeriesCollection();
+         List visibleSeriesKeys = new java.util.ArrayList();
+         Range r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys,
+@@ -351,10 +355,6 @@
+         r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true);
+         assertNull(r);
+ 
+-        // store the current time zone
+-        TimeZone saved = TimeZone.getDefault();
+-        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
+-
+         s1.add(new Year(2008), 8.0);
+         r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true);
+         assertEquals(1199142000000.0, r.getLowerBound(), EPSILON);
diff --git a/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild b/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild
new file mode 100644
index 000000000000..57aacc5d752a
--- /dev/null
+++ b/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFreeChart is a free Java class library for generating charts"
+HOMEPAGE="http://www.jfree.org/jfreechart"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	dev-java/jfreesvg:2.1
+	>=dev-java/jcommon-1.0.23:1.0
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.19-build.xml.patch"
+	"${FILESDIR}/${PN}-1.0.19-fix-TimeSeriesCollectionTest.patch"
+)
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_BUILD_XML="ant/build.xml"
+EANT_BUILD_TARGET="compile-experimental"
+EANT_GENTOO_CLASSPATH="
+	jfreesvg-2.1
+	jcommon-1.0
+	servlet-api-3.0
+"
+
+EANT_DOC_TARGET="javadoc"
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg_newjar "lib/${P}.jar" "${PN}.jar"
+	java-pkg_newjar "lib/${P}-experimental.jar" "${PN}-experimental.jar"
+
+	dodoc README.txt ChangeLog NEWS
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc source/org
+}
diff --git a/dev-java/jfreechart/metadata.xml b/dev-java/jfreechart/metadata.xml
new file mode 100644
index 000000000000..ba2158636f7e
--- /dev/null
+++ b/dev-java/jfreechart/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jfreechart</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jfreesvg-2.1-r1 b/dev-java/jfreesvg-2.1-r1
deleted file mode 100644
index aecb26d0eb50..000000000000
--- a/dev-java/jfreesvg-2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JFreeSVG is a fast, light-weight, vector graphics library for the Java platform
-EAPI=5
-HOMEPAGE=http://www.jfree.org/jfreesvg/
-IUSE=debug elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.1
-SRC_URI=mirror://sourceforge/jfreegraphics2d/jfreesvg-2.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4714b5f1df8880e9936254ab9b3ddd05
diff --git a/dev-java/jfreesvg-3.0 b/dev-java/jfreesvg-3.0
deleted file mode 100644
index 697e28387576..000000000000
--- a/dev-java/jfreesvg-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JFreeSVG is a fast, light-weight, vector graphics library for the Java platform
-EAPI=5
-HOMEPAGE=http://www.jfree.org/jfreesvg/
-IUSE=debug elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=mirror://sourceforge/jfreegraphics2d/jfreesvg-3.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=71f1073b7bef0f744d89970c79856ecd
diff --git a/dev-java/jfreesvg/Manifest b/dev-java/jfreesvg/Manifest
new file mode 100644
index 000000000000..338f62247131
--- /dev/null
+++ b/dev-java/jfreesvg/Manifest
@@ -0,0 +1,5 @@
+DIST jfreesvg-2.1.zip 2042545 BLAKE2B 702ea55c6e51bca156a41c5e624452fdad8c1a5472c204cbf58f796134ed6027259abd0a48719bbb5f83f6891ab3aec5db58c8726b0275b894065148a07ec179 SHA512 6c1556c640e749778aeb969540db7724895fe2113a7ceea732793730301dd04a1beafef35249b27b75696271bcd67a59236a15c106f7717482561011a1a08bc4
+DIST jfreesvg-3.0.zip 1946062 BLAKE2B 58aa3c95db3a0472de1e2c184f1e8bc9aa72b86f508dd7d41f169f03c8f07380269a36d0a22a71378ab7c2d45427fb479994b907c4e25317794814da69f79d7c SHA512 7d0bdcbf56f0a7110058137d53e291c41e53040cbc19442989a0c6d28f5d6d3ed26ecedbfc947ce845b8a971729e2d784e8ce5a041f6f095ff626a3494a55715
+EBUILD jfreesvg-2.1-r1.ebuild 857 BLAKE2B d21ba43d7e9e6326be9e4fa5e9a80e3522fef691c986f9d6a768a04fa59aff242444081495a367677893f4abb4444bb2c6f5f51f455e41cca2a5e62b1679065f SHA512 f1008bff54e47306623df1a972085adff1b95872192587a5aa361b8cc4f6d2a387cfc1e0c5d7864368ef2bbaf07d1413cabe4ed8d91ef893ed8f446997cb521b
+EBUILD jfreesvg-3.0.ebuild 891 BLAKE2B 5a1549132e6cc1949651abb8804764399109b7457fa5594d2f613c87394c2b27ff8dd1f743f3eca5d45936cc819f9e0ea82904e654fee8ee0a9a16d652872d7f SHA512 23bd9825d7b44024c7218dee3761ea0fae08a8b0c6fb2834d9da2bbdb852573a6248852ede1f38194ac01710055dfba4d66adbb57c57822bc85440b1d5f8eaff
+MISC metadata.xml 489 BLAKE2B 20d527a33a5c5d78975bba84e2886a81989511bdf554fb00c5c75d34f0909569aad2cbb4ae7a7f8c130a75a7b186d7324c90a2e2d2b6d37e70e18562a10b16f5 SHA512 67cac1aaa899e86b2c6a0f1222199116c2d0bbf6872d7c794572840248ffc24ac5bd04f1e02f8a500ae43fdf229d999cc470eafbc07dfc55f6fa45d5c77b6310
diff --git a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
new file mode 100644
index 000000000000..948b007cad2d
--- /dev/null
+++ b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFreeSVG is a fast, light-weight, vector graphics library for the Java platform"
+HOMEPAGE="http://www.jfree.org/jfreesvg/"
+SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="2.1"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_compile() {
+	if ! use debug; then
+		antflags="-Dbuild.debug=false -Dbuild.optimize=true"
+	fi
+	eant -f ant/build.xml compile $(use_doc) $antflags
+}
+
+src_install() {
+	java-pkg_newjar "./lib/${P}.jar" ${PN}.jar
+	dodoc README.md
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/jfreesvg/jfreesvg-3.0.ebuild b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
new file mode 100644
index 000000000000..2b3e2fef8407
--- /dev/null
+++ b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFreeSVG is a fast, light-weight, vector graphics library for the Java platform"
+HOMEPAGE="http://www.jfree.org/jfreesvg/"
+SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="3.0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.6"
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.jar' -print -delete || die
+}
+
+src_compile() {
+	if ! use debug; then
+		antflags="-Dbuild.debug=false -Dbuild.optimize=true"
+	fi
+	eant -f ant/build.xml compile $(use_doc) $antflags
+}
+
+src_install() {
+	java-pkg_newjar "./lib/${P}.jar" ${PN}.jar
+	dodoc README.md
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/jfreesvg/metadata.xml b/dev-java/jfreesvg/metadata.xml
new file mode 100644
index 000000000000..ab12970f46ef
--- /dev/null
+++ b/dev-java/jfreesvg/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<use>
+		<flag name="debug">
+			Enable debugging during compilation.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">jfreegraphics2d</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jgoodies-animation-1.2.0 b/dev-java/jgoodies-animation-1.2.0
deleted file mode 100644
index 201f05a0ae7f..000000000000
--- a/dev-java/jgoodies-animation-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip test? ( dev-java/ant-junit ) >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JGoodies Animation Library
-EAPI=0
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 examples? ( x86? ( >=dev-java/jgoodies-binding-1.1 >=dev-java/jgoodies-forms-1.0 ) ) >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.jgoodies.com/download/libraries/animation-1_2_0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8b608d4001273d9a14b7d66a4c6825d3
diff --git a/dev-java/jgoodies-animation-1.2.0-r1 b/dev-java/jgoodies-animation-1.2.0-r1
deleted file mode 100644
index 8be7f11906d6..000000000000
--- a/dev-java/jgoodies-animation-1.2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip test? ( dev-java/ant-junit ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JGoodies Animation Library
-EAPI=5
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 examples? ( >=dev-java/jgoodies-binding-1.1:1.0 >=dev-java/jgoodies-forms-1.0:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.jgoodies.com/download/libraries/animation-1_2_0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b26833bb296d6db3987610d7edda18ab
diff --git a/dev-java/jgoodies-animation/Manifest b/dev-java/jgoodies-animation/Manifest
new file mode 100644
index 000000000000..3b540ec0b021
--- /dev/null
+++ b/dev-java/jgoodies-animation/Manifest
@@ -0,0 +1,4 @@
+DIST animation-1_2_0.zip 728028 BLAKE2B 591b63b6a2799bfe6020c4e81b834807fba3e72a039dbd9954846b6c5a5c2445493e2d8814b1897b9465ec39c2b62c2f027c1e05ef7db5e9439acc236dbf9078 SHA512 2220630d7fd70a98b6d9605de7a1d6fc3470cc19b39815b9777e6bc8cf7db74ce77338861dde45aafbe336ce8b48ee00bcd8149af701a7001869cd3da3cf6a72
+EBUILD jgoodies-animation-1.2.0-r1.ebuild 1087 BLAKE2B 7560901fa5fbb57482829d751de1f8c9a6568d43390b2550e5cde1fbfeb2fd77e85a698b2691bd9c2715c6cba6614874f937df5889b95221961ee20fa446d96a SHA512 aeb3018c5e45def60b6a19a9045310a74d121eb5d3a2b0022236fba55b76d2af5e14caf06e7e658c166aa5fbd2b5a76ca3454835ee481c33e440a58d868a5532
+EBUILD jgoodies-animation-1.2.0.ebuild 1377 BLAKE2B b640f57c4bed08ff4f1cef7b36c24dfc88eb9d4bc6c72c0eca1b3cbfadce3ba20f2931ca75d6adec54bae9635f146244416fe8347d0a3096c33fb36b87cea62f SHA512 ce83da9da0fd2b36ea8de684b323a96b3140733e04dfbe5a629fbd80d7245b776283e0d4c5ccb358edd7b18b10ae102eec9c0f6466db89082dcbd7953f205867
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..3a8392129d3e
--- /dev/null
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_V=${PV//./_}
+
+DESCRIPTION="JGoodies Animation Library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/animation-${MY_V}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	test? ( dev-java/ant-junit )"
+
+RDEPEND=">=virtual/jre-1.4
+	examples? (
+		>=dev-java/jgoodies-binding-1.1:1.0
+		>=dev-java/jgoodies-forms-1.0:0
+	)"
+
+S="${WORKDIR}/animation-${PV}"
+
+EANT_FILTER_COMPILER="jikes"
+EANT_DOC_TARGET=""
+
+java_prepare() {
+	find -name "*.jar" -delete || die
+}
+
+src_test() {
+	eant test -Djunit.jar.present=true \
+		-Djunit.jar=$(java-pkg_getjar junit junit.jar)
+}
+
+src_install() {
+	java-pkg_dojar build/animation.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml README.html || die
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/core/*
+	use examples && java-pkg_doexamples src/tutorial
+}
diff --git a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
new file mode 100644
index 000000000000..6e12c6377096
--- /dev/null
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_V=${PV//./_}
+DESCRIPTION="JGoodies Animation Library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/animation-${MY_V}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	test? ( dev-java/ant-junit )"
+# Remove x86 when https://bugs.gentoo.org/show_bug.cgi?id=186081
+# is done
+RDEPEND=">=virtual/jre-1.4
+	examples? ( x86? (
+		>=dev-java/jgoodies-binding-1.1
+		>=dev-java/jgoodies-forms-1.0
+	) )"
+
+S="${WORKDIR}/animation-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Remove the packaged jar
+	rm -v lib/*.jar *.jar || die
+
+	# cp ${FILESDIR}/build-${PV}.xml ${S}
+	java-ant_xml-rewrite -f build.xml -d -e javac -a bootclasspath \
+		|| die "Failed to fix bootclasspath"
+	java-pkg_filter-compiler jikes
+}
+
+# precompiled javadocs
+EANT_DOC_TARGET=""
+
+src_test() {
+	eant test -Djunit.jar.present=true \
+		-Djunit.jar=$(java-pkg_getjar junit junit.jar)
+}
+
+src_install() {
+	java-pkg_dojar build/animation.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml README.html || die
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/core/*
+	use examples && java-pkg_doexamples src/tutorial
+}
diff --git a/dev-java/jgoodies-animation/metadata.xml b/dev-java/jgoodies-animation/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/jgoodies-animation/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jgoodies-binding-1.1.2-r2 b/dev-java/jgoodies-binding-1.1.2-r2
deleted file mode 100644
index 1d925da105ad..000000000000
--- a/dev-java/jgoodies-binding-1.1.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Bind object properties with UI components
-EAPI=6
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=mirror://gentoo/binding-1_1_2.zip -> jgoodies-binding-1.1.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7723d12c6a89735ba961038cccfa69e5
diff --git a/dev-java/jgoodies-binding/Manifest b/dev-java/jgoodies-binding/Manifest
new file mode 100644
index 000000000000..5a927406145e
--- /dev/null
+++ b/dev-java/jgoodies-binding/Manifest
@@ -0,0 +1,3 @@
+DIST jgoodies-binding-1.1.2.zip 1265099 BLAKE2B 15cbb78e8289d7457d8c34112b18293b975046221226630542ffdee1950f8e0cf6120eb69daff57e601f75141b037e5ebc85248f396487e37f4435fbb9e77fe6 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7
+EBUILD jgoodies-binding-1.1.2-r2.ebuild 727 BLAKE2B 7da37b4d1b8afcf534fc20d79aaf6da594da83eb48381f23157dc903d1640b9287b6f153d632428226c4e868360f85dfa8df2547e343ad7e6e8c2c277e9d0047 SHA512 d095b153caed39783f705f34a3e9d5729950e651704559d54850d67be6d080c1cea93fc265c05752548b2f5393ae430650a07571319172f0292066145c13e9a9
+MISC metadata.xml 341 BLAKE2B df75f028a7f38b32d21a20cd1cf3d17f298bf92e99187d95f525d30be00e7a02ca1d0f04dc4e6dcefd028be89b83069e6db326bdc4d1e8eefdd84aa523e4fb5e SHA512 ca7c045eb07e88e8cdb6c6639ec651b038159d824df55dcb5f0819dae264edb8873e4dadf94fd6bf71879ddd64a75e44820fe2b6cf485df18ca743b264c9f267
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..9d62dba26479
--- /dev/null
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_V=${PV//./_}
+
+DESCRIPTION="Bind object properties with UI components"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="mirror://gentoo/binding-${MY_V}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="1.0"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+DOCS=( RELEASE-NOTES.txt README.html )
+
+S="${WORKDIR}/binding-${PV}"
+
+JAVA_SRC_DIR="src/core"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples \
+		src/core \
+		src/tutorial
+	einstalldocs
+}
diff --git a/dev-java/jgoodies-binding/metadata.xml b/dev-java/jgoodies-binding/metadata.xml
new file mode 100644
index 000000000000..6cad2bed16e5
--- /dev/null
+++ b/dev-java/jgoodies-binding/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		A library to bind object properties to UI components.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jgoodies-common-1.8.0 b/dev-java/jgoodies-common-1.8.0
deleted file mode 100644
index 04749e35b689..000000000000
--- a/dev-java/jgoodies-common-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JGoodies Common Library
-EAPI=5
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.8
-SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c14cba0f89b095bf2c43c1eef62aede4
diff --git a/dev-java/jgoodies-common/Manifest b/dev-java/jgoodies-common/Manifest
new file mode 100644
index 000000000000..1fc7fae1dfa3
--- /dev/null
+++ b/dev-java/jgoodies-common/Manifest
@@ -0,0 +1,3 @@
+DIST jgoodies-common-1_8_0.zip 575972 BLAKE2B c197f35e495c7f638f9601aa29041271522c8382b97151ea3a4f78a38a17e8dd45d0b6baf8d74bfa0ac3deeefac77c8da3cc8c956495d3443e87461e876e66bc SHA512 c00ffb6498b40b214bccad3ee8f0f3a9231bb8e67243be5ea15956694466485ac75aeed09f340aea323c6989190c10015b7a72b82d5a251bb5ea12ddaedb6b25
+EBUILD jgoodies-common-1.8.0.ebuild 688 BLAKE2B ef68362ebe56fb5b9daa2f4d8081f41425952ca33650b3bb5041c4301a47eb836906673f8849c4637e02cd2d9c55639664439a3beefa69f32e0a0e9a882a3c0e SHA512 c2c9f27c3d8b37fe5bb6679849ba8d8576d9f5b6ab9817b64d09f7a0ce4ca33fd15266dcf7e8dce6d7ead1d86e4e77b8fdf669ed8049be7a13b5743de14218f6
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild b/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
new file mode 100644
index 000000000000..da63d80e25a4
--- /dev/null
+++ b/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="common"
+MY_PV=${PV//./_}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="JGoodies Common Library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="1.8"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}"/${P}
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	mkdir src || die
+	unzip ${P}-sources.jar -d src || die
+	rm "${S}"/pom.xml "${S}"/*.jar || die
+}
diff --git a/dev-java/jgoodies-common/metadata.xml b/dev-java/jgoodies-common/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/jgoodies-common/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jgoodies-forms-1.3.0-r1 b/dev-java/jgoodies-forms-1.3.0-r1
deleted file mode 100644
index 6e3170612aa8..000000000000
--- a/dev-java/jgoodies-forms-1.3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JGoodies library
-EAPI=5
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.jgoodies.com/download/libraries/forms/forms-1_3_0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ecd00ae31ad557282d91909f5f299174
diff --git a/dev-java/jgoodies-forms-1.8.0 b/dev-java/jgoodies-forms-1.8.0
deleted file mode 100644
index 1e9d478744ed..000000000000
--- a/dev-java/jgoodies-forms-1.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/jgoodies-common:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JGoodies Forms Library
-EAPI=5
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/jgoodies-common:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.8
-SRC_URI=http://www.jgoodies.com/download/libraries/forms/jgoodies-forms-1_8_0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=42dfefc4e4c40a82bc0946c0faad7202
diff --git a/dev-java/jgoodies-forms/Manifest b/dev-java/jgoodies-forms/Manifest
new file mode 100644
index 000000000000..668e98ab08dc
--- /dev/null
+++ b/dev-java/jgoodies-forms/Manifest
@@ -0,0 +1,5 @@
+DIST forms-1_3_0.zip 1320397 BLAKE2B a520ffe8a5487d125a53bed8d8524b68f68aaf1444389e4038af5f9a035ce800fdb1a470d172ec442240d5530e4c34cd34a0523a5ab92888daa57f543defd296 SHA512 d155cc85ec77f23f55e59d4651ef1f9df2ab749bc6cffd4dd7cfbc0035587a2e6bf03427e7bace6feb71e6c43efc87115d393fa54ea6da331ded21996b32a6e8
+DIST jgoodies-forms-1_8_0.zip 1668539 BLAKE2B eed78fccd151322737b0f9e5fe39bf7e50f2b4a761b406059af5b62c564f28c44cd4a4efbd5485389d31948b26661aae641066020ed8d460f1c297ef9223be7c SHA512 dced4ddaea7e9157f99b7c27ad06bfed53c307181bfc21cee8f454ba8cececa3f5fd5186947fe5bb299c4de2032bd7489248e3e77623785ac47388306e3d6933
+EBUILD jgoodies-forms-1.3.0-r1.ebuild 791 BLAKE2B 6c598f31f2dc88f67d296e8e0cd9655b7b3efc84bbc161722df6c17a6c57c71e71b258f6ecd83a17d81805ee486cbce1e1b5aba931ae4bc69e21b8c15e094f95 SHA512 09da514783b6a49ac980401305f6dd700c46a5d5a3f381344d70fffaa42a2f9fdc7ebedd2a68f30febd239d0dd02d8486acbb6ab1d97be9f7fd4ebe21af760cc
+EBUILD jgoodies-forms-1.8.0.ebuild 801 BLAKE2B 9fb4a0f91f597cea541f3480bd506e2a1d0bcab23b39be153b357ab4eaf1310b92008ad687ec5cfbb968d68906c160671827f1791980a652b14a00af56b0cf69 SHA512 313407c53c0a99b97d6d1d1fe6a1ff084390f8e1b48720db98f07dc305d7a18ee4f1fb7194ebd32e46d99e8321efcb4c31b2bb3a67d00ac5262848b5376e0a10
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..7a564f2d4aab
--- /dev/null
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="forms"
+MY_PV=${PV//./_}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="JGoodies library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg_dojar "build/${MY_PN}.jar"
+
+	dodoc RELEASE-NOTES.txt README.html
+
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/{core,extras}/com
+	use examples && java-pkg_doexamples src/tutorial
+}
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild
new file mode 100644
index 000000000000..fc01183201ac
--- /dev/null
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="forms"
+MY_PV=${PV//./_}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="JGoodies Forms Library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="1.8"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-java/jgoodies-common:${SLOT}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}"/${P}
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="jgoodies-common-${SLOT}"
+
+java_prepare() {
+	mkdir src || die
+	unzip ${P}-sources.jar -d src || die
+	rm "${S}"/pom.xml "${S}"/*.jar || die
+}
diff --git a/dev-java/jgoodies-forms/metadata.xml b/dev-java/jgoodies-forms/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/jgoodies-forms/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jgoodies-looks-1.2.2-r2 b/dev-java/jgoodies-looks-1.2.2-r2
deleted file mode 100644
index 5493f28f3bb6..000000000000
--- a/dev-java/jgoodies-looks-1.2.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JGoodies Looks Library
-EAPI=5
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=doc elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=http://www.jgoodies.com/download/libraries/looks-1_2_2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=118dd3ef6cf8284fc3d00e89082c6fff
diff --git a/dev-java/jgoodies-looks-2.3.1-r1 b/dev-java/jgoodies-looks-2.3.1-r1
deleted file mode 100644
index c335e2ee1330..000000000000
--- a/dev-java/jgoodies-looks-2.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JGoodies Looks Library
-EAPI=5
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.0
-SRC_URI=http://www.jgoodies.com/download/libraries/looks/looks-2_3_1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3f2e8e5ed7d0100f7dc9d419176eb316
diff --git a/dev-java/jgoodies-looks-2.6.0 b/dev-java/jgoodies-looks-2.6.0
deleted file mode 100644
index 3cff53254ad9..000000000000
--- a/dev-java/jgoodies-looks-2.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/jgoodies-common:1.8 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JGoodies Looks Library
-EAPI=5
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-java/jgoodies-common:1.8 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.6
-SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bf007ba9c5ed1214242f69eb9eb13bfe
diff --git a/dev-java/jgoodies-looks/Manifest b/dev-java/jgoodies-looks/Manifest
new file mode 100644
index 000000000000..5bc1f8dfce0f
--- /dev/null
+++ b/dev-java/jgoodies-looks/Manifest
@@ -0,0 +1,10 @@
+AUX jgoodies-looks-1.2.2-build.xml 3035 BLAKE2B eac4c5cf00b69c27829b1ad7f61d602a9c69d4a5a1f84744665470b0f3f5cbf6173a1ad9404e7b746420a592e5d68385daf4a0f0f30dee890bddab6602844285 SHA512 0653e5d3cf536f482198e003589a526759cebff89aae40916aa9d80f9d2c89d78fefd710dcc9460b26e794c4a64ebd4c0f039b94145c2dc5826f3170d30ae8e8
+AUX jgoodies-looks-1.2.2-plastic.txt 308 BLAKE2B ac4bfd456bac7a5e8af3e45ff3e09fed253d8ed00a2a017e6f307b36ae10b30b1d6462588b2b3ccdfd86b234bbbac8ddd17fd3e356702e0effc351591075c37a SHA512 4b0212758a260a43b3d6e67d1b53e7fdccee3a584ffe9f2687b46cada832eaa2fe352ab0afb996df066ea4e03478f83a291b22681efdc25e20f963102624556c
+AUX jgoodies-looks-2.3.1-build.xml.patch 2443 BLAKE2B 233024a28d66d68efb71d55cec9c24d69c91f3c80d76d82d32b93aba6bb6080428909d0c0cba3b4eedb9eda5a9b6a460e77fa260b8d8fbb27ac3a9cad3d3b2cf SHA512 478455b021091b6344f352a628c037013ea03eef53ba934f8599ee080349cb84231749b8a4a36f8528852529b02ffeb7de4b0a9f4e3138bf5747655bc6c0e4f8
+DIST jgoodies-looks-2_6_0.zip 2444893 BLAKE2B 97d00131cf07f609141c97e4fd3e6b3c93f67dc879eb0ad99469c602e7e30b0d78dc4bd59202db1a3a503dec6c92ea061a176ef11e6c5f4fc26a86c697cf961f SHA512 1c33413379f391109d1db35bdf301acf0cc6d66bf8aa1026280015946bddb230b4cc1d233b700d46a519fb02c169df4670c874058f5e636e1e924a9d3a42442a
+DIST looks-1_2_2.zip 1811849 BLAKE2B 47dd516b5523b655757c08ba108b58e7b1e2e113ae4d0e90649db88c4353b66810f9a7b3cc810fe7bdbd5e9c1ad2a32d4b504665d3ffa2917f7a46647f444d09 SHA512 d9c5f0590a44dbc7d778a9da135361f5753eca4d47bef3636f21aa0d014df86dbad90031b5289928b99c352147ea702948028b18b36eb3bc44aef800326fb302
+DIST looks-2_3_1.zip 2105839 BLAKE2B 590412d7ed00d68a3fd8f8e5402802ca69039f2619e542619de787c6e9b4b2019096e87b7809e3b1f5a7d72963da3657fae7e465a245ef1ab0a5630219a968ed SHA512 61278cc0b8556ce19cfb5bdaaab2b42d7035fcdf71d614a8d3673629d5b04c5698e2be521df3e0518e781f78c03a8d3f466f1fdfba525f679e9de7409faf1088
+EBUILD jgoodies-looks-1.2.2-r2.ebuild 951 BLAKE2B 4ae873faf78ee14aa149df23dc3e8f35afa17e15aa4d465ee6faab2b8f5082d321c3a319131e1b5a6d06e78a5f9e8d302136bf1bc0a9310848d8fefccd49c2be SHA512 9fa06f4d662fa9be1fbabe0660d0f30ef6f128c930aa7683a11c0b32e885034807a4ea75ad969922e4900e502f51f218adf8675ea8328bafcdcc39079965007e
+EBUILD jgoodies-looks-2.3.1-r1.ebuild 1459 BLAKE2B b95792fe921d627c9fb78fb1bdfdddab5a8bdc9346e5c799b1e651ca9969ae4c7bdf114486bc1630ccc83b80125f2140fdd5dee3d65619fbef979eb4840c8cab SHA512 2523a2f5755636626ce36eefbc7a28b56aa1c4ac6cda30d36c758b62a75510ec75d6737f9a6dcee4157b6730a34d2ddac93df2a0c321b1751bc4b2046d6a714a
+EBUILD jgoodies-looks-2.6.0.ebuild 779 BLAKE2B 4acc9508d50f8be4892f2d082bb8949a5df0be8a2f8002b3568163a161dacf9333d6ba97131c8346ed0eeff1be0cdd67e738c2703b7369cf625776313a42bf50 SHA512 c5999ca3a392652c2b3cb36e88dbc7081fa9ff0e2d24acc179bb0c983a414775eb3f67ca3adf66ef309d9dc275d2f6f25089c4705f59cdd9ca4522712771d788
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jgoodies-looks/files/jgoodies-looks-1.2.2-build.xml b/dev-java/jgoodies-looks/files/jgoodies-looks-1.2.2-build.xml
new file mode 100644
index 000000000000..b24ec32156b4
--- /dev/null
+++ b/dev-java/jgoodies-looks/files/jgoodies-looks-1.2.2-build.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+
+<project name="Plastic" default="jar" basedir=".">
+   
+   <!-- This is a customized build.xml for portage! -->
+   <!--
+      <property file="${basedir}/build.properties"/>
+      <property file="${basedir}/default.properties"/>
+   -->
+
+   <property name="build" value="${basedir}/build"/>
+
+   <property name="spec.title" value="JGoodies Looks"/>
+   <property name="spec.version" value="1.2"/>
+   <property name="spec.vendor" value="Apache Software Foundation"/>
+   <property name="imp.title" value="com.jgoodies.plaf"/>
+   <property name="imp.version" value="1.2.2"/>
+   <property name="imp.vendor" value="Apache Software Foundation"/>
+
+   <property name="plaf.src" value="${basedir}/com/jgoodies/plaf"/>
+   <property name="clearlook.src" value="${basedir}/com/jgoodies/clearlook"/>
+
+   <property name="clearlook.javadoc" value="${build}/doc/clearlook"/>
+   <property name="clearlook.packages" value="com.jgoodies.clearlook.*"/>
+
+   <property name="plastic.javadoc" value="${build}/doc/plastic"/>
+   <property name="plastic.packages" value="com.jgoodies.clearlook.*"/>
+   
+   <target name="init">
+      <tstamp />
+      <mkdir dir="${build}"/>
+      <mkdir dir="${build}/doc"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+
+         <section name="com/jgoodies/plaf">
+            <attribute name="Specification-Title" value="${spec.title}"/>
+            <attribute name="Specification-Version" value="${spec.version}"/>
+            <attribute name="Specification-Vendor" value="${spec.vendor}"/>
+            <attribute name="Implementation-Title" value="${imp.title}"/>
+            <attribute name="Implementation-Version" value="${imp.version}"/>
+            <attribute name="Implementation-Vendor" value="${imp.vendor}"/>
+         </section>
+      </manifest>
+   </target>
+   
+   <target name="compile" depends="init">
+      <javac srcdir="${plaf.src};${clearlook.src}"
+             destdir="${build}"
+             source="1.4"
+             target="1.4"/>
+      
+      <!--
+         Copy application resources
+         NOTE: THIS MAY NEED TO BE CHANGED IN FUTURE VERSIONS!!
+      -->
+      <copy toDir="${build}/com/jgoodies/plaf">
+         <fileset dir="${plaf.src}" excludes="**/*.java"/>
+      </copy>
+   </target>
+
+   <target name="javadoc" depends="compile">
+      <javadoc sourcepath="${basedir}"
+               destdir="${clearlook.javadoc}"
+               packagenames="${clearlook.packages}"/>
+      <javadoc sourcepath="${basedir}"
+               destdir="${plastic.javadoc}"
+               packagenames="${plastic.packages}"/>
+   </target>
+
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="looks.jar" manifest="MANIFEST.MF">
+         <fileset dir="${build}"/>
+         <zipfileset dir="${basedir}"
+                     includes="plastic.txt"
+                     fullpath="META-INF/services/javax.swing.LookAndFeel"/>
+      </jar>
+   </target>
+
+</project>
diff --git a/dev-java/jgoodies-looks/files/jgoodies-looks-1.2.2-plastic.txt b/dev-java/jgoodies-looks/files/jgoodies-looks-1.2.2-plastic.txt
new file mode 100644
index 000000000000..ab3737ca6a30
--- /dev/null
+++ b/dev-java/jgoodies-looks/files/jgoodies-looks-1.2.2-plastic.txt
@@ -0,0 +1,8 @@
+# JGoodies Plastic L&F- replacement for Metal
+com.jgoodies.plaf.plastic.PlasticLookAndFeel
+# JGoodies Plastic 3D L&F
+com.jgoodies.plaf.plastic.Plastic3DLookAndFeel
+# JGoodies Plastic XP L&F
+com.jgoodies.plaf.plastic.PlasticXPLookAndFeel
+# JGoodies Windows L&F
+com.jgoodies.plaf.windows.ExtWindowsLookAndFeel
diff --git a/dev-java/jgoodies-looks/files/jgoodies-looks-2.3.1-build.xml.patch b/dev-java/jgoodies-looks/files/jgoodies-looks-2.3.1-build.xml.patch
new file mode 100644
index 000000000000..e6c0a4be2330
--- /dev/null
+++ b/dev-java/jgoodies-looks/files/jgoodies-looks-2.3.1-build.xml.patch
@@ -0,0 +1,61 @@
+--- build.xml.orig	2006-10-12 23:54:26.000000000 +0200
++++ build.xml	2006-10-12 23:57:36.000000000 +0200
+@@ -100,7 +100,6 @@
+ 			srcdir       ="${src.core.dir}"

+ 			destdir      ="${build.core.dir}"

+         	encoding     ="${build.encoding}"

+-        	executable   ="${build.compile.executable}"

+         	fork         ="${build.compile.fork}"

+ 			debug        ="${build.compile.debug}"

+ 			depend       ="${build.compile.depend}"

+@@ -109,8 +108,7 @@
+ 			optimize     ="${build.compile.optimize}"

+             source       ="${build.compile.source}"

+ 			target       ="${build.compile.target}"

+-			verbose      ="${build.compile.verbose}"

+-			bootclasspath="${build.boot.classpath}" />

++			verbose      ="${build.compile.verbose}"/>
+ 

+ 		<copy toDir="${build.core.dir}" >

+ 			<fileset dir="${src.core.dir}" 

+@@ -127,7 +125,6 @@
+ 			srcdir       ="${src.demo.dir}" 

+ 			destdir      ="${build.demo.dir}"

+         	encoding     ="${build.encoding}"

+-        	executable   ="${build.compile.executable}"

+         	fork         ="${build.compile.fork}"

+ 			debug        ="${build.compile.debug}"

+ 			depend       ="${build.compile.depend}"

+@@ -137,7 +134,6 @@
+             source       ="${build.compile.source}"

+ 			target       ="${build.compile.target}"

+ 			verbose      ="${build.compile.verbose}"

+-			bootclasspath="${build.boot.classpath}" 

+ 		    classpathref ="classpath.demo" />

+ 	</target>

+ 

+@@ -149,7 +145,6 @@
+             srcdir       ="${src.test.dir}" 

+             destdir      ="${build.test.dir}"

+             encoding     ="${build.encoding}"

+-            executable   ="${build.compile.executable}"

+             fork         ="${build.compile.fork}"

+             debug        ="${build.compile.debug}"

+             depend       ="${build.compile.depend}"

+@@ -159,7 +154,6 @@
+             source       ="${build.compile.source}"

+             target       ="${build.compile.target}"

+             verbose      ="${build.compile.verbose}"

+-            bootclasspath="${build.boot.classpath}"

+             classpathref ="classpath.tests" />

+     </target>   

+     

+@@ -235,7 +229,7 @@
+ 	</target>

+ 	

+     <!-- ***************************************************************** -->

+-	<target name="jar-all" depends="compile, manifest"

++	<target name="jar-all" depends="compile-core, manifest"

+ 	        description="Creates the library jar with all JGoodies l&amp;fs." >

+ 

+ 		<jar 

diff --git a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..4dee649843f9
--- /dev/null
+++ b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="looks"
+MY_PV="${PV//./_}"
+
+DESCRIPTION="JGoodies Looks Library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}-${MY_PV}.zip"
+
+LICENSE="BSD"
+SLOT="1.2"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+EANT_DOC_TARGET="javadoc"
+
+java_prepare() {
+	java-pkg_clean
+
+	cp "${FILESDIR}/${P}-build.xml" "${S}"/build.xml || die
+	cp "${FILESDIR}/${P}-plastic.txt" "${S}"/plastic.txt || die
+
+	unzip ${MY_PN}-${PV}-src.zip || die
+}
+
+src_install() {
+	java-pkg_dojar "${MY_PN}.jar"
+
+	dodoc RELEASE-NOTES.txt
+	use source && java-pkg_dosrc com
+	use doc && java-pkg_dohtml -r build/doc
+	use examples && java-pkg_doexamples src/examples
+}
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..93852c012269
--- /dev/null
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="looks"
+MY_PV="${PV//./_}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="JGoodies Looks Library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="2.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	>=virtual/jdk-1.4
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# bug #150970
+EANT_FILTER_COMPILER="jikes"
+# jar target fails unless we make descriptors.dir an existing directory
+# update: it's where it looks for all.txt file
+EANT_EXTRA_ARGS="-Ddescriptors.dir=\"${S}\""
+
+EANT_BUILD_TARGET="jar-all"
+
+java_prepare() {
+	# remove the bootclasspath brokedness, make building demo optional
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# unzip the look&feel settings from bundled jar before we delete it
+	unzip -j looks-${PV}.jar META-INF/services/javax.swing.LookAndFeel \
+		|| die "unzip of javax.swing.LookAndFeel failed"
+	# and rename it to what build.xml expects
+	mv javax.swing.LookAndFeel all.txt || die
+
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg_dojar build/looks.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml README.html || die
+	use doc && java-pkg_dojavadoc build/docs/api
+	use source && java-pkg_dosrc src/core/com
+	use examples && java-pkg_doexamples src/demo
+}
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild
new file mode 100644
index 000000000000..bc04265b83bd
--- /dev/null
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="looks"
+MY_PV=${PV//./_}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="JGoodies Looks Library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="2.6"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/jgoodies-common:1.8"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}"/${P}
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="jgoodies-common-1.8"
+
+java_prepare() {
+	mkdir src || die
+	unzip ${P}-sources.jar -d src || die
+	rm "${S}"/pom.xml "${S}"/*.jar || die
+}
diff --git a/dev-java/jgoodies-looks/metadata.xml b/dev-java/jgoodies-looks/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/jgoodies-looks/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jgraph-5.12.0.4 b/dev-java/jgraph-5.12.0.4
deleted file mode 100644
index c1b330b9ac7d..000000000000
--- a/dev-java/jgraph-5.12.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Open-source graph component for Java
-EAPI=0
-HOMEPAGE=https://www.jgraph.com
-IUSE=doc examples source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jgraph/jgraph-5.12.0.4-lgpl-src.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c060de199d492b12cc46251d58f82528
diff --git a/dev-java/jgraph/Manifest b/dev-java/jgraph/Manifest
new file mode 100644
index 000000000000..2d0fb37f3b8a
--- /dev/null
+++ b/dev-java/jgraph/Manifest
@@ -0,0 +1,3 @@
+DIST jgraph-5.12.0.4-lgpl-src.jar 3460750 BLAKE2B 0d2c50673eb652e4335a2d4fe9edcd93745595302c9ce674e8bb05ceab5edcb6b4a190e4d4da14bdb552ca7d35421473d0931addb02c2d1326d81eb442c372d1 SHA512 0832afeb28c4d5abb9288de4e1b74eefc432bb98f622e71f0d192bf9f01741feb406ba0473b923e0cb93401120c1456a00eec4653355c37bff7e9e1863e81b5d
+EBUILD jgraph-5.12.0.4.ebuild 996 BLAKE2B d8b8587dfd1b4a81b274494351887cad8471eabfc41339b0ae32f96e0a910d488d58c83da76b08e356fa42fc9a2fffcc9358453c5abd0c2c34cfc6c94febd3dd SHA512 84f4bacaf5e8bebd32e09d213da2d43174581307fbc63f41737165d7d4043ad2e88f1729f4676a11642fd60aaca9bfc3f10eb215e644738bdaa924968418ce47
+MISC metadata.xml 312 BLAKE2B 4226249366dff5db47d56cbdba95d9a07bd19347720d5990adf17d24a3fec0dae9a133fd44f9ebc4990b21b8c1cc5ee959b2ba8f3421fb2bef779487243504a1 SHA512 270716861776916f2d7a6ab6671b6dcf220ce6b3cce5397b3994c19f83a91c110a5eb3a783ba6277d098b6382481d98cc610397c836e4a9166d857db92da0b56
diff --git a/dev-java/jgraph/jgraph-5.12.0.4.ebuild b/dev-java/jgraph/jgraph-5.12.0.4.ebuild
new file mode 100644
index 000000000000..fdd3e3ec6688
--- /dev/null
+++ b/dev-java/jgraph/jgraph-5.12.0.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Open-source graph component for Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}-lgpl-src.jar"
+HOMEPAGE="https://www.jgraph.com"
+IUSE="doc examples source"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v *.class || die
+
+	# don't do javadoc always
+	sed -i -e 's/depends="compile, doc"/depends="compile"/' build.xml || \
+		die "sed failed"
+
+	rm -rf doc/api || die
+	rm lib/jgraph.jar || die
+}
+
+EANT_DOC_TARGET="apidoc"
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	dodoc README WHATSNEW ChangeLog || die
+	use doc && java-pkg_dojavadoc build/doc/api
+	use source && java-pkg_dosrc src/org
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/jgraph/metadata.xml b/dev-java/jgraph/metadata.xml
new file mode 100644
index 000000000000..6770432d3010
--- /dev/null
+++ b/dev-java/jgraph/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jgraph</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jgrapht-0.8.3 b/dev-java/jgrapht-0.8.3
deleted file mode 100644
index 8a68817b32bd..000000000000
--- a/dev-java/jgrapht-0.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/touchgraph-graphlayout:0 dev-java/jgraph:0 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/xmlunit:1 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Graph library that is a simpler and faster alternative to JGraph
-EAPI=5
-HOMEPAGE=http://jgrapht.sourceforge.net
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/touchgraph-graphlayout:0 dev-java/jgraph:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jgrapht/jgrapht-0.8.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1a27818180025e86f9835b683b45b496
diff --git a/dev-java/jgrapht/Manifest b/dev-java/jgrapht/Manifest
new file mode 100644
index 000000000000..8aa0c78aa2b9
--- /dev/null
+++ b/dev-java/jgrapht/Manifest
@@ -0,0 +1,3 @@
+DIST jgrapht-0.8.3.tar.gz 1268147 BLAKE2B 78b9c6a4787adead9c27a4cf74f9ce821bab1ff35a62828383d058d50e4b568118f54bb0270449d75268aaae4d4d47231349342d064d185b4906ceb6b19022d1 SHA512 964790dc74fea1d84f4a4cda4a253ede810725ee7173a2b376acb3f0e10baa2eefcbc38c76441600e0c282e0486243a464116cb803308eac134561181a2c28e6
+EBUILD jgrapht-0.8.3.ebuild 1062 BLAKE2B 7bc9f9097b0ed041badd686d413b46b76b4df618c65d1b10b7f55735a64cec8da64c7e5a80cf6714d7c6fac5fe9de301bc69dcc0605e2067300f2270b548973f SHA512 cf0dda5088d2d4326f37c574489e1e6bdd4651800529c99ee474e3f4e26b702dbe31e56bafc2ceed66a6f54b2dd4a09e8ff166315bc9d2d8f5e9b20db329b631
+MISC metadata.xml 313 BLAKE2B 4144798a29806efe72bce4ac739d01b6e56112670ae49bcaa9daf136bc68f6d375a534f5cb1450b4804c2a991200e08432bb8a63146c10172ab978a876727e4f SHA512 f133e2841c59716d604538e5472d1b1d81a1c0a01d8ce1dd43d8a62115bbd3cb272a1c9c257c40f760c1b3236540e7ec0835e949073c6ca6d1c20d3de825ad67
diff --git a/dev-java/jgrapht/jgrapht-0.8.3.ebuild b/dev-java/jgrapht/jgrapht-0.8.3.ebuild
new file mode 100644
index 000000000000..d35de3c1861e
--- /dev/null
+++ b/dev-java/jgrapht/jgrapht-0.8.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Graph library that is a simpler and faster alternative to JGraph"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://jgrapht.sourceforge.net"
+
+KEYWORDS="amd64 x86"
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+CDEPEND="dev-java/touchgraph-graphlayout:0
+	dev-java/jgraph:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0
+		dev-java/xmlunit:1 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="touchgraph-graphlayout jgraph"
+EANT_DOC_TARGET="javadoc"
+
+java_prepare() {
+	rm -rf "${S}/lib" || die
+	rm -v "${S}"/*.jar || die
+}
+
+src_test() {
+	EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} xmlunit:1" ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	java-pkg_newjar ${PN}*.jar || die
+
+	dohtml README.html || die
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/jgrapht/metadata.xml b/dev-java/jgrapht/metadata.xml
new file mode 100644
index 000000000000..7c98afe81027
--- /dev/null
+++ b/dev-java/jgrapht/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jgrapht</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jgroups-2.9.0 b/dev-java/jgroups-2.9.0
deleted file mode 100644
index aa4f1f627555..000000000000
--- a/dev-java/jgroups-2.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 >=virtual/jre-1.5 dev-java/bsh:0 dev-java/log4j:0 java-virtuals/jmx app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JGroups is a toolkit for reliable multicast communication
-EAPI=2
-HOMEPAGE=http://www.jgroups.org/javagroupsnew/docs/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.5 dev-java/bsh:0 dev-java/log4j:0 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/javagroups/JGroups-2.9.0.GA.src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5877e0ab68eca8cac1f1e22d70cefd84
diff --git a/dev-java/jgroups/Manifest b/dev-java/jgroups/Manifest
new file mode 100644
index 000000000000..ba6fb56c0616
--- /dev/null
+++ b/dev-java/jgroups/Manifest
@@ -0,0 +1,4 @@
+AUX 2.9.0-ant-1.8-compat.patch 733 BLAKE2B 520d8c1f89cee180055711fd8568f881a9389d9e267f84962e69c91d8c672f014fd91b807f1f96db0b1ec1d217c249c721b05cf11e967caeafe59c4b931ba481 SHA512 71c8c0f4436c983a86b6eee8b4600cc573758ea5da7e33ed4fde8e40f47b47656cd453513a4b367807d51151d2298cda8df5ec1229ac6abd68f3d6bf3fdeaf22
+DIST JGroups-2.9.0.GA.src.zip 9227273 BLAKE2B 751d72adc9cf6d9c8ccddd5b006ef05de1c4ef523c465955d4d40fef847e880882ee6f51950f48f98f328373bdb0505ee39664244df5fa9eb0a8a0066095ec0c SHA512 5482e3a7d895db4d455f92d14c27559eca9370146b397efa4dc17c416a3b833fcfe0753117ca00e1445e49be239f817aad9bb8b626c1b0fb68869f7d1c9ad0df
+EBUILD jgroups-2.9.0.ebuild 1875 BLAKE2B 5c0a40d6d97b354cd30139087f6073b171de8356550f97bccfc6fd56227a4836f4c32585cc7ecc9e0138175dc150b5086eb53673875638041f6e4574d2ff6480 SHA512 1d940f2d63a2812d1475d84c8c7d586ab9824c7d38b364c746f1a13c306b63711db4c0c39e872bfe612edccfcf8781a0d23289309ec04e232f26d8d99ff75110
+MISC metadata.xml 316 BLAKE2B 1b31c10da4f0caadfd0e23b5674ee4a6d5dc053d54aca2ed3b5a2d887cbeca027bcb2d23d3f806ff811abc37359efdfb224be36f8c8ebb23d745dde628d3b36b SHA512 7f02e04f7c3598cf20c483279e740b88099344445d13559f198a863223ef27cd30fd8f9f7a8a33585899fd826db827eb7592b41805551a84ba3a66c3082f280a
diff --git a/dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch b/dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch
new file mode 100644
index 000000000000..46a7820377ec
--- /dev/null
+++ b/dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch
@@ -0,0 +1,20 @@
+--- build.xml.orig	2010-02-28 02:14:36.000000000 +0100
++++ build.xml	2010-02-28 02:15:13.000000000 +0100
+@@ -43,8 +43,6 @@
+     <property name="threadcount" value="false"/>
+     <property name="test.verbose" value="0"/>
+ 
+-    <taskdef resource="testngtasks" classpathref="jg.classpath"/>
+-
+     <!-- properties to determine IP version used -->
+     <condition property="java.net.preferIPv4Stack" value="true" else="false">
+       <isfalse value="${jgroups.useIPv6}"/>
+@@ -63,6 +61,8 @@
+         </fileset>
+     </path>
+ 
++    <taskdef resource="testngtasks" classpathref="jg.classpath"/>
++
+     <!-- patternsets used to define test sets -->
+     <patternset id="flush.tests">
+         <include name="org/jgroups/tests/FlushTest*"/>
diff --git a/dev-java/jgroups/jgroups-2.9.0.ebuild b/dev-java/jgroups/jgroups-2.9.0.ebuild
new file mode 100644
index 000000000000..e341d59ef449
--- /dev/null
+++ b/dev-java/jgroups/jgroups-2.9.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="JGroups"
+MY_PV="${PV/_p/-sp}"
+MY_P="${MY_PN}-${MY_PV}.GA"
+DESCRIPTION="JGroups is a toolkit for reliable multicast communication"
+SRC_URI="mirror://sourceforge/javagroups/${MY_P}.src.zip"
+HOMEPAGE="http://www.jgroups.org/javagroupsnew/docs/"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+RDEPEND=">=virtual/jre-1.5
+	dev-java/bsh:0
+	dev-java/log4j:0
+	java-virtuals/jmx"
+
+DEPEND=">=virtual/jdk-1.5
+	${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}.src
+
+java_prepare() {
+	# bug #305929
+	epatch "${FILESDIR}/2.9.0-ant-1.8-compat.patch"
+
+	cd "${S}/lib" || die
+	rm -v *.jar || die
+
+	java-pkg_jar-from bsh
+	java-pkg_jar-from log4j
+	java-pkg_jar-from --virtual jmx
+
+	# Needed for unit tests
+	#java-pkg_jar-from --build-only junit
+	# One unit tests needs this
+	#java-pkg_jar-from --build-only bcprov
+
+	# Just get rid of these as they are of no use to us as we don't install them
+	# Always tries to compile them.
+	#if ! use test; then
+		rm -vr "${S}"/tests/{junit,other,junit-functional}/org || die
+		rm -v "${S}/src/org/jgroups/util/JUnitXMLReporter.java" || die
+	#fi
+}
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+# The jar target generates jgroups-all.jar that has the demos and tests in it
+EANT_BUILD_TARGET="jgroups-core.jar"
+
+src_install() {
+	java-pkg_dojar dist/jgroups-*.jar
+	dodoc CREDITS README || die
+
+	if use doc; then
+		java-pkg_dojavadoc dist/javadoc
+		insinto /usr/share/doc/${PF}
+		doins -r doc/* || die
+	fi
+	use source && java-pkg_dosrc src/*
+
+}
+
+RESTRICT="test"
+# A lot of these fail. Don't know status in 2.7
+# as need testng in main tree first.
+src_test() {
+	# run the report target for nice html pages
+	ANT_TASKS="ant-junit" eant unittests-xml
+}
diff --git a/dev-java/jgroups/metadata.xml b/dev-java/jgroups/metadata.xml
new file mode 100644
index 000000000000..6cb3fe6207e0
--- /dev/null
+++ b/dev-java/jgroups/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">javagroups</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jibx-1.1.5-r3 b/dev-java/jibx-1.1.5-r3
deleted file mode 100644
index 1b5fc5da6643..000000000000
--- a/dev-java/jibx-1.1.5-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/bcel:0 dev-java/xpp3:0 dev-java/dom4j:1 dev-java/ant-core:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JiBX: Binding XML to Java Code
-EAPI=6
-HOMEPAGE=http://jibx.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=dev-java/bcel:0 dev-java/xpp3:0 dev-java/dom4j:1 dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip -> jibx-1.1.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fa99479b132db9e2c6b90712d3aa0e27
diff --git a/dev-java/jibx-1.2.6-r1 b/dev-java/jibx-1.2.6-r1
deleted file mode 100644
index 209f9eaec76e..000000000000
--- a/dev-java/jibx-1.2.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/bcel:0 dev-java/xpp3:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/log4j:0 dev-java/joda-time:0 dev-java/ant-core:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Bind XML to Java code
-EAPI=6
-HOMEPAGE=http://jibx.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=dev-java/bcel:0 dev-java/xpp3:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/log4j:0 dev-java/joda-time:0 dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=https://repo1.maven.org/maven2/org/jibx/jibx-extras/1.2.6/jibx-extras-1.2.6-sources.jar https://repo1.maven.org/maven2/org/jibx/jibx-bind/1.2.6/jibx-bind-1.2.6-sources.jar https://repo1.maven.org/maven2/org/jibx/jibx-run/1.2.6/jibx-run-1.2.6-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2debcbcee7978abc39edf84c0658d04b
diff --git a/dev-java/jibx-tools-1.1.5-r2 b/dev-java/jibx-tools-1.1.5-r2
deleted file mode 100644
index 8a9ee000885e..000000000000
--- a/dev-java/jibx-tools-1.1.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/bcel:0 java-virtuals/stax-api:0 dev-java/jibx:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JiBX: Binding XML to Java Code - Generators
-EAPI=5
-HOMEPAGE=http://jibx.sourceforge.net/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/bcel:0 java-virtuals/stax-api:0 dev-java/jibx:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3e3f54441022bc2033f0b5a4ae00c2a5
diff --git a/dev-java/jibx-tools-1.1.5-r3 b/dev-java/jibx-tools-1.1.5-r3
deleted file mode 100644
index a180dd208c80..000000000000
--- a/dev-java/jibx-tools-1.1.5-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/bcel:0 dev-java/jibx:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JiBX: Binding XML to Java Code - Generators
-EAPI=5
-HOMEPAGE=http://jibx.sourceforge.net/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/bcel:0 dev-java/jibx:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b785c49b69cf0c7ae028e9f9e8f0efb5
diff --git a/dev-java/jibx-tools/Manifest b/dev-java/jibx-tools/Manifest
new file mode 100644
index 000000000000..f96fdf4f25b4
--- /dev/null
+++ b/dev-java/jibx-tools/Manifest
@@ -0,0 +1,5 @@
+AUX 1.1.5-build.patch 1082 BLAKE2B 6a91b3c3464d23cd846501ced1bcbfb93c667ccea31cab3f27c2e19b8965cc6e54af45af23b39a27891ae82d0bb5b98122fd0c03515abb9de146ec601a617c28 SHA512 5e9b2814cfcdf2624c3e8c813d74cecf6a5c2fb1ed8fa493dbb8af039cb1b13b526018dffc512cda9abb48c3b6a481f7a3fe3095c71218f7231cc0785529d064
+DIST jibx_1_1_5.zip 6788994 BLAKE2B 0b579e6eb9f6037c92dce3acbec4e9fd5a6aec179cb0f4ecf935ff0bbfb525c4c317d79d21683c3ea6136256b69f5aa9250851802c8eaccf14f3dff9f5ad8aa6 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7
+EBUILD jibx-tools-1.1.5-r2.ebuild 1112 BLAKE2B e989b0bb0ba50c222b98331840310509a21ed9e8592035fbcfe438610504e018111f2a0d489cd9ccf0989d51097bde0664f455e5dd5a26ef6e65eeaea2602c40 SHA512 3a33add19351da5c3c2a358329a2e0b7ba68a120d9dd00db0a3fb6533c0f200259b175d0548ba1224d31f2c47287c7c2be60571ba6283e5a12e39fe5c52b1c1e
+EBUILD jibx-tools-1.1.5-r3.ebuild 1079 BLAKE2B 0ae251af105c5f8d35cf7e5172371284fccccc5bde50e5c5d6f1b868a2a6660a02b20e7216392216e49793c4c89aa6b98133c4464102d3930e853b70255e3325 SHA512 bad3f13750ce06d8832d7ae8bcc3c6be6255ba0528d473cdad871c45ca2a5f3e7688d961a8e6fb040bf1fd9cd6bd42ca53a233ea5243493048520632d9630135
+MISC metadata.xml 310 BLAKE2B 553d575c998235bcf718e558a48fd802b683298ac6075d165488a6173dab86c73169a761673ebd6307b3e3ad446034cb418e5515b1aeb147505e98410b3466cd SHA512 40d0f9f66393bca25216d7953624b713aa0ecce6badf7a8021ac269813131cd630d90b48e042f31b27b8681e2286c50f24c15938b14fc7a4fdbc224a626d75dd
diff --git a/dev-java/jibx-tools/files/1.1.5-build.patch b/dev-java/jibx-tools/files/1.1.5-build.patch
new file mode 100644
index 000000000000..7e2354c2cbde
--- /dev/null
+++ b/dev-java/jibx-tools/files/1.1.5-build.patch
@@ -0,0 +1,20 @@
+--- build/src/org/jibx/binding/SchemaGenerator.java	2007-05-23 21:31:14.000000000 +0300
++++ build/src/org/jibx/binding/SchemaGenerator.java	2008-02-21 23:14:06.000000000 +0200
+@@ -178,7 +178,7 @@
+         m_classLocator = new IClassLocator() {
+             public IClass getClassInfo(String name) {
+                 try {
+-                    return new ClassWrapper(ClassCache.getClassFile(name));
++                    return new ClassWrapper(m_classLocator, ClassCache.getClassFile(name));
+                 } catch (JiBXException e) {
+                     throw new IllegalStateException("Class not found " + name);
+                 }
+@@ -382,7 +382,7 @@
+             
+             // check for reference to a mapped class
+             StructureElement structure = (StructureElement)comp;
+-            TemplateElementBase templ = structure.getMapAsMapping();
++            TemplateElementBase templ = structure.getEffectiveMapping();
+             if (! (templ instanceof MappingElement)) {
+                 
+                 // unknown content, leave it to user to fill in details
diff --git a/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild b/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild
new file mode 100644
index 000000000000..dd75ab9faf44
--- /dev/null
+++ b/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_PV=$(replace_all_version_separators '_')
+
+DESCRIPTION="JiBX: Binding XML to Java Code - Generators"
+HOMEPAGE="http://jibx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jibx/jibx_${MY_PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/bcel:0
+	java-virtuals/stax-api:0
+	dev-java/jibx:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}/jibx"
+
+java_prepare() {
+	# http://jira.codehaus.org/browse/JIBX-207
+	epatch "${FILESDIR}/1.1.5-build.patch"
+
+	java-ant_rewrite-classpath "${S}/build/build.xml"
+
+	rm -v "${S}"/lib/*.jar || die
+}
+
+EANT_FILTER_COMPILER="ecj-3.3"
+EANT_BUILD_XML="build/build.xml"
+EANT_BUILD_TARGET="jar-tools"
+EANT_GENTOO_CLASSPATH="bcel,stax-api,jibx"
+
+src_install() {
+	java-pkg_register-dependency jibx
+
+	java-pkg_dojar "${S}/lib"/jibx-*.jar
+	use source && java-pkg_dosrc "${S}"/build/src/* "${S}"/build/extras/*
+}
diff --git a/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild b/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild
new file mode 100644
index 000000000000..c60763f4676e
--- /dev/null
+++ b/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_PV=$(replace_all_version_separators '_')
+
+DESCRIPTION="JiBX: Binding XML to Java Code - Generators"
+HOMEPAGE="http://jibx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jibx/jibx_${MY_PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/bcel:0
+	dev-java/jibx:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}/jibx"
+
+java_prepare() {
+	# http://jira.codehaus.org/browse/JIBX-207
+	epatch "${FILESDIR}/1.1.5-build.patch"
+
+	java-ant_rewrite-classpath "${S}/build/build.xml"
+
+	rm -v "${S}"/lib/*.jar || die
+}
+
+EANT_FILTER_COMPILER="ecj-3.3"
+EANT_BUILD_XML="build/build.xml"
+EANT_BUILD_TARGET="jar-tools"
+EANT_GENTOO_CLASSPATH="bcel,jibx"
+
+src_install() {
+	java-pkg_register-dependency jibx
+
+	java-pkg_dojar "${S}/lib"/jibx-*.jar
+	use source && java-pkg_dosrc "${S}"/build/src/* "${S}"/build/extras/*
+}
diff --git a/dev-java/jibx-tools/metadata.xml b/dev-java/jibx-tools/metadata.xml
new file mode 100644
index 000000000000..991690c700b2
--- /dev/null
+++ b/dev-java/jibx-tools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jibx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jibx/Manifest b/dev-java/jibx/Manifest
new file mode 100644
index 000000000000..4f7c0ef588cb
--- /dev/null
+++ b/dev-java/jibx/Manifest
@@ -0,0 +1,7 @@
+DIST jibx-1.1.5.zip 6788994 BLAKE2B 0b579e6eb9f6037c92dce3acbec4e9fd5a6aec179cb0f4ecf935ff0bbfb525c4c317d79d21683c3ea6136256b69f5aa9250851802c8eaccf14f3dff9f5ad8aa6 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7
+DIST jibx-bind-1.2.6-sources.jar 450003 BLAKE2B 01dac23fe19f59f634bbf4c78c5f8bbdd5f61cb20e3fdc0d7a08d18614220b84b0512624019e29d3c2c2500c2d7278613260ce70601f8aaa0a863cbca38dff6a SHA512 8a93aed76d00c465f4fa1d4929bbecc37497b05d7e094b68745bd740bf06cfe87919f3c02b83311766852845e763a2ed51f9ed1d543d03921dea1b67526e7668
+DIST jibx-extras-1.2.6-sources.jar 61737 BLAKE2B 4a9a5f3d2f0490b7322a911bf245e9081c1aeea112908014a64dd32792a5ae2519b5a2d1f29119774ad4d9947ff6ed30304f401a984d677619837139fa4ad4bf SHA512 355e387f92766e2cdd8686e9ed26e80584c668ca6c670532f8f24ae758bc4713cfd505890f0ea634b3380f41429725e2ca719652700b0dc3562d5966b108b3ed
+DIST jibx-run-1.2.6-sources.jar 194660 BLAKE2B 4a5cafab6ed7a75e88151c141bd1b41cad12523c353fe7803de3a0d334c186a86884bb3969b6a0ae17a50f48a360368043b6bf8a2f2a00181650da9f15ecca2b SHA512 623ef57cc411464fe1b936d9795ba982fb221334ad8ea8448afa73d9c229a2b3dacde1ee424864d1c12830d59ca2e9431d54b5cb0d1e8273b4fd6fbc47a3cf5a
+EBUILD jibx-1.1.5-r3.ebuild 1090 BLAKE2B 338c630eba01b2166c7a6c86b29dfc9dc672382e818f379f06a22544228ac45f5c3b7028434188f30fb6b7ca57ed6c5adeecd1be328093aa396d08d795b0fd9a SHA512 f41ef60c7a4497c3a91076b2b3ca0d775734bde53ae797dd44f37bcfbb11c77b60e029264925a87eeaa3bff4a7c4c035a615e75b407779952d9d0d476ec293c8
+EBUILD jibx-1.2.6-r1.ebuild 960 BLAKE2B 077e2dcaccaa07fe6e377273ae66144840a4d2fa75527c3746595f9911635189f049dc920e2dc9287ec949547adadb2207eb21b3bd76eb3390e986abd255d138 SHA512 2eb8dbbe4bb26d83e664bc98b2d57190eea9b333a406753af8268a08275a253f2b84d205b2b023de887a0c6c3f004c33733affa670aade2f47a7bbb44c9a64f3
+MISC metadata.xml 310 BLAKE2B 553d575c998235bcf718e558a48fd802b683298ac6075d165488a6173dab86c73169a761673ebd6307b3e3ad446034cb418e5515b1aeb147505e98410b3466cd SHA512 40d0f9f66393bca25216d7953624b713aa0ecce6badf7a8021ac269813131cd630d90b48e042f31b27b8681e2286c50f24c15938b14fc7a4fdbc224a626d75dd
diff --git a/dev-java/jibx/jibx-1.1.5-r3.ebuild b/dev-java/jibx/jibx-1.1.5-r3.ebuild
new file mode 100644
index 000000000000..08b38a263037
--- /dev/null
+++ b/dev-java/jibx/jibx-1.1.5-r3.ebuild
@@ -0,0 +1,52 @@
+# 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-ant-2 versionator
+
+MY_PV=$(replace_all_version_separators '_')
+
+DESCRIPTION="JiBX: Binding XML to Java Code"
+HOMEPAGE="http://jibx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+CDEPEND="
+	dev-java/bcel:0
+	dev-java/xpp3:0
+	dev-java/dom4j:1
+	dev-java/ant-core:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( changes.txt docs/binding.dtd docs/binding.xsd )
+HTML_DOCS=( readme.html docs starter tutorial )
+
+EANT_BUILD_TARGET="small-jars"
+EANT_BUILD_XML="build/build.xml"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	java-pkg_jar-from --into lib ant-core,bcel,dom4j-1,xpp3
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/lib/${PN}*.jar
+	use source && java-pkg_dosrc build/src/* build/extras/*
+	einstalldocs
+}
diff --git a/dev-java/jibx/jibx-1.2.6-r1.ebuild b/dev-java/jibx/jibx-1.2.6-r1.ebuild
new file mode 100644
index 000000000000..3a2db81cf37a
--- /dev/null
+++ b/dev-java/jibx/jibx-1.2.6-r1.ebuild
@@ -0,0 +1,47 @@
+# 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="Bind XML to Java code"
+HOMEPAGE="http://jibx.sourceforge.net/"
+SRC_URI="
+	https://repo1.maven.org/maven2/org/${PN}/${PN}-extras/${PV}/${PN}-extras-${PV}-sources.jar
+	https://repo1.maven.org/maven2/org/${PN}/${PN}-bind/${PV}/${PN}-bind-${PV}-sources.jar
+	https://repo1.maven.org/maven2/org/${PN}/${PN}-run/${PV}/${PN}-run-${PV}-sources.jar
+"
+
+LICENSE="BSD"
+SLOT="1.2"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+CDEPEND="
+	dev-java/bcel:0
+	dev-java/xpp3:0
+	dev-java/jdom:0
+	dev-java/dom4j:1
+	dev-java/log4j:0
+	dev-java/joda-time:0
+	dev-java/ant-core:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	joda-time
+	ant-core
+	dom4j-1
+	log4j
+	jdom
+	bcel
+	xpp3
+"
diff --git a/dev-java/jibx/metadata.xml b/dev-java/jibx/metadata.xml
new file mode 100644
index 000000000000..991690c700b2
--- /dev/null
+++ b/dev-java/jibx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jibx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jicmp-1.0.2 b/dev-java/jicmp-1.0.2
deleted file mode 100644
index 204a661807fd..000000000000
--- a/dev-java/jicmp-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Interface to Tobias Oetiker's RRDtool
-EAPI=2
-HOMEPAGE=http://www.opennms.org/
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/opennms/jicmp-1.0.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=209a07410a4cd95531c9ed3f24280dba
diff --git a/dev-java/jicmp/Manifest b/dev-java/jicmp/Manifest
new file mode 100644
index 000000000000..bf8b1ce62487
--- /dev/null
+++ b/dev-java/jicmp/Manifest
@@ -0,0 +1,3 @@
+DIST jicmp-1.0.2.tar.gz 348805 BLAKE2B b3340c1b7defd950d2d8579023c6c5a3527c55f53b72747d9f50759c3e45d525e7887fb61652c1aa5a8da32bfdde7520e67a7ec15b2072b6c11c6d1bfff21c70 SHA512 8633f12fdbf978e0312c07966fa37ddb9d904fc9845343e7d947400352d3a42d53e83a97a847cd61cf44f4fd1a6a47bab208525155eadadf62c222995a6e2d7d
+EBUILD jicmp-1.0.2.ebuild 799 BLAKE2B 175202d545b53fdbb17ed595f79060e207cf8e14015678ee3bf419ddc8b8343bfc8c0cad2368482f288f1209fb0ca1fe8d694d378c01a201a9f80e56bfe02346 SHA512 487d8a97993f902d57f9cb8ca08d0085db1c331429f8bed8e87f38aa696e6bba6073c8c9e3eeb923fcb4db9ada08b9144951002d307cc3c1fa821d3c31f7e061
+MISC metadata.xml 313 BLAKE2B 3fdc90e6fc3c9fe919ac862555a4d9463999776d4665b43109faddc9b3d8179e23e5c74a7011cd4e4824c4b07435f6172146f8b3c3d9bef871f7885b6629b686 SHA512 d872cd4e19f79a2c3966435faa85f40ada954e51a0561e90c1055113254d653d51e387cadb5d79a15a30eb4764fd3fa985f1e2183fe52a5bce2ae9dd2c824089
diff --git a/dev-java/jicmp/jicmp-1.0.2.ebuild b/dev-java/jicmp/jicmp-1.0.2.ebuild
new file mode 100644
index 000000000000..b7c8839350fb
--- /dev/null
+++ b/dev-java/jicmp/jicmp-1.0.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils autotools base java-pkg-2
+
+DESCRIPTION="Java Interface to Tobias Oetiker's RRDtool"
+SRC_URI="mirror://sourceforge/opennms/${P}.tar.gz"
+HOMEPAGE="http://www.opennms.org/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+
+SLOT="0"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+src_prepare() {
+	sed -i -e "s/-Werror//g" configure.ac || die "sed failed"
+	eautoreconf
+}
+
+src_compile() {
+	base_src_compile
+	if use doc; then
+		javadoc -d javadoc $(find org -name "*.java") || die "Javadoc failed"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar *.jar
+	java-pkg_doso .libs/*.so
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/jicmp/metadata.xml b/dev-java/jicmp/metadata.xml
new file mode 100644
index 000000000000..fba66bc4abac
--- /dev/null
+++ b/dev-java/jicmp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">opennms</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jid3-0.46-r2 b/dev-java/jid3-0.46-r2
deleted file mode 100644
index 1b997126b4cc..000000000000
--- a/dev-java/jid3-0.46-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 test? ( =dev-java/junit-3.8* ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=ID3 Class Library Implementation
-EAPI=5
-HOMEPAGE=http://jid3.blinkenlights.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://jid3.blinkenlights.org/release/jid3_0.46.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=53352187f7bcf7f51fefe8b6c8453fcb
diff --git a/dev-java/jid3/Manifest b/dev-java/jid3/Manifest
new file mode 100644
index 000000000000..58be3c0e263f
--- /dev/null
+++ b/dev-java/jid3/Manifest
@@ -0,0 +1,5 @@
+AUX 0.46-javadoc.patch 521 BLAKE2B a185db564d999096252bfc0f382d116b023b45d794083c038127c3d85a8b7bba6fbb0df9243d74b4955fa4ef1fc8d0813de9dcbb50bc63efa5a9612a98a9c70c SHA512 88a57f0c15f1915ac072bec7d420bf8a9eb1ca199175d56828f5439958f474b62d33f49a2eddcbcc01bb39dd07a22febccbfa58aa95be5e6b5413c54b94bca48
+AUX 0.46-tests-and-unicode.patch 17518 BLAKE2B c484cad7507d1b6c3c41d04a100102161d0f3f2cc2c9e64a636f11b61a927fc95e511ca38d4974fa05a34708268d9f6a16a739d57778c72776d78581b484aeca SHA512 d1448b2474af1d404999d1ac1df126814405840d8d80074ec90b7f4e2506a6d3497e2b6defa8c9c04b6fb7d86d815aec7dc3b7d7455f5fde41ade590db4452ff
+DIST jid3_0.46.tar.gz 972609 BLAKE2B f04e2055eeac530ae5256e43ea1cca2d528ee6b3027d43234c60be5150103212cecb68da5f1d6081462a9f215223f4b4377932b77c72b4de1c8dc816603cc9ea SHA512 478a78601613ab0e7965145733f1adec10005ef8069deb0595880feb47b065573d66cb5eb2b810869970a6b0272f8fb3363e4946ba5737ad740e372875cfa707
+EBUILD jid3-0.46-r2.ebuild 1269 BLAKE2B 7fc86e6aae3c11fad0c1c399be46bfb141495e871eeb7f913b15f7912a3ce547f4027afb1ab0b16ca79cbb5c9a05ecba1157bd0bd7e3be5efd64dda7a039b004 SHA512 0babc2575e023d689564d0385805408e489ac5a25cc408e5f37e40bc43870bbd7eca887dd9d4afdaa84350a35aa287c2e85de6610babae041211cf44ea827134
+MISC metadata.xml 458 BLAKE2B e62d6ad7013a3437846647124bed30d2332dd2fa35a8fca6e179f6ecf5282d4c5ba6f2b02299d3936d9c8c596a1f2c60005cdd35f60f87a3148c95f80af0649e SHA512 8dbbc0044f192093b672832681e521d55ff3ea2b3f3c74975cb493b0192c03f76279caf358f702449589d8d836a0b035c590c1fd4e0efc450740b354727fdc1b
diff --git a/dev-java/jid3/files/0.46-javadoc.patch b/dev-java/jid3/files/0.46-javadoc.patch
new file mode 100644
index 000000000000..8a17f1de73bb
--- /dev/null
+++ b/dev-java/jid3/files/0.46-javadoc.patch
@@ -0,0 +1,11 @@
+diff -ur nbproject.old/build-impl.xml nbproject/build-impl.xml
+--- nbproject.old/build-impl.xml	2007-05-05 13:32:49.000000000 +0300
++++ nbproject/build-impl.xml	2007-05-05 13:32:56.000000000 +0300
+@@ -343,7 +343,6 @@
+             <sourcepath>

+                 <pathelement location="${src.dir}"/>

+             </sourcepath>

+-            <fileset dir="${src.dir}"/>

+         </javadoc>

+     </target>

+     <target name="-javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,-javadoc-build">

diff --git a/dev-java/jid3/files/0.46-tests-and-unicode.patch b/dev-java/jid3/files/0.46-tests-and-unicode.patch
new file mode 100644
index 000000000000..1453cb38b996
--- /dev/null
+++ b/dev-java/jid3/files/0.46-tests-and-unicode.patch
@@ -0,0 +1,179 @@
+--- src/org/blinkenlights/jid3/io/TextEncoding.java	2008-05-27 11:23:03.000000000 -0700
++++ src/org/blinkenlights/jid3/io/TextEncoding.java	2008-05-26 10:39:01.000000000 -0700
+@@ -91,7 +91,7 @@
+             case (byte)0x00:

+                 return "ISO-8859-1";

+             case (byte)0x01:

+-                return "Unicode";

++                return "UTF-16";

+             default:

+                 return null;    // can't happen because we control construction of this object

+         }

+--- src/org/blinkenlights/jid3/test/AllTests.java	2008-05-27 11:23:03.000000000 -0700
++++ src/org/blinkenlights/jid3/test/AllTests.java	2008-05-27 11:11:32.000000000 -0700
+@@ -44,7 +44,7 @@
+ public class AllTests extends TestCase

+ {

+     // set root path for testing, so tests can find the test files

+-    public static String s_RootPath = "c:/work/jid3/test_data/";

++    public static String s_RootPath = "./test_data/";

+ 

+     public static void main(String[] args)

+     {

+@@ -134,7 +134,7 @@
+             }

+             

+             // a 'visit list' was created by our visitor, recording which frames were visited, so we can compare

+-            if ( ! oTestID3Visitor.getVisitList().equals("3=DS+uw_PsKMr(VT$ICBUtvNyEzRL)W[QJO6*-"))

++            if ( ! oTestID3Visitor.getVisitList().equals("3rstuvwyzBCDEIJKLMNOPQRSTUVW$()_=+[6*-"))

+             {

+                 fail("Unexpected resulting visit list: " + oTestID3Visitor.getVisitList());

+             }

+--- src/org/blinkenlights/jid3/test/ID3V2Test.java	2008-05-27 11:23:03.000000000 -0700
++++ src/org/blinkenlights/jid3/test/ID3V2Test.java	2008-05-26 10:39:01.000000000 -0700
+@@ -540,7 +540,7 @@
+             oTALB.setTextEncoding(TextEncoding.UNICODE);

+             oID3V2_3_0Tag.setTALBTextInformationFrame(oTALB);

+             

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>ATALB<bh:00><bh:00><bh:00>7<bh:00><bh:00><bh:01><bh:ff><bh:fe>a<bh:00>b<bh:00>c<bh:00>d<bh:00>e<bh:00>f<bh:00>g<bh:00>h<bh:00>i<bh:00>j<bh:00>k<bh:00>l<bh:00>m<bh:00>n<bh:00>o<bh:00>p<bh:00>q<bh:00>r<bh:00>s<bh:00>t<bh:00>u<bh:00>v<bh:00>w<bh:00>x<bh:00>y<bh:00>z<bh:00>";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>ATALB<bh:00><bh:00><bh:00>7<bh:00><bh:00><bh:01><bh:fe><bh:ff><bh:00>a<bh:00>b<bh:00>c<bh:00>d<bh:00>e<bh:00>f<bh:00>g<bh:00>h<bh:00>i<bh:00>j<bh:00>k<bh:00>l<bh:00>m<bh:00>n<bh:00>o<bh:00>p<bh:00>q<bh:00>r<bh:00>s<bh:00>t<bh:00>u<bh:00>v<bh:00>w<bh:00>x<bh:00>y<bh:00>z";

+ 

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -744,7 +744,7 @@
+             oTIME.setTextEncoding(TextEncoding.UNICODE);

+             oID3V2_3_0Tag.setTIMETextInformationFrame(oTIME);

+ 

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00><bh:15>TIME<bh:00><bh:00><bh:00><bh:0b><bh:00><bh:00><bh:01><bh:ff><bh:fe>0<bh:00>8<bh:00>0<bh:00>5<bh:00>";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00><bh:15>TIME<bh:00><bh:00><bh:00><bh:0b><bh:00><bh:00><bh:01><bh:fe><bh:ff><bh:00>0<bh:00>8<bh:00>0<bh:00>5";

+             

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -1258,7 +1258,7 @@
+             oTXXX = new TXXXTextInformationID3V2Frame("description2", "information2");

+             oID3V2_3_0Tag.addTXXXTextInformationFrame(oTXXX);

+ 

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>aTXXX<bh:00><bh:00><bh:00>3<bh:00><bh:00><bh:01><bh:ff><bh:fe>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:00><bh:ff><bh:fe>i<bh:00>n<bh:00>f<bh:00>o<bh:00>r<bh:00>m<bh:00>a<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00>TXXX<bh:00><bh:00><bh:00><bh:1a><bh:00><bh:00><bh:00>description2<bh:00>information2";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>aTXXX<bh:00><bh:00><bh:00>3<bh:00><bh:00><bh:01><bh:fe><bh:ff><bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:fe><bh:ff><bh:00>i<bh:00>n<bh:00>f<bh:00>o<bh:00>r<bh:00>m<bh:00>a<bh:00>t<bh:00>i<bh:00>o<bh:00>nTXXX<bh:00><bh:00><bh:00><bh:1a><bh:00><bh:00><bh:00>description2<bh:00>information2";

+ 

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -1464,7 +1464,7 @@
+             oWXXX = new WXXXUrlLinkID3V2Frame("another description", "http://www.grebenc.ca");

+             oID3V2_3_0Tag.addWXXXUrlLinkFrame(oWXXX);

+ 

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>vWXXX<bh:00><bh:00><bh:00>*<bh:00><bh:00><bh:00>another description<bh:00>http://www.grebenc.caWXXX<bh:00><bh:00><bh:00>8<bh:00><bh:00><bh:01><bh:ff><bh:fe>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:00>http://jid3.blinkenlights.org";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>vWXXX<bh:00><bh:00><bh:00>*<bh:00><bh:00><bh:00>another description<bh:00>http://www.grebenc.caWXXX<bh:00><bh:00><bh:00>8<bh:00><bh:00><bh:01><bh:fe><bh:ff><bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00>http://jid3.blinkenlights.org";

+ 

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -1519,7 +1519,7 @@
+             oID3V2_3_0Tag.addAPICFrame(oAPIC);

+             oID3V2_3_0Tag.addAPICFrame(new APICID3V2Frame("image/jpeg", APICID3V2Frame.PictureType.FrontCover, "Front cover.", new byte[] { 0x05, 0x04, 0x03, 0x02, 0x01 }));

+ 

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>bAPIC<bh:00><bh:00><bh:00>/<bh:00><bh:00><bh:01>image/png<bh:00><bh:08><bh:ff><bh:fe>A<bh:00>r<bh:00>t<bh:00>i<bh:00>s<bh:00>t<bh:00> <bh:00>i<bh:00>m<bh:00>a<bh:00>g<bh:00>e<bh:00>.<bh:00><bh:00><bh:00><bh:01><bh:02><bh:03><bh:04><bh:05>APIC<bh:00><bh:00><bh:00><bh:1f><bh:00><bh:00><bh:00>image/jpeg<bh:00><bh:03>Front cover.<bh:00><bh:05><bh:04><bh:03><bh:02><bh:01>";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>bAPIC<bh:00><bh:00><bh:00>/<bh:00><bh:00><bh:01>image/png<bh:00><bh:08><bh:fe><bh:ff><bh:00>A<bh:00>r<bh:00>t<bh:00>i<bh:00>s<bh:00>t<bh:00> <bh:00>i<bh:00>m<bh:00>a<bh:00>g<bh:00>e<bh:00>.<bh:00><bh:00><bh:01><bh:02><bh:03><bh:04><bh:05>APIC<bh:00><bh:00><bh:00><bh:1f><bh:00><bh:00><bh:00>image/jpeg<bh:00><bh:03>Front cover.<bh:00><bh:05><bh:04><bh:03><bh:02><bh:01>";

+             

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -1556,7 +1556,7 @@
+             oID3V2_3_0Tag.addCOMMFrame(oCOMM);

+             oID3V2_3_0Tag.addCOMMFrame(new COMMID3V2Frame("rus", "next description", "next actual text"));

+ 

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>{COMM<bh:00><bh:00><bh:00>B<bh:00><bh:00><bh:01>eng<bh:ff><bh:fe>s<bh:00>h<bh:00>o<bh:00>r<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:00><bh:ff><bh:fe>a<bh:00>c<bh:00>t<bh:00>u<bh:00>a<bh:00>l<bh:00> <bh:00>t<bh:00>e<bh:00>x<bh:00>t<bh:00>COMM<bh:00><bh:00><bh:00>%<bh:00><bh:00><bh:00>rusnext description<bh:00>next actual text";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>{COMM<bh:00><bh:00><bh:00>B<bh:00><bh:00><bh:01>eng<bh:fe><bh:ff><bh:00>s<bh:00>h<bh:00>o<bh:00>r<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:fe><bh:ff><bh:00>a<bh:00>c<bh:00>t<bh:00>u<bh:00>a<bh:00>l<bh:00> <bh:00>t<bh:00>e<bh:00>x<bh:00>tCOMM<bh:00><bh:00><bh:00>%<bh:00><bh:00><bh:00>rusnext description<bh:00>next actual text";

+             

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -1605,7 +1605,7 @@
+             oCOMR.setTextEncoding(TextEncoding.UNICODE);

+             oID3V2_3_0Tag.setCOMRFrame(oCOMR);

+ 

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>tCOMR<bh:00><bh:00><bh:00>j<bh:00><bh:00><bh:01>cad12.99<bh:00>25250101http://jid3.blinkenlights.org<bh:00><bh:03><bh:ff><bh:fe>s<bh:00>e<bh:00>l<bh:00>l<bh:00>e<bh:00>r<bh:00><bh:00><bh:00><bh:ff><bh:fe>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:00>image/png<bh:00><bh:01><bh:02><bh:03><bh:04><bh:05>";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>tCOMR<bh:00><bh:00><bh:00>j<bh:00><bh:00><bh:01>cad12.99<bh:00>25250101http://jid3.blinkenlights.org<bh:00><bh:03><bh:fe><bh:ff><bh:00>s<bh:00>e<bh:00>l<bh:00>l<bh:00>e<bh:00>r<bh:00><bh:00><bh:fe><bh:ff><bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00>image/png<bh:00><bh:01><bh:02><bh:03><bh:04><bh:05>";

+ 

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -1717,7 +1717,7 @@
+             oGEOB = new GEOBID3V2Frame("image/jpeg", "filename2", "another content description", new byte[] { 0x05, 0x04, 0x03, 0x02, 0x01 });

+             oID3V2_3_0Tag.addGEOBFrame(oGEOB);

+ 

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:01><bh:19>GEOB<bh:00><bh:00><bh:00>7<bh:00><bh:00><bh:00>image/jpeg<bh:00>filename2<bh:00>another content description<bh:00><bh:05><bh:04><bh:03><bh:02><bh:01>GEOB<bh:00><bh:00><bh:00>N<bh:00><bh:00><bh:01>image/png<bh:00><bh:ff><bh:fe>f<bh:00>i<bh:00>l<bh:00>e<bh:00>n<bh:00>a<bh:00>m<bh:00>e<bh:00><bh:00><bh:00><bh:ff><bh:fe>c<bh:00>o<bh:00>n<bh:00>t<bh:00>e<bh:00>n<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:00><bh:01><bh:02><bh:03><bh:04><bh:05>";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:01><bh:19>GEOB<bh:00><bh:00><bh:00>7<bh:00><bh:00><bh:00>image/jpeg<bh:00>filename2<bh:00>another content description<bh:00><bh:05><bh:04><bh:03><bh:02><bh:01>GEOB<bh:00><bh:00><bh:00>N<bh:00><bh:00><bh:01>image/png<bh:00><bh:fe><bh:ff><bh:00>f<bh:00>i<bh:00>l<bh:00>e<bh:00>n<bh:00>a<bh:00>m<bh:00>e<bh:00><bh:00><bh:fe><bh:ff><bh:00>c<bh:00>o<bh:00>n<bh:00>t<bh:00>e<bh:00>n<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>i<bh:00>o<bh:00>n<bh:00><bh:00><bh:01><bh:02><bh:03><bh:04><bh:05>";

+ 

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -1779,7 +1779,7 @@
+             oIPLS.setTextEncoding(TextEncoding.UNICODE);

+             oID3V2_3_0Tag.setIPLSFrame(oIPLS);

+ 

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:01><bh:15>IPLS<bh:00><bh:00><bh:00><bh:8b><bh:00><bh:00><bh:01><bh:ff><bh:fe>i<bh:00>n<bh:00>v<bh:00>o<bh:00>l<bh:00>v<bh:00>e<bh:00>m<bh:00>e<bh:00>n<bh:00>t<bh:00>1<bh:00><bh:00><bh:00><bh:ff><bh:fe>p<bh:00>e<bh:00>r<bh:00>s<bh:00>o<bh:00>n<bh:00>1<bh:00><bh:00><bh:00><bh:ff><bh:fe>i<bh:00>n<bh:00>v<bh:00>o<bh:00>l<bh:00>v<bh:00>e<bh:00>m<bh:00>e<bh:00>n<bh:00>t<bh:00>1<bh:00><bh:00><bh:00><bh:ff><bh:fe>p<bh:00>e<bh:00>r<bh:00>s<bh:00>o<bh:00>n<bh:00>2<bh:00><bh:00><bh:00><bh:ff><bh:fe>i<bh:00>n<bh:00>v<bh:00>o<bh:00>l<bh:00>v<bh:00>e<bh:00>m<bh:00>e<bh:00>n<bh:00>t<bh:00>2<bh:00><bh:00><bh:00><bh:ff><bh:fe>p<bh:00>e<bh:00>r<bh:00>s<bh:00>o<bh:00>n<bh:00>3<bh:00><bh:00><bh:00>";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:01><bh:15>IPLS<bh:00><bh:00><bh:00><bh:8b><bh:00><bh:00><bh:01><bh:fe><bh:ff><bh:00>i<bh:00>n<bh:00>v<bh:00>o<bh:00>l<bh:00>v<bh:00>e<bh:00>m<bh:00>e<bh:00>n<bh:00>t<bh:00>1<bh:00><bh:00><bh:fe><bh:ff><bh:00>p<bh:00>e<bh:00>r<bh:00>s<bh:00>o<bh:00>n<bh:00>1<bh:00><bh:00><bh:fe><bh:ff><bh:00>i<bh:00>n<bh:00>v<bh:00>o<bh:00>l<bh:00>v<bh:00>e<bh:00>m<bh:00>e<bh:00>n<bh:00>t<bh:00>1<bh:00><bh:00><bh:fe><bh:ff><bh:00>p<bh:00>e<bh:00>r<bh:00>s<bh:00>o<bh:00>n<bh:00>2<bh:00><bh:00><bh:fe><bh:ff><bh:00>i<bh:00>n<bh:00>v<bh:00>o<bh:00>l<bh:00>v<bh:00>e<bh:00>m<bh:00>e<bh:00>n<bh:00>t<bh:00>2<bh:00><bh:00><bh:fe><bh:ff><bh:00>p<bh:00>e<bh:00>r<bh:00>s<bh:00>o<bh:00>n<bh:00>3<bh:00><bh:00>";

+ 

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -1871,7 +1871,7 @@
+             oOWNE.setTextEncoding(TextEncoding.UNICODE);

+             oID3V2_3_0Tag.setOWNEFrame(oOWNE);

+ 

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>*OWNE<bh:00><bh:00><bh:00> <bh:00><bh:00><bh:01>cad12.34<bh:00>20000102<bh:ff><bh:fe>s<bh:00>e<bh:00>l<bh:00>l<bh:00>e<bh:00>r<bh:00>";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>*OWNE<bh:00><bh:00><bh:00> <bh:00><bh:00><bh:01>cad12.34<bh:00>20000102<bh:fe><bh:ff><bh:00>s<bh:00>e<bh:00>l<bh:00>l<bh:00>e<bh:00>r";

+ 

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -2063,7 +2063,7 @@
+             oSYLT.addSyncEntry(new SYLTID3V2Frame.SyncEntry("def", 5));

+             oID3V2_3_0Tag.addSYLTFrame(oSYLT);

+ 

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:01><bh:1a>SYLT<bh:00><bh:00><bh:00><bh:5c><bh:00><bh:00><bh:01>eng<bh:02><bh:01><bh:ff><bh:fe>c<bh:00>o<bh:00>n<bh:00>t<bh:00>e<bh:00>n<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>o<bh:00>r<bh:00><bh:00><bh:00><bh:ff><bh:fe>o<bh:00>n<bh:00>e<bh:00><bh:00><bh:00><bh:00><bh:00><bh:00><bh:01><bh:ff><bh:fe>t<bh:00>w<bh:00>o<bh:00><bh:00><bh:00><bh:00><bh:00><bh:00><bh:02><bh:ff><bh:fe>t<bh:00>h<bh:00>r<bh:00>e<bh:00>e<bh:00><bh:00><bh:00><bh:00><bh:00><bh:00><bh:03>SYLT<bh:00><bh:00><bh:00>*<bh:00><bh:00><bh:00>rus<bh:01><bh:06>another description<bh:00>abc<bh:00><bh:00><bh:00><bh:00><bh:04>def<bh:00><bh:00><bh:00><bh:00><bh:05>";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:01><bh:1a>SYLT<bh:00><bh:00><bh:00><bh:5c><bh:00><bh:00><bh:01>eng<bh:02><bh:01><bh:fe><bh:ff><bh:00>c<bh:00>o<bh:00>n<bh:00>t<bh:00>e<bh:00>n<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>o<bh:00>r<bh:00><bh:00><bh:fe><bh:ff><bh:00>o<bh:00>n<bh:00>e<bh:00><bh:00><bh:00><bh:00><bh:00><bh:01><bh:fe><bh:ff><bh:00>t<bh:00>w<bh:00>o<bh:00><bh:00><bh:00><bh:00><bh:00><bh:02><bh:fe><bh:ff><bh:00>t<bh:00>h<bh:00>r<bh:00>e<bh:00>e<bh:00><bh:00><bh:00><bh:00><bh:00><bh:03>SYLT<bh:00><bh:00><bh:00>*<bh:00><bh:00><bh:00>rus<bh:01><bh:06>another description<bh:00>abc<bh:00><bh:00><bh:00><bh:00><bh:04>def<bh:00><bh:00><bh:00><bh:00><bh:05>";

+ 

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -2141,7 +2141,7 @@
+             oUSER.setTextEncoding(TextEncoding.UNICODE);

+             oID3V2_3_0Tag.setUSERFrame(oUSER);

+             

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>*USER<bh:00><bh:00><bh:00> <bh:00><bh:00><bh:01>eng<bh:ff><bh:fe>T<bh:00>e<bh:00>r<bh:00>m<bh:00>s<bh:00> <bh:00>o<bh:00>f<bh:00> <bh:00>u<bh:00>s<bh:00>e<bh:00>.<bh:00>";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>*USER<bh:00><bh:00><bh:00> <bh:00><bh:00><bh:01>eng<bh:fe><bh:ff><bh:00>T<bh:00>e<bh:00>r<bh:00>m<bh:00>s<bh:00> <bh:00>o<bh:00>f<bh:00> <bh:00>u<bh:00>s<bh:00>e<bh:00>.";

+ 

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -2177,7 +2177,7 @@
+             oUSLT.setTextEncoding(TextEncoding.UNICODE);

+             oID3V2_3_0Tag.addUSLTFrame(oUSLT);

+             

+-            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>DUSLT<bh:00><bh:00><bh:00>:<bh:00><bh:00><bh:01>eng<bh:ff><bh:fe>c<bh:00>o<bh:00>n<bh:00>t<bh:00>e<bh:00>n<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>o<bh:00>r<bh:00><bh:00><bh:00><bh:ff><bh:fe>l<bh:00>y<bh:00>r<bh:00>i<bh:00>c<bh:00>s<bh:00>";

++            String sPrefix = "ID3<bh:03><bh:00><bh:00><bh:00><bh:00><bh:00>DUSLT<bh:00><bh:00><bh:00>:<bh:00><bh:00><bh:01>eng<bh:fe><bh:ff><bh:00>c<bh:00>o<bh:00>n<bh:00>t<bh:00>e<bh:00>n<bh:00>t<bh:00> <bh:00>d<bh:00>e<bh:00>s<bh:00>c<bh:00>r<bh:00>i<bh:00>p<bh:00>t<bh:00>o<bh:00>r<bh:00><bh:00><bh:fe><bh:ff><bh:00>l<bh:00>y<bh:00>r<bh:00>i<bh:00>c<bh:00>s";

+ 

+             runTagVerifyTest(oID3V2_3_0Tag, sPrefix);

+         }

+@@ -2599,7 +2599,7 @@
+         ID3Tag.useStrict(false);

+         try

+         {

+-            File oSourceDir = new File("c:/temp/mp3");

++            File oSourceDir = new File("test_data");

+             recurseDirectoryForMP3s(oSourceDir);

+         }

+         catch (Exception e)

+--- src/org/blinkenlights/jid3/v2/ID3V2Tag.java	2008-05-27 11:23:03.000000000 -0700
++++ src/org/blinkenlights/jid3/v2/ID3V2Tag.java	2008-05-27 11:09:51.000000000 -0700
+@@ -50,7 +50,7 @@
+     protected boolean m_bCRCDataFlag;

+     

+     /** Mapping from frame ID to list containing frames. For frames that can only be used once. */

+-    protected Map m_oFrameIdToFrameMap = null;

++    protected SortedMap m_oFrameIdToFrameMap = null;

+     

+     /** Default padding for ID3 v2 frames, if not specified.  16 bytes, because Winamp does not read the last

+      *  frame when there isn't at least 6 bytes of padding following it in a tag. */

+@@ -72,7 +72,7 @@
+         m_bUnsynchronizationUsedFlag = bUnsynchronizationUsedFlag;

+         m_bExtendedHeaderFlag = bExtendedHeaderFlag;

+         m_bExperimentalFlag = bExperimentalFlag;

+-        m_oFrameIdToFrameMap = new HashMap();

++        m_oFrameIdToFrameMap = new TreeMap();

+         //HACK: Default padding of 16 bytes, because Winamp doesn't seem to see the last frame in a v2 tag

+         //      when there is less than 6 bytes of padding.  (???)

+         m_iPaddingLength = s_iDefaultPaddingLength;

diff --git a/dev-java/jid3/jid3-0.46-r2.ebuild b/dev-java/jid3/jid3-0.46-r2.ebuild
new file mode 100644
index 000000000000..f50f2e94610f
--- /dev/null
+++ b/dev-java/jid3/jid3-0.46-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+# To make sure the javadoc patch doesn't break things
+WANT_SPLIT_WANT="true"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${P/-/_}"
+
+DESCRIPTION="ID3 Class Library Implementation"
+HOMEPAGE="http://jid3.blinkenlights.org/"
+SRC_URI="http://jid3.blinkenlights.org/release/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}/${MY_P}"
+
+# Feel free to submit a patch that doesn't bundle the classes
+# into the result jar
+DEPEND=">=virtual/jdk-1.4
+	test? ( =dev-java/junit-3.8* )"
+
+RDEPEND=">=virtual/jre-1.4"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PV}-javadoc.patch
+	epatch "${FILESDIR}"/${PV}-tests-and-unicode.patch
+
+	rm -v "${S}"/dist/*.jar || die
+
+	if use !test; then
+		rm -rv "${S}/src/org/blinkenlights/jid3/test" || die
+	fi
+
+}
+
+src_compile() {
+	local junit="-Dlibs.junit.classpath"
+	eant jar $(use_doc) \
+		$(use test && echo ${junit}=$(java-pkg_getjars --build-only junit))
+}
+
+src_test() {
+	ejunit -cp dist/JID3.jar org.blinkenlights.jid3.test.AllTests
+}
+
+src_install() {
+	java-pkg_dojar dist/JID3.jar
+
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src/
+}
diff --git a/dev-java/jid3/metadata.xml b/dev-java/jid3/metadata.xml
new file mode 100644
index 000000000000..9c54bd0250a2
--- /dev/null
+++ b/dev-java/jid3/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		JID3 is a class library, written in Java and licensed under the LGPL,
+		which provides the required functionality for editing ID3 tags commonly
+		used in MP3 media files.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jide-oss-3.6.12 b/dev-java/jide-oss-3.6.12
deleted file mode 100644
index e4570384fb4a..000000000000
--- a/dev-java/jide-oss-3.6.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JIDE Common Layer (Professional Swing Components)
-EAPI=5
-HOMEPAGE=https://github.com/jidesoft/jide-oss
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2-with-exceptions
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jidesoft/jide-oss/archive/3.6.12.tar.gz -> jide-oss-3.6.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=64d413126ce650453bcdcc5ac44eb1e8
diff --git a/dev-java/jide-oss-3.6.18 b/dev-java/jide-oss-3.6.18
deleted file mode 100644
index 075fe316ca7b..000000000000
--- a/dev-java/jide-oss-3.6.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JIDE Common Layer (Professional Swing Components)
-EAPI=6
-HOMEPAGE=https://github.com/jidesoft/jide-oss
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2-with-exceptions
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jidesoft/jide-oss/archive/3.6.18.tar.gz -> jide-oss-3.6.18.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f77792632e0f488e151f8ddce8770278
diff --git a/dev-java/jide-oss/Manifest b/dev-java/jide-oss/Manifest
new file mode 100644
index 000000000000..6bb8079c17c1
--- /dev/null
+++ b/dev-java/jide-oss/Manifest
@@ -0,0 +1,5 @@
+DIST jide-oss-3.6.12.tar.gz 4751908 BLAKE2B 731e2c2308e1a7d118a348e3f88258078e16b15f0b3c5bd2ab2ded72d75c4a4c2649e6928d9fbdd1ba7d7b99589a7c1090cb10798e678c44f830df26f0afedff SHA512 a2a60a2af653a1c20099fe81479aadfd252eed086c1009c20a17b561502748cca1cc4b016fe184a60dcb281fd5843c63ad876ca93062bb788e55b485d0e46124
+DIST jide-oss-3.6.18.tar.gz 4752506 BLAKE2B dae7fa89da88295ef5aee03e54778c971b44cc2fc6c017d2e9b24ff9454b9691c34849c9649435ac0a04b28f7fb1ac6b1c147e7fb632e2e30461cf388b3dee7f SHA512 c35f4e5b0462247bb8cc207e1f2120f6a861e796893ce6e7c55e06cab76da84402b3465d420f3fc8d09490f0eb98361d3609bb1675beb9fbf145be4c0bd5ea8c
+EBUILD jide-oss-3.6.12.ebuild 705 BLAKE2B 9033662f779b7768f4ad56e1771409a3c476f0ad30d3bb5c54ef21aa0e966c3f26533e4e19a3710f871c258e27fe85cbec10679afc889cc3e474d0a05926ef44 SHA512 4bd5def7916adff670bef949d78ff3dc70d07280b7e75060e6e2bcb3bf3fb98c571d3911e53abe30c5be6bf45188466f73d0e97e566febaff5c1f798f8cf2fa9
+EBUILD jide-oss-3.6.18.ebuild 658 BLAKE2B c3c36d5099d427427dbde7169d11411699966a1f8476e3da8215d96404f36247d74faebf9daf451325c2eb40f8a3e3f081758db97313fb9407936758b4523e8e SHA512 ba47cd9be0cd006fc0beba591e4982734050b98692fbf12c09fd1317029b2e930aa69f2037cfbd1912b16b7cad2146c734385ad1ecba48baad0483d9c5d23a9b
+MISC metadata.xml 647 BLAKE2B 6fc1b35acc30de3066d302c7a6523cccf9eb53bca466dabc59c533d3aa5b48284fcc3195598f7935cb6850a7b1bd9afc28eb05d9f5801d0e167d046269ecc734 SHA512 bb875ae246009af7e6fae09c53afda05547a12c4a6f4a06a0d9f611d2578f4787c2e4dcf4bcdb220ad2980eb4f8317c3a4a8f51e3697145936b5dfa56eef34ce
diff --git a/dev-java/jide-oss/jide-oss-3.6.12.ebuild b/dev-java/jide-oss/jide-oss-3.6.12.ebuild
new file mode 100644
index 000000000000..5b2346e79eef
--- /dev/null
+++ b/dev-java/jide-oss/jide-oss-3.6.12.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JIDE Common Layer (Professional Swing Components)"
+HOMEPAGE="https://github.com/jidesoft/jide-oss"
+SRC_URI="https://github.com/jidesoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2-with-exceptions"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+java_prepare() {
+	rm -rv libs/ src/com/jidesoft/plaf/aqua/ || die
+}
+
+src_install() {
+	java-pkg_newjar ${P}.jar ${PN}.jar
+	dodoc README.txt
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jide-oss/jide-oss-3.6.18.ebuild b/dev-java/jide-oss/jide-oss-3.6.18.ebuild
new file mode 100644
index 000000000000..58d4d49dd0c3
--- /dev/null
+++ b/dev-java/jide-oss/jide-oss-3.6.18.ebuild
@@ -0,0 +1,30 @@
+# 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="JIDE Common Layer (Professional Swing Components)"
+HOMEPAGE="https://github.com/jidesoft/jide-oss"
+SRC_URI="https://github.com/jidesoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2-with-exceptions"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+	default
+	rm -rv libs/ src/com/jidesoft/plaf/aqua/ test/ || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs
+}
diff --git a/dev-java/jide-oss/metadata.xml b/dev-java/jide-oss/metadata.xml
new file mode 100644
index 000000000000..a8fff703ba43
--- /dev/null
+++ b/dev-java/jide-oss/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>This module was the foundation for all JIDE commercial products. It was delivered as jide-common.jar in all former releases. In April of 2007, JIDE Software open sourced the module under GPL+classpath exception, hoping more and more people will join the project and push it to the next level.</longdescription>
+	<upstream>
+		<remote-id type="github">jidesoft/jide-oss</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jinklevel-0.1 b/dev-java/jinklevel-0.1
deleted file mode 100644
index 41d8fcc6e81d..000000000000
--- a/dev-java/jinklevel-0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=net-print/libinklevel-0.8.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java binding for libinklevel
-EAPI=2
-HOMEPAGE=https://mso.googlecode.com/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 >=net-print/libinklevel-0.8.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://mso.googlecode.com/files/jinklevel-0.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9a340f17e6370f3e25fb5c30ab3093a5
diff --git a/dev-java/jinklevel/Manifest b/dev-java/jinklevel/Manifest
new file mode 100644
index 000000000000..c859ab2e62fc
--- /dev/null
+++ b/dev-java/jinklevel/Manifest
@@ -0,0 +1,3 @@
+DIST jinklevel-0.1.tar.bz2 7892 BLAKE2B 5c8b1cfacf0a9bd9b1da08df60c4a2bca0a5837e99c573222727d7737b8c920f107e0cd7a92bf18acd261ef969a0fbbed5a08e7bf3fb365d71490e023c9a7f14 SHA512 6ec30afd7331e3ef3393f17495a3b0f5f89a014f5f5b3bb45113c1564e856e46b79d7c7f6fa079ed6436f28034175db84aa6ec69b2b662967808bd22b2d47797
+EBUILD jinklevel-0.1.ebuild 721 BLAKE2B 21df018bdf388e74dbf96f862782dea17b51f06e71ab1dc83536bf3dee8bfcfbf8267a430b0c0c4e34e14feddb457871f9484c18296961897d5914da47cca6ae SHA512 a42cb802e83d13427e4f267d78ff424ea28bc48b5a1ed6e57626d0f768ee1713db405964cc8504314b340dbaa2c0cf152e32a84c3c56a7a00fa838b9ffbc4a1d
+MISC metadata.xml 289 BLAKE2B b71176c5c4a716271cf4bb538b9521ca8be5c5970c5b2bdec7fdc62668449cb4bde24626f1d3299a1e4f084f67c6e77c83a6039c8c18e148ef83c38e3a7d6d94 SHA512 a62a10bdcd24d253d4134029406c417dabc1f6a1a675a5500a848414fcc18235bf20e84926b11108cd213fcbba9536fd7c10520e8eac65052a62f0af1be660a4
diff --git a/dev-java/jinklevel/jinklevel-0.1.ebuild b/dev-java/jinklevel/jinklevel-0.1.ebuild
new file mode 100644
index 000000000000..e0fcecceb160
--- /dev/null
+++ b/dev-java/jinklevel/jinklevel-0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java binding for libinklevel"
+HOMEPAGE="https://mso.googlecode.com/"
+SRC_URI="https://mso.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5
+	>=net-print/libinklevel-0.8.0"
+
+DEPEND=">=virtual/jdk-1.5
+	>=net-print/libinklevel-0.8.0"
+
+EANT_BUILD_TARGET="build"
+
+src_install() {
+	use source && java-pkg_dosrc src
+	use doc && java-pkg_dojavadoc doc
+	java-pkg_dojar build/${PN}.jar
+	java-pkg_doso build/libjinklevel.so
+	domo build/mo/*.mo || die "domo failed"
+}
diff --git a/dev-java/jinklevel/metadata.xml b/dev-java/jinklevel/metadata.xml
new file mode 100644
index 000000000000..23f6cab9eb8f
--- /dev/null
+++ b/dev-java/jinklevel/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">mso</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jinput-2.0.6-r1 b/dev-java/jinput-2.0.6-r1
deleted file mode 100644
index 28fff51cc190..000000000000
--- a/dev-java/jinput-2.0.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 dev-java/jutils:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An implementation of an API for game controller discovery and polled input
-EAPI=5
-HOMEPAGE=https://java.net/projects/jinput
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 dev-java/jutils:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jinput/jinput/archive/790b666.tar.gz -> jinput-2.0.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e2e7421d277298fc52fc9780d292d116
diff --git a/dev-java/jinput/Manifest b/dev-java/jinput/Manifest
new file mode 100644
index 000000000000..c38c3d41b2e4
--- /dev/null
+++ b/dev-java/jinput/Manifest
@@ -0,0 +1,7 @@
+AUX javah-classpath.patch 469 BLAKE2B 6cf9c5c6fb5048a074fd8e654cd4851779d1df9155ba81b7a38c716af1acda9eafc5e1fb2392cd05c9e2f14859daf93ec93fa5acf5d09784d3367a24f76af1a0 SHA512 a10b34e593980e24e0d9dbf0419cdacdb9c03059b54d3a811f3dadc8838d223cc3e4800feeb1ad0cf3b65d75117a0dbc7061740b40e051c683c4180a323bc916
+AUX nostrip.patch 431 BLAKE2B 5633db9dd6cf803c8a960dbfa38dce803b247efe107d20430b41c24aad057041750e1f05af1cc2e26d3d4b241260a0a3cdc5d295d713ae91c1748487d3f4f760 SHA512 0f1cccfef58afca9c1db074ae179bc9d06c0ae758a859671e362c229279d2b3c570356ca2e06bd319f1ba6674f601f4fd15479adf1e1410779a52eec9e1172c9
+AUX remove-getDeviceUsageBits.patch 4109 BLAKE2B 89518857ae50e74688fa1f9c0f493c8bcd34a0db44b39e5768c581019cced7d9c568813f3add70ba26eb42963291da9131238c9b3c96b703bd73e15897d55663 SHA512 e5d5a2c4715b00a08b909965079fffb2a0797a0a762481c76135692a66f208bc86b7610db525ed82997c90bb5c70f590ba1062833c00104b86112b0a1e0d6176
+AUX unbundle.patch 354 BLAKE2B 87bbc929c3449e786c61810bd4f3ef2beeb9d8bd7efdc006afede6898a6608accea69a6a935ab383cd5d5689f4c0956367043c5d1f856486c379f0b2b997deb1 SHA512 99d933a2bf501fe209df2bdfe8dbc0f756b78715c322f6f4c605e40b96aa3773cb8592c52ac2d752e720245bbb310e7bcf52409e97a74e06175f3c995a55454e
+DIST jinput-2.0.6.tar.gz 1590738 BLAKE2B ceb296af7ca4309913708fac5c67c6fec9cd94ef3dad454c41a99ffee7e390545ab6424354dd0dc9755dfb4c0711b449b29b423b395c0f2f504a73d2d7019645 SHA512 770b3a0724334b9182098797923cc11e575b42cb67c5583d8aac7aeb432ec80189199daf1ef624a56923c4ecce271f05adf0481c13b8cd6997bb1862a7a91eba
+EBUILD jinput-2.0.6-r1.ebuild 1251 BLAKE2B db033a093c70d0262d5f89379a0beb626b70136909aec43b34f53f42428e57f60afa4e33f8d89a00952b18fa54d44f6b993eca6e3650beb75116c5f0dd030c0d SHA512 6143fd69d97b780f2ba8b22eb29ceb636bfdc6249a53828981a73c73d29fa6740457ad217f77c4f7944362285ffd7a1349d140ce16e6fb34073816b7e2fb6b70
+MISC metadata.xml 657 BLAKE2B 17302de7620eb88fba8aca2a04148cd31cb9176a0e2e539e3e181d68ca0e98f98c6a2a1a2fc254c16e2f19c4a8d206af893e80581c0be3f18c9280376868f08a SHA512 2fa1026b4a776a5c527de51e4291b4cf12f58e0b526e329101b6c1cc9cd05b405919b4187b96b35c93977da3c8e80722984aff841d77a78d5e2ea6e6911073ac
diff --git a/dev-java/jinput/files/javah-classpath.patch b/dev-java/jinput/files/javah-classpath.patch
new file mode 100644
index 000000000000..ae90584691b8
--- /dev/null
+++ b/dev-java/jinput/files/javah-classpath.patch
@@ -0,0 +1,10 @@
+--- plugins/linux/build.xml.orig	2006-07-11 22:07:38.000000000 +0100
++++ plugins/linux/build.xml	2011-11-16 15:49:21.140789781 +0000
+@@ -56,6 +56,7 @@
+ 		<javah destdir="src/native">
+             <classpath>
+                 <pathelement location="classes"/>
++                <pathelement location="../../coreAPI/classes"/>
+             </classpath>
+ 			<class name="net.java.games.input.LinuxEventDevice"/>
+ 			<class name="net.java.games.input.LinuxJoystickDevice"/>
diff --git a/dev-java/jinput/files/nostrip.patch b/dev-java/jinput/files/nostrip.patch
new file mode 100644
index 000000000000..8627c0d12251
--- /dev/null
+++ b/dev-java/jinput/files/nostrip.patch
@@ -0,0 +1,12 @@
+--- plugins/linux/src/native/build.xml.orig	2013-03-25 18:01:56.000000000 +0000
++++ plugins/linux/src/native/build.xml	2015-04-12 17:36:36.020105790 +0100
+@@ -46,9 +46,6 @@
+ 			<arg line="-shared -O2 -Wall -o ${libname}"/>
+ 			<fileset dir="." includes="*.o"/>
+ 		</apply>
+-		<apply dir="." parallel="true" executable="strip" os="Linux" failonerror="true">
+-			<fileset file="${libname}"/>
+-		</apply>
+     </target>
+ </project>
+ 
diff --git a/dev-java/jinput/files/remove-getDeviceUsageBits.patch b/dev-java/jinput/files/remove-getDeviceUsageBits.patch
new file mode 100644
index 000000000000..038473d5ba00
--- /dev/null
+++ b/dev-java/jinput/files/remove-getDeviceUsageBits.patch
@@ -0,0 +1,90 @@
+From 3f8a5394be4cddfb5bec584170678aac0f28b763 Mon Sep 17 00:00:00 2001
+From: Endolf <endolf@java.net>
+Date: Fri, 22 Aug 2014 14:38:30 +0100
+Subject: [PATCH] Remove usage_bits call as it doesn't work on v3 kernels.
+
+---
+ .../net/java/games/input/LinuxEventDevice.java     | 32 ----------------------
+ .../native/net_java_games_input_LinuxEventDevice.c | 14 ----------
+ 2 files changed, 46 deletions(-)
+
+diff --git a/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java b/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java
+index a28c4c7..41a4fee 100644
+--- a/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java
++++ b/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java
+@@ -94,34 +94,11 @@ private final static int countComponents(List components, Class id_type, boolean
+ 	}
+ 
+ 	private final Controller.Type guessType() throws IOException {
+-		Controller.Type type_from_usages = guessTypeFromUsages();
+-		if (type_from_usages == Controller.Type.UNKNOWN)
+-			return guessTypeFromComponents();
+-		else
+-			return type_from_usages;
+-	}
+-	
+-	private final Controller.Type guessTypeFromUsages() throws IOException {
+-		byte[] usage_bits = getDeviceUsageBits();
+-		if (isBitSet(usage_bits, NativeDefinitions.USAGE_MOUSE))
+-			return Controller.Type.MOUSE;
+-		else if (isBitSet(usage_bits, NativeDefinitions.USAGE_KEYBOARD))
+-			return Controller.Type.KEYBOARD;
+-		else if (isBitSet(usage_bits, NativeDefinitions.USAGE_GAMEPAD))
+-			return Controller.Type.GAMEPAD;
+-		else if (isBitSet(usage_bits, NativeDefinitions.USAGE_JOYSTICK))
+-			return Controller.Type.STICK;
+-		else
+-			return Controller.Type.UNKNOWN;
+-	}
+-
+-	private final Controller.Type guessTypeFromComponents() throws IOException {
+ 		List components = getComponents();
+ 		if (components.size() == 0)
+ 			return Controller.Type.UNKNOWN;
+ 		int num_rel_axes = countComponents(components, Component.Identifier.Axis.class, true);
+ 		int num_abs_axes = countComponents(components, Component.Identifier.Axis.class, false);
+-		int num_keys = countComponents(components, Component.Identifier.Key.class, false);
+ 		int mouse_traits = 0;
+ 		int keyboard_traits = 0;
+ 		int joystick_traits = 0;
+@@ -342,15 +319,6 @@ private final List getDeviceComponents() throws IOException {
+ 	}
+ 	private final static native void nGetBits(long fd, int ev_type, byte[] evtype_bits) throws IOException;
+ 
+-	private final byte[] getDeviceUsageBits() throws IOException {
+-		byte[] bits = new byte[NativeDefinitions.USAGE_MAX/8 + 1];
+-		if (getVersion() >= 0x010001) {
+-			nGetDeviceUsageBits(fd, bits);
+-		}
+-		return bits;
+-	}
+-	private final static native void nGetDeviceUsageBits(long fd, byte[] type_bits) throws IOException;
+-
+ 	public final synchronized void pollKeyStates() throws IOException {
+ 		nGetKeyStates(fd, key_states);
+ 	}
+diff --git a/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c b/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c
+index 90eff09..18913c2 100644
+--- a/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c
++++ b/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c
+@@ -112,20 +112,6 @@ JNIEXPORT jint JNICALL Java_net_java_games_input_LinuxEventDevice_nGetNumEffects
+ 	return num_effects;
+ }
+ 
+-JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nGetDeviceUsageBits(JNIEnv *env, jclass unused, jlong fd_address, jbyteArray usages_array) {
+-#if EV_VERSION >= 0x010001
+-	int fd = (int)fd_address;
+-	jsize len = (*env)->GetArrayLength(env, usages_array);
+-	jbyte *usages = (*env)->GetByteArrayElements(env, usages_array, NULL);
+-	if (usages == NULL)
+-		return;
+-	int res = ioctl(fd, EVIOCGUSAGE(len), usages);
+-	(*env)->ReleaseByteArrayElements(env, usages_array, usages, 0);
+-	if (res == -1)
+-		throwIOException(env, "Failed to get device usages (%d)\n", errno);
+-#endif
+-}
+-
+ JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nGetBits(JNIEnv *env, jclass unused, jlong fd_address, jint evtype, jbyteArray bits_array) {
+ 	int fd = (int)fd_address;
+ 	jsize len = (*env)->GetArrayLength(env, bits_array);
diff --git a/dev-java/jinput/files/unbundle.patch b/dev-java/jinput/files/unbundle.patch
new file mode 100644
index 000000000000..1a8686308d71
--- /dev/null
+++ b/dev-java/jinput/files/unbundle.patch
@@ -0,0 +1,10 @@
+--- build.xml.orig	2013-03-25 18:01:56.000000000 +0000
++++ build.xml	2015-04-12 17:11:45.869203820 +0100
+@@ -137,7 +137,6 @@
+ 			<fileset dir="plugins/wintab/classes">
+ 				<include name="**/*.class"/>
+ 			</fileset>
+-			<zipfileset src="lib/jutils.jar" includes="**/*.class"/>
+ 			<manifest>
+ 				<attribute name="Sealed" value="true"/>
+ 			</manifest>
diff --git a/dev-java/jinput/jinput-2.0.6-r1.ebuild b/dev-java/jinput/jinput-2.0.6-r1.ebuild
new file mode 100644
index 000000000000..c4d0b5e00785
--- /dev/null
+++ b/dev-java/jinput/jinput-2.0.6-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+COMMIT="790b666"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils toolchain-funcs java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="An implementation of an API for game controller discovery and polled input"
+HOMEPAGE="https://java.net/projects/jinput"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/jutils:0"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
+
+JAVA_PKG_BSFIX="off"
+EANT_BUILD_TARGET="dist"
+
+src_prepare() {
+	# http://java.net/jira/browse/JINPUT-44
+	# http://java.net/jira/browse/JINPUT-45
+	epatch "${FILESDIR}"/{javah-classpath,nostrip,remove-getDeviceUsageBits,unbundle}.patch
+
+	sed -i \
+		-e "s/\"cc\"/\"$(tc-getCC)\"/g" \
+		-e "s/-O[0-9]/${CFLAGS} ${LDFLAGS}/g" \
+		plugins/linux/src/native/build.xml || die
+
+	java-pkg_jar-from --into lib jutils
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_doso dist/lib${PN}-*.so
+
+	# Only core API docs, others would conflict.
+	use doc && java-pkg_dojavadoc coreAPI/apidocs
+	use source && java-pkg_dosrc */src/java/* */**/src/java/*
+}
diff --git a/dev-java/jinput/metadata.xml b/dev-java/jinput/metadata.xml
new file mode 100644
index 000000000000..bf2bb954c526
--- /dev/null
+++ b/dev-java/jinput/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <longdescription>The JInput Project hosts an implementation of an API for game controller discovery and polled input. It is part of a suite of open-source technologies initiated by the Game Technology Group at Sun Microsystems with intention of making the development of high performance games in Java a reality.</longdescription>
+  <upstream>
+    <remote-id type="github">jinput/jinput</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jisp-2.5.1-r3 b/dev-java/jisp-2.5.1-r3
deleted file mode 100644
index a533c18c4389..000000000000
--- a/dev-java/jisp-2.5.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Indexed Serialization Package: A small, embedded database engine
-EAPI=5
-HOMEPAGE=http://www.coyotegulch.com/products/jisp/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=SVFL
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.5
-SRC_URI=http://gentooexperimental.org/distfiles/jisp-2.5.1-source.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b8c0de2246ab614591bde4786c5c07e6
diff --git a/dev-java/jisp/Manifest b/dev-java/jisp/Manifest
new file mode 100644
index 000000000000..7a040f275dca
--- /dev/null
+++ b/dev-java/jisp/Manifest
@@ -0,0 +1,4 @@
+AUX jisp-2.5.1-java15.patch 1828 BLAKE2B fe995052b054f43498911df78b4776c4df7b9a047b5e1f1a6f5c7b99d1d67cba12bb9459dd573e51c1e00c0c94d058f03caef5e0a4b8f524b1ac8cc88c6f830e SHA512 b6221e375ad98ec8d4eb86b3a0d720b898358d9528966b31e8f4f39e8eba595424ecca3d5eaddb0866efbdc056d2dc68b1c1e4e7e09ab2bf637f7e7e00c4b039
+DIST jisp-2.5.1-source.tar.gz 63282 BLAKE2B d2e8bbc91f2db1fbe1c8411dade375a8934f3cc662f1c7604097341ba1f0430b4e450dac7e77f1479d4078be4cb4c2878c243c3d1c84b36f6bd1ee9318046b90 SHA512 b82bea547e6725e37285a5d332daeb8ecf300a6f69004845a308a3ee87f143e7a7e8be34925fd288523e36eea64479010915306ac33871b3bf4310c54a1c26d0
+EBUILD jisp-2.5.1-r3.ebuild 797 BLAKE2B fdbab9e2af85fc29ffc0d56bfce9a2295f3fd885b724ee63f82e70e2f2c7979ee7e7fbba6840f5a7c5e84201e2e85d06ce09fff5778e201b57c3401dab9ae61a SHA512 26d5c32ff26de6b83c79e6bf302349f66db636273ff4a8d430075b1bcd55dfdfef00eff4f4e2e2f6a1df64aad2a5dd242aec92ea314494334b0f8eed183ce390
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/jisp/files/jisp-2.5.1-java15.patch b/dev-java/jisp/files/jisp-2.5.1-java15.patch
new file mode 100644
index 000000000000..cfc0b7e2c93e
--- /dev/null
+++ b/dev-java/jisp/files/jisp-2.5.1-java15.patch
@@ -0,0 +1,46 @@
+diff -ru jisp-2.5.1/com/coyotegulch/jisp/SerialObjectOutputStream.java jisp-2.5.1-patched/com/coyotegulch/jisp/SerialObjectOutputStream.java
+--- jisp-2.5.1/com/coyotegulch/jisp/SerialObjectOutputStream.java	2003-03-27 13:02:19.000000000 -0500
++++ jisp-2.5.1-patched/com/coyotegulch/jisp/SerialObjectOutputStream.java	2005-11-06 15:24:33.000000000 -0500
+@@ -83,11 +83,11 @@
+         // Check if we have a list of m_buffers

+         if (m_buffers != null)

+         {

+-            Iterator enum = m_buffers.iterator();

++            Iterator i = m_buffers.iterator();

+ 

+-            while (enum.hasNext())

++            while (i.hasNext())

+             {

+-                byte[] bytes = (byte[]) enum.next();

++                byte[] bytes = (byte[]) i.next();

+                 out.write(bytes, 0, m_blockSize);

+             }

+         }

+@@ -101,10 +101,10 @@
+         // Check if we have a list of m_buffers

+         if (m_buffers != null)

+         {

+-            Iterator enum = m_buffers.iterator();

+-            while (enum.hasNext())

++            Iterator i = m_buffers.iterator();

++            while (i.hasNext())

+             {

+-                byte[] bytes = (byte[]) enum.next();

++                byte[] bytes = (byte[]) i.next();

+                 out.write(bytes, 0, m_blockSize);

+             }

+         }

+@@ -126,10 +126,10 @@
+        int pos = 0;

+        if (m_buffers != null)

+        {

+-           Iterator enum = m_buffers.iterator();

+-           while (enum.hasNext())

++           Iterator i = m_buffers.iterator();

++           while (i.hasNext())

+            {

+-               byte[] bytes = (byte[]) enum.next();

++               byte[] bytes = (byte[]) i.next();

+                System.arraycopy(bytes,0,data,pos,m_blockSize);

+                pos+=m_blockSize;

+            }

diff --git a/dev-java/jisp/jisp-2.5.1-r3.ebuild b/dev-java/jisp/jisp-2.5.1-r3.ebuild
new file mode 100644
index 000000000000..6577ef618f4d
--- /dev/null
+++ b/dev-java/jisp/jisp-2.5.1-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple eutils
+
+DESCRIPTION="Java Indexed Serialization Package: A small, embedded database engine"
+HOMEPAGE="http://www.coyotegulch.com/products/jisp/"
+
+# TODO contact upstream about hosting jisp-2.5 on their site.
+# They only maintain 3.0 at the moment
+# This tarball is from jpackage's jisp2 source rpm
+SRC_URI="http://gentooexperimental.org/distfiles/${P}-source.tar.gz"
+
+LICENSE="SVFL"
+SLOT="2.5"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-java15.patch
+
+	mkdir src || die
+	mv com src || die
+}
diff --git a/dev-java/jisp/metadata.xml b/dev-java/jisp/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/jisp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/jlayer-1.0.1 b/dev-java/jlayer-1.0.1
deleted file mode 100644
index 2c506fb0577b..000000000000
--- a/dev-java/jlayer-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=MP3 decoder/player/converter library for Java
-EAPI=2
-HOMEPAGE=http://www.javazoom.net/javalayer/javalayer.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.javazoom.net/javalayer/sources/jlayer1.0.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=697c9f8358f9a8e065c15f737b06d951
diff --git a/dev-java/jlayer/Manifest b/dev-java/jlayer/Manifest
new file mode 100644
index 000000000000..c3aa921571ff
--- /dev/null
+++ b/dev-java/jlayer/Manifest
@@ -0,0 +1,3 @@
+DIST jlayer1.0.1.tar.gz 370583 BLAKE2B cf7fb72ef80cd4d94ff7b61f720c0d519afd478d3b4c380d16a1876f77bf7279796d487c5ff8f1ad8e57926d55ab448b0a7a760eb0820ce1650b2bd684571453 SHA512 904c3aa049d9be4c5569a233abd8c933fe85c58b26cf9e467d01e09a4245fe9933f8e7d8e3b2abf328e6f7a197f69acdcbde494b99c97056eab2e4936060ee08
+EBUILD jlayer-1.0.1.ebuild 1182 BLAKE2B b5fc0ef0cd1c76c59f1024a0fd8dc3451f349018bf75ae3efd78fac3ea2de776fbb860a7118e9f660a3d1aee340e9b0e6bcdce3ecd64555c2bea533786b3c964 SHA512 8e6972c19043aefe583fc0856f23e4dc198edbb2f167b7035e54aa80f4bfd285ad6ef2b2692f24e8c28bbeae451eea1c145b33f062a23873c2f228833fb5c0fa
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jlayer/jlayer-1.0.1.ebuild b/dev-java/jlayer/jlayer-1.0.1.ebuild
new file mode 100644
index 000000000000..a7607de7fe23
--- /dev/null
+++ b/dev-java/jlayer/jlayer-1.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="MP3 decoder/player/converter library for Java"
+HOMEPAGE="http://www.javazoom.net/javalayer/javalayer.html"
+
+SRC_URI="http://www.javazoom.net/javalayer/sources/${PN}${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${RDEPEND}"
+
+S=${WORKDIR}/JLayer${PV}
+EANT_BUILD_TARGET="dist"
+EANT_DOC_TARGET="all"
+
+src_prepare() {
+	rm -v *.jar || die
+	# build expects classes to exist
+	rm -vr classes/* || die
+}
+
+src_install(){
+	java-pkg_newjar jl${PV}.jar
+	dodoc README.txt CHANGES.txt || die
+	dohtml playerapplet.html || die
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc src/*
+
+	# the MP3TOWAV converter
+	java-pkg_dolauncher jl-converter \
+		--main javazoom.jl.converter.jlc
+
+	# the simple MP3 player
+	java-pkg_dolauncher jl-player \
+		--main javazoom.jl.player.jlp
+
+	# the advanced (threaded) MP3 player
+	java-pkg_dolauncher jl-advanced-player \
+		--main javazoom.jl.player.advanced.jlap
+}
diff --git a/dev-java/jlayer/metadata.xml b/dev-java/jlayer/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/jlayer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jlex-1.2.6-r2 b/dev-java/jlex-1.2.6-r2
deleted file mode 100644
index 3d9e8002ee3b..000000000000
--- a/dev-java/jlex-1.2.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JLex: a lexical analyzer generator for Java
-EAPI=5
-HOMEPAGE=http://www.cs.princeton.edu/~appel/modern/java/JLex/
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=amd64 x86
-LICENSE=jlex
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/jlex-1.2.6.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b9047cce4e22f815bf074122e4519e57
diff --git a/dev-java/jlex/Manifest b/dev-java/jlex/Manifest
new file mode 100644
index 000000000000..8c3aac883bea
--- /dev/null
+++ b/dev-java/jlex/Manifest
@@ -0,0 +1,3 @@
+DIST jlex-1.2.6.tar.bz2 45868 BLAKE2B d56329396668528bb626f6f03af2ebec3ccde1fc73f9e2242ff3dacc4e92c76a0e1cca29bf240832ef26c0ac98bf4b18bd820a06c99aea2b958ac13f3eadb78d SHA512 ebe16f87fe5b524de5c31651b0d5a0c282fdac99814c8f432a850a394657da4016880fba0f7418c8c42a989e78145d39188c3e68b79ed64fa1911d5680b00b9c
+EBUILD jlex-1.2.6-r2.ebuild 870 BLAKE2B 8030f4b3d536401cf25c51f2192477a1b8714787fdd40453736c3b590dcc60df4f454d39341e5985990bf8c4ff454e6800b23a9d93827fa80dcfcba1f2477bb9 SHA512 27aa4c8efdee4e0300ae131f7401a748e2b766a2741a429d36b5701a077eec6e7f858999165440741e1be8c4bb31b00898f67125057fb4d34fc98930afc9e234
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jlex/jlex-1.2.6-r2.ebuild b/dev-java/jlex/jlex-1.2.6-r2.ebuild
new file mode 100644
index 000000000000..0a9728167410
--- /dev/null
+++ b/dev-java/jlex/jlex-1.2.6-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2
+
+DESCRIPTION="JLex: a lexical analyzer generator for Java"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="http://www.cs.princeton.edu/~appel/modern/java/JLex/"
+
+KEYWORDS="amd64 x86"
+LICENSE="jlex"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+src_compile() {
+	ejavac -nowarn Main.java
+}
+
+src_install() {
+	dodoc README Bugs
+
+	if use doc; then
+		dohtml manual.html
+		dodoc sample.lex
+	fi
+
+	mkdir JLex || die
+	mv *.class JLex/ || die
+	jar cf jlex.jar JLex/ || die "failed to jar"
+
+	java-pkg_dojar "${PN}.jar"
+	java-pkg_dolauncher "${PN}" --main JLex.Main "${PN}.jar"
+
+	if use source; then
+		rm JLex/*
+		cp Main.java JLex
+		java-pkg_dosrc JLex
+	fi
+}
diff --git a/dev-java/jlex/metadata.xml b/dev-java/jlex/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jlex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jlfgr-1.0-r2 b/dev-java/jlfgr-1.0-r2
deleted file mode 100644
index 2a199efd0bc8..000000000000
--- a/dev-java/jlfgr-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java(TM) Look and Feel Graphics Repository
-EAPI=5
-HOMEPAGE=http://java.sun.com/developer/techDocs/hi/repository/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=sun-jlfgr
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://gentoo/jlfgr-1_0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=81014697eb26e4d7b2a05800ae12da9b
diff --git a/dev-java/jlfgr/Manifest b/dev-java/jlfgr/Manifest
new file mode 100644
index 000000000000..6e5041ae6f79
--- /dev/null
+++ b/dev-java/jlfgr/Manifest
@@ -0,0 +1,3 @@
+DIST jlfgr-1_0.zip 66708 BLAKE2B 8b8053e0c1960da11413a647991d2b956c58ffdcb307f38223a281b262a00a31fd5441f76b80075e5827ca70ee12b3e67fb7c79a35e06a2bdc9a981ee75a10a0 SHA512 a6d9b6a617508bbe95afba23eed414c609078fc76dbb0bb86d1a7aecdb7d2e3ba57d58c7d60d29b0f7f36e12937e2838ad335db7fc714efe8f062b84dcab674d
+EBUILD jlfgr-1.0-r2.ebuild 647 BLAKE2B 2be9062dcd097d21132aefcdefb6ecc864b3aecf9a7cecc620c596c0dca042063bbfe883c01d5aa10babb4c79fffb613e69632d0f0e654cd6bf48a859f863e46 SHA512 f9fe2ec2d9de64f79117efb272dfdf7a15cae67ec1ef1ac677b2a8fcc49e2d9f8e137c42edef7285d18b2fe6494b44850fb48290946657f28951576069936c47
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jlfgr/jlfgr-1.0-r2.ebuild b/dev-java/jlfgr/jlfgr-1.0-r2.ebuild
new file mode 100644
index 000000000000..df38eda7e2e9
--- /dev/null
+++ b/dev-java/jlfgr/jlfgr-1.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit versionator java-pkg-2
+
+MY_PV=$(replace_all_version_separators '_')
+
+DESCRIPTION="Java(TM) Look and Feel Graphics Repository"
+HOMEPAGE="http://java.sun.com/developer/techDocs/hi/repository/"
+SRC_URI="mirror://gentoo/jlfgr-${MY_PV}.zip"
+
+LICENSE="sun-jlfgr"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+# Empty src_compile() to prevent message about not found build.xml
+src_compile() { :; }
+
+src_install() {
+	java-pkg_newjar "jlfgr-${MY_PV}.jar" "${PN}.jar"
+}
diff --git a/dev-java/jlfgr/metadata.xml b/dev-java/jlfgr/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/jlfgr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jlibeps-0.1-r1 b/dev-java/jlibeps-0.1-r1
deleted file mode 100644
index 3b924552caa8..000000000000
--- a/dev-java/jlibeps-0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/unzip >=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Library to create EPS graphics from a Graphics2D
-EAPI=5
-HOMEPAGE=http://jlibeps.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jlibeps/jlibeps-0.1-src.zip -> jlibeps-0.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3da1ea2f428d97ca6975c377d8990cd6
diff --git a/dev-java/jlibeps/Manifest b/dev-java/jlibeps/Manifest
new file mode 100644
index 000000000000..2c8f2b3691c0
--- /dev/null
+++ b/dev-java/jlibeps/Manifest
@@ -0,0 +1,3 @@
+DIST jlibeps-0.1.zip 85686 BLAKE2B 54214d74007f63bafc7a0a88643ca82d488357501eef2f186162b6c8d6c913f77eb0074e7e156fd41954584f7398f47c6f883a802ceda39608ac5f60b4e9def9 SHA512 ce28d31d8aafaac2e493fecf8cf95e84ff5076fde7e4d2be8abcca5d849b823ab2b31303fa4f24450ce29aa1bc71f451c880213f820343a98f1aff0036693b5a
+EBUILD jlibeps-0.1-r1.ebuild 534 BLAKE2B 02f25fa2d797e9dc39f1980da4288fe29bb8bddc3ac9105ef01dc2597e81e990069a645e02ed483c04e1c52a67d84edf5cd9fded95ec3bf4b1f5c086d5dc8ae4 SHA512 b915aba64fc8dde67616dab0fbcf1892b3bffd3c531414a38d4582fe14b44ab98b377dc987265e0167a4b36833cf162375f7ccdb42c41029dbe89cc6d0c3ca80
+MISC metadata.xml 313 BLAKE2B c47ec481752d1492e2f8cd12c0e6fec4b90aebc7ce5f0f148926514aa88cef8829a667c5c3dd79f16f199ddb4cdc522c5f7cff9502bea9bd3405384149622d63 SHA512 5009d20a82fd81237740bebc3aa937b90a189286cf4dcae62ad69c5fc0830b150864a520ef0eb2d87528d78abca4bd64a3c8106b53069dfa78911c64fc4e4a19
diff --git a/dev-java/jlibeps/jlibeps-0.1-r1.ebuild b/dev-java/jlibeps/jlibeps-0.1-r1.ebuild
new file mode 100644
index 000000000000..2f75afc4bff6
--- /dev/null
+++ b/dev-java/jlibeps/jlibeps-0.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library to create EPS graphics from a Graphics2D"
+HOMEPAGE="http://jlibeps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.4"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.4"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/jlibeps/metadata.xml b/dev-java/jlibeps/metadata.xml
new file mode 100644
index 000000000000..8e0eb0d87c46
--- /dev/null
+++ b/dev-java/jlibeps/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jlibeps</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jline-1.0 b/dev-java/jline-1.0
deleted file mode 100644
index 5cf9538d1ea8..000000000000
--- a/dev-java/jline-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip test? ( dev-java/ant-junit ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java library for handling console input
-EAPI=2
-HOMEPAGE=http://jline.sourceforge.net/
-IUSE=elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jline/jline-1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1bec6d8d4dbffced1500b3c372b69384
diff --git a/dev-java/jline-2.12.1-r1 b/dev-java/jline-2.12.1-r1
deleted file mode 100644
index 8de70d213baf..000000000000
--- a/dev-java/jline-2.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=test? ( dev-java/junit:4 ) dev-java/jansi:0 dev-java/jansi-native:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java library for handling console input
-EAPI=5
-HOMEPAGE=https://github.com/jline/jline2
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=dev-java/jansi:0 dev-java/jansi-native:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/jline/jline2/archive/jline-2.12.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f889d613b7866d44180abd636d69b515
diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
new file mode 100644
index 000000000000..beff0e251d2b
--- /dev/null
+++ b/dev-java/jline/Manifest
@@ -0,0 +1,7 @@
+AUX maven-build.properties 501 BLAKE2B aaaaeb13e4e23588d6fe8c5e990b1e95edade85a7af30b4c9df3edf795b394c85a9baba202c8887cc46d7be1114b05637b486915ace8f51d25b31ee8c5e29012 SHA512 2e3347c2b53266c7d41cd9f73e79bdfecd28e41e78208b360533414ed551f101d04e4a76d416f061e56bbce43baf96c4c52fdba65ded3c0be18533c2c226ef6f
+AUX maven-build.xml 8634 BLAKE2B 4d1078e1201baf11da35772d0e48304522cad6b606a6d601c449bf1d97b2a43725ddcf703dea154ac923955aac5489d164686fb042fcb7c1753d0e9ef619a283 SHA512 45648b88f3df01e0623483c6c409ce1fb57b6b73e62775064b4bc7762d1dc3a3ead3a4925efe987986081ed34c26195827f3f34a1b631fdf4e7ce227376c2936
+DIST jline-1.0.zip 463082 BLAKE2B 4f4eec5a2674bf97ed9fe83c60d339fce54dcd556aca6e95db74438e87253fd4e36e4eef26b3ac14ed84fff3d2fe1b58ba3a6fe13f33d96fe50a34f7bb34f541 SHA512 2957e19a3536d89aeaf8f27afb1f8eb4eb8bcc99560244c7f1ba14693a84a2f5e677a6c21d5f85ec519674cc4cd6cb3c9e4725cb4797144168d2f6df3954aba9
+DIST jline-2.12.1.tar.gz 97289 BLAKE2B 375711ad78cba26c0b4702dd739a18dd4db2fd1e8b16ce817dd1f567c405b7b0f96c72a6c6b7fabff1520617cf9149a29040e132d0b61e2d57149bb83b404c8d SHA512 368492fa0b28e6aa3827db05d266b332935d9a03c2f6645d039941c61a698e85fd57accfac444503de4cb2f2dae5787496924b8d258faad1c18b6cafe787f99d
+EBUILD jline-1.0.ebuild 1644 BLAKE2B 4069f204bdcd09f156112ca33c12fbdc91da13f6a3ec124104ef54cbabb3b0acd9be65a81fa2e639d3f91f155b21eb8d0afb53abc9d74bcac22a1acedfac761b SHA512 195e08810e2e05ab6c3b2009ae407d3040505dfb12c303164e22110a9695e471d030e513c7cdfeb7bdcf0374e3f2fed3c1330138db0d119ac667e5a25e7ce26b
+EBUILD jline-2.12.1-r1.ebuild 1262 BLAKE2B 21b4efdf0413e9af3693154de0e7259f098b31bda663edb5ca40ba3f7ce46c03f7f98924ef0b4cc40a0ecbcca8ecfe6a7a40065fe81bcb0f0558187d6a3d485a SHA512 47891ca0a85a3e3414bab175e9cfd95b037f855effb069f682335042de102a622e16dc7bb8236481347d5e7493c1186ee9dff690c3ac72cc447b8542288e3ced
+MISC metadata.xml 375 BLAKE2B 6ac502feb83c678011ccf4b923c31184399f1feafdf3dbd8703d0c3c69900c1460da474eeb304d48590cb19ab7d128c8d8c0db48982e1283b527a0dfaf1668c2 SHA512 17a44da075005f0417e99ae638ba547800d799b98375f73c4bf7fc418b12e33e916952812850b63c623234bce98ebfd6eb525f7015e67cdaee16c38ad5f4b684
diff --git a/dev-java/jline/files/maven-build.properties b/dev-java/jline/files/maven-build.properties
new file mode 100644
index 000000000000..66ef7cf2840e
--- /dev/null
+++ b/dev-java/jline/files/maven-build.properties
@@ -0,0 +1,13 @@
+#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
+#Sun Jan 21 15:31:06 EET 2007
+maven.build.finalName=jline-0.9.9
+maven.build.outputDir=${maven.build.dir}/classes
+maven.build.resourceDir.0=src/main/resources
+maven.build.testResourceDir.0=src/test/resources
+maven.build.testOutputDir=${maven.build.dir}/test-classes
+maven.repo.local=lib
+maven.settings.offline=false
+maven.build.dir=target
+maven.settings.interactiveMode=true
+maven.build.srcDir.0=src/main/java
+maven.build.testDir.0=src/test/java
diff --git a/dev-java/jline/files/maven-build.xml b/dev-java/jline/files/maven-build.xml
new file mode 100644
index 000000000000..7be70998ddcc
--- /dev/null
+++ b/dev-java/jline/files/maven-build.xml
@@ -0,0 +1,199 @@
+<?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 1/21/07 3:31 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jline-from-maven" default="dist" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environnement properties                                         -->
+  <!-- ====================================================================== -->
+
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jline-0.9.9"/>
+  <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/main/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+
+  <property name="maven.settings.offline" value="true"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+  <path id="build.test.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="*.jar"/>
+    </fileset>
+  </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.3" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <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="junit-present, compile" 
+          description="Compile the test code" 
+          if="junit.present">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.3" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <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="junit-present, compile-tests" 
+          if="junit.present" 
+          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}">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="junit-present" 
+          depends="test-junit-present" 
+          unless="junit.present">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>===============================================================================</echo>
+  </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"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Dist target                                                            -->
+  <!-- ====================================================================== -->
+
+  <target name="dist" depends="package,test" description="Package the application and run tests"/>
+
+  <!-- ====================================================================== -->
+  <!-- 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}/junit/junit/3.8.1"/>
+    <get src="http://jline.sourceforge.net/m2repo/junit/junit/3.8.1/junit-3.8.1.jar" 
+         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
+         usetimestamp="true" 
+         ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" 
+         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
+         usetimestamp="true" 
+         ignoreerrors="true"/>
+  </target>
+</project>
diff --git a/dev-java/jline/jline-1.0.ebuild b/dev-java/jline/jline-1.0.ebuild
new file mode 100644
index 000000000000..5d846154e3f4
--- /dev/null
+++ b/dev-java/jline/jline-1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+JAVA_PKG_IUSE="source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java library for handling console input"
+HOMEPAGE="http://jline.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	test? ( dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${P}/src"
+
+java_prepare() {
+	rm -fv "${WORKDIR}"/${P}/*.jar || die
+
+	# we don't support maven for building yet. this build.xml was generated by:
+	# - mvn ant:ant
+	# - tweak build.xml to not load properties from home dir
+	# - tweak the test target to match the test cases
+	# - change maven.repo.local from ~/.maven to "lib" in .properties
+	# - change classpath definitions to "*.jar"
+	cp "${FILESDIR}/maven-build.xml" build.xml || die
+	cp "${FILESDIR}/maven-build.properties" . || die
+	java-ant_ignore-system-classes
+
+	mkdir lib && cd lib || die
+	use test && java-pkg_jar-from --build-only junit
+}
+
+src_compile() {
+	# precompiled javadocs (needs maven to generate)
+	# -Dmaven.build.finalName is needed to override the one defined in the
+	# build.xml, which because it was generated with 0.9.9, defaults to
+	# jline-0.9.9 -nichoj
+	eant package -Dmaven.build.finalName=${P}
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test -Djunit.present=true
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+	#no api docs in this release
+	#use doc && java-pkg_dojavadoc ../apidocs
+	use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
new file mode 100644
index 000000000000..2cf20f9d9991
--- /dev/null
+++ b/dev-java/jline/jline-2.12.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for handling console input"
+HOMEPAGE="https://github.com/jline/jline2"
+SRC_URI="https://github.com/jline/${PN}2/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND="
+	dev-java/jansi:0
+	dev-java/jansi-native:0"
+
+DEPEND="
+	test? (
+		dev-java/junit:4
+	)
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}2-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
+
+java_prepare() {
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+
+	# Don't forget the resources!
+	mkdir -p target/classes || die
+	cp -r src/main/resources/* target/classes || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	dodoc {CHANGELOG,README}.md
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jline/metadata.xml b/dev-java/jline/metadata.xml
new file mode 100644
index 000000000000..cb172808c6ff
--- /dev/null
+++ b/dev-java/jline/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jline/jline2</remote-id>
+    <remote-id type="sourceforge">jline</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jmdns-3.4.1-r1 b/dev-java/jmdns-3.4.1-r1
deleted file mode 100644
index 23a9fbda847f..000000000000
--- a/dev-java/jmdns-3.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JmDNS is an implementation of multi-cast DNS in Java
-EAPI=5
-HOMEPAGE=http://jmdns.sourceforge.net
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jmdns/jmdns-3.4.1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=893634ab129e1696e9554b96f9c75c64
diff --git a/dev-java/jmdns/Manifest b/dev-java/jmdns/Manifest
new file mode 100644
index 000000000000..1aed430b0c74
--- /dev/null
+++ b/dev-java/jmdns/Manifest
@@ -0,0 +1,3 @@
+DIST jmdns-3.4.1.tgz 665503 BLAKE2B b2ddf4216a39abf8b1fa9629005f83a5b6d3bbc6a2b85fcb716f4591d9435892977086276c1838ff4966d54bb501a589c4eff15948bae4ee7b8d0f035371fcb8 SHA512 06e01dc7ef9eabd1ba75be016d688294043a6eec53de40d20026587f2c3d82bd0b025efd9b662bbe28450940d277da0fbc30ef69293ca3e81426212d8e85d7fb
+EBUILD jmdns-3.4.1-r1.ebuild 631 BLAKE2B 9d94a03b6e27bff53aa7b0c083e91b74400ca71ab9bf4e78e7d148f775c4bedbc0f034347e3c052b8ee8c5415f71c206918e6eab2c3943b396d8026299d74c7a SHA512 8b6697eaec225ec03b51be3159168015866ff8a03b909eff50b619c0925f0b63251fabde7333e3d75309aa43e65227f915ad39df529fe220ac0d0edb709d16a9
+MISC metadata.xml 517 BLAKE2B 17226df160e782c9a3949d1e9d7d60cea9c335efffcb083b24b0c6905c6534bc8036d72dc5368d57494feaea7b1450b8b4eadabad46707b3070784a25981c664 SHA512 4f2ff275a1b5807fce359c7d536f3e723d43d2e0c0e83ff6ffae787b4b25bf64eec3b7a3abe3fc959736f0eeda331c1fb2c4fcff15b7b4e3bbf1ded234e7796d
diff --git a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..d33a9ab1c9b7
--- /dev/null
+++ b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+HOMEPAGE="http://jmdns.sourceforge.net"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	rm "${S}"/build.xml || die
+	find -name "*.jar" -delete || die
+	find "${JAVA_SRC_DIR}" -name "*Test.java" -delete || die
+}
diff --git a/dev-java/jmdns/metadata.xml b/dev-java/jmdns/metadata.xml
new file mode 100644
index 000000000000..98cdd972be35
--- /dev/null
+++ b/dev-java/jmdns/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		JmDNS is an implementation of multi-cast DNS in Java.
+		It supports service discovery and service registration.
+		It is fully interoperable with Apple's Rendezvous.
+	</longdescription>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jmdns</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jmh-core-1.4.1 b/dev-java/jmh-core-1.4.1
deleted file mode 100644
index 4b2f2cc23a2c..000000000000
--- a/dev-java/jmh-core-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/asm:4 dev-java/commons-math:3 =dev-java/jopt-simple-4.6:0 dev-java/junit:4 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Harness for building, running, and analysing nano/micro/milli/macro benchmarks
-EAPI=5
-HOMEPAGE=http://openjdk.java.net/projects/code-tools/jmh
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/asm:4 dev-java/commons-math:3 =dev-java/jopt-simple-4.6:0 dev-java/junit:4 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://hg.openjdk.java.net/code-tools/jmh/archive/7ff584954008.tar.gz -> jmh-core-1.4.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=438b00ebd56266bb4fb56a2b5802019a
diff --git a/dev-java/jmh-core/Manifest b/dev-java/jmh-core/Manifest
new file mode 100644
index 000000000000..0a4f1809a120
--- /dev/null
+++ b/dev-java/jmh-core/Manifest
@@ -0,0 +1,3 @@
+DIST jmh-core-1.4.1.tar.gz 585746 BLAKE2B ff6e9d3e8b11827042a9ff9983505fa5272d943a8365cf14ac43d940a7815f280c2b82c3ab810f1c22328a932912f6b09b9c5d5f1838a3cb357e6ebe21006e49 SHA512 a33c63b82712deb53218bb8d955c9606e5f393ff0c6256052ac8df022ec45be79bc0ee5ee08ce0d3762594214814bcf1e562717d83daa9ce13c664ca9e7c431b
+EBUILD jmh-core-1.4.1.ebuild 977 BLAKE2B a01c01762fdbb02267e0b00917452f072ec54e0fe973df70f5ec3f2971c02b8ae1fa289b39f9bbd3883576792c2eec0ae80d4a33152c4513f14348f2047b3867 SHA512 38beaf02a01a0c12e6148ba3c0d337cf6c04b2b6c996955f74071fa522b8369bf2e86f4ccfc12dc8b90b917fe27d64efd6c6cd231895aef22d31b4ab3508a8fa
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jmh-core/jmh-core-1.4.1.ebuild b/dev-java/jmh-core/jmh-core-1.4.1.ebuild
new file mode 100644
index 000000000000..ea497f214475
--- /dev/null
+++ b/dev-java/jmh-core/jmh-core-1.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# Hash of tag, download not available via ${PV}
+MY_PN="jmh"
+MY_PV="7ff584954008"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Harness for building, running, and analysing nano/micro/milli/macro benchmarks"
+HOMEPAGE="http://openjdk.java.net/projects/code-tools/jmh"
+SRC_URI="http://hg.openjdk.java.net/code-tools/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# jopt *must* be 4.6, see http://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html
+CDEPEND="
+	dev-java/asm:4
+	dev-java/commons-math:3
+	=dev-java/jopt-simple-4.6:0
+	dev-java/junit:4
+	source? ( app-arch/zip )
+"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="asm-4,commons-math-3,jopt-simple,junit-4"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/${PN}"
diff --git a/dev-java/jmh-core/metadata.xml b/dev-java/jmh-core/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/jmh-core/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jmi-interface-1.0-r4 b/dev-java/jmi-interface-1.0-r4
deleted file mode 100644
index 7de7ce536d2c..000000000000
--- a/dev-java/jmi-interface-1.0-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Metadata Interface Sample Class Interface
-EAPI=5
-HOMEPAGE=http://java.sun.com/products/jmi/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=sun-bcla-jmi
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/jmi-1_0-fr-interfaces.zip mirror://gentoo/mof-1.0.xml.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1685812d379175252c2ebd0766852585
diff --git a/dev-java/jmi-interface-1.0-r5 b/dev-java/jmi-interface-1.0-r5
deleted file mode 100644
index 3a4b19595868..000000000000
--- a/dev-java/jmi-interface-1.0-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Metadata Interface Sample Class Interface
-EAPI=6
-HOMEPAGE=http://java.sun.com/products/jmi/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=sun-bcla-jmi
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/jmi-1_0-fr-interfaces.zip mirror://gentoo/mof-1.0.xml.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1b5177841da66b29628196cc85b0eac1
diff --git a/dev-java/jmi-interface/Manifest b/dev-java/jmi-interface/Manifest
new file mode 100644
index 000000000000..b4f42482201d
--- /dev/null
+++ b/dev-java/jmi-interface/Manifest
@@ -0,0 +1,6 @@
+AUX jmi-interface-1.0-enum.patch 1026 BLAKE2B 9d9f4eb2938b405cafd8c82123b3b70e80552c34de1f27498610b28ae99f2130b81715a9b87b3208075b02f563a5f3d7ef4c8489d8f7a59ef395b80ff2a15f7e SHA512 82b8b8666da33d40c4284f221a60a44ef4cab4deceda9090f928d59165af6811630a54c771aa36e45dc86378eae0a6bdd7660b56206fe7ba933fe8e0e21ebae2
+DIST jmi-1_0-fr-interfaces.zip 38946 BLAKE2B fb48e994000bc01b9972bd50d6e110322f251de2356202d33fd16c2f8333e76d9d6c185e064e1b435bc572864f244483680a1a2ff9f4ab1970ebaf50bf647613 SHA512 40a7b983ca8bbd5c35f4e2ef0acda7ecb09230c80a41fd17998a24ae57216b579e0e33bcbb2348d0091d1e75c1132be9bcb959a957519fe9d5d29f347bf1eca6
+DIST mof-1.0.xml.bz2 7076 BLAKE2B e86f8cf05a4922130d70a79c95f3cb369d54f40246f89bd04d1371a6401a923633f353268954674dc86ae28ed1da760a3ff90fbffdbe79f4331814e657f9bd94 SHA512 72dfee938fb3cb019928d3813743d5d535e1a5dbaa39915f5af84c39f9a701f8b043150e53f25b3745c5bbf25010144735834b121e3884bcaf044db6ff22e722
+EBUILD jmi-interface-1.0-r4.ebuild 1056 BLAKE2B 0deecf71cd4402749b9a080e9a5be76f8483b6defe0d669645fea973082f6479a0ec50d1234e683a36cf595df74154046198fc29da800d4d8633b5813f705ed2 SHA512 094835e191e82c661b3fcd063eb98d4788eab1b1ac92529cfe3ac91fe2181a10ddec29d9ef333db8848016a06b9f84daf442912d9596cd040c38f06139d3fb4d
+EBUILD jmi-interface-1.0-r5.ebuild 1039 BLAKE2B 01849d5875749340cc3ecb6721e77e1213f033c0269598388ce83c00b698c2ffd1d27e41057a60b13267a8264f1fafd28b9dcbb1b7c2c996b6d395aa6dd876f5 SHA512 ed85224f3e008f4d463ce05bf5a180bc076cf8a4155cecb93cbefc49d21552860b8f9fd5b00708a85d984991d2da073068d93b6c5925b9991b0efb744c79a566
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jmi-interface/files/jmi-interface-1.0-enum.patch b/dev-java/jmi-interface/files/jmi-interface-1.0-enum.patch
new file mode 100644
index 000000000000..a74dfd4d4461
--- /dev/null
+++ b/dev-java/jmi-interface/files/jmi-interface-1.0-enum.patch
@@ -0,0 +1,22 @@
+--- a/src/javax/jmi/reflect/RefClass.java
++++ b/src/javax/jmi/reflect/RefClass.java
+@@ -8,6 +8,6 @@
+     public Collection refAllOfClass();

+     public RefStruct refCreateStruct(RefObject struct, List params);

+     public RefStruct refCreateStruct(String structName, List params);

+-    public RefEnum refGetEnum(RefObject enum, String name);

++    public RefEnum refGetEnum(RefObject enumObj, String name);

+     public RefEnum refGetEnum(String enumName, String name);

+ }
+\ No newline at end of file
+--- a/src/javax/jmi/reflect/RefPackage.java
++++ b/src/javax/jmi/reflect/RefPackage.java
+@@ -14,7 +14,7 @@
+     public Collection refAllAssociations();

+     public RefStruct refCreateStruct(RefObject struct, List params);

+     public RefStruct refCreateStruct(String structName, List params);

+-    public RefEnum refGetEnum(RefObject enum, String name);

++    public RefEnum refGetEnum(RefObject enumObj, String name);

+     public RefEnum refGetEnum(String enumName, String name);

+     public void refDelete();

+ } 

diff --git a/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild b/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild
new file mode 100644
index 000000000000..338e0ca2b25a
--- /dev/null
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+JMI_ZIP="jmi-${PV/./_}-fr-interfaces.zip"
+MOF_XML="mof-${PV}.xml.bz2"
+
+DESCRIPTION="Java Metadata Interface Sample Class Interface"
+HOMEPAGE="http://java.sun.com/products/jmi/"
+SRC_URI="mirror://gentoo/${JMI_ZIP}
+		 mirror://gentoo/${MOF_XML}"
+
+LICENSE="sun-bcla-jmi"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_SRC_DIR="src"
+
+src_unpack() {
+	mkdir "${S}/src" || die
+	cd "${S}/src" || die
+	unpack ${JMI_ZIP}
+
+	# adding mof.xml required by Netbeans
+	# #98603 and #162328
+	cd "${S}/src/javax/jmi/model" || die
+	unpack ${MOF_XML}
+	cp mof-1.0.xml mof.xml || die
+}
+
+java_prepare() {
+	# rename enum keywords because javadoc hates them
+	# even with -source 1.4, bummer
+	epatch "${FILESDIR}/${P}-enum.patch"
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" src -name "*.xml"
+}
diff --git a/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild b/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild
new file mode 100644
index 000000000000..76b58a2abf2c
--- /dev/null
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild
@@ -0,0 +1,51 @@
+# 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
+
+JMI_ZIP="jmi-${PV/./_}-fr-interfaces.zip"
+MOF_XML="mof-${PV}.xml.bz2"
+
+DESCRIPTION="Java Metadata Interface Sample Class Interface"
+HOMEPAGE="http://java.sun.com/products/jmi/"
+
+SRC_URI="mirror://gentoo/${JMI_ZIP}
+		 mirror://gentoo/${MOF_XML}"
+
+LICENSE="sun-bcla-jmi"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+JAVA_SRC_DIR="src"
+
+src_unpack() {
+	mkdir "${S}/src" || die
+	cd "${S}/src" || die
+	unpack "${JMI_ZIP}"
+
+	# adding mof.xml required by Netbeans
+	# #98603 and #162328
+	cd "${S}/src/javax/jmi/model" || die
+	unpack ${MOF_XML}
+	cp mof-1.0.xml mof.xml || die
+}
+
+src_prepare() {
+	default
+
+	# rename enum keywords because javadoc hates them
+	# even with -source 1.4, bummer
+	eapply "${FILESDIR}/${P}-enum.patch"
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" src -name "*.xml"
+}
diff --git a/dev-java/jmi-interface/metadata.xml b/dev-java/jmi-interface/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jmi-interface/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jmock-1.2.0-r1 b/dev-java/jmock-1.2.0-r1
deleted file mode 100644
index 673efab16ff7..000000000000
--- a/dev-java/jmock-1.2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 dev-java/junit:0 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Library for testing Java code using mock objects
-EAPI=5
-HOMEPAGE=http://www.jmock.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=http://www.jmock.org/downloads/jmock-1.2.0-jars.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=06a10d5de7af8dff3dae73e845b68516
diff --git a/dev-java/jmock-2.6.1 b/dev-java/jmock-2.6.1
deleted file mode 100644
index e7b76cd91fdb..000000000000
--- a/dev-java/jmock-2.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Library for testing Java code using mock objects
-EAPI=5
-HOMEPAGE=http://www.jmock.org
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=http://www.jmock.org/downloads/jmock-2.6.1-jars.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=98679b2b15c2147132d83f442abf0285
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
new file mode 100644
index 000000000000..fdd789c787c0
--- /dev/null
+++ b/dev-java/jmock/Manifest
@@ -0,0 +1,6 @@
+AUX jmock-1.2.0-AbstractMo.patch 1189 BLAKE2B d10edde92384c86c2cbf9605cffcf25aa0acbd073e8803b88cccca2b4b94839e28458cb02f647cb492615836e7df02562329fb6135876c2a39fe5bb8fa7766bd SHA512 b4d59d16c2c513031b3b36fc2bdf4526cee8bfa405cac4c2c76d850289a835ba6e57d4e042ed4afe2814a217dcc1493afe80af9fd17fa066d1ada96af6dfa663
+DIST jmock-1.2.0-jars.zip 153214 BLAKE2B 2c40696229018406f3b60559013b73b5331c223da6e2743830c4c9b8b728484b1ebed8fb347c240f50f6936c2fd1e4ee85b754315682047a87a14414effc3a48 SHA512 5290f1d14cbc3d0f223bdaf59716b037dbc021c8f39a3784d13af8d8be3edbddc5e2eb4754b80e78ae954daf12889210183e7e11c110012b4d9320344efe19da
+DIST jmock-2.6.1-jars.zip 1249841 BLAKE2B 87861dad7151000e1397a54d0ded7e49c3fd81fca64afd74d6176436f336be5b5e89f73be8c124cf086798f74aef4972303137529113e3c85ba93353f95e3a42 SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e
+EBUILD jmock-1.2.0-r1.ebuild 986 BLAKE2B a93c5e07830ed1dc6f2b92da16a796452ebfb74411555ea11e15d1ea0d7d8e5e1277184811723f2a44d97085bd879ffdc2a1a08fff1eb30be19a81693e3b1060 SHA512 336584062f37ef805f0320ec17562f9547900c11a0f24d7d450401acb544f1f1954c035e4d1ba5156cf8739d473d880ed5ff61816504258b4d9d4d468edfa675
+EBUILD jmock-2.6.1.ebuild 812 BLAKE2B 3d72677eb23caf056604dc2c799b1344cc38080fad875edbfe87c3e4f6dcb5f94dc7ad6ad8204f58770d1dbfef57061e0a47e84707511d837a71dfbba917d7b2 SHA512 a1cad09703ea22c47a6e898daa43764c708eb2ab400674e7efeb4b0d61451de1d0153495f81d42ccfa23a73ca4884df841f5262a148cf7c284d609874a9624c7
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch b/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
new file mode 100644
index 000000000000..1e3a939d26d3
--- /dev/null
+++ b/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
@@ -0,0 +1,27 @@
+--- src/org/jmock/expectation/AssertMo.java.orig	2015-08-28 10:15:13.490000000 +0000
++++ src/org/jmock/expectation/AssertMo.java	2015-08-28 10:15:22.206000000 +0000
+@@ -73,15 +73,15 @@
+         assertTrue("Should not have verified", threwException);
+     }
+ 
+-    static protected void failNotEquals( String message,
+-                                         Object expected,
+-                                         Object actual ) {
+-        String formatted = "";
+-        if (message != null) {
+-            formatted = message + " ";
+-        }
+-        fail(formatted + "\nExpected:<" + expected + ">\nReceived:<" + actual + ">");
+-    }
++//    static protected void failNotEquals( String message,
++//                                         Object expected,
++//                                         Object actual ) {
++//        String formatted = "";
++//        if (message != null) {
++//            formatted = message + " ";
++//        }
++//        fail(formatted + "\nExpected:<" + expected + ">\nReceived:<" + actual + ">");
++//    }
+ 
+     public static void notImplemented( String mockName ) {
+         throw new NotImplementedException("Not Implemented in " + mockName);
diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..30bbbb34de42
--- /dev/null
+++ b/dev-java/jmock/jmock-1.2.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library for testing Java code using mock objects"
+SRC_URI="http://www.${PN}.org/downloads/${P}-jars.zip"
+HOMEPAGE="http://www.jmock.org/"
+
+LICENSE="BSD"
+SLOT="1.0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+CDEPEND="dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="junit"
+
+src_unpack() {
+	default
+	unpack ${A}
+	unzip "${S}"/"${PN}-core-${PV}.jar" -d src || die
+	mv src "${S}" || die
+}
+
+java_prepare() {
+	find -name "*.class" -delete || die
+	rm *.jar || die
+
+	# This patch isn't changing the behaviour if jmock per se.
+	# Only the formatting is altered.
+	epatch "${FILESDIR}"/"${P}-AbstractMo.patch"
+}
diff --git a/dev-java/jmock/jmock-2.6.1.ebuild b/dev-java/jmock/jmock-2.6.1.ebuild
new file mode 100644
index 000000000000..2213fe41255e
--- /dev/null
+++ b/dev-java/jmock/jmock-2.6.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library for testing Java code using mock objects"
+SRC_URI="http://www.jmock.org/downloads/${P}-jars.zip"
+HOMEPAGE="http://www.jmock.org"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/hamcrest-library:1.3
+	dev-java/junit:4"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3,junit-4"
+
+S="${WORKDIR}/${P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	unzip ${P}.jar -d src || die
+	rm *.jar || die
+}
+
+src_prepare() {
+	find -name "*.class" -delete || die
+}
diff --git a/dev-java/jmock/metadata.xml b/dev-java/jmock/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jmock/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jna-3.4.1 b/dev-java/jna-3.4.1
deleted file mode 100644
index e6fa2709b11b..000000000000
--- a/dev-java/jna-3.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=virtual/libffi >=virtual/jdk-1.6 virtual/pkgconfig test? ( dev-java/junit:0 dev-java/ant-core:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Native Access (JNA)
-EAPI=5
-HOMEPAGE=https://github.com/twall/jna#readme
-IUSE=+awt +nio-buffers elibc_FreeBSD test doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/libffi >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-REQUIRED_USE=test? ( awt nio-buffers )
-SLOT=0
-SRC_URI=https://github.com/twall/jna/tarball/3.4.1 -> jna-3.4.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0bf1b8ef6b2eccdd25521471d09e46ee
diff --git a/dev-java/jna-4.2.2-r1 b/dev-java/jna-4.2.2-r1
deleted file mode 100644
index 6509300c8305..000000000000
--- a/dev-java/jna-4.2.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=virtual/libffi >=virtual/jdk-1.7 x11-libs/libXt virtual/pkgconfig test? ( dev-java/ant-junit:0 dev-java/guava:20 dev-java/javassist:3 dev-java/reflections:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Native Access (JNA)
-EAPI=6
-HOMEPAGE=https://github.com/twall/jna
-IUSE=+awt +nio-buffers test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/libffi >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-REQUIRED_USE=test? ( awt nio-buffers )
-RESTRICT=test
-SLOT=4
-SRC_URI=https://github.com/twall/jna/archive/4.2.2.tar.gz -> jna-4.2.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=919371f98032943ea0df91d486e9edaf
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
new file mode 100644
index 000000000000..d15ec586e86d
--- /dev/null
+++ b/dev-java/jna/Manifest
@@ -0,0 +1,7 @@
+AUX 4.2.2-build.xml.patch 819 BLAKE2B 5f411361cd566360206c996ff5c2c508e829e41bb56868dce428da1347ab91f7fc8e1230b6aca3e82806c80b23a038966f690a16f99b43b5b2594bca543cb606 SHA512 8d2e0552690c9282ce93e39aa489c1fd829e5e63e39c6e6db935b6b5e2308a3ee3cbe1a274ebf2ba59d9819dd4f618d89e22194a9f88dec0763d2a36cd3ca44e
+AUX 4.2.2-makefile-flags.patch 925 BLAKE2B 642982867b5c187345123725f5e19bccb363915aefc5ea6e69f02e9ca86efee1e5f466c7cb9abf1b2871a735c45f8b7adaf999e42a351e01e515ecdc6648387e SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54
+DIST jna-3.4.1.tar.gz 35285043 BLAKE2B 192f893f25c692a80d8b3ea0b469e951ef45ea561a02f1ec2ac8292f37ac32df468c7bb04211f1009314da4d7acba8ab9220114980b3f30b56af5f2310d5a18a SHA512 8164de9d213f670e6408627ec13fc128802351c2b906e1e1e95fd3280917ef1eba24d8b6b913a9df8034d20a5d46f6f823b5ee2d18b83248093a1855c89c5917
+DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
+EBUILD jna-3.4.1.ebuild 2294 BLAKE2B 9f9fe1c1498fe1e9d61d18a060d4110edb2c20f2f2ef87b3d0ea659f2c2205df2b02744eae9bf550f4868a8a1a8075d95caada773b6f42faa813475d36da08c3 SHA512 c81cbf7dfb8d3a54833a41f94fd763e7d6945c526a1651900c709514fbc3b32008f71de229e73188bf483f491dffd7b5778d9e6e4a6832defa89ae03f5961320
+EBUILD jna-4.2.2-r1.ebuild 2076 BLAKE2B b85f776feb0e705df3ca22af489d9095c30bd5085f08619de393edc8401ff4f1494d33988607b8c7cd815fd2ca0a03888723d87e93dee1a1d2a4aa85fb02fa8a SHA512 6b6485c517432b2e03c620dcab0fbec437dda6dfffe856b097d9bb71d9ba64a97609fd2f84afd152b14f2c3acc3c52ce67e701e2f026ceaff056c5185202c135
+MISC metadata.xml 462 BLAKE2B 7ad9e0cb48ce7fdfae4bdc10bf3cb6d6c25a7f86d62dbb9041d0ad2fe04409477eb27754b5f53218fba657f7ed77b423b34bea92bffb61c37ee2eefdcccc3a3b SHA512 88a027ef32c55e551625950ecb2efffc75a7611568f11a4abdcddd4fe24b894eb7d8fb805cba3fc0f79ddf6fae6116804790fc24b3d5b6097ade9ad92ed4c118
diff --git a/dev-java/jna/files/4.2.2-build.xml.patch b/dev-java/jna/files/4.2.2-build.xml.patch
new file mode 100644
index 000000000000..de49c24b1912
--- /dev/null
+++ b/dev-java/jna/files/4.2.2-build.xml.patch
@@ -0,0 +1,23 @@
+--- a/build.xml	2016-03-16 14:37:28.000000000 +0000
++++ b/build.xml	2016-04-16 22:22:27.692967205 +0100
+@@ -320,7 +320,9 @@
+       <pathelement path="${build}/${jar}"/>
+       <pathelement path="${test.classes}"/>
+       <pathelement path="${build}/${testjar}"/>
++      <!--
+       <pathelement path="lib/clover.jar"/>
++      -->
+       <path refid="test.libs"/>
+     </path>
+   </target>
+@@ -909,8 +911,10 @@
+     <mkdir dir="${build}/jws"/>
+     <copy todir="${build}/jws" file="${build}/${jar}"/>
+     <copy todir="${build}/jws" file="${build}/${testjar}"/>
++    <!--
+     <copy todir="${build}/jws" file="lib/junit.jar"/>
+     <copy todir="${build}/jws" file="lib/clover.jar"/>
++    -->
+     <jar jarfile="${build}/jws/jnidispatch.jar">
+       <fileset dir="${build.native}" includes="*jnidispatch.*"/>
+     </jar>
diff --git a/dev-java/jna/files/4.2.2-makefile-flags.patch b/dev-java/jna/files/4.2.2-makefile-flags.patch
new file mode 100644
index 000000000000..3e290ece4e78
--- /dev/null
+++ b/dev-java/jna/files/4.2.2-makefile-flags.patch
@@ -0,0 +1,25 @@
+--- a/native/Makefile	2016-03-16 14:37:28.000000000 +0000
++++ b/native/Makefile	2016-04-16 22:27:06.426345376 +0100
+@@ -81,7 +81,7 @@
+ LIBSFX=.so
+ ARSFX=.a
+ JNISFX=$(LIBSFX)
+-CC=gcc
++CC?=gcc
+ LD=$(CC)
+ LIBS=
+ # Default to Sun recommendations for JNI compilation
+@@ -94,10 +94,10 @@
+ COUT=-o $@
+ CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
+ CDEFINES=-D_REENTRANT
+-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
+-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
++PCFLAGS=-Wall -Wno-unused -Wno-parentheses
++CFLAGS+= $(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
+        -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
+-LDFLAGS=-o $@ -shared
++LDFLAGS+= -o $@ -shared
+ ifeq ($(DYNAMIC_LIBFFI),true)
+ CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
+ LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
new file mode 100644
index 000000000000..0a2dbc3a57ed
--- /dev/null
+++ b/dev-java/jna/jna-3.4.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="test doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic vcs-snapshot
+
+DESCRIPTION="Java Native Access (JNA)"
+HOMEPAGE="https://github.com/twall/jna#readme"
+SRC_URI="https://github.com/twall/jna/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+awt +nio-buffers"
+REQUIRED_USE="test? ( awt nio-buffers )"
+
+CDEPEND="
+	virtual/libffi"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	virtual/pkgconfig
+	test? (
+		dev-java/junit:0
+		dev-java/ant-core:0
+		dev-java/ant-junit:0
+	)"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="jar contrib-jars"
+
+java_prepare() {
+	# This jar is needed for some tests.
+	# So let's make a copy of it.
+	cp lib/clover.jar "${T}" || die
+
+	find -name "*.jar" -exec rm -v {} + || die
+	rm -r native/libffi || die
+	mkdir -p doc/javadoc || die
+
+	# and restore it.
+	cp "${T}"/clover.jar lib || die
+
+	# Build to same directory on 64-bit archs.
+	mkdir build || die
+	ln -snf build build-d64 || die
+
+	if ! use awt ; then
+		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die
+	fi
+
+	if ! use nio-buffers ; then
+		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die
+	fi
+}
+
+EANT_EXTRA_ARGS="-Ddynlink.native=true"
+
+EANT_TEST_ANT_TASKS="ant-junit ant-core"
+src_test() {
+	local sysprops=""
+
+	# crashes vm (segfault)
+	sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java || die
+
+	# crashes vm, java 7 only (icedtea-7,  oracle-jdk-bin-1.7)
+	sed -i -e 's|testGCCallbackOnFinalize|no&|' test/com/sun/jna/CallbacksTest.java || die
+
+	sysprops+=" -Djava.awt.headless=true"
+	sysprops+=" -Djava.io.tmpdir=${T}" #to ensure exec mount
+
+	mkdir -p lib || die
+	java-pkg_jar-from --into lib --build-only junit
+
+	# need to use _JAVA_OPTIONS or add them to the build.xml. ANT_OPTS won't
+	# survive the junit task.
+	_JAVA_OPTIONS="${sysprops}" java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	java-pkg_dojar contrib/platform/dist/platform.jar
+	java-pkg_doso build/native/libjnidispatch.so
+	use source && java-pkg_dosrc src/com
+	use doc && java-pkg_dojavadoc doc/javadoc
+}
diff --git a/dev-java/jna/jna-4.2.2-r1.ebuild b/dev-java/jna/jna-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..4e55ccbbcd70
--- /dev/null
+++ b/dev-java/jna/jna-4.2.2-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="Java Native Access (JNA)"
+HOMEPAGE="https://github.com/twall/jna"
+SRC_URI="https://github.com/twall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="+awt +nio-buffers test"
+REQUIRED_USE="test? ( awt nio-buffers )"
+
+# The tests stall immediately on some systems (not current stable?) when
+# the sandbox is active but pass successfully otherwise. Chewi has not
+# been able to determine why. This began in 4.2.0 as 4.1.0 worked
+# fine. Someone bisect it please. :)
+RESTRICT="test"
+
+CDEPEND="virtual/libffi"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	x11-libs/libXt
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit:0
+		dev-java/guava:20
+		dev-java/javassist:3
+		dev-java/reflections:0
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-build.xml.patch
+	"${FILESDIR}"/${PV}-makefile-flags.patch
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="native jar contrib-jars"
+EANT_EXTRA_ARGS="-Ddynlink.native=true"
+EANT_TEST_EXTRA_ARGS="-Dheadless=true -Djava.io.tmpdir=${T}"
+EANT_TEST_GENTOO_CLASSPATH="guava-20,javassist-3,reflections"
+
+src_prepare() {
+	default
+
+	# delete bundled jars and copy of libffi
+	# except native jars because build.xml needs them all
+	find ! -path "./lib/native/*" -name "*.jar" -delete || die
+	rm -r native/libffi || die
+
+	if ! use awt ; then
+		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die
+	fi
+
+	if ! use nio-buffers ; then
+		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die
+	fi
+
+	java-pkg-2_src_prepare
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	java-pkg_newjar build/${PN}-min.jar
+	java-pkg_dojar contrib/platform/dist/${PN}-platform.jar
+	java-pkg_doso build/native-*/libjnidispatch.so
+
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc doc/javadoc
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/jna/metadata.xml b/dev-java/jna/metadata.xml
new file mode 100644
index 000000000000..ceb3d23251bb
--- /dev/null
+++ b/dev-java/jna/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <use>
+    <flag name="awt">Enables support for Java AWT</flag>
+    <flag name="nio-buffers">Enables support for NIO buffers</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">twall/jna</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jnlp-api-6.0.18 b/dev-java/jnlp-api-6.0.18
deleted file mode 100644
index c698dbdc66b4..000000000000
--- a/dev-java/jnlp-api-6.0.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JNLP API classes, repackaged from the icedtea-web fork of netx
-EAPI=4
-HOMEPAGE=http://jcp.org/en/jsr/detail?id=56
-IUSE=source elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~caster/distfiles/jnlp-api-6.0.18.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=35679f87fc2b42085c5a30dd7bf04d8c
diff --git a/dev-java/jnlp-api/Manifest b/dev-java/jnlp-api/Manifest
new file mode 100644
index 000000000000..eeba35d1bfe2
--- /dev/null
+++ b/dev-java/jnlp-api/Manifest
@@ -0,0 +1,3 @@
+DIST jnlp-api-6.0.18.tar.bz2 10518 BLAKE2B c5e9f1c3f14dac45c2bdd979844ff3a49f573c6a79010d3b412086a2496ca7429a8ecd6211224c934cba90f40f7cc903fe23715006570e5876a504070ac797d8 SHA512 e3b7ed5092255b665feac2c37341be81bd71c1f2c925851338f1dbfb05bf1e1a8f09f5fea63c08ca1e737db7072b6ee25ec55cfaa18789e40101d6930785209f
+EBUILD jnlp-api-6.0.18.ebuild 605 BLAKE2B 62e3b429e0b6a120c6b95aa6a6dc76d7162b524f764345a43d0801867ab7253647afa5b8aa7be7e20942fd2c611f0715884585123f591617638eac1a8fb9100e SHA512 a8082c8a10c131d5609968018bd07a04d35495a8ab5260229a91970ced0a23e3cad00e33b01606763da38a888b9199d69d2b0ffce4c11b1d2db349ea1b6aac29
+MISC metadata.xml 353 BLAKE2B 6a6cf692b1e5a04174a9bd865d146d766aaf581affb8f98c389ced1186f6f31645df53ba7306f4f210668f3b53bd9cac496bba2045091b11a6c0f41d8a846191 SHA512 488871f2e58d0fc66bc3ddeb7f6ad7a62be17716e5af4f33cde5e2c755afa760e25ee935f50a186a32dc91a3e74ec635cc84d59dcdb6c2ee8f6bf67cf5588d0a
diff --git a/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild b/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild
new file mode 100644
index 000000000000..394507a13802
--- /dev/null
+++ b/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JNLP API classes, repackaged from the icedtea-web fork of netx"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=56"
+SRC_URI="https://dev.gentoo.org/~caster/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="source"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use source && java-pkg_dosrc javax
+}
diff --git a/dev-java/jnlp-api/metadata.xml b/dev-java/jnlp-api/metadata.xml
new file mode 100644
index 000000000000..e1ef333647f0
--- /dev/null
+++ b/dev-java/jnlp-api/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+	JNLP API classes (javax/jnlp), repackaged from the icedtea-web fork of netx.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jnr-constants-0.8.6 b/dev-java/jnr-constants-0.8.6
deleted file mode 100644
index 97d799a01749..000000000000
--- a/dev-java/jnr-constants-0.8.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A set of platform constants (e.g. errno values)
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-constants
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jnr/jnr-constants/archive/jnr-constants-0.8.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9243686962c9cc1bdc71e39dafbfb165
diff --git a/dev-java/jnr-constants/Manifest b/dev-java/jnr-constants/Manifest
new file mode 100644
index 000000000000..a4cd0074b70d
--- /dev/null
+++ b/dev-java/jnr-constants/Manifest
@@ -0,0 +1,4 @@
+AUX jnr-constants_maven-build.xml 11304 BLAKE2B fad6aa5bfb222be73e0c064802dfabf5370562de03db80c2c35c03423e6829e11622cbb1a87f92929de9a8f2b70c3dfc039071c5e9c1cc5b27e40289a3f92fca SHA512 ebe66da46f9d80e02361a895c2aba7b635cf0a4e550f7a4f4c5534684bcf06585b43458381d6a3dc526d0f020b96bf93a259d2b4b6125c23e5d6d571a373ce2f
+DIST jnr-constants-0.8.6.tar.gz 71080 BLAKE2B db86f3c0347b85dd56de72465c4198e74faa877b8a1373ab378728945edaf0c45748ed707e6b591224858f498ae7d43269d8127cb61b7ac2893ef9817e36ca1c SHA512 2098f8e1869b9c018ba3afa70ef386fce2609d9c650ee851dcd7cf7dc9d4d87dbe26886eb2e744d96cc11425f6b66144a018826360b7bab48a4b99e323f3717a
+EBUILD jnr-constants-0.8.6.ebuild 1058 BLAKE2B 512071e039a49fe64ae6432bd51979a1c3e13abf3cd655570f9aba4c74fb66df9eb433014f191d676aa79d7a04ae70394905f72dd812414e74f4d359853199a6 SHA512 d1fe0d566c5b8749bea6015a5cf6955763d187e48d4855147b9660a87dd8f0231f4a678080569f5b0b6ab48024d61948b232a0ef23451420c6969e2ad830d985
+MISC metadata.xml 328 BLAKE2B 88a26057d4d65c999414a6af378f9328a541d3dd83b36c9d22a0bc27415186981ba9cb7286b2bbea7fc5d7d3849f2eb6f15ef2e30e4b0b7d5b19917899424d39 SHA512 1d1c798e6e0c6443cd8e1bae74248d22b7daed826174cd97b1f9471113421e8aea7dea46b98f59f79ed47386a297edaa16ce26099af500e4e4b766d6976df008
diff --git a/dev-java/jnr-constants/files/jnr-constants_maven-build.xml b/dev-java/jnr-constants/files/jnr-constants_maven-build.xml
new file mode 100644
index 000000000000..75f8458ee2c2
--- /dev/null
+++ b/dev-java/jnr-constants/files/jnr-constants_maven-build.xml
@@ -0,0 +1,259 @@
+<?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 1/11/12 12:52 PM                      -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jnr-constants-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="jnr-constants-0.8.2"/>
+  <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"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.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.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </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.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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"/>
+  </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}/junit/junit/4.8.2"/>
+    <get src="http://repository.jboss.com/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://snapshots.jboss.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repository.jboss.org/maven2//junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repository.jboss.org/nexus/content/groups/public-jboss//junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
new file mode 100644
index 000000000000..3f8c33be960e
--- /dev/null
+++ b/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A set of platform constants (e.g. errno values)"
+HOMEPAGE="https://github.com/jnr/jnr-constants"
+# SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+S="${WORKDIR}/${PN}-${P}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_ENCODING="UTF-8"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jnr-constants/metadata.xml b/dev-java/jnr-constants/metadata.xml
new file mode 100644
index 000000000000..337019727399
--- /dev/null
+++ b/dev-java/jnr-constants/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jnr/jnr-constants</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jnr-enxio-0.7-r1 b/dev-java/jnr-enxio-0.7-r1
deleted file mode 100644
index fa77f0e2a3ef..000000000000
--- a/dev-java/jnr-enxio-0.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Native Runtime Enhanced X-platform I/O
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-enxio
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jnr/jnr-enxio/archive/0.7.tar.gz -> jnr-enxio-0.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0360ef646c8255ea1ce04044b644bcff
diff --git a/dev-java/jnr-enxio/Manifest b/dev-java/jnr-enxio/Manifest
new file mode 100644
index 000000000000..1ce1e469b847
--- /dev/null
+++ b/dev-java/jnr-enxio/Manifest
@@ -0,0 +1,4 @@
+AUX jnr-enxio-0.7-build.xml 17106 BLAKE2B b008c295c93839e2bd7086199b4b81c96adcda8ad26e33ece7b0a061b53041e6f481bc73db290d1d9fb15f7bed5a1a3649b79ad20cbcdef299ca6544bc1c2c4a SHA512 e655b5c8900ef050f45fc2a59dbfea520061fad94380d2e43757ed35f676a59f0816d006b4c6c3100cb063c29b44eb6e168edee65027a4a86f9c523ba018ba5e
+DIST jnr-enxio-0.7.tar.gz 10520 BLAKE2B 762c36ad59473d6be4f2c2b8c62ce489fe46ce30afe9b32101aa41ab703c50247cfa0908499f8c2fa79c2ac8c33972abe203984c5cbbe5111416e4684e4c79ed SHA512 ed8c13ae4de2334aa9ddd9a13534e0c49fb1bde48e3bd5085a62c96f2b9fe6970b4ba08fe6b27901c5e6db1b360511265ac276ca56f89fddf5e18db9726bd834
+EBUILD jnr-enxio-0.7-r1.ebuild 941 BLAKE2B 5e3cc61f215fa1432d6d2a01ba4099d54883fdda044e50f5323e75546b7ff602ac741913532c34efe1c0323639b6ee0c3be9c43de58e340d64a5e47777d3b12b SHA512 e3457d222de26e86948170130453b6470c5f7e63d7e01cf5f42c39389c775bb6322523e93f3d589d99ab8a31b8a39fa0a25d73e1938709207df742c16423c12f
+MISC metadata.xml 324 BLAKE2B 9ce9c50c39995314b7a5efe205cb2ef789c6745ac1033792b3fcd2935a0329fd788321481e92a7d468483c73cd87416f2476502097c61854c1dfd97fedde1882 SHA512 6f93b386f5899bf9771f983da31cccd57811bbb3b5691c71698f5a09915e448ad7ba4258da0cf1781d589fbf40611340034048b327b0242bdfcd06fcaa4c1578
diff --git a/dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml b/dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml
new file mode 100644
index 000000000000..efdb518451e1
--- /dev/null
+++ b/dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml
@@ -0,0 +1,320 @@
+<?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 6/6/13 12:27 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jnr-enxio-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="jnr-enxio-0.7"/>
+  <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}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <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"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.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.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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"/>
+  </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}/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"/>
+    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm/4.0"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm/4.0/asm-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-commons/4.0"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-tree/4.0"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-util/4.0"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild b/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild
new file mode 100644
index 000000000000..a5257b885a5e
--- /dev/null
+++ b/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Native Runtime Enhanced X-platform I/O"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/jnr/jnr-enxio"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+LICENSE="Apache-2.0"
+
+CDEPEND="dev-java/jnr-constants:0
+	dev-java/jnr-ffi:2"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-2"
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use source && java-pkg_dosrc src/main/java/jnr
+	use examples && java-pkg_doexamples src/main/java/jnr/enxio/example
+	use doc && java-pkg_dojavadoc target/site/apidocs
+}
diff --git a/dev-java/jnr-enxio/metadata.xml b/dev-java/jnr-enxio/metadata.xml
new file mode 100644
index 000000000000..8dadb2bd8904
--- /dev/null
+++ b/dev-java/jnr-enxio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jnr/jnr-enxio</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jnr-ffi-2.0.2 b/dev-java/jnr-ffi-2.0.2
deleted file mode 100644
index bc6e076c4456..000000000000
--- a/dev-java/jnr-ffi-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An abstracted interface to invoking native functions from java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-ffi
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/jnr/jnr-ffi/archive/2.0.2.tar.gz -> jnr-ffi-2.0.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=faff1779f73f0b98ba3ba3099804757b
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
new file mode 100644
index 000000000000..53c3b13d11e5
--- /dev/null
+++ b/dev-java/jnr-ffi/Manifest
@@ -0,0 +1,5 @@
+AUX jnr-ffi-2.0.2-junit48.patch 467 BLAKE2B 1f1e76e18f425e1a38dfc0b1788239329a58fb9944958045877115d375c65437660a2fa114cec2bbc3ad3b74b94d38a6b34d6ea142ec0aa12f9ba88638d14894 SHA512 e7b5bb64d65b432a028fa709e4e050feccd4f3023fa6d940f89a2ef67f489f8eeb6dfb87c08eb056f47f4a5019c875225013ca559eb065cca105d54f51b5e884
+AUX jnr-ffi_maven-build.xml 11211 BLAKE2B 94c92f033d7cb90db11123846cffb1e7532d197eaa739cac6da256159fe030c1d90d57e991a292d9f1511e57800a37d6791037afd72349529e045a6db6572c1b SHA512 612b793b664b71e1a1b924aabe2da16c6b0b70947640b3d5b6d6994ffecfd7c0b30991b3a2bb711130052870dd63b9d41f43a54221e52017510119c5d3e4f359
+DIST jnr-ffi-2.0.2.tar.gz 170707 BLAKE2B fc4f1dcea51939b6098b980b4962380e58ba590ea9d4cdba7823c1372bd645d985ae25d8ebf1f0b575a0e4b5c192e5595094076d3cd44e4bb3c077dd838c170f SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0
+EBUILD jnr-ffi-2.0.2.ebuild 1388 BLAKE2B 7fb54bdd6719f9d8af1cefa11c6560a438367855f8f6a4d28213156ef2a77808b15d77c951e7e93709931c083db4e3630f0d06ea31bc15323a052800235df847 SHA512 6a3d4b402eb4b8e6ad0e80509e510414c3936bcd7f176e2f17179d117aabcf6adf50d53cc28c2744a21eec0c5606494c8501060c6ef88b3bb1265ec408604c25
+MISC metadata.xml 322 BLAKE2B fbb6e5b91a2b8063f428a956f45150d6cb487f98ad9bb6f8222ea6b923d1d67b35373febaf6d2ab53b5411bb27ff07eb5012601114b7a51afa7bf3e362966a7c SHA512 522ccfcd9fc4871e9dccf2c2bb56fac98f695fe999f0967f1e689d24bba779c2c9e8cf657c68b1be9ad54861fd70778c0f1c8b2bb7da589085660f0882896efb
diff --git a/dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch b/dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch
new file mode 100644
index 000000000000..92b4cb2bcfc3
--- /dev/null
+++ b/dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch
@@ -0,0 +1,11 @@
+--- a/src/test/java/jnr/ffi/ObjectReferenceManagerTest.java
++++ b/src/test/java/jnr/ffi/ObjectReferenceManagerTest.java
+@@ -35,7 +35,7 @@
+         Pointer ptr = referenceManager.add(bar);
+         Pointer ptr2 = referenceManager.add(bar2);
+         assertNotSame(ptr, ptr2);
+-        assertNotEquals(ptr, ptr2);
++        assertTrue(!ptr.equals(ptr2));
+         assertSame(bar, referenceManager.get(ptr));
+         assertSame(bar2, referenceManager.get(ptr2));
+     }
diff --git a/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml b/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml
new file mode 100644
index 000000000000..0337f347bec0
--- /dev/null
+++ b/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml
@@ -0,0 +1,250 @@
+<?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 1/9/12 11:18 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jnr-ffi-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="jnr-ffi-0.6.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}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11-native.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.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.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </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.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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"/>
+  </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">
+  <!-- removed -->
+  </target>
+
+</project>
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
new file mode 100644
index 000000000000..c5807844d596
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="https://github.com/jnr/jnr-ffi"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="2"
+KEYWORDS="amd64 ~arm64 x86"
+
+COMMON_DEP="
+	dev-java/jffi:1.2
+	dev-java/jnr-x86asm:1.0
+	dev-java/asm:4"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${P}-junit48.patch
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jnr-ffi/metadata.xml b/dev-java/jnr-ffi/metadata.xml
new file mode 100644
index 000000000000..8554bb04eb46
--- /dev/null
+++ b/dev-java/jnr-ffi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jnr/jnr-ffi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jnr-netdb-1.1.4 b/dev-java/jnr-netdb-1.1.4
deleted file mode 100644
index a55e8b5c4cbc..000000000000
--- a/dev-java/jnr-netdb-1.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/jnr-ffi:2 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Network services database access for java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-netdb
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=https://github.com/jnr/jnr-netdb/archive/1.1.4.tar.gz -> jnr-netdb-1.1.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=803a3b7c5b99814db1ba91503f0cde57
diff --git a/dev-java/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
new file mode 100644
index 000000000000..7e27928c05f3
--- /dev/null
+++ b/dev-java/jnr-netdb/Manifest
@@ -0,0 +1,4 @@
+AUX jnr-netdb_maven-build.xml 9637 BLAKE2B 0ee947467fc1c8e07d2b98fb29a70de5244e4a92895018f8eb4860413a2c96ab6d5599f1eb39a45f4c43a09e1d6d0c7c1737416f7afbd205d397da17a257d3e5 SHA512 befe514fd332f5eb6495404b0f0d8edc428be34a1745b16dd2a20d2b859d251670e549036099884a810e3b5da0c6a4d311b6b0691409cae1b6c14d20ee763d24
+DIST jnr-netdb-1.1.4.tar.gz 648347 BLAKE2B 08953f93fe4a6146dfc77c463e07a8b9f6e784ffc26165d7409a623756733a7598b4d0a3fa55302b5f9b01c870cee3062f310c74e20f6a8a11ff1b41d38a0d7a SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195
+EBUILD jnr-netdb-1.1.4.ebuild 1133 BLAKE2B f430a9d005436b6d4c6e0ff567bb2c0155d6896a022526bbf4f2b84ab4b09cdda598a2d1d4079fe12b73e1c9afb6808f6c027e023fd1cd45fdf365c9636fd09f SHA512 8083073e3f32192e19787ca01b05278c9e0b7d58016d0018202bbc05a5a6beccadcf543e710d59acf0250cd9526ae7a527438f7daf6765ac4099e76f4afed0e4
+MISC metadata.xml 661 BLAKE2B d7028fb370aa95b7aa2eedc3e40a3456b8f7cc675de2d0a1eea8fe3d1871a8b9964cfbe27469fec1a28b74f50ff9b90368a82a76762aaf88fc9e78fc377c4b95 SHA512 0c7660f9c73bfbfb9bb766443d175a817e21be2113beed0d2167d3cd630dad0d89efe7ca14808f0db621549836515ad05f1c40f826e0e6c2801d456fdb5b1428
diff --git a/dev-java/jnr-netdb/files/jnr-netdb_maven-build.xml b/dev-java/jnr-netdb/files/jnr-netdb_maven-build.xml
new file mode 100644
index 000000000000..9f4dfef15335
--- /dev/null
+++ b/dev-java/jnr-netdb/files/jnr-netdb_maven-build.xml
@@ -0,0 +1,231 @@
+<?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/28/12 5:31 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jnr-netdb-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jnr-netdb"/>
+  <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.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+  </path>
+  <path id="build.test.classpath">
+  </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.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </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.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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"/>
+  </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">
+  </target>
+
+</project>
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
new file mode 100644
index 000000000000..8bb9e68cb34c
--- /dev/null
+++ b/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Network services database access for java"
+HOMEPAGE="https://github.com/jnr/jnr-netdb"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="amd64 ~arm64 x86"
+
+COMMON_DEP="
+	dev-java/jnr-ffi:2"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="jnr-ffi-2"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	dodoc README
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jnr-netdb/metadata.xml b/dev-java/jnr-netdb/metadata.xml
new file mode 100644
index 000000000000..b9e170aa3d0d
--- /dev/null
+++ b/dev-java/jnr-netdb/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		jnr-netdb is a java interface to getservbyname(3), getservbyport(3).
+
+		It tries to use the native functions if possible, falling back to
+		parsing
+		/etc/services directly, and finally to an inbuilt table for use in
+		environments
+		where neither native code, nor filesystem access is possible.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jnr/jnr-netdb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jnr-posix-3.0.10 b/dev-java/jnr-posix-3.0.10
deleted file mode 100644
index 3640dd6cd52e..000000000000
--- a/dev-java/jnr-posix-3.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jdk-1.6 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-posix
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=https://github.com/jnr/jnr-posix/archive/3.0.10.tar.gz -> jnr-posix-3.0.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a51f761d28c7f4af6d0038aa4b0dc1f0
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
new file mode 100644
index 000000000000..4cc836396ea2
--- /dev/null
+++ b/dev-java/jnr-posix/Manifest
@@ -0,0 +1,4 @@
+AUX jnr-posix_maven-build.xml 11760 BLAKE2B ec75beb884ccb81dc28c38db22e64953a6f536726105e2fec5cd38f7be2286091054026d6cf77471d03f5095c44087d8f7fe9d3065d31df26b018988a843fe39 SHA512 ab3f6b00e08cd7fff5f44df1c2a0eb9e73d3ad7400e6e708dcd1432b6ad122bfb0b8dac6417eb67a02d0fc2d19477d81287d2b202275676826081610d3e27d8e
+DIST jnr-posix-3.0.10.tar.gz 85912 BLAKE2B b87ff78ccf10718bd1faf9e308421ba3ab5e90dee5e244fb1b7f53592da8ad98973cc50e6469bcea59e1202ee82b3f77522eb95e23584ff70cc66099ef1c4266 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1
+EBUILD jnr-posix-3.0.10.ebuild 1241 BLAKE2B 00b01e8f5a6426c41dd2b9c31528d7bed51ff75d1a27f9faf333d0adb7d1e0af0e4439a82bea687cb073881360a94545725c7f34fc161c8b43999b38b19dae35 SHA512 a89817b0b1217cf3abc7ab01a58167f7fdb860e0e90794fa025cdcbc236e82763c1f7134cfe3830b51ba67bed21d3d00e63052c959d7551a8f4370bf3eef8892
+MISC metadata.xml 324 BLAKE2B 98f9bbfdf432f6b77c1d08d6ed8295badcbe27ddf46d57a8cf4ef12c8d469e83872e66e729bddf47191846d0deb1844ac65ae44e286c7f51e2d9422d75035edc SHA512 9f314e4997f05bf23bab85356f0c39bbcec2158d8ff566ba5ab6221ac076c46e8d8e1474b05b2fc25cad4b8d95b40a3d01b08858c0e4325449520d7042ab2eb2
diff --git a/dev-java/jnr-posix/files/jnr-posix_maven-build.xml b/dev-java/jnr-posix/files/jnr-posix_maven-build.xml
new file mode 100644
index 000000000000..82260e156394
--- /dev/null
+++ b/dev-java/jnr-posix/files/jnr-posix_maven-build.xml
@@ -0,0 +1,256 @@
+<?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 1/9/12 10:58 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jnr-posix-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="jnr-posix-2.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}/com/github/jnr/jnr-ffi/0.6.0/jnr-ffi-0.6.0.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11-native.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.2/jnr-constants-0.8.2.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/0.6.0/jnr-ffi-0.6.0.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11-native.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.2/jnr-constants-0.8.2.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.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </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.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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" 
+         manifest="MANIFEST.MF" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </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">
+    <!-- removed -->
+  </target>
+
+</project>
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
new file mode 100644
index 000000000000..d42fb953dfb4
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
+HOMEPAGE="https://github.com/jnr/jnr-posix"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="3.0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+CDEPEND="dev-java/jnr-constants:0
+	dev-java/jnr-ffi:2"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-2"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	dodoc README.txt
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jnr-posix/metadata.xml b/dev-java/jnr-posix/metadata.xml
new file mode 100644
index 000000000000..e649bf08d80f
--- /dev/null
+++ b/dev-java/jnr-posix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jnr/jnr-posix</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jnr-unixsocket-0.6-r1 b/dev-java/jnr-unixsocket-0.6-r1
deleted file mode 100644
index 850e48b11c79..000000000000
--- a/dev-java/jnr-unixsocket-0.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-posix:3.0 dev-java/jnr-ffi:2 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Unix sockets for Java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-unixsocket
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-posix:3.0 dev-java/jnr-ffi:2 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jnr/jnr-unixsocket/archive/0.6.tar.gz -> jnr-unixsocket-0.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7836e09796f994737a1d4ea8bd46cd86
diff --git a/dev-java/jnr-unixsocket/Manifest b/dev-java/jnr-unixsocket/Manifest
new file mode 100644
index 000000000000..bf0ead6449b3
--- /dev/null
+++ b/dev-java/jnr-unixsocket/Manifest
@@ -0,0 +1,4 @@
+AUX jnr-unixsocket-0.6-build.xml 17192 BLAKE2B fc3e951c539e98bb9d47a32e232a1838c90e4f25ab04756884ff7fd8ae079df9400e204b99e503af3bc12bc7565bcff681920c3b22d786ee7574544094ba0758 SHA512 d9d33107fa8d28ff5630e806a6a0415cba0fb0962520918f6e6373163a6eefb6ad58a4c3a1f87ca041f6c0dfc48c5bee95e729d591472199b8f07153f9ca9426
+DIST jnr-unixsocket-0.6.tar.gz 6756 BLAKE2B a011f3f660526b0a7e4973a5e2168f9b0ee8a408ad2c9c1b622d9aae7659d915e258a0588f010fb56e0ac5740590b89988d77579884930f70675aff4ffe056bf SHA512 93ceb4f90b259c94eb0a68f13da1bbdae547b77637102fc36b9aa4427ed079bca1e9d503579c52cb4ea591bf67df30efcb99c6c4d71e7545cc6ff35f5ca65249
+EBUILD jnr-unixsocket-0.6-r1.ebuild 999 BLAKE2B b4c078dd766043c55711f70dc47a59ed023dec0d0e3f3e994b366bcc8427a4b91ea52f46b8fb4ecb496d0e3efb99aae28c5330e2aa397d0512e142048e976ed0 SHA512 3ca6ba21c64f3dec69f2478258c086c54ad609bbc56a7c07293c13439267968682cede11d7e3ca17649df02004c6ff8dcd23ea49408f01a44d795dbe56aa4908
+MISC metadata.xml 329 BLAKE2B cc3005b976a8f341229241eaf4c7b306faa59fd2b87b52ab642c9b6adf9109957a1de9fed60491136656ce5ada99f2d58f145ed8c6d972f95fd7521564b68949 SHA512 e895c2ce843a28901420e7d8dcf279442cb3f419b49e7619464d300f9259d0e71bad90658a553163ce3901d8f0879cb948a896f4c8e8c42c949a1ff8fa6dc435
diff --git a/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml b/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml
new file mode 100644
index 000000000000..4ef23a7785e3
--- /dev/null
+++ b/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml
@@ -0,0 +1,321 @@
+<?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 6/6/13 12:11 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jnr-unixsocket-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="jnr-unixsocket-0.6"/>
+  <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}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.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>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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"/>
+  </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}/junit/junit/4.8.2"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm/4.0"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm/4.0/asm-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-commons/4.0"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-tree/4.0"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-util/4.0"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar" 
+         dest="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild
new file mode 100644
index 000000000000..4b92a5c3baaa
--- /dev/null
+++ b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Unix sockets for Java"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/jnr/jnr-unixsocket"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+LICENSE="Apache-2.0"
+
+CDEPEND="dev-java/jnr-constants:0
+	dev-java/jnr-enxio:0
+	dev-java/jnr-posix:3.0
+	dev-java/jnr-ffi:2"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="jnr-constants,jnr-enxio,jnr-ffi-2,jnr-posix-3.0"
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use source && java-pkg_dosrc src/main/java/jnr
+	use examples && java-pkg_doexamples src/main/java/jnr/unixsocket/example
+	use doc && java-pkg_dojavadoc target/site/apidocs
+}
diff --git a/dev-java/jnr-unixsocket/metadata.xml b/dev-java/jnr-unixsocket/metadata.xml
new file mode 100644
index 000000000000..1b1cbe76af50
--- /dev/null
+++ b/dev-java/jnr-unixsocket/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jnr/jnr-unixsocket</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jnr-x86asm-1.0.2-r1 b/dev-java/jnr-x86asm-1.0.2-r1
deleted file mode 100644
index d05a6854c622..000000000000
--- a/dev-java/jnr-x86asm-1.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A pure-java port of asmjit
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-x86asm
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=https://github.com/jnr/jnr-x86asm/archive/1.0.2.zip -> jnr-x86asm-1.0.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=330e1e16f2ce0c13813e27273fdae937
diff --git a/dev-java/jnr-x86asm/Manifest b/dev-java/jnr-x86asm/Manifest
new file mode 100644
index 000000000000..4542e39d183b
--- /dev/null
+++ b/dev-java/jnr-x86asm/Manifest
@@ -0,0 +1,3 @@
+DIST jnr-x86asm-1.0.2.zip 180046 BLAKE2B f346357dadaf4727e061ae4f11cb4a2fcb0aac7056c1ddc902c1779a0aa323ed47a90b7a7fef1148e4aefba2f003853d10718ae01ddcaffeb2b5b6d80d362b83 SHA512 e77124b7f0074dcd8b17ba200a1c99350827e6a3c641d6caa33b6bd900c95af9140f8ab716a5299bc591969f295158709b381f9b45faddbd6b75355949e4f463
+EBUILD jnr-x86asm-1.0.2-r1.ebuild 537 BLAKE2B d5955497f995098f3fec5f70093cc5d1b060eaa2d8fa4e7fc502bce9b5e76e8e4ac54c89aaa757b7a2adef67e156787eb5b3e830069266a10625e8100c3f9fa6 SHA512 03108db31e9dff342ce7017f19675267193790d16d8a9a6e707bf8187e98392ff72fd3908617568049a7a8887ba45050f1fec2f836bcf4b59573b3918377b185
+MISC metadata.xml 325 BLAKE2B 15dc0d2912dbb73aa35654c7eb159708abfc72b6f2e5426c6d21849984eb89f89ed5095a0e5f9a32dccbbd28722b0cbfab1291342a10eb04e51abcd7ef553a51 SHA512 9340b2600f4e4131177b0cb89acefc78c9d580bcadb3e69bb73ea536b36b7c81d7ba880f78df917ef6061c09b2da5da5a7d22a5497fa61bc8815f01359a95617
diff --git a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..304b608ca557
--- /dev/null
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A pure-java port of asmjit"
+HOMEPAGE="https://github.com/jnr/jnr-x86asm"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_ANT_ENCODING="UTF-8"
diff --git a/dev-java/jnr-x86asm/metadata.xml b/dev-java/jnr-x86asm/metadata.xml
new file mode 100644
index 000000000000..49236c1e21dc
--- /dev/null
+++ b/dev-java/jnr-x86asm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jnr/jnr-x86asm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/joda-convert-1.3.1 b/dev-java/joda-convert-1.3.1
deleted file mode 100644
index cfc3c2420b5f..000000000000
--- a/dev-java/joda-convert-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java library for conversion between Object and String
-EAPI=5
-HOMEPAGE=http://www.joda.org/joda-convert/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ppc64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/joda-convert/joda-convert-1.3.1-dist.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ab500aadb8005badef0d7beaa9e949d1
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
new file mode 100644
index 000000000000..e1f7adcf6ee1
--- /dev/null
+++ b/dev-java/joda-convert/Manifest
@@ -0,0 +1,4 @@
+AUX joda-convert-1.3.1-build.xml 10459 BLAKE2B 79f7930f5d71e046a5e0ad8e4b7bbddb10ce2be67e6d4120685e640d51d201289e02a45bf37a5c295add8cc90404c74c06709b996a946f88b4b2c7a0467c7cb2 SHA512 cfeec9e9ee537814eaa3277037e45878a71b80cd73705bce560cf24d1c0d20033dadd030dcc447b1be5ad742fa97637f57931cab96ca7e21d6b79c7897d7f0ce
+DIST joda-convert-1.3.1-dist.tar.gz 131288 BLAKE2B 0b7b6cebb7e13e89d838ec10c4edd54b52bf3449b3003cd41ea2628719b8ea52bc00a8681a96fad0de79b4acd56fc4a8d4a31d558841fa268d9ffbeb97ca1ed0 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451
+EBUILD joda-convert-1.3.1.ebuild 929 BLAKE2B cd065e0ba99aa5d4fb8a4bfff03ffc9a202ed97497851032eb3d8a7316b29143034d9a8a04e303b6e3e5027e9c40470642e82c3d24933b681ed84020568bb6fe SHA512 ab4fa2ac52ed7e70a1874ff7ae23eb98561669ccdfcaff994ba447cdca92c101d8e4c493a9a9bf3f78cef4c3271deb2dba93839d279e4694f0df60edd1924334
+MISC metadata.xml 318 BLAKE2B 2222c7e9955b61b5a3369476bfdaa1087b8381846f325d3218768a672b594d64cadc6998d13012653c89df816133be237f97c9f1b2949712c4f120cd107c0a15 SHA512 13ce055f2cf64b4b5f7f6b780c98cfae6bcae0792d5bee30633cb465ab49045fc77da1337042d672bcb1c74cb3a1dc0e26b1d6c5e38f17d3a79152b423a97030
diff --git a/dev-java/joda-convert/files/joda-convert-1.3.1-build.xml b/dev-java/joda-convert/files/joda-convert-1.3.1-build.xml
new file mode 100644
index 000000000000..c66dfec9c1d7
--- /dev/null
+++ b/dev-java/joda-convert/files/joda-convert-1.3.1-build.xml
@@ -0,0 +1,248 @@
+<?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/9/13 4:18 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="joda-convert-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="joda-convert-1.3.1"/>
+  <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="."/>
+  <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"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.5/junit-4.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" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="true" 
+           deprecation="false" 
+           target="1.6" 
+           verbose="true" 
+           fork="true" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <mkdir dir="${maven.build.outputDir}/META-INF"/>
+    <copy todir="${maven.build.outputDir}/META-INF">
+      <fileset dir="${maven.build.resourceDir.0}">
+        <include name="LICENSE.txt"/>
+        <include name="NOTICE.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}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="true" 
+           deprecation="false" 
+           target="1.6" 
+           verbose="true" 
+           fork="true" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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"/>
+          <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" 
+             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" 
+             linksource="true" 
+             breakiterator="false">
+      <link href="http://download.oracle.com/javase/6/docs/api/"/>
+    </javadoc>
+  </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" 
+         manifest="src/conf/MANIFEST.MF" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </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}/junit/junit/4.5"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.5/junit-4.5.jar" 
+         dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/joda-convert/joda-convert-1.3.1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1.ebuild
new file mode 100644
index 000000000000..5ea26cf25cdc
--- /dev/null
+++ b/dev-java/joda-convert/joda-convert-1.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java library for conversion between Object and String"
+HOMEPAGE="http://www.joda.org/joda-convert/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ppc64"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	dodoc NOTICE.txt RELEASE-NOTES.txt
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/joda-convert/metadata.xml b/dev-java/joda-convert/metadata.xml
new file mode 100644
index 000000000000..50873a696170
--- /dev/null
+++ b/dev-java/joda-convert/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">joda-convert</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/joda-time-2.7 b/dev-java/joda-time-2.7
deleted file mode 100644
index 201839b89207..000000000000
--- a/dev-java/joda-time-2.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/joda-convert:0 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A quality open-source replacement for the Java Date and Time classes
-EAPI=5
-HOMEPAGE=http://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/JodaOrg/joda-time/releases/download/v2.7/joda-time-2.7-dist.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c4df77829ce5df2a9a8d4cac94369ef8
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
new file mode 100644
index 000000000000..745399b0bca2
--- /dev/null
+++ b/dev-java/joda-time/Manifest
@@ -0,0 +1,4 @@
+AUX joda-time-2.7-build.xml 11231 BLAKE2B 9b7350270773c59f3497be28581408f9984f1151b812f3ddc4bbf8fbfe50505e36cb5fdbfc330f7f07416275adc92a8176b25d7c4cb4cecbdc9d239f711bc9e7 SHA512 c614cc2425b0cefdc5f9def196cd5014d6d65552038dd22f876bbb64ee25131ead57aa94ef967491e292cf1ddefef933d9827dd588056d58c9a311640a5af63f
+DIST joda-time-2.7-dist.tar.gz 4007765 BLAKE2B ed34c988dae1f1fb3359e06cccc148f680a04244987464770024635e72d5693036ec4d1648245f44db2fd57c47d9842a964d39e04e9ba510ecda7ec25c853ee7 SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209
+EBUILD joda-time-2.7.ebuild 1913 BLAKE2B 9f71d9c32855236f04435433b851dbe582e823dcb0727fc4e71a15ee749f6e7d46e5408bc274213f3934a0f7238b8deee9919f7faa3d4ceb656b58e96dbcee9c SHA512 ad90a7ca92d6e5f0514e9d1a6cb5693240395d470fbf5d59b5bba7678fc2ff679a0e538db638c259b92c160501519105ae3663977681a376b15b989d28b8ab38
+MISC metadata.xml 384 BLAKE2B 298d00eca8bdd34de1a3c30a423051cd62923963b1d239640690cf12c3ddbbe661bfaa689f1b225a968747bcc7d3b28aa53ccd90fa406322aeaa3e1f3703f4a6 SHA512 441aa3d5876d8ff91b9f9d368e817bf6869266c27f7f8686e9eb47812f899f37c5fa2e65337e979dd3247932b61d84e4b4f0d7325ea2659d54221ab428c9c089
diff --git a/dev-java/joda-time/files/joda-time-2.7-build.xml b/dev-java/joda-time/files/joda-time-2.7-build.xml
new file mode 100644
index 000000000000..fa1fd5e25a39
--- /dev/null
+++ b/dev-java/joda-time/files/joda-time-2.7-build.xml
@@ -0,0 +1,262 @@
+<?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/22/15 5:59 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="joda-time-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="joda-time-2.7"/>
+  <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="."/>
+  <property name="maven.build.resourceDir.1" value="src/main/java"/>
+  <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/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.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="true" 
+           deprecation="false" 
+           target="1.5" 
+           verbose="true" 
+           fork="true" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <mkdir dir="${maven.build.outputDir}/META-INF"/>
+    <copy todir="${maven.build.outputDir}/META-INF">
+      <fileset dir="${maven.build.resourceDir.0}">
+        <include name="LICENSE.txt"/>
+        <include name="NOTICE.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}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="true" 
+           deprecation="false" 
+           target="1.5" 
+           verbose="true" 
+           fork="true" 
+           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="**/TestAllPackages.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" 
+             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" 
+             linksource="true" 
+             breakiterator="false">
+      <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
+      <group title="User packages"/>
+      <group title="Implementation packages"/>
+    </javadoc>
+  </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">
+    </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/joda/joda-convert/1.2"/>
+    <get src="https://repo.maven.apache.org/maven2/org/joda/joda-convert/1.2/joda-convert-1.2.jar" 
+         dest="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/3.8.2"/>
+    <get src="https://repo.maven.apache.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/joda-time/joda-time-2.7.ebuild b/dev-java/joda-time/joda-time-2.7.ebuild
new file mode 100644
index 000000000000..fbf0a92b476f
--- /dev/null
+++ b/dev-java/joda-time/joda-time-2.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc examples source test"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A quality open-source replacement for the Java Date and Time classes"
+HOMEPAGE="http://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/"
+SRC_URI="https://github.com/JodaOrg/${PN}/releases/download/v${PV}/${P}-dist.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RESTRICT="test"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/joda-convert:0
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)"
+RDEPEND=">=virtual/jre-1.5"
+
+java_prepare() {
+	rm -v *.jar || die "Failed to remove bundled jars."
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file."
+
+	mkdir -p "${S}"/target/classes || die "Failed to create target classes directory."
+	cp -Rv "${S}"/src/tz-data/* "${S}"/target/classes/ || die "Failed to copy timezone data."
+
+	mkdir -p "${S}"/target/classes/org/joda/time/format || die "Failed to create target classes subdirectory."
+	cp -Rv "${S}"/src/main/java/org/joda/time/format/*properties "${S}"/target/classes/org/joda/time/format/ || die "Failed to copy message bundles."
+}
+
+src_compile() {
+	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar)"
+
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar):$(java-pkg_getjar --build-only junit junit.jar)"
+
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	dodoc NOTICE.txt RELEASE-NOTES.txt
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use examples && java-pkg_doexamples src/example
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/joda-time/metadata.xml b/dev-java/joda-time/metadata.xml
new file mode 100644
index 000000000000..78620eff5573
--- /dev/null
+++ b/dev-java/joda-time/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">JodaOrg/joda-time</remote-id>
+    <remote-id type="sourceforge">joda-time</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/joni-2.1.0 b/dev-java/joni-2.1.0
deleted file mode 100644
index 964278010e4a..000000000000
--- a/dev-java/joni-2.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/asm:3 dev-java/jcodings:1 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java port of the Oniguruma regular expression engine
-EAPI=5
-HOMEPAGE=https://github.com/codehaus
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-java/asm:3 dev-java/jcodings:1 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.1
-SRC_URI=https://github.com/jruby/joni/archive/joni-2.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c448987ebf1f7d35ecfb0424e5bda500
diff --git a/dev-java/joni/Manifest b/dev-java/joni/Manifest
new file mode 100644
index 000000000000..9e5f54062f73
--- /dev/null
+++ b/dev-java/joni/Manifest
@@ -0,0 +1,3 @@
+DIST joni-2.1.0.tar.gz 125084 BLAKE2B 4f5fa651f2a2c898b29c311f8bdabe10ded3dc86ededbdf35d703a08618e2dcc57e34a9ab928f0f69e4f47d59a287e138dcf2ec7d2bb71e1152637f174f5fa8e SHA512 dd40b3a857deb02848d4a87de010ec6b9c96fb962643ea1022833a1bb5ebd76ffac403ff2a54497df288998939ed81910c22c02a2df1f7290112bb2ea506db0e
+EBUILD joni-2.1.0.ebuild 784 BLAKE2B 8f2e4992882ed740bc6a725aeec84f0828cebc366fcc9e174f1a61f8b227bff2097759434aa946805ddd0d7bcfe0babb7cce2f9ebe26f5a0e2872d072836559a SHA512 ca6bc1c029ba81937fd36a5abdac67c985fb8bc1d5abbf21e88b030327387859584e254f7b7eb74e970f02f82b01af2196e170911c4c8bbbb561f2a1332a0a40
+MISC metadata.xml 321 BLAKE2B 15b171202803285938651636b3f078b2b45566a9f2ab03a4f720860c7c72f228705cf125014ada485f8b99e57a46fd73e0e86fc5c07c03a4ea8a19bd670e62c1 SHA512 4d54ecb85b209420ffcae97f976124f7ab297d96bd7eb3f38efba72ba112bdb790c470289c7df005fd09eaafd8c89ad857a2c1bfd2cc95be4233638359a517bc
diff --git a/dev-java/joni/joni-2.1.0.ebuild b/dev-java/joni/joni-2.1.0.ebuild
new file mode 100644
index 000000000000..3b88d67b34f0
--- /dev/null
+++ b/dev-java/joni/joni-2.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java port of the Oniguruma regular expression engine"
+HOMEPAGE="https://github.com/codehaus"
+SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2.1"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+CDEPEND="dev-java/asm:3
+	dev-java/jcodings:1"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="build"
+EANT_GENTOO_CLASSPATH="asm-3 jcodings-1"
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/joni/metadata.xml b/dev-java/joni/metadata.xml
new file mode 100644
index 000000000000..4a0a963f41af
--- /dev/null
+++ b/dev-java/joni/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jruby/joni</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jopt-simple-4.6 b/dev-java/jopt-simple-4.6
deleted file mode 100644
index 8f7211cdfde0..000000000000
--- a/dev-java/jopt-simple-4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java library for parsing command line options
-EAPI=5
-HOMEPAGE=https://pholser.github.com/jopt-simple/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.6 -> jopt-simple-4.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8a5dd6e40b86933032f3de2aa48fcf80
diff --git a/dev-java/jopt-simple-4.8 b/dev-java/jopt-simple-4.8
deleted file mode 100644
index 920c06e15a7c..000000000000
--- a/dev-java/jopt-simple-4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java library for parsing command line options
-EAPI=5
-HOMEPAGE=https://pholser.github.com/jopt-simple/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.8 -> jopt-simple-4.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7317f527dbf058e81aefa1c7e3bffde7
diff --git a/dev-java/jopt-simple-4.9 b/dev-java/jopt-simple-4.9
deleted file mode 100644
index 9fdf02961d9e..000000000000
--- a/dev-java/jopt-simple-4.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java library for parsing command line options
-EAPI=5
-HOMEPAGE=https://pholser.github.com/jopt-simple/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.9 -> jopt-simple-4.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=291ff0c479e25abc37b71453ca1a1004
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
new file mode 100644
index 000000000000..511fa636cf62
--- /dev/null
+++ b/dev-java/jopt-simple/Manifest
@@ -0,0 +1,7 @@
+DIST jopt-simple-4.6.tar.gz 107066 BLAKE2B 469ff2c3d6359b14ec95dd6b25639f01d681d72b492d28061e0ecaac729d6a1520202691da619be274e8412af88905afe93c44b3026dccaa126bd91c4d3fd67b SHA512 33c7e111312c46376d46195cdc659f011af688d4078316a2b8dcc0dfdee480a658a331902b53bb53d1b952978623e012ed595fee269e24680cffeb6c04b40f8b
+DIST jopt-simple-4.8.tar.gz 110173 BLAKE2B 75fa9659ba772ffa4d4acbbba6524c0719a0a5af8afbbd9dec0a5f9225ec75971907be3edbbbf73f320b67da8c7b3075be45380ef821913518b8e4b1917eb37b SHA512 cc5360cf97446117849f93397c41734a9a001ea623e9ea4223b8d760f36897c62103ab9d2dabfcf0fa032db8e33f7bc51759d626d7bd76dda3adc61fa6622984
+DIST jopt-simple-4.9.tar.gz 114636 BLAKE2B c694ab5fe373de6baad8789346aa763bea946da766c8123c6576616f0a081768e364c4b012772c8da0e8961f10bcefff60807ffc45f94d04921df4e5065fd58d SHA512 28b95ac9a508251b80b0283fc57422fef3f36676ad9160974386faf7f02eb7a0cda00ca1970046ed66863d49e784efba955695fcfd8b5b2535cfaefcb1035360
+EBUILD jopt-simple-4.6.ebuild 698 BLAKE2B 165bca7b16963c631e4f15e1c779f6b845584ca8cf54c657f117ce74168b73d3f32e0b10d6f7ce9655b506ef865ca5f74f0f1c789eb08c70e617fa043d064e8f SHA512 9041520b0490eb2566f860964ccbac55b6be12c3bfd111963a3fc9d7a945268db36acae67a39d8044288307bd5db339e385cde73cba0aea8fce39b3014f68617
+EBUILD jopt-simple-4.8.ebuild 689 BLAKE2B 6ca2f093cf41f99e543522fdd4a267a68e0b1111569c0a3fb512a0c6b20297db4e8b1217ec007d69946a4689825f2f049a86f5008dcdb8fdf965dfb3b59e182c SHA512 32b16f5431e8210f1187a6690e65be0f95866d5c1aa996032cdba5c8608bc8b43c363c9f7bcbbcbb22974b9411907d897538ff2333b8ce9811c55b3bfe71b6d0
+EBUILD jopt-simple-4.9.ebuild 656 BLAKE2B b8940f7ece3aea999f490984ce00f5bd0cb213b2bcb28586daf296dfe468dec2e8cbff1e0f3a8018fadd413286cee1a3403ba89b1e90f3b80e5535d6f2259036 SHA512 e1af8baac937f616554f77a501ebb1ba26f6c274bd531d4b9cd2de2389938001da5e55dc4f8144f52e00840a5a6d1493a60698b5477303e82862a1c81f1adf90
+MISC metadata.xml 320 BLAKE2B 618d24786328b35f3b25fb733c2add95fdb6fc602ddd451ec972662f5c80787f4f2283285e7a753d6dc66a4c2a7efca3aaa196cf329311f1b4799737e974b714 SHA512 e64ac86acc3088038b5ebcca26f7481730c5bdcda5d7fe05fcadbf66a4ba7d472b9787c288c1b8b4ed077d2a960cd9be3fa1645deba813de3b55e7ead642b61a
diff --git a/dev-java/jopt-simple/jopt-simple-4.6.ebuild b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
new file mode 100644
index 000000000000..d0cb07818b33
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for parsing command line options"
+HOMEPAGE="https://pholser.github.com/jopt-simple/"
+SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/pholser-jopt-simple-8808a39"
+
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md
+}
diff --git a/dev-java/jopt-simple/jopt-simple-4.8.ebuild b/dev-java/jopt-simple/jopt-simple-4.8.ebuild
new file mode 100644
index 000000000000..688255a6465c
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-4.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for parsing command line options"
+HOMEPAGE="https://pholser.github.com/jopt-simple/"
+SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/pholser-${PN}-587d4ee"
+
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md
+}
diff --git a/dev-java/jopt-simple/jopt-simple-4.9.ebuild b/dev-java/jopt-simple/jopt-simple-4.9.ebuild
new file mode 100644
index 000000000000..e8d3065f34ce
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-4.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for parsing command line options"
+HOMEPAGE="https://pholser.github.com/jopt-simple/"
+SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/pholser-${PN}-94ad77a"
+
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	rm -v pom.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md
+}
diff --git a/dev-java/jopt-simple/metadata.xml b/dev-java/jopt-simple/metadata.xml
new file mode 100644
index 000000000000..16afdff9de8f
--- /dev/null
+++ b/dev-java/jopt-simple/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pholser/jopt-simple</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jortho-1.0 b/dev-java/jortho-1.0
deleted file mode 100644
index e990646099fd..000000000000
--- a/dev-java/jortho-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java spell-checking library
-EAPI=5
-HOMEPAGE=https://www.inetsoftware.de/other-products/jortho
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/jortho/JOrtho%20Library/1.0/JOrtho_1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0ecbeff852119e92573e5d5326042d32
diff --git a/dev-java/jortho/Manifest b/dev-java/jortho/Manifest
new file mode 100644
index 000000000000..f92d19da3636
--- /dev/null
+++ b/dev-java/jortho/Manifest
@@ -0,0 +1,3 @@
+DIST JOrtho_1.0.zip 278599 BLAKE2B 3a8180005b0f34301aeeb5def5ea1b9854f404f14d8c27fd07a74209eeb7e27e1857568a12f7633a0da0ad9ce19324a07baa89370d670a2c8cd7501861fc9c9c SHA512 e9d99984e954711125eaace5d6bd3c7ec92dfbcf85cb567f0643a61533334a7d7b3d34bc47e2b2a147631edccc6898b9fbe4c999836f1638ef284aa0479a400c
+EBUILD jortho-1.0.ebuild 913 BLAKE2B ab9484ec70cea53307989c72838a72a4dd03b66856cff00692c0a20b79b2a4f0a484efa38d520d0c42514b60a4a0684451bde0b3272cf563e196f5a46b187fd3 SHA512 f1f6b6c0133aedef93ac8ba3378dfe73f778ff354f701284b9e9eeccf9cbd8667649415eb6ed66de7ccb46b55a36434c7d932ce5de785e4cdf1f286b7ead65cd
+MISC metadata.xml 312 BLAKE2B fade487164fa1518f3f4febf1ad785530d1d3e717394152800d50d6460e518ef440629a75f70a16c7ba02525e673b445f616bf48bb85b8a7f5851ea9544f0178 SHA512 eaa94dcf310fb056e6d27e7a9ccec7cfa8aa0f36c0e827dad5d839e39e4d7558296d603deeb584b6f4ee8e9ea92058c03102bc6b8ae6f3e4870dd26b4524b9b3
diff --git a/dev-java/jortho/jortho-1.0.ebuild b/dev-java/jortho/jortho-1.0.ebuild
new file mode 100644
index 000000000000..f8d16101d570
--- /dev/null
+++ b/dev-java/jortho/jortho-1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java spell-checking library"
+HOMEPAGE="https://www.inetsoftware.de/other-products/jortho"
+SRC_URI="mirror://sourceforge/project/jortho/JOrtho%20Library/${PV}/JOrtho_${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+java_prepare() {
+	find . -name '*.jar' -exec rm -v {} + || die
+}
+
+JAVA_SRC_DIR="src/com"
+src_compile() {
+	mkdir -p target/classes/com/inet/jortho/i18n || die
+	find src -name '*.properties' \
+		-exec cp {} target/classes/com/inet/jortho/i18n \; || die
+
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	use examples && java-pkg_doexamples src/SampleAppl{et,ication}.java
+}
diff --git a/dev-java/jortho/metadata.xml b/dev-java/jortho/metadata.xml
new file mode 100644
index 000000000000..0149fc6a4907
--- /dev/null
+++ b/dev-java/jortho/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jortho</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jreleaseinfo-1.3.0-r2 b/dev-java/jreleaseinfo-1.3.0-r2
deleted file mode 100644
index 6fb104a2fc94..000000000000
--- a/dev-java/jreleaseinfo-1.3.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip:0 dev-java/ant-core:0 source? ( app-arch/zip:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Ant Task for build-time creation of Java source file with version or other info
-EAPI=5
-HOMEPAGE=http://jreleaseinfo.sourceforge.net/
-IUSE=source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://sourceforge/jreleaseinfo/jreleaseinfo-1.3.0-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e2ca4a4d61d2b2c2714a757df3476b03
diff --git a/dev-java/jreleaseinfo/Manifest b/dev-java/jreleaseinfo/Manifest
new file mode 100644
index 000000000000..e09dc8ea6615
--- /dev/null
+++ b/dev-java/jreleaseinfo/Manifest
@@ -0,0 +1,3 @@
+DIST jreleaseinfo-1.3.0-src.zip 38437 BLAKE2B 614c60b47e2e662751eeada60d5b0985cf0ffd090ebc9563c26f7d1a58177a3f375772946f85dd1c91227c5230d7cedbfcdde36b7dcfdc066183651eaf0d2bb8 SHA512 6c339787085ad0701f1054ebb96e387168e0ea5997a977d01dd758b6a5cd9090fee1f63124960112f2a0c8db3685e98fc8c3ec90821b13a70b0dac8cbf25c38f
+EBUILD jreleaseinfo-1.3.0-r2.ebuild 764 BLAKE2B 3c56a8222c7db94cd13dd0a8fea7fe725a88a756179b1290ee39b9552c200a55e87696476c907e57c7e54b890c7d6469f49667c7304a6fbb5af499703703f073 SHA512 f8c1eab6bc6cf17db07844425868026c1e1ce7103054b159944bbed50d5017016657fdfea2e4cf9ce04de71b3b11595d83ce23d64e06c08aea7e730d62238c8e
+MISC metadata.xml 318 BLAKE2B 2f8cb4708e471344e269f99d7a3ad4ea0db5e50101841f7a834501616cd1a9806de0627957164b0cccee81f34ca371032e7b35ed0d6fd09c4519b40ce3e0290d SHA512 99675027c08cb4257cc954a308d74352466f09399640cfbb48939dc788938db92c899427f1bc6a1746625052b4f709265eecbdbde7e8af2fa5c69a76958aa6d9
diff --git a/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild b/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..104f130ffd4f
--- /dev/null
+++ b/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Ant Task for build-time creation of Java source file with version or other info"
+HOMEPAGE="http://jreleaseinfo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="source"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip:0
+	dev-java/ant-core:0
+	source? ( app-arch/zip:0 )"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/ant-core:0"
+
+EANT_GENTOO_CLASSPATH="ant-core"
+
+java_prepare() {
+	java-ant_rewrite-classpath build.xml
+}
+
+src_install() {
+	java-pkg_newjar "target/${P}.jar"
+
+	dodoc LICENSE.txt
+
+	use source && java-pkg_dosrc src/java/ch
+}
diff --git a/dev-java/jreleaseinfo/metadata.xml b/dev-java/jreleaseinfo/metadata.xml
new file mode 100644
index 000000000000..405d643779b0
--- /dev/null
+++ b/dev-java/jreleaseinfo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jreleaseinfo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jrexx-1.1.1-r2 b/dev-java/jrexx-1.1.1-r2
deleted file mode 100644
index 6dac0662be3c..000000000000
--- a/dev-java/jrexx-1.1.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=API for textual pattern matching based on the finite state automaton theory
-EAPI=5
-HOMEPAGE=http://www.karneim.com/jrexx/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jrexx/jrexx-1.1.1-src.zip -> jrexx-1.1.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4e0d2bd206f043a1ca0ea08b2abb32f1
diff --git a/dev-java/jrexx/Manifest b/dev-java/jrexx/Manifest
new file mode 100644
index 000000000000..eb305da15087
--- /dev/null
+++ b/dev-java/jrexx/Manifest
@@ -0,0 +1,3 @@
+DIST jrexx-1.1.1.zip 62878 BLAKE2B bb72a406bace2accb5fa1c31609222e0390debfaf598b5f5afa260a1620d74c259a03ab9000f7a8c62634e73979eb1058b1c3627bc9292ae0008e90fb30299aa SHA512 dc3e84e9c6313d8fc4c8fb57bc2713976d07284eae5d36ca4411d0e28eaae36351bbf7a6a16d9db365105e592d2e0cbccf7c3662f8d24114662422f02f0707d1
+EBUILD jrexx-1.1.1-r2.ebuild 600 BLAKE2B ce8ea06f136b3a2ef202b1713edb69080b49ab6ac13d15f98101e2fe6620dd99e211bcce2f38c36a03c676a3b4d6f5cb1b6a13b7ce979199883c22ec155869d5 SHA512 15528b20f1b6c277c58b2ee1c5c6d4e2355848db2944c5a1c0f36f33cb17cd1c4ac1f1483b253891cbba566fd9dd2234defd21af9b85b23161912476ac6f8c2e
+MISC metadata.xml 311 BLAKE2B 19fe5e29d58ba19931ae5ec5d90028f4b2a3dbdbc326bc98267791df5537fd265fb5e25aa46fd5bd32d224628a4e36aebcb59665c502438490dd1936c1346fe0 SHA512 5758f1cc5327cddfa8f035d816fbb86dbc77f0032c8e23e216b203696c5c94f3c9dc7e46e3c1a003f5027a9f3af4eef8862710b55499b56cc4041e28265867c0
diff --git a/dev-java/jrexx/jrexx-1.1.1-r2.ebuild b/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..ebff30ecbbe7
--- /dev/null
+++ b/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="API for textual pattern matching based on the finite state automaton theory"
+HOMEPAGE="http://www.karneim.com/jrexx/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip -> ${P}.zip"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/jrexx/metadata.xml b/dev-java/jrexx/metadata.xml
new file mode 100644
index 000000000000..5ad5c3c0dcdd
--- /dev/null
+++ b/dev-java/jrexx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jrexx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jrobin-1.6.0-r1 b/dev-java/jrobin-1.6.0-r1
deleted file mode 100644
index ad9d37858c6e..000000000000
--- a/dev-java/jrobin-1.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/asm:4 >=dev-java/cglib-3.1:3 dev-java/easymock:3.2 dev-java/junit:4 dev-java/objenesis:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JRobin is a 100% pure Java alternative to RRDTool
-EAPI=5
-HOMEPAGE=http://www.jrobin.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bf6a8c273a08665f33c99248ac57adda
diff --git a/dev-java/jrobin/Manifest b/dev-java/jrobin/Manifest
new file mode 100644
index 000000000000..6b08b7583bf6
--- /dev/null
+++ b/dev-java/jrobin/Manifest
@@ -0,0 +1,3 @@
+DIST jrobin-1.6.0-1.tar.gz 7340700 BLAKE2B 2db142423c3ad0006609b31fed38a4121e942f1253a5b6ed8b10f83c71c9b9fbf271346bad1f419f7337871cd4e61e59a4117de79a07715557335458944fccea SHA512 c5428906bf975f6c31f90185da3f0cbcaaff74d68e35e37b5e425340899fe01290d3d9813f1ecd60bd599512e3d62f635de290db9a9a1bd45292ac9c187b15c7
+EBUILD jrobin-1.6.0-r1.ebuild 1568 BLAKE2B 30e3a3f247b510336509df2834362c71b905d54c1d633dcbc75b240ec4bd463762743a57da924a746498c98d04330f8bbbb44b12cffd15d6945fcaeb7eb80bcf SHA512 42f36f0be9c58a03e86632a99dcdfeb404e84c17aab715fc00ed9b2b5bd175c9ecf764bd82165caac56e715f51ff573547d043ee29a3548d5c7865aea3d626f2
+MISC metadata.xml 602 BLAKE2B 8bfff3b518c2aa5731032876ac38afa49f49049c11a74387aa9007742659dcd06697ad9fb1044a5a1f96a2799f7f19845e720e6566c26e216b60c5d2e50ab821 SHA512 38a6b1ecf0ebe88c64718f48d77cf459f11facc7b422cda53630da3ae9d040de0fd004e4ea571d93bc9f8f315e8f0c65cfc16d0f57c399174198facd98613d37
diff --git a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..2eee39fbc808
--- /dev/null
+++ b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JRobin is a 100% pure Java alternative to RRDTool"
+HOMEPAGE="http://www.jrobin.org/"
+SRC_URI="https://github.com/OpenNMS/${PN}/archive/${P}-1.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	test? (	dev-java/asm:4
+		>=dev-java/cglib-3.1:3
+		dev-java/easymock:3.2
+		dev-java/junit:4
+		dev-java/objenesis:0 )"
+
+S="${WORKDIR}/${PN}-${P}-1/src"
+JAVA_SRC_DIR="main/java"
+
+java_prepare() {
+	find "${WORKDIR}" -name "*.jar" -delete || die
+
+	# The tests need the resources in this directory for some reason.
+	mkdir -p test/java/target/classes || die
+	cd test/java/target/classes || die
+	ln -snf ../../../../main/resources/* . || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	jar uf "${PN}.jar" -C main/resources . || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher "${PN}-rrdtool" --main org.jrobin.cmd.RrdCommander
+}
+
+src_test() {
+	cd test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars asm-4,cglib-3,easymock-3.2,junit-4,objenesis)"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
+
+pkg_postinst() {
+	elog "The rrdtool executable has been installed as ${PN}-rrdtool to"
+	elog "avoid conflicting with net-analyzer/rrdtool."
+}
diff --git a/dev-java/jrobin/metadata.xml b/dev-java/jrobin/metadata.xml
new file mode 100644
index 000000000000..485eb49b8399
--- /dev/null
+++ b/dev-java/jrobin/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+	JRobin is a 100% pure Java alternative to RRDTool, with about exactly
+	the same specifications. If you provide the same data to RRDTool and
+	JRobin, you will get exactly the same results and graphs. All standard
+	RRDTool operations are supported.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">OpenNMS/jrobin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jrrd-1.0.1-r1 b/dev-java/jrrd-1.0.1-r1
deleted file mode 100644
index e12cb604d42a..000000000000
--- a/dev-java/jrrd-1.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 net-analyzer/rrdtool >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.9* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-DESCRIPTION=Java Interface to Tobias Oetiker's RRDtool
-EAPI=0
-HOMEPAGE=http://www.opennms.org/
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 net-analyzer/rrdtool >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/opennms/jrrd-1.0.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=92322637716afa306c16b3476067d9e9
diff --git a/dev-java/jrrd/Manifest b/dev-java/jrrd/Manifest
new file mode 100644
index 000000000000..20e7253253f5
--- /dev/null
+++ b/dev-java/jrrd/Manifest
@@ -0,0 +1,4 @@
+AUX 1.0.1-javacflags.patch 346 BLAKE2B 49a4a3f582865c3053964622d1953f688d3f26cd210e2db819d8006ffddff3f9e68e0e07213070b2f896baa3910ee635a3ee23dd4e9e5efb8964ac84334f1884 SHA512 4c7383d1e55bdb56657cfd3de944ba1e18fe299d90b4493ccf9708abbaa0d4fa141215170c2bd9bf0f71002124a8221d5af657cd9c28817971801349be71ffc2
+DIST jrrd-1.0.1.tar.gz 320476 BLAKE2B c8f2a16bd9e3d1dc53e6523e7b936ea65e23852feb69af917df9fcb40fe63a69335faf0bb476779f1e618ad44dabfec52f890232a8d85d8d5aa5c901c739bb6f SHA512 f794f052af32544e17d5aef58c7acb068f442c85e991d7f11c25119d94edb4aebb75f744df53caa64f4fd1e9f900f9018a82790a77dcac48e071b13833a8cced
+EBUILD jrrd-1.0.1-r1.ebuild 960 BLAKE2B e6310151eb504a73fb8e4b6fcd88b39dd5d6f21579cc8f05cce0e4cc8896568e71c9de30044c9a8336c40e118dbf96c28c72f5f74238a5aa1d5dff5870c5eb8d SHA512 fd03d9a196d210c11c87a7a3123da679b80c5ebd9cb52db6e71b850806446c436799ab7f8fe12aa41a542300380f02a94593ae33d65fc802db727802a2c78b75
+MISC metadata.xml 396 BLAKE2B 66db2600dc0aa0b7ff5e5d6275f265495f0c7c7ea97baab568f993c49642dd2b928042fcdab7dbf5e5aeca154d5f463d472be2dfd4339b21f8429154fdb05e5c SHA512 4d701ce0342203d158d1fdb3d00d1c2f0fcdaf7a5f891584be4cb33e2b3ceeac22a25b780410c9be7c1c4c3a1f4494561a2dddaf37981b68b23911d55ae1f26c
diff --git a/dev-java/jrrd/files/1.0.1-javacflags.patch b/dev-java/jrrd/files/1.0.1-javacflags.patch
new file mode 100644
index 000000000000..26bd523fc7ac
--- /dev/null
+++ b/dev-java/jrrd/files/1.0.1-javacflags.patch
@@ -0,0 +1,13 @@
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(revision 7413)
++++ Makefile.am	(working copy)
+@@ -15,7 +15,7 @@
+ 
+ .java.class:
+ 	-mkdir -p $(classdir)
+-	$(JAVAC) -d $(classdir) $<
++	$(JAVAC) $(JAVACFLAGS) -d $(classdir) $<
+ 
+ rrd_jinterface.c: org_opennms_netmgt_rrd_rrdtool_Interface.h
+ 
diff --git a/dev-java/jrrd/jrrd-1.0.1-r1.ebuild b/dev-java/jrrd/jrrd-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..f0d86291237d
--- /dev/null
+++ b/dev-java/jrrd/jrrd-1.0.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+WANT_AUTOMAKE="1.9"
+
+inherit eutils autotools base java-pkg-2
+
+DESCRIPTION="Java Interface to Tobias Oetiker's RRDtool"
+
+SRC_URI="mirror://sourceforge/opennms/${P}.tar.gz"
+HOMEPAGE="http://www.opennms.org/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+
+SLOT="0"
+
+COMMON_DEP="net-analyzer/rrdtool"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+PATCHES=( "${FILESDIR}/1.0.1-javacflags.patch" )
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+	# Running autoconf would require some RPM macros
+	eautomake
+}
+
+src_compile(){
+	base_src_compile
+	if use doc; then
+		javadoc -d javadoc $(find org -name "*.java") || die "javadoc failed"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar "${S}/${PN}.jar"
+	java-pkg_doso .libs/*.so
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/jrrd/metadata.xml b/dev-java/jrrd/metadata.xml
new file mode 100644
index 000000000000..4b68e08c8e01
--- /dev/null
+++ b/dev-java/jrrd/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+	Java Interface to Tobias Oetiker's RRDtool
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">opennms</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jsap-2.1-r2 b/dev-java/jsap-2.1-r2
deleted file mode 100644
index cc8526680bd2..000000000000
--- a/dev-java/jsap-2.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/xstream:0 dev-java/ant-core:0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Simple Arguments Parser (JSAP)
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/jsap
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/xstream:0 dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jsap/JSAP-2.1-src.tar.gz -> jsap-2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=73a464b058edc4e5c0504aaa6ae03d8a
diff --git a/dev-java/jsap/Manifest b/dev-java/jsap/Manifest
new file mode 100644
index 000000000000..685b7b615147
--- /dev/null
+++ b/dev-java/jsap/Manifest
@@ -0,0 +1,3 @@
+DIST jsap-2.1.tar.gz 1281840 BLAKE2B aa7057ebff3dd9f7a9df9983165e64bc9785184d5505fe9d81527883e64eb350accb52372b78c5738c8124c1f2063a767aea0c95cfba802787a96eabc9b8963f SHA512 5509d67b8af11cfbf94ca1a4d2b055b84c6c025ca26cd70390f63394d112a842fd39271181dfad0a88856964acd66f8abe49c72c58cc0086445d810837ba3352
+EBUILD jsap-2.1-r2.ebuild 768 BLAKE2B 84d389450573b259512b179e7c37de794a640168e4404773292082d96f7970d4210f46f6957d46c3289c21db4c88c69d9d518d3964cf8052620065cd7e916be6 SHA512 fa8a2d6f571391b8ad941e5e190a6b9b9deeac045d846f1f4555098ef1670edf27252224c67aec96f52387179a9686548ddc56f1a6496894fcb08820fc3ea17c
+MISC metadata.xml 310 BLAKE2B 3eca6271304a97cce7ef6c23c5eb98add37ed09d286daf07a01c6d991ed7aea5c3d365555e0927298991c26bd92d91aff43ca82abf66bfcf00839bdd3151c4a5 SHA512 ef2fd9df3da998fc5b0add86af9e5d6d2829c3cfc566152d3caaf9957e55ee15da76d8af6e97bde9e616f0c1ac684f11d7f72bd6c67b43b281c795d459c73f5a
diff --git a/dev-java/jsap/jsap-2.1-r2.ebuild b/dev-java/jsap/jsap-2.1-r2.ebuild
new file mode 100644
index 000000000000..c354393345de
--- /dev/null
+++ b/dev-java/jsap/jsap-2.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="JSAP"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Java Simple Arguments Parser (JSAP)"
+HOMEPAGE="https://sourceforge.net/projects/jsap"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/xstream:0
+	dev-java/ant-core:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	xstream
+	ant-core
+"
+
+java_prepare() {
+	java-pkg_clean
+	find . -type f -name "Test*.java" -delete || die
+}
diff --git a/dev-java/jsap/metadata.xml b/dev-java/jsap/metadata.xml
new file mode 100644
index 000000000000..9827e6d8a40d
--- /dev/null
+++ b/dev-java/jsap/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jsap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jsch-0.1.52 b/dev-java/jsch-0.1.52
deleted file mode 100644
index d91177b893da..000000000000
--- a/dev-java/jsch-0.1.52
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JSch is a pure Java implementation of SSH2
-EAPI=5
-HOMEPAGE=http://www.jcraft.com/jsch/
-IUSE=zlib elibc_FreeBSD doc source examples elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 zlib? ( dev-java/jzlib:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jsch/jsch-0.1.52.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=388aee91bb439932e3d6119eec56d2bc
diff --git a/dev-java/jsch-0.1.54 b/dev-java/jsch-0.1.54
deleted file mode 100644
index b239bdc97e33..000000000000
--- a/dev-java/jsch-0.1.54
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=zlib? ( dev-java/jzlib:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JSch is a pure Java implementation of SSH2
-EAPI=6
-HOMEPAGE=http://www.jcraft.com/jsch/
-IUSE=zlib elibc_FreeBSD doc source examples elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=zlib? ( dev-java/jzlib:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jsch/jsch-0.1.54.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=62a48900a7e715daf9d53227483039a8
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
new file mode 100644
index 000000000000..4bacac52ea5b
--- /dev/null
+++ b/dev-java/jsch/Manifest
@@ -0,0 +1,5 @@
+DIST jsch-0.1.52.zip 363648 BLAKE2B 37f5105920868957409c6eed8fb7b1517c0816ee6c1da25b0ad5f1cb0b1e6c71954e30e255b8aa94989495e11767ee11c5ce8bfd9721da12d6823832dd57bb16 SHA512 a5a998b6139638eee403e120f5f217112a5c09e81db8e1b1240d53ca311df4540b56aaa5f67f7a5c40cbc8420535d72d456e4fbfc95fe86d46376a00295bec4d
+DIST jsch-0.1.54.zip 365455 BLAKE2B 5cd6fa012e5a511bad8f23a233559e6ad6d600f39ea7b519e66e118b1fdb997491b7ac8cff5bc1491c28f7ee99f0f4a3b4727f5d8ec02030576f34949d74e203 SHA512 2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e
+EBUILD jsch-0.1.52.ebuild 1196 BLAKE2B 5460a7e13f495d3ad958bf083d5131b4ef8838d981f777cf44594f6f6fd64454057a40655f70f04165e25e5eff3b5f9305b5177d6f81b432d4487e6082aa3ef1 SHA512 99af14f4aa3c09acf739297173fc89baede7facdbbd7223a3bc98835cb48246a2eae8803a99c7008973e7e1a761f071f6fda60977b2bde9352800321245e50b5
+EBUILD jsch-0.1.54.ebuild 1169 BLAKE2B a09d7b8eba17059fdf49b15ff459bfe4b35c0da97898e9afd8a1083be958afb3e2e7bc3c8dd10e761de56df87bc9ffb5fc9067e1e3edd5ae8fed059a0e433f1b SHA512 92f6a520c797230e0671d7f590a0794151b954a2ce97eb5cf0fdb6ae226db37846f57ebd01626e4d19923326dd2b4f8728a395032ee38cd542d7ce5106651380
+MISC metadata.xml 310 BLAKE2B 6b76bef1eadb48caec1f3314829856f655be55da55fddeec91c3d3fd14f3eecf65dd2508de12a01fc75e2089e8ce1107481bbdb6f3c92eeac74fe85e5ba02aee SHA512 5051c200e3f618fda4991704418d902b513cf94b96917a1c23c1e552e1443cf9ccbf8a0a2ceddc8db46d7104284b43689be62dee0353d50b207c7c6ad3336262
diff --git a/dev-java/jsch/jsch-0.1.52.ebuild b/dev-java/jsch/jsch-0.1.52.ebuild
new file mode 100644
index 000000000000..037e4ae36e32
--- /dev/null
+++ b/dev-java/jsch/jsch-0.1.52.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="JSch is a pure Java implementation of SSH2"
+HOMEPAGE="http://www.jcraft.com/jsch/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+CDEPEND=""
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6
+	zlib? ( dev-java/jzlib:0 )"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+EANT_BUILD_TARGET="dist"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_compile() {
+	if use zlib; then
+		EANT_EXTRA_ARGS="-Djzlib.available=true"
+		EANT_GENTOO_CLASSPATH="jzlib"
+	fi
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-osgi_newjar dist/lib/jsch*.jar "com.jcraft.jsch" "JSch" \
+		"com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, \
+		com.jcraft.jsch.jcraft;x-internal:=true"
+
+	dodoc README ChangeLog || die
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/jsch/jsch-0.1.54.ebuild b/dev-java/jsch/jsch-0.1.54.ebuild
new file mode 100644
index 000000000000..fa5203966a6e
--- /dev/null
+++ b/dev-java/jsch/jsch-0.1.54.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="JSch is a pure Java implementation of SSH2"
+HOMEPAGE="http://www.jcraft.com/jsch/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+CDEPEND="
+	zlib? ( dev-java/jzlib:0 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+EANT_BUILD_TARGET="dist"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_compile() {
+	if use zlib; then
+		EANT_EXTRA_ARGS="-Djzlib.available=true"
+		EANT_GENTOO_CLASSPATH="jzlib"
+	fi
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-osgi_newjar dist/lib/jsch*.jar \
+		"com.jcraft.jsch" "JSch" \
+		"com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, \
+		com.jcraft.jsch.jcraft;x-internal:=true"
+
+	einstalldocs
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/jsch/metadata.xml b/dev-java/jsch/metadata.xml
new file mode 100644
index 000000000000..a4be664f1511
--- /dev/null
+++ b/dev-java/jsch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jsch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/json-20150729 b/dev-java/json-20150729
deleted file mode 100644
index ce17a2f9bbc3..000000000000
--- a/dev-java/json-20150729
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java implementation of the JavaScript Object Notation
-EAPI=5
-HOMEPAGE=http://www.json.org/java/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/douglascrockford/JSON-java/archive/20150729.zip -> json-20150729.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=70c357639f39155156577646dacba1a0
diff --git a/dev-java/json-20160212 b/dev-java/json-20160212
deleted file mode 100644
index 7bd54cc392ae..000000000000
--- a/dev-java/json-20160212
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java implementation of the JavaScript Object Notation
-EAPI=5
-HOMEPAGE=http://www.json.org/java/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/douglascrockford/JSON-java/archive/20160212.zip -> json-20160212.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9291fcb7446082c2c161eb3479e9bbb4
diff --git a/dev-java/json-simple-1.1-r1 b/dev-java/json-simple-1.1-r1
deleted file mode 100644
index 8773425cd696..000000000000
--- a/dev-java/json-simple-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Simple Java toolkit for JSON
-EAPI=6
-HOMEPAGE=http://www.json.org
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/fangyidong/json-simple/archive/tag_release_1_1_1.tar.gz -> json-simple-1.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ead702e3e5efa10cb11fe01dd3f52003
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
new file mode 100644
index 000000000000..7170972d1a20
--- /dev/null
+++ b/dev-java/json-simple/Manifest
@@ -0,0 +1,3 @@
+DIST json-simple-1.1.tar.gz 22154 BLAKE2B 594717df45d56b4e70cee9aadca661a9da7e19c2a77e5ab2176396c48bdf061f25db0e4cbf5b93b12dc862dfca593a71dcd154f24c914a4d2ff510e3f4b11570 SHA512 f09cb298254a8f35b534670d6a1801eeaf58385529f459f413aed556df1ac577bea6e678a32065077abc851dc310b3af38b818f1737bd255f05e756d7e2da066
+EBUILD json-simple-1.1-r1.ebuild 591 BLAKE2B 5dd45bf8dead68b43cd9c28a2a55ad9e13a46d14956edb95b6560d6f0c07b4c960a55b71ddff8fe99898fe812272b01ee7b8bb27dcc468234afbdee964b0a846 SHA512 e1f5bfaa2d7ae6cb525cd1c129d10661e62a702362f3a6ad8977c409094feab9d90be0268b50050310665003e4dc6d4defa60a01655300b2db1028d792c52ac8
+MISC metadata.xml 884 BLAKE2B 93c8109aa04543cfda3354252a56ffd6520106daae5eaca5c428e6a001a8b2d87a3ce3d416c70fb06fb28e22f2b399be0d0911ee59856a9feaa26614f39c0ef5 SHA512 c62d038f6913bb8beb903930ed6d354c89b9b5fa231d9096690d263ee35812aad52696a3d15d74c83d99c02392f5ed3ab997bc6e9d2532cbb4ea12cbaab1ebe9
diff --git a/dev-java/json-simple/json-simple-1.1-r1.ebuild b/dev-java/json-simple/json-simple-1.1-r1.ebuild
new file mode 100644
index 000000000000..a91c4fbc828d
--- /dev/null
+++ b/dev-java/json-simple/json-simple-1.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="tag_release_1_1_1"
+
+DESCRIPTION="Simple Java toolkit for JSON"
+HOMEPAGE="http://www.json.org"
+SRC_URI="https://github.com/fangyidong/json-simple/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+JAVA_SRC_DIR="src/main"
+
+src_prepare() {
+	default
+	rm -rv src/test || die
+}
diff --git a/dev-java/json-simple/metadata.xml b/dev-java/json-simple/metadata.xml
new file mode 100644
index 000000000000..92e38406b83b
--- /dev/null
+++ b/dev-java/json-simple/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">Why the Simple Java toolkit (also named as JSON.simple) for JSON?
+	When I use JSON as the data exchange format between the AJAX client and JSP
+	for the first time, what worry me mostly is how to encode Java strings and
+	numbers correctly in the server side so the AJAX client will receive a well
+	formed JSON data. When I looked into the 'JSON in Java' directory in JSON
+	website,I found that wrappers to JSONObject and JSONArray can be simpler,
+	due to the simplicity of JSON itself. So I wrote the JSON.simple package.</longdescription>
+	<upstream>
+		<remote-id type="google-code">json-simple</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
new file mode 100644
index 000000000000..6c861790efc2
--- /dev/null
+++ b/dev-java/json/Manifest
@@ -0,0 +1,5 @@
+DIST json-20150729.zip 52114 BLAKE2B 8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
+DIST json-20160212.zip 52295 BLAKE2B a0cd21b9cdf5f14ad7531af2e48f8a6f22b8f05d3b2baba48c659bb91b7791681c74e37a4011bf2ef525c4e39edf2c7c73d1275514f44c8bc7e8eddf5c2b76e6 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
+EBUILD json-20150729.ebuild 688 BLAKE2B ec6bb2b42536b33e4a15144d4c0f0d5785c7b932e413881105242ac388b46d71282559377d1737080d76fd75392255e5c9c5e68d63a6349f57c28759d6ceae05 SHA512 7d7fb2348310ea877e5406bb20e156dd120e269cd3b0b4c144901c01fef8d745b763ff2809c9cc2f46f1d012f9e9619c35ebb1a3aa472f91f5da9eac72f13b33
+EBUILD json-20160212.ebuild 681 BLAKE2B d9f70c2ee4959cf9e197b51c7bc4c28b56d13486a03a7a6c31c7118d9989c216ad3f918069b77bbe201ced2ca026a7fb41ea5bd028b67347aa376e25e208c1d6 SHA512 bddd61f652ba800c27ca13e639280519d5fef30cc042a3cf02f9d416a4f91cb89e787db5f600c9b680a78a837676286344ced491d9a1bc3273ef8a5b72ef74a1
+MISC metadata.xml 454 BLAKE2B 866e5582e539c06b6bd26785ff62c97b178aacf82888963aac47489844ad3a8d98fc00bba667ed43d3e527fb3e04bfb05c7c644eeb0cfc4c408bd45cdcdc0e7f SHA512 18ba78f62a286b7a86d2dd7f2f407b145946e5b79df2554d3252706f38162e562f176105746dd028ec46f50dfe07e00fdbc6a37ca31a7ea3d1093e069192b2b3
diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
new file mode 100644
index 000000000000..5c65acbd6d3c
--- /dev/null
+++ b/dev-java/json/json-20150729.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java implementation of the JavaScript Object Notation"
+HOMEPAGE="http://www.json.org/java/"
+SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/JSON-java-${PV}"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	chmod a-x *.java || die
+	mkdir -p src || die
+	mv *.java src || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README || die
+}
diff --git a/dev-java/json/json-20160212.ebuild b/dev-java/json/json-20160212.ebuild
new file mode 100644
index 000000000000..db4c7252b880
--- /dev/null
+++ b/dev-java/json/json-20160212.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java implementation of the JavaScript Object Notation"
+HOMEPAGE="http://www.json.org/java/"
+SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/JSON-java-${PV}"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	chmod a-x *.java || die
+	mkdir -p src || die
+	mv *.java src || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README
+}
diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml
new file mode 100644
index 000000000000..8ec407117502
--- /dev/null
+++ b/dev-java/json/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		JSON (JavaScript Object Notation) is a lightweight data-interchange format.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">douglascrockford/JSON-java</remote-id>
+	</upstream>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jsoup-1.8.3 b/dev-java/jsoup-1.8.3
deleted file mode 100644
index 793d51d39832..000000000000
--- a/dev-java/jsoup-1.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java HTML parser that makes sense of real-world HTML soup
-EAPI=5
-HOMEPAGE=https://jsoup.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jhy/jsoup/archive/jsoup-1.8.3a.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=94c125f027d982dda293df370c961319
diff --git a/dev-java/jsoup/Manifest b/dev-java/jsoup/Manifest
new file mode 100644
index 000000000000..64a6a9f6986c
--- /dev/null
+++ b/dev-java/jsoup/Manifest
@@ -0,0 +1,3 @@
+DIST jsoup-1.8.3a.zip 370626 BLAKE2B 9ba471a8e161ef4ad5f0abd54feb29075400a53622dcd1a9934307a123bfad087bea9fc17f3cf020929aadbf51a47b0df1aa1ad5201487394faaaf4c44a793a9 SHA512 d044231fc70ff6d5428707d56853db77feedbb29a4ea1a501e6fcbaaecb2743bdeeaa8dcf4c76f7d278905b31e83707ad2644e7876a44c9d2325537d647aab85
+EBUILD jsoup-1.8.3.ebuild 1186 BLAKE2B 449200eb4701d4a2214eeadfbbdf9f77393ef203bbb3bb3a42392cae184655e49d219728e146941fbf14d480b73d6c1ee4d7cf1d9e60c34187be74c2a6ff7ab1 SHA512 31ba7a27aaee5707d38d2a8b47f91d082cadcba8137e5163036858be8508b7af6a7a9df4e1e0dd17740ecb8e85529c5473b8a64222f04f22975185276e54a234
+MISC metadata.xml 832 BLAKE2B 29ce6790f54497fbd017bbc4e06bc623a4a79fe08989eebe33d4c5ab63e277c0f421bf5103d9c9a84fca8f0099842fb48bb047628d00374ced085f0c12535f67 SHA512 795f0cfdf9dddeb803b917a4383e5b5d6626f3ba7e9ba1c9a3225c253860e8f66934863cb6d718a6eb96ce8e49b552beb849bb9dd33880166e37c93ba3a0e0c8
diff --git a/dev-java/jsoup/jsoup-1.8.3.ebuild b/dev-java/jsoup/jsoup-1.8.3.ebuild
new file mode 100644
index 000000000000..103a8ed904c7
--- /dev/null
+++ b/dev-java/jsoup/jsoup-1.8.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV="${PV}a"
+MY_P="${PN}-${PN}-${MY_PV}"
+
+DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
+HOMEPAGE="https://jsoup.org/"
+SRC_URI="https://github.com/jhy/${PN}/archive/${PN}-${MY_PV}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	rm pom.xml || die
+	mkdir -p target/classes/org/jsoup/nodes/ || die
+	cp src/main/java/org/jsoup/nodes/*.properties target/classes/org/jsoup/nodes/ || die
+}
+
+src_test() {
+	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
+
+	mkdir target/tests || die
+	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
+	cp -r src/test/resources/* target/tests || die
+
+	tests=$(find target/tests -name "*Test.class" \
+			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+			| grep -vP '\$');
+	ejunit4 -cp "${testcp}" ${tests}
+}
diff --git a/dev-java/jsoup/metadata.xml b/dev-java/jsoup/metadata.xml
new file mode 100644
index 000000000000..423272137d7f
--- /dev/null
+++ b/dev-java/jsoup/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jhy/jsoup</remote-id>
+	</upstream>
+	<longdescription>
+		jsoup is a Java library for working with real-world HTML. It provides a
+		very convenient API for extracting and manipulating data, using the best
+		of DOM, CSS, and jquery-like methods.
+		It implements the WHATWG HTML5 specification (http://whatwg.org/html),
+		and parses HTML to the same DOM as modern browsers do. It's designed to
+		deal with all varieties of HTML found in the wild; from pristine and
+		validating, to invalid tag-soup; jsoup will create a sensible parse tree.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jspeex-0.9.7-r1 b/dev-java/jspeex-0.9.7-r1
deleted file mode 100644
index 68c0db2a44a7..000000000000
--- a/dev-java/jspeex-0.9.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.4 dev-java/junit:0 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Speex speech codec library for Java
-EAPI=5
-HOMEPAGE=http://jspeex.sourceforge.net/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jspeex/jspeex-0.9.7.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6745b09076c63f6a7d8ea94ce90e3b90
diff --git a/dev-java/jspeex/Manifest b/dev-java/jspeex/Manifest
new file mode 100644
index 000000000000..8450be585dfb
--- /dev/null
+++ b/dev-java/jspeex/Manifest
@@ -0,0 +1,5 @@
+AUX jspeex-0.9.7-remove-junit-report.patch 530 BLAKE2B 2ebc0fcdd0713615bdcb1c829e0f26437af3829cdf4d01f453a6f8a4df9b0728f2f4d746214d44a8fa63f61ccda1c7812fe22ee6c67b8b141021adb61d6076e9 SHA512 8a38a6033ca138a131ee716712efd463c2fda87829d46eabd8fa561af0327fd8718a673075eaa0f6a08a931bfd142be23c65e16959a36e1a845dc002744010aa
+AUX jspeex-0.9.7-remove-proguard-taskdef.patch 1655 BLAKE2B 3ec50cada7bfd9b69a448f12fc1c07fc23003952e190ddafad4d58cb3cb1f13e746c02846cc17e2323d5c4ec7f76f049edb038e559c45f92854a23f72946b2e1 SHA512 d8c6358d01c659bf2e83d99d7831f1177383701ea34c76e8b39fa83a85477f8712b6911b6bea5da4e07b0e677816a1b7b4e90e51ee3c71fb7d0faffc9fc9b0d1
+DIST jspeex-0.9.7.zip 733580 BLAKE2B d5bfabb0857975ab8ca74d54401f6d4008c7386d8e2464c7386ecccfde8dcf3b92580d6168e4ff06cf8c1a27ca848abc7f630be7f19c6a0245beb8a9cb66c3f6 SHA512 9673bef155f1cccc45bc0a0d5596e79b48ba044309ba3446548b570bc7bad60b4b22cc7761749b0769114c7341b9fab6db8e8a155070f9de6fe2730c843199fe
+EBUILD jspeex-0.9.7-r1.ebuild 1128 BLAKE2B 63ccb61ad93710e592be7845c5e3dd93afd425014d621ada0e1270e9fe42bbb7e823103d9744229b3b862766df254b998cbeba4b050b149f6addb994a00a1f33 SHA512 0b889a02983a970eb66e0be3464e96e3280641ae4d16a61f5fec11216e303dacea41af37e68417b2773a7a7ae05cbbc6614cc33dede51cb14e1b4734dbdcfcb5
+MISC metadata.xml 312 BLAKE2B 030ecc0c42a9dc6ecfaa663b6e25d35bc2364cfb1f7c59a5aeb46728d5819c29f9c5389370782f30a5598553e7d1822b7a6d2018006aa7a69e8e0a1a98ee8e68 SHA512 bf48f9daeb64e474b08e897e502436b21db0f65ba4cee4987654e811b6b71a3a82c3ccf9ee49b37babc9a8d8f3c6d13978d9c2e19b4ae27da51c1fc28f15aec5
diff --git a/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch b/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch
new file mode 100644
index 000000000000..d3446420f720
--- /dev/null
+++ b/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch
@@ -0,0 +1,16 @@
+diff -Naur a/build.xml b/build.xml
+--- a/build.xml	2014-02-18 23:32:25.440819710 +0100
++++ b/build.xml	2014-02-18 23:32:43.017053558 +0100
+@@ -218,12 +218,6 @@
+         </fileset>

+       </batchtest>

+     </junit>

+-    <junitreport todir="${doc}/junit">

+-      <fileset dir="${doc}/junit">

+-        <include name="TEST-*.xml"/>

+-      </fileset>

+-      <report format="noframes" todir="${doc}/junit"/>

+-    </junitreport>

+   </target>

+ 

+   <!-- ******************************************************************** -->

diff --git a/dev-java/jspeex/files/jspeex-0.9.7-remove-proguard-taskdef.patch b/dev-java/jspeex/files/jspeex-0.9.7-remove-proguard-taskdef.patch
new file mode 100644
index 000000000000..eb9e6fc24af2
--- /dev/null
+++ b/dev-java/jspeex/files/jspeex-0.9.7-remove-proguard-taskdef.patch
@@ -0,0 +1,53 @@
+diff -Naur a/build.xml b/build.xml
+--- a/build.xml	2014-02-18 23:32:25.440819710 +0100
++++ b/build.xml	2014-02-18 23:33:26.308555686 +0100
+@@ -57,10 +57,6 @@
+ 

+   <property name="version" value="0.9.7"/>

+ 

+-  <!-- Define additional tasks -->

+-  <taskdef name="proguard" classname="proguard.ant.ProGuardTask"

+-           classpath="${lib}/proguard3.2.jar" />

+-

+   <target name="init" description="Initialise ant" depends="clean">

+     <tstamp>

+       <format property="NOW" pattern="dd/MM/yyyy HH:mm" locale="en"/>

+@@ -138,19 +134,6 @@
+   <target name="compress" depends="package"

+           description="Package obfuscated JSpeex library" >

+     <mkdir dir="${log}"/>

+-    <proguard>

+--libraryjars ${java.home}/lib/rt.jar

+--injars      ${dist}/jspeex.jar

+--outjar      ${dist}/jspeex-obf.jar

+--renamesourcefileattribute SourceFile

+--keepattributes InnerClasses,SourceFile

+--printmapping ${log}/jspeex-obf.map

+--overloadaggressively

+-

+--keep public class * {

+-    public protected *;

+-}

+-    </proguard>

+   </target>

+ 

+   <target name="compress-dec-nb" depends="compile-nb"

+@@ -161,18 +144,6 @@
+         <attribute name="Main-Class" value="JSpeexDec"/>

+       </manifest>

+     </jar>

+-    <proguard>

+--libraryjars ${java.home}/lib/rt.jar

+--injars      ${dist}/jspeex-dec-nb.jar

+--outjar      ${dist}/jspeex-dec-nb-obf.jar

+--printmapping ${log}/jspeex-dec-nb-obf.map

+--overloadaggressively

+--defaultpackage ''

+-

+--keep public class JSpeexDec {

+-    public static void main(java.lang.String[]);

+-}

+-    </proguard>

+   </target>

+ 

+   <!-- ******************************************************************** -->

diff --git a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..9d3390743ccd
--- /dev/null
+++ b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit base java-pkg-2 java-ant-2
+
+DESCRIPTION="Speex speech codec library for Java"
+HOMEPAGE="http://jspeex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.4"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.4
+	dev-java/junit:0
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="ant-core"
+EANT_BUILD_TARGET="package"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-remove-junit-report.patch
+	epatch "${FILESDIR}"/${P}-remove-proguard-taskdef.patch
+
+	find . -name "*.jar" -delete || die "Failed to remove bundled libraries."
+
+	cd lib || die
+	java-pkg_jar-from --build-only junit
+}
+
+src_test() {
+	ANT_TASKS="ant-junit ant-core" eant test
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	dodoc README TODO
+
+	use doc && java-pkg_dojavadoc doc/javadoc
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/jspeex/metadata.xml b/dev-java/jspeex/metadata.xml
new file mode 100644
index 000000000000..3b016edaf12a
--- /dev/null
+++ b/dev-java/jspeex/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jspeex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jsr101-1.4-r3 b/dev-java/jsr101-1.4-r3
deleted file mode 100644
index cfe8acded83d..000000000000
--- a/dev-java/jsr101-1.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 java-virtuals/saaj-api:0 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java(TM) API for XML-Based RPC Specification Interface Classes
-EAPI=5
-HOMEPAGE=http://jcp.org/aboutJava/communityprocess/first/jsr101/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 java-virtuals/saaj-api:0 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/jsr101-1.4.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e17ab1f7c1c530394e9c36340b9c99e9
diff --git a/dev-java/jsr101/Manifest b/dev-java/jsr101/Manifest
new file mode 100644
index 000000000000..5e4fb4767fa2
--- /dev/null
+++ b/dev-java/jsr101/Manifest
@@ -0,0 +1,3 @@
+DIST jsr101-1.4.tar.bz2 18614 BLAKE2B c181e07db54cdf13ec15c18b8340b4f4bd9befee62aace934fd2ffcc12de386d4749e63d16dd654a7c369795c12f7c71bf4628a7878540f8c486302f65699b6e SHA512 a29cca7e0ed1eb8aff4b70da6d804cb1cd61cdd9a800f420be6794aa927bca6a4146a95d71c8521d4dc16a0da56419f3e82079d942194380dbddb9d44d773317
+EBUILD jsr101-1.4-r3.ebuild 678 BLAKE2B bbec42fb8ce1861effdb9905b7489cd6ac997a45b249c2b80fb74b4894de96375bca91dee00a7357f88817b9589c75313f043fe93ce30f24aa1ea45b0f3c63e3 SHA512 52c3f28f0ef4b71bcba93e18519e59a52d1aba08a3dc38036f1daae557b0bf3f3fb61d60fb38c78c6a514bb3101755c611d2911c05d7b22cd94874dd8c0e1af8
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/jsr101/jsr101-1.4-r3.ebuild b/dev-java/jsr101/jsr101-1.4-r3.ebuild
new file mode 100644
index 000000000000..c6482614c9f4
--- /dev/null
+++ b/dev-java/jsr101/jsr101-1.4-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java(TM) API for XML-Based RPC Specification Interface Classes"
+HOMEPAGE="http://jcp.org/aboutJava/communityprocess/first/jsr101/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	java-virtuals/saaj-api:0
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND="
+	>=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	${CDEPEND}"
+
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="
+	servlet-api-3.0
+	saaj-api
+"
diff --git a/dev-java/jsr101/metadata.xml b/dev-java/jsr101/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/jsr101/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/jsr173-1.0-r4 b/dev-java/jsr173-1.0-r4
deleted file mode 100644
index da48b328a0e4..000000000000
--- a/dev-java/jsr173-1.0-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Yet another Java library for parsing and writing XML
-EAPI=6
-HOMEPAGE=http://dev2dev.bea.com/xml/stax.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=bea.ri.jsr173
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://ftpna2.bea.com/pub/downloads/jsr173.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3b43cff1a53b2529a78e908828e8996f
diff --git a/dev-java/jsr173/Manifest b/dev-java/jsr173/Manifest
new file mode 100644
index 000000000000..1c45135dc1ca
--- /dev/null
+++ b/dev-java/jsr173/Manifest
@@ -0,0 +1,3 @@
+DIST jsr173.jar 639734 BLAKE2B f34caff27d216303d14050c78c3a4413685e843b9a5aacb228c38c57c50a009b691bff889ebc970097f998ba93b3a0737256c3b8a19f9df3529d238b43f71538 SHA512 8b299532716682772e5eeafb63a5dd125dec8954a9a284f6766bac05409fff611724ae1a9b6f4f6f303b64c12b19e394371a6b0a87132b36e88f94e20b69efe4
+EBUILD jsr173-1.0-r4.ebuild 897 BLAKE2B 2310785a3d07ae50fba866c48e479ca8ba6b233150d1fbe92d1608e931b28f231f441f45a5a9e10333a09563c9204af7d09f873a09fa06cb3acbbbe03d546802 SHA512 87c2fe1796027e64fee8868625fa85762f6a8f1480bfd19282fda9c9ec0ab0f500a4057663b50f3dedb88821d7a9840917e891b6b04003a32b0e81b730e50769
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jsr173/jsr173-1.0-r4.ebuild b/dev-java/jsr173/jsr173-1.0-r4.ebuild
new file mode 100644
index 000000000000..332838833908
--- /dev/null
+++ b/dev-java/jsr173/jsr173-1.0-r4.ebuild
@@ -0,0 +1,44 @@
+# 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="Yet another Java library for parsing and writing XML"
+HOMEPAGE="http://dev2dev.bea.com/xml/stax.html"
+SRC_URI="http://ftpna2.bea.com/pub/downloads/${PN}.jar"
+
+LICENSE="bea.ri.jsr173"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}"
+
+DOCS=( README.txt jsr173_1.0.pdf )
+
+src_unpack() {
+	cd "${S}" || die
+	jar xvf "${DISTDIR}/${A}" || die "failed to unpack"
+	jar xvf "${P//-/_}_src.jar" || die "failed to unpack"
+}
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use doc && einstalldocs
+}
diff --git a/dev-java/jsr173/metadata.xml b/dev-java/jsr173/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/jsr173/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jsr181-1.0-r2 b/dev-java/jsr181-1.0-r2
deleted file mode 100644
index 1b77afeb7237..000000000000
--- a/dev-java/jsr181-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JSR 181 API classes
-EAPI=5
-HOMEPAGE=http://jcp.org/en/jsr/summary?id=181
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4d2fd3eb1d82e1decef84a681f5f1ca0
diff --git a/dev-java/jsr181/Manifest b/dev-java/jsr181/Manifest
new file mode 100644
index 000000000000..972b33fb44f5
--- /dev/null
+++ b/dev-java/jsr181/Manifest
@@ -0,0 +1,3 @@
+DIST jsr181-api-1.0-MR1-sources.jar 3929 BLAKE2B 8372097db6f3bd7073628b1fb22694d0d5c013163b83ab1daded1c08ed6f319d02fc7d5322789b35d44621dd5377b980e16a8ed2b2e7c6df8b30451f6dca3713 SHA512 383806428ebe80e94af2c80a3d383f24e934cde57d5628e60b2e2335052ac037ad45f1e8c265c579cf60ed7383b15fd8f2e8dda6b08d8edf1d171b9f0ef0080e
+EBUILD jsr181-1.0-r2.ebuild 530 BLAKE2B 4f9bc645ff8a8b2c2426732a677bcc2d40a0b0f1c2d7966cc242695e6d5cefb2e2496b3186c8c9d8f10747c75bb458b7a100569d43d7e84c3a8253889e9e4dfb SHA512 4955336c361c9b9b389a1ffc9fec765107ea433da9d8976c2e9088dc8a4fb3f37cad6933620d11fe4b3b6534ef4ec49fedfb5bbb20a85dc087730a55529aca2c
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/jsr181/jsr181-1.0-r2.ebuild b/dev-java/jsr181/jsr181-1.0-r2.ebuild
new file mode 100644
index 000000000000..0cc33422ff56
--- /dev/null
+++ b/dev-java/jsr181/jsr181-1.0-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-api"
+MY_PV="${PV}-MR1"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="JSR 181 API classes"
+HOMEPAGE="http://jcp.org/en/jsr/summary?id=181"
+SRC_URI="http://central.maven.org/maven2/javax/jws/${MY_PN}/${MY_PV}/${MY_P}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr181/metadata.xml b/dev-java/jsr181/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/jsr181/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/jsr223-1.0-r2 b/dev-java/jsr223-1.0-r2
deleted file mode 100644
index b2a38c8ac4e4..000000000000
--- a/dev-java/jsr223-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Scripting for the Java(TM) Platform
-EAPI=5
-HOMEPAGE=http://jcp.org/en/jsr/detail?id=223
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/jsr223-openjdk-6-src-b19.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=65613ae5136184e9a06c9597b6a110d6
diff --git a/dev-java/jsr223/Manifest b/dev-java/jsr223/Manifest
new file mode 100644
index 000000000000..ebe75e80d7b3
--- /dev/null
+++ b/dev-java/jsr223/Manifest
@@ -0,0 +1,3 @@
+DIST jsr223-openjdk-6-src-b19.tar.bz2 15936 BLAKE2B fb72dce61428f8a2bf5ef13dafa8b7fe4a4b2060322756d3140e8d3da0a995024a71cc954ca5f275fcedbffb0ca40001761f4c7b5a9e26a7610df7766d411a88 SHA512 69e09e7cce017693abdbf1a9fc1c4b412686f05fa6a3098bc2724020c95bbb8e5349a0a176b930a364a8848b91dd4383d9e9c40dde317b3ab998139bd528f205
+EBUILD jsr223-1.0-r2.ebuild 476 BLAKE2B e4095d99775f7fd6f0964613d8cf584f28e2a5ba453d71d9c15d816dbb498d0c5ddd9b61548eb56ee457e8a478105cac204cb2598135e3c4ffe8c3b86a1b28e9 SHA512 a4a3849eecc321a29955932b616641d4e9696a2b6115a866b3b775a8f2f8e4fe6258ae33c5d603182d7cbced993880b12d29bc43f999fe94091e3cbad1c0be96
+MISC metadata.xml 214 BLAKE2B 5452fb11be445b7579865f9777af292067658bf101f6321db48ab1b478101fe031bb7914c6c24215bcdbe369dda396c164fcbbc4253ecb315de82141ee25f8b0 SHA512 d2b6ecfbbd79440de1909d9f195e5d4a6f9886b685ac1e6d7a1db39b8925b29942fac2998cde06040c921f2cc9ef2cbfbf836b60e191d894b00f75628476b1f7
diff --git a/dev-java/jsr223/jsr223-1.0-r2.ebuild b/dev-java/jsr223/jsr223-1.0-r2.ebuild
new file mode 100644
index 000000000000..758dd0285b50
--- /dev/null
+++ b/dev-java/jsr223/jsr223-1.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Scripting for the Java(TM) Platform"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=223"
+SRC_URI="mirror://gentoo/${PN}-openjdk-6-src-b19.tar.bz2"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr223/metadata.xml b/dev-java/jsr223/metadata.xml
new file mode 100644
index 000000000000..33a02ea0f34d
--- /dev/null
+++ b/dev-java/jsr223/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jsr225-1.0 b/dev-java/jsr225-1.0
deleted file mode 100644
index 4c799035dc05..000000000000
--- a/dev-java/jsr225-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=XQuery API for Java
-EAPI=5
-HOMEPAGE=http://jcp.org/en/jsr/detail?id=225
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/cfoster/xqj-api-1.0.0/raw/master/javax/xml/xquery/xqj-api/1.0/xqj-api-1.0-sources.jar -> jsr225-1.0.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a2832b6b086c32f570d012dd949ddbb5
diff --git a/dev-java/jsr225/Manifest b/dev-java/jsr225/Manifest
new file mode 100644
index 000000000000..8b1e5ca28d77
--- /dev/null
+++ b/dev-java/jsr225/Manifest
@@ -0,0 +1,3 @@
+DIST jsr225-1.0.jar 58968 BLAKE2B 063cf9c372165a5382345e02cc4a6be9cc856533d18eca86c83c484034f97967e718f408ba701c1afccf8869f35980dba098d837b8cfb6cbe2d6b7adc9c70ef3 SHA512 c7f89904269bb09037599914cc4199b467f9d882b982eeeb7663776b61dbf6868c3aac8d576ca2d8999d0fe3378e3a3896776316c24039487d2501d6e2872712
+EBUILD jsr225-1.0.ebuild 591 BLAKE2B 1952affe734c646a9be11522d91f1a8bac1a0f6c026d9f5bd2baab090733a556b6a5ce6d43df7199943af60a67ae21b26182e05f97c55dfedc2717a642d09786 SHA512 8c320fed17fde4b654b49a1b327179bd39a4ad8f507f5fe96aa5f63c423896514e891b9a90f955090f9c574071154a590f7cc814b1e63dacaf3e1a376850e1de
+MISC metadata.xml 310 BLAKE2B 319df21a6d5e3beab24fcc78343e287bfe2de4a9c0c106f2839b0ea4eade430aecf82df5da44f51418215861252b64d87941da08db08be971d922cf453cd4a19 SHA512 875298f3b7c7eabdbdd0942a787324b5f2d9bb5c7d48c61cf48869595962e6ec7a632b606d4cd4c36144851904ca76c075fcb1d8b4008f48e9df6de42edd108f
diff --git a/dev-java/jsr225/jsr225-1.0.ebuild b/dev-java/jsr225/jsr225-1.0.ebuild
new file mode 100644
index 000000000000..bef070caa856
--- /dev/null
+++ b/dev-java/jsr225/jsr225-1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="xqj-api"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XQuery API for Java"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=225"
+SRC_URI="https://github.com/cfoster/${MY_P}.0/raw/master/javax/xml/xquery/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/jsr225/metadata.xml b/dev-java/jsr225/metadata.xml
new file mode 100644
index 000000000000..cda5077b67bf
--- /dev/null
+++ b/dev-java/jsr225/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">cfoster/xqj-api-1.0.0</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jsr250-1.2 b/dev-java/jsr250-1.2
deleted file mode 100644
index 742c1a5d8999..000000000000
--- a/dev-java/jsr250-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JSR 250 Common Annotations
-EAPI=6
-HOMEPAGE=https://jcp.org/en/jsr/detail?id=250
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux
-LICENSE=|| ( CDDL GPL-2 )
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2-sources.jar -> jsr250-1.2.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2c23355b97cb5dd807972b2900046397
diff --git a/dev-java/jsr250/Manifest b/dev-java/jsr250/Manifest
new file mode 100644
index 000000000000..4948ba67d465
--- /dev/null
+++ b/dev-java/jsr250/Manifest
@@ -0,0 +1,3 @@
+DIST jsr250-1.2.jar 42311 BLAKE2B 9b5868fcbee673b1c3a535e8cd28c7b8896be087906a0db37f4a6d585ce6d1bb7be6d028adfc0e233c28581960a59ed8da18960c21053410a74c4af11ced66a6 SHA512 bf6e816958a74009e6aa13d03530c1ee4520ac756305544958669bd6fd0fd1de0ec036855260dea9c7a3f86a10f88a866a7cd1d86a52856097d1f1ea3ec92d63
+EBUILD jsr250-1.2.ebuild 541 BLAKE2B cecc59e414fbd441254b69950b30d1865e9332f3bbae584dc5b43572707b52c7f3948d52a68975b4ab201124904693422d807f84e6821f9f4563663fc21fe629 SHA512 14225476185524f5dc18f92b83d80905ae3fd4000ed1eb5907e79f009dfdfb17618612ea516de4d3376cf357c27bbbd4cd97bfdabb5e100b79aeefd95364d59a
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/jsr250/jsr250-1.2.ebuild b/dev-java/jsr250/jsr250-1.2.ebuild
new file mode 100644
index 000000000000..95b2ac491d76
--- /dev/null
+++ b/dev-java/jsr250/jsr250-1.2.ebuild
@@ -0,0 +1,19 @@
+# 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="JSR 250 Common Annotations"
+HOMEPAGE="https://jcp.org/en/jsr/detail?id=250"
+SRC_URI="https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/${PV}/javax.annotation-api-${PV}-sources.jar -> ${P}.jar"
+
+LICENSE="|| ( CDDL GPL-2 )"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/jsr250/metadata.xml b/dev-java/jsr250/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/jsr250/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/jsr305-3.0.1 b/dev-java/jsr305-3.0.1
deleted file mode 100644
index 6eabd312cd67..000000000000
--- a/dev-java/jsr305-3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Annotations for Software Defect Detection in Java
-EAPI=5
-HOMEPAGE=http://jcp.org/en/jsr/detail?id=305
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=eec7696a9519e1d52a7bfe7a55fadf08
diff --git a/dev-java/jsr305-3.0.2 b/dev-java/jsr305-3.0.2
deleted file mode 100644
index 0144a908f391..000000000000
--- a/dev-java/jsr305-3.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Annotations for Software Defect Detection in Java
-EAPI=6
-HOMEPAGE=http://jcp.org/en/jsr/detail?id=305
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar -> jsr305-3.0.2.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=206d3d1a408652c96d4b9e8c7d1199d0
diff --git a/dev-java/jsr305/Manifest b/dev-java/jsr305/Manifest
new file mode 100644
index 000000000000..ad24ff11e00b
--- /dev/null
+++ b/dev-java/jsr305/Manifest
@@ -0,0 +1,5 @@
+DIST jsr305-3.0.1-sources.jar 16622 BLAKE2B c9cc042845c8cd0d4680568d1c1f7c3ae43ba03c0bc21eeac662572ec17a048b86d38848f116653f466904f5a90c345ab7e5ac827fdfe00c899521cea54e3474 SHA512 ca9902929de94fbc03b848599bb1f5f542898ade724eb0d6022f799733c9093bb27c0a565f0a90f47dba7bff72d5a6d24de687746721a1bec2050c2061ecd148
+DIST jsr305-3.0.2.jar 18102 BLAKE2B fa6c40a63eb3e4683ae70612058420a905428b9ac9b920b2f7f4024579a5ff6fcffa576d50a616ed585b4896cbba87f4496273b860930f047184cf5df77004d0 SHA512 02327071dde09470c8cd0fe39405263146d7e86b15312bc3f909c6a6fa9b11c730bdb833b6cdbdf1aee0c6553e519cecd0257a296947f94636650e88cd8c5b79
+EBUILD jsr305-3.0.1.ebuild 503 BLAKE2B ac29e41915dcde9d9913dd1c80ebeb0d5fd4d3a7156bf9bb47a94e6b6d79039ec23ead549001c696e2aef3bd8ba30844a50274b67f5af34cc67d4dd2b07eef07 SHA512 22e394320bf2bbbfe313a0228e6bebe6f67e0f66e23ada4c2ab1989dbb21a7ad602e2df1fd4ddbde6c005108fd917f7ef6f70db3bdd6c938201ca92181b8f88d
+EBUILD jsr305-3.0.2.ebuild 515 BLAKE2B b5db1b566a513b5aadf5082f7b8cdd9d60c27b1c96f440b8b3c1226f7bfa9350532c7f0ada9ec23e02283cf6dbc0f4091260991b15dac79055da8bdaa2a1bde6 SHA512 d823252f6e0a007a2994009a15361b284cd997144b7f18679bb4fca8147e669f0dabaee8dc53bb8cf002204e18fddcc331a913812ec033f572499f74a4711f2c
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/jsr305/jsr305-3.0.1.ebuild b/dev-java/jsr305/jsr305-3.0.1.ebuild
new file mode 100644
index 000000000000..02401bb30056
--- /dev/null
+++ b/dev-java/jsr305/jsr305-3.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for Software Defect Detection in Java"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=305"
+SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr305/jsr305-3.0.2.ebuild b/dev-java/jsr305/jsr305-3.0.2.ebuild
new file mode 100644
index 000000000000..13fb5256256d
--- /dev/null
+++ b/dev-java/jsr305/jsr305-3.0.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for Software Defect Detection in Java"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=305"
+SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr305/metadata.xml b/dev-java/jsr305/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/jsr305/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/jsr311-api-1.1.1 b/dev-java/jsr311-api-1.1.1
deleted file mode 100644
index 1b35257561f7..000000000000
--- a/dev-java/jsr311-api-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JAX-RS: Java API for RESTful Web Services
-EAPI=5
-HOMEPAGE=http://jcp.org/en/jsr/detail?id=311
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://repo1.maven.org/maven2/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d9267f51129fbebd084011565a577bc8
diff --git a/dev-java/jsr311-api/Manifest b/dev-java/jsr311-api/Manifest
new file mode 100644
index 000000000000..ef1cb2a1cef9
--- /dev/null
+++ b/dev-java/jsr311-api/Manifest
@@ -0,0 +1,3 @@
+DIST jsr311-api-1.1.1-sources.jar 70022 BLAKE2B ca1c08bbdc256475adb89642d97ee278f0a26bd1191a29460a928a5148449207e41906eddc7a76bcfa8451cb241230ed8010e261ba8ac37ca0d260d6c4d1a3b9 SHA512 4f32eb290aa312794ae91b3b4e2baa72efbcf2036962c7223320f7f7e7cd9b5de10c4acb1c92277df946b12710e0699bc1d3ddd7459903c43107437c21cb5542
+EBUILD jsr311-api-1.1.1.ebuild 481 BLAKE2B 179ced19f3a53bb6aa28125801e7856c421875b157f1571f93a7c985f5ed8cf600791e0bdbf364be6542a66f5345f8a2a8164387b15e60e6c55593cadfd2ff08 SHA512 9fa64ba0a95532e29ba88eb0219e7d6161ef0a8eb2f09f2f61a15a0a5a4ee0499d2b97bf7174010a857a0a5eb6d035145d2b6e5a4ba7c7476a5d5e7bca7232f6
+MISC metadata.xml 311 BLAKE2B 82efd30bd45f2e0eaef17b58340eeb8019307f9c81b1290da6701286460238d1243515eb3c0aec483b0addef4898166e0596e01d33cd4d2c2ba6b3054161891f SHA512 8e793d62ff46c9527765620d70db6a304f5b4789a2cc7a5674c736d80ac4ae96d30d463cd5ad14078375887ca034823e2ea499c3b9ddf544157d001d1b273211
diff --git a/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild b/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
new file mode 100644
index 000000000000..0a55c763d1c7
--- /dev/null
+++ b/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JAX-RS: Java API for RESTful Web Services"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=311"
+SRC_URI="http://repo1.maven.org/maven2/javax/ws/rs/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr311-api/metadata.xml b/dev-java/jsr311-api/metadata.xml
new file mode 100644
index 000000000000..9d9f207e4b59
--- /dev/null
+++ b/dev-java/jsr311-api/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jsr322-1.5 b/dev-java/jsr322-1.5
deleted file mode 100644
index 23cdd8014602..000000000000
--- a/dev-java/jsr322-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java EE Connector Architecture
-EAPI=5
-HOMEPAGE=http://jcp.org/en/jsr/detail?id=322
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/javax/resource/connector-api/1.5/connector-api-1.5-sources.jar -> jsr322-1.5.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=23cb0595b8bf58a4c9c2500b01b2aeed
diff --git a/dev-java/jsr322/Manifest b/dev-java/jsr322/Manifest
new file mode 100644
index 000000000000..9e2602f2c49a
--- /dev/null
+++ b/dev-java/jsr322/Manifest
@@ -0,0 +1,3 @@
+DIST jsr322-1.5.jar 86462 BLAKE2B e39aa3573ec711c721ed1cdf6ba3a3d58eb267ff6e05222852ba0d424100dfd9048f39e3f22910e70da60c8cbfff7ecd552488122789ade09a21972d8373e589 SHA512 e96d54f8ac8279e53754a3950590382f7857abf26a0a97f7ad70dc72e0da66c11c537627a329bee943756ffbb4d96e47b0501663b51c3775fb1dd5e8bfe3a9ae
+EBUILD jsr322-1.5.ebuild 536 BLAKE2B 9e1a143300b114a09852793177a2af8758814dbe4d61a0dbdafb859ecab35e154bb81b79f7b9712f4f599216a352ce8a2869bdac733f63c58ebb2c01d63fe007 SHA512 7996cd39fdcf80da79498a55ae1f91b20a6044e049e688d912dbfe523b4b70957c998948f5706be3710cb1e55a3a6a8f20063ea33281a7178a74f98eb5f5b237
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/jsr322/jsr322-1.5.ebuild b/dev-java/jsr322/jsr322-1.5.ebuild
new file mode 100644
index 000000000000..a6017011f867
--- /dev/null
+++ b/dev-java/jsr322/jsr322-1.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source doc"
+
+MY_PN="connector-api"
+MY_P="${MY_PN}-${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java EE Connector Architecture"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=322"
+SRC_URI="https://repo1.maven.org/maven2/javax/resource/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr322/metadata.xml b/dev-java/jsr322/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/jsr322/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/jsr67-1.3-r1 b/dev-java/jsr67-1.3-r1
deleted file mode 100644
index c60f31778d66..000000000000
--- a/dev-java/jsr67-1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=SAAJ 1.3 (AKA JSR-67 MR3) API
-EAPI=5
-HOMEPAGE=https://jcp.org/en/jsr/detail?id=67
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=sun-jsr67
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/com/sun/xml/messaging/saaj/saaj-impl/1.3/saaj-impl-1.3-sources.jar -> jsr67-1.3.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c2be0304b20e39b97206358694681269
diff --git a/dev-java/jsr67/Manifest b/dev-java/jsr67/Manifest
new file mode 100644
index 000000000000..ab30e38eeae7
--- /dev/null
+++ b/dev-java/jsr67/Manifest
@@ -0,0 +1,3 @@
+DIST jsr67-1.3.jar 327033 BLAKE2B cdfcb6d600a3b6cf6d355906eced551053f2cf608596dacfa477337d54eb47ef5dd6d87f508c59587453972d0eb547e6d6863ff57ec1d3c9e366f812c05a87c4 SHA512 c4145e5870af677542a09a17b7b57d9e5501f6354b26743b9eb9946dbd263114eb705c023af996ddcb256961df28a7ac2420a54fcdd69f73c8595901ee21760a
+EBUILD jsr67-1.3-r1.ebuild 551 BLAKE2B 625582c872f76bed715843e53df91e15213612ddc7c0617ddd0847d443bb8c00b4616d68e68cc4fe1d995fc23794a0ae004e57510d4e27c53f845583bf544bf2 SHA512 e166b2b9e1ab8757b8d56dd057a78c1e03efd88f1aedecf90d3f0d94789f9142b7e7e564dca146376e7d4a0b7fa0d2fc6657216b14219d071d6acf4f1cbe1930
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/jsr67/jsr67-1.3-r1.ebuild b/dev-java/jsr67/jsr67-1.3-r1.ebuild
new file mode 100644
index 000000000000..e9e87397f717
--- /dev/null
+++ b/dev-java/jsr67/jsr67-1.3-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+MY_PN="saaj-impl"
+MY_P="${MY_PN}-${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SAAJ 1.3 (AKA JSR-67 MR3) API"
+HOMEPAGE="https://jcp.org/en/jsr/detail?id=67"
+SRC_URI="https://repo1.maven.org/maven2/com/sun/xml/messaging/${MY_PN%%-*}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="sun-jsr67"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr67/metadata.xml b/dev-java/jsr67/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/jsr67/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/jss-4.3.2 b/dev-java/jss-4.3.2
deleted file mode 100644
index a2441de2347d..000000000000
--- a/dev-java/jss-4.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.1 >=dev-libs/nss-3.12.5 dev-lang/perl >=virtual/jdk-1.6 virtual/pkgconfig test? ( dev-libs/nss[utils] ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Network Security Services for Java (JSS)
-EAPI=5
-HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS
-IUSE=examples test elibc_FreeBSD doc source
-KEYWORDS=amd64 x86
-LICENSE=MPL-1.1
-RDEPEND=>=dev-libs/nspr-4.7.1 >=dev-libs/nss-3.12.5 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=3.4
-SRC_URI=https://dev.gentoo.org/~chewi/distfiles/jss-4.3.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3ecfdb3992479889e3532fb0c35dc4fc
diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest
new file mode 100644
index 000000000000..f6c6c2adb809
--- /dev/null
+++ b/dev-java/jss/Manifest
@@ -0,0 +1,9 @@
+AUX jss-3.4-target_source.patch 633 BLAKE2B a28bc0629e20852554e569f24ae494690d96320265c7b41a29b3debb17aa11d7c4b85b6b495f6f37812d36f8c73ee1a39d55f5110ed4bae9047ca2dfbb69d0a7 SHA512 5e41d3c7ccebdf91394f8c2e341f2d4667ec1b8a77417abff69be950d41824409f065023a927fa9836c3301e8df5ff2183c259338636cb04c31c38a6385fb4ce
+AUX jss-4.2.5-use_pkg-config.patch 1004 BLAKE2B 9cacf1b6499d4b87ae4de80dc403815942063ff2859491ee35a875f47cca95dcd79ac44b4e91f9ceca9926b0571bd09b0fe504b38ab69dbdf91f2be796b7c7b0 SHA512 1e32d7d9b66b90ed4e974ad5e3e0bf35c5d36fc749fa8398597b17bab27f076c533d724620b57a2cabfe2020a2b9979aa393ea4736bacff86798814e94367559
+AUX jss-4.3-cflags.patch 511 BLAKE2B f8a9f86047432348d0e82da5d540db0ab58e25d83ed1b7ece3ff8e585bed07deb2e44dd40f656d164c0796278c15c7ec5acb037099978ea20ab50a15bb3adff8 SHA512 80d01093adf1006771a3e0d8a03e826b4f68819297c4d2f1ef28b9403a7c9d50a08929c1e84b3ca471bf0a56fd60de2bff8555bd25596f3d869daa102916d513
+AUX jss-4.3-javadoc.patch 660 BLAKE2B 775e482c8b50d6eaff279de62825bc64a2c4633665a4c06911839fc1fbd45d708c993b0a1330325b3a587cd631d4b08b8cd30507cc7cee3a754eb06a743bcfd3 SHA512 8ecc605934999a1c6d063b71345727561daff776c411147e8c2858c127ca8d430e79f155b19e7527a4be41e50d8b96f19f02788d2f2db673e87bbbaf9ca0f7ea
+AUX jss-4.3-secitem.patch 5259 BLAKE2B 7ddf49b8857bed0b6c5412104b076124d8a01c0d52d4ff0828532658e86921de855e3b74d4cd3637afa450cf6a162c0d5ca7d2092b1bf6d5d54263dee9528504 SHA512 16eedbfd311829e2fa73ff88767b2474fcd1f5750cf3351d3bc23efdcbcb2729f861a7f69d6589418e6308576846b93a8d7dc615095c0cadc0accb9f63f6850b
+AUX jss-4.3.2-ldflags.patch 465 BLAKE2B 77ecfcfaf39cfde7d15b7b23a78c9fec92db72eb4bfb336b7afd1b92ec2d5c03802205bc71afae0e7d6a83eb6d8a86339b46d3d6062aecb90c645852cc440c06 SHA512 19910a0aeb0b994d0f5c871d011a7b97a0d323f43dcc86d88442aed17561c1bab379e0eeae93961afaf595a2651d29c17a36daa28a2bbfe522fcd04955d82214
+DIST jss-4.3.2.tar.bz2 435542 BLAKE2B 9623018e6e67654219fa439fdc907777cd286aa28b6bdbafee39a7082f949bc393d60dba32ca0b49178ecd423dcff0aa3ad411abb9db9332c6429d7751d89127 SHA512 3296da72f204fc4a0ea58dd889cf2721a4afa0ec7b5406312e64354cc67edcfc370140ad22a24f0dfcf11e438e69ebe9da45a70b5cbaa4026b40fd5fcf96c232
+EBUILD jss-4.3.2.ebuild 2759 BLAKE2B 8352d5e0e941de72fbecc4f9b47bdc6346500c65c13d861daf87f1e7412a2aefcf9c45e1bb8ef87321d687594e51ae8a758959cef1e7349d38069b1a501a6f72 SHA512 bf3369ab5385c7a36bbe51a0e4b4efa4358febe655e8d72b0ccc46eb0e8ad46d9054d78d9c1e19cb16f5348e352608c5ca247b4e07b96dc40352e586fbc1b830
+MISC metadata.xml 508 BLAKE2B 1c0a970c2297ce45006e6779871e7f9ea7035f3cc395b7b1dd7b5eb08594c3804f1b3024b8ac68fbdd8d9fdb841846c4f38006d361b66ceaabcadca566d9b0de SHA512 025f9d7f269f4c0dc744e6b705311b1efcb730bbe32e08a70233f2bb8a62a69e3d65de6cd2c3d3c8afdb383cee4bf76af180fff12b187dce7504d1e55fa56d4f
diff --git a/dev-java/jss/files/jss-3.4-target_source.patch b/dev-java/jss/files/jss-3.4-target_source.patch
new file mode 100644
index 000000000000..e024a0b8b622
--- /dev/null
+++ b/dev-java/jss/files/jss-3.4-target_source.patch
@@ -0,0 +1,12 @@
+diff -Nru jss-3.4-src/mozilla/security/jss/build_java.pl jss-3.4-src.patched/mozilla/security/jss/build_java.pl
+--- jss-3.4-src/mozilla/security/jss/build_java.pl	2002-10-17 02:33:29.000000000 +0200
++++ jss-3.4-src.patched/mozilla/security/jss/build_java.pl	2006-08-15 00:53:05.000000000 +0200
+@@ -190,7 +190,7 @@
+     #
+     if( scalar(@source_list) > 0 ) {
+         ensure_dir_exists($class_dir);
+-        print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " .
++        print_do("$javac $ENV{JAVA_GENTOO_OPTS} $javac_opt_flag -sourcepath . -d $class_dir " .
+             "$classpath " . join(" ",@source_list));
+     }
+ 
diff --git a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
new file mode 100644
index 000000000000..a2c3a3e5ad93
--- /dev/null
+++ b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
@@ -0,0 +1,25 @@
+Submitted By: Mario Fetka (mario-fetka at gmx dot at)
+Date: 2007-10-06
+Initial Package Version: 4.2.5
+Origin: me
+Upstream Status: #392775 UNCONFIRMED 
+Description: this patch adds pkgconfig support to jss coreconf 
+!!!! no check for NSS_PKGCONFIG NSPR_PKGCONFIG at the moment !!!!
+ 
+diff -Naur mozilla.orig/security/coreconf/location.mk mozilla/security/coreconf/location.mk
+--- mozilla.orig/security/coreconf/location.mk	2006-02-27 21:18:31.000000000 +0000
++++ mozilla/security/coreconf/location.mk	2007-10-06 10:10:17.000000000 +0000
+@@ -67,6 +67,13 @@
+ 
+ GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*)
+ 
++ifdef USE_PKGCONFIG
++    NSPR_INCLUDE_DIR = `pkg-config --variable=includedir $(NSPR_PKGCONFIG)`
++    NSPR_LIB_DIR = `pkg-config --variable=libdir $(NSPR_PKGCONFIG)`
++    NSS_INCLUDE_DIR = `pkg-config --variable=includedir $(NSS_PKGCONFIG)`
++    NSS_LIB_DIR = `pkg-config --variable=libdir $(NSS_PKGCONFIG)`
++endif
++
+ ifdef NSPR_INCLUDE_DIR
+     INCLUDES += -I$(NSPR_INCLUDE_DIR)
+ endif
diff --git a/dev-java/jss/files/jss-4.3-cflags.patch b/dev-java/jss/files/jss-4.3-cflags.patch
new file mode 100644
index 000000000000..3298a2765fc1
--- /dev/null
+++ b/dev-java/jss/files/jss-4.3-cflags.patch
@@ -0,0 +1,11 @@
+--- security/coreconf/command.mk	2007-10-23 23:55:00.000000000 +0200
++++ security/coreconf/command.mk.b	2013-06-05 11:15:31.092383902 +0200
+@@ -45,7 +45,7 @@
+ CCF           = $(CC) $(CFLAGS)
+ LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
+ LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
+-CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
++CFLAGS       += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
+ 		$(XCFLAGS)
+ PERL          = perl
+ RANLIB        = echo
diff --git a/dev-java/jss/files/jss-4.3-javadoc.patch b/dev-java/jss/files/jss-4.3-javadoc.patch
new file mode 100644
index 000000000000..891e1ff93838
--- /dev/null
+++ b/dev-java/jss/files/jss-4.3-javadoc.patch
@@ -0,0 +1,11 @@
+--- security/jss/build_java.pl.orig	2015-10-01 23:04:22.540035573 +0100
++++ security/jss/build_java.pl	2015-10-01 23:11:41.413230402 +0100
+@@ -323,7 +323,7 @@
+     ensure_dir_exists("$dist_dir/jssdoc");
+     my $targets = join(" ", @packages);
+     print "$targets\n";
+-    print_do("$javadoc -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
++    print_do("$javadoc -Xdoclint:none -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
+     print_do("cp $dist_dir/jssdoc/index.html $dist_dir/jssdoc/index.html.bak");
+     print_do("cp $dist_dir/jssdoc/overview-summary.html $dist_dir/jssdoc/index.html");
+ }
diff --git a/dev-java/jss/files/jss-4.3-secitem.patch b/dev-java/jss/files/jss-4.3-secitem.patch
new file mode 100644
index 000000000000..d9e7da394075
--- /dev/null
+++ b/dev-java/jss/files/jss-4.3-secitem.patch
@@ -0,0 +1,154 @@
+--- a/security/jss/org/mozilla/jss/CryptoManager.c	2008-05-22 06:28:09.000000000 +0200
++++ b/security/jss/org/mozilla/jss/CryptoManager.c	2013-06-05 11:09:58.649080012 +0200
+@@ -35,7 +35,7 @@
+  * ***** END LICENSE BLOCK ***** */
+ #include "_jni/org_mozilla_jss_CryptoManager.h"
+ 
+-#include <secitem.h>
++#include <nss/secitem.h>
+ #include <secmod.h>
+ #include <cert.h>
+ #include <certt.h>
+--- a/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c	2003-12-19 20:36:30.000000000 +0100
++++ b/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c	2013-06-05 11:09:58.585746684 +0200
+@@ -36,7 +36,7 @@
+ 
+ #include "_jni/org_mozilla_jss_SecretDecoderRing_KeyManager.h"
+ #include <nspr.h>
+-#include <secitem.h>
++#include <nss/secitem.h>
+ #include <jss_exceptions.h>
+ #include <jssutil.h>
+ #include <pk11func.h>
+--- a/security/jss/org/mozilla/jss/crypto/PQGParams.c	2004-04-25 17:02:21.000000000 +0200
++++ b/security/jss/org/mozilla/jss/crypto/PQGParams.c	2013-06-05 11:09:58.589080017 +0200
+@@ -39,7 +39,7 @@
+ #include <nspr.h>
+ 
+ #include <plarena.h>
+-#include <secitem.h>
++#include <nss/secitem.h>
+ #include <secoidt.h>
+ #include <keyt.h>   /* for PQGParams */
+ #include <pk11pqg.h>
+--- a/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c	2002-01-08 20:38:46.000000000 +0100
++++ b/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c	2013-06-05 11:09:58.585746684 +0200
+@@ -36,7 +36,7 @@
+ 
+ #include "_jni/org_mozilla_jss_crypto_SecretDecoderRing.h"
+ #include <nspr.h>
+-#include <secitem.h>
++#include <nss/secitem.h>
+ #include <pk11sdr.h>
+ #include <jss_exceptions.h>
+ #include <jssutil.h>
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c	2004-04-25 17:02:22.000000000 +0200
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c	2013-06-05 11:09:58.632413347 +0200
+@@ -40,7 +40,7 @@
+ #include <plarena.h>
+ #include <seccomon.h>
+ #include <pk11func.h>
+-#include <secitem.h>
++#include <nss/secitem.h>
+ 
+ /* JSS includes */
+ #include <java_ids.h>
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c	2006-02-23 02:21:42.000000000 +0100
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c	2013-06-05 11:09:58.595746684 +0200
+@@ -40,7 +40,7 @@
+ #include <pk11pqg.h>
+ #include <nspr.h>
+ #include <key.h>
+-#include <secitem.h>
++#include <nss/secitem.h>
+ 
+ #include <jssutil.h>
+ #include <pk11util.h>
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c	2006-02-23 02:21:42.000000000 +0100
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c	2013-06-05 11:09:58.629080014 +0200
+@@ -40,7 +40,7 @@
+ #include <plarena.h>
+ #include <seccomon.h>
+ #include <pk11func.h>
+-#include <secitem.h>
++#include <nss/secitem.h>
+ #include <keyt.h>
+ 
+ /* JSS includes */
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c	2004-04-25 17:02:22.000000000 +0200
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c	2013-06-05 11:09:58.609080016 +0200
+@@ -40,7 +40,7 @@
+ #include <plarena.h>
+ #include <seccomon.h>
+ #include <pk11func.h>
+-#include <secitem.h>
++#include <nss/secitem.h>
+ 
+ /* JSS includes */
+ #include <java_ids.h>
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c	2006-04-25 03:26:42.000000000 +0200
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c	2013-06-05 11:09:58.609080016 +0200
+@@ -43,7 +43,7 @@
+ #include <secerr.h>
+ #include <nspr.h>
+ #include <key.h>
+-#include <secitem.h>
++#include <nss/secitem.h>
+ 
+ #include <jss_bigint.h>
+ #include <jssutil.h>
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c	2004-04-25 17:02:22.000000000 +0200
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c	2013-06-05 11:09:58.605746683 +0200
+@@ -35,7 +35,7 @@
+  * ***** END LICENSE BLOCK ***** */
+ 
+ #include <nspr.h>
+-#include <secitem.h>
++#include <nss/secitem.h>
+ #include <secoidt.h>
+ #include <secmodt.h>
+ #include <pk11func.h>
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.c	2007-11-10 01:37:57.000000000 +0100
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.c	2013-06-05 11:09:58.622413348 +0200
+@@ -53,7 +53,7 @@
+ #include <jss_bigint.h>
+ #include <Algorithm.h>
+ 
+-#include <secitem.h>
++#include <nss/secitem.h>
+ #include "java_ids.h"
+ 
+ #include "pk11util.h"
+--- a/security/jss/org/mozilla/jss/ssl/callbacks.c	2004-09-03 20:32:03.000000000 +0200
++++ b/security/jss/org/mozilla/jss/ssl/callbacks.c	2013-06-05 11:09:58.565746686 +0200
+@@ -39,7 +39,7 @@
+ #include <nspr.h>
+ #include <java_ids.h>
+ #include <jss_exceptions.h>
+-#include <secitem.h>
++#include <nss/secitem.h>
+ #include <jssutil.h>
+ #include <certt.h>
+ #include <keythi.h>
+--- a/security/jss/org/mozilla/jss/util/jssutil.c	2004-04-25 17:02:29.000000000 +0200
++++ b/security/jss/org/mozilla/jss/util/jssutil.c	2013-06-05 11:09:58.579080018 +0200
+@@ -38,7 +38,7 @@
+ #include <nspr.h>
+ #include <plstr.h>
+ #include <seccomon.h>
+-#include <secitem.h>
++#include <nss/secitem.h>
+ #include "jssutil.h"
+ #include "jss_bigint.h"
+ #include "jss_exceptions.h"
+--- a/security/jss/org/mozilla/jss/util/jssutil.h	2004-04-25 17:02:29.000000000 +0200
++++ b/security/jss/org/mozilla/jss/util/jssutil.h	2013-06-05 11:09:49.829080794 +0200
+@@ -39,7 +39,7 @@
+ /* Need to include these first.
+  * #include <nspr.h>
+  * #include <jni.h>
+- * #include <secitem.h>
++ * #include <nss/secitem.h>
+  */
+ 
+ PR_BEGIN_EXTERN_C
diff --git a/dev-java/jss/files/jss-4.3.2-ldflags.patch b/dev-java/jss/files/jss-4.3.2-ldflags.patch
new file mode 100644
index 000000000000..fde2e26bf77c
--- /dev/null
+++ b/dev-java/jss/files/jss-4.3.2-ldflags.patch
@@ -0,0 +1,11 @@
+--- security/coreconf/Linux.mk.orig	2010-01-15 22:19:00.000000000 +0000
++++ security/coreconf/Linux.mk	2015-09-27 22:17:50.102547607 +0100
+@@ -142,7 +142,7 @@
+ ARCH			= linux
+ 
+ DSO_CFLAGS		= -fPIC
+-DSO_LDOPTS		= -shared $(ARCHFLAG)
++DSO_LDOPTS		= $(LDFLAGS) -shared $(ARCHFLAG)
+ # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
+ # incorrectly reports undefined references in the libraries we link with, so
+ # we don't use -z defs there.
diff --git a/dev-java/jss/jss-4.3.2.ebuild b/dev-java/jss/jss-4.3.2.ebuild
new file mode 100644
index 000000000000..077c3bf848fb
--- /dev/null
+++ b/dev-java/jss/jss-4.3.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit multilib toolchain-funcs java-pkg-2
+
+DESCRIPTION="Network Security Services for Java (JSS)"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS"
+# 4.3.2 was released but was seemingly never announced. The binary jar
+# exists on Mozilla's servers but Chewi could only find a source tarball
+# at https://obs.kolabsys.com/package/show/Kolab:3.4/jss. However, you
+# need to register in order to download it, hence he has mirrored it.
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.bz2"
+LICENSE="MPL-1.1"
+SLOT="3.4"
+KEYWORDS="amd64 x86"
+IUSE="examples test"
+
+CDEPEND=">=dev-libs/nspr-4.7.1
+	>=dev-libs/nss-3.12.5"
+
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	>=virtual/jdk-1.6
+	virtual/pkgconfig
+	test? ( dev-libs/nss[utils] )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}/mozilla"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.4-target_source.patch
+	epatch "${FILESDIR}"/${PN}-4.2.5-use_pkg-config.patch
+	epatch "${FILESDIR}"/${PN}-4.3-cflags.patch
+	epatch "${FILESDIR}"/${PN}-4.3.2-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-4.3-secitem.patch
+
+	if java-pkg_is-vm-version-ge 1.8; then
+		epatch "${FILESDIR}"/${PN}-4.3-javadoc.patch
+	fi
+}
+
+src_compile() {
+	local ARGS=(
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR) cr \$@"
+		"OS_RELEASE=2.6"
+		"BUILD_OPT=1"
+	)
+
+	export JAVA_GENTOO_OPTS="$(java-pkg_javac-args)"
+	use amd64 && export USE_64=1
+
+	cd "${S}/security/coreconf" || die
+	emake -j1 "${ARGS[@]}"
+
+	cd "${S}/security/jss" || die
+	emake -j1 "${ARGS[@]}" USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr
+	use doc && emake -j1 "${ARGS[@]}" javadoc
+}
+
+# Chewi has managed to reach a test pass rate of 31/40 (78%) but the
+# remainder fail due to JSS not having kept pace with the ciphersuites
+# in NSS. There's not much we can do about that. The suite also leaves
+# java processes running and exits successfully on failure.
+RESTRICT="test"
+
+src_test() {
+	# Parts of NSS are required for the tests.
+	ln -snf "${EROOT}usr/$(get_libdir)/libnssckbi.so" dist/Linux*.OBJ/lib/ || die
+	ln -snf "${EROOT}usr/bin" dist/Linux*.OBJ/ || die
+
+	# The tests must be run from this directory.
+	cd security/jss/org/mozilla/jss/tests || die
+	BUILD_OPT=1 perl all.pl dist "${S}"/dist/Linux*.OBJ/ || die "tests failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/*.jar
+
+	# Use this instead of the one in dist because it is a symlink
+	# and doso handles symlinks by just symlinking to the original
+	java-pkg_doso ./security/${PN}/lib/*/*.so
+
+	use doc && java-pkg_dojavadoc dist/jssdoc
+	use source && java-pkg_dosrc ./security/jss/org
+	use examples && java-pkg_doexamples ./security/jss/samples
+}
diff --git a/dev-java/jss/metadata.xml b/dev-java/jss/metadata.xml
new file mode 100644
index 000000000000..a3b5c860a274
--- /dev/null
+++ b/dev-java/jss/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+
+Network Security Services for Java (JSS) is a Java interface to NSS. It supports
+most of the security standards and encryption technologies supported by NSS. JSS
+also provides a pure Java interface for ASN.1 types and BER/DER encoding.
+
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jssc-2.8.0-r1 b/dev-java/jssc-2.8.0-r1
deleted file mode 100644
index 3fe649e9dfc2..000000000000
--- a/dev-java/jssc-2.8.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Simple Serial Connector
-EAPI=5
-HOMEPAGE=https://github.com/scream3r/java-simple-serial-connector
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/scream3r/java-simple-serial-connector/archive/2.8.0.zip -> jssc-2.8.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b238f6570dbc2e7cadfe16a8040b61f6
diff --git a/dev-java/jssc/Manifest b/dev-java/jssc/Manifest
new file mode 100644
index 000000000000..b95af68ed13f
--- /dev/null
+++ b/dev-java/jssc/Manifest
@@ -0,0 +1,4 @@
+AUX jssc-2.8.0-library-load.patch 4572 BLAKE2B c8018fce9326cb117e6087d2ffeeb041d6c75241b052efa7b9b21777cabcc8e053ade40cde005bb89a63cc03efc4a70a845dd559598b22b3c185a6218d7a5218 SHA512 5121cc00985736236fbeb05117135aa187d9587cb85c28f96958d9d7a1f9564f6be91a3c82856353c477728bcb725c86a9dce4732b3a2b67cbd813af7544c646
+DIST jssc-2.8.0.zip 171914 BLAKE2B 8bac5000d5512683809efab0ef041228f846390b29fa51ad5295d655dbec031dfc0a7ad67f7589d3f8b5dcfa8facd9896c7ec545b9db9c442eb3d34b569cd948 SHA512 4d767054085a79cff4fe60d96d664918f69a791c8263d96c9d9fd622070f567acacb621079f23d5c54253366beb9d2a01fea7ea48b95f6267bc693a9bacb8466
+EBUILD jssc-2.8.0-r1.ebuild 1183 BLAKE2B 50eeae46270fc20825e5768fffaac1d5843b1bf883ea6e4b82d41579d47aa0c3ff807087357a594d93c12ba532b701977391c7d8ccad9384a43dc5f3d5b84a48 SHA512 55d8817e376c68a9a05a7b92d1022698a1523342c32316e26724cca6c35104e86866a7c06d9b0ae5e8989a41de89bd0f1c3f2748c0f5d91b05432f69c1646791
+MISC metadata.xml 433 BLAKE2B 47268fc5f9bf04e831da068f80e73de826d48af6f635a795c622c32275ff28983b372cdbdaffb864cfc9556d60ef88b34a8bf5c3b925a606c473d715a647f507 SHA512 260b57a995c9d91cf894a0d56f23cbf07498f3256f4f86dbf4d37ec6b92085f9834437878b0addc7e91ba319798bfa18dda55627c89966c871f61b247f11449f
diff --git a/dev-java/jssc/files/jssc-2.8.0-library-load.patch b/dev-java/jssc/files/jssc-2.8.0-library-load.patch
new file mode 100644
index 000000000000..829a18af69bd
--- /dev/null
+++ b/dev-java/jssc/files/jssc-2.8.0-library-load.patch
@@ -0,0 +1,117 @@
+--- src/java/jssc/SerialNativeInterface.java.orig	2016-03-13 16:35:20.521644430 -0400
++++ src/java/jssc/SerialNativeInterface.java	2016-03-13 16:38:00.022571256 -0400
+@@ -44,7 +44,7 @@
+     public static final int OS_SOLARIS = 2;//since 0.9.0
+     public static final int OS_MAC_OS_X = 3;//since 0.9.0
+ 
+-    private static int osType = -1;
++    private static int osType = OS_LINUX;
+ 
+     /**
+      * @since 2.3.0
+@@ -77,104 +77,11 @@
+     public static final String PROPERTY_JSSC_PARMRK = "JSSC_PARMRK";
+ 
+     static {
+-        String libFolderPath;
+-        String libName;
+-
+-        String osName = System.getProperty("os.name");
+-        String architecture = System.getProperty("os.arch");
+-        String userHome = System.getProperty("user.home");
+-        String fileSeparator = System.getProperty("file.separator");
+-        String tmpFolder = System.getProperty("java.io.tmpdir");
+-
+-        //since 2.3.0 ->
+-        String libRootFolder = new File(userHome).canWrite() ? userHome : tmpFolder;
+-        //<- since 2.3.0
+-
+-        String javaLibPath = System.getProperty("java.library.path");//since 2.1.0
+-
+-        if(osName.equals("Linux")){
+-            osName = "linux";
+-            osType = OS_LINUX;
+-        }
+-        else if(osName.startsWith("Win")){
+-            osName = "windows";
+-            osType = OS_WINDOWS;
+-        }//since 0.9.0 ->
+-        else if(osName.equals("SunOS")){
+-            osName = "solaris";
+-            osType = OS_SOLARIS;
+-        }
+-        else if(osName.equals("Mac OS X") || osName.equals("Darwin")){//os.name "Darwin" since 2.6.0
+-            osName = "mac_os_x";
+-            osType = OS_MAC_OS_X;
+-        }//<- since 0.9.0
+-
+-        if(architecture.equals("i386") || architecture.equals("i686")){
+-            architecture = "x86";
+-        }
+-        else if(architecture.equals("amd64") || architecture.equals("universal")){//os.arch "universal" since 2.6.0
+-            architecture = "x86_64";
+-        }
+-        else if(architecture.equals("arm")) {//since 2.1.0
+-            String floatStr = "sf";
+-            if(javaLibPath.toLowerCase().contains("gnueabihf") || javaLibPath.toLowerCase().contains("armhf")){
+-                floatStr = "hf";
+-            }
+-            else {
+-                try {
+-                    Process readelfProcess =  Runtime.getRuntime().exec("readelf -A /proc/self/exe");
+-                    BufferedReader reader = new BufferedReader(new InputStreamReader(readelfProcess.getInputStream()));
+-                    String buffer = "";
+-                    while((buffer = reader.readLine()) != null && !buffer.isEmpty()){
+-                        if(buffer.toLowerCase().contains("Tag_ABI_VFP_args".toLowerCase())){
+-                            floatStr = "hf";
+-                            break;
+-                        }
+-                    }
+-                    reader.close();
+-                }
+-                catch (Exception ex) {
+-                    //Do nothing
+-                }
+-            }
+-            architecture = "arm" + floatStr;
+-        }
+-        
+-        libFolderPath = libRootFolder + fileSeparator + ".jssc" + fileSeparator + osName;
+-        libName = "jSSC-" + libVersion + "_" + architecture;
+-        libName = System.mapLibraryName(libName);
+-
+-        if(libName.endsWith(".dylib")){//Since 2.1.0 MacOSX 10.8 fix
+-            libName = libName.replace(".dylib", ".jnilib");
+-        }
+-
+-        boolean loadLib = false;
+-
+-        if(isLibFolderExist(libFolderPath)){
+-            if(isLibFileExist(libFolderPath + fileSeparator + libName)){
+-                loadLib = true;
+-            }
+-            else {
+-                if(extractLib((libFolderPath + fileSeparator + libName), osName, libName)){
+-                    loadLib = true;
+-                }
+-            }
+-        }
+-        else {
+-            if(new File(libFolderPath).mkdirs()){
+-                if(extractLib((libFolderPath + fileSeparator + libName), osName, libName)){
+-                    loadLib = true;
+-                }
+-            }
+-        }
+-
+-        if (loadLib) {
+-            System.load(libFolderPath + fileSeparator + libName);
++            System.loadLibrary("jssc");
+             String versionBase = getLibraryBaseVersion();
+             String versionNative = getNativeLibraryVersion();
+             if (!versionBase.equals(versionNative)) {
+                 System.err.println("Warning! jSSC Java and Native versions mismatch (Java: " + versionBase + ", Native: " + versionNative + ")");
+-            }
+         }
+     }
+ 
diff --git a/dev-java/jssc/jssc-2.8.0-r1.ebuild b/dev-java/jssc/jssc-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..e36b1c84a10c
--- /dev/null
+++ b/dev-java/jssc/jssc-2.8.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs
+
+MY_PN="java-simple-serial-connector"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java Simple Serial Connector"
+HOMEPAGE="https://github.com/scream3r/java-simple-serial-connector"
+SRC_URI="https://github.com/scream3r/${MY_PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-library-load.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	$(tc-getCXX) \
+		${CPP_FLAGS} ${CXX_FLAGS} \
+		-c -o ${PN}.o \
+		-fPIC -Wall \
+		-I$(java-config-2 -o)/include \
+		-I$(java-config-2 -o)/include/linux \
+		"${S}/src/cpp/_nix_based/${PN}.cpp" || die
+
+	$(tc-getCXX) \
+		-Wl,-soname,libjssc.so \
+		-shared -o "libjssc.so.${PV}" \
+		-Wall "${PN}.o" || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dolib libjssc*
+	dosym "libjssc.so.${PV}" /usr/$(get_libdir)/libjssc.so
+}
diff --git a/dev-java/jssc/metadata.xml b/dev-java/jssc/metadata.xml
new file mode 100644
index 000000000000..4767debd6260
--- /dev/null
+++ b/dev-java/jssc/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">scream3r/java-simple-serial-connector</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jstun-0.7.3 b/dev-java/jstun-0.7.3
deleted file mode 100644
index 61b232d71298..000000000000
--- a/dev-java/jstun-0.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/junit:0 ) dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java-based STUN implementation
-EAPI=5
-HOMEPAGE=https://jstun.javawi.de/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://jstun.javawi.de/jstun-0.7.3.src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cd3cac237e9c6b87e4340f0b841a94d1
diff --git a/dev-java/jstun/Manifest b/dev-java/jstun/Manifest
new file mode 100644
index 000000000000..9469e8f0de32
--- /dev/null
+++ b/dev-java/jstun/Manifest
@@ -0,0 +1,3 @@
+DIST jstun-0.7.3.src.tar.gz 173666 BLAKE2B d417b95f2adf5f072b35ca5ea50d3c32c60b0ae7d2095b4ffaa79f6dc9817bc730657189da0abf59f6e3bd362ae34c3c3ad9c02e8456e84a33e02c9cab3bfa65 SHA512 03dd54331c79992ef2c387eb78fde8c98b58e3818515bf57beafb6157914fe9295d3ff043ac8aab78490ac2582969c07e1891ddbefaa702c3816ddac061ceb18
+EBUILD jstun-0.7.3.ebuild 1321 BLAKE2B e1367511b25baa145e056836e4eaf5a364645c1fc6b8b4af01ca1c295ff8316b674666d56ac28dcd8be09841501e8a09c4ff296531609a119b8d1c717dec600f SHA512 46ba021dd9caea66a97808171b8d53387d33fd31f91ac998b884571442015874e7d5005bfa2dfcb31144f5a832138a128fa21a3b90bdf0e922147fe0f878349d
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jstun/jstun-0.7.3.ebuild b/dev-java/jstun/jstun-0.7.3.ebuild
new file mode 100644
index 000000000000..c50d44fcd0f7
--- /dev/null
+++ b/dev-java/jstun/jstun-0.7.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java-based STUN implementation"
+HOMEPAGE="https://jstun.javawi.de/"
+SRC_URI="https://${PN}.javawi.de/${P}.src.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/slf4j-api:0"
+
+RDEPEND="
+	>=virtual/jre-1.5
+	${CDEPEND}"
+
+DEPEND="
+	>=virtual/jdk-1.5
+	test? ( dev-java/junit:0 )
+	${CDEPEND}"
+
+S="${WORKDIR}/STUN"
+
+# Tests contain no main function; demos contain main function, but contact
+# external domains as well as aren't really tests. TODO: A main function needs
+# to be written in order to be able to test de.javawi.jstun.AllTests.
+RESTRICT="test"
+
+EANT_BUILD_XML="build/build.xml"
+
+java_prepare() {
+	rm -v *.jar build/*.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+EANT_TEST_GENTOO_CLASSPATH="junit"
+EANT_TEST_TARGET="jar-test"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_test() {
+	local cp="$(java-pkg_getjars --build-only junit)"
+
+	java-pkg-2_src_test
+
+	java -cp target/${PN}-test-${PV}.jar:${cp} de.javawi.jstun.AllTests \
+		|| die "Tests failed."
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/javadoc
+	use source && java-pkg_dosrc src
+}
diff --git a/dev-java/jstun/metadata.xml b/dev-java/jstun/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jstun/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jta-1.1 b/dev-java/jta-1.1
deleted file mode 100644
index 8603e85494e6..000000000000
--- a/dev-java/jta-1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=The Java Transaction API
-EAPI=5
-HOMEPAGE=http://www.oracle.com/technetwork/java/javaee/jta/index.html
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=sun-bcla-jta
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=jta-1_1-classes.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=39dc9524063cd1c95a512668ee7f3bc9
diff --git a/dev-java/jta/Manifest b/dev-java/jta/Manifest
new file mode 100644
index 000000000000..03d4a5223e60
--- /dev/null
+++ b/dev-java/jta/Manifest
@@ -0,0 +1,3 @@
+DIST jta-1_1-classes.zip 13236 BLAKE2B f2e1ffd531fce804d562c4cdcbe9b260d08eb2bcd79a879f94fbd3e23801849cbf311d8f7410a9776f9a8866027dcedcac479a64444321e8c6b2b23bd9a69054 SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14
+EBUILD jta-1.1.ebuild 1038 BLAKE2B c7033edd634f33b8c3e578445b36c49b337cd49391ac20059fd041c3d95032904c9cb3e85bab1d8b57eec2519ca5ddbf4855e7e6c0fd407d6f28c9ba06d38cd4 SHA512 d23725de3801d5ec78b328a0162c3ab828745debcfdbbfb853d442386e991be5dbc207b15f6d4ab8f958ae9610d2ab6b195eca090482d67380f3b00c7dfb2beb
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jta/jta-1.1.ebuild b/dev-java/jta/jta-1.1.ebuild
new file mode 100644
index 000000000000..6293b663d002
--- /dev/null
+++ b/dev-java/jta/jta-1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JTA_ZIP="jta-1_1-classes.zip"
+
+inherit java-pkg-2
+
+DESCRIPTION="The Java Transaction API"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javaee/jta/index.html"
+SRC_URI="${JTA_ZIP}"
+LICENSE="sun-bcla-jta"
+SLOT=0
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND=" >=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+RESTRICT="fetch"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo
+	einfo " Due to license restrictions, we cannot fetch the"
+	einfo " distributables automagically."
+	einfo
+	einfo " 1. Visit ${HOMEPAGE}"
+	einfo " 2. Select 'Java Transaction API Specification 1.1 Maintenance Release'"
+	einfo " 3. Download ${JTA_ZIP}"
+	einfo " 4. Move file to ${DISTDIR}"
+	einfo " 5. Restart the emerge process"
+	einfo
+}
+
+src_unpack() {
+	unzip -qq "${DISTDIR}"/${JTA_ZIP} || die "failed to unpack"
+}
+
+src_compile() {
+	jar cvf jta.jar javax/ || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar jta.jar
+}
diff --git a/dev-java/jta/metadata.xml b/dev-java/jta/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jta/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jtds-1.3.1 b/dev-java/jtds-1.3.1
deleted file mode 100644
index 9b8675aaf0b6..000000000000
--- a/dev-java/jtds-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/jcifs:1.1 >=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=jTDS - SQL Server and Sybase JDBC driver
-EAPI=5
-HOMEPAGE=http://jtds.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/jcifs:1.1 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.3
-SRC_URI=mirror://sourceforge/jtds/jtds-1.3.1-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=030b7a142a76c3d231cb046bdaff53d6
diff --git a/dev-java/jtds/Manifest b/dev-java/jtds/Manifest
new file mode 100644
index 000000000000..a524ee79ff0e
--- /dev/null
+++ b/dev-java/jtds/Manifest
@@ -0,0 +1,3 @@
+DIST jtds-1.3.1-src.zip 3377625 BLAKE2B 2c5ccfa4d7c6fbb1879007b5f0e9bcfd1ae1061fc68174d1679c72f3f9806433af842d5ca8e47da69acf53b8d517522f33a901adfa35867c96a63446da5269c3 SHA512 1744219a52c7167449388d774fd5e834ef551f60548569c4c54e6caefaade1d932a3879a023869d8d9ddb29ce4ab52b6d08bc4c364d5f372ff5fa96bed6d9864
+EBUILD jtds-1.3.1.ebuild 829 BLAKE2B 692867bb0c1c9f82f98d5fa30cfaee62025d6c16a2411262ef2f11fc375b20fca5d8bd5efce3e53167d0045df22a2dcc358f6d94be28e347ec31f346ecf24241 SHA512 482f2b94a427eecbfd3bccdd678635bd733379c7cd5b04ade41e12dfa5a30f7cc9f5dfa9e871936b0e74b77947bc141a75fe45d23de4509ca9cb8b75adf6adeb
+MISC metadata.xml 877 BLAKE2B fc1466a12596bb64c25bfae6c5d00d90e9541f3e01ba181224ef3c821e4312e46da4e0e1f251cce58654d71d4dd148b057bcba970ce5e9558b8238e936056bce SHA512 0a8371b9d8819206fa47ca34dae6a4ade669eabefc2b94fadb76bc4bcbd3c5d563a0dbe36860c8a90ca23d2b74f2088ed7d89864c94bd0f8f4650bd31844047c
diff --git a/dev-java/jtds/jtds-1.3.1.ebuild b/dev-java/jtds/jtds-1.3.1.ebuild
new file mode 100644
index 000000000000..fd6ec16d4026
--- /dev/null
+++ b/dev-java/jtds/jtds-1.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="jTDS - SQL Server and Sybase JDBC driver"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+HOMEPAGE="http://jtds.sourceforge.net"
+LICENSE="LGPL-2.1"
+SLOT="1.3"
+KEYWORDS="amd64 x86"
+RESTRICT="test" # Needs a running server
+
+CDEPEND="dev-java/jcifs:1.1"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	app-arch/unzip"
+
+JAVA_SRC_DIR="src/main"
+JAVA_ENCODING="ISO-8859-1"
+JAVA_GENTOO_CLASSPATH="jcifs-1.1"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar ${JAVA_SRC_DIR}
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc CHANGELOG README*
+}
diff --git a/dev-java/jtds/metadata.xml b/dev-java/jtds/metadata.xml
new file mode 100644
index 000000000000..816c7d4dfbca
--- /dev/null
+++ b/dev-java/jtds/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+jTDS is an open source 100% pure Java (type 4) JDBC 3.0 driver for Microsoft SQL
+Server (6.5, 7, 2000 and 2005) and Sybase (10, 11, 12). jTDS is based on the
+work of the FreeTDS project and is currently the fastest complete JDBC driver
+for SQL Server and Sybase. Starting with release 0.9 jTDS is 100% JDBC 3.0
+compatible, supporting forward-only and scrollable/updateable ResultSets,
+multiple concurrent (completely independent) Statements per Connection and
+implementing all the DatabaseMetaData and ResultSetMetaData methods.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jtds</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jtidy-1.0 b/dev-java/jtidy-1.0
deleted file mode 100644
index ed13f350b71e..000000000000
--- a/dev-java/jtidy-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java port of HTML Tidy, an HTML syntax checker and pretty printer
-EAPI=5
-HOMEPAGE=http://jtidy.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=HTML-Tidy W3C
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jtidy/jtidy-r938-sources.zip -> jtidy-1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=520505db054e83f36b44f002f2dd3c9c
diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
new file mode 100644
index 000000000000..5a3877d4ccbf
--- /dev/null
+++ b/dev-java/jtidy/Manifest
@@ -0,0 +1,4 @@
+AUX jtidy-1.0-build.xml.patch 994 BLAKE2B 502f0ee95fefbdc9e73f93bc551c029a8fdaf4436b4cc9ea5ae153931ce8915988f2d971eace574b5c4b57acd61957df3251530a24b17f23c2edfc076df48261 SHA512 62a3f995ab94d9759196ae48047d6de75146a82438c60e55e4e6fa27fea0c80685619e19224200462d54cc8c560e354cf1bf5953deddcebbe485c2b217912d30
+DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
+EBUILD jtidy-1.0.ebuild 1041 BLAKE2B f08794ec51cb9effef5e426632e4096cb3f2f09ab41d9d858623794d849c212a72185593562dad437b5c517b35bc289f2f33d93daa14e67f3d4fc8b02fda6cfc SHA512 cb06626f07e65f7e58dca3e4629a1bfe5b9ac3cb8f720f1659c0f38e3f458d1a220ddcec5787507d5df809a880dba6d6826832ce7d0fa485642f413d03851422
+MISC metadata.xml 311 BLAKE2B 0d8fbf35c072fc713578fa67ffa7484cc54ec1f20ea3fb9acf5d3a9067779c7682bd0280f3c6eee33b3b5591d34235ada0a6b9a3c007c9662e7361381c1eebe3 SHA512 1852a1e51bb36399ee3211139e6e6982bbcf87805a92d6b1d677a07aefcc86f6f4fec05c91e4dc3b83cc28db1c8c7001c121f1004683b16b9be72abffdc08368
diff --git a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
new file mode 100644
index 000000000000..fea64813365d
--- /dev/null
+++ b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
@@ -0,0 +1,31 @@
+--- build.xml.orig	2015-12-01 21:10:36.689000000 +0000
++++ build.xml	2015-12-01 21:11:05.642000000 +0000
+@@ -9,11 +9,7 @@
+ 	<property name="srczip" value="jtidy-${version}-sources.zip"/>
+ 	<property name="allzip" value="jtidy-${version}.zip"/>
+ 	
+-	<target name="clean">
+-		<delete dir="${target}"/>
+-	</target>
+-	
+-	<target name="jar" depends="clean">
++  <target name="jar">
+ 		<mkdir dir="${target}"/>
+ 		<mkdir dir="${bin}"/>
+ 		<javac srcdir="${src}" destdir="${bin}" source="1.4" target="1.4"/>
+@@ -30,13 +26,13 @@
+ 		</jar>
+ 	</target>
+ 	
+-	<target name="javadoc" depends="clean">
++  <target name="javadoc">
+ 		<javadoc sourcepath="${src}" destdir="${target}/${doc}" windowtitle=" JTidy ${version} " doctitle="JTidy ${version} API documentation">
+ 			<tag name="todo" scope="all" description="To do:"/>
+ 		</javadoc>
+ 	</target>
+ 	
+-	<target name="src" depends="clean">
++  <target name="src">
+ 		<zip destfile="${target}/${srczip}">
+ 			<fileset dir=".">
+ 				<include name="${src}/**"/>
diff --git a/dev-java/jtidy/jtidy-1.0.ebuild b/dev-java/jtidy/jtidy-1.0.ebuild
new file mode 100644
index 000000000000..f91781cedec6
--- /dev/null
+++ b/dev-java/jtidy/jtidy-1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV="r938"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Java port of HTML Tidy, an HTML syntax checker and pretty printer"
+HOMEPAGE="http://jtidy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
+LICENSE="HTML-Tidy W3C"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_ANT_ENCODING="UTF-8"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="ant-core"
+EANT_BUILD_TARGET="jar"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-build.xml.patch"
+)
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+}
+
+src_install() {
+	java-pkg_newjar "target/${MY_P}.jar"
+	java-pkg_dolauncher "jtidy" --main org.w3c.tidy.Tidy
+
+	use doc && java-pkg_dojavadoc target/javadoc/
+	use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/jtidy/metadata.xml b/dev-java/jtidy/metadata.xml
new file mode 100644
index 000000000000..48c119643336
--- /dev/null
+++ b/dev-java/jtidy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jtidy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jtreemap-1.1.0-r1 b/dev-java/jtreemap-1.1.0-r1
deleted file mode 100644
index 249c4caf3c6c..000000000000
--- a/dev-java/jtreemap-1.1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library for treemapping data
-EAPI=5
-HOMEPAGE=http://jtreemap.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jtreemap/jtreemap-1.1.0-src.zip -> jtreemap-1.1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ab9af3c7443e60186d3f81146f136f86
diff --git a/dev-java/jtreemap/Manifest b/dev-java/jtreemap/Manifest
new file mode 100644
index 000000000000..c7fb169eaf84
--- /dev/null
+++ b/dev-java/jtreemap/Manifest
@@ -0,0 +1,3 @@
+DIST jtreemap-1.1.0.zip 7358161 BLAKE2B 29afa39a3e7e1b581c36bc80d0a15b8b987a87cffad732ca24d3c344c6e8b3071ff6b85bf93266e779e2be722139853cf343ff07b2f280705b63559c59c4fabc SHA512 61c6b5e22cc839d6cfe8368bbd51db94b3667c8f4064645c3d70f5e6c93b029dd495b64b602570f59559dd99723516a197dcd1d915799411dc7f7c516bfce84c
+EBUILD jtreemap-1.1.0-r1.ebuild 822 BLAKE2B 1a8137b0ee3244e215a4e4641faac3a0770a422a3290b318060681ffd7199cc12f69c0dc116713ab12053443ac16dde56e66c93f0840f096c86a056b208cd7ab SHA512 8e3b866684d54d1b5a6a314d25e7b5fd376d77103d2d504cc3eaea4ec0edd17bddf8b3d11a4739d92a3e8883815e126a93e93c3fcc0aa89a00f5abc05d916a8b
+MISC metadata.xml 294 BLAKE2B c1d95c1f5cd65b046b55891f5504542cbab2b65a2a015e3773326ed60e549f15543cfb80d1e1423de43cf480fcb211c5c12993aeba1bcd1e54fadf4f71a64493 SHA512 b4ae787f6bcebb464ef0ca28ac24c07206d10d2cdfea55d2a8b06a7d75931e3da022cbcfcb4dd0ad4995490ac3f997c4255ef1cf031149d7e0338de881301329
diff --git a/dev-java/jtreemap/jtreemap-1.1.0-r1.ebuild b/dev-java/jtreemap/jtreemap-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..6e31859b2e15
--- /dev/null
+++ b/dev-java/jtreemap/jtreemap-1.1.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library for treemapping data"
+HOMEPAGE="http://jtreemap.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip -> ${P}.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${PN}-site-${PV}/JTreeMap"
+
+JAVA_SRC_DIR="src/main"
+
+JAVA_ENCODING="ISO-8859-1"
+
+java_prepare() {
+	pushd .. > /dev/null || die
+	java-pkg_clean
+	popd > /dev/null || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN}-demo --main net.sf.jtreemap.swing.example.JTreeMapExample
+}
diff --git a/dev-java/jtreemap/metadata.xml b/dev-java/jtreemap/metadata.xml
new file mode 100644
index 000000000000..b01b71f46e41
--- /dev/null
+++ b/dev-java/jtreemap/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jtreemap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jts-core-1.14 b/dev-java/jts-core-1.14
deleted file mode 100644
index 9879122ff5d6..000000000000
--- a/dev-java/jts-core-1.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 app-arch/unzip test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JTS Topology Suite for Java
-EAPI=5
-HOMEPAGE=https://tsusiatsoftware.net/jts/main.html
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/dr-jts/jts/archive/f67d35c1da06922c8165f66a919490ee94a04649.tar.gz -> jts-1.14.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=210ceceb3302477f7e0d05785b98a306
diff --git a/dev-java/jts-core/Manifest b/dev-java/jts-core/Manifest
new file mode 100644
index 000000000000..ee8306af9b05
--- /dev/null
+++ b/dev-java/jts-core/Manifest
@@ -0,0 +1,3 @@
+DIST jts-1.14.tar.gz 19693410 BLAKE2B 1784032fbd41858caebcca60898d947da4e47e98a33f82a25540bdf940203c923529df09066260b5998f9b85f475a725e32cf01d005401698dde71f380918542 SHA512 1d90f2e2774bf8738ce24fc65c5430f7970fcc1823c304a18bbdc243040e66409fc33bf9058ebc22217640e4c384772f852316031ef1b8779592d0e041e2261d
+EBUILD jts-core-1.14.ebuild 1072 BLAKE2B 27ca70f2326ef90ffd1fb8b77b8dbc63286ecc152ceb73dd6aa03e835b25a66aa105fbda9dc5f8bc3146d57eb327c55288b22b5dddb29a6ef334e980415e75b3 SHA512 aab15bdba6a01675aba8a4580c29bd8510bf924a37bf9d16e5c0be7ea9ba0ecaba5d29bef185679570ed687bb165207522483b60a582fcd8292eeb1fd78c11ee
+MISC metadata.xml 311 BLAKE2B af7b97c34bdece8fb17065e507ee06633fd911095d3eaeee8600d76826bfbd48e17123ed58a0425aeb7d6d2f595e2a4362db345876d116ba55346d72bbd2cd56 SHA512 58a717b155e3578187d875a85037af30366c22ed5f2a1c634b7cc43442d7ff3b123f11617569643fa5f0b7330e49c3e9d50f9850dd771d7e9a5180146ba251c2
diff --git a/dev-java/jts-core/jts-core-1.14.ebuild b/dev-java/jts-core/jts-core-1.14.ebuild
new file mode 100644
index 000000000000..b3559fafc3df
--- /dev/null
+++ b/dev-java/jts-core/jts-core-1.14.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# The project recently switched to git. There are no tags yet.
+GIT_REF="f67d35c1da06922c8165f66a919490ee94a04649"
+
+MY_PN="jts"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JTS Topology Suite for Java"
+HOMEPAGE="https://tsusiatsoftware.net/jts/main.html"
+SRC_URI="https://github.com/dr-jts/jts/archive/${GIT_REF}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	test? ( dev-java/junit:4 )"
+
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${GIT_REF}/${MY_PN}"
+JAVA_SRC_DIR="java/src"
+
+java_prepare() {
+	java-pkg_clean
+
+	# Use text-based test runner.
+	sed -i "s/swingui/textui/g" java/test/test/jts/junit/SimpleTest.java || die
+}
+
+src_test() {
+	cd java/test || die
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" test.jts.junit.MasterTester
+}
diff --git a/dev-java/jts-core/metadata.xml b/dev-java/jts-core/metadata.xml
new file mode 100644
index 000000000000..1cbcbcf30180
--- /dev/null
+++ b/dev-java/jts-core/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dr-jts/jts</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/juel-2.1.0-r2 b/dev-java/juel-2.1.0-r2
deleted file mode 100644
index 04688ffd47f8..000000000000
--- a/dev-java/juel-2.1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/unzip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Implementation of the Unified Expression Language (EL) - JSR-245
-EAPI=5
-HOMEPAGE=http://juel.sourceforge.net/
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/juel/juel-2.1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fa7e9ddf665e0397f8bd7335750545ff
diff --git a/dev-java/juel/Manifest b/dev-java/juel/Manifest
new file mode 100644
index 000000000000..b2fda15aceec
--- /dev/null
+++ b/dev-java/juel/Manifest
@@ -0,0 +1,3 @@
+DIST juel-2.1.0.zip 477363 BLAKE2B 3d1af823adcf27a5f9918983abf3de47f218089fdabc63975d8f3031c81bb02dcfe5c2fa822be02087f50537ba4e29b606c86abb324cc2bddbf07a6e80c56453 SHA512 eec79c301491b8bae5c394591feab0abed302da55e8cded798874286af32f15ce575bdb365ec9f90add89e320d23d3e40fbb5d465d34c66da60df26e1f7cb6f3
+EBUILD juel-2.1.0-r2.ebuild 712 BLAKE2B b539609615a37a134dbe21fb9516d19325c9182ad221b3ebaa50c1c525b173588dfe0b67dc96fe39c673718d0c0727b8a7409c91274a1b4366bb9264ec88c9f3 SHA512 6d5195b871d7a962f8c2a1172d278062074851af2d6a149e88067acf2dcdce44afcd04fac8f1e459f85cf34be8a3627fa3be9a6b2301dc44ebe9164df4aeec6d
+MISC metadata.xml 310 BLAKE2B ac14e313c0c30fb7e4792f55acae0f7755d6ba5b23ec404ef7a24b48aeec998efde59a9524cd816c0dcf494130f42faa7d8500ab46dad809163fc0a9133f22a0 SHA512 9ea87185947ee4bebce3ada55cb9ddeb79392467a115d7d809b6d0942f3455742c5172e5a41540098db0b5ea7f36642e89958ded9ad4a8870d8b5f01bfa0c294
diff --git a/dev-java/juel/juel-2.1.0-r2.ebuild b/dev-java/juel/juel-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..052a8b4e96e9
--- /dev/null
+++ b/dev-java/juel/juel-2.1.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of the Unified Expression Language (EL) - JSR-245"
+HOMEPAGE="http://juel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux"
+
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/unzip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/api src/impl"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples src/samples/*
+}
diff --git a/dev-java/juel/metadata.xml b/dev-java/juel/metadata.xml
new file mode 100644
index 000000000000..0d41ddbd0a1f
--- /dev/null
+++ b/dev-java/juel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">juel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jump-0.5-r1 b/dev-java/jump-0.5-r1
deleted file mode 100644
index 6f1708bec7f4..000000000000
--- a/dev-java/jump-0.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java-based extensible high-precision math library
-EAPI=5
-HOMEPAGE=http://jump-math.sourceforge.net/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jump-math/jump-0.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5c52f7a08c92782e1fef25680c717481
diff --git a/dev-java/jump/Manifest b/dev-java/jump/Manifest
new file mode 100644
index 000000000000..48b7e3242c40
--- /dev/null
+++ b/dev-java/jump/Manifest
@@ -0,0 +1,3 @@
+DIST jump-0.5.tar.gz 31266 BLAKE2B 7c7e4c7de2322e32e96e966617c774f8c19d2d5a6a25b4116412b4160282ef0e13b5a8f65c8f2b771968ae22ca659988f6262abac9f67c055eb2fa362f00b610 SHA512 9772ea61e921c4342f0e25a951d74850b9dbdd2bde5de9fabad4d55ddb82b6d09debd478f92f3f8c02a05425244b7eaf12d7b3d7d2876263234bafa27783bba8
+EBUILD jump-0.5-r1.ebuild 673 BLAKE2B 5f6939b4c2876e62cf1aee7f1989b705c8b211c199cc64a34e5be6c114aa252704ccaee26a4f47465885adb3698af35c4f3f3edaf18f38119ffbc0d040621919 SHA512 438bd98331ff2eeccb06090be77e3960193b75e24844990ef9437c7cf57b50f645c4e157dec77642acbf4defe1e3a0170dd72f0362d45feb121568b6a25477d7
+MISC metadata.xml 315 BLAKE2B a1bb1414d4b486a4d3bebcb196fe4297767c0f0f433463fb2425ef24070b6b961c14ceba0a39dcc4b42b7de2939255230d5afdb6ccb0c559ec496a40bc799f0a SHA512 608ae45bd9d707c202f5e104fae67583c7e2c7edabb895767b8450d6e7765c3dfa934ff3bb7b994074f73bbdc9765885411ffee355ca16cfb22910b12c6f5b39
diff --git a/dev-java/jump/jump-0.5-r1.ebuild b/dev-java/jump/jump-0.5-r1.ebuild
new file mode 100644
index 000000000000..460016fbe6f5
--- /dev/null
+++ b/dev-java/jump/jump-0.5-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java-based extensible high-precision math library"
+HOMEPAGE="http://jump-math.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-math/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main"
+
+java_prepare() {
+	rm -rv src/tests || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples src/examples
+}
diff --git a/dev-java/jump/metadata.xml b/dev-java/jump/metadata.xml
new file mode 100644
index 000000000000..3fc5ac0fea10
--- /dev/null
+++ b/dev-java/jump/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jump-math</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jung-1.7.6-r1 b/dev-java/jung-1.7.6-r1
deleted file mode 100644
index 3242380c9380..000000000000
--- a/dev-java/jung-1.7.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/colt:0 dev-java/commons-collections:0 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=The Java Universal Network/Graph Framework
-EAPI=5
-HOMEPAGE=http://jung.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-java/colt:0 dev-java/commons-collections:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jung/jung-1.7.6.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1e1aaff4175439acc4ac1e10dcb007ca
diff --git a/dev-java/jung/Manifest b/dev-java/jung/Manifest
new file mode 100644
index 000000000000..2027dd72bf11
--- /dev/null
+++ b/dev-java/jung/Manifest
@@ -0,0 +1,3 @@
+DIST jung-1.7.6.zip 8164548 BLAKE2B f7ae35557e531686ca56235a6087587dd520ab1336e1121871e1f6727d64818b078dedaf55b1cbd83c32a8c5e03af7926a75302033a7e21e07200ac8f5d729b5 SHA512 126f06e34a6db6cc55df2b1c1b52612ddece7db7a1fb45cbc91892122678b0b629eac00276fc501aeab558cf1f01a4e5e7f5d0392bfae977ca1950df2c3d063a
+EBUILD jung-1.7.6-r1.ebuild 660 BLAKE2B 782c19117a4c1d230c7bf2b9dd0fc884cfa4b25bc1ce452782fd3140b3aefe7a623bbbba6533db43baf9027dab450cf85b3855591c93ef7a3ee0e9b3356f175c SHA512 f5676eaa00faba26d7e9f1dd9227bb9f5798753cc55d1e322e64c0a88ffd284bdb6aafbd5dfa5321060813552056074838480b8fed1a890baae5877d4dc0eb2e
+MISC metadata.xml 532 BLAKE2B 3f7a781a447b885d31f1a33b8e6030dcb56e4be649b6a1716ef4bba3ee2047caa037dae275c9781f6a90b5d242482eb32dcf35353be8ee7098abec46f9195c41 SHA512 2662c5bedc6f2e200bbcca0af62dfa46063e01759e4abd5ffdaa908abe82f20f875c3fbd3e83134616997d67f8989e059810847ee5951cb0c2b296bb127f3c14
diff --git a/dev-java/jung/jung-1.7.6-r1.ebuild b/dev-java/jung/jung-1.7.6-r1.ebuild
new file mode 100644
index 000000000000..529a37e622f1
--- /dev/null
+++ b/dev-java/jung/jung-1.7.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Java Universal Network/Graph Framework"
+HOMEPAGE="http://jung.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/colt:0
+	dev-java/commons-collections:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_SRC_DIR="src/edu"
+
+JAVA_GENTOO_CLASSPATH="
+	colt
+	commons-collections
+"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/jung/metadata.xml b/dev-java/jung/metadata.xml
new file mode 100644
index 000000000000..50e56a48add2
--- /dev/null
+++ b/dev-java/jung/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		A software library that provides a common and extendible language for
+		the modeling, analysis, and visualization of data that can be
+		represented as a graph or network.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jung</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/junit-3.8.2-r1 b/dev-java/junit-3.8.2-r1
deleted file mode 100644
index d9410b18608e..000000000000
--- a/dev-java/junit-3.8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple framework to write repeatable tests
-EAPI=0
-HOMEPAGE=http://www.junit.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2edfdca939642f25c25cab55389acfdc
diff --git a/dev-java/junit-3.8.2-r2 b/dev-java/junit-3.8.2-r2
deleted file mode 100644
index 3c10e388f8bc..000000000000
--- a/dev-java/junit-3.8.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Simple framework to write repeatable tests
-EAPI=6
-HOMEPAGE=http://www.junit.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a60b0d9bc64b1a3a1bc74f83353e4b08
diff --git a/dev-java/junit-4.12-r1 b/dev-java/junit-4.12-r1
deleted file mode 100644
index 0e4910ac3290..000000000000
--- a/dev-java/junit-4.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Simple framework to write repeatable tests
-EAPI=5
-HOMEPAGE=http://junit.org/
-IUSE=examples elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4
-SRC_URI=https://github.com/junit-team/junit4/archive/r4.12.tar.gz -> junit4-r4.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ad556244309119a48a8630848750aafc
diff --git a/dev-java/junit-addons-1.4-r1 b/dev-java/junit-addons-1.4-r1
deleted file mode 100644
index 8454b5f842df..000000000000
--- a/dev-java/junit-addons-1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/junit:0 dev-java/ant-core:0 dev-java/jdom:0 dev-java/jaxen:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JUnit-addons is a collection of helper classes for JUnit
-EAPI=5
-HOMEPAGE=http://junit-addons.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~x86-linux ~x86-macos
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.4 dev-java/junit:0 dev-java/ant-core:0 dev-java/jdom:0 dev-java/jaxen:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/junit-addons/junit-addons-1.4.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=92f017acf1d126d5277af68859f28704
diff --git a/dev-java/junit-addons/Manifest b/dev-java/junit-addons/Manifest
new file mode 100644
index 000000000000..37e3434c3c26
--- /dev/null
+++ b/dev-java/junit-addons/Manifest
@@ -0,0 +1,5 @@
+AUX 1.4-build.xml 8725 BLAKE2B bdc668244b90693cd60f294d188b200b51929093c988ce96bda06231ae0df781515de678115cb6f8810aeda1f6c380f0405350bd9dc6e8804fb1240042d5c311 SHA512 3f3eae33867f9e311e8e2e58a87dbc67dc4beb6eb89793b2b477953a1fc5cba45aad2a8241e07717de472969ec448c6205617da2427243cfdb21f0cf4ba91b12
+AUX 1.4-common.properties 540 BLAKE2B 48c40f53f6f5557f5b97753209782ef3c57c53817ad2e7e04de7cc234ce84cf1abc9b7bdeefad992d3ea0586fb8aa72fe37942d63833cc3ceba01b400f23b432 SHA512 9362f56305b2d6cd97a10ed6cd661de6ae86e700d250cf69c55f922fca2c6f57e8ce1c306ad4378196c18cc8b839bcd5440816f6ef60f908a28da7b4ef78bbc6
+DIST junit-addons-1.4.zip 293750 BLAKE2B f305ae548ee9577ff9c5be01846768fe111a2cc7c523a080f5bfe823f6e2def5880fce091cd3e460eeae831e639616ec7cbf203dcee1dce66a7075a6343df1df SHA512 0ddc9a95d80190417c92e86697669020a2947e2211d2394334b80d76bca5397f132d90e00d0c679bf48607fbadf8d1d6e97d3770d06c35cab78c6cada198434a
+EBUILD junit-addons-1.4-r1.ebuild 1458 BLAKE2B 6c82788d394202095b5356e189603e27e57a43336e459b2f81c3fdb09d7363ef226fa6967709b4765dc1c8f930a1ce77a4a8b684d34b045814430c6bfeb5c469 SHA512 9b429406c445445282184cda4f61ee0cf8c43d3a7a7bd0fc27e0e59628e53121c752e659850e79aa07bd0f7fe426477a7c1a9f0e72cca341e77732e05d75ec57
+MISC metadata.xml 490 BLAKE2B 01319745e5907693e1cc616f05f66b4e049258cfe26a585af35a4ba5e56c7d78a338b374ff42558ce05c7523da5d330084b274aa91967f8a6ad4a06adab4e564 SHA512 bfa7b8058d0f28bd1455f2ab6841b562f369a62d90bd6a1a875c67c991dc75ade65c6e854351a4dee83d2ae059185e82a84f3159095a174aa48fdbfa8070b3fa
diff --git a/dev-java/junit-addons/files/1.4-build.xml b/dev-java/junit-addons/files/1.4-build.xml
new file mode 100644
index 000000000000..5b171e1051ab
--- /dev/null
+++ b/dev-java/junit-addons/files/1.4-build.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  - Build file for the JUnit-addons Project.
+  -
+  - This script should be started with the following command line :
+  -
+  -     ant <target>
+  -
+  - Run "ant -projecthelp" to get a list of available targets.
+  -
+  - Take from upstream CVS and modified a little for Gentoo:
+  - Version: Revision: 1.15 Date: 2003/04/09 04:41:10 
+  - Author: Vladimir R. Bossicard (vbossica@users.sourceforge.net)
+  -->
+
+<project name="junit-addons" default="build" basedir=".">
+
+    <property file="build.properties" />
+    <property file="common.properties" />
+
+    <!-- directories settings -->
+
+    <property name="src" value="src" />
+    <property name="main.src" value="src/main" />
+    <property name="test.src" value="src/test" />
+    <property name="example.src" value="src/example" />
+
+    <property name="build.dest" value="build" />
+    <property name="api.dest" value="${build.dest}/api" />
+    <property name="classes.dest" value="${build.dest}/classes" />
+    <property name="test.classes.dest" value="${build.dest}/classes-test" />
+    <property name="example.classes.dest" value="${build.dest}/classes-example" />
+    <property name="dist.dest" value="dist" />
+
+    <!-- miscellaneous settings -->
+
+    <property name="compilation.debug" value="on" />
+    <property name="compilation.deprecation" value="off" />
+    <property name="compilation.verbose" value="off" />
+
+    <!--
+      - Initializes the build and check if all libraries are available.
+      -->
+    <target name="init">
+        <tstamp/>
+        <mkdir dir="${build.dest}" />
+        <mkdir dir="${classes.dest}" />
+        <mkdir dir="${test.classes.dest}" />
+        <mkdir dir="${example.classes.dest}" />
+        <mkdir dir="${api.dest}" />
+        <mkdir dir="${dist.dest}" />
+    </target>
+
+    <path id="libraries">
+        <pathelement location="${jdom.jar}" />
+        <pathelement location="${jaxen.jar}" />
+        <pathelement location="${saxpath.jar}" />
+        <pathelement location="${ant.jar}" />
+        <pathelement location="${junit.jar}" />
+        <pathelement location="${xerces.jar}" />
+        <pathelement location="${xml-apis.jar}" />
+        <pathelement location="${commons-logging.jar}" />
+    </path>
+
+    <!--
+      - Compiles the source code to the build dir
+      - Copy all other resources to the build dir
+      - which are needed to run the application alone
+      -->
+    <target name="build"
+            depends="init"
+            description="compiles the junit-addons classes">
+        <javac srcdir="${main.src}"
+               destdir="${classes.dest}"
+               debug="${compilation.debug}"
+               verbose="${compilation.verbose}"
+               deprecation="${compilation.deprecation}">
+            <classpath>
+                <path refid="libraries"/>
+            </classpath>
+        </javac>
+
+        <javac srcdir="${example.src}"
+               destdir="${example.classes.dest}"
+               debug="${compilation.debug}"
+               verbose="${compilation.verbose}"
+               deprecation="${compilation.deprecation}">
+            <classpath>
+                <pathelement location="${classes.dest}" />
+                <path refid="libraries"/>
+            </classpath>
+        </javac>
+
+        <javac srcdir="${test.src}"
+               destdir="${test.classes.dest}"
+               debug="${compilation.debug}"
+               verbose="${compilation.verbose}"
+               deprecation="${compilation.deprecation}">
+            <classpath>
+                <pathelement location="${classes.dest}" />
+                <pathelement location="${example.classes.dest}" />
+                <path refid="libraries"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="test"
+            depends="build"
+            description="tests the junit-addons classes">
+        <java classname="junitx.runner.TestRunner" fork="yes">
+            <jvmarg value="-DPropertyManager.file=${test.src}/tests.properties" />
+            <jvmarg value="-DXMLPropertyManager.file=${test.src}/tests.xml" />
+            <arg line="-verbose" />
+            <arg line="-runner.properties /home/vladimir/projects/junit-addons-runner/src/main/conf/runner.properties" />
+            <arg line="-test.properties ${test.src}/tests.properties" />
+            <arg line="-class AllTests" />
+            <classpath>
+                <pathelement location="${classes.dest}" />
+                <pathelement location="${test.classes.dest}" />
+                <pathelement location="${example.classes.dest}" />
+                <pathelement location="${example.src}" />
+                <pathelement location="${junit-addons-runner.jar}" />
+                <path refid="libraries"/>
+            </classpath>
+        </java>
+    </target>
+
+    <target name="test-old"
+            depends="build">
+        <java classname="junit.textui.TestRunner" fork="yes">
+            <arg line="-class AllTests" />
+            <jvmarg value="-DPropertyManager.file=${test.src}/tests.properties" />
+            <jvmarg value="-DXMLPropertyManager.file=${test.src}/tests.xml" />
+            <classpath>
+                <pathelement location="${classes.dest}" />
+                <pathelement location="${test.classes.dest}" />
+                <pathelement location="${example.classes.dest}" />
+                <pathelement location="${example.src}" />
+                <path refid="libraries"/>
+            </classpath>
+        </java>
+    </target>
+
+    <target name="example"
+            depends="build"
+            description="compiles and runs the examples">
+        <javac srcdir="${example.src}"
+               destdir="${test.classes.dest}"
+               debug="${compilation.debug}"
+               verbose="${compilation.verbose}"
+               deprecation="${compilation.deprecation}">
+            <classpath>
+                <pathelement location="${classes.dest}" />
+                <path refid="libraries"/>
+            </classpath>
+        </javac>
+        <java classname="junitx.tool.TestClassValidator" fork="yes">
+            <arg line="junitx.example.ValidationExample" />
+            <classpath>
+                <pathelement location="${classes.dest}" />
+                <pathelement location="${test.classes.dest}" />
+                <path refid="libraries"/>
+            </classpath>
+        </java>
+    </target>
+
+    <!--
+      - Generates the junit-addons API
+      -->
+    <target name="api"
+            depends="build"
+            description="generates the API">
+        <javadoc
+            packagenames="junitx.*"
+            sourcepath="${main.src}"
+            destdir="${api.dest}"
+            overview="${main.src}/overview.html"
+            author="true"
+            version="true"
+            protected="true"
+            use="false"
+            windowtitle="${project.title} v${project.version}"
+            doctitle="${project.title}, version ${project.version}&lt;br>API specification"
+            header="&lt;b>${project.title}&lt;br>version ${project.version}&lt;/b>"
+            bottom="Copyright &amp;#169; ${project.year} ${project.holder}. All Rights Reserved.">
+            <classpath>
+                <path refid="libraries"/>
+            </classpath>
+        </javadoc>
+    </target>
+
+    <!--
+      - Generates a jar archive with the content of the build directory
+      -->
+    <target name="release"
+            depends="clean, build"
+            description="Generate the junit-addons jar archive" >
+        <delete quiet="true">
+            <fileset dir="${dist.dest}/" includes="${project.name}-${project.version}.jar" />
+        </delete>
+        <jar jarfile="${dist.dest}/${project.name}-${project.version}.jar"
+            basedir="${classes.dest}" >
+            <manifest>
+                <attribute name="Implementation-Vendor"
+                           value="${project.holder}" />
+                <attribute name="Implementation-Version"
+                           value="${project.version}" />
+                <attribute name="Implementation-Title"
+                           value="${project.title}" />
+            </manifest>
+        </jar>
+        <zip zipfile="${dist.dest}/${project.name}-${project.version}.jar"
+             update="yes">
+            <zipfileset dir="." includes="LICENSE" prefix="META-INF" />
+        </zip>
+        <zip zipfile="${dist.dest}/src.jar">
+        	<zipfileset dir="${src}" excludes="**/sflogo.png" prefix="src" />
+       	</zip>
+    </target>
+
+    <!--
+      - Delete all generate directories and their content
+      -->
+    <target name="clean">
+        <delete dir="${build.dest}" quiet="true" />
+        <delete dir="${dist.dest}" quiet="true" />
+    </target>
+
+</project>
diff --git a/dev-java/junit-addons/files/1.4-common.properties b/dev-java/junit-addons/files/1.4-common.properties
new file mode 100644
index 000000000000..f1e3efd9fa4a
--- /dev/null
+++ b/dev-java/junit-addons/files/1.4-common.properties
@@ -0,0 +1,15 @@
+# ----------------------------------------------------------------------------
+# Common properties used by both the build.xml and committer.xml files.
+#
+# Taken from upstream CVS:
+# Version: Revision: 1.2 Date: 2003/04/02 04:50:33 
+# Author: Vladimir R. Bossicard (vbossica@users.sourceforge.net)
+# ----------------------------------------------------------------------------
+
+# Project settings
+
+project.name = junit-addons
+project.title = JUnit-addons
+project.holder = Vladimir R. Bossicard
+project.year = 2002-2003
+project.version = 1.4
diff --git a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
new file mode 100644
index 000000000000..3e5a375987af
--- /dev/null
+++ b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JUnit-addons is a collection of helper classes for JUnit"
+HOMEPAGE="http://junit-addons.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos"
+
+COMMON_DEP="
+	dev-java/junit:0
+	dev-java/ant-core:0
+	dev-java/jdom:0
+	dev-java/jaxen:1.1
+	"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		${COMMON_DEP}"
+
+java_prepare() {
+	unpack ./src.jar
+	rm -v *.jar || die
+	# Not included so taken from cvs
+	cp "${FILESDIR}/${PV}-build.xml" build.xml || die
+	cp "${FILESDIR}/${PV}-common.properties" common.properties || die
+}
+
+_eant() {
+	eant \
+		-Djunit.jar="$(java-pkg_getjar junit junit.jar)" \
+		-Dant.jar="$(java-pkg_getjar ant-core ant.jar)" \
+		-Djdom.jar="$(java-pkg_getjar jdom jdom.jar)" \
+		-Djaxen.jar="$(java-pkg_getjar jaxen-1.1 jaxen.jar)" \
+		"${@}"
+}
+
+src_compile() {
+	# javadocs are bundled
+	_eant release
+}
+
+# Needs junit-addons-runner that again needs this package to build
+#src_test() {
+#	cd src/test/
+#	_eant -f AntTest.xml
+#}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar
+	dodoc README WHATSNEW || die
+	use doc && java-pkg_dojavadoc api
+	if use source; then
+		insinto "${JAVA_PKG_SOURCESPATH}"
+		newins dist/src.jar ${PN}-src.zip
+	fi
+}
diff --git a/dev-java/junit-addons/metadata.xml b/dev-java/junit-addons/metadata.xml
new file mode 100644
index 000000000000..3a46e0a4fd94
--- /dev/null
+++ b/dev-java/junit-addons/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		JUnit-addons is a collection of helper classes for JUnit.
+		This library can be used with both JUnit 3.7 and JUnit 3.8.x
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">junit-addons</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
new file mode 100644
index 000000000000..eec4fab4a92f
--- /dev/null
+++ b/dev-java/junit/Manifest
@@ -0,0 +1,7 @@
+AUX junit-3.8.2-build.xml 3179 BLAKE2B df7dd61b577d415f807d234fe41255bda57235465ec6a96dc793f3c4852278978f4c2be6df89f4910b96b450a280bb0e9bcaf50463430f4769c116bca4ea868c SHA512 6d2c74c70569feed235db70fdb646c813ce9453b5e7fae6d5fe8c818d0ce820fc155eef8426d8f3263cff45cd4b78542d5524aa1d5efbb84e43698c1d4466f55
+DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
+DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6042652ef27a5d405b83c471848edf83e799a4d1e950d83e127caa288f453edf19959a9a8aa5a9e26eeb4e771 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32
+EBUILD junit-3.8.2-r1.ebuild 1003 BLAKE2B 91753d0e74ce8efd135f394df69342ffdb113bbba628ebd8a5baf4af8e1a967c6e319a05192b3d35d4717e32b1324afcfd45a0115c284c8a59c8d83320a13598 SHA512 e6ed543345ffc53cc86e1a6582ece77660c9514e522d5f7b46038281ed13a67d70ee5263eb420f11a7b9a1155255161cb0beb40a639c3ddc112273eec3ae4050
+EBUILD junit-3.8.2-r2.ebuild 831 BLAKE2B e07f45d637d4aaee89c2ff51f168fd610cc6bb655b2da6efcaa3bdc8392b4a89c860c682a50fd1e4d3bcbea693d61142c7b8c95497f6f1cfe81d7cf2bf9f00d1 SHA512 2db4e78da194aaab043bca14d6679f5ad6b33b88fc01a55ad828bc9c43e47b3de1ba7a3c6e6bd8c867faceaf30cc45debdd9a9fab86c7a0d2b7153cb986b4c06
+EBUILD junit-4.12-r1.ebuild 1464 BLAKE2B c5c998dca82ed919aef941435b371d5f5788afbbe952b22f976740d53a37d8daeb6851e5c74c2d2ac6d9c066cb75f777372f272c5af4095e59f0adb80b980316 SHA512 a2f0b67b093f7bc86ac7a671bd66b69e67d561140ceffbf21e5ac5a3ebe935cb2bc3907b5f3bfae2248f6f6b2561d02e4afd327877adc8f761b393687306ee29
+MISC metadata.xml 367 BLAKE2B 7cd798ae028c83275e61522be10a35abba419a823042be242ee7fdf7e0ccfc978e817affaaf154b8d0723f502499f17bb81b0622fa493dc812b82ad23dfa647b SHA512 44e492dfaaa9faf54f4aaf420d5816da8d117951d6a52e37c76a9e533fcefbeaa3c44bafa4d525f878deb3af2b7f426e72a62b16464e85ce9690c61b1f0da71f
diff --git a/dev-java/junit/files/junit-3.8.2-build.xml b/dev-java/junit/files/junit-3.8.2-build.xml
new file mode 100644
index 000000000000..4e47d949bdaf
--- /dev/null
+++ b/dev-java/junit/files/junit-3.8.2-build.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" ?>
+<!-- JUnit build script using ant 1.4 --><project basedir="." default="dist" name="junit">
+	<property file="${user.home}/.junit.properties"/>
+	<property name="build.compiler" value="classic"/>
+	<property name="version" value="3.8.2"/>
+	<property name="dist" value="junit${version}"/>
+	<property name="versionfile" value="junit/runner/Version.java"/>
+	<property name="zipfile" value="${dist}.zip"/>
+	<target name="init">
+		<tstamp/>
+	</target>
+
+	<target depends="init" name="versiontag">
+		<filter token="version" value="${version}"/>
+		<copy file="${versionfile}" filtering="on" tofile="${versionfile}tmp"/>
+		<move file="${versionfile}tmp" tofile="${versionfile}"/>
+	</target>
+
+	<target depends="versiontag" name="build">
+		<javac debug="on" destdir="." source="1.3" srcdir="." target="1.3"/>	
+	</target>
+
+	<target depends="build" name="dist">
+		<delete dir="${dist}"/>
+		<mkdir dir="${dist}"/>
+		<jar basedir="." excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.class, doc/**, README.html, .classpath, .project, cpl-v10.html" jarfile="${dist}/src.jar"/>
+		<jar basedir="." excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.java, doc/**, README.html,  build.xml, jar-manifest.txt, .classpath, .project, cpl-v10.html" jarfile="${dist}/junit.jar"/>
+		<copy todir="${dist}/junit/samples">
+			<fileset dir="junit/samples"/>
+		</copy>
+		<copy todir="${dist}/junit/tests">
+			<fileset dir="junit/tests"/>
+		</copy>
+
+
+		<delete file="${dist}/junit/tests/runner/test.jar"/> 
+		<jar basedir="." includes="junit/tests/runner/LoadedFromJar.class" jarfile="${dist}/junit/tests/runner/test.jar"/> 
+
+		<copy file="README.html" tofile="${dist}/README.html"/>
+		<copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html"/>
+		
+		<java classname="junit.textui.TestRunner" fork="yes">
+			<arg value="junit.samples.AllTests"/>
+			<classpath>
+				<pathelement location="${dist}"/>
+				<pathelement location="${dist}/junit.jar"/>
+			</classpath>
+		</java>
+	</target>
+
+	<target name="javadoc">
+		<mkdir dir="${dist}/javadoc"/>
+		<javadoc author="false" destdir="${dist}/javadoc" packagenames="junit.framework.*, junit.extensions.*" source="1.3" sourcepath="." use="false" version="false" windowtitle="JUnit API"/>
+		<copy todir="${dist}/doc">
+			<fileset dir="doc"/>
+		</copy>
+	</target>
+	
+	<target depends="dist" name="zip">
+		<zip basedir="." includes="${dist}/**" zipfile="${zipfile}"/>
+	</target>
+	
+	<target depends="dist" name="awtui">
+		<java classname="junit.awtui.TestRunner" fork="yes">
+			<arg value="junit.samples.AllTests"/>
+			<classpath>
+				<pathelement location="${dist}"/>
+				<pathelement location="${dist}/junit.jar"/>
+			</classpath>
+		</java>
+	</target>
+	
+	<target depends="dist" name="swingui">
+		<java classname="junit.swingui.TestRunner" fork="yes">
+			<arg value="junit.samples.AllTests"/>
+			<classpath>
+				<pathelement location="${dist}"/>
+				<pathelement location="${dist}/junit.jar"/>
+			</classpath>
+		</java>
+	</target>
+
+	<target name="clean">
+		<delete dir="${dist}" quiet="true"/>			
+		<delete file="${zipfile}" quiet="true"/> 
+		<delete>
+			<fileset dir="${basedir}" includes="**/*.class"/> 
+		</delete>
+	</target>
+</project>
diff --git a/dev-java/junit/junit-3.8.2-r1.ebuild b/dev-java/junit/junit-3.8.2-r1.ebuild
new file mode 100644
index 000000000000..309adf1024bf
--- /dev/null
+++ b/dev-java/junit/junit-3.8.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P=${P/-/}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+HOMEPAGE="http://www.junit.org/"
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	unzip src.jar || die
+	rm -v *.jar || die
+	rm -rf javadoc ${PN}${PV} || die
+	cp "${FILESDIR}/${P}-build.xml" build.xml || die
+}
+
+EANT_BUILD_TARGET="dist"
+
+src_install() {
+	use source && java-pkg_dosrc ${PN}
+	cd ${MY_P}
+	java-pkg_dojar ${PN}.jar
+	dohtml README.html cpl-v10.html || die
+	if use doc; then
+		dohtml -r doc || die
+		java-pkg_dojavadoc javadoc
+	fi
+}
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
new file mode 100644
index 000000000000..362aa0129f62
--- /dev/null
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -0,0 +1,42 @@
+# 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
+
+MY_P=${P/-/}
+
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+HOMEPAGE="http://www.junit.org/"
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+DOCS=( README.html cpl-v10.html )
+
+JAVA_SRC_DIR="${PN}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	unzip src.jar || die
+}
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs
+}
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..f3190da6c338
--- /dev/null
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="${PN}${PV%%.*}"
+MY_P="${MY_PN}-r${PV}"
+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/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
+HOMEPAGE="http://junit.org/"
+LICENSE="EPL-1.0"
+SLOT="4"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~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}/${MY_P}"
+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/metadata.xml b/dev-java/junit/metadata.xml
new file mode 100644
index 000000000000..9c59435e026b
--- /dev/null
+++ b/dev-java/junit/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">junit-team/junit</remote-id>
+		<remote-id type="sourceforge">junit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/junitperf-1.9.1-r2 b/dev-java/junitperf-1.9.1-r2
deleted file mode 100644
index 73bcbfcb5357..000000000000
--- a/dev-java/junitperf-1.9.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/junit:4 test? ( dev-java/ant-junit:0 ) source? ( app-arch/zip ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple framework to write repeatable tests
-EAPI=5
-HOMEPAGE=http://www.clarkware.com/software/JUnitPerf.html
-IUSE=elibc_FreeBSD doc test source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-java/junit:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.clarkware.com/software/junitperf-1.9.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bcdd52d3492989c8a5e6e954344697a0
diff --git a/dev-java/junitperf/Manifest b/dev-java/junitperf/Manifest
new file mode 100644
index 000000000000..b3d04acd9992
--- /dev/null
+++ b/dev-java/junitperf/Manifest
@@ -0,0 +1,3 @@
+DIST junitperf-1.9.1.zip 110600 BLAKE2B f3f1467382da532d104fb1236607c72f2984f00e98eb9ae931df6cfdd8235f075e485f2cdb21a9837a866ea00fd4d07a55ed80c29c9a74871890441519a551a9 SHA512 35fd3cddf5643ede31a89f39e0149ceb5a07c97521bcb4e661fce32b08a5299064f6b52828889d4918485f3ca000f6020dd6cec802d8b1579f46bd861ad74b1b
+EBUILD junitperf-1.9.1-r2.ebuild 1033 BLAKE2B f0f6b4d75506748c872f6565f49dd8ffba6d95b2c9ed4de16f3c774ff521d68b3ff8bba79ab53bbf4b9eebc949350a9a9342530663857dd3de72bb0bd8aa3a78 SHA512 7cc0448e771002305887038f09a952369a3fc93688911dbcf39bab595bf0190b11d4166367602fb578b6f41db32b4f70ff7ca03bb9f6674f7d087ef67290cb4c
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/junitperf/junitperf-1.9.1-r2.ebuild b/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
new file mode 100644
index 000000000000..147b97e61da2
--- /dev/null
+++ b/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc test source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="http://www.clarkware.com/software/${P}.zip"
+HOMEPAGE="http://www.clarkware.com/software/JUnitPerf.html"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE=""
+
+CDEPEND="dev-java/junit:4"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? ( dev-java/ant-junit:0 )
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.6"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="junit-4"
+EANT_DOC_TARGET="doc"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}"
+EANT_TEST_TARGET="test"
+
+src_test() {
+	ANT_TASKS="ant-junit" java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "lib/${PN}.jar"
+	dodoc README
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc src/app/*
+}
diff --git a/dev-java/junitperf/metadata.xml b/dev-java/junitperf/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/junitperf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/junrar-0.6 b/dev-java/junrar-0.6
deleted file mode 100644
index 3036b2ab4a6b..000000000000
--- a/dev-java/junrar-0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=dev-java/commons-logging:0 dev-java/commons-vfs:2 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Unrar java implementation
-EAPI=5
-HOMEPAGE=https://github.com/edmund-wagner/junrar/
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=unRAR
-RDEPEND=dev-java/commons-logging:0 dev-java/commons-vfs:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/edmund-wagner/junrar/archive/junrar-0.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=469d45623bcdd9f70abdcb61bcb8af9c
diff --git a/dev-java/junrar/Manifest b/dev-java/junrar/Manifest
new file mode 100644
index 000000000000..aea24d2ace65
--- /dev/null
+++ b/dev-java/junrar/Manifest
@@ -0,0 +1,3 @@
+DIST junrar-0.6.tar.gz 70631 BLAKE2B a3702814247c30e5eade940ddacef5c561df53e511057f3321776a80d8d550e2d2fa0f87a228571ffda64d07f5ad818d175f704f408fbbf016953068294db4df SHA512 21da07fabb9f9c605191beaadad6a7abbdd1c02c8daab6913232889e735178954c0e2e7c4546734bb3b530d851d9016a549fbb68cc7795d005119fd176c15991
+EBUILD junrar-0.6.ebuild 726 BLAKE2B ece9e1c213d3f359bd94ac5a114b30ff69f2cdf95608c772f3a3d7633402af224757f0c6d606a3ef24b36b2588781eea771a8855f4659b2b16f8b1d992e19865 SHA512 4f51e3c2f02c78b30b94a12a582b73090a808bf3d048050aaa479eb19598c9767c54b2144e068a7d7e92e85f46605a62f7a241e27eb3cf225b209e4a18e853d0
+MISC metadata.xml 321 BLAKE2B 59c4a4df8a68c9c47bf5bcf1ddbbc95fbab7c442d3aaaf2e05c4a69217811ef9ad39c46e726441cdade036d52db98285afc92f14ae48714d219003f41331f666 SHA512 429cc777075ac0714111d1ee012b8bc93628e16477e64ba5716e3b96d457d54f2055a15c204e473db3593079baaa1e33b48ed557e7f9bfa360ab2eed624513ef
diff --git a/dev-java/junrar/junrar-0.6.ebuild b/dev-java/junrar/junrar-0.6.ebuild
new file mode 100644
index 000000000000..b5c290d608f4
--- /dev/null
+++ b/dev-java/junrar/junrar-0.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple vcs-snapshot
+
+DESCRIPTION="Unrar java implementation"
+HOMEPAGE="https://github.com/edmund-wagner/junrar/"
+SRC_URI="https://github.com/edmund-wagner/${PN}/archive/${P}.tar.gz"
+
+LICENSE="unRAR"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/commons-logging:0
+	dev-java/commons-vfs:2"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.5"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="commons-logging,commons-vfs-2"
+JAVA_SRC_DIR="unrar/src/main/java"
+
+java_prepare() {
+	find -name "pom.xml" -delete || die
+}
diff --git a/dev-java/junrar/metadata.xml b/dev-java/junrar/metadata.xml
new file mode 100644
index 000000000000..581cef5a47f9
--- /dev/null
+++ b/dev-java/junrar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">edmund-wagner/junrar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jupidator-0.6.0-r1 b/dev-java/jupidator-0.6.0-r1
deleted file mode 100644
index e452e98a066b..000000000000
--- a/dev-java/jupidator-0.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Jupidator is a library/tool in Java for automatic updating of applications
-EAPI=5
-HOMEPAGE=http://www.sourceforge.net/projects/jupidator
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jupidator/jupidator.0.6.0.tar.bz2 -> jupidator-0.6.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dd8b06911283b1295106085c716ab743
diff --git a/dev-java/jupidator/Manifest b/dev-java/jupidator/Manifest
new file mode 100644
index 000000000000..1f647a1a130c
--- /dev/null
+++ b/dev-java/jupidator/Manifest
@@ -0,0 +1,3 @@
+DIST jupidator-0.6.0.tar.bz2 253170 BLAKE2B 0a32df25c2885115ba914ecbcad8d8c426893eace2f8067a3f6c858ae15f3573e9106693694acc9179fe6841e5f3a664a0b1038cbda001dbbee08b475914d29b SHA512 5e96831ca41b6871eb5f6c883c21eae17474844a74fc5e103b534d6e225d0a16ef98149da1d52728e737607eb7ece586f05aafa0a0ada29c4c28ff3e078a2415
+EBUILD jupidator-0.6.0-r1.ebuild 636 BLAKE2B a4fa93db37d87e123d4b254fe59c24e79a2bf1c0ad6373438d5ddeba6eb39cb6a3ea65d9cfecd912e53797f613693765495cb0d09bb7eeaaf2e3879c021a8da8 SHA512 8da8b551d581f4261d380bd2803d7aeb5a0e7383caa83b821635f8fdc91c24ec6e592d93fb654c834d4454d0fd1ea21abb6fa254dbfd639b0f06364332084861
+MISC metadata.xml 315 BLAKE2B b2b3803bab58cdcc7fe68de765c6a2041b615b741c9252aebf54235a18293325a2da0c16a2292a04266514a10cf54930e9ba7411b6f0ebf385b6b76221eb0675 SHA512 ee74e4fc53d2a94b32fda03601185b2178e7329c1ca4a0560f94d3715b9f8cb8aab34ec1b09a8e388e87844bf4cbed70f36bad166eb2f7ee7420259ceaa95203
diff --git a/dev-java/jupidator/jupidator-0.6.0-r1.ebuild b/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..eecea93a1353
--- /dev/null
+++ b/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}.${PV}"
+
+DESCRIPTION="Jupidator is a library/tool in Java for automatic updating of applications"
+HOMEPAGE="http://www.sourceforge.net/projects/jupidator"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/jupidator/metadata.xml b/dev-java/jupidator/metadata.xml
new file mode 100644
index 000000000000..fe573240f061
--- /dev/null
+++ b/dev-java/jupidator/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jupidator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jutils-1.0.0-r1 b/dev-java/jutils-1.0.0-r1
deleted file mode 100644
index 50f9626275e2..000000000000
--- a/dev-java/jutils-1.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Common utilities for the Java Game Technology Group
-EAPI=5
-HOMEPAGE=https://java.net/projects/jutils
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/net/java/jutils/jutils/1.0.0/jutils-1.0.0-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d11d190825ada64cea0de3c52d9fdcc2
diff --git a/dev-java/jutils/Manifest b/dev-java/jutils/Manifest
new file mode 100644
index 000000000000..2e7dc2e27e95
--- /dev/null
+++ b/dev-java/jutils/Manifest
@@ -0,0 +1,3 @@
+DIST jutils-1.0.0-sources.jar 10247 BLAKE2B 877998d7c442bdf0f6ad58c69832d3f69377a973c0a7d3d2fe252825e7e8a1b72e7383dae2fd820f793a58a1889dc8eaa2d53e378d3a779e47ed3ec18e95ec29 SHA512 3bf29fa8e0ca0cb6cdba022a122f152df929d9738725839234b15eb6ef2f87c72d5a30c8788783e44f73a39aeeba459882d4106ccfd44449e43d838054a1fb01
+EBUILD jutils-1.0.0-r1.ebuild 506 BLAKE2B 06a36dfbd98f6dbc873a2331bc2a195af2a519de69c9c4c4faa01f5545fac375a13ad6295725381bd9038448ba06dfdadbe0a3f882fb8c30a09b0f274c4b4683 SHA512 d842ebbf3857bde2b3c6028432a7b7ae27402037ab26839e419afcfd2b6a01f96ab9e5597cf68b0074a0556e65f1d2796c1e6845840a7b123d8d1aee34362ba5
+MISC metadata.xml 510 BLAKE2B 94c04e7d7ca6daef885ff378aca3f4555368e21af77395a60ccd9e25898fdb5849d501a8248b5339043938e065ac32c21ac9c7a211d9aaa329c8586120f3a922 SHA512 27f43318fbec4a4df03d6e642bd269b4ca65457789694fa7617c9f94b9bfbcefd2a83f2fac2f5508ccc58de262364703293a5df536231e03ad1339fe707e492d
diff --git a/dev-java/jutils/jutils-1.0.0-r1.ebuild b/dev-java/jutils/jutils-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..87b28ba5fd1b
--- /dev/null
+++ b/dev-java/jutils/jutils-1.0.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Common utilities for the Java Game Technology Group"
+HOMEPAGE="https://java.net/projects/jutils"
+SRC_URI="http://central.maven.org/maven2/net/java/${PN}/${PN}/${PV}/${P}-sources.jar"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/jutils/metadata.xml b/dev-java/jutils/metadata.xml
new file mode 100644
index 000000000000..7e5bd9f460ca
--- /dev/null
+++ b/dev-java/jutils/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>The JUtils project hosts an implementation of a set of APIs utilized by other Java Game Technology Group projects (e.g. JInput, JOAl, JOGL). Some of those other projects may have build and/or run-time dependencies on the jutils.jar file.</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jvmstat-3.0 b/dev-java/jvmstat-3.0
deleted file mode 100644
index 5db1a76d5ee9..000000000000
--- a/dev-java/jvmstat-3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst setup
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-DESCRIPTION=Monitoring APIs and tools for monitoring the performance of the JVM
-EAPI=0
-HOMEPAGE=http://java.sun.com/performance/jvmstat/
-IUSE=doc elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=sun-bcla-jvmstat
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-RESTRICT=fetch strip
-SLOT=0
-SRC_URI=jvmstat-3_0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8f4007380e9f6a5f6f2903acd7c80c41
diff --git a/dev-java/jvmstat/Manifest b/dev-java/jvmstat/Manifest
new file mode 100644
index 000000000000..d3314b46605f
--- /dev/null
+++ b/dev-java/jvmstat/Manifest
@@ -0,0 +1,3 @@
+DIST jvmstat-3_0.zip 153629 BLAKE2B 9191873c9d719a0aab33e3eb7d8ef056dc93861f81c09ef10f7adea457fbfb39f347d34d0b84410457b0b0c52479620bde1060bc5fbc6f7dd1c23efe643d385c SHA512 c3967f5c11ef70aac3b3131c7ca1330c4ea377e59a2e9fb18329cfd9c82a8363efd960c9fb71e4d5f7e81867bd24e5bb6263d2f38b95878222c9184c0aaf4f12
+EBUILD jvmstat-3.0.ebuild 1018 BLAKE2B 84e53700ce1b388dd2e531f7ca58268e9c5c6c03896411bb329d0b22f847394d5138bbca921076415d1355825d5d34b625b7a3687f47de0acc2f3c4768b5effa SHA512 3fa0f7246bb4a6cf263cb3bc96af279a42ec90a28237f038d03af89fe5b9fb682505f89bc1704fc594b7048197592433fc12918b13cdcad2d96da386da19a85e
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jvmstat/jvmstat-3.0.ebuild b/dev-java/jvmstat/jvmstat-3.0.ebuild
new file mode 100644
index 000000000000..ebac4a87c59b
--- /dev/null
+++ b/dev-java/jvmstat/jvmstat-3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit java-pkg-2 versionator
+
+MY_PV=$(replace_version_separator 1 '_')
+DESCRIPTION="Monitoring APIs and tools for monitoring the performance of the JVM"
+HOMEPAGE="http://java.sun.com/performance/jvmstat/"
+SRC_URI="jvmstat-${MY_PV}.zip"
+
+LICENSE="sun-bcla-jvmstat"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RESTRICT="fetch strip"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/jvmstat/"
+
+INSTTO="/opt/${PN}"
+
+pkg_nofetch() {
+
+	einfo "Please go to following URL:"
+	einfo " ${HOMEPAGE}"
+	einfo "download file named ${SRC_URI} and place it in:"
+	einfo " ${DISTDIR}"
+
+}
+
+src_install() {
+
+	dodir "${INSTTO}"
+	cd "${S}"
+	cp -r jars bin "${D}/${INSTTO}"
+
+	dodoc README
+	use doc && dodoc -r docs
+
+	dodir /opt/bin
+	cat > "${D}/opt/bin/visualgc" <<-EOF
+	#!/bin/bash
+	export JVMSTAT_JAVA_HOME=$(java-config -O)
+	cd /opt/jvmstat/bin/
+	./visualgc \${@}
+	EOF
+	fperms 755 /opt/bin/visualgc
+
+}
diff --git a/dev-java/jvmstat/metadata.xml b/dev-java/jvmstat/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/jvmstat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jvyaml-0.2.1-r2 b/dev-java/jvyaml-0.2.1-r2
deleted file mode 100644
index 3f069dde6095..000000000000
--- a/dev-java/jvyaml-0.2.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java YAML parser and emitter
-EAPI=5
-HOMEPAGE=https://jvyaml.dev.java.net/
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/jvyaml-src-0.2.1.tar.gz -> jvyaml-0.2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dd65a4de08bceda421096b78a1174a11
diff --git a/dev-java/jvyaml/Manifest b/dev-java/jvyaml/Manifest
new file mode 100644
index 000000000000..380c4c2da795
--- /dev/null
+++ b/dev-java/jvyaml/Manifest
@@ -0,0 +1,3 @@
+DIST jvyaml-0.2.1.tar.gz 202550 BLAKE2B ec58d90a209916d21e9fe1e19b6dd3a394d77a41e4bf3272d55abc0c975eee31a6520270f1e2607017d558421e96cc0997e8ba075d3e5786e241e864be3c3cd2 SHA512 edac9309c285cf569c453cd63f2cbd5e0a29012936af181616010bebb4eac2c474e2b37463af61b5e66876ffba517040796c596ac2bbcc9dad2af7aedf324221
+EBUILD jvyaml-0.2.1-r2.ebuild 534 BLAKE2B 0653925dbee77c50bee30ee5a15a402c011f89110d85e58de8b6bfae70f81b1a61ab6b744007a0e69e24b3cfb8147f85fa6bc4cea49cdb5167e5a7d39fe81eff SHA512 a4bc69598701c3694398272181682048366364abc235095973336cc82a8f3026183a4289f08b6e42c105dd4067b48459bf9e67856e2aab9996a1618978a22020
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jvyaml/jvyaml-0.2.1-r2.ebuild b/dev-java/jvyaml/jvyaml-0.2.1-r2.ebuild
new file mode 100644
index 000000000000..01c3133f0780
--- /dev/null
+++ b/dev-java/jvyaml/jvyaml-0.2.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java YAML parser and emitter"
+HOMEPAGE="https://jvyaml.dev.java.net/"
+SRC_URI="mirror://gentoo/${PN}-src-${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+SLOT="0"
+LICENSE="MIT"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+JAVA_SRC_DIR="src"
+
+S="${WORKDIR}/${P}"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rv src/test || die
+}
diff --git a/dev-java/jvyaml/metadata.xml b/dev-java/jvyaml/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/jvyaml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jvyamlb-0.2.5 b/dev-java/jvyamlb-0.2.5
deleted file mode 100644
index dbe04f09a597..000000000000
--- a/dev-java/jvyamlb-0.2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit ) dev-java/bytelist:0 dev-java/jcodings:0 dev-java/joda-time:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JvYAMLb, YAML processor extracted from JRuby
-EAPI=2
-HOMEPAGE=https://github.com/olabini/jvyamlb
-IUSE=elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.4 dev-java/bytelist:0 dev-java/jcodings:0 dev-java/joda-time:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://jvyamlb.googlecode.com/files/jvyamlb-src-0.2.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=168c481bd14a9d383d53ab6f6025165e
diff --git a/dev-java/jvyamlb/Manifest b/dev-java/jvyamlb/Manifest
new file mode 100644
index 000000000000..96efefa3eedb
--- /dev/null
+++ b/dev-java/jvyamlb/Manifest
@@ -0,0 +1,3 @@
+DIST jvyamlb-src-0.2.5.tar.gz 1767828 BLAKE2B d87a31ce4cbba1ad039afaa067b0430d488abe5ed82fa53a14b4971c236e6ed77bcc652bdca4e9ff2d465d9468927f1dd5113bb44c63abba80caf50b272c60d1 SHA512 1e853ff957b888d706a4d264aac4573cf4aced02604e2679d5871f3a92c016136a7fb73adf5d5c0be0cea9f28b4bc6faf11abc0334fe2f96a251a7d9cc228711
+EBUILD jvyamlb-0.2.5.ebuild 1010 BLAKE2B 1145d98a1e70ffb4aaea1112750834a711d9f0a3b8378fb4fa94d7e18e9adddb5219a9b9ba9faff9ec3ef20df46308d70e0a03f78be5f01cf7747d1227b47734 SHA512 d3dd95121a759a52c3759283147f5d9c7a4f87ee9f2a0d6599fdfc4a020450c8da87fc89ee4c1a0867cff2ecc93a16719e9d5332b22ddcadd1c9231484903a94
+MISC metadata.xml 348 BLAKE2B 82f0d57c39dbdc2501bffc728986883387457858b9f044ed924efbe526a7ea282d872001695a7050b99c44707ac956d66e086426b98a071501c2a286c1299df8 SHA512 50cc0581097381b62f98172a0c876c5835dbcad92e6c1f966bcb2bf48614d9768a4577a511e49f83c3f9ed1679adf708ef709c1aecba40b5abb69626cd906e22
diff --git a/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild b/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild
new file mode 100644
index 000000000000..89d7ee44b2de
--- /dev/null
+++ b/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+JAVA_PKG_IUSE="source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JvYAMLb, YAML processor extracted from JRuby"
+HOMEPAGE="https://github.com/olabini/jvyamlb"
+SRC_URI="https://jvyamlb.googlecode.com/files/jvyamlb-src-${PV}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+CDEPEND="dev-java/bytelist:0
+	dev-java/jcodings:0
+	dev-java/joda-time:0"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="bytelist jcodings joda-time"
+
+java_prepare() {
+	rm -fv lib/*.jar || die
+
+	# Don't do tests unnecessarily.
+	sed -i 's:depends="test":depends="compile":' build.xml
+}
+
+src_install() {
+	java-pkg_newjar lib/${P}.jar
+	use source && java-pkg_dosrc src/*
+	dodoc CREDITS README || die
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test
+}
diff --git a/dev-java/jvyamlb/metadata.xml b/dev-java/jvyamlb/metadata.xml
new file mode 100644
index 000000000000..893114c9c1ca
--- /dev/null
+++ b/dev-java/jvyamlb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">jvyamlb</remote-id>
+		<remote-id type="github">olabini/jvyamlb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jython-2.7.0-r2 b/dev-java/jython-2.7.0-r2
deleted file mode 100644
index 1a6e86762389..000000000000
--- a/dev-java/jython-2.7.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/antlr:3 dev-java/netty-transport:0 >=dev-java/asm-5:4 dev-java/commons-compress:0 dev-java/guava:20 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:52 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/script-api:0 java-virtuals/servlet-api:3.0 >=virtual/jdk-1.7 app-arch/unzip dev-java/ant-core:0 test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An implementation of Python written in Java
-EAPI=6
-HOMEPAGE=http://www.jython.org
-IUSE=examples test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=PSF-2
-RDEPEND=dev-java/antlr:3 dev-java/netty-transport:0 >=dev-java/asm-5:4 dev-java/commons-compress:0 dev-java/guava:20 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:52 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/script-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2.7
-SRC_URI=http://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1a4cb72bf1af61c6e0d5bbb5b792314e
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
new file mode 100644
index 000000000000..c29216f79d29
--- /dev/null
+++ b/dev-java/jython/Manifest
@@ -0,0 +1,10 @@
+AUX CVE-2016-4000.patch 6415 BLAKE2B 4293384898752343d63986fa19c0d9bc49a336b05d690f3dbea9258e97248c094bb5ac2fb635cea6a05ced8bfc61389f2d7feeef4dcf587cc7a559e6943dd786 SHA512 8fef03e890e70a7a514a03e9b36c8b7b2ab744a7e7f53e9fbf970a2990553cdac9002cb6cdfd9a9fa0635d9bd231c41d98cdf0406889a162b9aa64c407a043f9
+AUX jython-2.5.2-distutils_scripts_location.patch 350 BLAKE2B 12eb41a3fa811643dcff99ba9736002321a8ca5ea4fde08e934ad851251f7b730e8b8f5c3449b6a4aeed8a9972c4590cde108d282840be912af6081a430d5099 SHA512 bf6e32641c539251550c979630311f0d3e4299fb1e4545d6c9fe18d42beace3959dadc22eff39ea53f20960889e19c73acb309414f007980909cf3a32a6b1b5d
+AUX jython-2.5.2-respect_PYTHONPATH.patch 551 BLAKE2B ad8bd92b7cad29074d837391c933a8db75376dab8d54c12138a4a94a278b50bb99b1c97276f226434a6cb686d5156d174d9792d3add2002175bd1b8ee395de98 SHA512 773d595fb05b687dfce63b3c2f67c663135d9faddd811c0d6939bbdd6da3e295f7ece9d913923205ca6fb433d90fd494bccafd8b421f14ced1e493a1a40682c7
+AUX jython-2.7.0-build.xml.patch 547 BLAKE2B 2c779ca1d6c99081bed511462130ccb01c704afd473e6ee5abe73d4f8404c21c70cc3376611076f6b32a6f379ea7233cc84439a7982607ac224557e505f99121 SHA512 d5a9cd75d99482996d3fd09b43c6becd2c45173e1a34116e74b43baba2235863eefbfd509bf714215bb311eb6f620d972249ad4593e067b91b5d7b88467f635a
+AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd6396c304ebe4d8dcddf8547a1464b56c947089cfff3a5b1f740f5cb8f3cfc26fcad1e3c94c0a0d45d8c92ed1bf2 SHA512 9d6888c0af9b0ca39f7e70c3aad868c17b65d2f703b1fcd05fb71fe0cc8a289ca055fadd878afdc7fd509e16099abb2ddf0de9053994010d09757f275d243c70
+AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18
+AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
+DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
+EBUILD jython-2.7.0-r2.ebuild 4298 BLAKE2B 5a536bfb3c69b6c01c2c7b9e510740f46c6ef9f1c6b74969492f7d61a887f3ff2a220bf9df611472d7a42884ba333cd68da4bef437c3a79d373bb0ce4a100524 SHA512 8ff019b22a9a7abac0f96dd4466654333de3f60c72764053f4f26ce995e1200084348aa223edcd3806037cfade26d956f57512d38d733f37652a4cdb590c7e01
+MISC metadata.xml 322 BLAKE2B 38d6e9bfdfaa08a94d90560b457b54d7e2732ddc7632b6c7c8a9fc9152ff563c36eeb31605e6bc5a96e9d4c537eb6e018dd57364456ac312cc64a3e7637cbadf SHA512 e8a44ffb98b2da1c2d60f478d89e45879c3f4516042afed922ee522ded157243381e51b198fd638845e45ceb2255535e25df8a7ce61f267b6222dd94525b2342
diff --git a/dev-java/jython/files/CVE-2016-4000.patch b/dev-java/jython/files/CVE-2016-4000.patch
new file mode 100644
index 000000000000..81785eb05b07
--- /dev/null
+++ b/dev-java/jython/files/CVE-2016-4000.patch
@@ -0,0 +1,158 @@
+
+# HG changeset patch
+# User Jim Baker <jim.baker@rackspace.com>
+# Date 1454384221 25200
+# Node ID d06e29d100c04576735e86c75a26c5f33669bb72
+# Parent  b6735606c13df95f770527e629954407f82808c5
+Do not deserialize PyFunction objects. Fixes #2454
+
+Instead use standard Python pickling; or subclass PyFunction.
+
+diff --git a/Lib/test/test_java_integration.py b/Lib/test/test_java_integration.py
+--- a/Lib/test/test_java_integration.py
++++ b/Lib/test/test_java_integration.py
+@@ -14,8 +14,9 @@ import re
+ from collections import deque
+ from test import test_support
+ 
+-from java.lang import (ClassCastException, ExceptionInInitializerError, String, Runnable, System,
+-        Runtime, Math, Byte)
++from java.lang import (
++    ClassCastException, ExceptionInInitializerError, UnsupportedOperationException,
++    String, Runnable, System, Runtime, Math, Byte)
+ from java.math import BigDecimal, BigInteger
+ from java.net import URI
+ from java.io import (ByteArrayInputStream, ByteArrayOutputStream, File, FileInputStream,
+@@ -656,13 +657,30 @@ class SerializationTest(unittest.TestCas
+         self.assertEqual(date_list, roundtrip_serialization(date_list))
+ 
+     def test_java_serialization_pycode(self):
+-
+         def universal_answer():
+             return 42
+ 
+         serialized_code = roundtrip_serialization(universal_answer.func_code)
+         self.assertEqual(eval(serialized_code), universal_answer())
+ 
++    def test_java_serialization_pyfunction(self):
++        # Not directly supported due to lack of general utility
++        # (globals will usually be in the function object in
++        # func_globals), and problems with unserialization
++        # vulnerabilities. Users can always subclass from PyFunction
++        # for specific cases, as seen in PyCascading
++        import new
++        def f():
++            return 6 * 7 + max(0, 1, 2)
++        # However, using the new module, it's possible to create a
++        # function with no globals, which means the globals will come
++        # from the current context
++        g = new.function(f.func_code, {}, "g")
++        # But still forbid Java deserialization of this function
++        # object. Use pickling or other support instead.
++        with self.assertRaises(UnsupportedOperationException):
++            roundtrip_serialization(g)
++
+     def test_builtin_names(self):
+         import __builtin__
+         names = [x for x in dir(__builtin__)]
+@@ -872,7 +890,7 @@ class SingleMethodInterfaceTest(unittest
+         future.get()
+         self.assertEqual(x, [42])
+ 
+-    @unittest.skip("FIXME: not working")
++    @unittest.skip("FIXME: not working; see http://bugs.jython.org/issue2115")
+     def test_callable_object(self):
+         callable_obj = CallableObject()
+         future = self.executor.submit(callable_obj)
+diff --git a/Lib/test/test_new.py b/Lib/test/test_new.py
+--- a/Lib/test/test_new.py
++++ b/Lib/test/test_new.py
+@@ -24,18 +24,10 @@ class NewTest(unittest.TestCase):
+         c = new.instance(C, {'yolks': 3})
+ 
+         o = new.instance(C)
+-
+-        # __dict__ is a non dict mapping in Jython
+-        if test_support.is_jython:
+-            self.assertEqual(len(o.__dict__), 0, "new __dict__ should be empty")
+-        else:
+-            self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
++        self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
+         del o
+         o = new.instance(C, None)
+-        if test_support.is_jython:
+-            self.assertEqual(len(o.__dict__), 0, "new __dict__ should be empty")
+-        else:
+-            self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
++        self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
+         del o
+ 
+         def break_yolks(self):
+@@ -109,7 +101,14 @@ class NewTest(unittest.TestCase):
+         test_closure(g, (1, 1), ValueError) # closure is wrong size
+         test_closure(f, g.func_closure, ValueError) # no closure needed
+ 
+-    if hasattr(new, 'code') and not test_support.is_jython:
++    # [Obsolete] Note: Jython will never have new.code()
++    #
++    # Who said that?!!! guess what, we do! :)
++    # 
++    # Unfortunately we still need a way to compile to Python bytecode,
++    # so support is still incomplete, as seen in the fact that we need
++    # to get values from CPython 2.7.
++    if hasattr(new, 'code'):
+         def test_code(self):
+             # bogus test of new.code()
+             def f(a): pass
+@@ -117,16 +116,16 @@ class NewTest(unittest.TestCase):
+             c = f.func_code
+             argcount = c.co_argcount
+             nlocals = c.co_nlocals
+-            stacksize = c.co_stacksize
++            stacksize = 1  # TODO c.co_stacksize
+             flags = c.co_flags
+-            codestring = c.co_code
+-            constants = c.co_consts
+-            names = c.co_names
++            codestring = 'd\x00\x00S'  # TODO c.co_code
++            constants = (None,)  # TODO c.co_consts
++            names = ()  # TODO c.co_names
+             varnames = c.co_varnames
+             filename = c.co_filename
+             name = c.co_name
+             firstlineno = c.co_firstlineno
+-            lnotab = c.co_lnotab
++            lnotab = '' # TODO c.co_lnotab, but also see http://bugs.jython.org/issue1638
+             freevars = c.co_freevars
+             cellvars = c.co_cellvars
+ 
+diff --git a/src/org/python/core/PyBytecode.java b/src/org/python/core/PyBytecode.java
+--- a/src/org/python/core/PyBytecode.java
++++ b/src/org/python/core/PyBytecode.java
+@@ -66,6 +66,12 @@ public class PyBytecode extends PyBaseCo
+ 
+         debug = defaultDebug;
+ 
++        if (argcount < 0) {
++            throw Py.ValueError("code: argcount must not be negative");
++        } else if (nlocals < 0) {
++            throw Py.ValueError("code: nlocals must not be negative");
++        }
++
+         co_argcount = nargs = argcount;
+         co_varnames = varnames;
+         co_nlocals = nlocals; // maybe assert = varnames.length;
+diff --git a/src/org/python/core/PyFunction.java b/src/org/python/core/PyFunction.java
+--- a/src/org/python/core/PyFunction.java
++++ b/src/org/python/core/PyFunction.java
+@@ -545,6 +545,9 @@ public class PyFunction extends PyObject
+     @Override
+     public boolean isSequenceType() { return false; }
+ 
++    private Object readResolve() {
++        throw new UnsupportedOperationException();
++    }
+ 
+     /* Traverseproc implementation */
+     @Override
+
diff --git a/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch b/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch
new file mode 100644
index 000000000000..fc9a95be89f9
--- /dev/null
+++ b/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch
@@ -0,0 +1,11 @@
+--- a/Lib/distutils/command/install.py
++++ b/Lib/distutils/command/install.py
+@@ -70,7 +70,7 @@
+         'purelib': '$base/Lib/site-packages',
+         'platlib': '$base/Lib/site-packages',
+         'headers': '$base/Include/$dist_name',
+-        'scripts': '$base/bin',
++        'scripts': '/usr/bin',
+         'data'   : '$base',
+         }
+     }
diff --git a/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch b/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch
new file mode 100644
index 000000000000..e695122ba1d6
--- /dev/null
+++ b/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch
@@ -0,0 +1,15 @@
+--- a/src/org/python/core/PySystemState.java
++++ b/src/org/python/core/PySystemState.java
+@@ -646,6 +646,12 @@
+             if (jythonpath != null) {
+                 registry.setProperty("python.path", jythonpath);
+             }
++            else {
++                jythonpath = System.getenv("PYTHONPATH");
++                if (jythonpath != null) {
++                    registry.setProperty("python.path", jythonpath);
++                }
++            }
+         } catch (SecurityException e) {
+         }
+         registry.putAll(postProperties);
diff --git a/dev-java/jython/files/jython-2.7.0-build.xml.patch b/dev-java/jython/files/jython-2.7.0-build.xml.patch
new file mode 100644
index 000000000000..1f0be614dbe5
--- /dev/null
+++ b/dev-java/jython/files/jython-2.7.0-build.xml.patch
@@ -0,0 +1,11 @@
+--- a/build.xml.orig	2015-06-27 16:12:08.442000000 +0000
++++ b/build.xml	2015-06-27 16:12:15.684000000 +0000
+@@ -448,7 +448,7 @@
+     </target>
+ 
+     <target name="antlr_gen" depends="prepare-output" unless="antlr.notneeded">
+-        <java classname="org.antlr.Tool" failonerror="true" fork="true" dir="${jython.base.dir}">
++        <java classname="org.antlr.Tool" failonerror="false" fork="true" dir="${jython.base.dir}">
+             <jvmarg value="-Xmx512m"/>
+             <arg value="-Xconversiontimeout"/>
+             <arg value="2000"/>
diff --git a/dev-java/jython/files/jython-2.7_beta1-ant.patch b/dev-java/jython/files/jython-2.7_beta1-ant.patch
new file mode 100644
index 000000000000..c86cae894a92
--- /dev/null
+++ b/dev-java/jython/files/jython-2.7_beta1-ant.patch
@@ -0,0 +1,28 @@
+--- jython-2.7-b1-sources/build.xml
++++ jython-2.7-b1-sources/build.xml
+@@ -508,6 +509,7 @@
+         </javac>
+ 
+         <!-- java files used by tests -->
++<!--
+         <javac srcdir="${test.source.dir}"
+                destdir="${compile.dir}"
+                target="${jdk.target.version}"
+@@ -529,6 +531,7 @@
+             <compilerarg line="${javac.Xlint}"/>
+             <classpath refid="test.classpath" />
+         </javac>
++-->
+         <copy file="${source.dir}/org/python/modules/ucnhash.dat"
+               todir="${compile.dir}/org/python/modules"
+               preservelastmodified="true" />
+@@ -826,9 +829,6 @@
+ 
+     <target name="copy-javalib" unless="full-build">
+         <copy todir="${dist.dir}/javalib">
+-            <fileset dir="${jython.base.dir}/extlibs">
+-                <exclude name="profile.properties"/>
+-            </fileset>
+             <fileset dir="${work.dir}/build">
+                 <include name="*.jar"/>
+                 <include name="*.properties"/>
diff --git a/dev-java/jython/files/jython-2.7_beta1-dont-always-recompile-classes.patch b/dev-java/jython/files/jython-2.7_beta1-dont-always-recompile-classes.patch
new file mode 100644
index 000000000000..326ef7f62afa
--- /dev/null
+++ b/dev-java/jython/files/jython-2.7_beta1-dont-always-recompile-classes.patch
@@ -0,0 +1,11 @@
+--- a/src/org/python/core/imp.java
++++ b/src/org/python/core/imp.java
+@@ -228,7 +228,7 @@
+         }
+         if (testing && mtime != NO_MTIME) {
+             long time = ar.getMTime();
+-            if (mtime != time) {
++            if (mtime < time) {
+                 return null;
+             }
+         }
diff --git a/dev-java/jython/files/jython-2.7_beta2-maxrepeat-import.patch b/dev-java/jython/files/jython-2.7_beta2-maxrepeat-import.patch
new file mode 100644
index 000000000000..944bb195cb38
--- /dev/null
+++ b/dev-java/jython/files/jython-2.7_beta2-maxrepeat-import.patch
@@ -0,0 +1,16 @@
+diff -r 035eded55c4d lib-python/2.7/sre_constants.py
+--- a/lib-python/2.7/sre_constants.py	Wed Apr 16 18:30:13 2014 -0600
++++ b/lib-python/2.7/sre_constants.py	Fri Jul 25 10:31:27 2014 -0700
+@@ -15,7 +15,11 @@
+ 
+ MAGIC = 20031017
+ 
+-from _sre import MAXREPEAT
++try:
++    from _sre import MAXREPEAT
++except ImportError:
++    import _sre
++    MAXREPEAT = _sre.MAXREPEAT = 65535
+ 
+ # SRE standard exception (access as sre.error)
+ # should this really be here?
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild b/dev-java/jython/jython-2.7.0-r2.ebuild
new file mode 100644
index 000000000000..d8fb023be8a9
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="examples test"
+
+CP_DEPEND="dev-java/antlr:3
+	dev-java/netty-transport:0
+	>=dev-java/asm-5:4
+	dev-java/commons-compress:0
+	dev-java/guava:20
+	dev-java/jffi:1.2
+	dev-java/jline:2
+	dev-java/icu4j:52
+	dev-java/jnr-constants:0
+	dev-java/jnr-posix:3.0
+	dev-java/jnr-netdb:1.0
+	dev-java/stringtemplate:0
+	dev-java/xerces:2
+	java-virtuals/script-api:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.7"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/ant-core:0
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+	)"
+
+S=${WORKDIR}
+
+RESTRICT="test"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" java"
+
+EANT_BUILD_TARGET="developer-build"
+EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
+
+# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
+# Uncomment and add to CDEPEND if you want either of them
+#EANT_GENTOO_CLASSPATH+=",jdbc-informix"   EANT_EXTRA_ARGS+=" -Dinformix.present"
+#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
+	"${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
+	"${FILESDIR}"/${PN}-2.7_beta1-ant.patch
+	"${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
+	"${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
+	"${FILESDIR}"/${PN}-2.7.0-build.xml.patch
+	"${FILESDIR}"/CVE-2016-4000.patch
+)
+
+src_prepare() {
+	default
+
+	find \( -name '*.jar' -o -name '*.class' \
+		-o -name '*.pyc' -o -name '*.exe' \) -delete
+
+	# needed for launchertest
+	chmod +x tests/shell/test-jython.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+src_configure() {
+	# apparently this can cause problems
+	append-flags -fno-stack-protector
+
+	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local instdir=/usr/share/${PN}-${SLOT}
+
+	java-pkg_newjar dist/${PN}-dev.jar
+
+	java-pkg_register-optional-dependency jdbc-mysql
+	java-pkg_register-optional-dependency jdbc-postgresql
+
+	insinto ${instdir}
+	doins -r dist/{Lib,registry}
+
+	dodoc ACKNOWLEDGMENTS NEWS README.txt
+
+	use doc && java-pkg_dohtml -r dist/Doc/javadoc
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples Demo/*
+
+	local java_args=(
+		-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
+		-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
+		-Dpython.cachedir="\${HOME}/.jythoncachedir"
+	)
+
+	java-pkg_dolauncher jython${SLOT} \
+		--main org.python.util.jython \
+		--java_args "${java_args[*]}"
+
+	# we need a wrapper to help python_optimize
+	cat <<-EOF > "${T}"/jython
+		exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
+			-Dpython.home="${ED}${instdir}" \
+			-Dpython.cachedir="${T}/.jythoncachedir" \
+			-Duser.home="${T}" \
+			org.python.util.jython "\${@}"
+	EOF
+	chmod +x "${T}"/jython || die
+
+	local -x PYTHON="${T}"/jython
+	# we can't get the path from the interpreter since it does some
+	# magic that fails on non-installed copy...
+	local PYTHON_SITEDIR=${EPREFIX}/usr/share/jython-${SLOT}/Lib/site-packages
+	python_export jython${SLOT} EPYTHON
+
+	# compile tests (everything else is compiled already)
+	# we're keeping it quiet since jython reports errors verbosely
+	# and some of the tests are supposed to trigger compile errors
+	python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
+
+	# for python-exec
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# some of the class files end up with newer timestamps than the files they
+	# were generated from, make sure this doesn't happen
+	find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
+}
diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
new file mode 100644
index 000000000000..d20250bf86a6
--- /dev/null
+++ b/dev-java/jython/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">jython</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jzlib-1.0.7-r2 b/dev-java/jzlib-1.0.7-r2
deleted file mode 100644
index 2c7170f4b8c1..000000000000
--- a/dev-java/jzlib-1.0.7-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=source? ( app-arch/zip ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JZlib is a re-implementation of zlib in pure Java
-EAPI=5
-HOMEPAGE=http://www.jcraft.com/jzlib/
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2f4d4638ff4c0f66614822833c7e450d
diff --git a/dev-java/jzlib-1.1.1 b/dev-java/jzlib-1.1.1
deleted file mode 100644
index 632a44b994c2..000000000000
--- a/dev-java/jzlib-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JZlib is a re-implementation of zlib in pure Java
-EAPI=4
-HOMEPAGE=http://www.jcraft.com/jzlib/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.1
-SRC_URI=http://www.jcraft.com/jzlib/jzlib-1.1.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6ecc11f22308ac4311a88be49247a31b
diff --git a/dev-java/jzlib-1.1.3 b/dev-java/jzlib-1.1.3
deleted file mode 100644
index 3768f055476c..000000000000
--- a/dev-java/jzlib-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JZlib is a re-implementation of zlib in pure Java
-EAPI=4
-HOMEPAGE=http://www.jcraft.com/jzlib/
-IUSE=elibc_FreeBSD examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.1.3
-SRC_URI=https://github.com/ymnk/jzlib/archive/1.1.3.zip -> jzlib-1.1.3.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=24105ca4b8de49b4872f64845bf931b3
diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
new file mode 100644
index 000000000000..48504abe01aa
--- /dev/null
+++ b/dev-java/jzlib/Manifest
@@ -0,0 +1,7 @@
+DIST jzlib-1.0.7.tar.gz 50303 BLAKE2B d38a1560fcbfbda479b797727d8e0ff0e6197ad13f78018d451346ae2f7a201bbffbf87a6ed727776dac2e9eb890aa0ea81486e0c78e11ddcb893c8654711618 SHA512 8cbc492857d432f79da08a9f6dcebc401e25bd888adada8d94caee15d67d0b89b4f66876a5b2275170157977527e1505386dd5a1575dbe658de233d4389941ea
+DIST jzlib-1.1.1.zip 105191 BLAKE2B ba2d53d2d2fb12de6ce6016b393a9147e0a0ffbed576940f629fae50bb60329d076d42a912897925517a2f6a75dca1fba4fc4836046152c45aafadd9e0983e8e SHA512 de76c008e640f17788c69ed2aae72cddbd0a72d039ce61169ca7af640571952080c48ec588b0fdb497a795d3f7644170ec541bdbe834b6b638e6260ffb57dc07
+DIST jzlib-1.1.3.zip 176747 BLAKE2B fb868a254e6beea192de9965bdb8c13313099efd68c0f11b6196c0b70d10bd189b6c82ef75c73376ec391b99e2c029b117cb51cee4bc9d6f888b400fe737c620 SHA512 844a157053a8d6c9b722e9c27e0f1520f3061d7e323f0e50d276c301477128f46dc7b1250c2ca337225690bc641b6f663ee76be8831b6e0c288438e64aa935b0
+EBUILD jzlib-1.0.7-r2.ebuild 762 BLAKE2B c4d8ab0af10c8b0cb09940d823a5df522d2f7afa374e21e94b10dbb985c9754df2fe69b345d709526de2644dc8dcf29dd5c225d2337cf5822993980263c8a784 SHA512 5364cd2fa32bd41178fee876f16be79c454587f6a4bdecce72daa1daf9cbd239d4c0013d36623d9101984cc823551fc4935506ae45c6e134d56996b88e521162
+EBUILD jzlib-1.1.1.ebuild 1360 BLAKE2B 0b6f492e0f41327af685fd4f9458c88df8d1cc47618e33aa8e95307921915d038dd8f93a2ef464eea0851dffdd207ecf6c0cccaf86c7c698557a8c6324f48733 SHA512 0bbb2582a9da8526fdb56698cfca29f988ade0eeeee46d441e06accc2f6a29c532bc9af150f7773a35ff8d956e22c5f7644bbb3250d3d79522de69d2f0451bd5
+EBUILD jzlib-1.1.3.ebuild 1313 BLAKE2B 633f77c17e22f391f2be1e3c59f8e95cad551103b51771f039d71db4baa075454e41df5d943d5e49913f42aeb64f7b9b7a7e81e99c51bedd19031cb72026365a SHA512 3ee03ac380a1abf20dbcc2d0c539f04441c4b1003b299cb127b0ee3916f156f6a3c2fa85a8f71bdcdd69257f3a8adddc373baecfcf52f207bf6348507cba1b68
+MISC metadata.xml 321 BLAKE2B 446bb7ac28e63630afcf6bc8583857b6ec3206b0db5fce1ba0c5564fbe6e662f1df4a711e794960dfa00c31b7d1a28779c0bbc48072e2133326cd1d1fbfce1b2 SHA512 0602c7d4ec61795409acf409461bb44105b58d340a3740ace885d3dba9bee4ff146ee1a1ad6a8dd995d51ea406962fe6e5654b1a55a94c05c14cea3482a6ab8e
diff --git a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
new file mode 100644
index 000000000000..cafaafe1b74a
--- /dev/null
+++ b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JZlib is a re-implementation of zlib in pure Java"
+HOMEPAGE="http://www.jcraft.com/jzlib/"
+SRC_URI="http://www.jcraft.com/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="com"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README ChangeLog
+	use examples && java-pkg_doexamples example
+}
diff --git a/dev-java/jzlib/jzlib-1.1.1.ebuild b/dev-java/jzlib/jzlib-1.1.1.ebuild
new file mode 100644
index 000000000000..f07ebfacbbda
--- /dev/null
+++ b/dev-java/jzlib/jzlib-1.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JZlib is a re-implementation of zlib in pure Java"
+HOMEPAGE="http://www.jcraft.com/jzlib/"
+SRC_URI="http://www.jcraft.com/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="1.1"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5"
+#	test? (
+#		dev-lang/scala
+#		dev-java/junit:4 )"
+# Restrict test due to missing keywords for scala
+RESTRICT="test"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	# Maven not yet supported, use java-pkg-simple instead.
+	rm -v pom.xml || die
+}
+
+src_test() {
+	local CP TESTS
+	CP="${PN}.jar:$(java-pkg_getjars --with-dependencies scala,junit-4)" || die
+	TESTS=$(find src/test/scala -name '*Test.scala' -printf com.jcraft.jzlib. -exec basename {} .scala \;) || die
+
+	mkdir -p target/test || die
+	find src/test/scala -name '*.scala' -exec scalac -classpath "${CP}" -d target/test {} + || die
+	ejunit4 -classpath "target/test:${CP}" ${TESTS}
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README ChangeLog
+	use examples && java-pkg_doexamples example
+}
diff --git a/dev-java/jzlib/jzlib-1.1.3.ebuild b/dev-java/jzlib/jzlib-1.1.3.ebuild
new file mode 100644
index 000000000000..0f0ba0e65841
--- /dev/null
+++ b/dev-java/jzlib/jzlib-1.1.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+JAVA_PKG_IUSE="examples source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JZlib is a re-implementation of zlib in pure Java"
+HOMEPAGE="http://www.jcraft.com/jzlib/"
+SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="1.1.3"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5"
+#	test? (
+#		dev-lang/scala
+#		dev-java/junit:4 )"
+# Restrict test due to missing keywords for scala
+RESTRICT="test"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	rm pom.xml || die
+}
+
+src_test() {
+	local CP TESTS
+	CP="${PN}.jar:$(java-pkg_getjars --with-dependencies scala,junit-4)" || die
+	TESTS=$(find src/test/scala -name '*Test.scala' -printf com.jcraft.jzlib. -exec basename {} .scala \;) || die
+
+	mkdir -p target/test || die
+	find src/test/scala -name '*.scala' -exec scalac -classpath "${CP}" -d target/test {} + || die
+	ejunit4 -classpath "target/test:${CP}" ${TESTS}
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README ChangeLog
+	use examples && java-pkg_doexamples example
+}
diff --git a/dev-java/jzlib/metadata.xml b/dev-java/jzlib/metadata.xml
new file mode 100644
index 000000000000..19b210e94d14
--- /dev/null
+++ b/dev-java/jzlib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ymnk/jzlib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/kryo-2.24.0 b/dev-java/kryo-2.24.0
deleted file mode 100644
index e6a0367237ed..000000000000
--- a/dev-java/kryo-2.24.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/objenesis:0 dev-java/reflectasm:0 dev-java/minlog:0 test? ( dev-java/junit:4 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Fast, efficient Java serialization and cloning
-EAPI=5
-HOMEPAGE=https://github.com/EsotericSoftware/kryo
-IUSE=elibc_FreeBSD source doc test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-java/objenesis:0 dev-java/reflectasm:0 dev-java/minlog:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/EsotericSoftware/kryo/archive/kryo-2.24.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5d3c6c4ade48ab3f6c2e5aea9dbcf22f
diff --git a/dev-java/kryo/Manifest b/dev-java/kryo/Manifest
new file mode 100644
index 000000000000..7d65ed163176
--- /dev/null
+++ b/dev-java/kryo/Manifest
@@ -0,0 +1,3 @@
+DIST kryo-2.24.0.zip 1203526 BLAKE2B a5a7f0376ee71bbd479f8d51b0d35a6445cf9b92ebc42e7af16cd57d0ba61eb45d23f88172e489ec08fbd45d1229f86f1e6babf2590a0f718eb9b82b413201f1 SHA512 0c804e7986678339865cb0dd000bce063e5a91d1f3ae56eba1ca1b1bcca5e917a5d69fe14ff0c986e36c49f115336efb6221d771dd19b4dda91a9a7a6daf1463
+EBUILD kryo-2.24.0.ebuild 1239 BLAKE2B b73a8b5e6510c412b0efcb65b2d88403e21b345d8129a3d4cae82fa50f13a9b4d78e242843f5867e6897e612beb8daef7116ccb78b7fbfd7d500ddbb9a3ae0cc SHA512 311f2771735a18480c79dd8e2246ec131bdad70dff3764a2df942a27208a55e2d6fa857fea9214bade1259f4e6545929e7c51d14b855ed91d4d01a7724ad0575
+MISC metadata.xml 770 BLAKE2B 599e02a9d8f95fc1091ee8ceee1f731ffa91cda749da008b541cef05f5d77a08de3077021c5a4bbf0ecfa99c48cd1bc8f31677cabce278688ef3cf0cf5d206c5 SHA512 0874395033c8921e6caeddebcab9bdbfacaa4e57e0e7900cd8baa36717db48edd4e0c6e05d152e93ffe8e62477f4d733cf61536fee8c2f96aba75884f629a6e4
diff --git a/dev-java/kryo/kryo-2.24.0.ebuild b/dev-java/kryo/kryo-2.24.0.ebuild
new file mode 100644
index 000000000000..e2179fff8899
--- /dev/null
+++ b/dev-java/kryo/kryo-2.24.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source doc test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Fast, efficient Java serialization and cloning"
+HOMEPAGE="https://github.com/EsotericSoftware/kryo"
+SRC_URI="https://github.com/EsotericSoftware/${PN}/archive/${P}.zip"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/objenesis:0
+	dev-java/reflectasm:0
+	dev-java/minlog:0"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/junit:4
+	)
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="objenesis,reflectasm,minlog"
+
+src_prepare() {
+	rm "${S}"/pom.xml || die
+	find "${S}" -name "*.jar" -delete || die
+}
+
+src_test() {
+	mkdir target/tests || die
+	local testcp="${S}/${PN}.jar:target/tests:$(java-pkg_getjars junit-4)"
+	testcp+=":$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH})"
+
+	ejavac -cp "${testcp}" -d target/tests $(find test/ -name "*.java")
+	tests=$(find target/tests -name "*Test.class" \
+			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+			| grep -vP '\$');
+	ejunit4 -cp "${testcp}" ${tests}
+}
diff --git a/dev-java/kryo/metadata.xml b/dev-java/kryo/metadata.xml
new file mode 100644
index 000000000000..b89ab26977a5
--- /dev/null
+++ b/dev-java/kryo/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+	Kryo is a fast and efficient object graph serialization framework for Java.
+	The goals of the project are speed, efficiency, and an easy to use API. The project
+	is useful any time objects need to be persisted, whether to a file, database, or over
+	the network. Kryo can also perform automatic deep and shallow copying/cloning. This is direct copying
+	from object to object, not object-&gt;bytes-&gt;object.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">EsotericSoftware/kryo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/kunststoff-2.0.2-r2 b/dev-java/kunststoff-2.0.2-r2
deleted file mode 100644
index 49d9c18013e9..000000000000
--- a/dev-java/kunststoff-2.0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Kunststoff look'n'feel Java library
-EAPI=6
-HOMEPAGE=http://www.incors.org/archive
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.incors.org/archive/kunststoff-2_0_2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=58dfecf9f6adfdae58fc8dcbeb3153bd
diff --git a/dev-java/kunststoff/Manifest b/dev-java/kunststoff/Manifest
new file mode 100644
index 000000000000..ce5272d9b36e
--- /dev/null
+++ b/dev-java/kunststoff/Manifest
@@ -0,0 +1,3 @@
+DIST kunststoff-2_0_2.zip 77078 BLAKE2B f4da25026f04b1feec10fc1f74405116702d745711d1d6ddd3a8844905a1530a577fd9bf832451bdb87320b6ae2f34390842f58b9a5b70af70ce045e576554b1 SHA512 30e4d74ba28795152b7c740430ac8e5aa650bead2adcbe17442b6e2daefb36b0000d6f98653a161c6d504a6ac77b40fd1477d64143b77e73bec8c28f1c03c5d7
+EBUILD kunststoff-2.0.2-r2.ebuild 440 BLAKE2B ecc32f2876d2b56d984f8b27db33294d9889d7999aacb186ad31f7865ea084a6b88299f34548b9bdef619ed6141b80ab3648711ab9589b544530ae7c052e98a5 SHA512 7e7bf5bf7c3d8bcdcffa239b36955ad9806f3aebf33473f53a73328a928ec479f307b173c022a4014c6cb88ae45a062985d07632fcf295f6858f2ba5ad3b2072
+MISC metadata.xml 503 BLAKE2B 8974bf43184e0c8014d7bee151500f3f680bb69b0a7ac0264125f105deb6ac9d1d6c21a3411e3212934c7047d64aa06512b31acaca9b624cf43d30e12edde6e8 SHA512 839d0e124e49a8476debca71c9526eda35e91cd3009f04f154fdbc90e86c2e2e8e0066ab67de6982af4b7b5474e503a6d20971fa552b0d6c33e21c35950e5194
diff --git a/dev-java/kunststoff/kunststoff-2.0.2-r2.ebuild b/dev-java/kunststoff/kunststoff-2.0.2-r2.ebuild
new file mode 100644
index 000000000000..381acae2d3ce
--- /dev/null
+++ b/dev-java/kunststoff/kunststoff-2.0.2-r2.ebuild
@@ -0,0 +1,19 @@
+# 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="Kunststoff look'n'feel Java library"
+HOMEPAGE="http://www.incors.org/archive"
+SRC_URI="http://www.incors.org/archive/${P//./_}.zip"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/kunststoff/metadata.xml b/dev-java/kunststoff/metadata.xml
new file mode 100644
index 000000000000..b15522ebffed
--- /dev/null
+++ b/dev-java/kunststoff/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+
+The Kunststoff Look&amp;Feel is an extension to the the Java Metal
+Look&amp;Feel.  This makes it very compact in size (approx. 43 kBytes) and
+ensures that all the great features provided by the Metal Look&amp;Feel do not
+get lost.
+
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/kxml-2.3.0 b/dev-java/kxml-2.3.0
deleted file mode 100644
index 342427eb7c22..000000000000
--- a/dev-java/kxml-2.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/xpp3:0 >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Small XML Pull Parser
-EAPI=5
-HOMEPAGE=http://kxml.org/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=mirror://sourceforge/kxml/kxml2-src-2.3.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e7c066dba1d92c3e7a4749ad3fe5846c
diff --git a/dev-java/kxml/Manifest b/dev-java/kxml/Manifest
new file mode 100644
index 000000000000..a980680603e8
--- /dev/null
+++ b/dev-java/kxml/Manifest
@@ -0,0 +1,4 @@
+AUX kxml-2.3.0-build.xml 1888 BLAKE2B 8a64b9c1b87aef6d2d58bb7ebe6a7c55da351ef08ab48912d5e394310cd44d25b59d8f66f1936647a2c529bc94329ffa405e904c8ace9842db0bd34cc278b75e SHA512 4fab1fd2b9abc410d0df327ba08f99658c1752e07fffd97183c924e815f72c365293ad5771d3eb3375b827b80ccd17bda3211d595066cbfd16e32a080950148a
+DIST kxml2-src-2.3.0.zip 354878 BLAKE2B 5e1a5f7d684493eac0b74ef1c2220075d85f2276dbd2b5ff4cba539571831045dad1a9e84f71596390adbcc34368f381318dd20ccd75968eb66abdb2805e50c8 SHA512 f4eeaa71fbe76b51cefb9a195d292c22c79c241920915fe8ddcf30dc11af39bbeb6b848a8c4dab9775fc8e327c5a29586ac53263a577de361312bbf45e25c1e5
+EBUILD kxml-2.3.0.ebuild 941 BLAKE2B 225088a5ca66d4e6da229fef3be398552e5c77f5a2b738e98807c42f8fc0db0597c263c61ad556035c10cb86596d175bbc289e7ab2c42cf7e4f64f35d3f9d83d SHA512 98e94185940701b7fe28f5c6a1a0536064e41a98554e4784f4046bdfa0e2e3249766d1b8fd06d88d085c070d43319e61d1f0c30e3894e6b523d6d2c986815dba
+MISC metadata.xml 310 BLAKE2B 99ac4722c8c372ceb13ec0e3e12206779bb8c11b07d4330f377df0a2835efafb3cbae3644af51e4ee053b79e7a7e3fc73de3157b8b8aea53901bb523152ee543 SHA512 f1a79f86c1602f19f9adba874fc1ae1f747c3d150ed9fbe14a90f5084fe08ba89d2164b8b8ef65e1eb52773e27c064f4b0ba7846204e605df712593fc5159cfd
diff --git a/dev-java/kxml/files/kxml-2.3.0-build.xml b/dev-java/kxml/files/kxml-2.3.0-build.xml
new file mode 100644
index 000000000000..ee1280d24b1b
--- /dev/null
+++ b/dev-java/kxml/files/kxml-2.3.0-build.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="build" basedir="." name="kxml2" >
+
+  <property name="version" value="2.3.0" ></property>	
+	
+  
+  <target name="javadoc" >
+    <delete dir="www/kxml2/javadoc" ></delete>
+    <mkdir dir="www/kxml2/javadoc" ></mkdir>    
+    <javadoc use="true" windowtitle="kxml API" author="true" sourcepath="src" classpath="" destdir="www/kxml2/javadoc" doctitle="kxml API" version="true" packagenames="org.kxml2.*" public="yes" source="1.4" ></javadoc>
+  </target>
+  
+    
+    <target depends="build_jar,javadoc" name="build_src" >
+		<zip zipfile="dist/kxml2-src-${version}.zip" >
+		  <fileset dir="." >
+		    <include name="*/**" ></include>
+		    <exclude name=".*" ></exclude>
+		    <exclude name="classes/**" ></exclude>
+		    <exclude name="tmpclasses/**" ></exclude>
+		    <exclude name="dist/kxml2-src-*.zip" ></exclude>
+		   </fileset>
+		</zip>    
+    
+    </target>
+
+
+    <target name="build_jar" >
+
+    	<delete dir="tmpclasses" ></delete>
+    	<mkdir dir="tmpclasses" ></mkdir>
+    	
+    	<javac destdir="tmpclasses" debuglevel="none" srcdir="src" optimize="true" verbose="true" source="1.4" target="1.4" nowarn="yes" classpath="${gentoo.classpath}" ><classpath path="${gentoo.classpath}" ></classpath></javac>
+	
+        <mkdir dir="dist" ></mkdir>
+            
+    	
+		<jar jarfile="dist/kxml2-${version}.jar" >
+			<fileset dir="tmpclasses" >
+				<include name="**/*.class" ></include>
+				<include name="META-INF/**" ></include>
+			</fileset>
+			<fileset dir="src" >
+				<include name="META-INF/**" ></include>
+			</fileset>			
+		</jar>
+
+		<jar jarfile="dist/kxml2-min-${version}.jar" >
+			<fileset dir="tmpclasses" >
+				<include name="org/kxml2/io/KXmlParser.class" ></include>
+			</fileset>
+		</jar>
+
+    	<delete dir="tmpclasses" ></delete>
+	</target>
+
+
+    <target depends="build_src" name="build" ></target>
+
+	
+    
+</project>
diff --git a/dev-java/kxml/kxml-2.3.0.ebuild b/dev-java/kxml/kxml-2.3.0.ebuild
new file mode 100644
index 000000000000..434bf19f6533
--- /dev/null
+++ b/dev-java/kxml/kxml-2.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Small XML Pull Parser"
+HOMEPAGE="http://kxml.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}2-src-${PV}.zip"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="amd64 ppc64 x86"
+
+CDEPEND="dev-java/xpp3:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	java-pkg_clean
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="build_jar"
+EANT_GENTOO_CLASSPATH="xpp3"
+
+src_install() {
+	java-pkg_newjar dist/${PN}2-${PV}.jar ${PN}.jar
+	java-pkg_newjar dist/${PN}2-min-${PV}.jar ${PN}-min.jar
+
+	use source && java-pkg_dosrc src/org
+	use doc && java-pkg_dojavadoc www/kxml2/javadoc
+	use examples && java-pkg_doexamples samples
+}
diff --git a/dev-java/kxml/metadata.xml b/dev-java/kxml/metadata.xml
new file mode 100644
index 000000000000..b63d654b57bb
--- /dev/null
+++ b/dev-java/kxml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kxml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/l2fprod-common-7.3-r2 b/dev-java/l2fprod-common-7.3-r2
deleted file mode 100644
index 50e0f0e3fd69..000000000000
--- a/dev-java/l2fprod-common-7.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/jreleaseinfo:0 dev-java/nachocalendar:0 dev-java/jcalendar:1.2 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/ant-trax >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java/Swing GUI components and libraries for building desktop applications
-EAPI=5
-HOMEPAGE=http://common.l2fprod.com/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/nachocalendar:0 dev-java/jcalendar:1.2 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://gentoo/l2fprod-common-7.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=96acb5be1c0702ec59ce26a1d3869499
diff --git a/dev-java/l2fprod-common/Manifest b/dev-java/l2fprod-common/Manifest
new file mode 100644
index 000000000000..2c73b8fbbb2f
--- /dev/null
+++ b/dev-java/l2fprod-common/Manifest
@@ -0,0 +1,4 @@
+AUX l2fprod-common-6.9.1-nodeps.patch 1776 BLAKE2B c7cf298871612ea9c168555fb5d0536fae85de786ae9cb3206f83816bfce86d8657dc36992e9864d342a2f7e97985d8d99f6ae72fcaa684addf02334c11131ea SHA512 636ac2851bc24b776fdcb54b2786879216cf112d400a67b032ef50b44dd3988fa0d35ba31044e74174906242aaeab1a8563900d23b0cee728d54eaace13f4086
+DIST l2fprod-common-7.3.tar.bz2 475662 BLAKE2B 40e41e7fc335220c437befd866bd4c5ff9413235f8efc6cc64922f8f9dbb8661f2acee0491ca9d90599bf314038bf0b2a30099e5ff2a323c39d8d60c3a6b0433 SHA512 685dff4cd7a171fbc92d31c6ca25faa2feda2c5a10d5f646e8fa649f53c532d83bd97388518a2720a3b4b8b87c0fa54a63ced23aedbf500e19aa0f618b938a3a
+EBUILD l2fprod-common-7.3-r2.ebuild 1208 BLAKE2B 5767c5a286f169c6b5eee37d43ed5033db26beaa4b652e510737974299ed3d0e1d9779d135c33d7a354f8112b85343d4f659fce77dfcc4b9d7808b86a644a58b SHA512 4d6a89f237229f2e7559bd0dcbe39c38706733c4966930f9c60dfce1948a87338cf46120b7f1d50aa8804db552680000354104d0dc15348ac4c0dcd2b490d369
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/l2fprod-common/files/l2fprod-common-6.9.1-nodeps.patch b/dev-java/l2fprod-common/files/l2fprod-common-6.9.1-nodeps.patch
new file mode 100644
index 000000000000..0ada57e1ed0b
--- /dev/null
+++ b/dev-java/l2fprod-common/files/l2fprod-common-6.9.1-nodeps.patch
@@ -0,0 +1,37 @@
+--- components.xml	2006-09-02 13:44:46.000000000 +0300
++++ components.xml.patched	2008-07-21 21:57:20.000000000 +0300
+@@ -179,26 +179,6 @@
+       <include name="com/l2fprod/common/swing/tips/*.java"/>
+     </javadoc>
+   </component>
+-
+-  <component name="springrcp">
+-    <depend>tasks</depend>
+-    <depend>directorychooser</depend>
+-    <external-depend groupId="org.springframework" artifactId="spring-richclient" version="2006.02.19"/>
+-    <external-depend groupId="org.springframework" artifactId="spring" version="1.2.5"/>
+-    <fileset dir="src/java/springrcp" includes="**"/>
+-    <resources>
+-      <fileset dir="src/java/springrcp" includes="**/*.gif,**/*.png,**/*.properties"/>
+-    </resources>
+-    <classpath>
+-      <pathelement location="build/classes/tasks"/>
+-      <pathelement location="build/classes/directorychooser"/>
+-      <pathelement location="lib/spring/spring.jar"/>
+-      <pathelement location="lib/spring/spring-richclient.jar"/>
+-    </classpath>
+-    <javadoc>
+-      <include name="com/l2fprod/common/springrcp/*.java"/>
+-    </javadoc>
+-  </component>
+             
+   <component name="all"
+              mainclass="com.l2fprod.common.demo.Main"
+@@ -212,7 +192,6 @@
+     <fileset dir="src/java/tasks" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
+     <fileset dir="src/java/totd" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
+     <fileset dir="src/java/shared" includes="**/Version.java" excludes="**/*.gif,**/*.png,**/*.jpg"/>
+-    <fileset dir="src/java/springrcp" includes="**" excludes="**/*.gif,**/*.png,**/*.jpg"/>
+     <resources>
+       <fileset dir="src/java/buttonbar" includes="**/*.gif,**/*.png,**/*.properties"/>
+       <fileset dir="src/java/directorychooser" includes="**/*.gif,**/*.png,**/*.properties"/>
diff --git a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
new file mode 100644
index 000000000000..01d54e8e31ba
--- /dev/null
+++ b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+WANT_ANT_TASKS="ant-trax"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java/Swing GUI components and libraries for building desktop applications"
+HOMEPAGE="http://common.l2fprod.com/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="dev-java/nachocalendar:0
+	dev-java/jcalendar:1.2"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/jreleaseinfo:0
+	${COMMON_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+
+java_prepare() {
+	# Do not build springrcp and sheet for now, would bloat the deps a lot;
+	# potential USE flag material (spring, calendars deps).
+	epatch "${FILESDIR}/${PN}-6.9.1-nodeps.patch"
+
+	java-pkg_jar-from --build-only --into lib jreleaseinfo jreleaseinfo.jar jreleaseinfo-1.2.0.jar
+}
+
+src_compile() {
+	eant init
+
+	java-ant_bsfix_one build/build4components.xml
+	java-ant_rewrite-classpath build/build4components.xml
+
+	eant -Dgentoo.classpath="$(java-pkg_getjar nachocalendar nachocalendar.jar):$(java-pkg_getjars jcalendar-1.2)" jar
+}
+
+src_install() {
+	java-pkg_dojar build/jars/*.jar
+
+	dodoc README.txt || die
+}
diff --git a/dev-java/l2fprod-common/metadata.xml b/dev-java/l2fprod-common/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/l2fprod-common/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/laf-plugin-0.2-r2 b/dev-java/laf-plugin-0.2-r2
deleted file mode 100644
index 88bb5e8d134b..000000000000
--- a/dev-java/laf-plugin-0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Look'n'feel Java library
-EAPI=6
-HOMEPAGE=http://laf-plugin.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/laf-plugin-0.2-src.tar.bz2 -> laf-plugin-0.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2e6afede068aa0df8da194631e518e27
diff --git a/dev-java/laf-plugin-1.1-r1 b/dev-java/laf-plugin-1.1-r1
deleted file mode 100644
index 1e5e6cc09e90..000000000000
--- a/dev-java/laf-plugin-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/nanoxml:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Look'n'feel Java library
-EAPI=6
-HOMEPAGE=http://laf-plugin.dev.java.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-java/nanoxml:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=https://repo1.maven.org/maven2/net/java/dev/laf-plugin/laf-plugin/1.1/laf-plugin-1.1-sources.jar -> laf-plugin-1.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=97c9d4d6d9052a380d2d731e13827f4f
diff --git a/dev-java/laf-plugin/Manifest b/dev-java/laf-plugin/Manifest
new file mode 100644
index 000000000000..eee6dd9e8cd2
--- /dev/null
+++ b/dev-java/laf-plugin/Manifest
@@ -0,0 +1,6 @@
+AUX laf-plugin-0.2-enum.patch 1987 BLAKE2B 9098169cdc3af4f3497542a4a92a37ee3dfa7be9843887d1f8ffdd7f4c40a8cd6bb3ee3efdf76a4fc6fefca7d803189cfb01179e57506feac30c3ae7984dd780 SHA512 3f32b546c95033add7647a209ea269ee398b90a3e286e60479dff83f20cb93c78318d80f961c544ed728c09b1f61297e492b7963736eb56e802ec7401298b801
+DIST laf-plugin-0.2.tar.bz2 13799 BLAKE2B b466053ccc064cc067f408a2d57e9ff99ae1d0e421ec70fe789baa865aa8ad12dae0143591b06ee9f19ce7d59b3c41e75ccb2adfe597d40923f5e4a4f156e144 SHA512 91ac3f9f5ebfcd70e7cc76f2e028e9578c6113a848b0ccdc6b001fff006bf5aaa12af08b1752851693d218d4b2d7d053f62461481e49d5a0bde21e5a7d086331
+DIST laf-plugin-1.1.jar 8105 BLAKE2B 45d065389b25f2e6cf8a06058edba8f056bb02a8e1eb038d0e88c04e086ba09b4ede4064f7bd8c618a0daf328e20781fa15d4902cf7889d41110af92bcf5e5a7 SHA512 2ca265d23ac95e5d194e4905ead4c975cb8739a0aa30096c028d2f6467b148de2ac0ff71c6730752a666eee53551867d9d8c852d25238a873fbd4bd994cf80c0
+EBUILD laf-plugin-0.2-r2.ebuild 562 BLAKE2B 6ef5df70d3626203651159800a1f4d3ff59283e2f367886e91227dbdca200f2b3981216de16f0a094013732bd75d2023a270f2abc6dc11d509ec888c27c0a9e6 SHA512 63ac19a8ec061503532f040ecd85c809f088fe0f263714afc9ae92177f6e599aaefbf4f5278bf76100e8b8377409217f928d823f2acc1e2001646c6ed95317d9
+EBUILD laf-plugin-1.1-r1.ebuild 648 BLAKE2B a3e386472b23de79162574227eb866422090efa8fa326413111768f897445c5b2030712a92ac26306c540bffedbe946d75038ad7d78dc1d0bab57503d02c1a91 SHA512 4d788eacf78c97ebc3f873766d2872f93a408bca6be7524c09c095350b4825df1e995a6a26437a3c4cf34959d6ccef0461f6e1afab9f88551f781b924a9da9b4
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/laf-plugin/files/laf-plugin-0.2-enum.patch b/dev-java/laf-plugin/files/laf-plugin-0.2-enum.patch
new file mode 100644
index 000000000000..35d818ead30a
--- /dev/null
+++ b/dev-java/laf-plugin/files/laf-plugin-0.2-enum.patch
@@ -0,0 +1,42 @@
+--- a/src/org/jvnet/lafplugin/XMLElement.java	2017-03-24 19:08:40.320048066 +0000
++++ b/src/org/jvnet/lafplugin/XMLElement.java	2017-03-24 19:10:18.490049991 +0000
+@@ -478,9 +478,9 @@
+         this.children = new Vector();

+         this.entities = entities;

+         this.lineNr = 0;

+-        Enumeration enum = this.entities.keys();

+-        while (enum.hasMoreElements()) {

+-            Object key = enum.nextElement();

++        Enumeration myEnum = this.entities.keys();

++        while (myEnum.hasMoreElements()) {

++            Object key = myEnum.nextElement();

+             Object value = this.entities.get(key);

+             if (value instanceof String) {

+                 value = ((String) value).toCharArray();

+@@ -2168,10 +2168,10 @@
+         writer.write('<');

+         writer.write(this.name);

+         if (! this.attributes.isEmpty()) {

+-            Enumeration enum = this.attributes.keys();

+-            while (enum.hasMoreElements()) {

++            Enumeration myEnum = this.attributes.keys();

++            while (myEnum.hasMoreElements()) {

+                 writer.write(' ');

+-                String key = (String) enum.nextElement();

++                String key = (String) myEnum.nextElement();

+                 String value = (String) this.attributes.get(key);

+                 writer.write(key);

+                 writer.write('='); writer.write('"');

+@@ -2189,9 +2189,9 @@
+             writer.write('/'); writer.write('>');

+         } else {

+             writer.write('>');

+-            Enumeration enum = this.enumerateChildren();

+-            while (enum.hasMoreElements()) {

+-                XMLElement child = (XMLElement) enum.nextElement();

++            Enumeration myEnum = this.enumerateChildren();

++            while (myEnum.hasMoreElements()) {

++                XMLElement child = (XMLElement) myEnum.nextElement();

+                 child.write(writer);

+             }

+             writer.write('<'); writer.write('/');

diff --git a/dev-java/laf-plugin/laf-plugin-0.2-r2.ebuild b/dev-java/laf-plugin/laf-plugin-0.2-r2.ebuild
new file mode 100644
index 000000000000..03ba88053fbc
--- /dev/null
+++ b/dev-java/laf-plugin/laf-plugin-0.2-r2.ebuild
@@ -0,0 +1,31 @@
+# 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="Look'n'feel Java library"
+HOMEPAGE="http://laf-plugin.dev.java.net/"
+SRC_URI="mirror://gentoo/${P}-src.tar.bz2 -> ${P}.tar.bz2"
+
+KEYWORDS="amd64 x86"
+SLOT="0"
+LICENSE="BSD"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+PATCHES=( "${FILESDIR}/${P}-enum.patch" )
+
+src_prepare() {
+	default
+}
+
+src_install() {
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/laf-plugin/laf-plugin-1.1-r1.ebuild b/dev-java/laf-plugin/laf-plugin-1.1-r1.ebuild
new file mode 100644
index 000000000000..0c34f8779fc1
--- /dev/null
+++ b/dev-java/laf-plugin/laf-plugin-1.1-r1.ebuild
@@ -0,0 +1,36 @@
+# 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="Look'n'feel Java library"
+HOMEPAGE="http://laf-plugin.dev.java.net"
+SRC_URI="https://repo1.maven.org/maven2/net/java/dev/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/nanoxml:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_GENTOO_CLASSPATH="nanoxml"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/laf-plugin/metadata.xml b/dev-java/laf-plugin/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/laf-plugin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ldapsdk-4.1.7-r4 b/dev-java/ldapsdk-4.1.7-r4
deleted file mode 100644
index 6d676221df79..000000000000
--- a/dev-java/ldapsdk-4.1.7-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 dev-java/jss:3.4 dev-java/jakarta-oro:2.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netscape Directory SDK for Java
-EAPI=5
-HOMEPAGE=http://www.mozilla.org/directory/javasdk.html
-IUSE=doc elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.4 dev-java/jss:3.4 dev-java/jakarta-oro:2.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.1
-SRC_URI=http://www.mozilla.org/directory/ldapsdk_java_20020819.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0d84497b79bbdb7d72722bc7368b1e96
diff --git a/dev-java/ldapsdk/Manifest b/dev-java/ldapsdk/Manifest
new file mode 100644
index 000000000000..d8a0f519e468
--- /dev/null
+++ b/dev-java/ldapsdk/Manifest
@@ -0,0 +1,5 @@
+AUX 4.1.7-fix-jdk-1.7-enum.patch 8395 BLAKE2B 44a69a7364592f1913f04a8ddd4f9b9792093e644084b2e0414f2168e788de87511d5c0e91d3ded0de8abd78bcc52e8c76cf1e68a2d5cee7ae733735dfef809c SHA512 b62749328c9ca64342550771a4aeed8321b2995a81b15a103c8c3383beaa471f657c13b9eefa6035f0820c7b39e4640f6af1eec4af8bcbbce75a2d97252bc20e
+AUX ldapsdk-gentoo.patch 5569 BLAKE2B ade856d7048ab2ab7b728bc3bc7b49ad9c3bac9dcf8e1fa860c8ab6a164e57df1e570c0611c153f7da3a391e0a299dafb1a20ee5b0f0bc4b4a5d08398867235b SHA512 2b3eb2b0cd819f6a5885235eb75b20c60a1b2805910fd0f11c4e54edfa5c5c802db79378e43b02182ef6acb60eae20fa5110835e8a772c9a34daf6a4352a3b0c
+DIST ldapsdk_java_20020819.tar.gz 1068301 BLAKE2B bb49f97908014218ed7a2c38bbc4ee4cb84e63866a7cc300a484588e0868a844367428c7a1008f6d69ba7e40031f03bd50ae595c2122d7a5b1fed91d4570b082 SHA512 e27be2a3c41db07589a0f4ee32f5b9dc2700f27aadf07c6c3db32041b3284ea8132d4aafad3cc0e132a68e1d438013df0068ea838c98cfed5ec9227f39d3c33d
+EBUILD ldapsdk-4.1.7-r4.ebuild 1309 BLAKE2B 9f0a6a0248bb9288e3875ff29baae0a9c656db77efc6287c5457662e4178a05ed0af16001f6c8041637c7d672d7c431df9696a8f332d7e60b8a2d87b5e275cfa SHA512 8c6b76e8f3f72016c2fec988d4faf90530e8d0c1e45a7fcec313d78ac734591500325b1fcf7a6bec8411c9204abcb6818447d5019e8f039b5c1bf2d498dfc205
+MISC metadata.xml 313 BLAKE2B 9e8564589bccd808a56750e2cd40cf23c8d7414a458a69ef2f11b567c36c5d3013199b743c25efc56ac5c4bd9f2653ee0d2235e2365e5fbe2bc07f0c8bbe74de SHA512 5b8c3260975827e81ee947fa27f70953bdeb6adb436eed116c63f377fb957aaf16e686bc86a0a3ee4d25ed8c752f9f5403bd831dafe731d8d297c9ecbb3b0240
diff --git a/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch b/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch
new file mode 100644
index 000000000000..13cdf30f843b
--- /dev/null
+++ b/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch
@@ -0,0 +1,151 @@
+diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
+index a0ba7e8..42834c1 100644
+--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
++++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
+@@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
+ 	BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
+ 							   numRead);
+ 	
+-	BEREnumerated enum = (BEREnumerated)s.elementAt(0);
++	BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
+ 	    
+-	_changeTypes = enum.getValue();
++	_changeTypes = enumx.getValue();
+ 
+ 	if (s.size() > 1) {
+ 	    if (s.elementAt(1) instanceof BEROctetString) {
+diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
+index c73bb68..5539f11 100644
+--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
++++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
+@@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
+             BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
+               numRead);
+ 
+-            BEREnumerated enum = (BEREnumerated)s.elementAt(0);
++            BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
+ 
+-            con.setChangeType(enum.getValue());
++            con.setChangeType(enumx.getValue());
+ 
+             if (s.size() > 1) {
+                 if (s.elementAt(1) instanceof BEROctetString) {
+diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
+index e126d47..b5f6809 100644
+--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
++++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
+@@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
+      * @see org.ietf.ldap.util.RDN#getAttributeSyntax
+      */
+     public static String[] getAttributesForSyntax( String oid ) {
+-        Enumeration enum = m_attributehash.keys();
++        Enumeration enumx = m_attributehash.keys();
+         Vector key_v = new Vector();
+         String tmp_str = null;
+ 
+-        while ( enum.hasMoreElements() ) {
+-            tmp_str = (String)enum.nextElement();
++        while ( enumx.hasMoreElements() ) {
++            tmp_str = (String)enumx.nextElement();
+             if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
+                 key_v.addElement( tmp_str );
+             }
+diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
+index a4d9e88..85cc7af 100644
+--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
++++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
+@@ -4519,9 +4519,9 @@ public class LDAPConnection
+         LDAPControl[] controls = null;
+ 
+         synchronized(m_responseControlTable) {            
+-            Enumeration enum = m_responseControlTable.keys();          
+-            while (enum.hasMoreElements()) {
+-                Object client = enum.nextElement();
++            Enumeration enumx = m_responseControlTable.keys();          
++            while (enumx.hasMoreElements()) {
++                Object client = enumx.nextElement();
+                 ResponseControls rspCtrls = (ResponseControls)m_responseControlTable.get(client);
+ 
+                 if (msgID == rspCtrls.msgID) {
+diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
+index 8e486c5..9256aa0 100644
+--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
++++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
+@@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
+ 	BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
+ 							   numRead);
+ 	
+-	BEREnumerated enum = (BEREnumerated)s.elementAt(0);
++	BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
+ 	    
+-	m_changeTypes = enum.getValue();
++	m_changeTypes = enumx.getValue();
+ 
+ 	if (s.size() > 1) {
+ 	    if (s.elementAt(1) instanceof BEROctetString) {
+diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
+index 9bab06a..a5836e8 100644
+--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
++++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
+@@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
+             BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
+               numRead);
+ 
+-            BEREnumerated enum = (BEREnumerated)s.elementAt(0);
++            BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
+ 
+-            con.setChangeType(enum.getValue());
++            con.setChangeType(enumx.getValue());
+ 
+             if (s.size() > 1) {
+                 if (s.elementAt(1) instanceof BEROctetString) {
+diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
+index 57bce3a..392d7ea 100644
+--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
++++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
+@@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
+      * @see netscape.ldap.util.RDN#getAttributeSyntax
+      */
+     public static String[] getAttributesForSyntax( String oid ) {
+-        Enumeration enum = m_attributehash.keys();
++        Enumeration enumx = m_attributehash.keys();
+         Vector key_v = new Vector();
+         String tmp_str = null;
+ 
+-        while ( enum.hasMoreElements() ) {
+-            tmp_str = (String)enum.nextElement();
++        while ( enumx.hasMoreElements() ) {
++            tmp_str = (String)enumx.nextElement();
+             if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
+                 key_v.addElement( tmp_str );
+             }
+diff --git a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
+index 4bcb46d..7b22371 100644
+--- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
++++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
+@@ -151,8 +151,8 @@ class AttributesImpl implements Attributes {
+      */
+     static LDAPAttributeSet jndiAttrsToLdapAttrSet(Attributes jndiAttrs) throws NamingException{
+         LDAPAttributeSet attrs = new LDAPAttributeSet();
+-        for (Enumeration enum = jndiAttrs.getAll(); enum.hasMoreElements();) {
+-            attrs.add(jndiAttrToLdapAttr((Attribute) enum.nextElement()));
++        for (Enumeration enumx = jndiAttrs.getAll(); enumx.hasMoreElements();) {
++            attrs.add(jndiAttrToLdapAttr((Attribute) enumx.nextElement()));
+         }
+         return attrs;
+     }    
+diff --git a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
+index 2595b8a..d9bd103 100644
+--- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
++++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
+@@ -465,8 +465,8 @@ public class ObjectMapper {
+      */
+     static Attributes encodeDirCtxObj(DirContext obj, Attributes attrs) throws NamingException{
+         Attributes ctxAttrs = obj.getAttributes("");
+-        for (NamingEnumeration enum = ctxAttrs.getAll(); enum.hasMore();) {
+-            attrs.put((Attribute)enum.next());
++        for (NamingEnumeration enumx = ctxAttrs.getAll(); enumx.hasMore();) {
++            attrs.put((Attribute)enumx.next());
+         }
+         return attrs;
+     }
diff --git a/dev-java/ldapsdk/files/ldapsdk-gentoo.patch b/dev-java/ldapsdk/files/ldapsdk-gentoo.patch
new file mode 100644
index 000000000000..539b0f79d033
--- /dev/null
+++ b/dev-java/ldapsdk/files/ldapsdk-gentoo.patch
@@ -0,0 +1,129 @@
+diff -uprN mozilla.orig/directory/java-sdk/build.properties mozilla/directory/java-sdk/build.properties
+--- mozilla.orig/directory/java-sdk/build.properties	2004-12-13 16:19:25.626622784 +0100
++++ mozilla/directory/java-sdk/build.properties	2004-12-13 16:23:48.285692536 +0100
+@@ -12,6 +12,6 @@
+ # place the location of this file in the following line.
+ # the library may be downloaded from http://www.oroinc.com
+ 
+-#ororegexp.jar=../lib/oroinc.jar
+-
++#ororegexp.jar=
++#jss.jar=
+ 
+diff -uprN mozilla.orig/directory/java-sdk/build.xml mozilla/directory/java-sdk/build.xml
+--- mozilla.orig/directory/java-sdk/build.xml	2004-12-13 16:19:25.636621264 +0100
++++ mozilla/directory/java-sdk/build.xml	2004-12-13 16:36:40.320325432 +0100
+@@ -58,8 +58,7 @@
+ 
+     <!-- the following is to setup the correct info for sun jsse which
+         is jdk dependent -->
+-    <property name="ssllibs14" value="${basedir}/ldapjdk/lib/jss32_stub.jar"/>
+-    <property name="ssllibs13" value="${basedir}/ldapjdk/lib/jaas.jar:${basedir}/ldapjdk/lib/jnet.jar:${basedir}/ldapjdk/lib/jsse.jar:${basedir}/ldapjdk/lib/jss32_stub.jar"/>
++	<property name="ssllibs14" value="${jss.jar}"/>
+ 
+     <!-- we do not use the users existing classpath and instead build our own
+          comment the following line out if this is not desired -->
+@@ -75,7 +74,7 @@
+    dist-jndi    : will build only the jndi service provider (ldapsp.jar)
+    dist-docs    : will package up all the documentation (ldapdoc.zip)
+ 
+-   build        : will compile the entire sdk but not package
++   bild        : will compile the entire sdk but not package
+    build-jdk    : will compile only the ldap jdk jar
+    build-filter : will compile only the filter classes
+    build-beans  : will compile only the ldap beans
+@@ -173,15 +172,21 @@
+         <!-- Compile the java jdk code from ${src} into ${dest} -->
+         <javac srcdir="${basedir}/ldapjdk/com" destdir="${jdk.dist}"
+             excludes="cvs/**"
+-            classpath="${jsselibs}"
++	    classpath="${jsselibs}"
++	    source="1.4"
++	    target="1.4"
+         />
+         <javac srcdir="${basedir}/ldapjdk/netscape" destdir="${jdk.dist}"
+             excludes="cvs/**"
+             classpath="${jsselibs}"
++	    source="1.4"
++	    target="1.4"
+         />
+         <javac srcdir="${basedir}/tools" destdir="${jdk.dist}"
+             excludes="cvs/**"
+             classpath="${jsselibs}"
++	    source="1.4"
++	    target="1.4"
+         />
+       </target>
+ 
+@@ -191,6 +196,8 @@
+         <javac srcdir="${basedir}/ldapfilter" destdir="${filter.dist}"
+             excludes="cvs/**"
+             classpath="${jdk.dist}:${jsselibs}:${ororegexp.jar}"
++	    source="1.4"
++	    target="1.4"
+         />
+       </target>
+ 
+@@ -199,6 +206,8 @@
+         <javac srcdir="${basedir}/ldapbeans" destdir="${jdk.dist}"
+             excludes="cvs/**"
+             classpath="${jsselibs}"
++	    source="1.4"
++	    target="1.4"
+         />
+       </target>
+ 
+@@ -207,6 +216,8 @@
+         <javac srcdir="${basedir}/ldapsp" destdir="${jndi.dist}"
+             excludes="cvs/**"
+             classpath="${jsselibs}:${basedir}/ldapsp/lib/jndi.jar"
++	    source="1.4"
++	    target="1.4"
+         />
+       </target>
+ 
+@@ -221,7 +232,7 @@
+                  author="true"
+                  version="true"
+                  use="true"
+-                 classpath="${basedir}/ldapjdk:${basedir}/ldapjdk/lib/jss32_stub.jar:${basedir}/ldapbeans" >
++		 classpath="${basedir}/ldapjdk:${jss.jar}:${basedir}/ldapbeans" >
+         </javadoc>
+ 
+         <javadoc packagenames="com.netscape.jndi.ldap.controls.*"
+diff -uprN mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPFilterDescriptor.java mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPFilterDescriptor.java
+--- mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPFilterDescriptor.java	2004-12-13 16:19:25.601626584 +0100
++++ mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPFilterDescriptor.java	2004-12-13 16:19:51.198735232 +0100
+@@ -24,7 +24,7 @@ package netscape.ldap.util;
+ import java.io.*;
+ import java.util.*;
+ import java.net.*;
+-import com.oroinc.text.regex.*;
++import org.apache.oro.text.regex.*;
+ import netscape.ldap.*;
+ 
+ /**
+diff -uprN mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterList.java mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterList.java
+--- mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterList.java	2004-12-13 16:19:25.601626584 +0100
++++ mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterList.java	2004-12-13 16:20:23.892764984 +0100
+@@ -22,7 +22,7 @@
+ package netscape.ldap.util;
+ 
+ import java.util.*;
+-import com.oroinc.text.regex.*;
++import org.apache.oro.text.regex.*;
+ 
+ /**
+  *  Represents an Internal LDAPFilterList object.  This is an internal object
+diff -uprN mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterSet.java mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterSet.java
+--- mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterSet.java	2004-12-13 16:19:25.601626584 +0100
++++ mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterSet.java	2004-12-13 16:20:11.728614216 +0100
+@@ -22,7 +22,7 @@
+ package netscape.ldap.util;
+ 
+ import java.util.*;
+-import com.oroinc.text.regex.*;
++import org.apache.oro.text.regex.*;
+ /**
+  *  Represents an LDAPIntFilterSet object.  This is an internal object that
+  *  should never be instantiated directly by the developer.
diff --git a/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild b/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild
new file mode 100644
index 000000000000..9d6a64e8db56
--- /dev/null
+++ b/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Netscape Directory SDK for Java"
+HOMEPAGE="http://www.mozilla.org/directory/javasdk.html"
+SRC_URI="http://www.mozilla.org/directory/${PN}_java_20020819.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="4.1"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/jss:3.4
+	dev-java/jakarta-oro:2.0"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/mozilla/directory/java-sdk
+
+java_prepare() {
+	cd "${WORKDIR}"/mozilla || die
+	epatch "${FILESDIR}"/ldapsdk-gentoo.patch
+	epatch "${FILESDIR}"/${PV}-*.patch
+
+	echo "ororegexp.jar=$(java-pkg_getjars jakarta-oro-2.0)" > "${S}"/build.properties || die
+	echo "jss.jar=$(java-pkg_getjars jss-3.4)" >> "${S}"/build.properties || die
+
+	cd "${S}"/ldapjdk/lib || die
+	rm -f *.jar || die
+	java-pkg_jar-from jss-3.4
+
+	cd "${S}"/ldapsp/lib || die
+	rm *.jar || die
+
+	java-pkg_filter-compiler jikes
+}
+
+src_compile() {
+	eant dist-jdk dist-filter dist-beans dist-jndi $(use_doc build-docs)
+}
+
+src_install() {
+	java-pkg_dojar dist/packages/*.jar
+
+	use doc && java-pkg_dojavadoc dist/doc/ldapsp
+	use source && \
+		java-pkg_dosrc {ldapsp,ldapjdk}/com	{ldapjdk,ldapbeans,ldapfilter}/netscape
+}
diff --git a/dev-java/ldapsdk/metadata.xml b/dev-java/ldapsdk/metadata.xml
new file mode 100644
index 000000000000..730175bdcb9d
--- /dev/null
+++ b/dev-java/ldapsdk/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+
+The Mozilla Directory (LDAP) SDK Project
+
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/leiningen-bin-2.7.0 b/dev-java/leiningen-bin-2.7.0
deleted file mode 100644
index 7a4ac0eeedbe..000000000000
--- a/dev-java/leiningen-bin-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Automate Clojure projects without setting your hair on fire
-EAPI=6
-HOMEPAGE=https://leiningen.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/technomancy/leiningen/releases/download/2.7.0/leiningen-2.7.0-standalone.zip -> leiningen-2.7.0-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.7.0/bin/lein-pkg -> leiningen-2.7.0.sh
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=023791c52d461ce9d39946f6b4e05e51
diff --git a/dev-java/leiningen-bin-2.7.1-r1 b/dev-java/leiningen-bin-2.7.1-r1
deleted file mode 100644
index 7955b6f5622d..000000000000
--- a/dev-java/leiningen-bin-2.7.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Automate Clojure projects without setting your hair on fire
-EAPI=6
-HOMEPAGE=https://leiningen.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/technomancy/leiningen/releases/download/2.7.1/leiningen-2.7.1-standalone.zip -> leiningen-2.7.1-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.7.1/bin/lein-pkg -> leiningen-2.7.1.sh
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b224c0d89beb2ec33236313a3a9cf4e1
diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
new file mode 100644
index 000000000000..5047b7dc5ae2
--- /dev/null
+++ b/dev-java/leiningen-bin/Manifest
@@ -0,0 +1,8 @@
+AUX leinrc 37 BLAKE2B 0c5df00ef323caebf53e52246ca87b066a1b6104fb03fc7e3548dba0947ecf53c33bf4e8215fc098212293915d9808b961c0df527f30d7f6316b4aff84bf3b69 SHA512 f948d5f355d43fdee6cf68d0dad39f53f72b341649869a6ca161f5d8c83bf30434ed03c51a7e01aaefa422ff4e93ca3db5680fd4c2af92f5393acde6e8aec7d0
+DIST leiningen-2.7.0-standalone.jar 15366772 BLAKE2B f8156298f0b0fc2dc87b7534796c81864ccbff350b69d9d1f303120ae2c24efbeefd874cc132dd37a25f08e5cafa5ebe3bf23168f466ebd4da9ae1535a9ed3a3 SHA512 d42288c696d5b4d86c41a0ca9b8e748cdb9200c3adc23161b9b97b8c2f3da9c5bd811e2ddae265bf11d323b1449291e9914bf1e222aaf403e73ceef4084ed082
+DIST leiningen-2.7.0.sh 4301 BLAKE2B f08d161c1c45c994ec361636891f72cf560248e33aacebacd821d3af96d7d5215d9cfdf17a4dd62e10d7dde34abaa42578956a0a38fa33e5226a44052426d155 SHA512 241357de3f19dfe1c729c14d1540140fccdd6a6c7bae76d6ccfe7a28cdff95b01f52a671ccd2d6712e11ff33115c720906e34a5118ff6bb6d232520d77125f5d
+DIST leiningen-2.7.1-standalone.jar 15370238 BLAKE2B 8b33bb04fc8d9c9d45a557833e2a7febf1cf1130081a39e9d22cdf6df23677f1b2bf4578a1b7e2f44635ceb5178f343584b8104acbb3f94ae8af9a60613af4ca SHA512 6f0ac01917b273c063dd16d8a5e98cba0265ba19766ce6a2c1e160367e3514e637c969f831384845e752cde015e1357eecac7141259e279584577f4f527bc08a
+DIST leiningen-2.7.1.sh 4581 BLAKE2B 966db930da0d4855dc4ee84d1035fce5d05f6938032db31302489e9a729e4516bb1adfd3fb8e49d39c1fe031ee9d725c8f36112ddb678120f96aded332b20742 SHA512 88e52f843a9b3cc4ebe2d8ffef1bec5e52a9e1e492d69b75c1482f7a97f6bcb766360502a5f1270ced1f4c1419af8b0cccd79219dc333a7305d3e4b58082d1e6
+EBUILD leiningen-bin-2.7.0.ebuild 1525 BLAKE2B 7c249a7d3cc79fd6bd42b0604272c9bafcd29109541490f710852fe29e7928ea5448521916ef191d803dcb4424d7bb93af188370652d4a7b87151f038e90f57f SHA512 0eb203650b4d4f98188ee7e6f66cece8757f39155a26f17c16041d027c90785eccca5fa9535c99f20a55e471f46baad3bf0f4de11bdaf4b6311b7d722ed43ce3
+EBUILD leiningen-bin-2.7.1-r1.ebuild 1549 BLAKE2B 7ced587689ba587f317b08d3b0f3a4456f4f736fcc8a97f5ea9b8ca131113a459cd09bdfe827631c3a0b60908cd10162eb85aab45638578fd4a8a167710d7b67 SHA512 cd6b352eaf5fb136622075031a2f1033f86db1393c3ab31e0fb5395e69aa758ed7fe357227fbfccd8db07f056dd0a259dea4451356a974453f32438355192b4f
+MISC metadata.xml 408 BLAKE2B 5c7a156b3dce1942e988302fb75ffbb3fc3738bb4aeb21203804b61a46f313fcbe2b8314702b9361afe21d33db68d9643217eaa3db3f08b7f001f29100e06eca SHA512 be76fcdb5d5ab199c951e2b563976b5c2bfe4f95000822073dccd71305f2409e90488e4c0fa726e503cbb533b16ca6a85599d84cadcf15d46e8070c3e5d0a5d3
diff --git a/dev-java/leiningen-bin/files/leinrc b/dev-java/leiningen-bin/files/leinrc
new file mode 100644
index 000000000000..db1efad3c043
--- /dev/null
+++ b/dev-java/leiningen-bin/files/leinrc
@@ -0,0 +1 @@
+source /usr/share/@@PN@@/package.env
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild
new file mode 100644
index 000000000000..4f07d80fc893
--- /dev/null
+++ b/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_PNV="${MY_PN}-${PV}"
+
+DESCRIPTION="Automate Clojure projects without setting your hair on fire"
+HOMEPAGE="https://leiningen.org/"
+SRC_URI="
+	https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
+	https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
+"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+RESTRICT="test"
+
+src_unpack() {
+	mkdir -p "${S}" || die "Can't mkdir ${S}"
+	cd "${S}"	|| die "Can't enter ${S}"
+	for file in ${A}; do
+		einfo "Copying ${file}"
+		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
+	done
+}
+
+src_prepare() {
+	einfo "Copying leinrc"
+	cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
+	einfo "Patching leinrc"
+	sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
+
+	einfo "Renaming lein-pkg"
+	# Rename generically to help user patching
+	mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
+
+	einfo "Patching lein"
+	java-pkg_init_paths_
+	sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${JAVA_PKG_JARDEST}/${PN}.jar|" "${S}/lein" \
+		|| die "Can't patch LEIN_JAR in lein"
+
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin "${S}/lein"
+	java-pkg_newjar "${MY_PNV}-standalone.jar"
+	insinto /etc
+	doins "${S}/leinrc"
+	fperms 0644 "/etc/leinrc"
+}
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.7.1-r1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..a6174af9f139
--- /dev/null
+++ b/dev-java/leiningen-bin/leiningen-bin-2.7.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_PNV="${MY_PN}-${PV}"
+
+DESCRIPTION="Automate Clojure projects without setting your hair on fire"
+HOMEPAGE="https://leiningen.org/"
+SRC_URI="
+	https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
+	https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
+"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+RESTRICT="test"
+
+src_unpack() {
+	mkdir -p "${S}" || die "Can't mkdir ${S}"
+	cd "${S}"	|| die "Can't enter ${S}"
+	for file in ${A}; do
+		einfo "Copying ${file}"
+		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
+	done
+}
+
+src_prepare() {
+	einfo "Copying leinrc"
+	cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
+	einfo "Patching leinrc"
+	sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
+
+	einfo "Renaming lein-pkg"
+	# Rename generically to help user patching
+	mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
+
+	einfo "Patching lein"
+	java-pkg_init_paths_
+	sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
+		|| die "Can't patch LEIN_JAR in lein"
+
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin "${S}/lein"
+	java-pkg_newjar "${MY_PNV}-standalone.jar"
+	insinto /etc
+	doins "${S}/leinrc"
+	fperms 0644 "/etc/leinrc"
+}
diff --git a/dev-java/leiningen-bin/metadata.xml b/dev-java/leiningen-bin/metadata.xml
new file mode 100644
index 000000000000..10d8b4a184ad
--- /dev/null
+++ b/dev-java/leiningen-bin/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kentnl@gentoo.org</email>
+		<name>Kent Fredric</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">technomancy/leiningen</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/libg-2.1.0-r1 b/dev-java/libg-2.1.0-r1
deleted file mode 100644
index 7484fe7dbd01..000000000000
--- a/dev-java/libg-2.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lots of small utilities for bndlib, a swiss army knife for OSGi
-EAPI=5
-HOMEPAGE=http://www.aqute.biz/Bnd/Bnd
-IUSE=elibc_FreeBSD test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cce0dc87133c79e2f85f024fae178440
diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest
new file mode 100644
index 000000000000..e0ae1ecbf44e
--- /dev/null
+++ b/dev-java/libg/Manifest
@@ -0,0 +1,3 @@
+DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
+EBUILD libg-2.1.0-r1.ebuild 1365 BLAKE2B bc2e2bb471a8b427b3200ef39d6ca363ae0faea4ac55f66bd1742ab6bbddadc528897ab51a8d310a3aadd2b51b72c86769d880f7a3046add50938da0cbb091c3 SHA512 34d78f327d082e95c09cacb764b34391311d76b76aeea147ab1488fd781aa4955bc7d6f6baa09ce364953f2b13f424096fc0658b7a974b4adc88b429213ca829
+MISC metadata.xml 323 BLAKE2B b7a6a3bf3330da14a229f4b8e178c7f5da2bdab8d7249b92daa4a6d414471b001d21441465852b21f9abbbb6bdff229a8c7dbe162e4ae820d5feccf2684c19f8 SHA512 b9affc0513759478d6db10968d574cc820ac19476a539d27e279884314805f663f0807abd01ce8107154fae445ad3e4fd37f485004130f04aa890c0607f85fcf
diff --git a/dev-java/libg/libg-2.1.0-r1.ebuild b/dev-java/libg/libg-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..0595fc1a9fc6
--- /dev/null
+++ b/dev-java/libg/libg-2.1.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lots of small utilities for bndlib, a swiss army knife for OSGi"
+HOMEPAGE="http://www.aqute.biz/Bnd/Bnd"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# Tests depend on biz.aQute.junit, which depends on biz.aQute.bndlib, which on
+# its own turn again depends on aQute.libg again; we can temporarily assume that
+# if bndlib tests pass that libg is sufficiently tested, in the future we should
+# look whether it is feasible to combine the packages or otherwise temporarily
+# build biz.aquite.bndlib and biz.aqute.junit in this package.
+RESTRICT="test"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/bnd-${PV}.REL/aQute.${PN}"
+
+EANT_BUILD_TARGET="build"
+
+java_prepare() {
+	# Move the correct build.xml into place, needed for testing.
+	cp ../cnf/build.xml . || die "Failed to move build file into the right place."
+
+	# Remove bundled jar files.
+	find . -name '*.jar' -delete
+
+	# Remove test files
+	if ! use test ; then
+		find src/test -name '*.java' -delete || die "Failed to remove test files."
+	fi
+}
+
+src_install() {
+	java-pkg_newjar generated/aQute.${PN}.jar
+}
diff --git a/dev-java/libg/metadata.xml b/dev-java/libg/metadata.xml
new file mode 100644
index 000000000000..7ed2fdf0797a
--- /dev/null
+++ b/dev-java/libg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bndtools/bnd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/libmatthew-java-0.7.2-r1 b/dev-java/libmatthew-java-0.7.2-r1
deleted file mode 100644
index deaa1df0d973..000000000000
--- a/dev-java/libmatthew-java-0.7.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-DESCRIPTION=A selection of libraries for Java
-EAPI=0
-HOMEPAGE=http://www.matthew.ath.cx/projects/java/
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.matthew.ath.cx/projects/java/libmatthew-java-0.7.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cf44d191042f55d9401ce743a935935d
diff --git a/dev-java/libmatthew-java/Manifest b/dev-java/libmatthew-java/Manifest
new file mode 100644
index 000000000000..5968257c6c58
--- /dev/null
+++ b/dev-java/libmatthew-java/Manifest
@@ -0,0 +1,4 @@
+AUX libmatthew-java-0.7.2-makefile-fixes.patch 2545 BLAKE2B 9662d03e04b55a3041807661b9503644b0595e3cf0ae4479eef9818dbd9edbfa5d7c4a9886e51c1adfc194dec5c06746ac18c559bd4d6768a49c3a8bfef802c9 SHA512 698883f9f0a6485c7d751c70441d0791ddeb78260eceeefff1661983d04d81960c652f9dd64522cd3431981549689b8c9d3051674da5b0871124c912b4d9e3f3
+DIST libmatthew-java-0.7.2.tar.gz 40601 BLAKE2B 92686eb0136ab72c7a7a9bb93a142099f9fa8207a0abe8052a824f46601aa88412bc132be424886b6dc6f7d1b48f5b84f800132031b42ae1c17d5a63c8589393 SHA512 d4a0024fb17221dff4d787b83fd5d9b4a189db0b3110291066f037dc33c009d479a3b94ec8d7c00ab5a39731ec8015dba212f367a858f4329e9d203325fec02a
+EBUILD libmatthew-java-0.7.2-r1.ebuild 1292 BLAKE2B e793fc6135cde82e6da91898124e486962bc257ae52bb4d235e864a6875b350963c5b47bf79eaed33317c1e9b145c9f0bd5d31ea86ee09438242e63f8f4389f4 SHA512 3a863464c5291fa01b249af04fc22b94103f3c91c8c31b06d75836c3b8f9ea9560774c5746e34db749b6a9a622f066147f3a293ab47c3e0cee6f686cb0dadd32
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch b/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
new file mode 100644
index 000000000000..1132a7e1ce76
--- /dev/null
+++ b/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
@@ -0,0 +1,70 @@
+diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile
+--- libmatthew-java-0.7.2/Makefile	2009-04-05 12:46:42.000000000 +0300
++++ libmatthew-java-0.7.2_patched/Makefile	2010-02-28 12:07:15.000000000 +0200
+@@ -6,13 +6,12 @@
+ CC?=gcc
+ LD?=gcc
+ JPPFLAGS+=-C -P
+-CFLAGS+=-Wall -Os -pedantic -Werror
++CFLAGS+=-Wall -pedantic
+ CSTD?=-std=c99
+ CSHAREFLAG+=-fpic -fno-stack-protector
+ GCJJNIFLAG=-fjni
+ JVERCFLAGS+=-source 1.5
+ JCFLAGS+=
+-INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+ JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/
+ 
+ LDVER?=$(shell ld -v | cut -d' ' -f1)
+@@ -20,9 +20,8 @@
+ 
+ ifeq ($(LDVER),GNU)
+ LDSHAREFLAGS+=-fpic -shared
+-else
+-LDSHAREFLAGS+=-lc
+ endif
++LDLIBS=-lc
+ 
+ PREFIX?=/usr/local
+ JARDIR?=$(PREFIX)/share/java
+@@ -62,12 +61,7 @@
+ io-$(IOVER).jar: .classes
+ 	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/io/*class)
+ unix-$(UNIXVER).jar: .classes
+-ifeq ($(DEBUG),enable)
+-	echo "Class-Path: $(JARDIR)/debug-$(DEBUG).jar" > Manifest
+-else
+-	echo "Class-Path: " > Manifest
+-endif
+-	(cd classes; $(JAR) cfm ../$@ ../Manifest cx/ath/matthew/unix/*class)
++	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/unix/*class)
+ 
+ hexdump-$(HEXVER).jar: .classes
+ 	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/utils/Hexdump.class)
+@@ -75,7 +69,7 @@
+ %.o: %.c %.h
+ 	$(CC) $(CFLAGS) $(CSTD) $(CSHAREFLAG) $(INCLUDES) -c -o $@ $<
+ lib%.so: %.o
+-	$(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $<
++	$(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $< $(LDLIBS)
+ unix-java.h: .classes
+ 	$(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream
+ cgi-java.h: .classes
+@@ -91,13 +85,11 @@
+ 	tar zcf $@ libmatthew-java-$(MATTVER)
+ 
+ debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
+-	make .enabledebug
+-	echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
+-	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
++	$(MAKE) .enabledebug
++	(cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
+ debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
+-	make .disabledebug
+-	echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
+-	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
++	$(MAKE) .disabledebug
++	(cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
+ .enabledebug: cx/ath/matthew/debug/Debug.jpp 
+ 	mkdir -p classes
+ 	cpp $(PPFLAGS) $(JPPFLAGS) -DDEBUGSETTING=true < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java
diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..cb98a553c6be
--- /dev/null
+++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+inherit eutils java-pkg-2 flag-o-matic toolchain-funcs
+
+DESCRIPTION="A selection of libraries for Java"
+HOMEPAGE="http://www.matthew.ath.cx/projects/java/"
+SRC_URI="http://www.matthew.ath.cx/projects/java/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-makefile-fixes.patch
+	rm -v "${S}"/cx/ath/matthew/debug/Debug.java || die "rm failed"
+}
+
+src_compile() {
+	CC=$(tc-getCC) LD=$(tc-getCC) INCLUDES="$(java-pkg_get-jni-cflags)" \
+		emake -j1 JARDIR=/usr/share/libmatthew-java/lib JCFLAGS="$(java-pkg_javac-args)" all $(usev doc) || die "emake failed"
+}
+
+src_install() {
+	java-pkg_newjar cgi-0.5.jar cgi.jar
+	java-pkg_newjar debug-disable-1.1.jar debug-disable.jar
+	java-pkg_newjar debug-enable-1.1.jar debug-enable.jar
+	java-pkg_newjar hexdump-0.2.jar hexdump.jar
+	java-pkg_newjar io-0.1.jar io.jar
+	java-pkg_newjar unix-0.5.jar unix.jar
+	java-pkg_doso libcgi-java.so
+	java-pkg_doso libunix-java.so
+	dodoc INSTALL changelog README || die
+	use source && java-pkg_dosrc cx/
+	use doc && java-pkg_dojavadoc doc
+}
diff --git a/dev-java/libmatthew-java/metadata.xml b/dev-java/libmatthew-java/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/libmatthew-java/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/libmso-0.1 b/dev-java/libmso-0.1
deleted file mode 100644
index 23674324326a..000000000000
--- a/dev-java/libmso-0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 sys-apps/hwinfo dev-java/jinklevel:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java library to detect printers
-EAPI=2
-HOMEPAGE=https://mso.googlecode.com/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 sys-apps/hwinfo dev-java/jinklevel:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://mso.googlecode.com/files/libmso-0.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a9442b7a04d404a9bc4937e4fa182545
diff --git a/dev-java/libmso/Manifest b/dev-java/libmso/Manifest
new file mode 100644
index 000000000000..175a4334b445
--- /dev/null
+++ b/dev-java/libmso/Manifest
@@ -0,0 +1,3 @@
+DIST libmso-0.1.tar.bz2 2874 BLAKE2B ae6145dc85255353cc53c29ca27ae3f390618f8e5e255d26156d2e7c1a1c3ab29fafb8a57920acec47c0e6544e6e8ffbb30525f170ed08f8d79c094ca08c19c0 SHA512 b0f2bf5d7eeba6d1053bc895484142d3126b40ef40ea8a624ff2f83661151157bda194ba7a0aab3633ff66ca32768818c7dd8ca42cd5bde81454a807ec1f8e28
+EBUILD libmso-0.1.ebuild 796 BLAKE2B f8c024bbafbbe2ba4bae91b7323a2d00f2372f1ee54eace58b6d20660da586cc696824f89d8f5318ec2613a4725c7d7c7f24a428f225ba27840d71924a0d0b77 SHA512 9b21c5c9c24a818fc8d41ed3104f06c12c400fca4992dfdc819b20da778684f0920ebe93d2d6c484a1c97edefbe651aa2cf9186057aecb909c85077003c9f5da
+MISC metadata.xml 289 BLAKE2B b71176c5c4a716271cf4bb538b9521ca8be5c5970c5b2bdec7fdc62668449cb4bde24626f1d3299a1e4f084f67c6e77c83a6039c8c18e148ef83c38e3a7d6d94 SHA512 a62a10bdcd24d253d4134029406c417dabc1f6a1a675a5500a848414fcc18235bf20e84926b11108cd213fcbba9536fd7c10520e8eac65052a62f0af1be660a4
diff --git a/dev-java/libmso/libmso-0.1.ebuild b/dev-java/libmso/libmso-0.1.ebuild
new file mode 100644
index 000000000000..73fc4922ec4c
--- /dev/null
+++ b/dev-java/libmso/libmso-0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java library to detect printers"
+HOMEPAGE="https://mso.googlecode.com/"
+SRC_URI="https://mso.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5
+	sys-apps/hwinfo
+	dev-java/jinklevel:0"
+
+DEPEND=">=virtual/jdk-1.5
+	sys-apps/hwinfo
+	dev-java/jinklevel:0"
+
+EANT_BUILD_TARGET="build"
+EANT_GENTOO_CLASSPATH="jinklevel"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+src_install() {
+	use source && java-pkg_dosrc src
+	use doc && java-pkg_dojavadoc doc
+	java-pkg_dojar build/${PN}.jar
+	java-pkg_doso build/${PN}.so
+}
diff --git a/dev-java/libmso/metadata.xml b/dev-java/libmso/metadata.xml
new file mode 100644
index 000000000000..23f6cab9eb8f
--- /dev/null
+++ b/dev-java/libmso/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">mso</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/libreadline-java-0.8.0-r3 b/dev-java/libreadline-java-0.8.0-r3
deleted file mode 100644
index c16f8a80c601..000000000000
--- a/dev-java/libreadline-java-0.8.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 sys-libs/ncurses >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A JNI-wrapper to GNU Readline
-EAPI=2
-HOMEPAGE=http://java-readline.sourceforge.net/
-IUSE=elibc_FreeBSD elibc_FreeBSD doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 sys-libs/ncurses >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/java-readline/libreadline-java-0.8.0-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1b82673fd4d32533173185ebb315318e
diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
new file mode 100644
index 000000000000..a9642f07f8ed
--- /dev/null
+++ b/dev-java/libreadline-java/Manifest
@@ -0,0 +1,6 @@
+AUX libreadline-java-0.8.0-gmake.patch 532 BLAKE2B 2bdc0e198b5daf274ec2bce5cef04281793957ed5a9fd3cd182188ef18794a5c96081386ebc4e6031d0366b0d263062bc18e6e986a9455084ea8f5d1591ac3c3 SHA512 079f978e90968a6d04f717e25511320f69e4eea76b64b9ae928eea868433d4cfff2586c2598ff0b73eeb5f6146066d2926e5c6c7ec077a69e0f2abbcabb9c2c7
+AUX libreadline-java-0.8.0-respect-flags.patch 651 BLAKE2B e8c4fe1901fb87b5f8b7fa9faa21e5446385e029aa034a482b883df174c0889c65ca09d7f34a7728d7dc2d8fc90ea3373f8dcb16f740befe5b9183481ed32844 SHA512 b3419484c6732d3396ae90fba0c77bec656bb705d63c8ec2bd999222c8e687d6fbecebfa10bcb91c8780e6ffa922e2d58318978073f382c4b7601cd569ec7abd
+AUX termcap-to-ncurses.patch 498 BLAKE2B 693eddef846b0b4e3f570d0cac46164b0990deeacdea55ad0ef547c3c7eabf7a682d2ac9c3360366d478a00c68703092f0641cdce1cc9ab6e6f464be4c2f8d02 SHA512 43b6494d94da3d8874da34caf3e191e489bdea3e680d76514f3acf7d1c55db784efd8220e9aa914831c8dc753c231a06d5c3980bdd28835a3369f4c1d862a932
+DIST libreadline-java-0.8.0-src.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2
+EBUILD libreadline-java-0.8.0-r3.ebuild 1282 BLAKE2B ab39d4e9fa4d863a94355a886baca4a94804c52b95483dade22d644daf3fd0137ee5821d93d6089f55458ab40313fa7bb55a5c02aa7635f429616cd5341c828d SHA512 cc71cfc74461c13c190ef135d6a53a3f2704888b77ddb8a9401cdec69dc92fcac9fbe850c8eb079198edb9aec225f492118cc83bb3205be0105ecad313ed6221
+MISC metadata.xml 319 BLAKE2B e82b45bce13253c5e40fffb3429166c0613d8841af08a626d6a9d70bfe5f69c036e8fdc4248cfe632ab8ccc54b6901df0ba02ce2faf0ad18b649ef87f92d9bed SHA512 e13714611711ecb54943d5d3ccc5a8ae8f9dcfb6e9a6e6c6e96d04d7d80dec6a07d76225850cb2cdbb6b2d6a99f0c5c5fd0c9c4a9a3c0724c6e8ed7b21a75e8f
diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
new file mode 100644
index 000000000000..6de5cde18e89
--- /dev/null
+++ b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
@@ -0,0 +1,21 @@
+Index: libreadline-java-0.8.0/src/native/Makefile
+===================================================================
+--- libreadline-java-0.8.0.orig/src/native/Makefile
++++ libreadline-java-0.8.0/src/native/Makefile
+@@ -69,13 +69,13 @@ all: $(T_LIBS) 
+ lib: $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT)
+ 
+ JavaReadline:
+-	make TG=$@ lib
++	$(MAKE) TG=$@ lib
+ 
+ JavaEditline:
+-	make TG=$@ lib
++	$(MAKE) TG=$@ lib
+ 
+ JavaGetline:
+-	make TG=$@ lib
++	$(MAKE) TG=$@ lib
+ 
+ $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT): $(OBJECTS)
+ ifeq (MSC,$(WIN32))
diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch
new file mode 100644
index 000000000000..9af21ba83d4b
--- /dev/null
+++ b/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch
@@ -0,0 +1,27 @@
+diff --git a/src/native/Makefile b/src/native/Makefile
+index 679adb7..a1f2a6a 100644
+--- a/src/native/Makefile
++++ b/src/native/Makefile
+@@ -51,11 +51,11 @@ JavaEditline_LIBS = -ledit -ltermcap
+ ifeq (cygwin,$(WIN32))
+ JavaGetline_LIBS = -lcygwin
+ endif
+-CC = gcc
++CC ?= gcc
+ OBJ_EXT := o
+ LIB_PRE := lib
+ LIB_EXT := so
+-CFLAGS=-fPIC -DPOSIX
++CFLAGS += -fPIC -DPOSIX
+ endif
+ 
+ 
+@@ -97,7 +97,7 @@ ifeq (CYGWIN,$(WIN32))
+ 	$(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
+ 		$(OBJECTS) -W1,-e,_readline_init@12
+ else
+-	$(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
++	$(CC) -shared $(LDFLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
+ endif
+ endif
+ 
diff --git a/dev-java/libreadline-java/files/termcap-to-ncurses.patch b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
new file mode 100644
index 000000000000..22921c80ba54
--- /dev/null
+++ b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
@@ -0,0 +1,13 @@
+--- src/native/Makefile.org	2004-09-07 16:43:16.703100016 +0200
++++ src/native/Makefile	2004-09-07 16:43:28.804919625 +0200
+@@ -45,8 +45,8 @@
+ CFLAGS=-DWIN32=$(WIN32) -D__IBMC__
+ else
+ INCLUDES          = -I $(JAVAINCLUDE) -I $(JAVANATINC)
+-LIBPATH           = -L/usr/lib/termcap 
+-JavaReadline_LIBS = -lreadline -ltermcap -lhistory
++LIBPATH           = 
++JavaReadline_LIBS = -lreadline -lncurses -lhistory
+ JavaEditline_LIBS = -ledit -ltermcap
+ ifeq (cygwin,$(WIN32))
+ JavaGetline_LIBS = -lcygwin
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
new file mode 100644
index 000000000000..3fd6a4df55eb
--- /dev/null
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 eutils
+
+DESCRIPTION="A JNI-wrapper to GNU Readline"
+HOMEPAGE="http://java-readline.sourceforge.net/"
+SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="elibc_FreeBSD"
+
+COMMON_DEP="sys-libs/ncurses"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RESTRICT="test"
+
+java_prepare() {
+	epatch "${FILESDIR}/termcap-to-ncurses.patch"
+	# bug #157387, reported upstream
+	epatch "${FILESDIR}/${P}-gmake.patch"
+
+	# bug #157390
+	sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die
+	if use elibc_FreeBSD; then
+		sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed"
+	fi
+
+	#Respect CC CFLAGS LDFLAGS #336302 #296741
+	epatch "${FILESDIR}"/${P}-respect-flags.patch
+}
+
+src_compile() {
+	emake -j1 || die "failed to compile"
+	if use doc; then
+		emake -j1 apidoc || die "failed to generate docs"
+	fi
+}
+
+src_install() {
+	java-pkg_doso *.so
+	java-pkg_dojar *.jar
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc api
+	dodoc ChangeLog NEWS README README.1st TODO || die
+}
diff --git a/dev-java/libreadline-java/metadata.xml b/dev-java/libreadline-java/metadata.xml
new file mode 100644
index 000000000000..ee80557bb2d5
--- /dev/null
+++ b/dev-java/libreadline-java/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">java-readline</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/log4j-1.2.17-r3 b/dev-java/log4j-1.2.17-r3
deleted file mode 100644
index 7d1bb89a6ffa..000000000000
--- a/dev-java/log4j-1.2.17-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=javamail? ( dev-java/oracle-javamail:0 ) jms? ( java-virtuals/jms:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A low-overhead robust logging package for Java
-EAPI=5
-HOMEPAGE=http://logging.apache.org/log4j/
-IUSE=javamail jms elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=javamail? ( dev-java/oracle-javamail:0 ) jms? ( java-virtuals/jms:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/logging/log4j/1.2.17/log4j-1.2.17.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=66d90dc74f7d4926fa36a95e204d2ba4
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
new file mode 100644
index 000000000000..d971d1971d07
--- /dev/null
+++ b/dev-java/log4j/Manifest
@@ -0,0 +1,3 @@
+DIST log4j-1.2.17.tar.gz 2864448 BLAKE2B 233763dbe53f92b5408d3e278b291dff8a7d74657f367ec8b7c7ae1e685ddc0170783c8a5e4b48ec2590b6dda13f45e91bd66066f2c6b515e5d692caca31660b SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8
+EBUILD log4j-1.2.17-r3.ebuild 1417 BLAKE2B 4601f6d91064d97ac84b5ba7ec83ba0bddc8aeb7b6fd788a6f8401394cff1dcbfe494e6eaa34157aa3561b637bfd42e221869d7d9f8e99c5cec5279c83b6f1d9 SHA512 1f9cdfc8782930a1f04bf5944aed24c6b21efc3313d7a05fe695bda76bb45bf611451561d795a9c5988fc037598c14014c30766ef9ad9a69be4166ebd7416a42
+MISC metadata.xml 365 BLAKE2B c7d4eddda426c4ba6e5749a60c60c1ec3a169e545e119b4987703c13bbbea8fb59ea52055c1dad743b0374a13b32869fb39ee846e5fad2237cd11426b612f69e SHA512 0a4edf2fd6a980baad45c3282db2f991b7c806d8a36a06bed355a4491472b58e0e79f96c5dd2210d0ea51f5f4e83731165345c21b0b439bb2a36584b543b18a7
diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
new file mode 100644
index 000000000000..fb7e7820dbe2
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A low-overhead robust logging package for Java"
+SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
+HOMEPAGE="http://logging.apache.org/log4j/"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux"
+IUSE="javamail jms"
+
+CDEPEND="
+	javamail? ( dev-java/oracle-javamail:0 )
+	jms? ( java-virtuals/jms:0 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+MY_P="apache-${P}"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_BUILD_TARGET="log4j.jar"
+EANT_EXTRA_ARGS="-Djaxp-present=true -Djmx-present=true"
+EANT_DOC_TARGET=""
+
+src_compile() {
+	if use javamail; then
+		EANT_GENTOO_CLASSPATH+="oracle-javamail"
+		EANT_EXTRA_ARGS+=" -Djavamail-present=true"
+	fi
+
+	if use jms; then
+		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
+	fi
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r site/*
+		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
+		java-pkg_dojavadoc --symlink apidocs site/apidocs
+	fi
+
+	if use source; then
+		java-pkg_dosrc src/main/java/*
+	fi
+}
diff --git a/dev-java/log4j/metadata.xml b/dev-java/log4j/metadata.xml
new file mode 100644
index 000000000000..84c33199b892
--- /dev/null
+++ b/dev-java/log4j/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <use>
+    <flag name="javamail">Build the SMTPAppender</flag>
+    <flag name="jms">Build the JMSAppender</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/logback-1.0.13-r1 b/dev-java/logback-1.0.13-r1
deleted file mode 100644
index dcf3290363c6..000000000000
--- a/dev-java/logback-1.0.13-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jansi:0 dev-java/janino:0 dev-java/slf4j-api:0 dev-java/oracle-javamail:0 java-virtuals/servlet-api:3.0 tomcat? ( www-servers/tomcat:7 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A generic, reliable, fast & flexible logging framework for Java
-EAPI=5
-HOMEPAGE=http://logback.qos.ch/
-IUSE=tomcat elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( EPL-1.0 LGPL-2.1 )
-RDEPEND=dev-java/jansi:0 dev-java/janino:0 dev-java/slf4j-api:0 dev-java/oracle-javamail:0 java-virtuals/servlet-api:3.0 tomcat? ( www-servers/tomcat:7 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://logback.qos.ch/dist/logback-1.0.13.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/logback/logback-1.0.13-build.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f8af4f480ef4f6df4c26d77c81222b4a
diff --git a/dev-java/logback/Manifest b/dev-java/logback/Manifest
new file mode 100644
index 000000000000..5712c187c4d6
--- /dev/null
+++ b/dev-java/logback/Manifest
@@ -0,0 +1,4 @@
+DIST logback-1.0.13-build.tar.bz2 2079 BLAKE2B 5c18656eaaadc1b066a006c3ea6e8a11d637aa6fbf7f2a9763176f30ac4138a2ee6a53baa6d9d64149efd4ef943697b2dbdb578d6c9039210fee2ede0eeb8638 SHA512 4d5a4385f427dbb6a0897459ab6d691c4b77460ea667d7e7a05e2f353730ef78ff712b1c0538e5c5f04fa4daf6605ca1da2dc1b9d0a35741192236b40e44d81e
+DIST logback-1.0.13.tar.gz 6989078 BLAKE2B 3576f7739e90026a9f32bb576f7e692921fde9831b7ce7cb004e36f56650ef8ba63b7d15bf4835b64ea30787586d31a419763d34fcfdcc401d1e4f0b0ca8e7dd SHA512 974cdb6ba77c4654fa3f3bd6e7526eacfd6cf6369118e37436e441ac7742b0e98e4de49af4677cb0524b571639843059c6252751b2eeca58a39d6e9a12aa3814
+EBUILD logback-1.0.13-r1.ebuild 1668 BLAKE2B 43a5307cc78e90009759d654f7abc51047c8ed5a73df8c4e82652e841ff10cae3cef2528fc663e627abe60f5dfd675c4c5d6f91017c4966605a8c05688089651 SHA512 884ccd358edfaff06d3ee871998a8e7529c1b125fd14c03ed6627388c8ec7092d84a119c7cb5de70e296b5e89af3b3e1c5a4a14f11840b1db65ef6792ea46431
+MISC metadata.xml 309 BLAKE2B a4ce901e26e5cf7d0ecece2a68841108adffe61355914c2301ea6ef69722d5174b6f05ddabf0adf9978798b2f1ed981e44b0b738c603c75b21965336445d00e4 SHA512 f14e640a615329341196a8b003f1b12de45594ca6a5b2f1927f210ee94c619b586594227fc43a737c889b2036bfc80a6a11467775b657be853087339742d181a
diff --git a/dev-java/logback/logback-1.0.13-r1.ebuild b/dev-java/logback/logback-1.0.13-r1.ebuild
new file mode 100644
index 000000000000..c69c601b1d1b
--- /dev/null
+++ b/dev-java/logback/logback-1.0.13-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A generic, reliable, fast & flexible logging framework for Java"
+HOMEPAGE="http://logback.qos.ch/"
+SRC_URI="http://logback.qos.ch/dist/${PN}-${PV}.tar.gz
+		https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}-build.tar.bz2"
+
+LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="tomcat"
+
+CDEPEND="
+	dev-java/jansi:0
+	dev-java/janino:0
+	dev-java/slf4j-api:0
+	dev-java/oracle-javamail:0
+	java-virtuals/servlet-api:3.0
+	tomcat? ( www-servers/tomcat:7 )
+"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	jansi
+	janino
+	slf4j-api
+	oracle-javamail
+	servlet-api-3.0
+"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-core/target/${PN}-core.jar"
+
+java_prepare() {
+	find "${S}" -name "*.jar" -delete || die
+
+	use tomcat || rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/tomcat/ || die
+	# remove the next line when we have jetty in the tree
+	rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/jetty/ || die
+
+	use tomcat && EANT_GENTOO_CLASSPATH+=",tomcat-7"
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}-core/target/${PN}-core.jar
+	java-pkg_dojar "${S}"/${PN}-access/target/${PN}-access.jar
+
+	use source && java-pkg_dosrc "${S}"/${PN}-core/src/main/java "${S}"/${PN}-access/src/main/java
+	use doc && java-pkg_dojavadoc "${S}"/${PN}-core/target/site/apidocs
+	use examples && java-pkg_doexamples "${S}"/${PN}-examples/src/main/java/chapters/*
+}
diff --git a/dev-java/logback/metadata.xml b/dev-java/logback/metadata.xml
new file mode 100644
index 000000000000..22f9cc83879f
--- /dev/null
+++ b/dev-java/logback/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<use>
+		<flag name="tomcat">Builds Apache Tomcat support</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-java/lucene-1.4.3-r4 b/dev-java/lucene-1.4.3-r4
deleted file mode 100644
index d9effa4613ea..000000000000
--- a/dev-java/lucene-1.4.3-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=High-performance, full-featured Java text search engine
-EAPI=6
-HOMEPAGE=https://lucene.apache.org
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://apache/lucene/java/archive/lucene-1.4.3-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f68b71512f67de7b10707b67e5d558b1
diff --git a/dev-java/lucene-2.4.1-r2 b/dev-java/lucene-2.4.1-r2
deleted file mode 100644
index 7341644cf455..000000000000
--- a/dev-java/lucene-2.4.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/javacc:0 >=virtual/jdk-1.6 test? ( dev-java/junit:0 dev-java/ant-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
-EAPI=6
-HOMEPAGE=https://lucene.apache.org
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/javacc:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.4
-SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz -> lucene-2.4.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f600176223481fd074181365488abbb2
diff --git a/dev-java/lucene-3.5.0-r1 b/dev-java/lucene-3.5.0-r1
deleted file mode 100644
index 6c4e5a0fc6e9..000000000000
--- a/dev-java/lucene-3.5.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/junit:4 dev-java/ant-junit:0 dev-java/ant-nodeps:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/ant-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
-EAPI=6
-HOMEPAGE=https://lucene.apache.org
-IUSE=elibc_FreeBSD doc source test contrib elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/junit:4 dev-java/ant-junit:0 dev-java/ant-nodeps:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=3.5
-SRC_URI=mirror://apache/lucene/java/3.5.0/lucene-3.5.0-src.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=93d18340437e30a0ec2ac0b870151fda
diff --git a/dev-java/lucene-3.5.0-r2 b/dev-java/lucene-3.5.0-r2
deleted file mode 100644
index e82944edf02c..000000000000
--- a/dev-java/lucene-3.5.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/junit:4 dev-java/ant-junit:0 dev-java/ant-core:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/ant-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
-EAPI=6
-HOMEPAGE=https://lucene.apache.org
-IUSE=elibc_FreeBSD doc source test contrib elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/junit:4 dev-java/ant-junit:0 dev-java/ant-core:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=3.5
-SRC_URI=mirror://apache/lucene/java/3.5.0/lucene-3.5.0-src.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=24e3a74193991435b5f4ddc82821273e
diff --git a/dev-java/lucene-3.6.2-r1 b/dev-java/lucene-3.6.2-r1
deleted file mode 100644
index a1716f828d00..000000000000
--- a/dev-java/lucene-3.6.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/ant-ivy:2 dev-java/ant-junit:0 dev-java/ant-nodeps:0 dev-java/hamcrest-core:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
-EAPI=6
-HOMEPAGE=https://lucene.apache.org
-IUSE=elibc_FreeBSD doc source test contrib elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-ivy:2 dev-java/ant-junit:0 dev-java/ant-nodeps:0 dev-java/hamcrest-core:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=3.6
-SRC_URI=mirror://apache/lucene/java/3.6.2/lucene-3.6.2-src.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0073a120b71a9fdd968874c81086ff6f
diff --git a/dev-java/lucene-3.6.2-r2 b/dev-java/lucene-3.6.2-r2
deleted file mode 100644
index 76357c2927c7..000000000000
--- a/dev-java/lucene-3.6.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/ant-ivy:2 dev-java/ant-junit:0 dev-java/ant-core:0 dev-java/hamcrest-core:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
-EAPI=6
-HOMEPAGE=https://lucene.apache.org
-IUSE=elibc_FreeBSD doc source test contrib elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-ivy:2 dev-java/ant-junit:0 dev-java/ant-core:0 dev-java/hamcrest-core:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=3.6
-SRC_URI=mirror://apache/lucene/java/3.6.2/lucene-3.6.2-src.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ce94c6017e2d710917103fd75d8b415f
diff --git a/dev-java/lucene-analyzers-1.9.1-r1 b/dev-java/lucene-analyzers-1.9.1-r1
deleted file mode 100644
index 7d51add24f45..000000000000
--- a/dev-java/lucene-analyzers-1.9.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.6 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lucene Analyzers additions
-EAPI=0
-HOMEPAGE=http://lucene.apache.org/java
-IUSE=elibc_FreeBSD source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=1.9
-SRC_URI=mirror://apache/lucene/java/lucene-1.9.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dae9226615fd1333fb46e2fb30f58546
diff --git a/dev-java/lucene-analyzers-2.3.2 b/dev-java/lucene-analyzers-2.3.2
deleted file mode 100644
index 3640daf86192..000000000000
--- a/dev-java/lucene-analyzers-2.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lucene Analyzers additions
-EAPI=0
-HOMEPAGE=http://lucene.apache.org/java
-IUSE=elibc_FreeBSD source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=2.3
-SRC_URI=mirror://apache/lucene/java/lucene-2.3.2-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3305d4903b5a610487161b7dd607fed7
diff --git a/dev-java/lucene-analyzers/Manifest b/dev-java/lucene-analyzers/Manifest
new file mode 100644
index 000000000000..b640b38e4349
--- /dev/null
+++ b/dev-java/lucene-analyzers/Manifest
@@ -0,0 +1,6 @@
+AUX manifest 489 BLAKE2B 8c9c0ab03955824613f736d81c7fbefe9fb4198a59f56bbd042672c6473886b54e8d229d4f94e2b938ad7db058b981cd9207c1e51666fba15531f7642efdf924 SHA512 959662da8f99cf3cb87bb81f6ca4df39eb7e76bfbb9d60eebc1bbf204dfb1beff48448d8ee5d3d2f8ecf8bf3eb01690a9a50b046850277609f3df77303b77c88
+DIST lucene-1.9.1-src.tar.gz 6135056 BLAKE2B 1777d5ff2e9bfda7dd0ce35f973a15c74136829ed42a8b7bcea4902b8d868cc8a6388357f6abf3406b66c4228f20d705bbf2c85e18bd67a1fcdb90df1a160811 SHA512 fb9f29e0d38d6525d7f6f86d339867a08bfe77ba18a023885a3ecb093d217840c274c767b6e1451f7c58135919c6159122756ebde4640a47420526502395a994
+DIST lucene-2.3.2-src.tar.gz 4602041 BLAKE2B baf4c6685ec88d483aa33df8970305c2b34fbe99d328349f33704e24e0ba5b6bd381da272a8aed84bcc7c2bdd25b38aa85f5585de1819a3f235d41040f1472a5 SHA512 42bf988b2eed45ea8d8a3523d9fcf4e384e0e9729a25a54e518a34faf960370a8f7d824f537df7155dc2b64ac11e1b30a8e1ea745a0e054c86722f6e8551360d
+EBUILD lucene-analyzers-1.9.1-r1.ebuild 786 BLAKE2B 3889af10b163cb53e9a643baf1d58bb988f437c43264f44d3264074bdd0d07ab4aa2ea3dd1c38f94f8349c549f1ca3ffa15816ed2ded07ce1f3d9d521270169a SHA512 9fc2ee8e462a5f436d7d81913b59d77325b70bcc8e065da73e9bf8eb19a2b13e7a8bebc067fbb46902368b298ab07e7d4f5696e98fc0c3f64f1a10fe8918209d
+EBUILD lucene-analyzers-2.3.2.ebuild 768 BLAKE2B c3d11e2d3a81155ecc4a4ccffdca7de69e164c58c1e7a7f3fe69316a115fe431818a7b3fbac14e581f78a4dce3afcf78810764220b036ab7accbf4d3749d33fa SHA512 42d1251a695a15039c83acd711980667aede82e229792bd9b36c2f7e743d8bbbbcec2a5ec457b48c9c4ee04dce61230081aef8aff9ded62ae6f0f9345efc7961
+MISC metadata.xml 455 BLAKE2B 81a90fef0b2779f76d2da618f1b14bbaba9219ab81bb395cf255f8b5d661cd4e6a9143760275a37ec87eddac95952e30ac36bc36a8ad767b75407cdd23e36863 SHA512 41dd077d4e3c0771fdda58b3ea22ebe491e4c6ef342df8bcc144e09d2fbd60592c3077ce4763f238d1d8e3f53ac3bf2945da1ebcdda27841e02fbe5563f1226d
diff --git a/dev-java/lucene-analyzers/files/manifest b/dev-java/lucene-analyzers/files/manifest
new file mode 100644
index 000000000000..9ab3b27d9757
--- /dev/null
+++ b/dev-java/lucene-analyzers/files/manifest
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %vendorName
+Bundle-Localization: plugin
+Export-Package: org.apache.lucene.analysis.br,org.apache.lucene.analysis.cjk,org.apache.lucene.analysis.cn,
+ org.apache.lucene.analysis.cz,org.apache.lucene.analysis.de,org.apache.lucene.analysis.el,org.apache.lucene.analysis.fr,
+ org.apache.lucene.analysis.nl,org.apache.lucene.analysis.ru
+Bundle-SymbolicName: org.apache.lucene.analysis
+Bundle-Version: 1.9.1
diff --git a/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild b/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..d843e94f7e7c
--- /dev/null
+++ b/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="source"
+inherit java-pkg-2 java-ant-2 java-osgi
+
+MY_PN="${PN/lucene-}"
+MY_P="${P/-${MY_PN}}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Lucene Analyzers additions"
+HOMEPAGE="http://lucene.apache.org/java"
+SRC_URI="mirror://apache/lucene/java/${MY_P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="1.9"
+KEYWORDS="amd64 x86"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.6"
+RDEPEND=">=virtual/jre-1.4"
+
+src_compile() {
+	cd "${S}/contrib/${MY_PN}"
+	eant
+}
+
+src_install() {
+	java-osgi_newjar-fromfile "build/contrib/${MY_PN}/${PN}-1.9.2-dev.jar" \
+			"${FILESDIR}/manifest" "Apache Lucene Analysis"
+
+	use source && java-pkg_dosrc contrib/${MY_PN}/src/java/org
+}
diff --git a/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild b/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
new file mode 100644
index 000000000000..8303e3149731
--- /dev/null
+++ b/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="source"
+inherit java-pkg-2 java-ant-2 java-osgi
+
+MY_PN="${PN/lucene-}"
+MY_P="${P/-${MY_PN}}"
+
+DESCRIPTION="Lucene Analyzers additions"
+HOMEPAGE="http://lucene.apache.org/java"
+SRC_URI="mirror://apache/lucene/java/${MY_P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_P}/contrib/${MY_PN}"
+
+src_install() {
+	java-osgi_newjar-fromfile "${WORKDIR}/${MY_P}/build/contrib/${MY_PN}/${PN}-${SLOT}.jar" \
+			"${FILESDIR}/manifest" "Apache Lucene Analysis"
+
+	use source && java-pkg_dosrc "${S}/src/java/org"
+}
diff --git a/dev-java/lucene-analyzers/metadata.xml b/dev-java/lucene-analyzers/metadata.xml
new file mode 100644
index 000000000000..166fe6bf054e
--- /dev/null
+++ b/dev-java/lucene-analyzers/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription>
+	Set of analyzers (for various languages) to be used with the Lucene search library.
+	An analyzer's job is to take a string of text and give back a stream of tokens
+	(presumably words).
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
new file mode 100644
index 000000000000..529de6f32e23
--- /dev/null
+++ b/dev-java/lucene/Manifest
@@ -0,0 +1,11 @@
+DIST lucene-1.4.3-src.tar.gz 768320 BLAKE2B 8017b672b0104be007582a67cff5cb130187afcf9608bec0cb2b6bae9b3ea8c67486b324740c99e4db8f23879dd614a098f778f6b52b429d3dd1906387e9b61e SHA512 426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf844449532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911
+DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
+DIST lucene-3.5.0-src.tgz 39564076 BLAKE2B 5018f0e07a9df3f2f55c540e94e349e64e2c02c99acf14946e4471e16ace4f17a18e306aca6187028cde4434f0d6b38090442baaddaa79ef12ff34a8461f9e98 SHA512 58846190ed0e8c0747e14cb46bf27255d0e4ee93aa0969cf16140713ce20c8fc3f451353437313f14416c92b7b6825d4ce3416d9c7ce4cb1854f31877c2af275
+DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40aee3a2e59c8524420059f004a73be4c1e50c98345ad0ad4808ff8a0a996f9406523bf5c124616657ec91f9797f70 SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965
+EBUILD lucene-1.4.3-r4.ebuild 981 BLAKE2B c506d4a98402026bca8e4c968bb9d56ecaf5ab5f37891834b587db8069c32bc41ac2d8f75a7c63f26a4eb80929a3fe9b6310ba3577bad32cf505809971cbd568 SHA512 abcbbadabe7dd9dccd2fa59c8888b6871e0104d803139a53549341f2a691975de2a3e9092c7dd4c2738dd89038fa154fd32dc91c293a8373bd012408bf2d1d69
+EBUILD lucene-2.4.1-r2.ebuild 1802 BLAKE2B 71e720f396d65c1621d956d0536c3655a1530014861df0350dc506b7e03f2acd4f75ab70f0f7768ae867523ee49e1b7fac11095502fbba65d350ecf8223d1d41 SHA512 2551db0ac39d6ca7516b71e86202cef50e7784ee49f715f03703b205509e89983e735cc66ce3970abca9212390edbb06a948399310845e758855fb4764e2c985
+EBUILD lucene-3.5.0-r1.ebuild 3514 BLAKE2B 4e944c04e995278521268166d300e292c21b477969505de26f56d2450c2461e2fe76040d52ab81218176ac52a1104de7de37f7f05e942975789710b5304e2b08 SHA512 c1cd0378af15f5c555cbb9459415552e10861738107a321b3023ce57b569b8733d6779cdb87bcc75ff1f2f526f8cc87a74aab8402fbc3d2ffdedab5a93c805db
+EBUILD lucene-3.5.0-r2.ebuild 3512 BLAKE2B 9f30115ea1ce8570213517a3e841675c761654e23d81cdb5c30a0111dad97b2ed41bcd3fbb316bc8716836f82fc14f4dc6c30012ec7fb41e8fd5bcca3637af9d SHA512 f7bc1e244f8f4f19d2c8674a17382fc425ef34cb2957489e8216d4ddc009ebce77b191ee1357f60719158020d098a8d0fe7239648f96014126e68111a22f10e8
+EBUILD lucene-3.6.2-r1.ebuild 5555 BLAKE2B ab16e0833ee520598e3590a98379fd51ea01eb09d46e04e69b350e86fa51c52b329967081a844a33505494ffc953b08420418faf9ef41a994748e900d71649e7 SHA512 c47459c094fa94f22a79c1623a4a9fa3c4edec4de72520d641d21f054eb1089b2949de0666678407dcb0ac9bc3114126a8651b9ddf7ae5729c8b789736513098
+EBUILD lucene-3.6.2-r2.ebuild 5553 BLAKE2B 4602e1ddf43e0fc5b71093bbc88069fe7f016187e78b61fd7a1fbd7ed03f1ce54b1dcf42e918f128c3bb58cc7eadfdd4fcb3ba455d5567788a9866834c805db4 SHA512 92d2a8aa60347ae964ed8d99e50c57addb4b3621fee34262a865565c6280f381dfc9f14792ddb330d89a1b7fbaaf07d4031bf6cbbd2ddfffa62634fd84779b49
+MISC metadata.xml 462 BLAKE2B 2f93e0f1a5f130d6e17e1431764c6492bb1c66200ab79175a54f8ecb3311b8edc9fc6ce1c7e062bc7357d2f48c4155829c34d719a780b373336a2c95d52d70e8 SHA512 611e91130a53366e58e7a628f1eb63317064eff25cc9921e3f4c0c649e7e140a5478667fed236da8c10c52d3c4a70cf0f3d87445d6e82f052910b6b35550036f
diff --git a/dev-java/lucene/lucene-1.4.3-r4.ebuild b/dev-java/lucene/lucene-1.4.3-r4.ebuild
new file mode 100644
index 000000000000..a5604d395c7c
--- /dev/null
+++ b/dev-java/lucene/lucene-1.4.3-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured Java text search engine"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
+
+KEYWORDS="amd64 x86"
+LICENSE="Apache-1.1"
+SLOT="1"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_compile() {
+	eant jar-core $(use_doc javadocs)
+}
+
+src_test() {
+	java-ant_rewrite-classpath build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" \
+		ANT_TASKS="ant-junit" \
+		eant test
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar build/lucene-1.5-rc1-dev.jar
+
+	if use doc; then
+		dodoc -r docs/*
+		java-pkg_dojavadoc build/docs/api
+	fi
+
+	use examples && java-pkg_doexamples src/demo
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-2.4.1-r2.ebuild b/dev-java/lucene/lucene-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..b3f32a4fea35
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+	dev-java/javacc:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:0
+		dev-java/ant-core:0
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i -e '/-Xmax/ d' common-build.xml || die
+
+	# Portage marks shese files as bogus for some reason.
+	find . -type f -name instruction_arrow.png -exec rm -v {} \; || die
+}
+
+src_compile() {
+	# regenerate javacc files just because we can
+	# put javacc.jar on ant's classpath here even when <javacc> task
+	# doesn't use it - it's to fool the <available> test, first time
+	# it's useful not to have ignoresystemclasses=true...
+	ANT_TASKS="ant-core javacc" \
+		eant \
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib \
+		javacc
+	ANT_TASKS="none" \
+		eant \
+		-Dversion=${PV} \
+		jar-core \
+		jar-demo \
+		$(use_doc javadocs-core javadocs-demo)
+}
+
+src_test() {
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" \
+		ANT_TASKS="ant-junit" \
+		eant \
+		test-core
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar"
+	java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar"
+
+	if use doc; then
+		dodoc -r docs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-3.5.0-r1.ebuild b/dev-java/lucene/lucene-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..1c1898386a21
--- /dev/null
+++ b/dev-java/lucene/lucene-3.5.0-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="3.5"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+	dev-java/junit:4
+	dev-java/ant-junit:0
+	dev-java/ant-nodeps:0
+	contrib? (
+	          dev-java/jakarta-regexp:1.4
+			  dev-java/commons-compress:0
+	          dev-java/commons-collections:0
+	          dev-java/commons-digester:0
+	          dev-java/commons-logging:0
+			  dev-java/commons-beanutils:1.7
+	)"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+		dev-java/ant-core:0
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DOCS=(
+	CHANGES.txt README.txt
+	NOTICE.txt CHANGES.txt
+	JRE_VERSION_MIGRATION.txt
+)
+
+# All tests fail with the following error:
+# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
+RESTRICT="test"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i \
+		-e '/-Xmax/ d' \
+		common-build.xml || die
+
+	# FIXME: contrib builds do not work if junit not included
+	#java-pkg_jar-from --build-only --into lib \
+	#	junit-4 junit.jar junit-4.7.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-core ant.jar ant-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-junit ant-junit.jar ant-junit-1.7.1.jar
+
+	if use contrib; then
+	  cd contrib/ || die
+	  java-pkg_jar-from --build-only --into queries/lib \
+	  	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-compress commons-compress.jar commons-compress-1.1.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-collections commons-collections.jar commons-collections-3.1.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-digester commons-digester.jar commons-digester-1.7.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+	fi
+}
+
+src_compile() {
+	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
+	java-ant_xml-rewrite -f common-build.xml \
+		-c -e javadoc \
+		-a failonerror \
+		-v "false"
+
+	ANT_TASKS="none" \
+		eant -Dversion=${PV} \
+		-Dfailonjavadocwarning=false \
+		jar-core \
+		$(use_doc javadocs-core)
+
+	if use contrib; then
+		ANT_TASKS="none" \
+			eant -Dversion=${PV} \
+			-Dfailonjavadocwarning=false \
+			build-contrib \
+			$(use_doc javadocs-all)
+	fi
+}
+
+src_test() {
+	# FIXME: test does not get run, even when selected
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
+		ANT_TASKS="ant-junit" \
+		eant test-core
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
+
+	if use contrib; then
+		local i j
+		for i in $(find build/contrib -name \*-${PV}.jar); do
+		    j=${i##*/}
+			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+		done
+	fi
+	if use doc; then
+		dodoc -r docs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	if use source; then
+	     java-pkg_dosrc src/java/org
+	  	 use contrib && java-pkg_dosrc contrib
+	fi
+}
diff --git a/dev-java/lucene/lucene-3.5.0-r2.ebuild b/dev-java/lucene/lucene-3.5.0-r2.ebuild
new file mode 100644
index 000000000000..6d0031e124b3
--- /dev/null
+++ b/dev-java/lucene/lucene-3.5.0-r2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="3.5"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+	dev-java/junit:4
+	dev-java/ant-junit:0
+	dev-java/ant-core:0
+	contrib? (
+	          dev-java/jakarta-regexp:1.4
+			  dev-java/commons-compress:0
+	          dev-java/commons-collections:0
+	          dev-java/commons-digester:0
+	          dev-java/commons-logging:0
+			  dev-java/commons-beanutils:1.7
+	)"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+		dev-java/ant-core:0
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DOCS=(
+	CHANGES.txt README.txt
+	NOTICE.txt CHANGES.txt
+	JRE_VERSION_MIGRATION.txt
+)
+
+# All tests fail with the following error:
+# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
+RESTRICT="test"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i \
+		-e '/-Xmax/ d' \
+		common-build.xml || die
+
+	# FIXME: contrib builds do not work if junit not included
+	#java-pkg_jar-from --build-only --into lib \
+	#	junit-4 junit.jar junit-4.7.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-core ant.jar ant-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-junit ant-junit.jar ant-junit-1.7.1.jar
+
+	if use contrib; then
+	  cd contrib/ || die
+	  java-pkg_jar-from --build-only --into queries/lib \
+	  	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-compress commons-compress.jar commons-compress-1.1.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-collections commons-collections.jar commons-collections-3.1.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-digester commons-digester.jar commons-digester-1.7.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+	fi
+}
+
+src_compile() {
+	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
+	java-ant_xml-rewrite -f common-build.xml \
+		-c -e javadoc \
+		-a failonerror \
+		-v "false"
+
+	ANT_TASKS="none" \
+		eant -Dversion=${PV} \
+		-Dfailonjavadocwarning=false \
+		jar-core \
+		$(use_doc javadocs-core)
+
+	if use contrib; then
+		ANT_TASKS="none" \
+			eant -Dversion=${PV} \
+			-Dfailonjavadocwarning=false \
+			build-contrib \
+			$(use_doc javadocs-all)
+	fi
+}
+
+src_test() {
+	# FIXME: test does not get run, even when selected
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
+		ANT_TASKS="ant-junit" \
+		eant test-core
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
+
+	if use contrib; then
+		local i j
+		for i in $(find build/contrib -name \*-${PV}.jar); do
+		    j=${i##*/}
+			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+		done
+	fi
+	if use doc; then
+		dodoc -r docs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	if use source; then
+	     java-pkg_dosrc src/java/org
+	  	 use contrib && java-pkg_dosrc contrib
+	fi
+}
diff --git a/dev-java/lucene/lucene-3.6.2-r1.ebuild b/dev-java/lucene/lucene-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..4dcb812a206d
--- /dev/null
+++ b/dev-java/lucene/lucene-3.6.2-r1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+	dev-java/ant-ivy:2
+	dev-java/ant-junit:0
+	dev-java/ant-nodeps:0
+	dev-java/hamcrest-core:0
+	contrib? (
+	          dev-java/jakarta-regexp:1.4
+			  dev-java/commons-compress:0
+	          dev-java/commons-collections:0
+	          dev-java/commons-digester:0
+	          dev-java/commons-logging:0
+			  dev-java/commons-beanutils:1.7
+	)"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DOCS=(
+	CHANGES.txt README.txt
+	NOTICE.txt CHANGES.txt
+	JRE_VERSION_MIGRATION.txt
+)
+
+# All tests fail with the following error:
+# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
+RESTRICT="test"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i \
+		-e '/-Xmax/ d' \
+		common-build.xml || die
+
+	# FIXME: contrib builds do not work if junit not included
+	#java-pkg_jar-from --build-only --into lib \
+	#	junit-4 junit.jar junit-4.7.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-core ant.jar ant-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-junit ant-junit.jar ant-junit-1.7.1.jar
+
+	if use contrib; then
+	  cd contrib/ || die
+	  java-pkg_jar-from --build-only --into queries/lib \
+	  	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-compress commons-compress.jar commons-compress-1.1.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-collections commons-collections.jar commons-collections-3.1.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-digester commons-digester.jar commons-digester-1.7.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+	fi
+}
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i \
+		-e '/-Xmax/ d' \
+		-e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
+		-e '/<ivy:retrieve/d' \
+		common-build.xml || die
+	mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib || die
+	java-pkg_jar-from --build-only --into lib \
+		ant-core ant.jar ant-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-junit ant-junit.jar ant-junit-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-ivy:2
+	java-pkg_jar-from --build-only --into lib \
+		junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --build-only --into lib \
+		hamcrest-core
+
+	# Always needed anyway
+	cd "${S}"/test-framework/ || die
+	java-pkg_jar-from --build-only --into lib \
+		ant-core ant.jar ant-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-junit ant-junit.jar ant-junit-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --build-only --into lib \
+		hamcrest-core
+
+	if use contrib; then
+	    cd "${S}"/contrib/ || die
+		# queries
+	    java-pkg_jar-from --build-only --into queries/lib \
+	    	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
+		# benchmark
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-compress commons-compress.jar commons-compress-1.1.jar
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-collections commons-collections.jar commons-collections-3.1.jar
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-digester commons-digester.jar commons-digester-1.7.jar
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+		# analyzers/phonetic
+	    java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
+	    	commons-codec commons-codec.jar commons-codec-1.6.jar
+	fi
+}
+
+src_compile() {
+	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
+	java-ant_xml-rewrite -f common-build.xml \
+		-c -e javadoc \
+		-a failonerror \
+		-v "false"
+
+	ANT_TASKS="none" \
+		eant -Dversion=${PV} \
+		-Dfailonjavadocwarning=false \
+		jar-core \
+		$(use_doc javadocs-core)
+
+	if use contrib; then
+		ANT_TASKS="none" \
+			eant -Dversion=${PV} \
+			-Dfailonjavadocwarning=false \
+			build-contrib \
+			$(use_doc javadocs-all)
+	fi
+}
+
+src_test() {
+	# FIXME: test does not get run, even when selected
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
+		ANT_TASKS="ant-junit" \
+		eant test-core
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
+
+	if use contrib; then
+		local i j
+		for i in $(find build/contrib -name \*-${PV}.jar); do
+		    j=${i##*/}
+			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+		done
+	fi
+	if use doc; then
+		dodoc -r docs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	if use source; then
+	     java-pkg_dosrc core/src/java/org
+	  	 use contrib && java-pkg_dosrc contrib
+	fi
+}
diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
new file mode 100644
index 000000000000..091821750c1b
--- /dev/null
+++ b/dev-java/lucene/lucene-3.6.2-r2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+	dev-java/ant-ivy:2
+	dev-java/ant-junit:0
+	dev-java/ant-core:0
+	dev-java/hamcrest-core:0
+	contrib? (
+	          dev-java/jakarta-regexp:1.4
+			  dev-java/commons-compress:0
+	          dev-java/commons-collections:0
+	          dev-java/commons-digester:0
+	          dev-java/commons-logging:0
+			  dev-java/commons-beanutils:1.7
+	)"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DOCS=(
+	CHANGES.txt README.txt
+	NOTICE.txt CHANGES.txt
+	JRE_VERSION_MIGRATION.txt
+)
+
+# All tests fail with the following error:
+# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
+RESTRICT="test"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i \
+		-e '/-Xmax/ d' \
+		common-build.xml || die
+
+	# FIXME: contrib builds do not work if junit not included
+	#java-pkg_jar-from --build-only --into lib \
+	#	junit-4 junit.jar junit-4.7.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-core ant.jar ant-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-junit ant-junit.jar ant-junit-1.7.1.jar
+
+	if use contrib; then
+	  cd contrib/ || die
+	  java-pkg_jar-from --build-only --into queries/lib \
+	  	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-compress commons-compress.jar commons-compress-1.1.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-collections commons-collections.jar commons-collections-3.1.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-digester commons-digester.jar commons-digester-1.7.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+	fi
+}
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i \
+		-e '/-Xmax/ d' \
+		-e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
+		-e '/<ivy:retrieve/d' \
+		common-build.xml || die
+	mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib || die
+	java-pkg_jar-from --build-only --into lib \
+		ant-core ant.jar ant-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-junit ant-junit.jar ant-junit-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-ivy:2
+	java-pkg_jar-from --build-only --into lib \
+		junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --build-only --into lib \
+		hamcrest-core
+
+	# Always needed anyway
+	cd "${S}"/test-framework/ || die
+	java-pkg_jar-from --build-only --into lib \
+		ant-core ant.jar ant-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-junit ant-junit.jar ant-junit-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --build-only --into lib \
+		hamcrest-core
+
+	if use contrib; then
+	    cd "${S}"/contrib/ || die
+		# queries
+	    java-pkg_jar-from --build-only --into queries/lib \
+	    	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
+		# benchmark
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-compress commons-compress.jar commons-compress-1.1.jar
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-collections commons-collections.jar commons-collections-3.1.jar
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-digester commons-digester.jar commons-digester-1.7.jar
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+		# analyzers/phonetic
+	    java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
+	    	commons-codec commons-codec.jar commons-codec-1.6.jar
+	fi
+}
+
+src_compile() {
+	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
+	java-ant_xml-rewrite -f common-build.xml \
+		-c -e javadoc \
+		-a failonerror \
+		-v "false"
+
+	ANT_TASKS="none" \
+		eant -Dversion=${PV} \
+		-Dfailonjavadocwarning=false \
+		jar-core \
+		$(use_doc javadocs-core)
+
+	if use contrib; then
+		ANT_TASKS="none" \
+			eant -Dversion=${PV} \
+			-Dfailonjavadocwarning=false \
+			build-contrib \
+			$(use_doc javadocs-all)
+	fi
+}
+
+src_test() {
+	# FIXME: test does not get run, even when selected
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
+		ANT_TASKS="ant-junit" \
+		eant test-core
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
+
+	if use contrib; then
+		local i j
+		for i in $(find build/contrib -name \*-${PV}.jar); do
+		    j=${i##*/}
+			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+		done
+	fi
+	if use doc; then
+		dodoc -r docs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	if use source; then
+	     java-pkg_dosrc core/src/java/org
+	  	 use contrib && java-pkg_dosrc contrib
+	fi
+}
diff --git a/dev-java/lucene/metadata.xml b/dev-java/lucene/metadata.xml
new file mode 100644
index 000000000000..27faa4347b91
--- /dev/null
+++ b/dev-java/lucene/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+  <description>Maintainer for actual Lucene issues.</description>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+<use>
+  <flag name="contrib">Include extra functionality from contrib/</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-java/lzma-9.18 b/dev-java/lzma-9.18
deleted file mode 100644
index b42ee483ef2e..000000000000
--- a/dev-java/lzma-9.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java code for LZMA compression and decompression
-EAPI=5
-HOMEPAGE=https://www.7-zip.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/sevenzip/lzma918.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=112e4eb04de75e7ca0d070400cbdf983
diff --git a/dev-java/lzma/Manifest b/dev-java/lzma/Manifest
new file mode 100644
index 000000000000..082112a25813
--- /dev/null
+++ b/dev-java/lzma/Manifest
@@ -0,0 +1,3 @@
+DIST lzma918.tar.bz2 533322 BLAKE2B ed79541be70e127ead9f7683ed098fe6c69cca90574377a4abf0d130434624b05e67448e65e5f88602640b1784a7d613527fafd237d0a94c01ddd91a8f698dd4 SHA512 fa32920d5c45e80c6d029fa1244154e7ae2a2db676e9b115359e955bec829f4cffa6cd8297cae388aca540fc2974dfced4ce284fb351992d7b4a337292da3803
+EBUILD lzma-9.18.ebuild 503 BLAKE2B 68df02e7b664be7c59467f27b051684120929b5007a781f4f6eb205b0dee35bea374bbcd3a710cd778dc3975fd815e23bc94f8403db114dc901d9a0bc4d0df4d SHA512 d451bd866b6c4f486cf4707a953b267bcb6f3cf1cc15b85863e0511eadec0990072adcc8a8068a0a62645abc281d046bb087a6861cfc99c6ba140f4090fa4ea0
+MISC metadata.xml 431 BLAKE2B 290cfcc373d82a26fee073fe3bb4cdc53820d54c2c485bba5ecf9a06f0a7676305e619a91601c73086951e411e42af66d510e8d9a9386a7c5f0515bb1a09a928 SHA512 7c4883d6b59a9494a79dc774c5006de6b3a6b53ffbaab9e8f6fe8224083a800c800b80619e49b3214d9711ab22db53013109c54f4768c472c6f274302cc19e9f
diff --git a/dev-java/lzma/lzma-9.18.ebuild b/dev-java/lzma/lzma-9.18.ebuild
new file mode 100644
index 000000000000..c08f6ff48dc2
--- /dev/null
+++ b/dev-java/lzma/lzma-9.18.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java code for LZMA compression and decompression"
+HOMEPAGE="https://www.7-zip.org/"
+SRC_URI="mirror://sourceforge/sevenzip/${PN}${PV/./}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/Java"
+
+JAVA_SRC_DIR="SevenZip"
diff --git a/dev-java/lzma/metadata.xml b/dev-java/lzma/metadata.xml
new file mode 100644
index 000000000000..8a8bf5973243
--- /dev/null
+++ b/dev-java/lzma/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sevenzip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/lzmajio-0.95-r1 b/dev-java/lzmajio-0.95-r1
deleted file mode 100644
index e87b62303b47..000000000000
--- a/dev-java/lzmajio-0.95-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/lzma:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders
-EAPI=5
-HOMEPAGE=https://contrapunctus.net/league/haques/lzmajio/ https://github.com/league/lzmajio
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 dev-java/lzma:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://comsci.liu.edu/~league/dist/lzmajio/lzmajio-0.95.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c10d5c9faa0a9d5d26860e63411a378c
diff --git a/dev-java/lzmajio-0.95-r2 b/dev-java/lzmajio-0.95-r2
deleted file mode 100644
index cc7909458dc3..000000000000
--- a/dev-java/lzmajio-0.95-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/lzma:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders
-EAPI=6
-HOMEPAGE=https://contrapunctus.net/league/haques/lzmajio/ https://github.com/league/lzmajio
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/lzma:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/league/lzmajio-0.95/archive/0.95.tar.gz -> lzmajio-0.95.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ad9aedb0dada2097e6375381a1f3133b
diff --git a/dev-java/lzmajio/Manifest b/dev-java/lzmajio/Manifest
new file mode 100644
index 000000000000..2a0cace59041
--- /dev/null
+++ b/dev-java/lzmajio/Manifest
@@ -0,0 +1,4 @@
+DIST lzmajio-0.95.tar.gz 20790 BLAKE2B e24a5f4778bb135ce3ab519dfc8357cf3abc04d564b8d365f7cbad579be7ff86b4d24156720954bab882d7ade8e5145e533fd477c1925f6a9353c90dd5a2e511 SHA512 65736a66ec8f5eb63688edda912718f4e9b0518c68b0b1eed3df26e7b6bb15728024c637b4cf40f6ab52168c913cce91bd7cafefca7515e0f3e386738cedc6e5
+EBUILD lzmajio-0.95-r1.ebuild 680 BLAKE2B d1761a2317f81216c37f4c40d2b59d70727caece1a6af0e74127aeb5b70da986894cb8fe865c25843882ed629e992433210836f64d5df1f7c69cacce31b44fbb SHA512 05d34b13fbf5e52975ddfbd54ec11fea10c022c7395a6326d0afcacc6f882e765a40433e6a040722e7dcc657c729654454c7bd67060d94dd7bb4df47689a4830
+EBUILD lzmajio-0.95-r2.ebuild 679 BLAKE2B 3f4de611f88fd898c4b29e15ffa685772c69598b76d664dfbfa338e6d9d742071567b956f4958bdfb3c256514729d7d9b9359f0c3adecfc0e1690d4d5fb53ed3 SHA512 2add22580d5f3ff97016f509db4a7c7e81534e7003592e694df3dd8b722e069f533b3d1724492de1762c11babb6c45afb33ee5b63bcca0b300e2bbee7199f3b0
+MISC metadata.xml 354 BLAKE2B 9b4fad4285c60df9a8341f2bb257e376cffc0fd483f4865850c24f43fe8d1770d7056297f773bef0b7d4f666eb5155753118b2394f85e7d45e0cc62713dc13de SHA512 75420fb1c8b1ebafdc3e237f34d2c70503166f248eeba6356d9bc703ca4c89a6dc2e28dd67b29fffe359f3b35bbc09539ade4f3c4b968fa1b76fb6481fd849dc
diff --git a/dev-java/lzmajio/lzmajio-0.95-r1.ebuild b/dev-java/lzmajio/lzmajio-0.95-r1.ebuild
new file mode 100644
index 000000000000..614275aea27e
--- /dev/null
+++ b/dev-java/lzmajio/lzmajio-0.95-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders"
+HOMEPAGE="https://contrapunctus.net/league/haques/lzmajio/
+	https://github.com/league/lzmajio"
+SRC_URI="http://comsci.liu.edu/~league/dist/${PN}/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+CDEPEND="dev-java/lzma:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+JAVA_GENTOO_CLASSPATH="lzma"
+JAVA_SRC_DIR="net"
diff --git a/dev-java/lzmajio/lzmajio-0.95-r2.ebuild b/dev-java/lzmajio/lzmajio-0.95-r2.ebuild
new file mode 100644
index 000000000000..d0cfe223c5d6
--- /dev/null
+++ b/dev-java/lzmajio/lzmajio-0.95-r2.ebuild
@@ -0,0 +1,32 @@
+# 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="LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders"
+HOMEPAGE="https://contrapunctus.net/league/haques/lzmajio/
+	https://github.com/league/lzmajio"
+SRC_URI="https://github.com/league/${P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/lzma:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="lzma"
+JAVA_SRC_DIR="net"
diff --git a/dev-java/lzmajio/metadata.xml b/dev-java/lzmajio/metadata.xml
new file mode 100644
index 000000000000..380bcf5d302a
--- /dev/null
+++ b/dev-java/lzmajio/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/dev-java/matrix-toolkits-java-0.9.12 b/dev-java/matrix-toolkits-java-0.9.12
deleted file mode 100644
index 97498405eefd..000000000000
--- a/dev-java/matrix-toolkits-java-0.9.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/junit:0 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=BLAS and LAPACK-derived matrix data structures and linear algebra methods
-EAPI=2
-HOMEPAGE=https://github.com/fommil/matrix-toolkits-java
-IUSE=elibc_FreeBSD doc test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://matrix-toolkits-java.googlecode.com/files/mtj-0.9.12.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e5a6ebd9d52ce99ea89fd7d74cb7ad47
diff --git a/dev-java/matrix-toolkits-java/Manifest b/dev-java/matrix-toolkits-java/Manifest
new file mode 100644
index 000000000000..989a38c3dafa
--- /dev/null
+++ b/dev-java/matrix-toolkits-java/Manifest
@@ -0,0 +1,3 @@
+DIST mtj-0.9.12.zip 2576775 BLAKE2B 6325ec4286ba3c103439488f7bc58f0acc70d1df71cf1adc61f99715f8a653ca5198ec0ddb3a24c890bc696143e4b7f61ff38b26c0c81144cadcc63f166c5ea8 SHA512 526793d02d1a5ff7e8b9a2fb1c8fa570a88f96fcb4926623bae6cfdc31f206dc6103efa4e14a29f7b600ed2e1eba516f12c8da7e749983dd6f75a1a4c6676f4d
+EBUILD matrix-toolkits-java-0.9.12.ebuild 1158 BLAKE2B 3bb357e6da68f36277e3214241594bbc0db0560873e2bb3f647e795cbce716f2bca372cbaacf3e3f6f2452c6eccbab2d6d42aa87d24c2aff28fa07b35b12cb64 SHA512 c5926c67e2774c3bd2a07147ffefe68389937ec1ec25559e59a9817d6fd0d012735e0e310791fcb5494ab071de841468c266815b49ae5ecc17ec7aa4ef854c22
+MISC metadata.xml 405 BLAKE2B bb9879b01eac45a76e9b5a3a2ff077f8b66b296dbb649a6a5dbe4914a9586c64e81dcb85113b474d54bf26f75ebfbf99c40f4d3718d9cbe1658f2faa47a992d0 SHA512 6f4bcbfe1ce195a54a8a9f8d51e02ee26b65a2b1b1391bfe6ae80b519728825d48621510881279d5b09587fdd72d8949fc806d1df55933eccef86f5ad02b176a
diff --git a/dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild b/dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild
new file mode 100644
index 000000000000..1638f937a9fb
--- /dev/null
+++ b/dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc test"
+#WANT_ANT_TASKS="ant-junit"
+EANT_GENTOO_CLASSPATH="junit"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="BLAS and LAPACK-derived matrix data structures and linear algebra methods"
+HOMEPAGE="https://github.com/fommil/matrix-toolkits-java"
+SRC_URI="https://matrix-toolkits-java.googlecode.com/files/mtj-${PV}.zip"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPS=""
+DEPEND="
+	dev-java/junit:0
+	>=virtual/jdk-1.5
+	${COMMON_DEPS}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPS}"
+
+S="${WORKDIR}/mtj-${PV}"
+
+src_prepare() {
+	einfo "Removing bundled jars..."
+	cd "${S}/lib/junit"
+	rm -v junit*.jar
+	java-pkg_jar-from junit
+	cd "${S}"
+	rm -v mtj*.jar
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	eant jar -Dplatforms.JDK_1.5.home="${JAVA_HOME}"
+}
+
+src_install() {
+	java-pkg_newjar dist/Matrix_Toolkits_for_Java.jar ${PN}.jar
+	use doc && java-pkg_dojavadoc javadoc
+}
+
+# FIXME: Test suite compilation fails
+#src_test() {
+#	eant test -Dplatforms.JDK_1.5.home="${JAVA_HOME}"
+#}
diff --git a/dev-java/matrix-toolkits-java/metadata.xml b/dev-java/matrix-toolkits-java/metadata.xml
new file mode 100644
index 000000000000..f67cb7be8e25
--- /dev/null
+++ b/dev-java/matrix-toolkits-java/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">matrix-toolkits-java</remote-id>
+    <remote-id type="github">fommil/matrix-toolkits-java</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/maven-bin-1.1-r3 b/dev-java/maven-bin-1.1-r3
deleted file mode 100644
index 432117e0d85e..000000000000
--- a/dev-java/maven-bin-1.1-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-eselect/eselect-java
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=4
-HOMEPAGE=http://maven.apache.org/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java
-SLOT=1.1
-SRC_URI=mirror://apache/maven/maven-1/1.1/binaries/maven-1.1.tar.gz
-_md5_=8f4924ab03dc46d411e973d362aa5942
diff --git a/dev-java/maven-bin-2.0.11-r2 b/dev-java/maven-bin-2.0.11-r2
deleted file mode 100644
index 1684d868a08a..000000000000
--- a/dev-java/maven-bin-2.0.11-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=4
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.4 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-SLOT=2.0
-SRC_URI=mirror://apache/maven/maven-2/2.0.11/binaries/apache-maven-2.0.11-bin.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e90ba02a2104a19a3d7efdc54bb656fb
diff --git a/dev-java/maven-bin-2.2.1-r2 b/dev-java/maven-bin-2.2.1-r2
deleted file mode 100644
index 9212dd8c78ef..000000000000
--- a/dev-java/maven-bin-2.2.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=4
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-SLOT=2.2
-SRC_URI=mirror://apache/maven/maven-2/2.2.1/binaries/apache-maven-2.2.1-bin.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fb60cc4dca4eacd97262549a6a0285b9
diff --git a/dev-java/maven-bin-3.0.4-r1 b/dev-java/maven-bin-3.0.4-r1
deleted file mode 100644
index 3063d55a7f25..000000000000
--- a/dev-java/maven-bin-3.0.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=4
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-SLOT=3.0
-SRC_URI=mirror://apache/maven/maven-3/3.0.4/binaries/apache-maven-3.0.4-bin.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=11ca67a1b0c31b62c40337fe0cdc1458
diff --git a/dev-java/maven-bin-3.1.1 b/dev-java/maven-bin-3.1.1
deleted file mode 100644
index ae3325932e2e..000000000000
--- a/dev-java/maven-bin-3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=5
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3
-SLOT=3.1
-SRC_URI=mirror://apache/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=136ae24521281eea15ee317228f334e8
diff --git a/dev-java/maven-bin-3.2.5 b/dev-java/maven-bin-3.2.5
deleted file mode 100644
index 2ca9036472c9..000000000000
--- a/dev-java/maven-bin-3.2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=5
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.6 >=virtual/jre-1.6 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3
-SLOT=3.2
-SRC_URI=mirror://apache/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6a86e31133ac3725b42fcdec8cc9db14
diff --git a/dev-java/maven-bin-3.3.3-r1 b/dev-java/maven-bin-3.3.3-r1
deleted file mode 100644
index 70bd7e3df4e7..000000000000
--- a/dev-java/maven-bin-3.3.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=5
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=3.3
-SRC_URI=mirror://apache/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9639c763b94761f151bcb677e8f4e5bc
diff --git a/dev-java/maven-bin-3.3.9 b/dev-java/maven-bin-3.3.9
deleted file mode 100644
index e097d2584c8c..000000000000
--- a/dev-java/maven-bin-3.3.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=5
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=3.3
-SRC_URI=mirror://apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f494b539cba92a3a81b85617a48cae1b
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
new file mode 100644
index 000000000000..761bea0eaccd
--- /dev/null
+++ b/dev-java/maven-bin/Manifest
@@ -0,0 +1,18 @@
+AUX maven 5108 BLAKE2B ea00d51464bb983871760ea1683a4b3f9129a5c91040fe7d1e86998e46c6938df49481f26a0d1c94d32d2419544824022aaa439cd7c01edaaa391428e455e32b SHA512 91901a50153e148b2799b8a1298b4ef26ac07af4b7bbb3ae5c76edccdc8efe41b5613ffd78bd1dd917a78fae8086cdbe737096ff2d4912d0333fff206026dd0b
+DIST apache-maven-2.0.11-bin.tar.bz2 2104711 BLAKE2B 4bc6272957f3e258135d4efacacc625f63522a7e0277e3383ec27a9906e8e4b41cb606d44b30ba870fa5c05d79a45d26af9af00cbffb7615087949c2eec563f7 SHA512 829a583e44ea997576cb0949d74f95e6557069489329523c28c44b546f07cd9487a75f4326d7dc0a098a9755fd52630f2ee27a60daf35006eb48d6af250f84de
+DIST apache-maven-2.2.1-bin.tar.bz2 2839688 BLAKE2B 64427a0e8925c7ec4567a96878c389635aaf578a6569825749fb5786ee7566654d5e6583d40cced8e3585b72bc1cee70567388cddf32393ff1fb5962a4ad96eb SHA512 ffbf74b6b51616dcd87252973ddd776f13861fece7cd25df9cfba4bda1d8dd574772cb5d37ac7ed97ef8b93b507939d428d47b9b81742c801c7958b9fd6188e7
+DIST apache-maven-3.0.4-bin.tar.gz 4873043 BLAKE2B 6cdbc6362dfd766f8e14298873f574fff1a6b4c4e29011a234ff7f3f0d2350a7fe7ff26dd68d486b68d84ba575d77324d0cb950e0cea91894a2f0ce81da0f7de SHA512 d6935daff3b80ed6e40ee0acb4f269b4b16e63bc29b792316599a9847f1b33d9309d3c399cdb170710714a1d150957eedc909754de8f8a77d87bd20a0abcb36c
+DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
+DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
+DIST apache-maven-3.3.3-bin.tar.gz 8042383 BLAKE2B 2d1826e85ee558e8672ac541237248b32db1577c76eecf9ac3d08d79e157c9c7a4fa7d892a7bc0bc25d2751f9713a72959198fb6ccd68907bda7f841068b6a63 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5
+DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
+DIST maven-1.1.tar.gz 7625074 BLAKE2B b96b5b5c74fdccba8914772fe2ba789751b85170d78afb3fb75c151d56d757be10a1f8706d9593a4ff4459a1e7d8b31801eef07cf2514e1992ba1c99c4d0a7e8 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0
+EBUILD maven-bin-1.1-r3.ebuild 943 BLAKE2B 184f9d88036feecc7cf657e8bd792c126d2a5bebdc232a62c80ae845df5b9800cec324e07d543fad664add754fdc611c5b45b37eaae40ffc29767bfd5d63c2d0 SHA512 cfde3cb81d60eca2ff500228baf7aa5aaffbaa333d8364f05143811aee48b263dc3df8f5f2764bd486f04271f916e52250b7ec019fa80792527a4ca2c591e110
+EBUILD maven-bin-2.0.11-r2.ebuild 1198 BLAKE2B 7077d0a91ecffc1f5fb6e018d11a4bc0f17b477d39a46e14a4017e0cbfa9ce8136a4fb8b54d89371aa317083b7aa3374b69fedc045e935c9e1bfb53209b86002 SHA512 87e71fab63238961ab03f2509c1b1a7f19e5d027072d1c48c8e4a0b726a15e5e502e1f5afbe19fb95a2159c48ce88e742f8266bbf154ddaebdeeb4cb82379433
+EBUILD maven-bin-2.2.1-r2.ebuild 1198 BLAKE2B 53c2334854fa9215a3f9fc3b444d06363b74a7aa6444d88c742c3fe7cd83d9bce570cb8a4142db22dd4fb109f384f37619b28f91b6d17c952b9ccc17feab5503 SHA512 81db5d6d926eba62e7104a832c50799474e7a1ff2aeda48c9f0d37cb9d5649159881afecc68850538f0f946c7de6559faf6fbe728b9e1199f4a55c9cc5c5cfdf
+EBUILD maven-bin-3.0.4-r1.ebuild 1275 BLAKE2B aa254e625be8d5697261fdcafb064050a4918a77e19bc1ff16381b344347e4da0eb33dd639e4cfc0c74bc5557879dc8156a9e5ab8f851c74d746ac778fb1884a SHA512 962818f9a4762a4422498d67ee878d2e2cf33f1372192e4d8c1becae1357daef156a6588a08e7b7d43190b914d9b6d341a7cac61ce4161fd9ca1b35a1eb74fd9
+EBUILD maven-bin-3.1.1.ebuild 2276 BLAKE2B 460b49a29f7aa9f07b672a2751b3a5df3ec6f7027380cb0c84ca4e6146c39da92f52dc6a3158c7e51e74311a1ef4d01402c27f426d9ce5bfb83ebe485b27c083 SHA512 42935864e2af19b20851fdada4ba22562a995fca5bcc63e178c0771ff5d6d9560806cb288ddf9663b1da12d1242627cf9c7903ad8acef32174b2848b4527a096
+EBUILD maven-bin-3.2.5.ebuild 2283 BLAKE2B 5d3292e5f0f2a50e0bb3fe71150d0853947af536432d6b7c6e159fd2cd16a387ee8aa0c3682ca4fc65211f1a32d8d246a901487c9445036285c57fa3397edbd8 SHA512 2a8e8145a454c2f88cf4d48c9cfc2a2cd7689f38f3ce53ffb6d579523aed92d04fe1c3368d8da1035c9ccff8c77142db25dd8fdb6a0d5a9682daf733bd6da71e
+EBUILD maven-bin-3.3.3-r1.ebuild 2220 BLAKE2B a781e334df1a9afd6b0ed76e0c67f29d20777384e7f99d54aea6c140669cdef3e060e3cac6925f7c77eabf5580296416984b21cf479d093f038e5276d09d99a3 SHA512 188beb36be65bc2699fee7ed75407399ecd66e13791242cb12de9a1c18a0c8a233018f5e86d779e597d6a7f7c0e7001a726b437a65c1e51bfba69af57a188683
+EBUILD maven-bin-3.3.9.ebuild 2222 BLAKE2B fe852cdf3e64577d3565cef67ac1be99e9d9a435dbae7609b46b53f18c0198da4da1f45bb5c55a9973eeb3d0656eee2cfe6fc52efe2dfa196c1142f2d2b7d165 SHA512 5ed211c1017f9079251f7888c9920d3bf37fe2d9be680f0d7dbc142da340da6467b328d3972c6d69cf26eb57f2e80d084f25344e02174953aa886f76b6a3a8ef
+MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083
diff --git a/dev-java/maven-bin/files/maven b/dev-java/maven-bin/files/maven
new file mode 100644
index 000000000000..97f09f065f45
--- /dev/null
+++ b/dev-java/maven-bin/files/maven
@@ -0,0 +1,168 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+#  Copyright 2001-2004 The Apache Software Foundation.
+#  
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#  
+#       http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+# ----------------------------------------------------------------------------
+
+#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+#   reserved.
+
+FOREHEAD_VERSION=1.0-beta-5
+
+if [ -z "$MAVEN_OPTS" ] ; then
+  MAVEN_OPTS="-Xmx256m"
+fi
+
+if [ -f "$HOME/.mavenrc" ] ; then
+  . "$HOME/.mavenrc"
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  Darwin*) darwin=true 
+           if [ -z "$JAVA_VERSION" ] ; then
+             JAVA_VERSION="CurrentJDK"
+           else
+             echo "Using Java version: $JAVA_VERSION"
+           fi
+           if [ -z "$JAVA_HOME" ] ; then
+             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+           fi
+           ;;
+esac
+
+  # try a couple ways to find MAVEN_HOME
+
+  if [ -z ${MAVEN_HOME} ] && [ -d /opt/maven ] ; then
+    MAVEN_HOME=/opt/maven
+  fi
+
+  if [ -z ${MAVEN_HOME} ] && [ -d "$HOME/maven" ] ; then
+    MAVEN_HOME="$HOME/maven"
+  fi
+
+  # try to load from env.d file
+  if [ -z ${MAVEN_HOME} ] && [ -f /etc/env.d/25maven ]; then
+  	MAVEN_HOME=$(source /etc/env.d/25maven; echo ${MAVEN_HOME})
+  fi
+
+ # try to figure it out from how this script was invoked
+  if [ -z ${MAVEN_HOME} ]; then
+    ## resolve links - $0 may be a link to maven's home
+    PRG=$0
+    progname=`basename $0`
+    saveddir=`pwd`
+
+    # need this for relative symlinks
+    cd `dirname $PRG`
+
+    while [ -h "$PRG" ] ; do
+      ls=`ls -ld "$PRG"`
+      link=`expr "$ls" : '.*-> \(.*\)$'`
+      if expr "$link" : '.*/.*' > /dev/null; then
+        PRG="$link"
+      else
+        PRG="`dirname $PRG`/$link"
+      fi
+    done
+
+    MAVEN_HOME=`dirname "$PRG"`/..
+
+    # make it fully qualified
+    MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
+
+    cd $saveddir
+  fi
+
+[ -z "${MAVEN_HOME}" ] && exit "Was unable to determine MAVEN_HOME"
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$MAVEN_HOME" ] &&
+    MAVEN_HOME=`cygpath --unix "$MAVEN_HOME"`
+  [ -n "$MAVEN_HOME_LOCAL" ] &&
+    MAVEN_HOME_LOCAL=`cygpath --unix "$MAVEN_HOME_LOCAL"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD=java
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly."
+  echo "  We cannot execute $JAVACMD"
+  exit
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+  echo "  If build fails because sun.* classes could not be found"
+  echo "  you will need to set the JAVA_HOME environment variable"
+  echo "  to the installation directory of java."
+fi
+
+MAVEN_ENDORSED="${JAVA_HOME}/lib/endorsed:${MAVEN_HOME}/lib/endorsed"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$MAVEN_HOME" ] &&
+    MAVEN_HOME=`cygpath --path --windows "$MAVEN_HOME"`
+  [ -n "$MAVEN_HOME_LOCAL" ] &&
+    MAVEN_HOME_LOCAL=`cygpath --path --windows "$MAVEN_HOME_LOCAL"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$HOME" ] &&
+    HOME=`cygpath --path --windows "$HOME"`
+  [ -n "$MAVEN_ENDORSED" ] &&
+    MAVEN_ENDORSED=`cygpath --path --windows "$MAVEN_ENDORSED"`
+fi
+
+# For Darwin, use classes.jar for TOOLS_JAR
+TOOLS_JAR="${JAVA_HOME}/lib/tools.jar"
+if $darwin; then
+  TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Classes/classes.jar"
+fi
+
+MAIN_CLASS=com.werken.forehead.Forehead
+if [ -n "$MAVEN_HOME_LOCAL" ]; then
+  MAVEN_OPTS="$MAVEN_OPTS -Dmaven.home.local=${MAVEN_HOME_LOCAL}" 
+fi
+  
+"$JAVACMD" \
+  $MAVEN_OPTS \
+  -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
+  -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
+  "-Djava.endorsed.dirs=${MAVEN_ENDORSED}" \
+  -classpath "${MAVEN_HOME}/lib/forehead-${FOREHEAD_VERSION}.jar" \
+  "-Dforehead.conf.file=${MAVEN_HOME}/bin/forehead.conf"  \
+  "-Dtools.jar=$TOOLS_JAR" \
+  "-Dmaven.home=${MAVEN_HOME}" \
+  $MAIN_CLASS "$@"
+
diff --git a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
new file mode 100644
index 000000000000..dc990e66e4cb
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+MY_PN=${PN/-bin}
+MY_PV=${PV/_/-}
+MY_P=${MY_PN}-${MY_PV}
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="1.1"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-eselect/eselect-java"
+RDEPEND=">=virtual/jdk-1.5
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+MAVEN=${PN}-${SLOT}
+MAVEN_HOME="/usr/share/${MAVEN}"
+MAVEN_BIN="${MAVEN_HOME}/bin"
+
+src_install() {
+	dodir ${MAVEN_HOME}
+	insinto ${MAVEN_HOME}
+	doins -r bin lib *.xsd plugins
+
+	dodir ${MAVEN_BIN}
+	exeinto ${MAVEN_BIN}
+	doexe "${FILESDIR}/${MY_PN}"
+
+	dodir /usr/bin
+	dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/mvn-${SLOT}
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
new file mode 100644
index 000000000000..849b313ae57d
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_P="${MY_PN}-${PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.bz2"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="2.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-eselect/eselect-java"
+RDEPEND=">=virtual/jdk-1.4
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -v "${S}"/bin/*.bat || die
+}
+
+# TODO we should use jars from packages, instead of what is bundled
+src_install() {
+	dodir "${MAVEN_SHARE}"
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# bug #342901
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..43b208161178
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_P="${MY_PN}-${PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.bz2"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="2.2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-eselect/eselect-java"
+RDEPEND=">=virtual/jdk-1.5
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -v "${S}"/bin/*.bat || die
+}
+
+# TODO we should use jars from packages, instead of what is bundled
+src_install() {
+	dodir "${MAVEN_SHARE}"
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# bug #342901
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
new file mode 100644
index 000000000000..2a1fd224356b
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_P="${MY_PN}-${PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-eselect/eselect-java"
+RDEPEND=">=virtual/jdk-1.5
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -v "${S}"/bin/*.bat || die
+	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
+}
+
+# TODO we should use jars from packages, instead of what is bundled
+src_install() {
+	dodir "${MAVEN_SHARE}"
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# bug #342901
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
new file mode 100644
index 000000000000..0063d4ff7c7b
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="amd64 x86"
+
+# TODO: Needs further resolution:
+#
+# - https://bugs.gentoo.org/show_bug.cgi?id=472850
+# - https://bugs.gentoo.org/show_bug.cgi?id=477436
+#
+DEPEND="app-eselect/eselect-java
+	|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
+	dev-java/aopalliance:1
+	dev-java/avalon-framework:4.1
+	dev-java/commons-cli:1
+	dev-java/commons-io:1
+	dev-java/javax-inject:0
+	dev-java/jsoup:0
+	dev-java/jsr250:0
+	dev-java/juel:0
+	dev-java/osgi-core-api:0
+	java-virtuals/interceptor-api:0
+	java-virtuals/servlet-api:2.4"
+
+RDEPEND=">=virtual/jdk-1.5
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
+
+	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
+
+	# Symlink jars.
+	cd lib || die
+	java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
+	has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
+	has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
+	has_version dev-java/log4j:0 && java-pkg_jar-from log4j
+}
+
+# TODO: We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
new file mode 100644
index 000000000000..a92297f4dfb0
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: Needs further resolution:
+#
+# - https://bugs.gentoo.org/show_bug.cgi?id=472850
+# - https://bugs.gentoo.org/show_bug.cgi?id=477436
+#
+DEPEND="app-eselect/eselect-java
+|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
+dev-java/aopalliance:1
+dev-java/avalon-framework:4.1
+dev-java/commons-cli:1
+dev-java/commons-io:1
+dev-java/javax-inject:0
+dev-java/jsoup:0
+dev-java/jsr250:0
+dev-java/juel:0
+dev-java/osgi-core-api:0
+java-virtuals/interceptor-api:0
+java-virtuals/servlet-api:2.4"
+
+RDEPEND=">=virtual/jdk-1.6
+>=virtual/jre-1.6
+${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
+
+	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
+
+	# Symlink jars.
+	cd lib || die
+	java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
+	has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
+	has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
+	has_version dev-java/log4j:0 && java-pkg_jar-from log4j
+}
+
+# TODO: We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
new file mode 100644
index 000000000000..d0a6200c052b
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.3"
+KEYWORDS="amd64 x86"
+
+# TODO: Needs further resolution:
+#
+# - https://bugs.gentoo.org/show_bug.cgi?id=472850
+# - https://bugs.gentoo.org/show_bug.cgi?id=477436
+#
+CDEPEND="
+	dev-java/juel:0
+	dev-java/log4j:0
+	dev-java/jsoup:0
+	dev-java/jsr250:0
+	dev-java/commons-io:1
+	dev-java/aopalliance:1
+	dev-java/commons-cli:1
+	dev-java/javax-inject:0
+	dev-java/osgi-core-api:0
+	dev-java/commons-logging:0
+	java-virtuals/interceptor-api:0
+	java-virtuals/servlet-api:3.0"
+
+DEPEND="
+	${CDEPEND}
+	app-eselect/eselect-java
+	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
+	>=virtual/jdk-1.7"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+MAVEN_DEPENDENCIES=(
+	juel
+	jsoup
+	log4j
+	jsr250
+	javax-inject
+	commons-io-1
+	osgi-core-api
+	aopalliance-1
+	commons-cli-1
+	commons-logging
+	interceptor-api
+	servlet-api-3.0
+)
+
+java_prepare() {
+	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
+
+	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
+
+	# Symlink jars.
+	cd lib || die
+
+	# Link deps.
+	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
+		java-pkg_jar-from "${mvn_dep}"
+	done
+}
+
+# TODO: We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.3.9.ebuild b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
new file mode 100644
index 000000000000..a40b338ff43f
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.3"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: Needs further resolution:
+#
+# - https://bugs.gentoo.org/show_bug.cgi?id=472850
+# - https://bugs.gentoo.org/show_bug.cgi?id=477436
+#
+CDEPEND="
+	dev-java/juel:0
+	dev-java/log4j:0
+	dev-java/jsoup:0
+	dev-java/jsr250:0
+	dev-java/commons-io:1
+	dev-java/aopalliance:1
+	dev-java/commons-cli:1
+	dev-java/javax-inject:0
+	dev-java/osgi-core-api:0
+	dev-java/commons-logging:0
+	java-virtuals/interceptor-api:0
+	java-virtuals/servlet-api:3.0"
+
+DEPEND="
+	${CDEPEND}
+	app-eselect/eselect-java
+	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
+	>=virtual/jdk-1.7"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+MAVEN_DEPENDENCIES=(
+	juel
+	jsoup
+	log4j
+	jsr250
+	javax-inject
+	commons-io-1
+	osgi-core-api
+	aopalliance-1
+	commons-cli-1
+	commons-logging
+	interceptor-api
+	servlet-api-3.0
+)
+
+java_prepare() {
+	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
+
+	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
+
+	# Symlink jars.
+	cd lib || die
+
+	# Link deps.
+	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
+		java-pkg_jar-from "${mvn_dep}"
+	done
+}
+
+# TODO: We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/metadata.xml b/dev-java/maven-bin/metadata.xml
new file mode 100644
index 000000000000..af5cc0fd07e0
--- /dev/null
+++ b/dev-java/maven-bin/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>Maven is a Java project management and project comprehension tool. Maven is based on the concept of a project object model (POM) in that all the artifacts produced by Maven are a result of consulting a well defined model for your project. Builds, documentation, source metrics, and source cross-references are all controlled by your POM.</longdescription>
+</pkgmetadata>
diff --git a/dev-java/maven-hawtjni-plugin-1.11 b/dev-java/maven-hawtjni-plugin-1.11
deleted file mode 100644
index 936e722c2287..000000000000
--- a/dev-java/maven-hawtjni-plugin-1.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Maven plugin for the HawtJNI code generator (resources only)
-EAPI=5
-HOMEPAGE=https://github.com/fusesource/hawtjni
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.11.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6dd645fe045caa32ef91d41bcb05ef9d
diff --git a/dev-java/maven-hawtjni-plugin/Manifest b/dev-java/maven-hawtjni-plugin/Manifest
new file mode 100644
index 000000000000..ae5f46e7a005
--- /dev/null
+++ b/dev-java/maven-hawtjni-plugin/Manifest
@@ -0,0 +1,3 @@
+DIST hawtjni-project-1.11.tar.gz 1603735 BLAKE2B 1ef2986ce40e6cadf7256699e1b1527a39e85672f02602855804e1bbf9b7d915bd683abef5f30b99ed7edc56eef4cafaa6e75698fa45b0b64491ef8309d51387 SHA512 0fafe29dd058eee07e9c26179b7605cc092254199ccb913064002c882e7ab55ecc4045dd2baab99bbc46d6bf28a9f4f2108c210616e3a9c4a92582c65e6de4e4
+EBUILD maven-hawtjni-plugin-1.11.ebuild 672 BLAKE2B 5d2e7c6db61b8a414d1bda5c0c718f4de949640dd5bf947d4874fac764c45b3b9bee269fd878bfcd3f3a16a26163994e9c0681fd745356cf7fa68def99043ab1 SHA512 6eef7c1cefa80c1eb7411c8c0d799e5d9562598bf3f84f32d4cdba102df0a016581dc76f863181784fd49b75bc6ad0f4d4712273c5145b60c7b73941165e7c7b
+MISC metadata.xml 319 BLAKE2B a8ff6beec59dcc3e34b41cc80d269095ece235e2254d412e2c7b2493f9d2804d273b52f9c550ad7ab9e37f512edb293db91d5ecfc2520c1637f9f610eddf80a0 SHA512 898070ae9d50aff49b3a7273149ee1cf57fb770acb71dbe57c40bc53a10ff5b07d1a461c7a88d361ddcbf15863c228db494092119d84c1b8b0439b9e5dfb2e74
diff --git a/dev-java/maven-hawtjni-plugin/maven-hawtjni-plugin-1.11.ebuild b/dev-java/maven-hawtjni-plugin/maven-hawtjni-plugin-1.11.ebuild
new file mode 100644
index 000000000000..29f28f1b6d3a
--- /dev/null
+++ b/dev-java/maven-hawtjni-plugin/maven-hawtjni-plugin-1.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2
+
+MY_P="hawtjni-project-${PV}"
+
+DESCRIPTION="Maven plugin for the HawtJNI code generator (resources only)"
+HOMEPAGE="https://github.com/fusesource/hawtjni"
+SRC_URI="https://github.com/fusesource/hawtjni/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/hawtjni-${MY_P}/${PN}"
+
+src_compile() {
+	touch ${PN}.jar || die # jar won't create on update.
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+}
diff --git a/dev-java/maven-hawtjni-plugin/metadata.xml b/dev-java/maven-hawtjni-plugin/metadata.xml
new file mode 100644
index 000000000000..6208a5add14c
--- /dev/null
+++ b/dev-java/maven-hawtjni-plugin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">fusesource/hawtjni</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/mchange-commons-0.2.10 b/dev-java/mchange-commons-0.2.10
deleted file mode 100644
index c7855db0293d..000000000000
--- a/dev-java/mchange-commons-0.2.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 dev-java/typesafe-config:0 app-arch/zip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=a library of arguably useful Java utilities
-EAPI=5
-HOMEPAGE=https://github.com/swaldman/mchange-commons-java
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=CDDL
-RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 dev-java/typesafe-config:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/swaldman/mchange-commons-java/archive/mchange-commons-java-0.2.10.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1644232f23d99cbe43ad579f5a966c6b
diff --git a/dev-java/mchange-commons/Manifest b/dev-java/mchange-commons/Manifest
new file mode 100644
index 000000000000..d1b68d90cf1f
--- /dev/null
+++ b/dev-java/mchange-commons/Manifest
@@ -0,0 +1,3 @@
+DIST mchange-commons-java-0.2.10.zip 773768 BLAKE2B abfcc70e109431afcc514e80a2dc3585a90de07f8cb800d0a9807b72ad10f0488ad0a8b7a641c3de7a91029e3d6b25590985df85e592d90d0af42728389d7e28 SHA512 8196cd4476c3dea55355ba11cc2f801602235de3a977d75eff3835dacaf612647adc0e595e0bf77a6313adcd718d143d08ecf6fd5aa0e6638a419cf1f107c3a9
+EBUILD mchange-commons-0.2.10.ebuild 775 BLAKE2B db834708c256a68a2c40460920c153e5c29c7c51bbc37143f61226893d0f31074437f148574680dc71dd4dd2a381b7357ecaefdb8bba8ec7af0272a6445bbcff SHA512 53445826420dbfbfbe553f3e6460c58012b9a79ee0fd28173e79c4ce4ff1c571947133b56e4a71159b69ca868cd5837a3b1585426064b520b649523460411584
+MISC metadata.xml 340 BLAKE2B a81cee80f8ce7433eecd756e2fa4748e0bcb9483180f28e3190941ca2daa48084e4723f39d41a3f6783117f9c0b101cb4339c7f6a6ee1ad844cd14d5e96ffa23 SHA512 28af226bb9e6dff2c469c0e6b46802c64abd139826d5117ab8b1ebdfb6a94f8b5e295c85cbb36048c7049bb0d77b10313aad4a3038d2a7b51c6ff12c81d799a5
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
new file mode 100644
index 000000000000..da085079a41a
--- /dev/null
+++ b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="a library of arguably useful Java utilities"
+HOMEPAGE="https://github.com/swaldman/mchange-commons-java"
+SRC_URI="https://github.com/swaldman/${MY_PN}/archive/${MY_P}.zip"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE="doc source"
+
+CDEPEND="
+	dev-java/log4j:0
+	dev-java/slf4j-api:0
+	dev-java/typesafe-config:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/zip
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+JAVA_SRC_DIR="src/main"
+
+JAVA_GENTOO_CLASSPATH="
+	log4j
+	slf4j-api
+	typesafe-config"
diff --git a/dev-java/mchange-commons/metadata.xml b/dev-java/mchange-commons/metadata.xml
new file mode 100644
index 000000000000..3a0ba11e13d0
--- /dev/null
+++ b/dev-java/mchange-commons/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">swaldman/mchange-commons-java</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/mersennetwister-0_pre23765-r1 b/dev-java/mersennetwister-0_pre23765-r1
deleted file mode 100644
index 598c89c8814e..000000000000
--- a/dev-java/mersennetwister-0_pre23765-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=source? ( app-arch/zip ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Modified MersenneTwister java port for Freenet
-EAPI=5
-HOMEPAGE=http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/mersennetwister-0_pre23765.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e91ad9292fe06c848fe998664b0a68e9
diff --git a/dev-java/mersennetwister/Manifest b/dev-java/mersennetwister/Manifest
new file mode 100644
index 000000000000..363319b8aaf2
--- /dev/null
+++ b/dev-java/mersennetwister/Manifest
@@ -0,0 +1,3 @@
+DIST mersennetwister-0_pre23765.tar.bz2 4974 BLAKE2B 3a609f7319f365234ebac8ae7b9accd447b9a506cf7cbf45c59bb2c44099e3ee780ea7754db91f96ff6f33fa84f65f20acda58d058aba30345114808ca90e65d SHA512 3c3b970da3ddc3a0b7fda299916781551867b6ce3c8ecb1f89670783d4d51e2681b07c6b2dfc15e11a03c8b949f4880b0bf1511dde2cb4ad0600688809d38e46
+EBUILD mersennetwister-0_pre23765-r1.ebuild 485 BLAKE2B c72a4625e3e19505172f71e403ce8ae928c6561e9b47e6b4cdb15087f84fa199de27cd3cfdd8d41f549210f788ad7415e4aaff620905dbc942c602112a478dce SHA512 8793bfbed4be02fda5edc8455e544ba4eafec8ab3a6af29e1cf39672271b92db4a3520f6833a278100e05ebe9a13de2bc484717a240db5deae85f061345925f3
+MISC metadata.xml 352 BLAKE2B 8390000455654697f473905c14903172230b9667fd16c4db74dd32643b096cb7c8efa21f8614b30d676fb32e052a76c613298e2a28c362d6135f61a4fe27c242 SHA512 a3c6ce3cd97b39644238700277dd416e1ee79df975184de3429810ca4d77f7160112adef6a9b56f77243a003187f6642798b278cf8501d55da766ccfbaa861cf
diff --git a/dev-java/mersennetwister/mersennetwister-0_pre23765-r1.ebuild b/dev-java/mersennetwister/mersennetwister-0_pre23765-r1.ebuild
new file mode 100644
index 000000000000..d6c0247fd153
--- /dev/null
+++ b/dev-java/mersennetwister/mersennetwister-0_pre23765-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Modified MersenneTwister java port for Freenet"
+HOMEPAGE="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND="
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.6"
diff --git a/dev-java/mersennetwister/metadata.xml b/dev-java/mersennetwister/metadata.xml
new file mode 100644
index 000000000000..bc74090b9d62
--- /dev/null
+++ b/dev-java/mersennetwister/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/metadata-extractor-2.8.1 b/dev-java/metadata-extractor-2.8.1
deleted file mode 100644
index c05ad4db262d..000000000000
--- a/dev-java/metadata-extractor-2.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/xmpcore:0 >=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Access the metadata in digital images and video via a simple Java API
-EAPI=5
-HOMEPAGE=http://www.drewnoakes.com/code/exif/
-IUSE=examples test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-java/xmpcore:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/drewnoakes/metadata-extractor/archive/2.8.1.tar.gz -> metadata-extractor-2.8.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ea22e4a9a121838d920895f3331e364c
diff --git a/dev-java/metadata-extractor/Manifest b/dev-java/metadata-extractor/Manifest
new file mode 100644
index 000000000000..02f5bb7a0153
--- /dev/null
+++ b/dev-java/metadata-extractor/Manifest
@@ -0,0 +1,3 @@
+DIST metadata-extractor-2.8.1.tar.gz 3132397 BLAKE2B 919a0bdb04304255efbe3cc39def8c8d6440334853e840acaf5c2c51f4eec53860f0abb5d2c99d26c8865c846270f5a331372cebce7cdf1fea9831e3701afe41 SHA512 4e9fe88be4112fbf9ce481e7fd3b3a7c9544d1d5b1ebd646d2c6e2a2a1fe2d53a4b80ab859fe5e277c3e72f5e035aa46d7af7a953a182f5b8215edf9cde99974
+EBUILD metadata-extractor-2.8.1.ebuild 1179 BLAKE2B 30e087e1e06bcb51f6ecc53def755d7984da880b6fd63e46fccbd159716d1737d82f82c96a723264ba5f33dae13fd2199ac0135293b5f2842d201081cc708a8f SHA512 86edd91c93b17f35fb6e62f4fe04a69f27cce096d0470c46be2f3bc02c296104cc80703cd4feb40c1b38d2327ed962076e0a9ddae7a094770b1a9a095ce93aab
+MISC metadata.xml 744 BLAKE2B 6fa67251c20eefea15005ed8e193ea650a9f8b7fa0c4acabd38173ca7fa25be53a45efcf8a1e2da24a43a6513350adb5d714077e13e7069357f01210a61de921 SHA512 a83a4d45bd9abc54687d55cf3aa0756915d261391ec317f27775639b08a8e973f865e9f1885d306a5344630f101ee5cffc0b080b791ace2c35c46812d946c780
diff --git a/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
new file mode 100644
index 000000000000..d92aacdc6272
--- /dev/null
+++ b/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Access the metadata in digital images and video via a simple Java API"
+HOMEPAGE="http://www.drewnoakes.com/code/exif/"
+SRC_URI="https://github.com/drewnoakes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+CDEPEND="dev-java/xmpcore:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="Source"
+JAVA_GENTOO_CLASSPATH="xmpcore"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc {CONTRIBUTING,README}.md
+	use examples && java-pkg_doexamples Samples
+}
+
+src_test() {
+	local DIR=Tests
+	local CP="${DIR}:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find ${DIR} -name "*Test.java")
+	TESTS="${TESTS//Tests\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/metadata-extractor/metadata.xml b/dev-java/metadata-extractor/metadata.xml
new file mode 100644
index 000000000000..9ad285ab6075
--- /dev/null
+++ b/dev-java/metadata-extractor/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		metadata-extractor is a straightforward Java library for reading metadata from image files.
+
+		Metadata metadata = ImageMetadataReader.readMetadata(imagePath);
+
+		With that metadata object, you can iterate or query the various tag values that were read from the image.
+
+		The library understands several formats of metadata, many of which may be present in a single image.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">drewnoakes/metadata-extractor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/metadata.xml b/dev-java/metadata.xml
new file mode 100644
index 000000000000..878473a04601
--- /dev/null
+++ b/dev-java/metadata.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The dev-java category contains libraries and utilities relevant to the
+		Java programming language.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-java enthält Bibliotheken und Werkzeuge für die
+		Programmiersprache Java.
+	</longdescription>
+	<longdescription lang="fi">
+		Kategoria dev-java sisältää kirjastoja ja työkaluja
+		Java-ohjelmointikielen hyödyntämiseen.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-java contiene librerias y utilidades para el lenguaje
+		de programación Java.
+	</longdescription>
+	<longdescription lang="ja">
+		dev-java カテゴリー��Javaプログラミング言語�関連��ライブラリー�
+		ユーティリティ���れ��。
+	</longdescription>
+	<longdescription lang="nl">
+		De dev-java categorie bevat bibliotheken en hulpmiddelen voor het gebruik
+		van de programmeertaal Java.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm dev-java chứa các thư viện và tiện ích liên quan
+		đến ngôn ngữ lập trình Java.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria dev-java contiene librerie ed utilità per il linguaggio Java.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria dev-java contém bibliotecas e utilitários para a
+		linguagem de programação Java.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria dev-java zawiera biblioteki i narzędzia związane z
+		z językiem programowania Java.
+	</longdescription>
+</catmetadata>
+
diff --git a/dev-java/metainf-services-1.6 b/dev-java/metainf-services-1.6
deleted file mode 100644
index 07a9f692eac6..000000000000
--- a/dev-java/metainf-services-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Generates META-INF/services files automatically
-EAPI=5
-HOMEPAGE=http://metainf-services.kohsuke.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f79e64abbaca065377eea9c82b583245
diff --git a/dev-java/metainf-services-1.7 b/dev-java/metainf-services-1.7
deleted file mode 100644
index 9f42af0bfdaf..000000000000
--- a/dev-java/metainf-services-1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Generates META-INF/services files automatically
-EAPI=5
-HOMEPAGE=http://metainf-services.kohsuke.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0f3ab79241926a177e59063f163ace6d
diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
new file mode 100644
index 000000000000..0686ef5971e1
--- /dev/null
+++ b/dev-java/metainf-services/Manifest
@@ -0,0 +1,7 @@
+AUX metainf-services-1.6-build.xml 8356 BLAKE2B 1f73238ca0f06f0a9b31d756313a492333dae4098f93979978eaa369498994671cbeb3da185c3628a013bae0fe2537aa0b55dca14246e982b7a185cfed17a5bd SHA512 22ae17b70e0760553cdc6dd641a79533712c8512a4f43b81a97eadeb674037fc0e1019afe82d7d98dc6e5346c048343ffe7ce747ab81f51a52f555974545a012
+AUX metainf-services-1.7-build.xml 8356 BLAKE2B a9ee4ed2d959885fd2cb81a827f709152ce656f3864af8949ef47fc32fe9932dddac08cdc44887115444069b5852383177b17de162404c6d1c46a073558bcead SHA512 183ea6c131bc9d63172d34966950f6d7eca5aeb4b23e2b9fc4f6045ac2688cc8e2931ab7d1a986c36bedbc0521a7fc13263be3e5cebbf915b07d12c4e6aac5ec
+DIST metainf-services-1.6.tar.gz 5282 BLAKE2B e5d0231bb90e72200780eef67a631146d10281f4a29e61a09c0cabd5a00205974f351445a7cfd88146862c3d84ad5340e2e259f469374a3d4942a4c33744b5fb SHA512 237f37b8eaa384dfd7df6d0a31fa7e5d086c6923c5eb2435317701402b14ba472839d0e49b9ce9da25c265d6e128679f7d637d41439756242ae591d3b15e1108
+DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
+EBUILD metainf-services-1.6.ebuild 577 BLAKE2B d0c9157467fb86df109cb5a10169992c4e0f8dab09d2273d09ec6026b5ad93aaa65a1c78ba4c74301934c77888036877cd9dd1785e3c49bfb3e732416dd59bdc SHA512 0845ce1d6f6f0bc69968361ca533d33b2ca5f87f166ef033117b0a951a597b4bf3bb22baee0101b75c91edca8f7b92130cc1f46459a13494abde838bf6af8bb2
+EBUILD metainf-services-1.7.ebuild 579 BLAKE2B 668c9e89475694915479a2b88bb23eabdc9c8d11828eb8bc1cfb8520da91f23948311653baaee59032445c311d3d1a0cd9ff9e4ca9ce6fdf9675aa1af8a50445 SHA512 2985d856e58088c9051fee25cc2336ff9529529597161e33df7eefdc0158041eeaec073430661f6fa380c0df28fe7f13ed727448d9ce77765cebd80cf44ce81b
+MISC metadata.xml 335 BLAKE2B 6b80ceaeaef798225f8d929e5e86677482395de9bb24ad765759f68e7a788ade7de997d230a35aa92b97145ef7dd0c8d319a9c1c2597149e161adbcdab373947 SHA512 7dda5e5b222befb2e0a0040429d96d8e9bcc721a22576400b0ee16d827011dbbed85edd85383ed3b398564645d94da56ea48fc7aa3c8a65655334df74b8a6f5a
diff --git a/dev-java/metainf-services/files/metainf-services-1.6-build.xml b/dev-java/metainf-services/files/metainf-services-1.6-build.xml
new file mode 100644
index 000000000000..98e53f439d22
--- /dev/null
+++ b/dev-java/metainf-services/files/metainf-services-1.6-build.xml
@@ -0,0 +1,192 @@
+<?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/13/13 1:12 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="metainf-services-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="metainf-services-1.6"/>
+  <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"/>
+  <path id="build.test.classpath"/>
+
+  <!-- ====================================================================== -->
+  <!-- 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.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>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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"/>
+  </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}"/>
+  </target>
+
+</project>
diff --git a/dev-java/metainf-services/files/metainf-services-1.7-build.xml b/dev-java/metainf-services/files/metainf-services-1.7-build.xml
new file mode 100644
index 000000000000..4dd4174c45b4
--- /dev/null
+++ b/dev-java/metainf-services/files/metainf-services-1.7-build.xml
@@ -0,0 +1,192 @@
+<?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/13/13 1:12 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="metainf-services-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="metainf-services-1.7"/>
+  <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"/>
+  <path id="build.test.classpath"/>
+
+  <!-- ====================================================================== -->
+  <!-- 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.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>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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"/>
+  </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}"/>
+  </target>
+
+</project>
diff --git a/dev-java/metainf-services/metadata.xml b/dev-java/metainf-services/metadata.xml
new file mode 100644
index 000000000000..6248f7ab18f2
--- /dev/null
+++ b/dev-java/metainf-services/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">kohsuke/metainf-services</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/metainf-services/metainf-services-1.6.ebuild b/dev-java/metainf-services/metainf-services-1.6.ebuild
new file mode 100644
index 000000000000..28fb9e4748ea
--- /dev/null
+++ b/dev-java/metainf-services/metainf-services-1.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Generates META-INF/services files automatically"
+HOMEPAGE="http://metainf-services.kohsuke.org/"
+SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}-${P}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+}
diff --git a/dev-java/metainf-services/metainf-services-1.7.ebuild b/dev-java/metainf-services/metainf-services-1.7.ebuild
new file mode 100644
index 000000000000..976442a825fb
--- /dev/null
+++ b/dev-java/metainf-services/metainf-services-1.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Generates META-INF/services files automatically"
+HOMEPAGE="http://metainf-services.kohsuke.org/"
+SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}-${P}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+}
diff --git a/dev-java/microba-0.4.4.3-r1 b/dev-java/microba-0.4.4.3-r1
deleted file mode 100644
index 05fc3649fe35..000000000000
--- a/dev-java/microba-0.4.4.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/jgraph:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Swing components for date operations and palettes
-EAPI=6
-HOMEPAGE=https://github.com/tdbear/microba
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-java/jgraph:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/tdbear/microba/archive/0.4.4.3.zip -> microba-0.4.4.3.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c15914077d044c9b72f8a027fc0f258b
diff --git a/dev-java/microba/Manifest b/dev-java/microba/Manifest
new file mode 100644
index 000000000000..590126392253
--- /dev/null
+++ b/dev-java/microba/Manifest
@@ -0,0 +1,3 @@
+DIST microba-0.4.4.3.zip 89737 BLAKE2B 130f6a39f069b0b4e93f352b7fea10abd6eec23b7f0392ad15fa34c198b4dfb46a9b0208322b245f0934e2ff2260661934f958e6216a45c4c69573976f366a2c SHA512 17933578fe101053a1004a1aa0ef342ffa1dc1f2ea2d670fa8aa2523c7d8207bb79e54755e58d0b7ce5ba627ca3b348ac10870718622e818f4097a966acc0a10
+EBUILD microba-0.4.4.3-r1.ebuild 768 BLAKE2B 118819854bb185b357736387a7b016f30a9e2bbd768b93a8b129c2e06854414fb7ce21c08a84bed586f5e9419a7ebc867f878f34c35eb179a3e033a02eedd5b9 SHA512 57501fb0b7b526e150ac60f1d6ff9435500ee771348e63f6487e2d78b4ec7904fca664c9bfbcc91a02e7e9e479af483492c5ecdbb9ebc30528901aa61156cc16
+MISC metadata.xml 367 BLAKE2B 8b77b9e21a7b7ecf7cf4ec5f6038d89099400f34b5400d781657881199a66b76d54b6795b5b32bab132d6eac75c904ec59e02d0024ad8a7c9ba2f8ed23b83e9c SHA512 ff305633c3f8b368c57882d57a545755dacd718071f0e3a00e438c1eac3281057d4572b085cea61ea2ef40574fcd924032529b8267485ae6a5788d594b0305c1
diff --git a/dev-java/microba/metadata.xml b/dev-java/microba/metadata.xml
new file mode 100644
index 000000000000..21819550bc2e
--- /dev/null
+++ b/dev-java/microba/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">microba</remote-id>
+		<remote-id type="github">tdbear/microba</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/microba/microba-0.4.4.3-r1.ebuild b/dev-java/microba/microba-0.4.4.3-r1.ebuild
new file mode 100644
index 000000000000..02c622fbcd24
--- /dev/null
+++ b/dev-java/microba/microba-0.4.4.3-r1.ebuild
@@ -0,0 +1,42 @@
+# 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="Swing components for date operations and palettes"
+HOMEPAGE="https://github.com/tdbear/microba"
+SRC_URI="https://github.com/tdbear/${PN}/archive/${PV}.zip -> ${P}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CP_DEPEND="dev-java/jgraph:0"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+
+DOCS=(
+	change.log.txt
+	readme.txt
+	README.md
+)
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar ${JAVA_SRC_DIR}
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/miglayout-4.0 b/dev-java/miglayout-4.0
deleted file mode 100644
index 2a709451c5a4..000000000000
--- a/dev-java/miglayout-4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=swt? ( dev-java/swt:3.7 ) >=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Easy to use yet very powerful Java Swing layout manager
-EAPI=4
-HOMEPAGE=http://www.miglayout.com/
-IUSE=swt elibc_FreeBSD doc examples source
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=swt? ( dev-java/swt:3.7 ) >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.migcalendar.com/miglayout/versions/4.0/miglayout-4.0-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8c6c0e2531637e38eccb6ba0dcdd002e
diff --git a/dev-java/miglayout/Manifest b/dev-java/miglayout/Manifest
new file mode 100644
index 000000000000..bf2ec51a0595
--- /dev/null
+++ b/dev-java/miglayout/Manifest
@@ -0,0 +1,3 @@
+DIST miglayout-4.0-sources.jar 194675 BLAKE2B 9d0a4fce1b76e49f4a2962fccf323676172fc9fa084060d8b3507031635b7979d8b29ce598a0a484e3707eefdf90721162e67d36be5702e9309ef067fd39aab3 SHA512 27284ceac254707428351fb2451ffd5f2ebd580374df59624bb6af06011f70d87b27849900c2573aff782ebe6d84e1806c18a59741213948f0b238ee5a51ec2f
+EBUILD miglayout-4.0.ebuild 1244 BLAKE2B 2e35fa173ca1956c5656a8e45af706af99c286275c61f944d4048d1298fc86ce2d8d53d18f0d57e2b082f74d3b183137c6e38b994d93cf8ef93155fe8330dc4a SHA512 4d85706df61b695f511ed2a2e197593e692a2492682cdb304c3455bbbd4f9a88b33305e40f6b3af283d30ed029972b79d7d19ad40a92e83a1d87bcd664cc6bcf
+MISC metadata.xml 751 BLAKE2B 2fdfc28e91176b4c7e1dcc4a1d61c491c1e7a5d835fb1bdc89e340db57dcabbf951da958ac0ae728658fffcc6aada76194745282245a066adc8d9c792ac09a49 SHA512 b097936cfa00fa8468489722f2d9557ee93efdf0d9ac852fbcf745814d35b294d0a8b5f559c4aecc62480c6f59e8329013e133a7dc7618c4f665b79c3b03375d
diff --git a/dev-java/miglayout/metadata.xml b/dev-java/miglayout/metadata.xml
new file mode 100644
index 000000000000..34ad0f5b718e
--- /dev/null
+++ b/dev-java/miglayout/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <longdescription lang="en">
+For Java developers writing GUI layouts by hand that wants simplicity, power and automatic per platform fidelity, that are dissatisfied with the current layout managers in Swing, JavaFX and SWT, MigLayout solves your layout problems. User interfaces created with MigLayout is easy to maintain, you will understand how the layout will look like just by looking at the source code.
+  </longdescription>
+  <use>
+    <flag name="swt">Add support for the SWT toolkit.</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/miglayout/miglayout-4.0.ebuild b/dev-java/miglayout/miglayout-4.0.ebuild
new file mode 100644
index 000000000000..95862c4d8e1f
--- /dev/null
+++ b/dev-java/miglayout/miglayout-4.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2
+
+DESCRIPTION="Easy to use yet very powerful Java Swing layout manager"
+HOMEPAGE="http://www.miglayout.com/"
+SRC_URI="http://www.migcalendar.com/miglayout/versions/${PV}/${P}-sources.jar"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="swt"
+
+COMMON_DEP="
+	swt? ( dev-java/swt:3.7 )"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	mv net/miginfocom/{demo,examples} . || die
+	mv demo/* examples || die
+
+	if ! use swt; then
+		rm -r net/miginfocom/swt || die
+	fi
+
+	find net -name '*.java' > sources.lst
+}
+
+src_compile() {
+	local classpath
+	use swt && classpath=( -classpath "$(java-pkg_getjars swt-3.7)" )
+
+	mkdir classes || die
+	ejavac "${classpath[@]}" -d classes @sources.lst || die
+	jar -cf ${PN}.jar -C classes . || die
+
+	if use doc; then
+		javadoc "${classpath[@]}" -author -version -d api @sources.lst || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc api
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc net
+}
diff --git a/dev-java/milton-api-2.7.1.3 b/dev-java/milton-api-2.7.1.3
deleted file mode 100644
index 4fe91c17245b..000000000000
--- a/dev-java/milton-api-2.7.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-codec:0 dev-java/commons-io:1 dev-java/slf4j-api:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Milton WebDav library
-EAPI=5
-HOMEPAGE=http://milton.io
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-codec:0 dev-java/commons-io:1 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://milton.io/maven/io/milton/milton-api/2.7.1.3/milton-api-2.7.1.3-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d4b3c84f8f717269c5ecf3079bba222a
diff --git a/dev-java/milton-api/Manifest b/dev-java/milton-api/Manifest
new file mode 100644
index 000000000000..0b6e68af29c5
--- /dev/null
+++ b/dev-java/milton-api/Manifest
@@ -0,0 +1,3 @@
+DIST milton-api-2.7.1.3-sources.jar 240367 BLAKE2B 9c6ff4484336b5dc2d8f4506398d4e522cbad102473f6a2fb59fad8b98c6154a4b09c18378adceaa698a9db0bc495dd1b83fcc93c5afcd153876e52a4df99e5f SHA512 9d73e830a4c62b872fe756679158a961d6160016cc6db6915dd17f65f9ca6008cf7f451aae71beb735b24c7b0872b8b672f53f4a0ecb1279d9572e1908fd5f08
+EBUILD milton-api-2.7.1.3.ebuild 612 BLAKE2B 851a3f42c8632288835b25f69bb7682d9fe75272e91a4552ff82c8f131ba047a457753a1759f440fd26fde6419112b1102af08d3fdbfbda2d5fc0aeef642defd SHA512 201dc2312ea3d727d56884f0c06ea4656b5fe6830371f201284fcc3725ad0190f9223d2cfa1dd2746bb960dd6e63ae34ee3616535a4ac065584d660054765507
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/milton-api/metadata.xml b/dev-java/milton-api/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/milton-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/milton-api/milton-api-2.7.1.3.ebuild b/dev-java/milton-api/milton-api-2.7.1.3.ebuild
new file mode 100644
index 000000000000..72136a1b758f
--- /dev/null
+++ b/dev-java/milton-api/milton-api-2.7.1.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Milton WebDav library"
+HOMEPAGE="http://milton.io"
+SRC_URI="http://milton.io/maven/io/milton/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/commons-codec:0
+	dev-java/commons-io:1
+	dev-java/slf4j-api:0
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="commons-codec,commons-io-1,slf4j-api"
diff --git a/dev-java/milton-mail-api-2.7.1.3 b/dev-java/milton-mail-api-2.7.1.3
deleted file mode 100644
index ba3a4828c342..000000000000
--- a/dev-java/milton-mail-api-2.7.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/slf4j-api:0 dev-java/milton-api:0 dev-java/oracle-javamail:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Milton WebDav library
-EAPI=5
-HOMEPAGE=http://milton.io
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/slf4j-api:0 dev-java/milton-api:0 dev-java/oracle-javamail:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://milton.io/maven/io/milton/milton-mail-api/2.7.1.3/milton-mail-api-2.7.1.3-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=eb55e47f331d0e1af496a79600fab21f
diff --git a/dev-java/milton-mail-api/Manifest b/dev-java/milton-mail-api/Manifest
new file mode 100644
index 000000000000..f39906a9f8b4
--- /dev/null
+++ b/dev-java/milton-mail-api/Manifest
@@ -0,0 +1,3 @@
+DIST milton-mail-api-2.7.1.3-sources.jar 34106 BLAKE2B 3307f0bbc700c529d1988648d1aab306dbefe6b5c6ca78d9706b0342b6f122836d05de99971d67c2c99bfdd07014f85307b8a87d97ef85337dbc8096fc4a289a SHA512 c0b7f7d62b54f996f42c44e8b28eeaee8a76e8990be5a9894a0f3b2daead699e78442c5cf96a272f71a54536c87247f366f10f3aa2c3adb9d4870253ec8c3b67
+EBUILD milton-mail-api-2.7.1.3.ebuild 619 BLAKE2B d6840aaf27a1f52ee31978d12bb40099c59c5fd747675cf3bf65ba37c698fb3b00e30d238ddf6b39c7f20b3853d0aa72bd0ecdc3d80199b0cb27fe3a6cf2fa5f SHA512 2d29a0622006e52609b2ac50eddca9ee2ff1debb662c1a1c30f36051067a64f2be3214a20e1d006385d07cb03a891c4a549ae1febc790abe2759fbcd495e037a
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/milton-mail-api/metadata.xml b/dev-java/milton-mail-api/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/milton-mail-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild b/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
new file mode 100644
index 000000000000..13bf1e501a5a
--- /dev/null
+++ b/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Milton WebDav library"
+HOMEPAGE="http://milton.io"
+SRC_URI="http://milton.io/maven/io/milton/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/slf4j-api:0
+	dev-java/milton-api:0
+	dev-java/oracle-javamail:0
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	slf4j-api
+	milton-api
+	oracle-javamail
+"
diff --git a/dev-java/mimepull-1.8 b/dev-java/mimepull-1.8
deleted file mode 100644
index 227c4ff8b5a4..000000000000
--- a/dev-java/mimepull-1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Pull API for parsing MIME messages
-EAPI=4
-HOMEPAGE=http://java.net/projects/mimepull
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sera/distfiles/mimepull-1.8.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b1cbce45f7451cc7c12d9dd11583db98
diff --git a/dev-java/mimepull-1.9.6-r1 b/dev-java/mimepull-1.9.6-r1
deleted file mode 100644
index dd586d4300be..000000000000
--- a/dev-java/mimepull-1.9.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Pull API for parsing MIME messages
-EAPI=5
-HOMEPAGE=http://java.net/projects/mimepull
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/org/jvnet/mimepull/mimepull/1.9.6/mimepull-1.9.6-sources.jar -> mimepull-1.9.6.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=03be053348f261b7481e8f7de3822a97
diff --git a/dev-java/mimepull/Manifest b/dev-java/mimepull/Manifest
new file mode 100644
index 000000000000..fd7d8aa88805
--- /dev/null
+++ b/dev-java/mimepull/Manifest
@@ -0,0 +1,6 @@
+AUX mimepull-maven-build.xml 9697 BLAKE2B a297e74be1aa6bddf7c15b8601df79246a41d8490677bc555fee4db1a1ee81cfeb48ec5226f071c7869638fd8284309ee8857b4c9909a78fa922c5860bef01a5 SHA512 23ec5dfc06aa518632e9d69ddc6633010f0a41baa73f7a9e8695b8666927a2612b9ba3b31a74e9fae436dabb51657e39f2623acb41da14b3df71a93eb64dfa9e
+DIST mimepull-1.8.tar.bz2 48841 BLAKE2B ebc5ba45cff2d01c3d0960433f3334cd9c2e39bf9a627b41b3682ece4e376fc10ad53b00773cbb91fb66463e0f9d29790eb4f55dbd27c4b29b70a6fc24856c0d SHA512 60de5b888ccdf89ffdeba0a5ccd98e77f7497e57c6b3c71049446dab0293836f8f2b84a39354602e9073fb6fef880dbc11c80323413f8ed15f0a3af68086ae07
+DIST mimepull-1.9.6.jar 68382 BLAKE2B a59c4837dd82fa2a1e67e653870ead62c6db6ede03690eb483724d2a9bdb588e34145eff604b372a417cda12a1f4074741630e47b3acd81f438145c938d04578 SHA512 528eb77d6edbbfb1b1d8aebb617f9d20c84b9c18f7ab763163ea136c3898319519bbfa8a8e204bd0697a4eac9b964eaf3fb2ee214555efcb3da152ebf467ae64
+EBUILD mimepull-1.8.ebuild 953 BLAKE2B 1ffe4e9a41b81eae44414e20c84ea4c570c7f9786bdce7ffa33a81ad92e0a1e66da84f2477706603a0c849eb39504d62719ac5aa125c5d8d90229bcc7707c624 SHA512 ad20b2a6b8abc3d49028f575efe82b69218ba156411fbcbac7400934169d5d41dc54649fba4c35fdc575aa5032f8546da941f15dd0ce8f079e5f7d6998c8469f
+EBUILD mimepull-1.9.6-r1.ebuild 496 BLAKE2B 51f4d6ae0fc26652cc9adb3ecd26e0d72f019ab6d2660b30e368071c7a935a61434fbcaf96274836b05646f2fbd057d68814ed115857e6a601cb20768897d408 SHA512 97fe69a0ce8b215a306347a17655fd156754150a22593262927b0dee1740044239c433478fc6bb44bca14ddb9f2b60872b32cfce81acf65550e8d95faeeda357
+MISC metadata.xml 573 BLAKE2B f056f34e757829704b8efe77f55e2da69d27a7dc086cde47135854469195578f1b9dd3b67638a0379bc30eff764c25269a93560e11e0e12f9d7440308d240f44 SHA512 5ba96c89a6e2e5c29367ec1b5e52ab3abbfa7bdb0d8e1dd2e305980d83de83b4c29d657e5ecb4a9c1eb3804fd8589b5de86e4f34f70b951b14b2ed453a8ef427
diff --git a/dev-java/mimepull/files/mimepull-maven-build.xml b/dev-java/mimepull/files/mimepull-maven-build.xml
new file mode 100644
index 000000000000..af6d5ea93733
--- /dev/null
+++ b/dev-java/mimepull/files/mimepull-maven-build.xml
@@ -0,0 +1,231 @@
+<?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/31/12 11:02 AM                      -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="mimepull-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property name="maven.build.finalName" value="mimepull"/>
+  <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.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath"/>
+  <path id="build.test.classpath">
+  </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>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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"/>
+  </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">
+  </target>
+
+</project>
diff --git a/dev-java/mimepull/metadata.xml b/dev-java/mimepull/metadata.xml
new file mode 100644
index 000000000000..b06e421248fc
--- /dev/null
+++ b/dev-java/mimepull/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		This provides a streaming API to access attachments parts in a MIME message.
+		Often times, a large MIME message cannot be loaded into memory. Hence the
+		whole message or attachment parts are written to a file system and access to
+		the attachment parts is provided using those files.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/mimepull/mimepull-1.8.ebuild b/dev-java/mimepull/mimepull-1.8.ebuild
new file mode 100644
index 000000000000..61e403db28c5
--- /dev/null
+++ b/dev-java/mimepull/mimepull-1.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Pull API for parsing MIME messages"
+HOMEPAGE="http://java.net/projects/mimepull"
+# svn export https://svn.java.net/svn/mimepull~svn/tags/mimepull-1.8 mimepull-1.8
+# tar cjf mimepull-1.8.tar.bz2 mimepull-1.8
+SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5
+	test? ( dev-java/ant-junit:0 )"
+
+java_prepare() {
+	find -name '*.class' -exec rm -v {} + || die
+
+	cp "${FILESDIR}"/${PN}-maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/mimepull/mimepull-1.9.6-r1.ebuild b/dev-java/mimepull/mimepull-1.9.6-r1.ebuild
new file mode 100644
index 000000000000..301cfe14b421
--- /dev/null
+++ b/dev-java/mimepull/mimepull-1.9.6-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Pull API for parsing MIME messages"
+HOMEPAGE="http://java.net/projects/mimepull"
+SRC_URI="https://repo1.maven.org/maven2/org/jvnet/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=virtual/jdk-1.7"
+
+RDEPEND="
+	>=virtual/jre-1.7"
diff --git a/dev-java/mina-core-1.1.7-r1 b/dev-java/mina-core-1.1.7-r1
deleted file mode 100644
index e12d99369b1e..000000000000
--- a/dev-java/mina-core-1.1.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/slf4j-api:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache MINA Project
-EAPI=6
-HOMEPAGE=https://mina.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/mina-core-1.1.7-sources.jar -> mina-core-1.1.7.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=98769e4e61485abd80f237ae8a0ef377
diff --git a/dev-java/mina-core-2.0.7-r1 b/dev-java/mina-core-2.0.7-r1
deleted file mode 100644
index baa91e537113..000000000000
--- a/dev-java/mina-core-2.0.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/slf4j-api:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache MINA Project
-EAPI=6
-HOMEPAGE=https://mina.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/mina/mina/2.0.7/apache-mina-2.0.7-src.tar.bz2 -> mina-core-2.0.7.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=14c41ac8c505805bd63ac3714ade108c
diff --git a/dev-java/mina-core/Manifest b/dev-java/mina-core/Manifest
new file mode 100644
index 000000000000..0ac954223fd6
--- /dev/null
+++ b/dev-java/mina-core/Manifest
@@ -0,0 +1,5 @@
+DIST mina-core-1.1.7.jar 272148 BLAKE2B 08017722d3e85f233725c0f3495372d4c189a18bea346ff56ab2911dd35fa65df3697101a577424c8702b4fe52dee2701a13bdb2a90f187ff9df0f038fdfa02e SHA512 44f2f94aa356ce1b4ac0379ecec7b76b15210e54314c911bd8ba6d48910415363c9a34dc50e29b8e04ad08a371398ad9e2a00065a44b71c25caa3ef14a72b832
+DIST mina-core-2.0.7.tar.bz2 1953751 BLAKE2B 973e7d67f2328a8bc9fec31f693280b7f640fc3856912e7186b9c7f1d4b506303c4857304f26138a07b0cc10b6e6ff7516be504388980e4042f0ac450ddb5fbd SHA512 406f5fe9c389dc0a2ebe602207e1c914fee308368d5a1e15815ae4c160a986a30a453a1bfb4e010452de87aa28a6817c02f0b5a669ad272fdf603084e994e57e
+EBUILD mina-core-1.1.7-r1.ebuild 530 BLAKE2B 01a568320f9d8a3dca8ae5d92c95c4b3bc66f7b48f82e7752014b6b07b0480b2ab3cc348e7a1e6db44c6858a85bfa349da4900911d6fb1dd18964b84f17b579f SHA512 8867bcc913463498f2f36f336ebab3e33c5a0f52c40ca0d20215980a4ab05713767f4db520952626368ee57cac836affdf86bef0ae38d976a84640368fff2fa5
+EBUILD mina-core-2.0.7-r1.ebuild 705 BLAKE2B edf158c8b1ad9049fcb8e447c9957f410a94808071c0117f83d6aadac678ba54c0bb83d7f336ea7e2701cd5c3e7a25c4104e33577e66d181516e3c6793903ff9 SHA512 6f920cfeae008ea27a2e6d62dcc68d89f3d1d6f44c1bbc7b844028acac5235b24fbf4b38f9669b05214eec626cc7877c5ef8b48f72c5821fea340f49c167a54d
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/mina-core/metadata.xml b/dev-java/mina-core/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/mina-core/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/mina-core/mina-core-1.1.7-r1.ebuild b/dev-java/mina-core/mina-core-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..46dc34c23318
--- /dev/null
+++ b/dev-java/mina-core/mina-core-1.1.7-r1.ebuild
@@ -0,0 +1,29 @@
+# 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="Apache MINA Project"
+HOMEPAGE="https://mina.apache.org/"
+SRC_URI="mirror://gentoo/${P}-sources.jar -> ${P}.jar"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+CDEPEND="dev-java/slf4j-api:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="slf4j-api"
diff --git a/dev-java/mina-core/mina-core-2.0.7-r1.ebuild b/dev-java/mina-core/mina-core-2.0.7-r1.ebuild
new file mode 100644
index 000000000000..abe95666b3f3
--- /dev/null
+++ b/dev-java/mina-core/mina-core-2.0.7-r1.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+MY_P="apache-mina-${PV}"
+
+DESCRIPTION="Apache MINA Project"
+HOMEPAGE="https://mina.apache.org/"
+SRC_URI="mirror://apache/mina/mina/${PV}/${MY_P}-src.tar.bz2 -> ${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+CDEPEND="dev-java/slf4j-api:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="slf4j-api"
+
+JAVA_SRC_DIR="my_src"
+
+src_prepare() {
+	default
+	mkdir my_src || die
+	mv src/mina-core/src/main/java/org my_src || die
+}
diff --git a/dev-java/minlog-1.2 b/dev-java/minlog-1.2
deleted file mode 100644
index c23947c44705..000000000000
--- a/dev-java/minlog-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Minimal overhead Java logging
-EAPI=5
-HOMEPAGE=https://github.com/EsotericSoftware/minlog/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://minlog.googlecode.com/files/minlog-1.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=552e56123f25f09f775f28c212a7e6f3
diff --git a/dev-java/minlog/Manifest b/dev-java/minlog/Manifest
new file mode 100644
index 000000000000..9674588a7e3d
--- /dev/null
+++ b/dev-java/minlog/Manifest
@@ -0,0 +1,3 @@
+DIST minlog-1.2.zip 19766 BLAKE2B e7bbbe5c2aba1bd44ffa793c397061cbae30bdbcc3e1ce7c7293f05ec8a35e898ab52e1dc4c953cda114002a143a503188eff2f33a40303549afa3b257b8208d SHA512 79c341288fc4c18ceb307011b3591e239d00a356fc78379449bbcc4d93b0355665a4425dd31a23d83c79eeebf19a591b9d3fb34d6107a4a503125dc683b4519c
+EBUILD minlog-1.2.ebuild 494 BLAKE2B f91b4f0339e6b58a482d895923593082f3be5d3497c43f9615c2d973c329303d79f20dbaae9b0fa1875ae999a78790da5ffcecc90532986a23d0ab1dbaa9d338 SHA512 c6d39530eb2ac19a33a099960e7ab22a0aac4888b4f16fb7495f766563a58833dbe025db3e49d226d81cc9355e081bc471434b0061b00ac93c146225820d1730
+MISC metadata.xml 324 BLAKE2B 74203b4ba970f32333e2af69015245ab2f3555ed3f5602d8e2cbf93115f5b306946c37b96c167de0b7ff63b25ffa3f8827621a1a1f9474b94b5b19ac5e361706 SHA512 f760fad4ddc817e31066df080e17a53c44cacd3434bb5de1d1f9ec7ccf82acc1e3f2a40b2dd4ac34a31f609cd69fcbcd1555996130d24a77107978653758f444
diff --git a/dev-java/minlog/metadata.xml b/dev-java/minlog/metadata.xml
new file mode 100644
index 000000000000..d27e594b9ae4
--- /dev/null
+++ b/dev-java/minlog/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">EsotericSoftware/minlog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/minlog/minlog-1.2.ebuild b/dev-java/minlog/minlog-1.2.ebuild
new file mode 100644
index 000000000000..afa340f3c6df
--- /dev/null
+++ b/dev-java/minlog/minlog-1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Minimal overhead Java logging"
+HOMEPAGE="https://github.com/EsotericSoftware/minlog/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.5"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.5"
+
+S="${WORKDIR}/${PN}"
diff --git a/dev-java/mockito-1.9.5-r1 b/dev-java/mockito-1.9.5-r1
deleted file mode 100644
index b5ae1e1d6398..000000000000
--- a/dev-java/mockito-1.9.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip dev-java/junit:4 dev-java/objenesis:0 dev-java/hamcrest-core:0 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A mocking framework for Java
-EAPI=5
-HOMEPAGE=https://github.com/mockito/mockito
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.5 dev-java/junit:4 dev-java/objenesis:0 dev-java/hamcrest-core:0 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://mockito.googlecode.com/files/mockito-1.9.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9ef0046553923e499e88302f35743334
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
new file mode 100644
index 000000000000..e786ecd10ef1
--- /dev/null
+++ b/dev-java/mockito/Manifest
@@ -0,0 +1,3 @@
+DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08d57d633d95a1eaba17f52d4306603f50f332df360d0a4880c85c65bad4503503df0acad8f7b437694a2b887 SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51
+EBUILD mockito-1.9.5-r1.ebuild 844 BLAKE2B b8ed4f84aaece678fcf10167dc29df664f5d484a302cdb560f64337833bfc93c26094550be04adfbe69e49d35c5c7b794c02e82886ee5a0cfe25b5e0f7031d8b SHA512 2caa56ec15407184643ebd9204d19c2536773c371bfad8e936012957b84f79612fc75ef96c60b0f3756a2e4643d215c058f0f91a479c187242fa40c51b96b74f
+MISC metadata.xml 368 BLAKE2B b76278732bfbed14a8ec62d1b339971836efbaf3565e6b93dd61a09c18749fa30c815c283f633321cf0ddbc818ccfbeb92fed293f6e43137eeb2d3b8efa9ed04 SHA512 371a02c769989a221b89405e852f627a4cd9953f1529b8e6890056b6ca83e2526a82752ab3ed9b36f40a3d88d460360e20762d2a4cdcba359116c036f1d7cc7b
diff --git a/dev-java/mockito/metadata.xml b/dev-java/mockito/metadata.xml
new file mode 100644
index 000000000000..37aa3d0ae1cc
--- /dev/null
+++ b/dev-java/mockito/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">mockito</remote-id>
+		<remote-id type="github">mockito/mockito</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/mockito/mockito-1.9.5-r1.ebuild b/dev-java/mockito/mockito-1.9.5-r1.ebuild
new file mode 100644
index 000000000000..bb99d5cb44b6
--- /dev/null
+++ b/dev-java/mockito/mockito-1.9.5-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A mocking framework for Java"
+HOMEPAGE="https://github.com/mockito/mockito"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+
+IUSE=""
+
+CDEPEND="dev-java/junit:4
+	dev-java/objenesis:0
+	dev-java/hamcrest-core:0
+	dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="junit-4,objenesis,hamcrest-core,ant-core"
+
+src_unpack() {
+	unpack ${A}
+	unzip "${S}"/sources/${PN}-core-${PV}-sources.jar -d src/ || die
+}
+
+java_prepare() {
+	find "${S}" -name "*.jar" -delete || die
+}
diff --git a/dev-java/mojarra-2.2.12-r1 b/dev-java/mojarra-2.2.12-r1
deleted file mode 100644
index c6a84b4cd359..000000000000
--- a/dev-java/mojarra-2.2.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/glassfish-persistence:0 dev-java/glassfish-ejb-api:0 java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-spec:0 dev-java/tomcat-jstl-impl:0 dev-java/validation-api:1.0 dev-java/javax-inject:0 dev-java/cdi-api:1.2 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Mojarra - GlassFish's Implementation for JavaServer Faces API
-EAPI=5
-HOMEPAGE=https://javaserverfaces.dev.java.net/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 dev-java/glassfish-persistence:0 dev-java/glassfish-ejb-api:0 java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-spec:0 dev-java/tomcat-jstl-impl:0 dev-java/validation-api:1.0 dev-java/javax-inject:0 dev-java/cdi-api:1.2 >=dev-java/java-config-2.2.0-r3
-SLOT=2.2
-SRC_URI=https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.2.12/javax.faces-2.2.12-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=02497fc8ad9a9255f5946dcddbf4904f
diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
new file mode 100644
index 000000000000..1134b1514da2
--- /dev/null
+++ b/dev-java/mojarra/Manifest
@@ -0,0 +1,4 @@
+AUX mojarra-2.2.12-Util.java.patch 1196 BLAKE2B ce5eefa43f1531a2ae0f2bec2644c25daee9529f972eed974ac3b5ca2c40248a2e440a690eb9240069fd39795099a4e9df18c0cde8b2e2a2b4080e510297797d SHA512 b3f2f1fb0f7541eb5fae494d3a0f254553aaed7de2016f5bf8f4433e88ce9cfb59cae6d6e3e169040b77ba1ae9038beaaae2591610a71f0fc194ac6fba295732
+DIST javax.faces-2.2.12-sources.jar 3105808 BLAKE2B 347daf8b44171a94e7ebf09c8ad22b1b20255355f589def6c537c49e37275605caf80f219be21dd8561597c94c15e6fe2cc0c0c713297ceaf8d6be669b6a6e78 SHA512 b2bc2ce38d72af38a4b2fdb5aec790600ca41a5d7f6340bf6be671a901c9fe664d50d9d13f021694e85e0e145a2031e2d8b61dd6d6ccebb544f2512a91ff670a
+EBUILD mojarra-2.2.12-r1.ebuild 1238 BLAKE2B 17c0a8b66fdbe8dcf56594ba2675508c6079715f01bc70a2f5ddf9ad32f5168b449976bd3b77d7226d3f4cd3aa99dd5d25f209f3f3e286cf2cd48c82a0386e94 SHA512 4453e29687ecd426d1df64e8e010ed4629d7ff9e6faeadbcb6daac24dfc578cd93192ab1e45443a83dfa94e5f144c2cb1fa6602be17bb3ccefbad8140526724f
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch b/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch
new file mode 100644
index 000000000000..23033f652969
--- /dev/null
+++ b/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch
@@ -0,0 +1,25 @@
+--- src/com/sun/faces/util/Util.java.orig	2015-09-03 14:43:30.953486000 +0000
++++ src/com/sun/faces/util/Util.java	2015-09-03 14:43:57.692486000 +0000
+@@ -354,13 +354,15 @@
+         // as the same adapter in a standalone program works as one might expect.
+         // So, for now, if the classname starts with '[', then use Class.forName()
+         // to avoid CR 643419 and for all other cases, use ClassLoader.loadClass().
+-        if (loader.getClass() == com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) {
+-            if (name.charAt(0) == '[') {
+-                return Class.forName(name, true, loader);
+-            } else {
+-                return loader.loadClass(name);
+-            }
+-        }        
++        //
++        // Disable Groovy support.
++        // if (loader.getClass() == com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) {
++        //     if (name.charAt(0) == '[') {
++        //         return Class.forName(name, true, loader);
++        //     } else {
++        //         return loader.loadClass(name);
++        //     }
++        // }        
+         return Class.forName(name, true, loader);
+     }
+ 
diff --git a/dev-java/mojarra/metadata.xml b/dev-java/mojarra/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/mojarra/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
new file mode 100644
index 000000000000..735e0e7b91bc
--- /dev/null
+++ b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API"
+HOMEPAGE="https://javaserverfaces.dev.java.net/"
+SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/${PV}/javax.faces-${PV}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="2.2"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+CDEPEND="dev-java/glassfish-persistence:0
+	dev-java/glassfish-ejb-api:0
+	java-virtuals/servlet-api:3.0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/tomcat-jstl-impl:0
+	dev-java/validation-api:1.0
+	dev-java/javax-inject:0
+	dev-java/cdi-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="
+	glassfish-persistence
+	glassfish-ejb-api
+	tomcat-jstl-spec
+	tomcat-jstl-impl
+	validation-api-1.0
+	cdi-api-1.2
+	servlet-api-3.0
+	javax-inject
+"
+
+java_prepare() {
+	mkdir src || die
+	mv * src
+
+	# We *MUST* bump Groovy to 2.4 at some point
+	# to make this stuff work correctly.
+	rm -v src/com/sun/faces/scripting/groovy/GroovyHelperImpl.java || die
+	epatch "${FILESDIR}"/${P}-Util.java.patch
+}
diff --git a/dev-java/moshi-1.1.0 b/dev-java/moshi-1.1.0
deleted file mode 100644
index 1ba601736843..000000000000
--- a/dev-java/moshi-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/assertj-core:2 dev-java/junit:4 dev-java/okio:0 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A modern JSON library for Android and Java
-EAPI=5
-HOMEPAGE=https://github.com/square/moshi
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/assertj-core:2 dev-java/junit:4 dev-java/okio:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/square/moshi/archive/moshi-parent-1.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=91889ce21b18d9125a2a35d34dd3bdd3
diff --git a/dev-java/moshi/Manifest b/dev-java/moshi/Manifest
new file mode 100644
index 000000000000..b48023bd25cd
--- /dev/null
+++ b/dev-java/moshi/Manifest
@@ -0,0 +1,3 @@
+DIST moshi-parent-1.1.0.tar.gz 85572 BLAKE2B 22a2192c47142591f1a3bc56525bd715247b94c61c0e97f2db942ddca1cdba914ef5eab61d19632f4eccd02425f29ad27f288e030e0f6af238095c75a6e20a9f SHA512 58557f20a84f4b59f0b603b6e6dbe803285f5c066451dac72e9926ca57131b62fddd222b995dc233e1c7120fc7787fa5b2c6ddab33d0b8e69b8ea1147ca06549
+EBUILD moshi-1.1.0.ebuild 775 BLAKE2B 79e14da0a7eaec3b481d8a31846a67ef70e7160607c625727a440ca19bfde14ed1e0fcddbc318f71d2422a1de153454d0d7b9a014db6360900e4eaa36720c1d7 SHA512 cca48d24345b1319ba26bd7b116af6b952bb02445fa8f451929f4831ee00d3b06b00f321bd09d0f30826b745fe9226b07835ba94d11e9c79bef0223299b806d5
+MISC metadata.xml 313 BLAKE2B cae00b304b105c11f30504a2420e28691eeb401827ce409f4dde52c3b53955ecf576360f147b01ecf401411cbfe68a0cdae5934f2385e9f1f914ce8a7baeaf7e SHA512 32266aa32b392436df5057ece8975a6898e3093cdd247e31f12d17b6a3cae58fc39e15d9460aa7d1aff53980e2b0dfbbedd33692bd9c174ff297b1b656658694
diff --git a/dev-java/moshi/metadata.xml b/dev-java/moshi/metadata.xml
new file mode 100644
index 000000000000..b2097aa1b4c9
--- /dev/null
+++ b/dev-java/moshi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">square/moshi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/moshi/moshi-1.1.0.ebuild b/dev-java/moshi/moshi-1.1.0.ebuild
new file mode 100644
index 000000000000..5348dfbdb2f7
--- /dev/null
+++ b/dev-java/moshi/moshi-1.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-parent-${PV}"
+
+DESCRIPTION="A modern JSON library for Android and Java"
+HOMEPAGE="https://github.com/square/moshi"
+SRC_URI="https://github.com/square/${PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/assertj-core:2
+	dev-java/junit:4
+	dev-java/okio:0
+"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="assertj-core-2,junit-4,okio"
+
+JAVA_SRC_PATH="${WORKDIR}/${MY_P}/${PN}/src"
+
+src_prepare() {
+	# Some don't compile, not putting effort into it now
+	rm -rf "${WORKDIR}/${PN}-${MY_P}/${PN}"/src/test
+}
diff --git a/dev-java/msv-20130601 b/dev-java/msv-20130601
deleted file mode 100644
index eb580382f8dc..000000000000
--- a/dev-java/msv-20130601
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xsdlib:0 app-arch/unzip >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Multi-Schema XML Validator, a Java tool for validating XML documents
-EAPI=5
-HOMEPAGE=https://msv.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD Apache-2.0
-RDEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xsdlib:0 dev-java/xerces:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://search.maven.org/remotecontent?filepath=net/java/dev/msv/msv-core/2013.6.1/msv-core-2013.6.1-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=47e91d4a8f08d3d715963104af62b580
diff --git a/dev-java/msv/Manifest b/dev-java/msv/Manifest
new file mode 100644
index 000000000000..b9644aabbc26
--- /dev/null
+++ b/dev-java/msv/Manifest
@@ -0,0 +1,3 @@
+DIST msv-core-2013.6.1-sources.jar 1011944 BLAKE2B 474d8a45bc5f16ec76dbe853a835b66cd1d733973ffad0dd5e0a653d349f075e22a72d29d91da312a9a133218f4187ece15fd66b19dc34bc00cdea72b95a5929 SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a
+EBUILD msv-20130601.ebuild 1194 BLAKE2B 271f5fc1729666b46b4d63381060bfa8181673ee3735a6962be6f7eaa3fac4c1e401601da0253396b0bfd3a56b460dc1e953cede5bb5c08627cc8f1e6d421c83 SHA512 138b4479514aec6c7b29e970bf90a50a7c063a60e43613dcb62cc0139495a597a326f0f46252f92390c476bcd00f55d3e9522a0f0e6c43c40652b57be70317c7
+MISC metadata.xml 401 BLAKE2B fbb5715feb77351d3edfb71b51f026f5c858300cb966a8d5cdfa4f3534c03e0de977703263015e5e60bc2928a2060e3da8684f5442f22c4e119e4d1616c82ac1 SHA512 cb176f670e860f0fb7612d313b9fe2fe1c00d5f08de531d7ef93f42204bb0dd537e6b51728b8e068cf571e24aaa7488441e0743724c8d54357f1aeee5ca10560
diff --git a/dev-java/msv/metadata.xml b/dev-java/msv/metadata.xml
new file mode 100644
index 000000000000..5793ba043a01
--- /dev/null
+++ b/dev-java/msv/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription>
+The Sun Multi-Schema XML Validator (MSV) is a Java technology tool
+to validate XML documents against several kinds of XML schemata.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/msv/msv-20130601.ebuild b/dev-java/msv/msv-20130601.ebuild
new file mode 100644
index 000000000000..a1bf53084537
--- /dev/null
+++ b/dev-java/msv/msv-20130601.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PV="${PV:4:2}.${PV:6}"
+MY_PV="${PV:0:4}.${MY_PV//0}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Multi-Schema XML Validator, a Java tool for validating XML documents"
+HOMEPAGE="https://msv.java.net/"
+SRC_URI="http://search.maven.org/remotecontent?filepath=net/java/dev/${PN}/${PN}-core/${MY_PV}/${PN}-core-${MY_PV}-sources.jar"
+LICENSE="BSD Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND="dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0
+	dev-java/xsdlib:0"
+
+RDEPEND="${CDEPEND}
+	dev-java/xerces:2
+	>=virtual/jre-1.5"
+
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.5"
+
+JAVA_GENTOO_CLASSPATH="iso-relax,relaxng-datatype,xsdlib"
+JAVAC_ARGS="-XDignore.symbol.file"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" . ! -path "*/doc-files/*" ! -name "*.html"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-dependency xerces-2
+	java-pkg_dolauncher "${PN}" --main com.sun.msv.driver.textui.Driver
+}
diff --git a/dev-java/myfaces-api-2.2.8 b/dev-java/myfaces-api-2.2.8
deleted file mode 100644
index 29c2cdfc95b0..000000000000
--- a/dev-java/myfaces-api-2.2.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/cdi-api:1.2 dev-java/javax-inject:0 dev-java/tomcat-jstl-spec:0 dev-java/validation-api:1.0 dev-java/tomcat-servlet-api:3.0 dev-java/myfaces-builder-annotations:0 >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache MyFaces API - Core package
-EAPI=5
-HOMEPAGE=http://myfaces.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/cdi-api:1.2 dev-java/javax-inject:0 dev-java/tomcat-jstl-spec:0 dev-java/validation-api:1.0 dev-java/tomcat-servlet-api:3.0 dev-java/myfaces-builder-annotations:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://repo1.maven.org/maven2/org/apache/myfaces/core/myfaces-api/2.2.8/myfaces-api-2.2.8-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=26b89410fb72b7aa95d66f159e4643ed
diff --git a/dev-java/myfaces-api/Manifest b/dev-java/myfaces-api/Manifest
new file mode 100644
index 000000000000..3fd699e7447b
--- /dev/null
+++ b/dev-java/myfaces-api/Manifest
@@ -0,0 +1,3 @@
+DIST myfaces-api-2.2.8-sources.jar 949466 BLAKE2B b69911aba18033197a9627205817b7cddb3ab42f7dca8c53beb951790c1cc98cd66ba2bffa8ef9ba6679b0b5d255f302cfd85060476ba90e218493a3b10b67cf SHA512 2c6abd6bbed3d55ff58f18e12cb97dac5232b55b320893097513fdc11c183d52082838a2bdfab035abd927179fb308502440072752cca697cb8ce084a61b3ead
+EBUILD myfaces-api-2.2.8.ebuild 859 BLAKE2B d9d29b02f9cd5eb28fc82f5f4c933177446e98063c43cd3609756b62f6ed900fb45627a0b2a4d236757c8c26a6e622f20acfcdc4236d8cb997d7817a2d9b9e76 SHA512 5700abb88df9d753f6a99404b806ddc4b4cb0b7114836030b6eb395e811ed4776125d2379462ac4b580d0c9ec4a47c3cbb718de0635e6108e00cf21b086837a4
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/myfaces-api/metadata.xml b/dev-java/myfaces-api/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/myfaces-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild b/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild
new file mode 100644
index 000000000000..e9de102fb5de
--- /dev/null
+++ b/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache MyFaces API - Core package"
+HOMEPAGE="http://myfaces.apache.org/"
+SRC_URI="http://repo1.maven.org/maven2/org/apache/myfaces/core/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/cdi-api:1.2
+	dev-java/javax-inject:0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/validation-api:1.0
+	dev-java/tomcat-servlet-api:3.0
+	dev-java/myfaces-builder-annotations:0
+	"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="
+	cdi-api-1.2
+	javax-inject
+	tomcat-jstl-spec
+	validation-api-1.0
+	tomcat-servlet-api-3.0
+	myfaces-builder-annotations
+"
diff --git a/dev-java/myfaces-builder-annotations-1.0.9 b/dev-java/myfaces-builder-annotations-1.0.9
deleted file mode 100644
index 2ed7b452c779..000000000000
--- a/dev-java/myfaces-builder-annotations-1.0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache MyFaces API - Builder annotations package
-EAPI=5
-HOMEPAGE=http://myfaces.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://repo1.maven.org/maven2/org/apache/myfaces/buildtools/myfaces-builder-annotations/1.0.9/myfaces-builder-annotations-1.0.9-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ca97f0a8ca4c5d457592ca3f1e44b31a
diff --git a/dev-java/myfaces-builder-annotations/Manifest b/dev-java/myfaces-builder-annotations/Manifest
new file mode 100644
index 000000000000..0108b449567f
--- /dev/null
+++ b/dev-java/myfaces-builder-annotations/Manifest
@@ -0,0 +1,3 @@
+DIST myfaces-builder-annotations-1.0.9-sources.jar 43051 BLAKE2B 72ea55574c863965465189fb38abfbefed51aec8b260d041b1cbfd8cd97bcdacbf8d2cafcd8589863a2c54f9e6eea7a0858abe35f91a75b160ad23c0a824fac0 SHA512 09bf3f9faaaae0545544b2195c8070689431bf28497afc9e317010243617137528a61be82f47123237e114b1a7f5f174a5e2cc2190abdff8beb5188e38feec04
+EBUILD myfaces-builder-annotations-1.0.9.ebuild 521 BLAKE2B ddc8c26db9c7d85fc6b4e38c6067318c56ae7f56ba1e34333f99ed8b5b1db0e09f0c8e2c4a68df6abc85dedd4167934c363131e591164825c1418a36e4e088a5 SHA512 52a0bef3884068312da90cc95d147e18d308d1b065acea03a8ff99985e797ea5d19a40f4a3cc73b52bc01f17f8351dbe1ab8df184a365f3da72b1b365870e9ba
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/myfaces-builder-annotations/metadata.xml b/dev-java/myfaces-builder-annotations/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/myfaces-builder-annotations/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild b/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild
new file mode 100644
index 000000000000..10d59c6e606f
--- /dev/null
+++ b/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache MyFaces API - Builder annotations package"
+HOMEPAGE="http://myfaces.apache.org/"
+SRC_URI="http://repo1.maven.org/maven2/org/apache/myfaces/buildtools/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/nachocalendar-0.23-r1 b/dev-java/nachocalendar-0.23-r1
deleted file mode 100644
index e04508eb9aae..000000000000
--- a/dev-java/nachocalendar-0.23-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=source? ( app-arch/zip ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Flexible Calendar component to the Java Platform
-EAPI=5
-HOMEPAGE=http://nachocalendar.sourceforge.net/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/nachocalendar/nachocalendar-src-0.23.tar.bz2 -> nachocalendar-0.23.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8eafd41753f5769c1409c33ff856f05a
diff --git a/dev-java/nachocalendar/Manifest b/dev-java/nachocalendar/Manifest
new file mode 100644
index 000000000000..0583ce7685fd
--- /dev/null
+++ b/dev-java/nachocalendar/Manifest
@@ -0,0 +1,3 @@
+DIST nachocalendar-0.23.tar.bz2 412489 BLAKE2B 780189da72bb6c8848ead81896cf19c4e389db7124bf04fdaf25b5d4f1c8023338f2752233491e014e2cea6bf1b59f6381049108a5a5c12ef8b9b2d42efc8b20 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b
+EBUILD nachocalendar-0.23-r1.ebuild 725 BLAKE2B 4e181855eb0919dcb42d0ee53afbea35eea27c72a2c64113e547a8c5fe72dffe0d9b4a104026807166ec07030e537928776d096e482b0e979f15a53bad70625b SHA512 1393f2d591dfcaf270182c0b29cf0bbc877946592e45edcb45c91a498697067d50a7d2bf59255a786d1b2638750f1a90721667cda6a8a488b06cb42dccd52672
+MISC metadata.xml 299 BLAKE2B 0cbcc5093c39a838b2a75b8e3f9d12728fcddd373c32ec73030dbcab073f1010e6dc5d2fc9c8cf49ce220cf0c4dd175640faaaade59f76adc96e91332c998104 SHA512 271b39c2cc289cfe33649fe9b22ac6626d5a66e7c70d1d5bcb3907efbb6a7ba2205d70932a2402b439d5cf1bf1c0880a2ff1da85c21770a1e8648f26073abac3
diff --git a/dev-java/nachocalendar/metadata.xml b/dev-java/nachocalendar/metadata.xml
new file mode 100644
index 000000000000..3a1015d84eae
--- /dev/null
+++ b/dev-java/nachocalendar/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">nachocalendar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild b/dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild
new file mode 100644
index 000000000000..ba1cc419b4cf
--- /dev/null
+++ b/dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Flexible Calendar component to the Java Platform"
+HOMEPAGE="http://nachocalendar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2 -> ${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf src/test || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" resources
+}
diff --git a/dev-java/nailgun-0.7.1-r1 b/dev-java/nailgun-0.7.1-r1
deleted file mode 100644
index 065fcdf7884a..000000000000
--- a/dev-java/nailgun-0.7.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 dev-java/java-getopt:1 dev-java/bcel:0 dev-java/jakarta-oro:2.0 dev-java/log4j:0 app-arch/unzip dev-java/junit:0 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A client, protocol and server for running without incurring JVM startup overhead
-EAPI=2
-HOMEPAGE=http://martiansoftware.com/nailgun/index.html
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 !app-editors/ng >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/nailgun/nailgun-src-0.7.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cdf3707f6b792e4a839a75d7ac112f8d
diff --git a/dev-java/nailgun/Manifest b/dev-java/nailgun/Manifest
new file mode 100644
index 000000000000..ce245eced987
--- /dev/null
+++ b/dev-java/nailgun/Manifest
@@ -0,0 +1,4 @@
+AUX 0.7.1-r1-Makefile.patch 584 BLAKE2B 2699c0ed508069d6600754548dc6496bc99a9779c52d226b8b9e2022dddc049f58beb815ad96f85b1c993f2246f30fac17a3d7c4811c7f87f51ead89e256746e SHA512 818cb35a65902cf325d06c85c4a1d896784e90cb6a770e70b3df55b8e9661c6b4d83ad46c6e8cfc99c4e6d572f1e496ccaccd514b24fc6029211b1fa2cc89de9
+DIST nailgun-src-0.7.1.zip 1489813 BLAKE2B 2acbd23177bfe2af90d3ba1e026b1c7c63110959b23ec34b6a99063327e2eb07ade21725c9078d0beee220d4dd84d85d5d68241a8581785dd55afa1f9c477664 SHA512 51867248179487b042f3fe93585390b972d1d95928f92fc6b342c3ae663696b251fcd074c8042c6ae129947105e2203cb256a987b46dd8499bb3964302f1ccae
+EBUILD nailgun-0.7.1-r1.ebuild 1613 BLAKE2B 4debc9a5bd468785fe46ddb4647e5ffaaf40f044f16a88451f718ad5833b24ccaf1650766feadd71c807a09a6c4c308c2906e4a2dcad7ca9f831de39f8fec146 SHA512 db6298b59d6393f2cdecff18112ccf0199d01e20349e4c955a114921039991449e05e1c3ec7308f4380dd85dfeaa899e54181fbcb23f5ee4991fd48567785cfa
+MISC metadata.xml 628 BLAKE2B 53019a86f797790612eb6f5bc79fe0c48fef1ad9b3ff9fa397bb43c1ff78d2485ee6e6c1e5fe8108c038556d0a89df44e8ed678dad1ed62767a8d1bd18c73cb1 SHA512 0781b073c443cbf166cd2e080dbacd51cff3bb743311acf486b8dc17f0f15a5a65f453b256dd84a32876891fb08578f930d9d2d3448671f670ef4eed3022b85b
diff --git a/dev-java/nailgun/files/0.7.1-r1-Makefile.patch b/dev-java/nailgun/files/0.7.1-r1-Makefile.patch
new file mode 100644
index 000000000000..a38185485578
--- /dev/null
+++ b/dev-java/nailgun/files/0.7.1-r1-Makefile.patch
@@ -0,0 +1,18 @@
+diff -Naur nailgun-0.7.1/Makefile nailgun-0.7.1_patches/Makefile
+--- nailgun-0.7.1/Makefile	2004-11-25 11:00:22.000000000 +1300
++++ nailgun-0.7.1_patches/Makefile	2012-04-19 07:22:16.000000000 +1200
+@@ -5,13 +5,11 @@
+ #
+ # Marty Lamb
+ 
+-CC=gcc
+ WIN32_CC=/usr/local/mingw32/bin/mingw32-gcc
+-CFLAGS=-Wall -pedantic -s -O3
+ 
+ ng: src/c/ng.c
+ 	@echo "Building ng client.  To build a Windows binary, type 'make ng.exe'"
+-	${CC} ${CFLAGS} -o ng src/c/ng.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ng src/c/ng.c
+ 
+ ng.exe: src/c/ng.c
+ 	# any idea why the command line is so sensitive to the order of
diff --git a/dev-java/nailgun/metadata.xml b/dev-java/nailgun/metadata.xml
new file mode 100644
index 000000000000..17b114b5b115
--- /dev/null
+++ b/dev-java/nailgun/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		Nailgun is a client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead. Programs run in the server (which is implemented in Java), and are triggered by the client (written in C), which handles all I/O.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">nailgun</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..53243b83e508
--- /dev/null
+++ b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A client, protocol and server for running without incurring JVM startup overhead"
+HOMEPAGE="http://martiansoftware.com/nailgun/index.html"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.4
+	!app-editors/ng"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/java-getopt:1
+	dev-java/bcel:0
+	dev-java/jakarta-oro:2.0
+	dev-java/log4j:0
+	app-arch/unzip
+	dev-java/junit:0
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+#need jcoverage
+RESTRICT="test"
+
+java_prepare() {
+	rm -vf ng* beansh
+	find . -iname '*.jar' -delete
+
+	epatch "${FILESDIR}/${PV}-r1-Makefile.patch"
+
+	sed -i '/<arg line="ng.exe/d' build.xml || die
+	sed -i 's/depends="test"/depends="compile"/' build.xml || die
+
+	java-pkg_jar-from --into tools/lib --build-only java-getopt-1 \
+		gnu.getopt.jar java-getopt-1.0.10.jar
+	java-pkg_jar-from --into tools/lib --build-only junit junit.jar
+	java-pkg_jar-from --into tools/lib --build-only bcel bcel.jar \
+		bcel-5.1.jar
+	java-pkg_jar-from --into tools/lib --build-only jakarta-oro-2.0 \
+		jakarta-oro.jar jakarta-oro-2.0.8.jar
+	java-pkg_jar-from --into tools/lib --build-only log4j log4j.jar \
+		log4j-1.2.8.jar
+}
+
+src_test() {
+	WANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	dobin ng
+	# Should we have a dolauncher?
+
+	java-pkg_newjar "dist/${P}.jar"
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc src/java/prod/*
+}
diff --git a/dev-java/nanoxml-2.2.3-r4 b/dev-java/nanoxml-2.2.3-r4
deleted file mode 100644
index 588ce477cfee..000000000000
--- a/dev-java/nanoxml-2.2.3-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/sax:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=NanoXML is a small non-validating parser for Java
-EAPI=6
-HOMEPAGE=http://nanoxml.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=ZLIB
-RDEPEND=dev-java/sax:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://pkgs.fedoraproject.org/repo/pkgs/nanoxml/NanoXML-2.2.3.tar.gz/357c7136417ea996cf714278ea84f2df/NanoXML-2.2.3.tar.gz -> nanoxml-2.2.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5dbdd620ebda0c7a941d661b91d713fb
diff --git a/dev-java/nanoxml/Manifest b/dev-java/nanoxml/Manifest
new file mode 100644
index 000000000000..ac86469d24cf
--- /dev/null
+++ b/dev-java/nanoxml/Manifest
@@ -0,0 +1,5 @@
+AUX nanoxml-2.2.3-enum.patch 9487 BLAKE2B 33d1433983f461f50f17a63151b292798036eda70d340ca8d7f139615fc16dda87c6e4d4314952ed8b270a7972ecd06fc1ddda8faa24e505af816c1bf7f0f614 SHA512 cdb5bc356f35e0b1906d2acc6b937ab8102ae34fd688f77e214976417174a3f15c884b1d22715782a19b4c374f9def94d35971ca88b9400c9c28350d3f795769
+AUX nanoxml-2.2.3-lite-enum.patch 2515 BLAKE2B 41f698b9fd685739b181951d1ac022226e5be8e4c4c72078ec4339102f46fb24acd9ba3aa2765f6f9787a9c818bf6c50bc3818835635f48279dc2214a84d284c SHA512 8bb31f737211168bb4a24f2abbd8f4fb78df35bc471116b427b5c2faeb2b1b1710ce5eda793d364a95bd7d7162075f1322dfed4c5a2527c3ae113a8c9a5cb97e
+DIST nanoxml-2.2.3.tar.gz 426111 BLAKE2B ac9980502c8c6ec50c6aebd19c0d08319701a508eea2a58847b804dcb3a3a93ca8d41ee1f08f4ec48527e669fc1695ec945933688516775373458ac7b6564895 SHA512 6800b86039cb555efc05644db65c516fb242d4d081ea612969d6cc52a12ffd7571e012a7afe7962cd61c28b0ebb3b9d94af76f20013f3b4dd7d2aacdc552c6fc
+EBUILD nanoxml-2.2.3-r4.ebuild 875 BLAKE2B 03bff6a5a87cb09ad518fb7d17b95299152af143203c51bf03953261c0a1182168b6900ad94720bc7d6db54e8175cc5aa264f52cbc8e9e41a40ce3ce2392e388 SHA512 2eba557cff7beb1ef4d5d73d75facac6ea5a5980f7432dc60f75bab7b7ac3fe03f2ebc51d5118cdc21dc46732607894a5bd9c6bb167e1dc2c71ea1c29ede82f4
+MISC metadata.xml 313 BLAKE2B f5fa3b22b2233fbfe20819af9612b185c1279d5d6ce3688942d9fd1b651bbf07b92efacd77ad2ca77418dc3c3d384bfe903cc66f65693e79560f3d35e2340da8 SHA512 e9b3806d0286175ade9158968346fd9dc2251dd4f4f7363bfdb147bf08b60f3088d07483971c55b2e1ccf656362d83443cea57a2a6b876a0f1c6107987ee7974
diff --git a/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch b/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch
new file mode 100644
index 000000000000..f3992f845b85
--- /dev/null
+++ b/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch
@@ -0,0 +1,208 @@
+--- a/Sources/Java/net/n3/nanoxml/XMLElement.java.orig	2016-03-04 09:21:07.908000000 +0000
++++ a/Sources/Java/net/n3/nanoxml/XMLElement.java	2016-03-04 09:35:16.283000000 +0000
+@@ -484,9 +484,9 @@
+      * @return the child element, or null if no such child was found.
+      */
+     public IXMLElement getFirstChildNamed(String name) {
+-        Enumeration enum = this.children.elements();
+-        while (enum.hasMoreElements()) {
+-            IXMLElement child = (IXMLElement) enum.nextElement();
++        Enumeration myEnum = this.children.elements();
++        while (myEnum.hasMoreElements()) {
++            IXMLElement child = (IXMLElement) myEnum.nextElement();
+             String childName = child.getFullName();
+             if ((childName != null) && childName.equals(name)) {
+                 return child;
+@@ -506,9 +506,9 @@
+      */
+     public IXMLElement getFirstChildNamed(String name,
+                                           String namespace) {
+-        Enumeration enum = this.children.elements();
+-        while (enum.hasMoreElements()) {
+-            IXMLElement child = (IXMLElement) enum.nextElement();
++        Enumeration myEnum = this.children.elements();
++        while (myEnum.hasMoreElements()) {
++            IXMLElement child = (IXMLElement) myEnum.nextElement();
+             String str = child.getName();
+             boolean found = (str != null) && (str.equals(name));
+             str = child.getNamespace();
+@@ -534,9 +534,9 @@
+      */
+     public Vector getChildrenNamed(String name) {
+         Vector result = new Vector(this.children.size());
+-        Enumeration enum = this.children.elements();
+-        while (enum.hasMoreElements()) {
+-            IXMLElement child = (IXMLElement) enum.nextElement();
++        Enumeration myEnum = this.children.elements();
++        while (myEnum.hasMoreElements()) {
++            IXMLElement child = (IXMLElement) myEnum.nextElement();
+             String childName = child.getFullName();
+             if ((childName != null) && childName.equals(name)) {
+                 result.addElement(child);
+@@ -557,9 +557,9 @@
+     public Vector getChildrenNamed(String name,
+                                    String namespace) {
+         Vector result = new Vector(this.children.size());
+-        Enumeration enum = this.children.elements();
+-        while (enum.hasMoreElements()) {
+-            IXMLElement child = (IXMLElement) enum.nextElement();
++        Enumeration myEnum = this.children.elements();
++        while (myEnum.hasMoreElements()) {
++            IXMLElement child = (IXMLElement) myEnum.nextElement();
+             String str = child.getName();
+             boolean found = (str != null) && (str.equals(name));
+             str = child.getNamespace();
+@@ -585,9 +585,9 @@
+      * @return the attribute, or null if the attribute does not exist.
+      */
+     private XMLAttribute findAttribute(String fullName) {
+-        Enumeration enum = this.attributes.elements();
+-        while (enum.hasMoreElements()) {
+-            XMLAttribute attr = (XMLAttribute) enum.nextElement();
++        Enumeration myEnum = this.attributes.elements();
++        while (myEnum.hasMoreElements()) {
++            XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
+             if (attr.getFullName().equals(fullName)) {
+                 return attr;
+             }
+@@ -606,9 +606,9 @@
+      */
+     private XMLAttribute findAttribute(String name,
+                                        String namespace) {
+-        Enumeration enum = this.attributes.elements();
+-        while (enum.hasMoreElements()) {
+-            XMLAttribute attr = (XMLAttribute) enum.nextElement();
++        Enumeration myEnum = this.attributes.elements();
++        while (myEnum.hasMoreElements()) {
++            XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
+             boolean found = attr.getName().equals(name);
+             if (namespace == null) {
+                 found &= (attr.getNamespace() == null);
+@@ -860,9 +860,9 @@
+      */
+     public Enumeration enumerateAttributeNames() {
+         Vector result = new Vector();
+-        Enumeration enum = this.attributes.elements();
+-        while (enum.hasMoreElements()) {
+-            XMLAttribute attr = (XMLAttribute) enum.nextElement();
++        Enumeration myEnum = this.attributes.elements();
++        while (myEnum.hasMoreElements()) {
++            XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
+             result.addElement(attr.getFullName());
+         }
+         return result.elements();
+@@ -897,9 +897,9 @@
+      */
+     public Properties getAttributes() {
+         Properties result = new Properties();
+-        Enumeration enum = this.attributes.elements();
+-        while (enum.hasMoreElements()) {
+-            XMLAttribute attr = (XMLAttribute) enum.nextElement();
++        Enumeration myEnum = this.attributes.elements();
++        while (myEnum.hasMoreElements()) {
++            XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
+             result.put(attr.getFullName(), attr.getValue());
+         }
+         return result;
+@@ -915,9 +915,9 @@
+      */
+     public Properties getAttributesInNamespace(String namespace) {
+         Properties result = new Properties();
+-        Enumeration enum = this.attributes.elements();
+-        while (enum.hasMoreElements()) {
+-            XMLAttribute attr = (XMLAttribute) enum.nextElement();
++        Enumeration myEnum = this.attributes.elements();
++        while (myEnum.hasMoreElements()) {
++            XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
+             if (namespace == null) {
+                 if (attr.getNamespace() == null) {
+                     result.put(attr.getName(), attr.getValue());
+@@ -1007,9 +1007,9 @@
+         if (this.attributes.size() != elt.getAttributeCount()) {
+             return false;
+         }
+-        Enumeration enum = this.attributes.elements();
+-        while (enum.hasMoreElements()) {
+-            XMLAttribute attr = (XMLAttribute) enum.nextElement();
++        Enumeration myEnum = this.attributes.elements();
++        while (myEnum.hasMoreElements()) {
++            XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
+             if (! elt.hasAttribute(attr.getName(), attr.getNamespace())) {
+                 return false;
+             }
+--- a/Sources/Java/net/n3/nanoxml/NonValidator.java.orig	2016-03-04 09:36:05.247000000 +0000
++++ a/Sources/Java/net/n3/nanoxml/NonValidator.java	2016-03-04 09:36:25.195000000 +0000
+@@ -587,10 +587,10 @@
+                                           int        lineNr)
+    {
+       Properties props = (Properties) this.currentElements.pop();
+-      Enumeration enum = props.keys();
++      Enumeration myEnum = props.keys();
+ 
+-      while (enum.hasMoreElements()) {
+-         String key = (String) enum.nextElement();
++      while (myEnum.hasMoreElements()) {
++         String key = (String) myEnum.nextElement();
+          extraAttributes.put(key, props.get(key));
+       }
+    }
+--- a/Sources/Java/net/n3/nanoxml/XMLWriter.java.orig	2016-03-04 09:36:53.616000000 +0000
++++ a/Sources/Java/net/n3/nanoxml/XMLWriter.java	2016-03-04 09:38:11.868000000 +0000
+@@ -182,10 +182,10 @@
+             }
+          }
+ 
+-         Enumeration enum = xml.enumerateAttributeNames();
++         Enumeration myEnum = xml.enumerateAttributeNames();
+ 
+-         while (enum.hasMoreElements()) {
+-            String key = (String) enum.nextElement();
++         while (myEnum.hasMoreElements()) {
++            String key = (String) myEnum.nextElement();
+             int index = key.indexOf(':');
+ 
+             if (index >= 0) {
+@@ -203,10 +203,10 @@
+             }
+          }
+ 
+-         enum = xml.enumerateAttributeNames();
++         myEnum = xml.enumerateAttributeNames();
+ 
+-         while (enum.hasMoreElements()) {
+-            String key = (String) enum.nextElement();
++         while (myEnum.hasMoreElements()) {
++            String key = (String) myEnum.nextElement();
+             String value = xml.getAttribute(key, null);
+             this.writer.print(" " + key + "=\"");
+             this.writeEncoded(value);
+@@ -229,10 +229,10 @@
+                writer.println();
+             }
+ 
+-            enum = xml.enumerateChildren();
++            myEnum = xml.enumerateChildren();
+ 
+-            while (enum.hasMoreElements()) {
+-               IXMLElement child = (IXMLElement) enum.nextElement();
++            while (myEnum.hasMoreElements()) {
++               IXMLElement child = (IXMLElement) myEnum.nextElement();
+                this.write(child, prettyPrint, indent + 4,
+                           collapseEmptyElements);
+             }
+--- a/Sources/Java/net/n3/nanoxml/StdXMLParser.java.orig	2016-03-04 09:38:44.521000000 +0000
++++ a/Sources/Java/net/n3/nanoxml/StdXMLParser.java	2016-03-04 09:39:08.028000000 +0000
+@@ -492,10 +492,10 @@
+                                                 extraAttributes,
+                                                 this.reader.getSystemID(),
+                                                 this.reader.getLineNr());
+-      Enumeration enum = extraAttributes.keys();
++      Enumeration myEnum = extraAttributes.keys();
+ 
+-      while (enum.hasMoreElements()) {
+-         String key = (String) enum.nextElement();
++      while (myEnum.hasMoreElements()) {
++         String key = (String) myEnum.nextElement();
+          String value = extraAttributes.getProperty(key);
+          attrNames.addElement(key);
+          attrValues.addElement(value);
diff --git a/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch b/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch
new file mode 100644
index 000000000000..602cd9f87909
--- /dev/null
+++ b/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch
@@ -0,0 +1,53 @@
+--- a/Sources/Lite/nanoxml/XMLElement.java.orig	2016-03-04 09:16:52.339000000 +0000
++++ a/Sources/Lite/nanoxml/XMLElement.java	2016-03-04 09:19:03.213000000 +0000
+@@ -63,8 +63,8 @@
+  * The following example shows how to list the attributes of an element:
+  * <UL><CODE>
+  * XMLElement element = ...;<BR>
+- * Enumeration enum = element.getAttributeNames();<BR>
+- * while (enum.hasMoreElements()) {<BR>
++ * Enumeration myEnum = element.getAttributeNames();<BR>
++ * while (myEnum.hasMoreElements()) {<BR>
+  * &nbsp;&nbsp;&nbsp;&nbsp;String key = (String) enum.nextElement();<BR>
+  * &nbsp;&nbsp;&nbsp;&nbsp;String value = element.getStringAttribute(key);<BR>
+  * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println(key + " = " + value);<BR>
+@@ -478,9 +478,9 @@
+         this.children = new Vector();
+         this.entities = entities;
+         this.lineNr = 0;
+-        Enumeration enum = this.entities.keys();
+-        while (enum.hasMoreElements()) {
+-            Object key = enum.nextElement();
++        Enumeration myEnum = this.entities.keys();
++        while (myEnum.hasMoreElements()) {
++            Object key = myEnum.nextElement();
+             Object value = this.entities.get(key);
+             if (value instanceof String) {
+                 value = ((String) value).toCharArray();
+@@ -2168,10 +2168,10 @@
+         writer.write('<');
+         writer.write(this.name);
+         if (! this.attributes.isEmpty()) {
+-            Enumeration enum = this.attributes.keys();
+-            while (enum.hasMoreElements()) {
++            Enumeration myEnum = this.attributes.keys();
++            while (myEnum.hasMoreElements()) {
+                 writer.write(' ');
+-                String key = (String) enum.nextElement();
++                String key = (String) myEnum.nextElement();
+                 String value = (String) this.attributes.get(key);
+                 writer.write(key);
+                 writer.write('='); writer.write('"');
+@@ -2189,9 +2189,9 @@
+             writer.write('/'); writer.write('>');
+         } else {
+             writer.write('>');
+-            Enumeration enum = this.enumerateChildren();
+-            while (enum.hasMoreElements()) {
+-                XMLElement child = (XMLElement) enum.nextElement();
++            Enumeration myEnum = this.enumerateChildren();
++            while (myEnum.hasMoreElements()) {
++                XMLElement child = (XMLElement) myEnum.nextElement();
+                 child.write(writer);
+             }
+             writer.write('<'); writer.write('/');
diff --git a/dev-java/nanoxml/metadata.xml b/dev-java/nanoxml/metadata.xml
new file mode 100644
index 000000000000..4c006a5b2b06
--- /dev/null
+++ b/dev-java/nanoxml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">nanoxml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild b/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
new file mode 100644
index 000000000000..023a196112c0
--- /dev/null
+++ b/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+MY_P="NanoXML-${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="NanoXML is a small non-validating parser for Java"
+HOMEPAGE="http://nanoxml.sourceforge.net/"
+SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/nanoxml/${MY_P}.tar.gz/357c7136417ea996cf714278ea84f2df/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+CDEPEND="dev-java/sax:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="sax"
+
+JAVA_SRC_DIR="Sources"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-lite-enum.patch"
+	"${FILESDIR}"/"${P}-enum.patch"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+	rm -rf Test || die
+}
diff --git a/dev-java/nekohtml-1.9.18-r1 b/dev-java/nekohtml-1.9.18-r1
deleted file mode 100644
index 59a82efe7a88..000000000000
--- a/dev-java/nekohtml-1.9.18-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A simple HTML scanner and tag balancer using standard XML interfaces
-EAPI=5
-HOMEPAGE=http://nekohtml.sourceforge.net/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.18.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=10cbb9ff7c8cb8442faec9a992af7263
diff --git a/dev-java/nekohtml/Manifest b/dev-java/nekohtml/Manifest
new file mode 100644
index 000000000000..32a1163d7a55
--- /dev/null
+++ b/dev-java/nekohtml/Manifest
@@ -0,0 +1,4 @@
+AUX nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch 533 BLAKE2B 891239b5b4586ccf542394da265036d29b8e4850258e697f6289f42e1bf2aeb924be92f912f064431165632e5fd8c7f027d36b7553320b4591f478fbe5138fa1 SHA512 21c077f13c5157928f6cdc1be45f729e05b42d5b33cae7394d0d8c1167045f27e8baab89a5aefe33b907d1c3e2146030ee54a48da6d1a3bdde6c75f729dc7937
+DIST nekohtml-1.9.18.tar.gz 10471968 BLAKE2B b033158c2ae6742c615d6bcc58ef05eb18f2395cab5052de20a485adb573b924202ed04dfbcf39bfefb4eec524aa0d5d9216fdd151c4a8722b5277c2808cc878 SHA512 f7321ad853eb63e327ef8bada52892caf58372f11136df72f46d8a7cd6918492cc66243002955525ac05fd669b3c4389e9067421f749f99f928629cc7f88e0eb
+EBUILD nekohtml-1.9.18-r1.ebuild 1226 BLAKE2B 7de840c88baa799596cb3fae642263bbb65be17eb28f8ac5ac7eabe0de5c7646826235bd414196fa4653827efccf1a32c7fa19384fc69192fa54c20372abc0e9 SHA512 650cebaba5acba5ce87885c3589fe9e3f8efe4ca21e5aa96ced484667399643e6609e155cfb0adbbb59128b41cafbfd6e912d1aed6f7f56dc6d7b73d609dffe5
+MISC metadata.xml 314 BLAKE2B 073d261d268fe26737f695f2c376829add4b29affddea58a4ad61764facd3bcf32eb5f5f7a80b26f989c8722da1cff4247672b2fecf535b59afd9e21235b1b55 SHA512 a8b454129fe31dd7b221ea1094a331ad78feb7cbf558e256fad7a49a28c7ceb99874504c4430c1fad04e854b25a5e1005005f3c2320eafe985ee934c758351f6
diff --git a/dev-java/nekohtml/files/nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch b/dev-java/nekohtml/files/nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch
new file mode 100644
index 000000000000..2f4a6c655cac
--- /dev/null
+++ b/dev-java/nekohtml/files/nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch
@@ -0,0 +1,12 @@
+diff -Nru /tmp/nekohtml-1.9.16.orig/build.xml ./build.xml
+--- /tmp/nekohtml-1.9.16.orig/build.xml	2012-07-31 18:12:48.559950104 +0300
++++ ./build.xml	2012-07-31 18:12:53.887883123 +0300
+@@ -103,8 +103,6 @@
+ 		unless="compile.skip">
+ 	<mkdir dir="${build.classes.dir}"/>
+ 	
+-	<compileWith xercesVersion="2.0.2" bridge="2_0"/>
+-	<compileWith xercesVersion="2.1.0" bridge="2_1"/>
+ 	<compileWith xercesVersion="2.2.1" bridge="2_2"/>
+ 	<compileWith xercesVersion="2.3.0" bridge="2_3"/>
+ 	<compileWith xercesVersion="2.8.1" bridge="2_3"/>
diff --git a/dev-java/nekohtml/metadata.xml b/dev-java/nekohtml/metadata.xml
new file mode 100644
index 000000000000..7b1fb1901602
--- /dev/null
+++ b/dev-java/nekohtml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">nekohtml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
new file mode 100644
index 000000000000..fd1401c96ca6
--- /dev/null
+++ b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A simple HTML scanner and tag balancer using standard XML interfaces"
+
+HOMEPAGE="http://nekohtml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP=">=dev-java/xerces-2.7"
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} taskdef"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="xerces-2"
+EANT_TEST_GENTOO_CLASSPATH="ant-junit,junit,xerces-2"
+
+# Do not generate docs, use bundled.
+EANT_DOC_TARGET=""
+
+java_prepare() {
+	find . -iname '*.jar' -delete || die
+	epatch "${FILESDIR}"/${P}-remove-obsolete-xerces-bridges.patch
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	if use doc; then
+		java-pkg_dojavadoc doc/javadoc
+		java-pkg_dohtml -r doc/*
+	fi
+
+	use source && java-pkg_dosrc src/org
+	use examples && java-pkg_doexamples src/sample
+}
diff --git a/dev-java/netbeans-apisupport-8.2 b/dev-java/netbeans-apisupport-8.2
deleted file mode 100644
index 047dfd9ac0d4..000000000000
--- a/dev-java/netbeans-apisupport-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 app-arch/unzip dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans API Support Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/projects/apisupport
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=26149fe5bed1400364ad55c9104a4f5b
diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
new file mode 100644
index 000000000000..421a0696226c
--- /dev/null
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -0,0 +1,4 @@
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-apisupport-8.2.ebuild 3010 BLAKE2B 6fdfe1664730ef473cc979aa36d323a235bc074a08fb28e166d0c8c92e32ad1eb741e65955f08728bebf3f6f3f117760dfd354a7d2c26736f410cff6883627dd SHA512 f20ff5bbde263b8a4992ee83ed0de8fc4c6f52fc515aa6c9ad9eda9f493cdae2659e53fa3cdc8dca23ad6cd1f0335f7db376164cd026b439326a3fcf49644135
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-apisupport/metadata.xml b/dev-java/netbeans-apisupport/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-apisupport/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
new file mode 100644
index 000000000000..73f3a4ebf168
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/apisupport >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
+}
diff --git a/dev-java/netbeans-cnd-8.2 b/dev-java/netbeans-cnd-8.2
deleted file mode 100644
index cfea6c17040d..000000000000
--- a/dev-java/netbeans-cnd-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-dlight-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8.2 app-arch/unzip >=dev-java/jna-3.4.0 dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans CND Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/projects/cnd
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-dlight-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f530b9425b79239766b37288db35b1c2
diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
new file mode 100644
index 000000000000..f1c9ba62aa67
--- /dev/null
+++ b/dev-java/netbeans-cnd/Manifest
@@ -0,0 +1,10 @@
+DIST 43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip 38904 BLAKE2B 38fc919e95a8c030bb587aa9cdb1fe65778dc976dfea0fb392c5aad3137c4cce4d79ce4617e65c4a20e0f57227c3d70336818579d2cf4a33226feda1b2cf4d47 SHA512 ae3b1865e32403c09354fe9bda5092f88bdfc9bf36c18f21dbf4cccbbb2874881aee3cadea039860a3ddc5770b9ba95201faeb13ebcdfe5a403fee12e8935852
+DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 BLAKE2B ab01480df198884932dbd84abbf17e963488a80dda9f67ff654b2e6e3a234e87f038849faba6c5fa33aec6378fbcf6951e840eb61e525ad728ee337d14ab0586 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc
+DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 BLAKE2B 561c1dffe464bbc387075df6d95bbdcab27315ba5679cfa10f85d6449baad3d05f4daa45af93d9b127d9fedb8c7e44c45537f1a84b4c4d877c40b9812620f669 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
+DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 BLAKE2B 28d53e1ce0a429d436a9209cd152517232138a45638ef0e20bcf3c8393aa15ed1fd9f4e14de021a80ccac97b32009c1c17892fdc6f4b1c3fe3a35d28b1081d0e SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530
+DIST E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip 179656 BLAKE2B 5639f113da1354fe0ca9c1e9ab172fde253221c9dcaf0a745d13fb1a51b948f51bec3a05adb936efd583aa998fc51b0120eb7d487cb74b51ccb7effa3f48e5ca SHA512 748979d810751d570087dc60bc02cb5969c6f713cba87d32004c505b9a92150d518c6dcf66caca61841ca8f28c16cf3cd2a5a40b370f5dec5c9482b57bd051d8
+DIST F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip 11747046 BLAKE2B a3cc474e94c650abf257e62979373a7909d1a8759c2536e2547fb609c05c0c545f23d8f5b541a5658257d907c55df2260ba1de9e9c435ddf79de805185529de8 SHA512 73f5c986f132bc898fe67c528f5a356868c7d5a0dd7e9201252b3a20a4906f3e729ce5444b33197c28a94513cbc47664a8c80aeb5c114f9a58c7065b41d414f8
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-cnd-8.2.ebuild 4416 BLAKE2B 895b65ef45554d056dec6c766514733d3585e8dbc8e57427170416339257947b76b6b520ee46c822e4537a590072d05a2a71ec63193e53336045e40b71e112ec SHA512 c2d7ff1d976790981856b7f4deed0b804586b47ec9425b1566e178606387537968ca28d64bac4515472e6c2132bcb324a92a5b806164499ce64db25da964a0f3
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-cnd/metadata.xml b/dev-java/netbeans-cnd/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-cnd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
new file mode 100644
index 000000000000..815b8d949a70
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip
+	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip libs.clank/external/clank_0.3.9.zip || die
+	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}
diff --git a/dev-java/netbeans-dlight-8.2 b/dev-java/netbeans-dlight-8.2
deleted file mode 100644
index c10e138f71dd..000000000000
--- a/dev-java/netbeans-dlight-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8.2 app-arch/unzip dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans D-Light Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/18E39A0D10357B72EDB76F2070E27019317792F1-fs_server-1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=43a8c2aa4a66f5c8d6f8c928abf043e5
diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
new file mode 100644
index 000000000000..f3c2def452cf
--- /dev/null
+++ b/dev-java/netbeans-dlight/Manifest
@@ -0,0 +1,5 @@
+DIST 18E39A0D10357B72EDB76F2070E27019317792F1-fs_server-1.0.zip 474820 BLAKE2B 0bcb5b01505060627921411b695d873c21b1529ef120078f598458978f61b24778bfe4a959e1d835640888628c49cf0e02c87482d7971ee00d83ae2dc16d563d SHA512 5bc28a6ebe734279ce4999f4657c34885f91f2f44b157dbf65b3690986189961fec138631fe39274ff43762ed74860f3adc1db605f79352dfdc362d2239677a8
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-dlight-8.2.ebuild 2594 BLAKE2B 5fdc5ea80e83a04bf1f35f668110bf00024b274f3ab99fde29c4946338354b5bb52ead92fa725400efe89e739b1a1539ae09d353f346dd2fc468bb4191217fc0 SHA512 0c3e7b8e4b8b6c0b78ec2f882e981fd51324f718077c7c335c468efa3e4e6f513646c81bb0db60c15fba8762f2f5d7ec199c5a3f6b5a46b767bce5f7345c1558
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-dlight/metadata.xml b/dev-java/netbeans-dlight/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-dlight/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
new file mode 100644
index 000000000000..ccbf7aef1790
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/18E39A0D10357B72EDB76F2070E27019317792F1-fs_server-1.0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/18E39A0D10357B72EDB76F2070E27019317792F1-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
+}
diff --git a/dev-java/netbeans-enterprise-8.2-r1 b/dev-java/netbeans-enterprise-8.2-r1
deleted file mode 100644
index 8b0f033bc51e..000000000000
--- a/dev-java/netbeans-enterprise-8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-profiler-8.2 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-webcommon-8.2 ~dev-java/netbeans-websvccommon-8.2 dev-java/commons-codec:0 dev-java/commons-fileupload:0 dev-java/commons-logging:0 dev-java/glassfish-deployment-api:1.2 dev-java/jsr181:0 app-arch/unzip dev-java/javahelp:0 >=dev-java/junit-4.4:4 dev-java/tomcat-servlet-api:2.3 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Enterprise cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-profiler-8.2 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-webcommon-8.2 ~dev-java/netbeans-websvccommon-8.2 dev-java/commons-codec:0 dev-java/commons-fileupload:0 dev-java/commons-logging:0 dev-java/glassfish-deployment-api:1.2 dev-java/jsr181:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/bsf:2.3 dev-java/cglib:3 dev-java/commons-beanutils:1.7 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-io:1 dev-java/commons-validator:0 dev-java/glassfish-persistence:0 dev-java/guava:20 dev-java/jakarta-oro:2.0 dev-java/osgi-core-api:0 dev-java/validation-api:1.0 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e3dd8279bbc6f20cfaecca49b946d851
diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
new file mode 100644
index 000000000000..d93ca2a98ba9
--- /dev/null
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -0,0 +1,35 @@
+DIST 065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar 2650526 BLAKE2B 09aacefccf349a483807d8b7830a85a2479a43c7ec0e63d09f8e4c2a82415dd4a4f872f34f93df096b68423112452c8065a748835e13f322dc3b0771bc68cc72 SHA512 070773502d8020e17b9b3ecf881a746f0a19f2781d00ba49e8869ec3dbf4166a86d5e52fc016f4c23a88a10640df7924c783def4c88cf959e4eac9eebd7a39a8
+DIST 1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar 26124 BLAKE2B 0a1092c9e90ad99a3b89e2109ea8a9efa27ffa5c03e223ac0257d0094700efe1649805d84bfeb87c6dd1322cd343004d3952b66e42c8b4f9bc670e66394496e2 SHA512 78a2eeed3262e4105288bef7ae8653a0c669ca04d70d4064b3b73ffd2bb22a0448d9750c4081261cab17dc3a821cef7af0b06bcc29354972d306ace9e07228f7
+DIST 27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar 13112852 BLAKE2B ff59ddd92f82450e2aca1f434125bfb918ad90316902be460b83dc1fdfb9f01d20d422030d85e1b5002508983e7d7a2c0471fbb1a74275000dbb9dad9d80be7b SHA512 07697423321a9726eac7e0640befcac0de76cc88dcf4245612702fd9370c2df4256552afb47f25b3b75bf9ea70c2dc0134e3cd7caaee13f510336351f7dc7c38
+DIST 33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar 699557 BLAKE2B 83719dc3b43792867261b44e1b343331345bd378df78b2dfccad0bb1301da57204d5e94ec9eeff36e327cbd710011f6cb47a7edb36363dee1c072f8bf469e837 SHA512 9c1e79976794e71aedf598c53ab999c56c52f63c5d0dd2ba8c8f17166bb6b9642380ff5043299f5c22f9c74dfc833d222e6a17de8ddff7f00604e5ad1c1e6833
+DIST 33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar 181041 BLAKE2B 52c53d097187331c48462976943a82feefdcc650da545fec00407d691cadd383952359c1f6a731626fbf2ed33b5cee5ee72e937429e519def737c6432ff00172 SHA512 b463ec2e3fc27ccaa69b50e6eb35e89d2df9bc0e6b50e2bd4419a70c4058af3f456d25bde6e625915ebc5a010824dd8efd1176f3854a5d8bbb261b6a49c38429
+DIST 3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar 351132 BLAKE2B cf6e8f76569e4fdb40b585ff1ce74da0ad1180bbce8f4959b5690220c524c200fe16cc94700dd54826bdddb799c18beeca866c3f9b5edd42a2e70efe139adbfa SHA512 104c7c13e38281aa9d725d64f3363eaa32ae946bc4896a2595973b342574eaaf21166373c300808a4970e89edd38f58724a32cb1abd212fa63b227edaf060b1a
+DIST 45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar 113208 BLAKE2B 058cf21898c7b68e1fd7e18755aa30c085ae09c747c42dc18b873bca8910fd2bea9e1167215a3b52e91171466b488c5242af0590244d31e853049e2a3f88d286 SHA512 3341353caa0a1f0eeb8d15d686f86812784153f83552461396827bb1b87b0199f22a7eecb1eeb70b1bea4fefccb564a7770a1b56896186f4498ebd9b7f3cf3bc
+DIST 51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar 1930692 BLAKE2B dd91048046d97b48261660617203950be55f0bd4338c5a3a1b88ad26ba361087a6feb68d68abd41255b34f17279616ee761b4534daebc6b4ea8f61bc78e51387 SHA512 e1e20ee7559cbbf83707829409c3f6385660db68aa5706a985dc47b2fd180edf34a4ef4b3aa429d3b5888fba70843b991129303dbe4d7f6afce67c6b32e5cdcd
+DIST 5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar 405951 BLAKE2B bfacb33986ebfb3b8cc4432c9b3fbd66404b1bd5f26ae9ff7e7ea9b6e41731863091dc82a58be58a17b1693f741e9232182fe42599af05f214b09d31664c7b31 SHA512 6b9e6626805d230ea944e79adffde23dc809ed2a7dea7ae2858426bea9239fe86e398fb0f76ba09f4f548857a092e58457e41d26b93bf09850b68dc5ecfafb4c
+DIST 68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar 368265 BLAKE2B c1498a3bc62a43a8a7a84b40743a9198fa58ac3e6ef3f160dbb6ec36cb4e8ad8865a282e3c92a4738f23de1354e6acd601b358f3733ce56d146099314303bc82 SHA512 fb66409b1ef68e7e29287b0390b9e1411e9ebf88a2acc4be29c3c2d01ef49b23f961fbe238dbfbd81d16dfb007cc7326c9f1a64a65442a34fb54bbbe3a4faa9a
+DIST 8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar 2866088 BLAKE2B 94204256bbf16e82674a88e35071a4e2420d8c5adc1eb9392334976252f3277514c4302b391f09f64f9ed21e35819515e3655c14fd5746342619b0171ba0a98b SHA512 cf9e29e147605438666f0e63be9297e7a5ab8c4e7af3a2dd8f363f1a6b2b360deb1445452810d2a4e2121635a71d9939c36e66a68a6d971501ee3d6e275b782f
+DIST 9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip 4151472 BLAKE2B 59dba119847cdd2d0716a62573d94982fc2c5004ef7a93e3bae35ac90b62c5a1dd119a1ca5bb139e4ea907ce9bdcc4ddd487962161fe5cab57d5de9eac3f0076 SHA512 c83f67fd0e5f9610a7d758f0bb6a0108d90909d3f91034602a44cb7c573665d2c61154872f798c94ccfa6c568f5e692b9678aa6f6807f8591e94a09791acb2b0
+DIST 93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip 1699050 BLAKE2B 9bda89183e47a09503eefe5df43d6d062d31b93279a639f51868e6142dee0e8b76876fe5c57a994850ea2a9d665d9e67ce1153d32b6c25557c9555f20d82b70c SHA512 ad472325f86ebc85fbcd8c891ec7ac726046365110318d4b9cd6922935e326d98814ed10112054ead847f354f3f98f3bcb69044c4c0507e1da5d866b661fce07
+DIST 99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip 2910708 BLAKE2B 3b44d434d438f13017070c2f84d10b15dcbd245d5a9444527befba75fccb9c32fbd34975454b3a64c3d3e090aa86c0e44dd1be17d5a063ce76c8e6c533b7b9af SHA512 e192763e7b10921747f5a1ea6c1f8ed176302dbb72acd4ed1d473d0edc93766104fa3f2a0f0d31de3f8aa9f032fef1f10af6f1d12b00902bcf090af61a5484b0
+DIST 9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip 2728179 BLAKE2B 987c2222305a4021e011581a8229d57f8713819ae0a8738e16da22402f63a8743ae1480b7481f745766bd2f9a744fc423eecaaa76783a61c55e6a00b919766eb SHA512 3e4f84a20cb76697e96e54b2c36d29e5696f674a9810ca1e4112b792318b9a54f928b7c22aa5ff07acc08879556faa950d147955576f30320b485405bb340cca
+DIST A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar 52314 BLAKE2B b32314d3e7a21638394184a49e62784e870cf54378f2961cc56d8387ef316004ff782c19c6534c96d9a29c8c6d5ed0c475cf6f73d9df11e01235a0477bf65c63 SHA512 ff726c7bfc9d855613b6773e78d220078855cff2c8b96f063d546301cae9ec0e21251631d2ffd84b52ae532614f13df10fc1da2d13264e0bae8818f4f69ec996
+DIST B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar 1315115 BLAKE2B 118ff3ed9d9e5f1f4884624a366fc18a0dce64d72e8eee14182e8cfb4c3dddb4fb0a656b085df6d9dfa335f20616c33476c4905a8ef35d4d25c739152c53844b SHA512 5f3fd68121c7080dbd932110a6ad695cb0a860aac23a585707f23bb48727f341dee82732f279d3b580a7969b1ca255ed48d40965e29eef488154965d253c114a
+DIST B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar 22020 BLAKE2B 003277a2f13394c65a07b5fa6e250312001ce8d372d67097ad6c4862f5f9c584728475b09f87171e25cdd1a48824b3390b74b0c875b96006396550f0e2c06128 SHA512 89076160994f4bfa8e270eae1e6b5745ebafb98aae945e2ed8be6ff2a717002bc7879b4ed77f3ff28e9611476eb1ec5dc58e378da1cee87bbc363f32eb9ea6c5
+DIST B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip 1801252 BLAKE2B 5f7ef249821508be3223b9757f70523d3c447e62ee1936f8e6fc2f500a32f954358ed21d70b33d9639884019cd23997ba2e7ab185757d78b2cad1359307c0067 SHA512 d02b4d2ff052de35f957e8093f31f55d27dd6f00d0fca035fe6f2f9c0990ce4a03709ec3273878a326937c44d4d580ead666f94a0649e1dc9e00133b5f001ca1
+DIST BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar 169152 BLAKE2B 6f124de6419c93eb898e913813632c27db052a94662e39b2a51188129957fb03b9cde1e38ca2e78cd35073bb92b1fefd6fdb9c7b46838e29418dce5325f20f81 SHA512 9d9b00cb1c1ae0effea11d17b941987d222c0a5f9b54a9f8a60bae1b4e0ce5edfeb57305207d315609c9788454fe32614463a4fce3a0d8c9cbf1c86866496a78
+DIST C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip 5700763 BLAKE2B 254c5e4eddbc38dda484f07b18edc4fc736ad7784a5da7a248eb59a6de2d56ab25610549c5b726075159d8796816f9578ced8dc2ade9d32aa904a3b48e053f9d SHA512 c4bfe64dca6c5d12ba76fc67b01748bc0d44d31c4954cde9b3150d2b0693bd4c6a01e2bc12186b310590f4fd9921bef42b103c9292273de32731b76744025c0e
+DIST D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar 46337 BLAKE2B fb45139f5c7ab83639fb58264fdb8efdbf242f601463557bbb7ba0601a3ac6dd441cc8f2104b7ac11023d8bf43f0f318974c947ebf374f8ab58dc9c0f2293b5a SHA512 be846932b4942a69acf0f4bed41a02c98f05c9247103518366a4c69ba051e6513c4142b831430dfdf3b3c5178aed981e4924e5ce765bd459670889942b544d1c
+DIST D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar 979616 BLAKE2B ca9650e87569ce8f2c14cd088a4d8f6f2b4fdfaacf8c553340b7371fefa779035a0498209b60f995d7b149734c8e9a0d36f6db0585c18a31f0e9eca917e41ed6 SHA512 3f69f0a8827cd58cb53e9a1e25fb816760b91d441286f0534a0cb2f7a07f83d8ec1a50f8bdf6fe3b489bf66bdb8ac363d9f5c6fecb6fae8ff704f1a42b0aeab6
+DIST D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar 21631 BLAKE2B e6ac15c47f0d1bad48137acb7741e9d418b9f3893c522065d274a63a4cc26027bed9dc5affde5e0cb904e74fe1f218f1e3f1d008958f400b1fb8974c635767ed SHA512 6c2e3cfbe53a2888b962cc17811afd0aac285591bba94b9850c6733ae841cd5ceff5588e33d1ae3f292e314050bac5576366c0d78a2260dd30738d1ae68b035b
+DIST E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar 40812 BLAKE2B 5af0e672b38bc16a3d8bd5634a51a16f6ef70ad5c043112e4cdd22e1500f576238f0b59985947a35421b13df1c418f4aa34a196eb27f1ceb0cd98721ff865793 SHA512 97856b5ef08a1b0f2bbd2a25421f364a35c005b0bd9270058b38c19fde1baf311af5bdf8c9c472f2d8e0ed2c4096e493319b3b1d2479f9a9fed7a86c69213869
+DIST EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar 105613 BLAKE2B cc5953de31ba6dc2e5aa43805fad44fa9f47b6df9ba290eab583927cad3d637b83f9740e7513a14c962c6305af04bd0f848d7bfd272ae29558597bf15ae99a57 SHA512 291358cfe1ea240e70ec190f7dbe9541bf5e0c3d11c774948eb4f45d6ceb1c11f7fee366152bcccd1c60747a6edf8049be5f09e40cc43f0ee0a22f5fbf02e9ac
+DIST EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar 930427 BLAKE2B 76c7fc1414efc12b0bce423cc70cd92190b9615bf3c86bd1edd431ee9b75942ea8f089fc8785bb305339bc1f54bf51e6e4bf6138b714ac80d7a18d8a8d597d55 SHA512 178efcf9dd9cfdc6185128b62ffb3fffac7cb5755127e9af9b8c70a3932fbae06404cb281b0b768dbf43c552aeea78d7b6532f02278eebc1a213707ce0f192a4
+DIST F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip 14764137 BLAKE2B b4df37793b00021dc507e34e7832412a553c7e344adb2e56aa07eb834843810769a8bbb855ed9cd0909188d7a1fced4e498e6b5df03d6805bbdcd79c51705439 SHA512 a6a1ac748e3b419e414b34b5014cdbc1ff3d53fd02160484e683f7237042d73d87c524c3d1293f311282997ddb688b5dca534abb594232ef16d9af758aec1415
+DIST F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar 32522 BLAKE2B c0c0faf09fe833d14803f629051df527ccebfdfc23b4c7e22514d0b6643deb6858673b87d6580e583979d3245f38ffd5fedb8e115ee2f126e5ee2a88fe2e9048 SHA512 c78db8068fc7e6aa67f747bd474372f4c2133099f732ff0c1d7a7f17661968f2f4f3ead43301e74a1c9e892861cf485df35246b40aa6810afbe908ed5a7639a6
+DIST F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip 57110 BLAKE2B 3e4497acec45040fdf5a799f4b79329fa34bd9888bfe5855a569a0f1b29c334d5fd3b4a0660864627259ee6bb076816352bfa71ab096a6ca756ad3bd603f0640 SHA512 e5aeeb3c41904ae293bf9186c68b6ad2033a39e48c0f2de4e3dfc3c89a6d3ffada54cd98576b0759cd8a104ddb57180b5860ec52a36d81d5f0cb3f04338abf83
+DIST FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip 5025064 BLAKE2B 0fd7e1d26d9bf61afaf51234d40a38b181022ba47ef5c365bb68c7be3cf72e8d3ac3bdfa44ad7e838db9d5dabbbc9962cc3d3387fd6c1eca6d29fc2ad2d77acd SHA512 8624cb07f939d36b7528343b7e3690427578089de7a1b46ed30d576b69002df6f1ffb5878e9c40624dfe8ccf898b7a0be056333184b51d26d3eadb073f58241c
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-enterprise-8.2-r1.ebuild 15451 BLAKE2B 08e7931a1c2204768c9bb75120fd7cc887b0ecf5db920f8b36a27d61d8b740513b8239ded8f81e3d713cea83f76ff341a095c220a04814c54bb033836a400606 SHA512 f0c6d33c7fdfc67708653548d43034baa634bf9e6d5acfe4e9897933170f39fb703c58ea0fb86dff56211c5f42b74b829b8c373153ab566185b49af3f2501a1a
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-enterprise/metadata.xml b/dev-java/netbeans-enterprise/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-enterprise/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
new file mode 100644
index 000000000000..cd3f853e2846
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
+	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
+	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
+	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
+	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
+	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
+	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
+	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
+	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
+	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
+	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
+	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
+	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
+	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
+	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
+	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
+	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
+	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/commons-codec:0
+	dev-java/commons-fileupload:0
+	dev-java/commons-logging:0
+	dev-java/glassfish-deployment-api:1.2
+	dev-java/jsr181:0"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND="${CDEPEND}
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/bsf:2.3
+	dev-java/cglib:3
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-collections:0
+	dev-java/commons-digester:0
+	dev-java/commons-io:1
+	dev-java/commons-validator:0
+	dev-java/glassfish-persistence:0
+	dev-java/guava:20
+	dev-java/jakarta-oro:2.0
+	dev-java/osgi-core-api:0
+	dev-java/validation-api:1.0"
+#	dev-java/commons-chain:1.1 in overlay
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
+	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
+	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
+	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
+	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
+	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
+	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
+	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
+	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
+	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
+	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
+	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
+	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
+	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
+	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
+	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
+	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
+	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
+	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
+	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
+	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
+	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
+	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
+	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
+	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
+	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+	java-pkg_jar-from --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/enterprise >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm commons-fileupload-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+	rm jsr88javax.jar && java-pkg_jar-from --into "${instdir}" glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${instdir}" >/dev/null || die
+	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
+	rm commons-logging-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${instdir}" >/dev/null || die
+	rm cglib-2.2.0-b21.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.0-b21.jar
+	rm guava-14.0.1.jar && java-pkg_jar-from --into "${instdir}" guava-20 guava.jar guava-14.0.1.jar
+	rm org.osgi.core-4.2.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar org.osgi.core-4.2.0.jar
+	rm persistence-api-1.0.jar && java-pkg_jar-from --into "${instdir}" glassfish-persistence glassfish-persistence.jar persistence-api-1.0.jar
+	rm validation-api-1.1.0.Final.jar && java-pkg_jar-from --into "${instdir}" validation-api-1.0 validation-api.jar validation-api-1.1.0.Final.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${instdir}" >/dev/null || die
+	rm commons-beanutils.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar
+	rm commons-collections.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar
+	rm commons-digester.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar
+	rm commons-logging.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/struts
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.2.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.2.jar
+	rm bsf-2.3.0.jar && java-pkg_jar-from --into "${instdir}" bsf-2.3 bsf.jar bsf-2.3.0.jar
+	rm commons-beanutils-1.8.0.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.8.0.jar
+	rm commons-digester-1.8.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar commons-digester-1.8.jar
+	rm commons-fileupload-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.1.1.jar
+	rm commons-io-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-io-1 commons-io.jar commons-io-1.1.jar
+	rm commons-logging-1.0.4.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	rm commons-validator-1.3.1.jar && java-pkg_jar-from --into "${instdir}" commons-validator commons-validator.jar commons-validator-1.3.1.jar
+	rm oro-2.0.8.jar && java-pkg_jar-from --into "${instdir}" jakarta-oro-2.0 jakarta-oro.jar oro-2.0.8.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}
diff --git a/dev-java/netbeans-ergonomics-8.2 b/dev-java/netbeans-ergonomics-8.2
deleted file mode 100644
index e6569766846e..000000000000
--- a/dev-java/netbeans-ergonomics-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-nb-8.2 ~dev-java/netbeans-platform-8.2 app-arch/unzip dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Ergonomics Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-nb-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4e9ca1fb0c5f2ac1418c674fee9d6562
diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
new file mode 100644
index 000000000000..50950fa201a0
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -0,0 +1,4 @@
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-ergonomics-8.2.ebuild 2539 BLAKE2B 295b04652fad991c40b1a0ff09927226cc60ca9a5607f8034da6dda4436c3bd9bcfaaa384818972eee2486eb50411649b0d5e6fd3079c3430d05330870dc61ea SHA512 76972a212794b1442453b5acb8d16748990b3d2ab417406ce383e6d104a2cd66122b0888ea424504346b1e71f0c2b8e7a2cf171cce18218794f93c45db2d6df8
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-ergonomics/metadata.xml b/dev-java/netbeans-ergonomics/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
new file mode 100644
index 000000000000..224881a93101
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ergonomics >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
+}
diff --git a/dev-java/netbeans-extide-8.2 b/dev-java/netbeans-extide-8.2
deleted file mode 100644
index 15dcbbd1c7fe..000000000000
--- a/dev-java/netbeans-extide-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8.2 app-arch/unzip dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans ExtIDE Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/projects/ide
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a7e030e7345a1216514f47d30bd83105
diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
new file mode 100644
index 000000000000..6b33332a3fb6
--- /dev/null
+++ b/dev-java/netbeans-extide/Manifest
@@ -0,0 +1,6 @@
+DIST 545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip 99139 BLAKE2B b2935b4eda55c23202e2a98892bc4f524ab7045ceb9fddc2e551ae2c88e5e0076135ae22b36f0843d03ebc077fac432f7a90a701e56d1e13efd11e612f83e4be SHA512 045d0bf82a498b7b222fca4cdf826443f2507f2594d857296b57e16f1475e6b892bfd8d21720a5d25a65d09e6b7bf8f051abca9ce55f030c748d0ad46cbfd7f7
+DIST BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip 2341753 BLAKE2B e322b5aff8830c4e20fe8ed132b06169ab12a22b2c6416d85c6b7e45d34e546e99dfaa5ff30f4bbce33c77089df0f298fffabb1d187224e6ac1b4a6ec36a8e31 SHA512 024b1458f74ae977f5864b543b39417205203f27ff94518aa61ee4c7336c887dc5704b71909fd2b6286c3a29a9ee0aeb86aafc32f741c7650adcacc8374f62ca
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-extide-8.2.ebuild 3003 BLAKE2B 0452a10c95c5f561c0c0120b22098688e1962175e8734385aec4ba67d393c81f250c2c8397d9943cdba9294f2fdfae3601fa820f0441213debb7462fbd94c61a SHA512 8baef1c1cbce3ad7d9fe6176b49306f989ff331048a899ba4a7125e232c1cddd7c61be83c18d51adb4e90d6217ff444137e2ab74deff0eb736c28ee763bee1fd
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-extide/metadata.xml b/dev-java/netbeans-extide/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-extide/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
new file mode 100644
index 000000000000..87ded315355c
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
+	http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
+	ln -s "${DISTDIR}"/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip o.apache.tools.ant.module/external/ant-misc-1.9.7.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/extide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/extide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/extide
+}
diff --git a/dev-java/netbeans-groovy-8.2 b/dev-java/netbeans-groovy-8.2
deleted file mode 100644
index 69ea3f79950e..000000000000
--- a/dev-java/netbeans-groovy-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 app-arch/unzip dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Groovy Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/projects/groovy
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d64fcbe87528281d8552d03f9aff7f48
diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
new file mode 100644
index 000000000000..203ceead86d9
--- /dev/null
+++ b/dev-java/netbeans-groovy/Manifest
@@ -0,0 +1,5 @@
+DIST 01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar 6997394 BLAKE2B e7be2e27e2f1880071302f385e86b4ad7cb41e19004036c94bcbb76037b287a2ab264881eeac1d965a3cd42aaecc8222aba2cb4ee81226e0e3498a05f4a734e8 SHA512 44d66a51338c478a08092160d483c005cedc275f238d2521748d8af95fbb11920b818d7ea3780545658e76aeb25f900e6188cbc09277ca4726b90ada5d883653
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-groovy-8.2.ebuild 3042 BLAKE2B 3bb871bbb59ead9216f4bb3d4396a63f83da2e9c86772399a23c9e76837ad95deffcf2f0dac51521e8a2d92aef1a3e8fd79653473c3162afd3ebe5cdb95ef5b4 SHA512 5ec0e771489003212f49849d7cef5a7dfbd8acbadf64c1fb6c8a880fd37b5e99e19c7f694133074ad9eb5aff649d0339e840258ab390185d87764cecbc7526ef
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-groovy/metadata.xml b/dev-java/netbeans-groovy/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-groovy/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
new file mode 100644
index 000000000000..f00968df2a12
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/groovy >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
+}
diff --git a/dev-java/netbeans-harness-8.2 b/dev-java/netbeans-harness-8.2
deleted file mode 100644
index 0cd011527b2f..000000000000
--- a/dev-java/netbeans-harness-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 dev-java/javahelp:0 app-arch/unzip >=dev-java/junit-4.4:4 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Harness
-EAPI=6
-HOMEPAGE=http://netbeans.org/features/platform/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=026e6d609a4cb7057eefc8972bf68f9e
diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
new file mode 100644
index 000000000000..755a62f0d458
--- /dev/null
+++ b/dev-java/netbeans-harness/Manifest
@@ -0,0 +1,9 @@
+DIST 20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar 61713 BLAKE2B 4b4c47851bca5a7cb4e81791ed186790167e5804a072f52a0ad75d6e133f7f37875ed20350f6d39b72da32aa659486e4d3334972f21ff27d8f0a400545bc3793 SHA512 2d06db5267ac5d8fd227819014177f0d5cc345583628f1ff2fff89f180a4269936a136af0b4649cf43603b0adab6ce3e3f525ef2033537c6f035b558c356d900
+DIST 49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip 579550 BLAKE2B e58aecad031e08a69d9f3f69be74960a9ed8049a94d8445bf5750c6b2907b4739f63d1f37ac6aa50a5fe96c02cba7d3ccfb836304b6956d3a21add3d8c83f32a SHA512 3de7720a392813cbbbc73a6ce2a745e10054c0888df61b1e623bf327f8a4584a9eaa07303fc41d01d2088fd6c868e7273c6355d23839dfaa9009d1f672520d58
+DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 BLAKE2B ac04471f6fd5869d4fff8fe86749b599cd49d81d55319085c01f7fdd7ff30aebeffafa46dad254e7193fe3d035f3b4d0310a7e9242cb54daf82188510e4fcafb SHA512 5a0089c36c35ffa2c243cbaee376a246dbfd3dd3f170fa233946b6134f9c80dda610f2900e8bbd1553c3e8bdd3b5548145c881745acc720ec1e059d8252b8399
+DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 BLAKE2B e06b4df3e96cdaf8150c74f2039a28251a55469449674cbb045a46d7866ddfa52f6e3ac4a01a7c7da4f40906038245574f1cb208aa3385bdc48f88ece3924519 SHA512 ffad7d45643015d178cdb1b5bb075f0232470f5f7b82acd87d3dbf88e2034aed04fa9fadadbf7831d3c57fe0c4bc9684d841aebaa8a99ba1d6c1f6cb13f80359
+DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 BLAKE2B e06cc8c989a3ecf5c501ad3e187b8f2afcd7a4838345812b52e0496a2a68b481d2f4406bde00f9cad662d94d97494769d7ea3a2686cf62d3691d953d67701010 SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-harness-8.2.ebuild 3752 BLAKE2B 46064f2fc61e80ad005c4de3d020d9178c0fd940704d4c6339e0384bbd50b36cf29244479ee258f7ced555e126733d1e930cd23f72dacc94eb150e81ce670ec1 SHA512 b1e360b877145e24b683e38b3b912ea19daed54bf5c0d5034b536acab40ddb535656afe082d6c1ab1ea56a1e885b332d7b6694dc513bc91b3e9fc51ef0855b18
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-harness/metadata.xml b/dev-java/netbeans-harness/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-harness/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild b/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
new file mode 100644
index 000000000000..9e5f5e9db7a2
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-platform-${PV}
+	dev-java/javahelp:0"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=dev-java/junit-4.4:4"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/harness >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 launchers/app.sh
+	find "${D}" -name "*.exe" -type f -delete
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/antlib
+	pushd "${instdir}" >/dev/null || die
+	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}
diff --git a/dev-java/netbeans-ide-8.2 b/dev-java/netbeans-ide-8.2
deleted file mode 100644
index 0643a74028d5..000000000000
--- a/dev-java/netbeans-ide-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/antlr-4.5:4 dev-java/commons-compress:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 dev-java/icu4j:55 dev-java/iso-relax:0 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 >=dev-java/jsch-0.1.46:0 >=dev-java/json-simple-1.1:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.5 dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 <=dev-java/sun-jaf-1.1.1:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 app-arch/unzip dev-java/commons-codec:0 dev-java/javacc:0 dev-java/javahelp:0 dev-java/jna:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans IDE Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/projects/ide
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/antlr-4.5:4 dev-java/commons-compress:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 dev-java/icu4j:55 dev-java/iso-relax:0 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 >=dev-java/jsch-0.1.46:0 >=dev-java/json-simple-1.1:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.5 dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 <=dev-java/sun-jaf-1.1.1:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d6a04b5cee20465f7f650e695f5301e7
diff --git a/dev-java/netbeans-ide-8.2-r1 b/dev-java/netbeans-ide-8.2-r1
deleted file mode 100644
index f620eace0d29..000000000000
--- a/dev-java/netbeans-ide-8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/antlr-4.5:4 dev-java/commons-compress:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 dev-java/icu4j:55 dev-java/iso-relax:0 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 >=dev-java/jsch-0.1.46:0 >=dev-java/json-simple-1.1:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.5 dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 >=dev-java/sun-jaf-1.1.1-r1:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 app-arch/unzip dev-java/commons-codec:0 dev-java/javacc:0 dev-java/javahelp:0 dev-java/jna:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans IDE Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/projects/ide
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/antlr-4.5:4 dev-java/commons-compress:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 dev-java/icu4j:55 dev-java/iso-relax:0 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 >=dev-java/jsch-0.1.46:0 >=dev-java/json-simple-1.1:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.5 dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 >=dev-java/sun-jaf-1.1.1-r1:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=243a67a81e483d3564f22907200a7f5b
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
new file mode 100644
index 000000000000..14422d2629cd
--- /dev/null
+++ b/dev-java/netbeans-ide/Manifest
@@ -0,0 +1,76 @@
+DIST 036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar 9592 BLAKE2B 04f0e8962c3a6e53abb0a8d120a74acb578fab369add55af39bfa6c5f8e9bf5d542555b1f1502eb370cafc014ca6f9a132fbb3974f0ec5c19ea73363ef65d496 SHA512 5c1b54d5b0f5f146895a35e7cae50fa41f63b19ed0a5e68b80c2a47b14b380286c8382a56d6729f0f50e0db82eb7db92a449a9bfc46b5cda83b0d4c9f9b86057
+DIST 0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar 284220 BLAKE2B 4a5db0451ca79c5b038592d41cbf774ea80bb2da0afbf5212cffa8b3904d84ccd2cbe02d29143d0565fde828d011dbc25f5a8b780f6ffea1b0a1290485118671 SHA512 4a5a3dbe4941c645e2cca068cca5c1882cfe988b02e7cd981d1e51784900767d1deab0e0e0566f559c9fcabb4a180e436d5bb948902d4f4106f37360466afb42
+DIST 0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar 150954 BLAKE2B f7c460e9c224f86b0e29a7e8ba1812192406424770553c43802d803ce70b0bb8f1316a71822849bfd0a18371444d9eebe7b62ff8d8664ab33c74de6e6a990781 SHA512 8d75e496200fffd6847c5e2cd0ff9f05cda8f32e9973c13b177d3c102c87a6ac0d430f45ac3a4cd3c0804ffd0968c8edfcbcabd37c2df630ae79e39b0a918dfa
+DIST 11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar 82072 BLAKE2B a7e8c5ea92c2b511d36e117d0f86bbc3a5e39cd2d751f87286af815ed7d3177b2549a92c7f5cd7a9274233d7a983f9e58d09c39ce6a07103c9c97e4d41622f98 SHA512 b213dff423d636429fceec190664d4493c94ea828361d4b6296c5bfd796bc33662d56a3b36423ca7c3c712e21c69bcdcc42dab33a9c88de29651f07539b8c645
+DIST 15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar 2280092 BLAKE2B 70cb124bae32a54e14b9e134e1e2e031672f9c706ce2c655b5ea0a410e5f67d33f5748f756658006a41ef59fc5d79cf2b1401c8e9c9670e5e49e9573feb04744 SHA512 ee03fe59cc16815012bc84e79b18be571ffc0700419c33824682bf4e5ad708addb58bd401469452c526faf6a3e025213bfb9e57e961761fb635241bc7e1e8c9c
+DIST 1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar 82875 BLAKE2B 242f9a8308df636981c3aec5ea477ce961e4b5d4fccf58c82cb321bab1fc58340c7a31178f3c3a681fce0a49a03187c86d99043af3bfc7916c341211a747e6ff SHA512 093aef080bdb72a6c5b38d4d6906ad1d51fdc5454ec99989205cd47fa011caaf469a58a8d9f3e3ae3c8bbf4389bca55a6a2e09998846084e5261abce6913e430
+DIST 16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar 17771 BLAKE2B 0e8dcd1bbc66f63837c109625824e21e5db7aaf0034d673cf01baf8387476a5a64aee8c1dcc6f433b89d5789bb177e1bae48e1c9ef1a117e33bc6b8fee443b51 SHA512 fe7d7855893db867d75ab75f15c128ecba54fab48b15ad541dc042588a96dd965b1278331f114e55b853e0764c0291823acb73f5e2a48eeeaf2f8a985222d82e
+DIST 17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar 6106359 BLAKE2B 3e392928023f32f7b2e578f77e814c6fb895a88d3692c5b56782c6340bc9c68e266077aab2354be619bde66dda82bf73db3177680690cfbd4b6688166bdc7d45 SHA512 c2bd8b7369e627a32300800ccff909698fb98a1dc6e97b722cae40ed7ac8f9ad806a1a5c46d243d9c4123c5309ccc3ec5ccbf942e237b5dcac09750400f1ba50
+DIST 20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar 62050 BLAKE2B 81d4851d36d4ba2664b05e82c53777a14fa2f5ee52852effec77f4345140d87a2a0a284de4e664d0d53664ecd44127a6e337128568f660662919c694b0cc6ede SHA512 d38d8675481e3881490f825bfa02da4ca64bed62d06ec75e8ae386d40f4827f8a65c0442edad990069303a03667e8aba9143cea877774458c791d2561a66977c
+DIST 23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip 401328 BLAKE2B 2e6d5045cf0bd31c4b23165ba1e49fa8d2c5d7e51b59c1d01960b9ef81f52c15604588ae1753aea8acc8459a2824291034fc1cf39cbdf061e9602c5ac3bf71bb SHA512 e76ae7f1cb6679bc69534ca9d24dc72f545f8e8fd849f57f746cbc73762729bd872f79c524e2dfd3f481d9d9cbe60a08bd85f383e843ccd39bcbf777db786e9f
+DIST 244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar 17184 BLAKE2B 0b8e0158531e5b39f3ea254dbec0003b5f843ff7d784a3e2df997c706d36da285ffe94a232c00c7f7eb60dff8af44326dbed7a472821dc6b9c8ead90a5d121a4 SHA512 a441cb77ac764769695e819a4a10c3ec58491a380489897e5589eed94839c15f9c793a23e35bfe2d9e7bde40e4cb104bbf633a7142b54b3fe1870a246c848173
+DIST 2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip 1530055 BLAKE2B 14521128376f4289efc60d11f55dcb3893a3e2918070c4ca03f6dc51dc992e712733d202a7c7eb3ec7fc05cb07d0d142fd40d6033b51751fbe2d06b32779429d SHA512 86f6254f45f7cd4cf90fe94f5fdea0bdabe7b547e4e4cff91f27e58ada0fdd17a4ee2f9dcf1983be468da5fd452664e09d0fc759507344f7861b28a317d95792
+DIST 27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip 428971 BLAKE2B 5a0711f9a82905a6d65a61c7c40617d384defa392eae3715ce77395a6487560feb854677ae68ccababaf22257768e9efca23acd64c1d0aa89f518ce07704a8ed SHA512 02b724efadfa66260780e641396f2cf96347769b328b291cbf914ae1363e26324a1a887a583f5ed6b3f23f1d704283e5142e3fa46987b6978af06ccd6880a265
+DIST 2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar 12471 BLAKE2B 4d18fb2317d990b66d3a0863981e260529f692812e167d035f9f2b0f9908d1d6b3d2359cec449bf480e45ddf8bb626596a778705de77ca16f483405f669c30bf SHA512 493939ed187c114ad7607160a9d460304fbb760a8c5fd80016f0454bbb6c9022734f1f433843a6de1181a839e2e08f7a79df78e1945262929a5d05339f91d7a9
+DIST 3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip 270250 BLAKE2B d960966870082f51480053eeff58538e5025660f1e9530f91f43bef6af1f708e012671b28537cafd9dee0f887b3cc6385b877d48366da42f33d57d66a3b280cf SHA512 963422b8f498824b880b3f61aaed3aca41e3b3ee81e2710564293c4a694907d187722bdae4b7ab9d7bb98e69cfac99726e269c2fab1f96d56c96f3a097d23ecf
+DIST 387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar 1106410 BLAKE2B c6bcfbf9c53a7c7a76b5a69059cbd37659c63a8905e9e3e33aa35bdba768c7241725d5d510e7ee9b5ff0c798299645d10d08e591781c466be6c3ddcbecba78de SHA512 51076f5933ba9923d7004b2b205e68f88a564b77c168935a1e96ad9deffb19b9182685bd368d0e0ebb3ec28f0e45a61fb555ff7eaf2acc748f8786136a91ed28
+DIST 3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar 7847 BLAKE2B d1d3e5e299c325ae9f9f670527a7a7e52e232f6aed3743bffe6a1cdaeb1c43a7fa88b0b3a0d9b68ca4b021814eff2f6df484bf8b4b408d30efc08b273d4ac80c SHA512 d1dab33fdf498628fedfafdbe008988df3c079b4de40c4895e9a9aee4f74019d43f8fef85d397c7a48e9db67f7a7bf365b83447a9a674a6aa123c5daad792252
+DIST 483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar 594732 BLAKE2B b4ed44757ecaf356842ff8ca592d63a141bea3e0fa5f98962ce5de97a0e568940e58cec83e7006f67798e62c50e5ac8a3cb9716d2cebe6d779d257d5741d0d13 SHA512 84a110da6cbbafc38bd1d15c88fcf28793175c906d8a273fe9bab014348bcfa68eab01d8d821c27275278d4b4f4c083356032eaf779e8d9fd537f39d30e03069
+DIST 4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar 84793 BLAKE2B 6ffb1380aed050dea9597c63d2c222a20911e618b24dafa1399f96aa890cd6f037aba857d8195acff7c27183d6e597a1d99b76de699f967f0081eb3eda499ebd SHA512 193fa461f0bf438ee472a738aa29411af5ebeb8f757a3533db8553318ada5770a21b831696ac32dd1576f38d1f83b01ee8b6d1e0f4f23a52d27cd097b1a02a70
+DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 BLAKE2B ab01480df198884932dbd84abbf17e963488a80dda9f67ff654b2e6e3a234e87f038849faba6c5fa33aec6378fbcf6951e840eb61e525ad728ee337d14ab0586 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc
+DIST 4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar 96271 BLAKE2B f029a84a38b15eb0c325a910f12d9a894be64684f29a4a46d94dbf90b57fcbb9353fa2e49c55485e4b46901f5c3f9833efa09cdba26aaaa466758b19d85e850a SHA512 ce5cef3b016e6a4353f6eda2f1b672f4f9369d1b2674bef01710c9a285dfab476c1a9d3a9a48023c54e88dcada40049f02fe7c16f5e9fe3e7ad90763c504bae2
+DIST 4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar 454045 BLAKE2B fb4cf247aa60395fdf24db366521808e04ee7d13da3176b34f9011bdf2f81a9c9de05a39ba700eca29bc0ea4d34fecfcd051ac760ae70a18bf974f4595a54d0b SHA512 dc990c8ccc65825f69244cca1cb37bbd947026da1f5e28229be28c58d82326a37d411e26691d7818a0024aaf8a957311229e72cc6afc3c700559756f067fa7ee
+DIST 4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar 3778995 BLAKE2B 946bb73d0a8a9f0d93e0b1e74ca222f7964aa5782c98277800ec9e2875a6e21c861dc21e2d126f7101147ed45d4e7743ed1d7816e5738c5f4a658ed07428b571 SHA512 3d9f273fbf1187c69f88a8d5741841f9b6ac0edeb8dd9df0610390bc4f7bbafc63d872621e26c5093dcb792986657ae2d0f691caedd249f7b861d0a552134d58
+DIST 50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar 37606 BLAKE2B 5c7bafdc096747c9a5bd97a348cfe90b24d9c8154a5333cb47f76f0ddcce12f9e924c91313f214b02c10b3b768ffcefd51285704574994a59be75ccbca83cec7 SHA512 3cc7744b9a99a3ac9930ea9bd4f8c319bd05838624384dadc22a16ae49490b16fa55b7e18079d5bf845cf45fae4b0144403ec210b71f9c9afc5391bf27825c50
+DIST 5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar 262880 BLAKE2B 500e278c051d70feb16bb868f722e90f9cd1a0d1c67cf3df54d67de9e39c0ca190c682837d0845caa972191d966c21bdb0b8c11840dcbae272f63d112df3eb46 SHA512 b464f7ab0b40e2d8b74faea161fea7d164ce07e66f63fc9e52d9394b0662e392f1b45d11e4c5fcc9378dbb4f06230d4e1dfb64ac153a00803b7c02408dfeaf92
+DIST 5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar 14867985 BLAKE2B b3c21684b14e9336694ad51b9107f2c9d4d4616f7abcb023296e2f6ef58decbc164a872b33612478291e0c1ec613cf3bf8154f89ebd9f9db09d905e15c626a7a SHA512 f753f748564abec974d236190511222523957fc0ec91b18155d926844eaa5c9aa63053cb155c85f562b9558e164214aef11c74c30aca123a352a02e2cb4e5a31
+DIST 5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar 674877 BLAKE2B 508cbbe8a64b1a06ed4170dcc1c9f74c2eac5f5f2ab17e2f1af0e326fb2466b678dc218380be07a20f503e7e07f7af0963639088c5caf12e6eee09e229fb8575 SHA512 61c24ff2c2286339b08cb5d749482d45bcc8e51b6821adccc715a9ebbd86a9810726d5889ff8e5ac2a7b0136fe23e7476483f593b54786c1799ecf623e904824
+DIST 64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar 43312 BLAKE2B 922ff1e010437bf2076a582d4387e0d8ebd9dda5de17c3cbed4b59c3b90c8d1a7a12ee9f4d730002170cfe3faaf2d38f4140495e94694a6673d08bac46eda6f0 SHA512 89827a65cb27ec3cbd66892028eb4d1d3422cb5ba059bb26e288e75504c5445db21c6ac6725a18903a0beb3191824f96caf284515aee7381908d8074732b7bc0
+DIST 6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar 33833 BLAKE2B f057b6bb946fff13c23b8788e70e4839b1c80d36695962ada5f46f8a0ccaa26879f162703ad3186138632d1016ff0376c7e5bbcf774c13b032d4c958e28c3866 SHA512 fa1a9fefc90f4050d70ab79c6fc80cb7611835803fa5fc95d8bf1ec9de7b47f0cb620ab18387f239cf22ef97df08c4749eacaec336021b5f5250668b6d51211e
+DIST 71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar 99570 BLAKE2B 8a36cbeabdaaba9e9df3d3026dd040810c9ccf8fe80bca0cc00036cb2088dc5bd1b946b04309f87c98856f91c6f621c18dd7d77e3e8c0a828c7217fc2440b533 SHA512 5056a55f5ad60e14d7f585288e70da9db87676520a4d81996f7b3deb34b5214cdf519b448a2202193b3b8672a7b2e86345ac28a451723d50678560439c4a8127
+DIST 825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar 74937 BLAKE2B aa9352b76c597dc0852c196ce544fa6960ffaa0d8c4a9750801ab6c93ccc86a9e5bb1940a7ca90d652e42d0135a5bf34eba06568091ff83d5ef3c1d291928eef SHA512 7530f6f9b5d0b6ef5948aaee7864bb9a562de361a6c6473428d994c364a82107e3fe2b1bb7e25da25124c2003b2f0d2d650ae481680a7dc4c3e7497499bd1690
+DIST 83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip 7658677 BLAKE2B 5a21e223eba6322faaf758358b6e73304755c1c4c783ecca0e3637d39fb6a25ff7cefce7e4dd2ec402ceaff0d610be3a729f08fb7f1655597b07e6fed5d0a28a SHA512 c3498a99f46fe79c78382840d6f6ae07a2a7aef469fa39ad39f2d3c7083045d1e85d72700de8f35a2f35fc74022f6a28f77ea2553b41cca11995d8a28e50966c
+DIST 886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar 8266 BLAKE2B e853e454696ce0a38995e6a756114ab5d2ac8558b2dce5b557aff30e8ffb469bfd92e67bad64311fdaa97476f76697183eed9c7d8e38cc637e05ab368bfc9755 SHA512 59241a6fece05560a88227b4d12e72cd573b721dfe6aa916f0f8db04c2f697ee7d1b8ade84f4163e5fe40a9b277ec5be9640b3c5a445c769e0668f06a97e4a96
+DIST 89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar 332198 BLAKE2B 016a2baf68ecdbe6f76de54968878d1c5570eeb1d7028ed414a536a50e9293d7707f1e34d911f5bc89911e590a11658d216906b6e2a949d77fbc1b9680ddb541 SHA512 8139337bafdae44804416fce5fa6d2f981ac6cea41888866b5447163e6492f39f0a8892edd018360122ccafbb7d199bb65ab70ab3f1d6a7a643d9c279a772287
+DIST 8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar 275808 BLAKE2B 67c75a97eeab9cf24a01a4ca6e66bdf18b1ffa3cd22fdbe8f96abeec8bdf947a9623156662e038d3abe9a760cc18fd74b338bc08b217f3e3c9538e91ccac0830 SHA512 71d1c245e2833440e9df20ee0d15d64fdeb5e5fa8eb832afa5813ee3528575178d9b851b65520806863d9aea9623b172198c040823aaa5fb73ec56f4d8ff0045
+DIST 8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar 48913 BLAKE2B fffd498f11dc7960e650fa653287778f918e8944429fe48e68b06d0da62096788e8d1b20c61d9d07e8ce16d0f1d0c4d2fb3456652f85ddd7c9e011f54ea0f578 SHA512 602514630ed327d834302071bef8286721e174c970e9f9db83f358ee8c75ffd3f713ab1555c87d437ba7100d57d9d12d1eae3efb7f4f6d726d00812dd86cd3ab
+DIST 8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar 96879 BLAKE2B 42a07e5e3e777fc961afff973a253ffade12bb41db177959d04cc6ee38d55bc49dcb3447640bd733608f08dbdfd8e1d30400e85b0877086607c54b8a731cbe43 SHA512 4ffe3dec5c140d15ecdcc5473659889c4f830ca5847ff301078fdfca8b724c29537680c9685da4109efc6d8561ce2f9d9deeb58536a5fa33f7049646f17c7716
+DIST 8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar 98051 BLAKE2B 0b3d714a180cc26096afecec52cc67210ac03408372c493499c5f05a1af663acdbbd476a347cac6d95bfb5463cd40a000ab19ace7158272089b845b88abeab43 SHA512 d5af6d069e31c4e207c342d4808ff7ae83a8bb5a1b51dd5aa3382c11a5268c4705ba27b479e4e1ac0a977eb30ea942c2b1477586374e4b10d909473591f50557
+DIST 901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip 912288 BLAKE2B fd2bcd5c6bb6156ecda1abf20d7ed1291a6e7ffc77f41c67f066e86f20393c0b652a6da54547f774c26c22388abb6f1440f90d96d46f559a84e921ee7da417e4 SHA512 d4dc458485065a1a66b2453d54e2229e3d65fcdfc4b1ce1735e1c1528883c45bf570fb7cd07f0bfed40967ca696542113164f92f7316c81e387979f13e8e170d
+DIST 9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar 96151 BLAKE2B d86bb10438c9d8e9ae56504ee6f06395224d149b6f93faf56e3a529d998d5897848df35c43e848c18e2179887aad408b2df8ddee45e126e3c4521285019079d1 SHA512 76bdf219668cc82fabfb2fcd8ae91bccdcb86a97328b7aec1a461bd325813ea5d721b645f5baba062fc8a100a4c0711dc2afb4989d0b3acf041d1e119e7d0435
+DIST 9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar 4173 BLAKE2B 0248e77084ab83b39e65a001deab2c8f29680c06765693a5a4d8c5c77d8fc62daf94cf37916df03320132b31d5e16ec103ac063118679df59870fd5512d29faa SHA512 8955e24831394afa5dce25485d25b0bf06d53b50b7ae1e7e347ca7c3844aa3768854551b7ca0da3fe08d68a08386579cc013539dd53e69cb1407e19211b658a6
+DIST A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar 356070 BLAKE2B c1e55f13ef7f223a96b6c69dd9b1e70636920acf781c9f279958d45901e50ed31a3476ba5117510e11364f35134602f17ec0d508f908cc33352c0b2286b4e5ce SHA512 5496f339422490ee9e9072b54f37cebfaaf014b727c5e0ca4f17c6221159db12bdcd9b7c8c37e73141b9870496d5964a96e35de36e47245d09b811b7bb245ce3
+DIST A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar 109043 BLAKE2B e56b3245f9bb7a710772729d69b9119232042a4cb4e1819885a94e19ede692e39874158e814bc714b27748e40e0b66ceeb7e73fef3b1ccc46e9e29c5fa6fd8c5 SHA512 a1cc0feb2805e08d49229a20cc4423bb52d6800aab3f65723a28ed7d3429455a3f6ef80daaabad7aa89bfb70e4d3c362b268401e636505d1c89bfa7baf871d94
+DIST AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar 83249 BLAKE2B d5733a189d008b7e086db93bb90bea449023d02125f9f857a360fb518036f87538d6d7183a6280e4785fa0214f65b74c8e5cd768cdc5c6b53f84db6de3346886 SHA512 c2a498cd1e45e5bc815d24370cd3abb1c46a8165fa4b1d57493fe1e24c727c74570ac203fbf23a8ac8c25d121f52450d61d0386dd69a45597dba42736509b9a5
+DIST AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar 94946 BLAKE2B ccaa1e3bcaccedc1796e3702bfc2240bd209086e2805c28465783dded9be4ffb13a8723bd18c10d605feca58bd2231adfa8155c3d7864864f67404b0956652ca SHA512 b6f5e88c0414a5f3f2c03bfe93e694cb0274f1d6ea7a2d7e9a4cc6bacdf2379033b188d0ef6603790418d9f7a9469ac8056110f7036717deccf5dcbbb3c4e54c
+DIST B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar 90859 BLAKE2B b7febd6530b42727c81a396beaaa76b9dc6de6df56ecc88bf9c1622af1d9a1bab2d54971962a2c5da70a5c97f04b9f6160c40412da4b97929df6639aa6153e3d SHA512 8ad97ed698a2dc6a8fe94dcafa142a3794a1497b7c67497c9d7345fdbbc41fe58a7181e5e38be186a988c5b70cbaa97a16f79299982da414c176b1e07bddaa2d
+DIST B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar 1855307 BLAKE2B 6f7ad51e52788b72a87edae59ccc818c7119b60e1fcaa454f7f5e12a73f56471c940493e6f2205f27945710a00a556df1b9d43609022b34bfe48c94bd1668fde SHA512 6de9c15374c83625d08eecd7cc1a95bb8dcfeb1f144246709b955178461bb344ffe9a8abeda01c77ba4c9cd0fe8074bdbee5196087d5ea1d548f14fdb27941c7
+DIST B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar 103974 BLAKE2B 82a9bde252d69d92a3eebb095e1dc2c8704bacaae96681e83a9900f12928ef5746a3fe95f2a270959d5d157028164ab8430a54a0290ed027ff2b182906652c07 SHA512 7644f75ac0ea9b0caeeb0657e9d05624c61d86660c3a9b33bf04ffc58b8e7c21adf74443e52fecdf434458b32ceabcc0f9919ad5671b2f526a02d7160e2c6570
+DIST BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar 77903 BLAKE2B 5a7b1dc4de77ef1148daf6d41aa958685540a0bf9f3df4b8b3d4374e112e7588ae02925b89583c1f19942afc0ebada581581386915ee95420caae8ed355c932f SHA512 b1e2ac5dfce90d9d8c7a8ad0a9ab2a7e8d5d5e7c7dd64a565ed564f90243940e577fa1d2618301f12f9f69393339f6b9a4d3e93e16cad65f4a7103bc4c3e6929
+DIST C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar 1487304 BLAKE2B 794b854739f305be0cca848b95f5ce1e423d2f69d985278f83008e3384995c809a735d99bf90df57d0522fbad03ff1613eff283a4c5478b79a26e25d621995b3 SHA512 7c1bec8fc317a13a0353ae95320bf57afb81997e4bcf484b365ad12940c4eeed2e414ec01ded4d9b6bcb4239d59baaf78e2b51829fbd28dd034d768193d87a7d
+DIST C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar 90597 BLAKE2B 018b97caf00dff1e1c364ded70474b3c446464e372fdc4d318fca42822c2f7e943048bfd2df45f9d094465b325c30dfd9826f73aedbec94b09dd5e1c63f094c8 SHA512 f885dbab5f03508ca4d144558f8db5b855d643cf037e7c136b5a814826613204c7e22c8f77d3e696e1cec28fdef3b84230f132344829996c5a123716476d7bbd
+DIST C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar 3476101 BLAKE2B 08ec8b713ff61c6b68acd42399e49bb44528969336b34c64eb14105454630a060cc3f0c4078931ffd70a99a0e08becdcab8ac77a32fd62b497d36167a7c8bea4 SHA512 6b363137fd38afa1e860749ffbac3909ab921c45de657ea4eee8cdae58726a822be6d9beb15c3e8a4928e28ea1d52d2d53c39d85ef068547ca3dc669f2874fcf
+DIST C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar 72036 BLAKE2B 47b3ab937a4b52b87bdc68bf1f3230e5d336ac967aa5fc6d509f8f24d443a5798a70fdcbcdf94fb7a078c21011e07560a0a748896d4314d501a8f1ce86656ecb SHA512 4694642dfa9d4f993b928d653c509812f604bdcd721e690c3150e8c27b73a028c6cc5d63d92d21b9d61fc88672039e8b0cee3cce5f3f83b75d081bbc121d048f
+DIST C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar 170502 BLAKE2B 47e9736644b28237ede07acc29e3682400c8e134ac69ae5f81d0803107f3f8440d1cc74aca30fc75bff446b6c6763e4db40eb667845ec2d3e5405752bc08ad6c SHA512 9e08442c20537cd5ef788f623792e83429e9a534bf14d1c48c8031393f25c96fcbf2cd87ff9a37eac6908bd4fb2a4bc478fad95f38779d773e1ecd842d5807aa
+DIST C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar 18627 BLAKE2B ca0afc1394bb58f089bbdd666970215f9592ea4e5cce82ba76c5ac9c5e09fc9e41e63fbed292f00345e979e1d1ad2656c06a0a49f97e27598814b9dadd617eb3 SHA512 378028472842c9c8b029da44ae27b55dba7b3018ec15dff874798530792a03d4f4949ac644f6a172e7b47702b748fde0e652c9089f51a3f6a03c06ff2b356f8c
+DIST C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip 205743 BLAKE2B 81990ec684f8963d0d9c9536c254944956cec0860936bf0e753a9b2dce07178fdd5c7c4e6604032e30d21b47bfd8d5dded7dabe33cd79c518f016ba3e9638acf SHA512 17555962d99e880478083f2eedb65e5e07288d23f541971161e433768928b19f9864592bdd5a06c789cf35e7b1faa18296ae0832fc5d38f6e6531d754b12e816
+DIST CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar 280983 BLAKE2B 3de72da66bc1a1f356baa98e7f5dff99fdba4d6f40228909c15b4e6aaf821246727315febc887ba6c6545d0d1ed3dfbd090458d79604ca4087c00827b4fd88ef SHA512 680c2072b301cdf19bcb3525a5292874d4903dd1cd0fd83b9affb46354894cea4a2fe192414da5c82ed125063365b8a1f1a8f23849e8ed7e4a2378e8a9249ea9
+DIST CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar 406767 BLAKE2B b2256c06528e42be927682eeb790b2d0b475fc027f9d17eed715b09a623454544ccef4cca0f264349bd52790b489b6013bbc2aa714fa776b78c4cd11bab2e0b7 SHA512 1d8b502956520c98bf9084cc63dc1e926e8061b5fc01931d6fca67274edf1c4f7d8524e942a0f911baaa95a3cc285212a938a67fd92899630ecbcfaa10072321
+DIST D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar 63557 BLAKE2B 606d292b028837d70bde644ac3c5405658d1e464f3917e8aa73eef9f6a09e7c2e7cf97f69c026073d692cdb470604deb20a82ffbf5e68b815de2ed7b33054b00 SHA512 b1db7cfe17a592d49e3e751ab48533236f397ddb453f3d0232232d723d0ed0204d46dee7ced39d0611a18fdcb9b4531001142770cb2dcc1973588f3c845d866e
+DIST D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar 124303 BLAKE2B ddca47a8838fa55ba7ab574357b2db2759a52dd8c45fa2a855d4e0ca7acca77bdf9923705d0ff9e4fb2eb158358bae1eebd00fb514a14b07b5cff5c856a5ddfd SHA512 97af2b5023748d8ac63c0aafba06073cbac9a30919e53fe8fa628822de54bdc5602770736fd32fc1e8dccf0e1fef8d826a1322ba6e2eded6ca830115f1c0394b
+DIST D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar 290305 BLAKE2B b21517369b96c9383eb8c623316906a9e85a5e9ff1dd67369d2aca21afecc8a51a93ca731decb928ef805190ffdaadfd01d1595625455397abb4fbc8d93d8704 SHA512 ea583899ebb31f7f55ba5f4e53008bdf8a2e79d472741f288d6b26b259aad788e0c67b197dba5445cc5c269ef9872c6c11b023212482ac7b0a160c777e7be597
+DIST D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar 69186 BLAKE2B e464168fec1cbacc93b5b4388e5ab16250a8aca005a2b9b20c4d4bc19fb3df44d0386a130f51e55d83cde0dbfefd24436abb6d54fbb20123d189ceb3f84412cf SHA512 99fbe678c6f20ad52a59aca159d2eb89c3a670f80453f909c6c9f713a4624b70d0f95b2797596e9a7618d6f1b28e5fd10afb6ce6c02d30b1ef8f98d5fb47d50f
+DIST DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar 90677 BLAKE2B ec89850b5af27adf3c215a1b073402c2f8df6139df22ad88b1294d87b8a958b53ffad36dbba39c36882e6babe90e4f92a5cf935419795cd5790f355815e961ba SHA512 337cb1964ef9561261a8725592a3c279bab78ead882f87ede3be80f60ddcc3431f927e38a56ba2c14b008aaf00ac8b91316bfe6eafd34eb004fc3cc66b160eff
+DIST DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar 250816 BLAKE2B 6c5fbf89a5948d04f4718e39a081e5929f8cb4f131044715a9f691ccbdb38f9faf688b3b492d41fad249733de47ec25a09f03b0a951dba3802b2b3f2f2865a0c SHA512 dbbc4a0869013c48bf7e6243cd790b6f2b140fbe1cfdbd3c210d2df39db78cab1b350c5153125e0b1ee1ed37450e1b3077a1db975a3abf1154019447b64c6c9c
+DIST ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar 125146 BLAKE2B a508bffb5d2bebdaa9c672534323e311daf30308ea88cf683f82906bab3723230a503bde7c02d69525441969f40435dfebe3dd41eeef93130413a0e0b051468e SHA512 5b77ad69e116393560ff0e4514b514e0c0be5796a237458b09981a92b270a36892feb96293954e983221b2800a49ca693e30592ee69f391b67174cfc3ff107c2
+DIST ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar 2172168 BLAKE2B 6838ceaadecc53cd34a84f3c25bd8c88e6b25e293aac96e26a4e129ff2be20d79376994b08cdb666840db1ce660644b77cf04de2406af0d682a4999c11fb5844 SHA512 47d9a7526c3c039b3793750f537fee19b645b1293b574fd1939ee058d8fdeb8ad956e0e0aa36b5d4b527e9cace51b71aefa6c8fdf40acbf611606a162d878f58
+DIST EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar 761996 BLAKE2B 2ee389bc341aab1f0ca267617fd1a497a51e3ea3c4674b4a6be0b8b48298de70d3027b0b1811a7ed3ca25747df5b26f0141857d8ab7b1428bdc1a00b8cc99563 SHA512 4923bbfcd0531d6807debc9ac0d8a1e10576eb2ed8a224ccb3bbba7e4f172d97b1d41f708398943b1298db15335fdd8919f1c8d9ba0ceb2170f7bf935cb7e470
+DIST F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar 91110 BLAKE2B 55b388ec5e6eb7c12b37a2c7f03de59a67430be3bac21ba2329cfd4c3a9197f0e11797d98177d8b8f64987627df0eb8f93a094c366771d569cf2004c18791ca4 SHA512 bb91d3675c5a9fcf86631ef40c0c97bd14869d73864b46d82ba585208b17fc20ca9830ecc327ad3d3d55746015a297d3ef34de97edb381afdb790336438a202e
+DIST F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar 1077617 BLAKE2B 7ea8df70365cc3675ffed5bc9277fb0da34bd8374af3d7479554ee3a8d4c6cf06f663813cff8bd155c95311faaf782693dd272e04ca9c943ed2299cbf24c1a8c SHA512 c7faa01d25b323f63604f17602c62cdf3cec9fce542cf51c0666d6042db37efb9ac0296da0244a83ff4738ec44c2a67ba6a2550e0acbf621ad83a9b7db56ebe0
+DIST F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar 6599 BLAKE2B bad0cf397525081c09545ff18bbf57074f9858dc581faab2ec37a0c371ae09a14c9220e3424c46b9849690b2c48ee03de2f53e3a6cb5814d163c6b1a3c458845 SHA512 862e3d9b2609df8888a2ab9569234f190583aed6bf553c8009921dd5a3c521f268c8cd91005371a5de6d1f561d6a22113c125d94fe78d18e6d4543246f0ef3d7
+DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 BLAKE2B 8d847c768f545b668838b7adce3f0eba4b3b7b4f56469b59e658da0089313748843d08a4f0df180824a3a5e516fb9f103e259c37b315b0352daf58e8ff711470 SHA512 8add9ad7e3f2fb551c11841ad991f204dbeadf7d88cf2e10609644deaa1012095579fb32d568aa67715108062836b48d5c17fd69d5b61d33bca38ad85a617ab5
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-ide-8.2-r1.ebuild 29502 BLAKE2B a602e565fac2cfebfa905a264795bd638e26cff038d8dd40104b19c398d938c054cfcc5cdd8d90354d16fe16e384d6a28811c1685f955fba7628990cf99b66bb SHA512 b240c2d2e3a76ab7b8dc9f0fead272caa85ec2583c25d4e486ec0a9396f802fd5f2b6b9a261ddd45c3fb8ef6119fc92904abef83a496ed3b6677a174c16b8a34
+EBUILD netbeans-ide-8.2.ebuild 29489 BLAKE2B 12c8c79b8566387e30401dc33b411c5491702b1cdf2f72486afdb6be42a9659d5465bafdd386c7ecbeaed4181f0b9cfb8ad039b99b92c801fe441da9d23f31c5 SHA512 4be4bb7912bef84b19a4daeab23291a7480564906834d0190f5ff2440e52ce16228defebea3c1aab03152c2eb1022e43d5ffbe5428b3c95649d531e66d0da248
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-ide/metadata.xml b/dev-java/netbeans-ide/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-ide/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
new file mode 100644
index 000000000000..841b1b8c9e65
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
+	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	>=dev-java/antlr-4.5:4
+	dev-java/commons-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	>=dev-java/sun-jaf-1.1.1-r1:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/commons-codec:0
+	dev-java/javacc:0
+	dev-java/javahelp:0
+	dev-java/jna:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
+	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
+	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
+	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
+	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
+	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
+	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.4.1209.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf sun-jaf.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules
+	pushd "${instdir}" >/dev/null || die
+	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.4.1209.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.4.1209.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf sun-jaf.jar activation.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
new file mode 100644
index 000000000000..1d445837b6c6
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
+	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	>=dev-java/antlr-4.5:4
+	dev-java/commons-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	<=dev-java/sun-jaf-1.1.1:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/commons-codec:0
+	dev-java/javacc:0
+	dev-java/javahelp:0
+	dev-java/jna:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
+	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
+	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
+	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
+	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
+	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
+	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.4.1209.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules
+	pushd "${instdir}" >/dev/null || die
+	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.4.1209.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.4.1209.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-java/netbeans-java-8.2 b/dev-java/netbeans-java-8.2
deleted file mode 100644
index 7f62d2a5ec0c..000000000000
--- a/dev-java/netbeans-java-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-websvccommon-8.2 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:0 app-arch/unzip dev-java/javahelp:0 dev-java/json-simple:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Java Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/projects/java
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-websvccommon-8.2 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:0 dev-java/absolutelayout:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/c3p0:0 dev-java/commons-cli:1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/fastinfoset:0 dev-java/glassfish-transaction-api:0 dev-java/javassist:3 dev-java/jboss-logging:0 dev-java/jsr67:0 dev-java/jsr181:0 >=dev-java/jtidy-1:0 dev-java/log4j:0 dev-java/mimepull:0 dev-java/oracle-javamail:0 dev-java/saaj:0 dev-java/slf4j-api:0 dev-java/slf4j-log4j12:0 dev-java/slf4j-simple:0 dev-java/stax-ex:0 dev-java/stax2-api:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar http://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=29db5adbd9506b4e8b329634b7cfce4b
diff --git a/dev-java/netbeans-java-8.2-r1 b/dev-java/netbeans-java-8.2-r1
deleted file mode 100644
index f80371f5c416..000000000000
--- a/dev-java/netbeans-java-8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-websvccommon-8.2 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:0 app-arch/unzip dev-java/javahelp:0 dev-java/json-simple:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Java Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/projects/java
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-websvccommon-8.2 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:0 dev-java/absolutelayout:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/c3p0:0 dev-java/commons-cli:1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/fastinfoset:0 dev-java/glassfish-transaction-api:0 dev-java/javassist:3 dev-java/jboss-logging:0 dev-java/jsr67:0 dev-java/jsr181:0 >=dev-java/jtidy-1:0 dev-java/log4j:0 dev-java/mimepull:0 dev-java/oracle-javamail:0 dev-java/saaj:0 dev-java/slf4j-api:0 dev-java/slf4j-log4j12:0 dev-java/slf4j-simple:0 dev-java/stax-ex:0 dev-java/stax2-api:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar http://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9310321716bb3d340e9bbcfee24eafb3
diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
new file mode 100644
index 000000000000..abb1770c97ac
--- /dev/null
+++ b/dev-java/netbeans-java/Manifest
@@ -0,0 +1,31 @@
+DIST 0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar 53529 BLAKE2B 982e25621a42bc6d7fe708984aeb1308f2a14037708f22e250e8d89749eb969221ee191c8a228136757ad6087adc1b545bc51ae21cceaf138171404d06e990ae SHA512 406fc500e6356cb6729b89026180331c8717921e22fd0627abb799e73cd0f82c64af654b64922175f7f5514af621bd83dacae123a6078966264cc3cc753a7b5e
+DIST 29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar 1366247 BLAKE2B 7303eee6b3583bf14d659ce47d1f93ff5bd83d9eb91adeb0bcaac82dfd23a45699a8424158f94731d08f04ae14f0633ea2b3b23deb220b831a80c57768227740 SHA512 06d887e5cd47b6bd86ea9e1a26c604b630285129dde43e6068d4b36f0e81c39cd91757e3323e77316e76b0fdf8c18a609bd216c7103ac8a4d947abd0ed6bab47
+DIST 3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar 11763 BLAKE2B 41aa6a8fe13341ceba288973c314b8f8d4ac53594d2ac3b0523ea6420542f86eb51f410b6367ca93e5695b49b152814ac08848c8b1cd1861c434f09a27606647 SHA512 c834126f83008d75320eb33c5a752787d6ed7e96b4223aed329aabb08aad93d13d64a8be03d28f989d5f558e9233ae221e4eb9fec326df01b6be101ebab38b35
+DIST 3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar 45718 BLAKE2B cfd1271501b7ac8763d21617af3e837575822bfda8f43f970120573613a08483839c672fafe23aa3684e97c518774b5dc02f6ec928349a6ecebee6dcc8f05978 SHA512 1abad0ebdb35d8fd4eec1350ac497cc6a372239aea9eb6c45a94265f46e4e5c2458fe5e4d0e1e067effc9ba8629451abf169bb4820274484f9c2404271b21727
+DIST 4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar 2259008 BLAKE2B a737c5a3b6e084569a7a9fe8b24d6ecf1137b04b037c502fda7581a125563670df218c496414b1ce0d715861a093bec9136abd4da183c998d4208560328486dd SHA512 058d88fad0522a9fdae80552eecfa743cd771c7325b630762d13c1456f5f51024c6e88111d3e92ed97c69cc1013cc3d2e81332b94063113fc025951f871bf881
+DIST 562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar 23838 BLAKE2B cffd29e50cf40e3ff5eef7f458bdb802fb7ae0c47b63780b290fb07762a09f3330e0773bd991ee323506f61ec550e963744981bd92f276f31437bfe29f43539f SHA512 a39da963b1e0c0111870bc3989e10c70dd136c0276099b48cadc70706f76b0b2ba1ece6df67c05bf8e26a4638b19b28b454df6c23ed5a9d4936d3cc5506ec4b1
+DIST 5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar 3046788 BLAKE2B ca8e7040d9ea5df8076649eda04c171828d6611c0f5d00561bebf3e2d80c73ff17396d2f2463b3c1aed4d59d4add4c7c55eaaedbb314516e5c52a4f44417e3e9 SHA512 600640efc8be0dba0081eb3969688936caf57c50dc1967e94471d8ec35d0361e62aa73d3d9546271a80fe3fa8e3bdda365616d2a6ed309dc6fa3ff84f31680ed
+DIST 5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar 162126 BLAKE2B cd778dc9e92f93e2d1f99ba69b1b8d5c4bf289454fd6d9c70f40f2a1daad994581e9b14928d02bdf712cb4541b12f8914217477c9bf8e48a5e876008d787877f SHA512 de26d1e19a625adb040b6aa870762ecf8f1ffdfb2c82f58cc7a82f1a029249862dcfd39b6a995f63f04d9b36ef23a8ba8518c9cff1b5e2242e6ad5268790b5ba
+DIST 5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar 187846 BLAKE2B 8b20b89514fec78b00ce9f8c5cd04105f23b7c5637d7f741ee9a95fd888a2394ea269166b5ca065c25ab13e4a0edeaba4adb20c834c20cb5417ea8518eab3c1a SHA512 548dcb27bc8aa61f17573e0e9896c361466a5d226b8e6b0d5f9a0181d17ce61ad5d137caa268c33da17e8541978427c3faa34be99d96817d09f22277f99dfda2
+DIST 694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip 5870668 BLAKE2B f7bab4a4d1315a315eb57182abbe8fb3136eb1e5da229a115ecbf2e9ac354da579b8b0a1957ac1635d6638961df8e58dadc4b7099b5c84f0c4e4f7425113849e SHA512 49a0854318678ec52641babca57bbf57ce8d67825dc9b0565df77b8fc6bc90a2b02a3ace7dce737de49de2eb7d1f2885ca901350e8826a63c4dd5381f03fcaa6
+DIST 7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip 5678488 BLAKE2B 3752ba72d5e59a6607f69e4110e94fc84f78341a3014258a7a66997a18e62e205b9f725fe9577ea79dc7a56c6891ea64004175737f0e5d68434deaf24ab995e7 SHA512 d49f22b3ce2bd49f3ddfc35f86c0c21accd45a07b710b0787560b9969e40700d408a25e8e02d10f0d937ce642cbcab222d4e8fa28bd442e34c768b63e5583b41
+DIST 839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar 136324 BLAKE2B 83d2acd77c4ce91cb888fccf04439f19c6c5e4b3ac518776e8430551edadaadcbb84131f9af493aa25f17aa19e62a60ba9b13935db282d68420f59797ac70829 SHA512 c75746a1b82ef2c7ae13a33f06ec82292934e4348ead4a57d0e6b356ba79903e4658d031dd347e1e2c627288de6585c125a70e0f1d47a696db1eb967cbc36da3
+DIST 84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip 4599034 BLAKE2B 56e8f574461a4f9f34422d16c9769a38bdb42dfae9328640b1c5c1178f01ccdcd57068c2447f271253baa6374332b26732efa37a898e720eb5b8b18ac4c5a64d SHA512 5058624cadecf56182afe021b94b4ef10375b217000155a30d6f16d24286e985d472deaf47271a8239c15b5941a412b58c918e5f0684f5045690be322e0acc5d
+DIST 8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip 266314 BLAKE2B 186585fafd7a33b39ab37fbf05d560e9c78960d80c8923420f126cf5f82ef5018dbbfffaf463bd5820b28bbf2306c70a2ee303d8bbceffe2cb15851b26eae406 SHA512 f08cf953e56966a239d3ff31adc1b3ad74aac76207c4f92d860b13a2ddfbc6cb9ebe8223959ebebbdc6eb8f358a170ff8de544e58bf72a7c12eb101c32b02f46
+DIST 91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip 6377019 BLAKE2B 12cb5718f2f3807a48cbc6bec17bdd79b2cf131d6b38d954f77869a69a7643f2c7f8acaf141805e6a9f6f67f9754ed82d2cfd60e1b6158f5f5f9566dd7c958c6 SHA512 b43fce0d1e39985395b3f161908d52a3c7eb4b1d70b9f0485cde5b782c2ef861594e1f49d71059cbab8fb71d5fbdeabbdb9c40866b9596bc8677359b79876c99
+DIST 9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar 1539086 BLAKE2B 941239dba58346bf80e7dd9537fc24d3779dd2a8f72d1d12a3cd022b6c10c3a5d70624c5cd5574d531d0650c45051c1e64e4423c4fb56a64f3bb598a47c3bd3f SHA512 cf8c1218f59a20e4bff22a1b179299e632258dbab92992b6600f1af3ddba1ffd10daa709e758deade56f37dc34245bff23a0789b0d57c97805767a1639602653
+DIST A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip 675425 BLAKE2B 976aaf823f1406b661bf23b1c8be1fa40340152590e0ed9644ac799af574a643d05f07ab0fe6aee44c3dd289d6cdec1ab589a623480e28d866c839bfcd2eb188 SHA512 bff8f89e96ae7b5cf22bbdbcbf95c1b6c789626a4f3f972a7216c3a545b3f85a67950c022f19c36edefb8e3fa605968b31e267166922dfb46fdd56bc16e4bd7e
+DIST A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar 89171 BLAKE2B d7e06cde7dd4dd9b518eeff0e690edc83f4bc629f28d88ac26a357ca4cdabac8514bd73f98f15ba74132f4b651d3dbb7388bd389220c20b7b19e97f283882ba7 SHA512 b66922bb86a5eb787a76714a6bf2c2adfd8469ea9c3031d9b5970373f71a2349b1e8156213397b9119cc9510e48905b181388744bf2189e04e18922023dacb12
+DIST A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip 19717645 BLAKE2B 2adb68820a13423b9a991df50eb52120189e4e691da1536138da1e74bcf207bf1b648b3ebcddfe180e0f6b37d1b81326dcdd23d405c5b032b5c13798657d0207 SHA512 160fa0353baa9b31090432053a2d602fdffa663fe1f83ad79de4788ed74d3e5938d0bba0ef28ff4a946e6bc99c3a629b3fc8ff7d44ada98348fee816cb39b42e
+DIST BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar 56032 BLAKE2B 33fec12990b539eb86ba3e2df8760130ff8465340797a610ac80e1ce9927340dea3dcb6e2fa329c3ae86a3d49cfdd11d04810ba3b1346e116ca50aa1a356bd14 SHA512 c84d4066b9519cf2c00d5d4f054865693cd1665e5db3b30f6e77b44a7c0d3055cc40a1641b805ea38d2294e2cab1a27fab85035950ff0d94960a4de185bcc76b
+DIST BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar 11429 BLAKE2B f394952ce980db5ee29eae5309a1891b021c49bdd86a60d1c0681b46f242ade272762a053b2e7dada569623946b6573ec38e6f707e513756c20b630706dc208b SHA512 f7a69e5622153a3f6568a7b28b753ab0d19adea6c34a265b5efeaf95a9961dd0af711d0719956e0859fa3c63a1c06237381c35f20fb14e1fc9d9894f09f3522a
+DIST CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar 8632395 BLAKE2B 1a29ac269c1561dae6d6255d8360dbbf630659f16bf1aca876be2c15f2e0b3027fc333dbf0e7721ce0454b0c1cf940a60f8267e60b065e9a96b2783a8cfb189c SHA512 56559a40532fa42775a92d82296a86033a587116870d8201dd42f07e29990a28de5b1547e3fb59ddedadfe6b4fc3dd109b108cc65cf7b253ac1b0fbb9cc03fcc
+DIST D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip 84706 BLAKE2B 6a793abd7cfa879ec9fa382fc2dd6b81a6c914cdfaec1d57194cab836a0a072672d794b1e848ec69b9b7ce8d86abc8dd9df9bcb4805e3dc93bf03232a76bfe6e SHA512 5dd4270d3514f448f2d1533b099dbe64aab97c21e89066c467a3332d354f0675e27f6ed5ca1b23c01a2222c8e1ad261c374ae6549b9323951763b7a542a386f5
+DIST D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar 120575 BLAKE2B e60c0c49c5e81a4490d9be7b4c774a2cfabcdb7cee5b8e78110437c9d67ac1145fff47e744bbb9b3554ba7b5b58883b21ee3f9680f47f3f3e60f793b3834a123 SHA512 788bb5e115a77e12e9329db70e0b6edca185ebd5e30a8178f451da3a8492acba8c89848873acff224868772f464f17bd9eccc9130638d49c95593edd697d3dd2
+DIST E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar 227553 BLAKE2B 0d39bd0332636a8a9a906d926b9507a77ba03088e544ea360852dca1496e12aabfd3063b38e85a10f75043b1c292ebb114e837b45522733fbeb387c036547cf4 SHA512 5ff83f5925fa4250ecb46e08f7f064ccf5d637bff14edadf16abbcd0d6a6203cedd07a64cc5718656249d18b17a1016f7152094da3f8ed13fdbee9afbdfcd926
+DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 BLAKE2B 3dd14163ec38294b42974e54fa7bcfb551468294dc4e8ef00928ec13df9eb774ee938a58c06565cc621592457f0c9c96d4f352bbb53d63bca5f2526c6022d9ea SHA512 0a65813cf76e997b362a0ce48ec55ac180907a7af6062c6f86f96448775164c2bf67c147920f2bfa6a8eb24c14046acf66d0ee9a5481bd7b9b251774a86a7db6
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-java-8.2-r1.ebuild 15304 BLAKE2B 71694169d54d481dcfb95f23eb23950473ef595eac0f1c06421b893b31ee1a00beae5fdc0e68deabe72e7a4cfa58a91f0262f59cf0a3485f32ec84d2150c0780 SHA512 c08f766179e97b6866c137b51216f9d9115304cebfe3d7cdb64b9b804a396125e32c0f313150edf41ecc08e37049a3dfad2a546f2417e2d98d7bb02b26ef6547
+EBUILD netbeans-java-8.2.ebuild 15282 BLAKE2B 6f9cc569192af99f8fb70f17564cee6e2dcff4df8d537a920447fe49aa538fa8296091388670c89e41162c1a1abfb638d1607c96b54b83fd8617df1808be3827 SHA512 833a66094812baf6ee45ead2dbe4afec5e1b9b4269bd55e77e6445d5ddd17f295e856235b62c59932a8ac27d5b0c1f3d560360dd8a19dd6ce4b7d32bcd97cc97
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-java/metadata.xml b/dev-java/netbeans-java/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-java/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-java/netbeans-java-8.2-r1.ebuild b/dev-java/netbeans-java/netbeans-java-8.2-r1.ebuild
new file mode 100644
index 000000000000..b12ee87baf75
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-8.2-r1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
+	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
+	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
+	http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
+	http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
+	http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:0"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND="${CDEPEND}
+	dev-java/absolutelayout:0
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	>=dev-java/jtidy-1:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	ln -s "${DISTDIR}"/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar maven.embedder/external/wagon-file-2.10.jar || die
+	ln -s "${DISTDIR}"/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar maven.embedder/external/wagon-http-2.10-shaded.jar || die
+	ln -s "${DISTDIR}"/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar maven.embedder/external/wagon-http-shared-2.10.jar || die
+	ln -s "${DISTDIR}"/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar maven.embedder/external/wagon-provider-api-2.10.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/maven/lib
+	pushd "${instdir}" >/dev/null || die
+	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
+	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
+	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
+	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
+	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
+	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api glassfish-transaction-api.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
+	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
+	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
+	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${instdir}" >/dev/null || die
+	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
+	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
+	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
+	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
+	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
+	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
+	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
+	pushd "${instdir}" >/dev/null || die
+	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
diff --git a/dev-java/netbeans-java/netbeans-java-8.2.ebuild b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
new file mode 100644
index 000000000000..20e2c32c4036
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
+	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
+	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
+	http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
+	http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
+	http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:0"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND="${CDEPEND}
+	dev-java/absolutelayout:0
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	>=dev-java/jtidy-1:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	ln -s "${DISTDIR}"/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar maven.embedder/external/wagon-file-2.10.jar || die
+	ln -s "${DISTDIR}"/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar maven.embedder/external/wagon-http-2.10-shaded.jar || die
+	ln -s "${DISTDIR}"/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar maven.embedder/external/wagon-http-shared-2.10.jar || die
+	ln -s "${DISTDIR}"/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar maven.embedder/external/wagon-provider-api-2.10.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/maven/lib
+	pushd "${instdir}" >/dev/null || die
+	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
+	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
+	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
+	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
+	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
+	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api jta.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
+	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
+	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
+	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${instdir}" >/dev/null || die
+	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
+	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
+	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
+	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
+	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
+	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
+	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
+	pushd "${instdir}" >/dev/null || die
+	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
diff --git a/dev-java/netbeans-javacard-8.2 b/dev-java/netbeans-javacard-8.2
deleted file mode 100644
index 56d685f20882..000000000000
--- a/dev-java/netbeans-javacard-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 app-arch/unzip dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans JavaCard Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/projects/javacard
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 dev-java/ant-contrib:0 dev-java/asm:3 dev-java/bcel:0 dev-java/commons-cli:1 dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=481ec51be1ac653b349407dd81bcfea5
diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
new file mode 100644
index 000000000000..1834bc8713a6
--- /dev/null
+++ b/dev-java/netbeans-javacard/Manifest
@@ -0,0 +1,7 @@
+DIST 33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar 60835 BLAKE2B e826ad6b908c476518086361384b498abb77703210c9702100c5e5ca87ef1038dbd448885ade5326878eb924298192714c76d07b30ac9080712ea20df53621e7 SHA512 119bfd0c03d8508251c1b70fb2ffaa2c096dbf12ee4558c689b81b33724d88ce03c7805dc473e806f49c0a400a9fd586e1d3c96a3362fa26a962144bc92e4abe
+DIST 6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip 7788619 BLAKE2B 3eacce7db30ccc5f15ecf65bbcb24c24429646702e20d9a8983d4ac711bb62bde99999ef6f4e12118bf69e38716bbd96ec078f0129299538f93376ed0b74535a SHA512 4c61ac191ff528466d7112b7d162596ce6d636484bce84c1781f92e2c865592df8919ad410a1053a418710920815d7f04792b25275c5304a2b9107b5420bf792
+DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 BLAKE2B f5d82243a58e8dff86966d2d745ca2fd39654ba33d502cdd56ad4dcb88ca28bdf6e347dd48034bd2cb70318ff0cebc79c7b26887fcc5bad430c8ab13f9acc8f5 SHA512 52601718cefae5570412b801999b5d6799ff6425d6a090323c6dac80248598b21f8ecf09c31e6a7f73f6ca7de9e99bdd3e79f539d96c5e1192fd2958766d212c
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-javacard-8.2.ebuild 4597 BLAKE2B ec30097b59f82426e3bb1ca8370365150d374d32c13af558613c15612512211a5be4c220790c42153b4803ab29fa7ecea7db9e295adff6872690e2a77d27b0a7 SHA512 08db9582217c6b8d1c151e2e04d985a5b2bb4b2321b56d1ce7e782480e6d56e77bba288513457a13e5aefd828f9b33d8e663124b760ab00b40081f0d91022114
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-javacard/metadata.xml b/dev-java/netbeans-javacard/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-javacard/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
new file mode 100644
index 000000000000..ec2f0e662487
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
+	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
+	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}
+	dev-java/ant-contrib:0
+	dev-java/asm:3
+	dev-java/bcel:0
+	dev-java/commons-cli:1
+	dev-java/commons-codec:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
+	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
+	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javacard >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin || die
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${instdir}" >/dev/null || die
+	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
+	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
+	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
+	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
+	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
+	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}
diff --git a/dev-java/netbeans-javadoc-8.2 b/dev-java/netbeans-javadoc-8.2
deleted file mode 100644
index d79d62ee3640..000000000000
--- a/dev-java/netbeans-javadoc-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/oracle-jdk-bin:1.8[javafx] app-arch/unzip dev-java/javahelp:0 dev-java/junit:4 ~dev-java/netbeans-apisupport-8.2 ~dev-java/netbeans-cnd-8.2 ~dev-java/netbeans-dlight-8.2 ~dev-java/netbeans-enterprise-8.2 ~dev-java/netbeans-ergonomics-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-groovy-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-javacard-8.2 ~dev-java/netbeans-mobility-8.2 ~dev-java/netbeans-nb-8.2 ~dev-java/netbeans-php-8.2 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-profiler-8.2 ~dev-java/netbeans-websvccommon-8.2 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans JavaDocs
-EAPI=6
-HOMEPAGE=http://netbeans.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=>=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d95ed0a7453f71ac13cce81bccb717f8
diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
new file mode 100644
index 000000000000..ba2113a35ed3
--- /dev/null
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -0,0 +1,5 @@
+DIST BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip 2341753 BLAKE2B e322b5aff8830c4e20fe8ed132b06169ab12a22b2c6416d85c6b7e45d34e546e99dfaa5ff30f4bbce33c77089df0f298fffabb1d187224e6ac1b4a6ec36a8e31 SHA512 024b1458f74ae977f5864b543b39417205203f27ff94518aa61ee4c7336c887dc5704b71909fd2b6286c3a29a9ee0aeb86aafc32f741c7650adcacc8374f62ca
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-javadoc-8.2.ebuild 5940 BLAKE2B c1c7576e47437d5ab5847d8b640ef43d03d9921cc19106667a38ac5336a814075d78f9596add3c483be3e7cb658c0a3346bc8a14af91e394ee1b9490f3bd5060 SHA512 e977fadc36971140cad10206051e54d149fea8026c993a5c1cdb9e64313e94717f1429310b61c2f8846e8ca715f5a3065384bed56756c0a55a1e3204f87a9b75
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-javadoc/metadata.xml b/dev-java/netbeans-javadoc/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-javadoc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
new file mode 100644
index 000000000000..45c1e8fc8c28
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/junit:4
+	~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-cnd-${PV}
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ergonomics-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-groovy-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-javacard-${PV}
+	~dev-java/netbeans-mobility-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-php-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+RDEPEND=""
+
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
+	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.cnd.built
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
+	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ergonomics.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
+	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.groovy.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
+	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.javacard.built
+
+	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
+	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.mobility.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-php-${SLOT} php || die
+	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.php.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() {
+	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
+}
+
+src_install() {
+	rm nbbuild/build/javadoc/*.zip
+	java-pkg_dojavadoc nbbuild/build/javadoc
+}
diff --git a/dev-java/netbeans-javafx-8.2 b/dev-java/netbeans-javafx-8.2
deleted file mode 100644
index 198be40cb236..000000000000
--- a/dev-java/netbeans-javafx-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 app-arch/unzip dev-java/javahelp:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans JavaFX Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/projects/javafx
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=24d4e9efcd44d6f22ad75906676f0000
diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
new file mode 100644
index 000000000000..279c592c77c7
--- /dev/null
+++ b/dev-java/netbeans-javafx/Manifest
@@ -0,0 +1,10 @@
+DIST 20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar 61713 BLAKE2B 4b4c47851bca5a7cb4e81791ed186790167e5804a072f52a0ad75d6e133f7f37875ed20350f6d39b72da32aa659486e4d3334972f21ff27d8f0a400545bc3793 SHA512 2d06db5267ac5d8fd227819014177f0d5cc345583628f1ff2fff89f180a4269936a136af0b4649cf43603b0adab6ce3e3f525ef2033537c6f035b558c356d900
+DIST 49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip 579550 BLAKE2B e58aecad031e08a69d9f3f69be74960a9ed8049a94d8445bf5750c6b2907b4739f63d1f37ac6aa50a5fe96c02cba7d3ccfb836304b6956d3a21add3d8c83f32a SHA512 3de7720a392813cbbbc73a6ce2a745e10054c0888df61b1e623bf327f8a4584a9eaa07303fc41d01d2088fd6c868e7273c6355d23839dfaa9009d1f672520d58
+DIST 5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar 187846 BLAKE2B 8b20b89514fec78b00ce9f8c5cd04105f23b7c5637d7f741ee9a95fd888a2394ea269166b5ca065c25ab13e4a0edeaba4adb20c834c20cb5417ea8518eab3c1a SHA512 548dcb27bc8aa61f17573e0e9896c361466a5d226b8e6b0d5f9a0181d17ce61ad5d137caa268c33da17e8541978427c3faa34be99d96817d09f22277f99dfda2
+DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 BLAKE2B ac04471f6fd5869d4fff8fe86749b599cd49d81d55319085c01f7fdd7ff30aebeffafa46dad254e7193fe3d035f3b4d0310a7e9242cb54daf82188510e4fcafb SHA512 5a0089c36c35ffa2c243cbaee376a246dbfd3dd3f170fa233946b6134f9c80dda610f2900e8bbd1553c3e8bdd3b5548145c881745acc720ec1e059d8252b8399
+DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 BLAKE2B e06b4df3e96cdaf8150c74f2039a28251a55469449674cbb045a46d7866ddfa52f6e3ac4a01a7c7da4f40906038245574f1cb208aa3385bdc48f88ece3924519 SHA512 ffad7d45643015d178cdb1b5bb075f0232470f5f7b82acd87d3dbf88e2034aed04fa9fadadbf7831d3c57fe0c4bc9684d841aebaa8a99ba1d6c1f6cb13f80359
+DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 BLAKE2B e06cc8c989a3ecf5c501ad3e187b8f2afcd7a4838345812b52e0496a2a68b481d2f4406bde00f9cad662d94d97494769d7ea3a2686cf62d3691d953d67701010 SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-javafx-8.2.ebuild 4343 BLAKE2B 3aba488e1f9745ea11e9205a7058338d60db2378c8cc05c0620871b1ff89c0d9310c631dc7b686787870ec468b1ad9b04e4cc7dedf64a0b8542cbedd004d080b SHA512 b883be9a1d77a1933e719a7713ead18206dc3301212cd23a9cc88aa7d06560139e95a2dabf53fb2a5b926d0ab085ab266751d8aed646a97d6ea9fabe7cb9aa19
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-javafx/metadata.xml b/dev-java/netbeans-javafx/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-javafx/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
new file mode 100644
index 000000000000..1709fa057411
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
+	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javafx >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
+}
diff --git a/dev-java/netbeans-mobility-8.2 b/dev-java/netbeans-mobility-8.2
deleted file mode 100644
index 12af3935f9fc..000000000000
--- a/dev-java/netbeans-mobility-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-apisupport-8.2 ~dev-java/netbeans-enterprise-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-websvccommon-8.2 app-arch/unzip dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Mobility Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/features/platform/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-apisupport-8.2 ~dev-java/netbeans-enterprise-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-websvccommon-8.2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=86db5ddc139a71229fa58d4ba9a30b0f
diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
new file mode 100644
index 000000000000..91b436c23ad7
--- /dev/null
+++ b/dev-java/netbeans-mobility/Manifest
@@ -0,0 +1,4 @@
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-mobility-8.2.ebuild 4038 BLAKE2B 1811d5c1e5e59ffed5b0846dd862f0397d974ef10af800cfa873918f1e78cf5e09a3a2e92f3b9e6768dc31dba1d54285632253eb620b8163a86219dcfcfc5dd3 SHA512 efd620ee98dd6482f87a01f6b114f867a67de9e772b1ae6759d71ba6deca253492759fdc1c674d1b57ae30caa4f7c0f53ddde103d370372acbe886cb1f20bebf
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-mobility/metadata.xml b/dev-java/netbeans-mobility/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-mobility/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
new file mode 100644
index 000000000000..46b758883587
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
+		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
+		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
+		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
+		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/mobility >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
+}
diff --git a/dev-java/netbeans-nb-8.2 b/dev-java/netbeans-nb-8.2
deleted file mode 100644
index e7b3b602e965..000000000000
--- a/dev-java/netbeans-nb-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 app-arch/unzip dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans IDE Branding
-EAPI=6
-HOMEPAGE=http://netbeans.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bb53a91562b5e6785bcf7fe9bdb7a4ef
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
new file mode 100644
index 000000000000..c69bd78f4c52
--- /dev/null
+++ b/dev-java/netbeans-nb/Manifest
@@ -0,0 +1,7 @@
+AUX 7.2/keychain-support.patch 872 BLAKE2B b03371474ee9153bd9d2d1008089e1c1730b393ecefd7a89747f1a5e4fef396d2a927cb64fb05512002ff2faa795d1055fb92cda969f5ec2041b07ca5ad9c5eb SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94
+AUX 8.0/keychain-support.patch 872 BLAKE2B b03371474ee9153bd9d2d1008089e1c1730b393ecefd7a89747f1a5e4fef396d2a927cb64fb05512002ff2faa795d1055fb92cda969f5ec2041b07ca5ad9c5eb SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94
+DIST netbeans-7.0.png 20011 BLAKE2B f502517c7495b888f4942ae0aa7ea5206205ecadf13ffb5abb7470abeaf27db84dd5a8ff39e540c3da701c3e56f6ba196933f00ba38aa13d022e5b4d0cc19eaf SHA512 67bc2673f3e770bbde10587e68890c3091ef38a850cdf48ca73e4c1a288246e1f757fd4ef1c7b052b6137f31fa6044c9bf3ea5a2a9e0ceaede132c106a746113
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-nb-8.2.ebuild 3738 BLAKE2B 775f43c9e5ef5ecd71615e9ff5b13a2338a828b02e31d3fcf9d99176011d342c98f69e478e1235ebb830088b4e9d50b9c1866c398c04fb0f93d857a3a9ebb473 SHA512 729097b8a574ea971c8010adb3387aa3f4a54773f565fc735ed8ccaf6294cba8254f2c325734c7d7f9d1cf16cf1f9bc9d7ca5cb323294eb541b8f16442bdfb3c
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-nb/files/7.2/keychain-support.patch b/dev-java/netbeans-nb/files/7.2/keychain-support.patch
new file mode 100644
index 000000000000..4e9c4878fbcc
--- /dev/null
+++ b/dev-java/netbeans-nb/files/7.2/keychain-support.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# Parent cbf7b2d2851314077b9c1ecd6ec95ce51453daf8
+diff -r cbf7b2d28513 -r 0350861eeabf ide/launcher/unix/netbeans
+--- a/ide/launcher/unix/netbeans	Tue Nov 09 13:44:15 2010 +0100
++++ b/ide/launcher/unix/netbeans	Tue Nov 09 14:21:18 2010 +0100
+@@ -169,6 +169,20 @@
+     then
+         sh=/bin/bash
+     fi
++    keychain=`which keychain`
++    if [ -n "$keychain" ]; then
++        $keychain -q
++        . $HOME/.keychain/$HOSTNAME-sh
++        if [ -e $userdir/keychain-keys.txt ]; then
++            for key in `cat $userdir/keychain-keys.txt`; do
++                SSH_ASKPASS=`which x11-ssh-askpass`
++                export SSH_ASKPASS
++                if [ -n "$key" ]; then
++                    keychain $key
++                fi
++            done
++        fi
++    fi
+     if [ "${founduserdir}" = "yes" ]; then
+         exec $sh "$nbexec" "$@"
+     else
diff --git a/dev-java/netbeans-nb/files/8.0/keychain-support.patch b/dev-java/netbeans-nb/files/8.0/keychain-support.patch
new file mode 100644
index 000000000000..4e9c4878fbcc
--- /dev/null
+++ b/dev-java/netbeans-nb/files/8.0/keychain-support.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# Parent cbf7b2d2851314077b9c1ecd6ec95ce51453daf8
+diff -r cbf7b2d28513 -r 0350861eeabf ide/launcher/unix/netbeans
+--- a/ide/launcher/unix/netbeans	Tue Nov 09 13:44:15 2010 +0100
++++ b/ide/launcher/unix/netbeans	Tue Nov 09 14:21:18 2010 +0100
+@@ -169,6 +169,20 @@
+     then
+         sh=/bin/bash
+     fi
++    keychain=`which keychain`
++    if [ -n "$keychain" ]; then
++        $keychain -q
++        . $HOME/.keychain/$HOSTNAME-sh
++        if [ -e $userdir/keychain-keys.txt ]; then
++            for key in `cat $userdir/keychain-keys.txt`; do
++                SSH_ASKPASS=`which x11-ssh-askpass`
++                export SSH_ASKPASS
++                if [ -n "$key" ]; then
++                    keychain $key
++                fi
++            done
++        fi
++    fi
+     if [ "${founduserdir}" = "yes" ]; then
+         exec $sh "$nbexec" "$@"
+     else
diff --git a/dev-java/netbeans-nb/metadata.xml b/dev-java/netbeans-nb/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-nb/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
new file mode 100644
index 000000000000..9025ef03d113
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+
+	# fix paths per bug# 163483
+	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
+		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+	fi
+
+	dodir /usr/share/icons/hicolor/32x32/apps
+	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+	dodir /usr/share/icons/hicolor/128x128/apps
+	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
+	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
+
+	popd >/dev/null || die
+
+	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
+
+	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
+	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
+}
diff --git a/dev-java/netbeans-php-8.2 b/dev-java/netbeans-php-8.2
deleted file mode 100644
index d81e83916acd..000000000000
--- a/dev-java/netbeans-php-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-webcommon-8.2 ~dev-java/netbeans-websvccommon-8.2 dev-java/javacup:0 app-arch/unzip dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans PHP Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/projects/php
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-webcommon-8.2 ~dev-java/netbeans-websvccommon-8.2 dev-java/javacup:0 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=53aab5f0a086f03bf982e2421e144749
diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
new file mode 100644
index 000000000000..3f0fa435ea2f
--- /dev/null
+++ b/dev-java/netbeans-php/Manifest
@@ -0,0 +1,7 @@
+DIST 0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip 38814 BLAKE2B ac7a248bd3431c2421474065fc1886f7861445c1ec29bfc48de91bffc7f1ebe9256dbd3413fab96276ff3fd26b46ac095cb86b15571dd8e75ac71da13868fda3 SHA512 75773b7067a0ec98263bdd2e9fdda77ae05e415b19b12e828ca92085266380f19980ffcdfdfac5a7f284fd2292b3af47ee93938b034f77397d8ade129fec6076
+DIST 3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip 4593 BLAKE2B b116ea4bdfa656e618ee850fa59b74cb1adbc79a263eabd6a87c0b49037308d40d187643de843bfd89a963d2b7e912a70b9e84ee5a3d43a109a046100aa474ae SHA512 66efd8c6f586c501e19d0b1f04ab212c955ffbd67bf489a9c60b37e0f93733c75b86b01462cf78ba8877b4baff723659d9753458aeb8a0150fbddd4d81ab1b01
+DIST 472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip 510273 BLAKE2B b66803089a422d55a9187a51e3381f6bae6eb80d602b4bbe51423fe46065c5b8ff23ed22f8b55e3743d851b6a6c603c09daf4233e244fb5ce87ba9943e460eef SHA512 d28f46ff8cc1874108a9a2ef37b6e41b40df27cd36eb976e23d75ac2fac36dcd08f8a18a26d62126bd982724e747cdc9c344f8c25cf3cbeeec9194e0d4412341
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-php-8.2.ebuild 4044 BLAKE2B 57d223814a428803bfbb458c5e2f8da59b396d34c258ff91b27deb0b4dbccbda7cff728a43cf6c1b65929f22ddb6a49e7c17dccba9fafb2f05565a495df8541c SHA512 43f9b754382b1496f881d3a2d6f9a1ea2a04322d32cf876b9fa6dd1e9c012e31d3359f8a8828908a973f2eb9c65723f5d34e62a02d2a1b5475b87324cf02cdd5
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-php/metadata.xml b/dev-java/netbeans-php/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-php/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-php/netbeans-php-8.2.ebuild b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
new file mode 100644
index 000000000000..c4aaafc0b777
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/javacup:0"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/php >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}
diff --git a/dev-java/netbeans-platform-8.2 b/dev-java/netbeans-platform-8.2
deleted file mode 100644
index 94673d8fb403..000000000000
--- a/dev-java/netbeans-platform-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/hamcrest-core:1.3 dev-java/javahelp:0 >=dev-java/jna-3.4:0 dev-java/junit:4[source] >=dev-java/osgi-core-api-5:0 dev-java/osgi-compendium:0 dev-java/swing-layout:1[source] dev-java/testng:0 dev-java/oracle-jdk-bin:1.8[javafx] app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Platform
-EAPI=6
-HOMEPAGE=http://netbeans.org/features/platform/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=dev-java/hamcrest-core:1.3 dev-java/javahelp:0 >=dev-java/jna-3.4:0 dev-java/junit:4[source] >=dev-java/osgi-core-api-5:0 dev-java/osgi-compendium:0 dev-java/swing-layout:1[source] dev-java/testng:0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7b8fd427b24df51eec751f593c750a09
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
new file mode 100644
index 000000000000..175745f3ffda
--- /dev/null
+++ b/dev-java/netbeans-platform/Manifest
@@ -0,0 +1,19 @@
+DIST 10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar 26101 BLAKE2B 826c6d577de20d7f37af54869718a078262a17863a3a4e18ed568819d52d5a91eecbf1a7666a7d529552494a79557b0137483bd2e627366b7ccae3ba897eae2d SHA512 be6587de5ba44b05a4912658cff0dff15c20ee984462b441d6f8088a2d6a991f1c070ee78fe75ed35ad406d11c615a08a1b40b3b729cf7b3508c60ded1ad3caf
+DIST 1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar 529233 BLAKE2B 3eb995b936e2de9b8a580e5b96224c016a6fdebe93aabf6060bd339b98d85ea56bbe0db72de29a16866fe2a5c0bf12dcb4b5e0695b8c93814304fcfc52b702ae SHA512 55f88f204cafd6968a952d6d08286220a569f678915446aca2b49bfe3bb7e2de6935d5ce834ef55363209d8f23be7d2275cc517a2ce837b75e5e5a6551e9ba9e
+DIST 1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip 77859 BLAKE2B f5dd4139af4f6f477bc8e344eea5eb280eddcdf19482c9f42bb8286b13fccdf949a2accf691b40acd39a21b42435e2935eb05f13a885077cdd6ef194270294d2 SHA512 15834d5448da80be539259e902ffa678a3b94293ffec221ad1e6238f0abd2dd2b588b8c06165f7e89796e96a6660c3166aad13112d34eebbed29163b52074b56
+DIST 2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar 241636 BLAKE2B 66c75fc8a10cae353751e087b5553499989b9bcb5a662d853f45c992f7a7ee363be8f93872fe2ac918ef2cd591838481e82661abb0c7246f4a062b6a6ccaf364 SHA512 346746e19ca24e7489ba7bb283cefa47d2df33e6795e9e275bdc269dc312537264c24537b2128246cca8a4c2053a73e4172c6d0b9f16450e227d9aa895e9c730
+DIST 5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar 67500 BLAKE2B 6cedf54603f7c5566ab430a53b6337c21f646e4e5f9db2e87b0164e4b8b0e7959c3d98cb82449c0ee09934e17f5da5a37e51a459104900c8a473abe525c9150d SHA512 d87ca1d527b87a47266593bdc0e58f4aa4adb6a04869a342657940e8a442b58a60c08831e27202b9628b996c16bc4635a0985c8d3126962e5d7f2dde049515df
+DIST 6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar 9109 BLAKE2B 45880789d4e460e6d3375de4cbfbbb4f925f023a480ec2eaf3ff27cfdedc7d3c438bbf392bc65aa2b0184f815d15db84ebfde727ad5cc911a5adb7fa2a9717ce SHA512 883d2428460ab3728e60259fa74b5dd6cb0ef168eb54becb10ad0a289a29e518273917daaed64a7d8f8c61033a8dd56a160ea922be4e8df396823d00910b9c52
+DIST 771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar 45895 BLAKE2B 86bcd356cac1c242a4009b8f5ea5ba0a3322535e6ac9e603861bb375e46f0ab1c707b834dffe5ae57fdc8df1a01b11f8e1fde317c0a97191ec964920640b0c1d SHA512 5ea1efe94544f52aa9ac1492929c0342140df12cde399610faff719ad71f3740621834868876bc622f983c237a880df792ec6817bd0c7fd3ad6edc02320584ad
+DIST 7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar 59464 BLAKE2B cf7f28d1ddb8d3305e41e4793e98f1918731618d97214dfa90c04b53db0154ce9b1379fc2e98ca384e8d0f2234db07cc15af1643e14451d4ee56965b6550dd68 SHA512 dddc4e304ea53bead46d2a5d4485ce51447380003d16aab999fee799e98b9aab281e2d9426b2a41274a4c2fea98bd3a2470594c753c10748db3e3c20f5abecbf
+DIST 941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar 937942 BLAKE2B 4f79726785917812d37f6cbb27090317441319c540891e471d55ccf81ce5112862921fe73245b997e3a5c7d70ae540db9826d1cd3e82bb7e063b0b509721d40a SHA512 bea8b53fc64cc3fbab1646a9235e7a9d98ffc7311277ea6a53485364462fce1b4bc9645d9f0bb6f072ee32ca730f963f7cad5c43cad052b1df7fad6245c90177
+DIST A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar 14974 BLAKE2B 8d8149a394eb817e8cec79b50f3a272916e63825945640a7579b4f5f2433d28349670be28cb0caedefc53e6c22075dc90a2e654d8ce887674c331b0e5f7ccbb1 SHA512 7b52a1ad7d32ed98b9bdcc8fe4e179a781cd36b10aa87c3ea60e9fc30f27dd914a1fb94cf09d96b66c2dfb4e4f0811b01febcd746c3316155905f29eeed6abee
+DIST AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip 388369 BLAKE2B b00517bcbeea2f6e529f7e18b931f98d23f23d4fde51506b39890856d877c4370e72c0fb7e01e8fe2d7a4e4704b9f63aa8c149aca24b9b5a697d0c8a68fec8f5 SHA512 2a7938d152d101416ce2d06bce39e07d670189450a723cb298d23a1c6613c49569c6774fb160081b08f22e644e71b27787a4eb9173856cfb3d56b05bca9b95e4
+DIST BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar 10702 BLAKE2B 403ad2646d7cbab7cf630350b9225a72aef5244f839204bdb7ebeddef82de555676d45f87468234d1b9d0e2d64a89ff63b289dd55256eff948ae18afbbeedd91 SHA512 8e054e4b207a30495718ffd0cc01a0654de1eed4a7ec37d0a23a68aa6a8af1fd215d0660d6d6957e39298866a3e0bdbcea6fd329269ec97bc4141548c814bfc3
+DIST CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar 10718 BLAKE2B 0134e79bd2e5671502bd2d75d66cecd247d6f3c8ec2e7fda7f21d9aa59e8ec7bb1aeb09ababee7f9b898a9cd0c916b91a22ee169aa101b0c004b9d894c9d75d1 SHA512 e679b73200a4cd33bb8ef575aa2d79cab29a0e97d042abf7db9576e247ac720effde1c314636719dbf5133fe9d00457865d1209ae15a3022d931a448f0c0758b
+DIST D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar 106018 BLAKE2B 336ca6386a8c781c5414195f0defaa65d8c721f1797397d8620e9fd6e4d137f09d9f3bd1d6dda400b20a2e024142fec35b643d58d83a4285c39c0e3591298285 SHA512 d7465d9ee58ba91facdbd911f38993788ca54865da64e5322fd29d399fc8e4b2680bb7c2575ebe421e7a247bb32a5fa5075527c0b3cc0b783a4dc2599b193a86
+DIST E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar 1333309 BLAKE2B e1b8d0dd9f9e7d9a1a2220c47421bb4b4dc9ba4c60804d598fd8c93b4ea2a4ded9f08483496e6e1f5b710e5b429f7fd4c03aa4c4e02d9035d4c6142ea8ed6926 SHA512 db6581b3e208470ced2ea5c367160dcb9470a1858926da46eaad6011d5a9feb273038467f75e57a375376ad947b3c1ecb4e5ea6a2fd88096eda84e1232b2eaef
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-platform-8.2.ebuild 9165 BLAKE2B 07ce2322d9fc33b869ff3fc873b71da1433541b5d68414a083288aeffe397681e5aec0bf1412f6ace1fb0cfb4bcc4e6c286cdb8b18c8ac33d1c46fa62ab03368 SHA512 5a9f7e5489d7cf6331bd49e6f8959a023a1329816b0853a229e24c10bace76676a53e509b04411d19b405d892cead1190ee5b9f507a3e4ffa63908c6003df1cd
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-platform/metadata.xml b/dev-java/netbeans-platform/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-platform/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild b/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
new file mode 100644
index 000000000000..4060b0f86ede
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
+	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
+	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
+	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
+	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
+	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
+	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
+	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
+	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
+	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
+# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
+# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.htmlui
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	dev-java/junit:4[source]
+	>=dev-java/osgi-core-api-5:0
+	dev-java/osgi-compendium:0
+	dev-java/swing-layout:1[source]
+	dev-java/testng:0"
+DEPEND="${CDEPEND}
+	dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip"
+RDEPEND="${CDEPEND}
+	virtual/jdk:1.8"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
+	ln -s "${DISTDIR}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
+	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
+	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
+	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
+	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
+	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
+	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
+	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.3.jar || die
+	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.2.2.jar
+	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
+	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
+	rm jna-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.2.2.jar
+	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.2.2.jar
+	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
+	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}
diff --git a/dev-java/netbeans-profiler-8.2 b/dev-java/netbeans-profiler-8.2
deleted file mode 100644
index 5b287fda0cde..000000000000
--- a/dev-java/netbeans-profiler-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 app-arch/unzip dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Profiler Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/projects/profiler
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ed3b866c1008f72b225b6b0815d453f4
diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
new file mode 100644
index 000000000000..4628461f1b39
--- /dev/null
+++ b/dev-java/netbeans-profiler/Manifest
@@ -0,0 +1,4 @@
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-profiler-8.2.ebuild 3098 BLAKE2B 8e9d62d5153ea361a7d32e3849eea4db39703296c08dd2e1c3313a4b560274351c7651d187726c6376d2379f5d50d9f78cb13b81bb45735f3cfb97ae2a60fb4d SHA512 9a501315ac528476b7fb610a5ce4a74b820c9098adbffa880b1750ead5066006287943abdd4292f46134013f9ef09708b3e4cb322ebb9ee9382fd39c9e5b9fb0
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-profiler/metadata.xml b/dev-java/netbeans-profiler/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-profiler/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
new file mode 100644
index 000000000000..f48d6c544a99
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# Binary files needed for remote profiling
+QA_PREBUILT="usr/share/netbeans-profiler-${SLOT}/lib/deployed/*"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/profiler >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	for file in lib/deployed/cvm/linux/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in lib/deployed/jdk*/linux*/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in remote-pack-defs/*.sh ; do
+		fperms 755 ${file}
+	done
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
+}
diff --git a/dev-java/netbeans-webcommon-8.2 b/dev-java/netbeans-webcommon-8.2
deleted file mode 100644
index d4034fbb91cb..000000000000
--- a/dev-java/netbeans-webcommon-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 app-arch/unzip dev-java/javahelp:0 dev-java/jna:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Web Services Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim http://hg.netbeans.org/binaries/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3144f951b2ab8fe103bcbdf7b285aa2c
diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
new file mode 100644
index 000000000000..4961c056cb6e
--- /dev/null
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -0,0 +1,18 @@
+DIST 08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar 15474 BLAKE2B eb201fbcdef415dbd033af120a65ffe78eda3639cb79bf5b703071cb900efa4c787f2b92f43e34339bc97ca3122e31c2db9178122f0508ba1a2f7772799a4032 SHA512 91ecd525f39d4e664269cb6886b1e5545561203da9631dce9efdc77a46cb9d442f88e90030c7ac9c1c9e3561b8a4ffc1d949239a50a689963a4370de8832090c
+DIST 0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib 10084 BLAKE2B 97ad8b20c28106dd977a1fc1f2f511faf957cd11391f8451a1ffca0105a4f2025c18ca49fbd637465e83aa4f37dc77e6dcceeaf3c98344b873d8ad914aade861 SHA512 dd6de26e2f5978449ec353ea32ad7239af89478a184d408159f60bade144c69ec1e741e53239b4122b586a26ff5751ba3b318d6ff4e30ebdab075d229ee24c73
+DIST 1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip 1972629 BLAKE2B 209d94e2e54c2756658c41cf329aeb442919b7209733e4738e830609f8b007d4e3439b9d9203497219387eb7ede61c58c21c0df80822dc4e7c78204fc13ec595 SHA512 d1a8f73cf7c2c5ec6f1501086a64b7b52148b485811a7557a49f1609ad15e9ba46c9c2545a1d3bd01e551406d97e374d9e88a6ef5ba5a89d51b006b4e6763df6
+DIST 2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib 159252 BLAKE2B 651e501ddef267d38513263b9ccda198bb19cd721b14ce2be83c23a38def92bd8bd415e66f8233f87e5f3e9cccb30663d9f5ee6585b51fc1fb63d09e9002511b SHA512 c6767db80e8003c9d533d2acdd60877497461944148d406da68aa18ebe5164c266883d223343f118240d7f48523ff21afc16d9b5959e7740174447add8c933d4
+DIST 2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip 133018 BLAKE2B f7ec7108b4a76eaf1ae210c03098fd2fdc451db1bb95ab68038eaf8ff503c81fff1816d68c97e159e0ae5e77654a557d26a94a7d7ac9c2e0fe4e5895094c71d3 SHA512 360f7f57e0472f6b53337408cbc068619f83aa286fc7a5a7a84c6a451d2ba1ecd7b516741263737e11295169abcd5f1911ae0e0a68b51be93b871ae252cd99de
+DIST 480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib 70604 BLAKE2B 65fb919bbaed365ca239b3c8ad2b68fc2fa77cecb5193f4bdb7b9914be15387f63e7974e3a745ba39053a649d72544a9110f4841b48a40d194dd8ce4e84005c4 SHA512 95fe392982d78bab0770f4b6dab48ca490d0b93de386835e87be8521cc2828bb9fc793aa3a7be3a786dedbd30523a65e3fab84b555d0aff2b7b952e73187e186
+DIST 59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar 60912 BLAKE2B c4e5d21030751de8b5c5884c8443308f93f157d630aa4daf5fbc1d7f375b114e5f02261d314c655e04621e4ebf1fecba4c69a5b06270309d6f18f3b288df35b7 SHA512 4fdab86bb7471b4ace1d41e68463a567d9b1c817961c9aa6b1462e02dbf0d4ff647d3a08a35c13929c79b2a189d4a646041c6c569a6f8bec88d668422a40a4a0
+DIST 7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip 10012 BLAKE2B a7ff601cf0a75d944b72494897abd2c1733f388a21b9e3c49bc586a7ab52df65971d1f939592438e6fa2e2392f55e7329e97f6a79c2d74e9af524d38222ae383 SHA512 5fec29796ac076b6df5b83736dc6384ac93349d36093e522266b2f6facd129fd9957989fd4619422743fe01860f00d818de00e6a66a23037ff27ce071b8862e4
+DIST 7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim 72664 BLAKE2B b25c8869aa2abb66dec248f39e56326a70eafa33c06e89aeb9d9a1cbedb214d6dd5dea850a33737e89b06820e84c04e59e3e4ece976eed0c2bb1b871ff21e78d SHA512 6dfa8f474073cf46c3a08ff3fe78d2bf2444e4ec6d17c779f3171d964bb0c5837ded5c8a4b16bbe08ac14508e335845f5e39d6a0d57679602482de8e30c3bcd3
+DIST 7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar 278471 BLAKE2B e691a277e8e420d3c02248a5b85b954d273f13d516227d407c4789580ea24f1ee8826064402b586b6715e783aa11282cc9f0d584a3c5448880882f3c373cdd15 SHA512 fe228b770fa390b8b470282c1ff09bfa80d006e78d555842bbd1cd1230fb80420b8ebc5ae8fc75a063dfceac5080ede0144f13c43048c95e540fec244672e2c0
+DIST C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib 29404 BLAKE2B 66c064df36fea23f0bf7ce9f04af217f2d90ed3702e469337c5bf8e88f023a83f1dc837900e4974f4d21784e7161a6bd0b78131b8da987341df5d99bb3b2177b SHA512 c7ffc8890d7c605a6815edb34fe9b5578fa42b9111d2b40ddb128917ae04066292303c3cd11223d2e79526bc4b2f25025e1eee1449e60dc90ca98ffb11cc70ba
+DIST C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip 32928 BLAKE2B 5d8aa26bc369aec5441cdefb35c82d98d9bd77cd2df08364835c6c87c6b42d330dc92b315dcb9f3a8e8f9b73845a7734b63388697b071f8591fd56413289054a SHA512 055810e141e29ef139bd6bcb0578d2f4790dc43ef6e4fd044f26a59c69ab6fe8af8ac9cb39b336e74bc3235d6a5de6aa7ca93b797c508ed8061c20b5d4588f6b
+DIST CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip 2179489 BLAKE2B cbfb9d69c6e9dc77e799e612bf7dc98cf907f57adc995fb6107ba7f57f39658da76bc4b946443f3d6737bb8e4365293c01374b68aa1bef076a890722d62442f7 SHA512 bafbf999c1e64da8a4b72896514d1b9e6dca2dc5fb4d66dbd62fb5a986348faa42834da7960db4cd1455104f0d0dd0eaf6e56edd47affefdbc903a2320110da6
+DIST D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip 912402 BLAKE2B 8f128e9bf4fa6811d085316dd4f2ce38e309dda300b59e1fa614f2cdc75fd4b19cc46a6d91fc96f3e418dfc2008a585aaccb94a14b6a057090339a7ade8debab SHA512 0bc0a65bb7b6d78a003634027c93d842e2f1d928fcfedc9b12db4b508752b06931429a4a580a08b5fd5e666e4f3a208aed86eb21e81377973b43cb77b48cf4ce
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-webcommon-8.2.ebuild 5868 BLAKE2B a7720483ee3105fe326deb68cd204751fcfc5a78addcd2be873cd4567bc3925ecbd0640887d28011e28ed06c66de9e02d856887df246c0018d86807ccfba00f6 SHA512 b0973af70d56fcbac4e5b22706069acebe5eb46435212cfa5163773c1070ad66bcc0eb7f193703aee381c38a62d4cf357e0457edf140558455dd30126635917d
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-webcommon/metadata.xml b/dev-java/netbeans-webcommon/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-webcommon/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
new file mode 100644
index 000000000000..0ea4053b2eac
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
+	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
+	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
+	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
+	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
+	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
+	http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/jna:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
+	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
+	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
+	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
+	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
+	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}
diff --git a/dev-java/netbeans-websvccommon-8.2 b/dev-java/netbeans-websvccommon-8.2
deleted file mode 100644
index 2632bd7ec442..000000000000
--- a/dev-java/netbeans-websvccommon-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-ide-8.2 app-arch/unzip dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Web Services Common Cluster
-EAPI=6
-HOMEPAGE=http://netbeans.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-ide-8.2 >=dev-java/java-config-2.2.0-r3
-SLOT=8.2
-SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7ed8f0b2a20f1c834d620898405418ee
diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
new file mode 100644
index 000000000000..6d201073d4c0
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -0,0 +1,4 @@
+DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
+DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
+EBUILD netbeans-websvccommon-8.2.ebuild 2347 BLAKE2B 95292b97d5662f360755c96b55f06e4838d90c5b0735dd86fb93039d3079eb4969bb3ec0d3ee72507ab892b83afdb55617b77f5adfdefb6f0d30efcbdd805c4d SHA512 dd69b56961f5684c49d93ad35d4cfae355e4705406f4c710819fed0d7789e241cfb97fa44b1973c7e0ec4b69cc7cda3ab860acb8f3891c029f11fd61a74cea8a
+MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-websvccommon/metadata.xml b/dev-java/netbeans-websvccommon/metadata.xml
new file mode 100644
index 000000000000..85f4d904aad0
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
new file mode 100644
index 000000000000..5ab104d7c79a
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	eapply netbeans-8.2-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_install() {
+	pushd nbbuild/netbeans/websvccommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
+}
diff --git a/dev-java/netty-buffer-4.0.21 b/dev-java/netty-buffer-4.0.21
deleted file mode 100644
index 2d0e0890bc23..000000000000
--- a/dev-java/netty-buffer-4.0.21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/netty-common:0 test? ( dev-java/ant-core:0 dev-java/easymock:3.2 dev-java/hamcrest-library:1.3 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Async event-driven framework for high performance network applications
-EAPI=5
-HOMEPAGE=http://netty.io/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/netty-common:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fc7cddec54ecefca467357814e98a654
diff --git a/dev-java/netty-buffer-4.0.36 b/dev-java/netty-buffer-4.0.36
deleted file mode 100644
index a08fc8a85f1d..000000000000
--- a/dev-java/netty-buffer-4.0.36
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 ~dev-java/netty-common-4.0.36:0 test? ( dev-java/easymock:3.2 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Async event-driven framework for high performance network applications
-EAPI=5
-HOMEPAGE=http://netty.io/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-common-4.0.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1294ec9d7c0ca2590012425f7f03b85a
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
new file mode 100644
index 000000000000..c56bbc1bfb7c
--- /dev/null
+++ b/dev-java/netty-buffer/Manifest
@@ -0,0 +1,6 @@
+AUX netty-buffer-4.0.21-build.xml 9693 BLAKE2B ec0f0c5ba4b4c259e1ab1045124190aa7cf5cc1c33a03acbe75c4f5971c1d39ef0fa99704c9663e56635b12b0f59b5582904ac2b1590f4e85686544a4a9e4472 SHA512 5b082802b6f7c7e619ba053757ede64f0ffa18c3002205207d2d129464aa89f5b52c20133299e280ea937e821a42e525e7885d773f56f0c8000726b56753fbf9
+DIST netty-4.0.21.Final.tar.gz 960489 BLAKE2B ef279fcc2d56baaee62841ad973702c585d5450a45e513ca6beafa295943878b88ed81b8a167091e77aa9f26bccbdcea4138230850dca57321f1241c4ff56d0b SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74
+DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
+EBUILD netty-buffer-4.0.21.ebuild 1292 BLAKE2B 7109e2aa22415f7bc730213afedd242873bb98cb54432002cae0d12501393d4e00dde369177d2c6ef75323a4f6cfe11b4b37d6f8a29d57f193ce5188d1b79166 SHA512 51df749a4f546b5bc0e717d6b279397c8c5d1a9045392aea75cd84c89752b49aa0d25003b4cd0742c08980b7c554eec051ff0c78cee3ade65edd15d99e20ec42
+EBUILD netty-buffer-4.0.36.ebuild 1233 BLAKE2B b47b2d96c3b01113edcaffdacbc6a1880d0dc1d7a5151757b2fd39a120f2ba5a60d22adef04503db5a76c42f41234c65a5d24891fb6fa0cee49df66e38c04b4e SHA512 efb521ff910efe81d47ffa700fab5c3031686d00b229906325f532f463fa9039c584a78e823aada5c60951389afb83373e292a3c27db73a6a20ffb13276e90d8
+MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-buffer/files/netty-buffer-4.0.21-build.xml b/dev-java/netty-buffer/files/netty-buffer-4.0.21-build.xml
new file mode 100644
index 000000000000..376c30458ecd
--- /dev/null
+++ b/dev-java/netty-buffer/files/netty-buffer-4.0.21-build.xml
@@ -0,0 +1,229 @@
+<?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/15/14 7:12 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="netty-buffer-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="netty-buffer-4.0.21.Final"/>
+  <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">
+  </path>
+  <path id="build.test.classpath">
+  </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}" 
+           nowarn="true" 
+           debug="true" 
+           optimize="true" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="true" 
+           memoryInitialSize="1024m"
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </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="true" 
+           debug="true" 
+           optimize="true" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="true" 
+           memoryInitialSize="1024m"
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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="**/*Benchmark*.java"/>
+          <exclude name="**/Abstract*"/>
+          <exclude name="**/TestUtil*"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/Abstract*"/>
+          <exclude name="**/TestUtil*"/>
+        </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="false" 
+             use="true" 
+             author="false" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="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"/>
+  </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/netty-buffer/metadata.xml b/dev-java/netty-buffer/metadata.xml
new file mode 100644
index 000000000000..3a4bd0130d1b
--- /dev/null
+++ b/dev-java/netty-buffer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">netty/netty</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
new file mode 100644
index 000000000000..44d1a7d3625f
--- /dev/null
+++ b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/${MY_PN}-common:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	test? (
+		dev-java/ant-core:0
+		dev-java/easymock:3.2
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH="${MY_PN}-common"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},ant-core,easymock-3.2,hamcrest-library-1.3,junit-4"
+EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
new file mode 100644
index 000000000000..2e4b6c85aa19
--- /dev/null
+++ b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="~dev-java/${MY_PN}-common-${PV}:0"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	test? (
+		dev-java/easymock:3.2
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="${MY_PN}-common"
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4)"
+	local TESTS=$(find * -name "*Test.java" ! -name "Abstract*")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/netty-codec-4.0.36 b/dev-java/netty-codec-4.0.36
deleted file mode 100644
index 465aa8e5530d..000000000000
--- a/dev-java/netty-codec-4.0.36
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/jboss-marshalling:0 dev-java/jzlib:1.1.3 dev-java/protobuf-java:0 test? ( dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/jboss-marshalling-river:0 dev-java/jboss-marshalling-serial:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Async event-driven framework for high performance network applications
-EAPI=5
-HOMEPAGE=http://netty.io/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/jboss-marshalling:0 dev-java/jzlib:1.1.3 dev-java/protobuf-java:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=29e1d97b4224e5a1cbd13d1fa7a8d7f3
diff --git a/dev-java/netty-codec-http-4.0.36 b/dev-java/netty-codec-http-4.0.36
deleted file mode 100644
index 5a7fec8e014a..000000000000
--- a/dev-java/netty-codec-http-4.0.36
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-codec-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-handler-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/jboss-marshalling:0 dev-java/jzlib:1.1.3 dev-java/protobuf-java:0 test? ( dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/jboss-marshalling-river:0 dev-java/jboss-marshalling-serial:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Async event-driven framework for high performance network applications
-EAPI=5
-HOMEPAGE=http://netty.io/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-codec-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-handler-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/jboss-marshalling:0 dev-java/jzlib:1.1.3 dev-java/protobuf-java:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=520190b5dd7edc36d12ceddd77134042
diff --git a/dev-java/netty-codec-http/Manifest b/dev-java/netty-codec-http/Manifest
new file mode 100644
index 000000000000..51f0fc624e56
--- /dev/null
+++ b/dev-java/netty-codec-http/Manifest
@@ -0,0 +1,3 @@
+DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
+EBUILD netty-codec-http-4.0.36.ebuild 1667 BLAKE2B c2460bb746caa5d83d925478bfd00ba6f13727fc779ebe5a6c06fe5e7817419b55077cd05136f03464a2aec422a91d4664b3764a34d4f99a0bb3c42e4448d8ee SHA512 fd8762b237b31d48ea4945f52fc5399e0957d6619e23e61d553afa9660caa1bbd5671fda2a4d9d59a3325736ece2f64af6d6b979af21e4fbacb67248ec0851f9
+MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-codec-http/metadata.xml b/dev-java/netty-codec-http/metadata.xml
new file mode 100644
index 000000000000..3a4bd0130d1b
--- /dev/null
+++ b/dev-java/netty-codec-http/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">netty/netty</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild b/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
new file mode 100644
index 000000000000..3753a6e2ebd3
--- /dev/null
+++ b/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
+	~dev-java/${MY_PN}-codec-${PV}:0
+	~dev-java/${MY_PN}-common-${PV}:0
+	~dev-java/${MY_PN}-handler-${PV}:0
+	~dev-java/${MY_PN}-transport-${PV}:0
+	dev-java/jboss-marshalling:0
+	dev-java/jzlib:1.1.3
+	dev-java/protobuf-java:0"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/jboss-marshalling-river:0
+		dev-java/jboss-marshalling-serial:0
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-codec,${MY_PN}-common,${MY_PN}-handler,${MY_PN}-transport,jboss-marshalling,jzlib-1.1.3,protobuf-java"
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},hamcrest-core-1.3,hamcrest-library-1.3,jboss-marshalling-river,jboss-marshalling-serial,junit-4)"
+	local TESTS=$(find * -name "*Test.java" ! -name "Abstract*" ! -name "ZlibTest*")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/netty-codec/Manifest b/dev-java/netty-codec/Manifest
new file mode 100644
index 000000000000..430f742034ef
--- /dev/null
+++ b/dev-java/netty-codec/Manifest
@@ -0,0 +1,3 @@
+DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
+EBUILD netty-codec-4.0.36.ebuild 1565 BLAKE2B 5d2ad5241c60543295c11c9ee2899eeca50e3ff6b7b99c677351a6e22d5ccacf35093c902d0f9f617c6a91470e6cfd33acd24dd8b42f865cc3dc5234839b434d SHA512 ca21f4d16aa37dd8a7a129feed5cadf0ac5bb60c1fc703259057d914150d1e4cf5ddb799c372375ce22a6dfe6e59c5d1a078a474be27a3b17e1dcdf5f4150cdf
+MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-codec/metadata.xml b/dev-java/netty-codec/metadata.xml
new file mode 100644
index 000000000000..3a4bd0130d1b
--- /dev/null
+++ b/dev-java/netty-codec/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">netty/netty</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/netty-codec/netty-codec-4.0.36.ebuild b/dev-java/netty-codec/netty-codec-4.0.36.ebuild
new file mode 100644
index 000000000000..447b8bcc347b
--- /dev/null
+++ b/dev-java/netty-codec/netty-codec-4.0.36.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
+	~dev-java/${MY_PN}-common-${PV}:0
+	~dev-java/${MY_PN}-transport-${PV}:0
+	dev-java/jboss-marshalling:0
+	dev-java/jzlib:1.1.3
+	dev-java/protobuf-java:0"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/jboss-marshalling-river:0
+		dev-java/jboss-marshalling-serial:0
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common,${MY_PN}-transport,jboss-marshalling,jzlib-1.1.3,protobuf-java"
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},hamcrest-core-1.3,hamcrest-library-1.3,jboss-marshalling-river,jboss-marshalling-serial,junit-4)"
+	local TESTS=$(find * -name "*Test.java" ! -name "Abstract*" ! -name "ZlibTest*")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/netty-common-4.0.21 b/dev-java/netty-common-4.0.21
deleted file mode 100644
index dadfd8d67f0f..000000000000
--- a/dev-java/netty-common-4.0.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-nop:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Async event-driven framework for high performance network applications
-EAPI=5
-HOMEPAGE=http://netty.io/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-nop:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e5f0385f7c6bbcf83e92a4b75d9c1470
diff --git a/dev-java/netty-common-4.0.36 b/dev-java/netty-common-4.0.36
deleted file mode 100644
index 139dd6e79a5f..000000000000
--- a/dev-java/netty-common-4.0.36
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 test? ( dev-java/asm:4 dev-java/cglib:3 dev-java/easymock:3.2 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 dev-java/mockito:0 dev-java/objenesis:0 dev-java/slf4j-simple:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Async event-driven framework for high performance network applications
-EAPI=5
-HOMEPAGE=http://netty.io/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=93e49799117749784a4cf0d75e4ed212
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
new file mode 100644
index 000000000000..77941e1df3be
--- /dev/null
+++ b/dev-java/netty-common/Manifest
@@ -0,0 +1,5 @@
+DIST netty-4.0.21.Final.tar.gz 960489 BLAKE2B ef279fcc2d56baaee62841ad973702c585d5450a45e513ca6beafa295943878b88ed81b8a167091e77aa9f26bccbdcea4138230850dca57321f1241c4ff56d0b SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74
+DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
+EBUILD netty-common-4.0.21.ebuild 1077 BLAKE2B acc67ea4fb21cffcb787c13589a3277b154ad5804ad43ed9de45bf04fd1ea16a247647e5b488d77514da20c69c33d0fcdcc5cebd90dc2063a64deb7937e86e44 SHA512 72a988bc64b7177345fe084746da732deb64391caef03bceae7dea6eedbe23061d2b9e362c6fe265ca8524b43386aff12c3f262f5885f8c34a70cdd6f2bbac22
+EBUILD netty-common-4.0.36.ebuild 1575 BLAKE2B 8cff7403f4d0b91c2fdd16ed3eb567b62d928750c4a81047cd4c5731b06411387cdc9056919e829b132ef244b5e1ab0fc7d9e8f0f177ac561615df5aafd7f86c SHA512 bbf723c2f46f15ec93c4a7e3de363709c40b1baf6601defbdd74db230a63f7a49a0e452ab96e71e9d45e1879aa8498c83bf1fc30ceadf213b9112b2519f8e0de
+MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-common/metadata.xml b/dev-java/netty-common/metadata.xml
new file mode 100644
index 000000000000..3a4bd0130d1b
--- /dev/null
+++ b/dev-java/netty-common/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">netty/netty</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/netty-common/netty-common-4.0.21.ebuild b/dev-java/netty-common/netty-common-4.0.21.ebuild
new file mode 100644
index 000000000000..188eed46074b
--- /dev/null
+++ b/dev-java/netty-common/netty-common-4.0.21.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/commons-logging:0
+	dev-java/javassist:3
+	dev-java/log4j:0
+	dev-java/slf4j-nop:0
+	dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.7
+		${CDEPEND}"
+DEPEND=">=virtual/jdk-1.7
+		${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+
+JAVA_GENTOO_CLASSPATH="
+	log4j
+	slf4j-api
+	slf4j-nop
+	javassist-3
+	commons-logging"
+
+JAVA_SRC_DIR="src/main/java"
+
+# Tests fail as they might need logging to be properly set up and/or compatible.
+#
+# junit.framework.AssertionFailedError: expected:<[foo]> but was:<[NOP]>
+# at io.netty.util.internal.logging.Slf4JLoggerFactoryTest.testCreation
+RESTRICT="test"
diff --git a/dev-java/netty-common/netty-common-4.0.36.ebuild b/dev-java/netty-common/netty-common-4.0.36.ebuild
new file mode 100644
index 000000000000..f401578160c6
--- /dev/null
+++ b/dev-java/netty-common/netty-common-4.0.36.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/commons-logging:0
+	dev-java/javassist:3
+	dev-java/log4j:0
+	dev-java/slf4j-api:0"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	test? (
+		dev-java/asm:4
+		dev-java/cglib:3
+		dev-java/easymock:3.2
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+		dev-java/mockito:0
+		dev-java/objenesis:0
+		dev-java/slf4j-simple:0
+	)"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="commons-logging,javassist-3,log4j,slf4j-api"
+
+java_prepare() {
+	# Needs Mockito 1.10.
+	rm -v src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java || die
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},asm-4,cglib-3,easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis,slf4j-simple)"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/netty-handler-4.0.36 b/dev-java/netty-handler-4.0.36
deleted file mode 100644
index 13927412b3cb..000000000000
--- a/dev-java/netty-handler-4.0.36
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-codec-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/netty-tcnative:0 dev-java/bcpkix:1.52 dev-java/bcprov:1.52 dev-java/jetty-alpn-api:0 dev-java/jetty-npn-api:0 test? ( dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Async event-driven framework for high performance network applications
-EAPI=5
-HOMEPAGE=http://netty.io/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-codec-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/netty-tcnative:0 dev-java/bcpkix:1.52 dev-java/bcprov:1.52 dev-java/jetty-alpn-api:0 dev-java/jetty-npn-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=870435e8e1cde2407235e6454216db4e
diff --git a/dev-java/netty-handler/Manifest b/dev-java/netty-handler/Manifest
new file mode 100644
index 000000000000..51da82bebe29
--- /dev/null
+++ b/dev-java/netty-handler/Manifest
@@ -0,0 +1,3 @@
+DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
+EBUILD netty-handler-4.0.36.ebuild 1707 BLAKE2B b0dd571df99cd93ca2a920052d0151e62289a79fc6d583adc956d2c9f28a68a03a94c3f5eada6c0ce9e9c16635d19cc029f274ba327f65246bb01b869b592ec0 SHA512 04e1047b637a53389058e5f21c47eaa871b4d792e980a9b1a166a610614e823dfc263080dd7c3de1c29446fedf2bd2558c056c7ae73ed5f79a73b1b6d419d77a
+MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-handler/metadata.xml b/dev-java/netty-handler/metadata.xml
new file mode 100644
index 000000000000..3a4bd0130d1b
--- /dev/null
+++ b/dev-java/netty-handler/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">netty/netty</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/netty-handler/netty-handler-4.0.36.ebuild b/dev-java/netty-handler/netty-handler-4.0.36.ebuild
new file mode 100644
index 000000000000..d4ffae7bdcd0
--- /dev/null
+++ b/dev-java/netty-handler/netty-handler-4.0.36.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
+	~dev-java/${MY_PN}-codec-${PV}:0
+	~dev-java/${MY_PN}-common-${PV}:0
+	~dev-java/${MY_PN}-transport-${PV}:0
+	dev-java/${MY_PN}-tcnative:0
+	dev-java/bcpkix:1.52
+	dev-java/bcprov:1.52
+	dev-java/jetty-alpn-api:0
+	dev-java/jetty-npn-api:0"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+		dev-java/mockito:0
+	)"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-codec,${MY_PN}-common,${MY_PN}-tcnative,${MY_PN}-transport,bcpkix-1.52,bcprov-1.52,jetty-alpn-api,jetty-npn-api"
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito)"
+	local TESTS=$(find * -name "*Test.java" ! -name "RenegotiateTest.java" ! -name "SslContextTest.java" ! -name "SSLEngineTest.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	LD_LIBRARY_PATH=$(java-config -i netty-tcnative) ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/netty-tcnative-1.1.33.15 b/dev-java/netty-tcnative-1.1.33.15
deleted file mode 100644
index c60371a5446e..000000000000
--- a/dev-java/netty-tcnative-1.1.33.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jdk-1.7 app-arch/unzip dev-java/maven-hawtjni-plugin:0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Fork of Tomcat Native that incorporates various patches
-EAPI=5
-HOMEPAGE=http://netty.io/wiki/forked-tomcat-native.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/netty/netty-tcnative/archive/netty-tcnative-1.1.33.Fork15.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c3a587c4eb1e8c205098004bc0b7e803
diff --git a/dev-java/netty-tcnative/Manifest b/dev-java/netty-tcnative/Manifest
new file mode 100644
index 000000000000..7a0222187681
--- /dev/null
+++ b/dev-java/netty-tcnative/Manifest
@@ -0,0 +1,3 @@
+DIST netty-tcnative-1.1.33.Fork15.tar.gz 186153 BLAKE2B 3d769a04e659c09aa32059fc2a2eede84f6105469de33ef7d26df436de6a1f6290a6640268934f63f77a969eb6aa024651380cca6dc69099c4016ed61f7d5310 SHA512 592c70a926473a4903b704be920aac1a4fd5a032a8d821a77800b6922b374cb28decf496a65ef62867c027dbac93f0e563e9bb4ecf6659bc70cc33663bb979f5
+EBUILD netty-tcnative-1.1.33.15.ebuild 1657 BLAKE2B 5bb72d18f8230cc0423b1909236284f0edf5290061b8b67052e11fde1328da4ab273943dedd7f3f4f416739631c8fa9eac5233f9fe931a7cb1fbb818c8875e8c SHA512 4a533c530136e2eb72bd6070515490e4a49898b1742ce8d986a367140ebba978c0d619727270d7a13a5aa9ee9ec4c19008d87447b8c7853045793cc2791eee20
+MISC metadata.xml 321 BLAKE2B d5ef2b6901e18ae4fcbb63df20a62edbe59169783a0ae50553194b6e4760b421078ad26fefb1fe38527a71d2e0053b3ee24683e166660cdd2b8ca1d9e1b47d94 SHA512 cafd11002a29f2a3f485ea8c2abc2c338811c0c9e9f6fe416f089d545971b44dbd6490cdbf9c9f3be75fb1fbad56c533d9d3e6141721027545b6e1ae31bdddd5
diff --git a/dev-java/netty-tcnative/metadata.xml b/dev-java/netty-tcnative/metadata.xml
new file mode 100644
index 000000000000..ab6637a0c595
--- /dev/null
+++ b/dev-java/netty-tcnative/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">netty/netty-tcnative</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild b/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
new file mode 100644
index 000000000000..395e9a7a95df
--- /dev/null
+++ b/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit autotools versionator java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-$(replace_version_separator 3 .Fork)"
+
+DESCRIPTION="Fork of Tomcat Native that incorporates various patches"
+HOMEPAGE="http://netty.io/wiki/forked-tomcat-native.html"
+SRC_URI="https://github.com/netty/netty-tcnative/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0="
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/maven-hawtjni-plugin:0"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+JAVA_SRC_DIR="${S}/openssl-dynamic/src/main/java"
+NATIVE_DIR="${S}/openssl-dynamic/src/main/native-package"
+
+java_prepare() {
+	cd "${NATIVE_DIR}" || die
+	ln -sn ../c src || die
+	ln -sn . project-template || die
+
+	# Provides missing m4 files and Makefile.am template.
+	unzip -n $(java-pkg_getjars --build-only maven-hawtjni-plugin) project-template/\* || die
+
+	sed -i \
+		-e "s:@PROJECT_NAME@:${PN}:g" \
+		-e "s:@PROJECT_NAME_UNDER_SCORE@:${PN//-/_}:g" \
+		-e "s:@PROJECT_SOURCES@:$(echo src/*.c):g" \
+		Makefile.am || die
+
+	# Avoid dummy version and tedious symlink.
+	sed -i "s/-release @VERSION@/-avoid-version/g" configure.ac || die
+
+	eautoreconf
+}
+
+src_configure(){
+	cd "${NATIVE_DIR}" || die
+	econf --with-apr=/usr/bin/apr-1-config --with-ssl=/usr
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	emake -C "${NATIVE_DIR}"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_doso "${NATIVE_DIR}"/.libs/lib${PN}.so
+	dodoc README.md
+}
diff --git a/dev-java/netty-transport-4.0.21-r1 b/dev-java/netty-transport-4.0.21-r1
deleted file mode 100644
index 738764d9b8e8..000000000000
--- a/dev-java/netty-transport-4.0.21-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/netty-buffer:0 dev-java/netty-common:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Async event-driven framework for high performance network applications
-EAPI=5
-HOMEPAGE=http://netty.io/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/netty-buffer:0 dev-java/netty-common:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8bb55f558603901de29bd4311487d34c
diff --git a/dev-java/netty-transport-4.0.36 b/dev-java/netty-transport-4.0.36
deleted file mode 100644
index 7110cf2ec43e..000000000000
--- a/dev-java/netty-transport-4.0.36
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common-4.0.36:0 test? ( dev-java/easymock:3.2 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 dev-java/mockito:0 dev-java/objenesis:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Async event-driven framework for high performance network applications
-EAPI=5
-HOMEPAGE=http://netty.io/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common-4.0.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a08db750d9247ef19d1f3cebaae63fae
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
new file mode 100644
index 000000000000..70e7ce39063e
--- /dev/null
+++ b/dev-java/netty-transport/Manifest
@@ -0,0 +1,6 @@
+AUX netty-transport-4.0.21-build.xml 9699 BLAKE2B ca533763bf7d1a2c05436e598db421ee96dcdf62105acf9bb6be8842c03de95894559b4fdd443e0b797956d4b2b41c0b414167da3435db393f55cb492049b0e8 SHA512 1b63c011bd15c0fc0f2bcfa68b8ef969f178071eb2f9041a8812a08d9c7c871e85f16ebe049ed425fe4064df8149066ccab8bf12b32f6d5bc7e80e18a51b29a9
+DIST netty-4.0.21.Final.tar.gz 960489 BLAKE2B ef279fcc2d56baaee62841ad973702c585d5450a45e513ca6beafa295943878b88ed81b8a167091e77aa9f26bccbdcea4138230850dca57321f1241c4ff56d0b SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74
+DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
+EBUILD netty-transport-4.0.21-r1.ebuild 1109 BLAKE2B 5dea13615eec6fe6c97f67d8c05b98fd8635aab081916c93bda4afb145086f91df79cde77127749a5501ef946796989baebe27df9554d24547f491a31824db7e SHA512 a0cd74bee02353cdccae2eecf70cc75f5bb99059dc2760c6db5dbc5aaf16673da8225ee95f569703c01f2a9a3f1248ee43379843ed7cc94904e5b4badaab0454
+EBUILD netty-transport-4.0.36.ebuild 1687 BLAKE2B f6533ffdc0f98aa173825562b5c35e9bbf59f9a746ad8e876dfe37fbb01ba4e57757676048e8224b7bd7a6e71f022b1e95736efdc09f10dff6c73fd972b96eda SHA512 2da281117fdf8b031d13c5ec5b580930414a17fd5d4c5f587dbd10dac2b89d5d1e7ca8b1e55e460b342ecebbe02301d622fff30b585db0b3f57014a18b9b3fcf
+MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-transport/files/netty-transport-4.0.21-build.xml b/dev-java/netty-transport/files/netty-transport-4.0.21-build.xml
new file mode 100644
index 000000000000..4f033f48124a
--- /dev/null
+++ b/dev-java/netty-transport/files/netty-transport-4.0.21-build.xml
@@ -0,0 +1,229 @@
+<?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/15/14 7:12 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="netty-transport-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="netty-transport-4.0.21.Final"/>
+  <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">
+  </path>
+  <path id="build.test.classpath">
+  </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}" 
+           nowarn="true" 
+           debug="true" 
+           optimize="true" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="true" 
+           memoryInitialSize="1024m"
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </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="true" 
+           debug="true" 
+           optimize="true" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="true" 
+           memoryInitialSize="1024m"
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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="**/*Benchmark*.java"/>
+          <exclude name="**/Abstract*"/>
+          <exclude name="**/TestUtil*"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/Abstract*"/>
+          <exclude name="**/TestUtil*"/>
+        </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="false" 
+             use="true" 
+             author="false" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="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"/>
+  </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/netty-transport/metadata.xml b/dev-java/netty-transport/metadata.xml
new file mode 100644
index 000000000000..3a4bd0130d1b
--- /dev/null
+++ b/dev-java/netty-transport/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">netty/netty</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild b/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
new file mode 100644
index 000000000000..d026de50d1c4
--- /dev/null
+++ b/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/${MY_PN}-buffer:0
+	dev-java/${MY_PN}-common:0"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_ENCODING="UTF-8"
+
+# error: package ch.qos.logback.classic does not exist
+RESTRICT="test"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_install() {
+	java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/netty-transport/netty-transport-4.0.36.ebuild b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
new file mode 100644
index 000000000000..46802012be81
--- /dev/null
+++ b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
+	~dev-java/${MY_PN}-common-${PV}:0"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	test? (
+		dev-java/easymock:3.2
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+		dev-java/mockito:0
+		dev-java/objenesis:0
+	)"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common"
+
+java_prepare() {
+	# Need to package "classic" component of logback.
+	rm -v src/test/java/io/netty/channel/SingleThreadEventLoopTest.java || die
+}
+
+src_test() {
+	ewarn "If the hostname does not resolve to this system then these tests will"
+	ewarn "fail. It is currently set to: $(uname -n)"
+
+	cd src/test/java || die
+
+	# --with-dependencies breaks while mockito needs hamcrest-core:0.
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH},easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis)"
+	local TESTS=$(find * -name "*Test.java" ! -name "Abstract*" ! -name "Base*")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/neuroph-2.3 b/dev-java/neuroph-2.3
deleted file mode 100644
index 23b1319f0a72..000000000000
--- a/dev-java/neuroph-2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A lightweight Java neural network framework
-EAPI=2
-HOMEPAGE=http://neuroph.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3_nb.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4ba3924d22dcf77c1d102447cf1872af
diff --git a/dev-java/neuroph-2.3.1 b/dev-java/neuroph-2.3.1
deleted file mode 100644
index c32dc049b1a0..000000000000
--- a/dev-java/neuroph-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A lightweight Java neural network framework
-EAPI=2
-HOMEPAGE=http://neuroph.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3.1_nb.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4ba3924d22dcf77c1d102447cf1872af
diff --git a/dev-java/neuroph-2.4 b/dev-java/neuroph-2.4
deleted file mode 100644
index dc88e2eda718..000000000000
--- a/dev-java/neuroph-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A lightweight Java neural network framework
-EAPI=5
-HOMEPAGE=http://neuroph.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/neuroph/neuroph_2.4_nb.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0d925704ae30fab2300fba6b27aa8d86
diff --git a/dev-java/neuroph/Manifest b/dev-java/neuroph/Manifest
new file mode 100644
index 000000000000..97c36889f6c5
--- /dev/null
+++ b/dev-java/neuroph/Manifest
@@ -0,0 +1,7 @@
+DIST neuroph_2.3.1_nb.zip 8006436 BLAKE2B 5be553e6d9393df0bf803313b1d4da95e0ea4f99876027753c093015f1e07c2c4537928167df0bb685e18b4d873a518e3af18e545fa5f3f840b60ed00f262496 SHA512 50977d407e45c11d7a9154d434a84fac5386b55c542b91cefd27e4b147a10fdaa0903446ec4e6ceeaad139013ef78a81125f783ff2fae9f0bc6661813dfe48c8
+DIST neuroph_2.3_nb.zip 8257618 BLAKE2B 9b84eb18201f7cd4b35de3bb48b227b5e3579e436870f1bac943cd904b5259fc9107b08df0446958096737f17ff3a83487160c7367b292b0bfd1696d7cbbc849 SHA512 f2d6c87862435fe5217259842b3d9829780fe82dc87a682bc3ce38ecb708968b2458bf2d8631daeba209ccb9ca8e7c74fd1e5dd3c6ca606cf8b9ce4ea23db485
+DIST neuroph_2.4_nb.zip 20050658 BLAKE2B a05e9feeb7c0dd8dd505cc9f85f33f40058b26521d9a80b00991ed84cb150240caedf6c00bcf4a7562f5559a6e5efeac7d150017a17c882e2119e6c3f4b35e10 SHA512 9c675f0d2194c5c1b822af8adffd8120f97962d22eb8e99561cfc78f2d87bb76e73d335c1c8ee5278964f3717bfde41c8ae91527e78efca63f5914529ae6d61a
+EBUILD neuroph-2.3.1.ebuild 863 BLAKE2B 7aa8c8d045523e634b5e1ee24b72155f57d866f03a3b0438856cd2e6ffaac1f676af836480fedc893a9e9119abc25cb6f4340e5915df9b4eef781afb45da7b29 SHA512 ebc35a11c54f11f5d1c9189e9715a163829a5bff116856ea7500b990b636659f4a8c8055120772fff1466c0a87e6348f883a8130235b4055c2b4e1326a7147ae
+EBUILD neuroph-2.3.ebuild 863 BLAKE2B 7aa8c8d045523e634b5e1ee24b72155f57d866f03a3b0438856cd2e6ffaac1f676af836480fedc893a9e9119abc25cb6f4340e5915df9b4eef781afb45da7b29 SHA512 ebc35a11c54f11f5d1c9189e9715a163829a5bff116856ea7500b990b636659f4a8c8055120772fff1466c0a87e6348f883a8130235b4055c2b4e1326a7147ae
+EBUILD neuroph-2.4.ebuild 856 BLAKE2B 4c1f02ae7554ff9ba21a73f36e4d427c30cbb557d221c59cef6bfddda375fca9715af667facdb2b993aa00beb7cce740e90c25f961777bc924e901c7b8301385 SHA512 7ed88d6a86a1ca147fde7bb06c655d6193b0ef9b9a12d588bfaa53af361e821debf5a4fcca71fbfefbf9694d382d550dde9a5dec4c4bb66c72f5a7d3fe7f9c23
+MISC metadata.xml 313 BLAKE2B 83416b0c997a93441ec87b00bffcdca9fd1d633a5b1efc030b7962830518249776d604b7e53f314478b6036210bb3ab3eaf2dbe13ea5205f8b1451aa3316a666 SHA512 a59f20c8be206fd5d02ae1e83919ce976d4b7503167ff41864d294fb92e692beed71a1c55ca76732f30b988393ef7559c3529bf44c186ceee6cf5be76125e39f
diff --git a/dev-java/neuroph/metadata.xml b/dev-java/neuroph/metadata.xml
new file mode 100644
index 000000000000..34e441f73ac8
--- /dev/null
+++ b/dev-java/neuroph/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">neuroph</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/neuroph/neuroph-2.3.1.ebuild b/dev-java/neuroph/neuroph-2.3.1.ebuild
new file mode 100644
index 000000000000..cfe33c8ea55b
--- /dev/null
+++ b/dev-java/neuroph/neuroph-2.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A lightweight Java neural network framework"
+HOMEPAGE="http://neuroph.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_nb.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}_${PV}_nb/${PN}"
+
+java_prepare() {
+	find "${WORKDIR}" -iname '*.jar' -delete
+	find "${WORKDIR}" -iname '*.class' -delete
+}
+
+EANT_BUILD_XML="nbbuild.xml"
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="javadoc"
+EANT_EXTRA_ARGS="-Djavadoc.additionalparam=\"\""
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src
+}
diff --git a/dev-java/neuroph/neuroph-2.3.ebuild b/dev-java/neuroph/neuroph-2.3.ebuild
new file mode 100644
index 000000000000..cfe33c8ea55b
--- /dev/null
+++ b/dev-java/neuroph/neuroph-2.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A lightweight Java neural network framework"
+HOMEPAGE="http://neuroph.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_nb.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}_${PV}_nb/${PN}"
+
+java_prepare() {
+	find "${WORKDIR}" -iname '*.jar' -delete
+	find "${WORKDIR}" -iname '*.class' -delete
+}
+
+EANT_BUILD_XML="nbbuild.xml"
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="javadoc"
+EANT_EXTRA_ARGS="-Djavadoc.additionalparam=\"\""
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src
+}
diff --git a/dev-java/neuroph/neuroph-2.4.ebuild b/dev-java/neuroph/neuroph-2.4.ebuild
new file mode 100644
index 000000000000..c2bd142ce233
--- /dev/null
+++ b/dev-java/neuroph/neuroph-2.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A lightweight Java neural network framework"
+HOMEPAGE="http://neuroph.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_nb.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}_${PV}_nb/${PN}"
+
+java_prepare() {
+	find "${WORKDIR}" -iname '*.jar' -delete
+	find "${WORKDIR}" -iname '*.class' -delete
+}
+
+EANT_BUILD_XML="nbbuild.xml"
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="javadoc"
+EANT_EXTRA_ARGS="-Djavadoc.additionalparam=\"\""
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src
+}
diff --git a/dev-java/objenesis-1.3 b/dev-java/objenesis-1.3
deleted file mode 100644
index 861ebb8f21cf..000000000000
--- a/dev-java/objenesis-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A small Java library with one purpose: To instantiate a new object of a class
-EAPI=5
-HOMEPAGE=https://objenesis.googlecode.com/
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://objenesis.googlecode.com/files/objenesis-1.3-bin.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a26cf914d4aaf1abe702c698d17df032
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
new file mode 100644
index 000000000000..9b2b333ffebe
--- /dev/null
+++ b/dev-java/objenesis/Manifest
@@ -0,0 +1,3 @@
+DIST objenesis-1.3-bin.zip 287452 BLAKE2B d3f6cce9ad46d8578e24077df8a19fcdf2f9456ef732f73fe234ae688c9ceca7277e5376657efcdaba1a7b5a80ddf106aff52f291a6b2f698a010a288e961e33 SHA512 48f838e00cfe0d12c6c73fb3d1d8482ccd8de71742a86c3afbba832c6b73e1f7b1604f8c209386e00f7751cd568e9ef4d61b543db66c927f3d61f9e6ee0a4193
+EBUILD objenesis-1.3.ebuild 639 BLAKE2B 29eed60a55dc4809ea5177a07c6c90fbc20ac162a1c4713084ffbcf1203e4cf6147a7d524e0b6104d697a29b7a20b5531155fea3a63e00eecec7eac94c833313 SHA512 877de6af0b05a03fac261968c07b766ef4b1ffe8bcef8b8e467a5c03d0c523d066c54cc3b8a20f39484a9e79145d5ce0ab4421bd18e1371885dc1775b0701c78
+MISC metadata.xml 315 BLAKE2B 2190fc553786144aad4a8887b7d040a8597cb48aacb4f9ad04261bab6b7752d2d43779edd3f4bfb8fc700c7decbb0e82f80216dd8f1722f6bae6f2522aeb8a50 SHA512 21adb506d9c4eb3d989497eccc9ae6d052753e880afa8b7800dc86d54128173b288c1788579f1d8e1be4acf7b03a1fee2e15ade6551241062e8a908ae9a6c7ed
diff --git a/dev-java/objenesis/metadata.xml b/dev-java/objenesis/metadata.xml
new file mode 100644
index 000000000000..5edcde2bc350
--- /dev/null
+++ b/dev-java/objenesis/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">objenesis</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/objenesis/objenesis-1.3.ebuild b/dev-java/objenesis/objenesis-1.3.ebuild
new file mode 100644
index 000000000000..0622138a4c35
--- /dev/null
+++ b/dev-java/objenesis/objenesis-1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A small Java library with one purpose: To instantiate a new object of a class"
+HOMEPAGE="https://${PN}.googlecode.com/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}-bin.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src"
+
+src_unpack() {
+	unpack ${A}
+	unzip "${S}"/${P}-sources.jar -d "${S}"/src || die
+}
diff --git a/dev-java/odfdom-0.8.6-r1 b/dev-java/odfdom-0.8.6-r1
deleted file mode 100644
index 7b184df65ca6..000000000000
--- a/dev-java/odfdom-0.8.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/xerces:2 dev-java/xml-commons-external:1.4 test? ( dev-java/ant-junit4:0 dev-java/hamcrest-core:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=The ODFDOM reference implementation, written in Java
-EAPI=4
-HOMEPAGE=http://odftoolkit.org/projects/odfdom
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc-aix ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252Fodfdom-0.8.6-sources.zip -> odfdom-0.8.6-sources.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9f3f5341774584108674fd75d4577e74
diff --git a/dev-java/odfdom/Manifest b/dev-java/odfdom/Manifest
new file mode 100644
index 000000000000..a2c9a48d3b66
--- /dev/null
+++ b/dev-java/odfdom/Manifest
@@ -0,0 +1,4 @@
+AUX build-0.8.6.xml 11328 BLAKE2B 73af33dddbcb829fa0a5e6354a8ac176836fbc975336f633709fb6519e834cc237af80b8bfc4822af58a85dbc89e452e891dcbbc16425f3c245ecc2ad6de5943 SHA512 6db30e3cf5b154e07bba0374beed2781c0aceb4000d73d1e44c9041f876c2aad3510f9d07d7838c7d427755819cb7e57907843a52140755bfdf8818bb15664ef
+DIST odfdom-0.8.6-sources.zip 33171275 BLAKE2B ac509fad6891a715196e36b945071a44e6c1b096d69df1ad08690dead00f9f1ed5811f070859c81da546333fb12bbccf3eed5cbe06efe9520952cde2ed509d0f SHA512 7b71d55da01d604d89c5e0c7b9efcfd67e926db6807c885cb34cb9bd2e1fb1dc4a38d8e75967e08913b7ab1dcd85e7165d561fd3585a3d0c63df35a1a12c44e0
+EBUILD odfdom-0.8.6-r1.ebuild 1730 BLAKE2B c24df664ab771b3c5327d2bf69798b65d6602f54ffe52724265b35a186171cb281fc2bb22df4d2790d706f3e0742d7af5a146f96a816265474a6fbbaf02fd9ff SHA512 6349b4eabb9839eb89249475bb9fda23bdf4605b3c7fdbb14ef1f71c8fe7b5e8a00cd26df8325c13be0acf33c0847c00ae727b327b7855818dc7a1a730401d7d
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/odfdom/files/build-0.8.6.xml b/dev-java/odfdom/files/build-0.8.6.xml
new file mode 100644
index 000000000000..a2750f73a117
--- /dev/null
+++ b/dev-java/odfdom/files/build-0.8.6.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 1/17/11 1:59 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- Also contains some hand made modifications                             -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="odfdom-java-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="odfdom"/>
+  <property name="maven.build.version" value="0.8.6"/>
+  <property name="maven.build.odfversion" value="1.2"/>
+  <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="lib"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <fileset dir="lib">
+      <include name="xercesImpl-2.9.1.jar"/>
+      <include name="xml-apis-1.3.04.jar"/>
+    </fileset>
+  </path>
+  <path id="build.test.classpath">
+    <fileset dir="lib">
+      <include name="xercesImpl-2.9.1.jar"/>
+      <include name="xml-apis-1.3.04.jar"/>
+      <include name="junit-4.5.jar"/>
+      <include name="hamcrest-core.jar"/>
+    </fileset>
+  </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}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           memoryMaximumSize="512m" 
+           memoryInitialSize="1024m" 
+           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" 
+           memoryMaximumSize="512m" 
+           memoryInitialSize="1024m" 
+           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>
+    <copy todir="${maven.build.outputDir}">
+        <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="."/>
+      <sysproperty key="odfdom.version" value="${maven.build.version}"/>
+      <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"/>
+        </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="true" 
+             windowtitle="ODFDOM API v0.8.6 - http://odftoolkit" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false" 
+             maxmemory="1024m">
+      <doctitle>&lt;![CDATA[ODFDOM]]&gt;</doctitle>
+      <link href="http://java.sun.com/javase/6/docs/api/"/>
+      <link href="http://xerces.apache.org/xerces-j/apiDocs/"/>
+    </javadoc>
+  </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="true" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Main-Class" 
+                   value="org.odftoolkit.odfdom.JarManifest"/>
+        <attribute name="version" value="${maven.build.version}"/>
+        <section name="ODFDOM">
+          <attribute name="ODFDOM-Built-By" value="Gentoo"/>
+          <attribute name="ODFDOM-Built-Date" value="${TODAY}"/>
+          <attribute name="ODFDOM-Name" value="odfdom"/>
+          <attribute name="ODFDOM-Supported-Odf-Version" value="${maven.build.odfversion}"/>
+          <attribute name="ODFDOM-Version" value="${maven.build.version}"/>
+          <attribute name="ODFDOM-Website" value="http://odftoolkit.org"/>
+        </section>
+      </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/odfdom/metadata.xml b/dev-java/odfdom/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/odfdom/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..d770b3a1f21f
--- /dev/null
+++ b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The ODFDOM reference implementation, written in Java"
+HOMEPAGE="http://odftoolkit.org/projects/odfdom"
+SRC_URI="http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252F${P}-sources.zip -> ${P}-sources.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc-aix ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="dev-java/xerces:2
+	dev-java/xml-commons-external:1.4"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/hamcrest-core:0
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${P}-sources"
+
+EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-external-1.4"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+java_prepare() {
+	cp "${FILESDIR}/build-${PV}.xml" build.xml || die
+
+	mkdir lib || die
+
+	# These tests fail.
+	rm -v src/test/java/org/odftoolkit/odfdom/doc/DocumentCreationTest.java \
+		  src/test/java/org/odftoolkit/odfdom/doc/PresentationTest.java \
+		  src/test/java/org/odftoolkit/odfdom/doc/ImageTest.java \
+		  src/test/java/org/odftoolkit/odfdom/incubator/meta/MetaDocumentStatisticTest.java \
+		  src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java
+}
+
+EANT_BUILD_TARGET="package"
+EANT_JAVADOC_TARGET="javadoc"
+EANT_EXTRA_ARGS="-Dmaven.test.skip=true"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
+
+src_test() {
+	EANT_EXTRA_ARGS="" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/odfdom.jar
+
+	dodoc README.txt LICENSE.txt || die
+	use doc && java-pkg_dojavadoc target/site/apidocs
+}
diff --git a/dev-java/offo-hyphenation-2.0 b/dev-java/offo-hyphenation-2.0
deleted file mode 100644
index 494e92c1a460..000000000000
--- a/dev-java/offo-hyphenation-2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=app-arch/unzip
-DESCRIPTION=Hyphenation patterns for Apache Fop
-EAPI=5
-HOMEPAGE=http://offo.sourceforge.net
-IUSE=doc
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2 Apache-2.0 LPPL-1.3b TeX
-SLOT=0
-SRC_URI=mirror://sourceforge/offo/offo-hyphenation_v2.0.zip
-_md5_=0e03890d8761daabc9ba40cbe0607f9b
diff --git a/dev-java/offo-hyphenation/Manifest b/dev-java/offo-hyphenation/Manifest
new file mode 100644
index 000000000000..788178938449
--- /dev/null
+++ b/dev-java/offo-hyphenation/Manifest
@@ -0,0 +1,3 @@
+DIST offo-hyphenation_v2.0.zip 858046 BLAKE2B 193ef92fd55a4c5e8f840d29f96417a725e678e5bd03473ff22a116894b94a40aee8b12ef7a0534020746f21db8304a2840ce09417f2182259c78a03109e63ad SHA512 8a907a38dcb54ef1578973293efa2fcd771e3c77faedd537381f04f6f543b3f04ff8b8f96fb692274e9fe9cbdb2d3d8e5c7b29caae412271d9d8c023c079421b
+EBUILD offo-hyphenation-2.0.ebuild 995 BLAKE2B 754a31b96ed1f845222c98e94198bdd425b341d85d32d07af2d5182e3648c23c57ba444d7225b1f803d881df6d77aab05684af34bb187a92225b8ad6024425ed SHA512 cc62e89925ef5cc9a91652b76639388837ad7b884af805d4e53c92b6bb1b95131182b82bd295658619aa3b537528a0b31da14dc2080cf53ab809a69dcea27cd3
+MISC metadata.xml 310 BLAKE2B 29b282b6cbcd61925f963cd75bfc6cb5f7955593281bda8f327d6afad6762fca4a09e6a1cf4c2aa3abebb8fb323bff23fc1bb0cab5df6229ea62558d0f7c3485 SHA512 1f1c8172b99df046c63f3b23e7a0331954433fa05dfd106b8e97d5f6039635f378714ae49ddaf8b58a4512d3d1789b3df5798570619f5f241bbf564f4c5e6a03
diff --git a/dev-java/offo-hyphenation/metadata.xml b/dev-java/offo-hyphenation/metadata.xml
new file mode 100644
index 000000000000..eb0f3a26bd42
--- /dev/null
+++ b/dev-java/offo-hyphenation/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">offo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild b/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild
new file mode 100644
index 000000000000..e68c0ee10fa8
--- /dev/null
+++ b/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Hyphenation patterns for Apache Fop"
+HOMEPAGE="http://offo.sourceforge.net"
+SRC_URI="mirror://sourceforge/offo/${PN}_v${PV}.zip"
+LICENSE="GPL-2 Apache-2.0 LPPL-1.3b TeX"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr/share/${PN}/
+	insinto /usr/share/${PN}/
+	doins -r hyph
+
+	if use doc; then
+		dohtml -r images skin i*.html
+	fi
+}
+
+pkg_postinst() {
+	elog "This package installs hyphenation files for several languages"
+	elog "into /usr/share/${PN}/hyph"
+	elog "Check /usr/share/doc/${PF}/html/licenses.html for each file's license."
+	elog "To compile the patterns, install dev-java/fop with USE=hyphenation."
+	elog "Alternatively, use the uncompiled patterns via the <hyphenation-base>"
+	elog "configuration option. See the documentation for more details."
+}
diff --git a/dev-java/ognl-3.0.8 b/dev-java/ognl-3.0.8
deleted file mode 100644
index 9ec488c74fb1..000000000000
--- a/dev-java/ognl-3.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/javassist:3 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Object-Graph Navigation Language: get/set properties of objects
-EAPI=5
-HOMEPAGE=http://www.ognl.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-1.1
-RDEPEND=dev-java/javassist:3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=https://github.com/jkuhnert/ognl/archive/OGNL_3_0_8.tar.gz https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c6ebf25296a071d6e5aee15b966c35c9
diff --git a/dev-java/ognl/Manifest b/dev-java/ognl/Manifest
new file mode 100644
index 000000000000..88b4a6b0be92
--- /dev/null
+++ b/dev-java/ognl/Manifest
@@ -0,0 +1,4 @@
+DIST OGNL_3_0_8.tar.gz 3564389 BLAKE2B c39c5d4e51727d0a0b12b3908953ff01a9dd6458a5d6b6b6c654a860e4c0d1f4414fb3b79288c4ef0a86fdcdcbf3666c9af4c05a39ba85ff593c021319e6fb68 SHA512 79ca457077f344da16677e56f8e0ae809d2af85015e1c4bc17a3eef4dd25c01738fdbcac8a9397b83251b48164404df161d60e20d43868e1ff32e9bb388ef4b6
+DIST osbuild.xml 5939 BLAKE2B 7d34f6713a53cddc17d526af7bf30fe03c13897fad4e02b87454811a1943f7aca03abd9fd889ed3566484252d3076007595fd4c85a0c9b3fea823b5ab18acfda SHA512 6b66b7b27073fd6b707b71fb2da7017602edd85de52e767ecb8d8931fdd96811b04d9ec0ac9ec1cb32daf03d43610f760471959cf7211b1921a92d5f5a070416
+EBUILD ognl-3.0.8.ebuild 1081 BLAKE2B a49434435a9b037592b3cde25976ae0c87a005f45f193f43fb43b0d98c2698044bfaa214d72e7b04e64e4c6c9ccb728a4b4c5ec7620616f4269e9af9924c9e8e SHA512 f352879f869a3f89d251db0a49813f93e339618518e017cecae299d18805d4b3e9aeaddfc017cd74416f886ca6511aa0701a4bbfa56d6a663c85ef164ad73381
+MISC metadata.xml 324 BLAKE2B a935efbfc22931af8df70e05cf6d37149c1e0247b73db7ab92817c4b91e8060e2a373ef2455d6dc3fe99fed0fb505aa4acfc4ad9fe3bf7e189ac1e9e27496bf9 SHA512 e62a903e93f2d3464fc2b0b88bf77486976daa9be56d96e2beff0490daf5c8530b449076e6151420f65a421ec0ddee6b8a5b13a28e9f884c0f5f70cbb4790bb7
diff --git a/dev-java/ognl/metadata.xml b/dev-java/ognl/metadata.xml
new file mode 100644
index 000000000000..88611f363347
--- /dev/null
+++ b/dev-java/ognl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jkuhnert/ognl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/ognl/ognl-3.0.8.ebuild b/dev-java/ognl/ognl-3.0.8.ebuild
new file mode 100644
index 000000000000..c3d11389846b
--- /dev/null
+++ b/dev-java/ognl/ognl-3.0.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Object-Graph Navigation Language: get/set properties of objects"
+HOMEPAGE="http://www.ognl.org/"
+SRC_URI="https://github.com/jkuhnert/ognl/archive/OGNL_${PV//./_}.tar.gz
+	https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
+
+LICENSE="Apache-1.1"
+SLOT="3.0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/javassist:3"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}-OGNL_${PV//./_}"
+
+java_prepare() {
+	java-pkg_clean
+
+	cp "${DISTDIR}/osbuild.xml" "${S}/" || die
+
+	sed "s/\(name=\"compile.version\" value=\"\)1.3\"/\1$(java-pkg_get-source)\"/" \
+		-i osbuild.xml || die
+
+	cd lib/build || die
+
+	java-pkg_jar-from javassist-3
+}
+
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_newjar build/ognl-2.7.2.jar "${PN}.jar"
+
+	use doc && java-pkg_dohtml -r dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/okio-1.11.0 b/dev-java/okio-1.11.0
deleted file mode 100644
index 3c3568cec4c5..000000000000
--- a/dev-java/okio-1.11.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 source? ( app-arch/zip ) dev-java/jmh-core:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A modern I/O API for Java
-EAPI=5
-HOMEPAGE=https://github.com/square/okio
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 source? ( app-arch/zip ) dev-java/jmh-core:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/square/okio/archive/okio-parent-1.11.0.zip -> okio-1.11.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=04bad6d03a17eb5ed5ae39359058b097
diff --git a/dev-java/okio/Manifest b/dev-java/okio/Manifest
new file mode 100644
index 000000000000..c9282b82e011
--- /dev/null
+++ b/dev-java/okio/Manifest
@@ -0,0 +1,4 @@
+AUX okio-remove-maven-animal-jre.patch 1631 BLAKE2B e43c497a63d598ceb825716de40a6f1869e39a45eccbb4759c128805bfcf52a5b95658bb776299a32e7ef2970dc6466dcfb5d422032c460675d416ec2412fc09 SHA512 5bd6cacf2ca9cf51ee7b80fc5deead8174fb579dc3a8422f65b7af80492f37d24ccad4605896f0653984852db89c2ca9ce0b78bd0ea2630ad8c71e1808b9a3f7
+DIST okio-1.11.0.zip 147483 BLAKE2B 776b77f12d72eafd573793b3a7e146d042cd07c38bdc96dd549ce82018cf128e40aee0a19bf019ffd174d73e75b35508c96684d87f443e4fb28da2964276eb4d SHA512 c8f440284d683a04e3d75d6f6715e229c06caad5e7f2bc544348703cdfbd8fe5bfb19f0c316ea4cfb473a933b03bda2277de8c0b7c956b143cc04826e61cf0b6
+EBUILD okio-1.11.0.ebuild 754 BLAKE2B 91748fc321cbac3b333bb7f39b07ca74e5f1a850e723256aa4f686909e99b4ab6d01a5ff812da3892d622bfa6052947a10ba8c5c182c3d8a63abf3337131e2d9 SHA512 405fb52d98b0b3b044d1e92ce3c6cca8654ea1816b6149a4b9bfe9a76943994e6f8d3975e985127cbf76395bf59acd3297ed5d1217c198d1fcdfd08b4ce01544
+MISC metadata.xml 312 BLAKE2B 4d749d9fd3b69a6e7cd51d9c1c9fbca98d6d6363147f0ee55ff767a3a8880d53cb0f4ab41fb8338e2c2d5aa3234b28fa61608d2332fcf9e1491e9f411c6d6a25 SHA512 595713b72b25fddd2950c667f082fef0ce861354c44a878efcaf721abdb8761c2496a9b975c21824cfebdea6d9d4fc39560c2f8747a868ccbf08b49ff7dbbb25
diff --git a/dev-java/okio/files/okio-remove-maven-animal-jre.patch b/dev-java/okio/files/okio-remove-maven-animal-jre.patch
new file mode 100644
index 000000000000..0e5e5d62880e
--- /dev/null
+++ b/dev-java/okio/files/okio-remove-maven-animal-jre.patch
@@ -0,0 +1,44 @@
+--- okio/src/main/java/okio/DeflaterSink.java	2016-08-22 12:01:19.828823222 -0500
++++ okio/src/main/java/okio/DeflaterSink.java	2016-08-22 12:01:25.039823574 -0500
+@@ -17,7 +17,6 @@
+ 
+ import java.io.IOException;
+ import java.util.zip.Deflater;
+-import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
+ 
+ import static okio.Util.checkOffsetAndCount;
+ 
+@@ -79,7 +78,6 @@
+     }
+   }
+ 
+-  @IgnoreJRERequirement
+   private void deflate(boolean syncFlush) throws IOException {
+     Buffer buffer = sink.buffer();
+     while (true) {
+--- okio/src/main/java/okio/Okio.java	2016-08-22 12:03:23.819831591 -0500
++++ okio/src/main/java/okio/Okio.java	2016-08-22 12:03:34.874832337 -0500
+@@ -30,7 +30,6 @@
+ import java.nio.file.Path;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+-import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
+ 
+ import static okio.Util.checkOffsetAndCount;
+ 
+@@ -167,7 +166,6 @@
+   }
+ 
+   /** Returns a source that reads from {@code path}. */
+-  @IgnoreJRERequirement // Should only be invoked on Java 7+.
+   public static Source source(Path path, OpenOption... options) throws IOException {
+     if (path == null) throw new IllegalArgumentException("path == null");
+     return source(Files.newInputStream(path, options));
+@@ -186,7 +184,6 @@
+   }
+ 
+   /** Returns a sink that writes to {@code path}. */
+-  @IgnoreJRERequirement // Should only be invoked on Java 7+.
+   public static Sink sink(Path path, OpenOption... options) throws IOException {
+     if (path == null) throw new IllegalArgumentException("path == null");
+     return sink(Files.newOutputStream(path, options));
diff --git a/dev-java/okio/metadata.xml b/dev-java/okio/metadata.xml
new file mode 100644
index 000000000000..1f3df0522d64
--- /dev/null
+++ b/dev-java/okio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">square/okio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/okio/okio-1.11.0.ebuild b/dev-java/okio/okio-1.11.0.ebuild
new file mode 100644
index 000000000000..57105c8e9838
--- /dev/null
+++ b/dev-java/okio/okio-1.11.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-parent-${PV}"
+
+DESCRIPTION="A modern I/O API for Java"
+HOMEPAGE="https://github.com/square/okio"
+SRC_URI="https://github.com/square/${PN}/archive/${MY_P}.zip -> ${P}.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.7"
+
+CDEPEND="
+	source? ( app-arch/zip )
+	dev-java/jmh-core:0
+	dev-java/junit:4"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="jmh-core,junit-4"
+
+src_prepare(){
+	epatch "${FILESDIR}/okio-remove-maven-animal-jre.patch"
+}
diff --git a/dev-java/opencsv-2.3 b/dev-java/opencsv-2.3
deleted file mode 100644
index ff7a88bf19c9..000000000000
--- a/dev-java/opencsv-2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A very simple csv (comma-separated values) parser library for Java
-EAPI=5
-HOMEPAGE=http://opencsv.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/opencsv/opencsv-2.3-src-with-libs.tar.gz -> opencsv-2.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6340ad3a91296be825974ab2eb5c8001
diff --git a/dev-java/opencsv/Manifest b/dev-java/opencsv/Manifest
new file mode 100644
index 000000000000..fdc7ac5dd027
--- /dev/null
+++ b/dev-java/opencsv/Manifest
@@ -0,0 +1,3 @@
+DIST opencsv-2.3.tar.gz 280510 BLAKE2B 02455b2a78854146af5c1bb262240678bbedf740a6994f9ef28a447145b0a1e9e2ab74d3c877f7d90882f598eef097a95acb71a458d5db338b7a3c73e640766a SHA512 3831cb9c5aaf8b19ed6895406e7358ddb6b30cba1876b42daeab41230d83bd532b9db53c073960413a385222ca889f1aae14404fd46143aa28ee05b3d1019106
+EBUILD opencsv-2.3.ebuild 640 BLAKE2B dbd2edd029cb4f8b7e89e009f440aaee1de6d3fd421e9bcc19d4b38361423201b2db2300e59feb1e0b8ab114106a7536a1ec4e54f13eb53ae4041ca5e510e928 SHA512 0aa7ba6d05c454b13b78dcb137b8cf499ac412f78bbf2c2eee72af64044ae4f0fa65eb5387d6aaafebcd1dd8a1ce91edd727e74d4534811129034ed1c51d8053
+MISC metadata.xml 313 BLAKE2B 32a2f9e7f87127e9805055d03b93c21731fdbc7096dcf753d8a9842ced1e0c2f0318678c361689441aafe7313c267dd08dea46468040b5aca45998426a08c461 SHA512 93d704c946f02479abc1d89604df715f49c01906f9e119859f90289cd6027e0a9498b2f62d30db47a62936716f45a031868805da4eaa39934dd2a9ad4223a8e2
diff --git a/dev-java/opencsv/metadata.xml b/dev-java/opencsv/metadata.xml
new file mode 100644
index 000000000000..0ae56959dc98
--- /dev/null
+++ b/dev-java/opencsv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">opencsv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/opencsv/opencsv-2.3.ebuild b/dev-java/opencsv/opencsv-2.3.ebuild
new file mode 100644
index 000000000000..17e96b3424e3
--- /dev/null
+++ b/dev-java/opencsv/opencsv-2.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A very simple csv (comma-separated values) parser library for Java"
+HOMEPAGE="http://opencsv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src-with-libs.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf test || die
+}
diff --git a/dev-java/oracle-javamail-1.5.2 b/dev-java/oracle-javamail-1.5.2
deleted file mode 100644
index e72c17ace304..000000000000
--- a/dev-java/oracle-javamail-1.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java-based framework to build multiplatform mail and messaging applications
-EAPI=4
-HOMEPAGE=https://java.net/projects/javamail/pages/Home
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CDDL GPL-2 BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.2-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=165d599d329e7d40e158edc803a887fd
diff --git a/dev-java/oracle-javamail-1.5.5 b/dev-java/oracle-javamail-1.5.5
deleted file mode 100644
index 44ac9d9bf7a7..000000000000
--- a/dev-java/oracle-javamail-1.5.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java-based framework to build multiplatform mail and messaging applications
-EAPI=5
-HOMEPAGE=https://java.net/projects/javamail/pages/Home
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CDDL GPL-2 BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.5-src.zip -> oracle-javamail-1.5.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=36864345a6c97569f67ac65822c29595
diff --git a/dev-java/oracle-javamail-1.5.6 b/dev-java/oracle-javamail-1.5.6
deleted file mode 100644
index 933986d8395c..000000000000
--- a/dev-java/oracle-javamail-1.5.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java-based framework to build multiplatform mail and messaging applications
-EAPI=5
-HOMEPAGE=https://java.net/projects/javamail/pages/Home
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CDDL GPL-2 BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.6-src.zip -> oracle-javamail-1.5.6.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=64639e3c4a994e808dba97d220d2b8ad
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
new file mode 100644
index 000000000000..bb140249f463
--- /dev/null
+++ b/dev-java/oracle-javamail/Manifest
@@ -0,0 +1,7 @@
+DIST javamail-1.5.2-src.zip 1573447 BLAKE2B 0ba805e20de84c8a4457d0a03225299a458c5324dc47bccbbf9708673a63521299565e45b66eec552d0216f144505aa319ea724a867ab7de2a69acd072e1a67f SHA512 9d2ae8c38a8e7464023219dac13df95a34cab52a5ff9f19015ea0dde73a838f49ae006c9dc1538eeb978844af7ac962ce3b22d89f0f9ccda684141f7b52840bc
+DIST oracle-javamail-1.5.5.zip 1794428 BLAKE2B 6bcba7aa40ad668b8cfd55ae3b4afddcd0df51298860fb75a2e1ae805920b5a966ef031d91c7a5e0a6cd2f5a2892f4f70ae0e24c87c9623bc1a6c15df93be7a9 SHA512 20eb12e757d00ceedbf45c43ddc1b6fe1155e79766e5843fbb8fd58c3ad91305edb07351b4ff9ed411aaffe977e9e4f287ac16b88ac55541f6f4f93c1c81a58a
+DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
+EBUILD oracle-javamail-1.5.2.ebuild 1256 BLAKE2B e53887a1ad16fb179215f9df91d7a911175f58f40575649c6a15a2444b504edeb5990180cba566c1494a2fbd3b08ad722fe632530c6c32c189ef7d8f9d3ae46c SHA512 38ac3b08f7dcf9530c058d1d982c851606cac3865237aafecb18df69ea6eaab4f30ba286946621d46cc546f57a4a496c5f3d037e6d339f3559060302f2a66f59
+EBUILD oracle-javamail-1.5.5.ebuild 1271 BLAKE2B 8e5cbc325d8d60505d5834797d68b68d14ed12e148d619fdef5584023209d78d3d03803f04b283e8c9ae8a97b181b51c2cc2b74e04e112b5a374dad83a96cfe1 SHA512 8072133774a6864739b1aff8e00e611b5fc3782d80d1b034c2b145d5ee6aa0af00f0e9f6f3a8e9e71ee82b8d1f1576c1080de8bbb9062c63eaddc1e260f4b6a6
+EBUILD oracle-javamail-1.5.6.ebuild 1278 BLAKE2B 575ef4c929e7f644dcda4ffe67651c04347522791b5bf05b2d522cec18465098c637f97e796ac207a3df5bf8631cbcb3298b15d8991eeda3c12eb7370531621c SHA512 49e142b1912c4497a220c8397c5fea533a9b063e46d6a6858fe2a3a219eed47bb84893d3b874af4cde65b84d1df44c60d8662a299103c98af0b9e8b58da90863
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/oracle-javamail/metadata.xml b/dev-java/oracle-javamail/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/oracle-javamail/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
new file mode 100644
index 000000000000..7ff17890673c
--- /dev/null
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
+HOMEPAGE="https://java.net/projects/javamail/pages/Home"
+
+SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip"
+
+# either of these
+LICENSE="CDDL GPL-2 BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	default
+
+	# build.xml expects it here
+	mkdir -p legal/src/main/resources/META-INF || die
+	cp mail/src/main/resources/META-INF/LICENSE.txt \
+		legal/src/main/resources/META-INF || die
+}
+
+EANT_DOC_TARGET="docs"
+EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
+
+src_install() {
+	java-pkg_dojar target/release/mail.jar
+
+	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt || die
+	dohtml -r doc/release/{*.html,images} || die
+
+	use doc && java-pkg_dojavadoc target/release/docs/javadocs
+	use source && java-pkg_dosrc mail/src/main/java
+}
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
new file mode 100644
index 000000000000..b50794d5b058
--- /dev/null
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
+HOMEPAGE="https://java.net/projects/javamail/pages/Home"
+SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip -> ${P}.zip"
+
+# either of these
+LICENSE="CDDL GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	default
+
+	# build.xml expects it here
+	mkdir -p legal/src/main/resources/META-INF || die
+	cp mail/src/main/resources/META-INF/LICENSE.txt \
+		legal/src/main/resources/META-INF || die
+}
+
+EANT_DOC_TARGET="docs"
+EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
+
+src_install() {
+	java-pkg_dojar target/release/mail.jar
+
+	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt || die
+	dohtml -r doc/release/{*.html,images} || die
+
+	use doc && java-pkg_dojavadoc target/release/docs/javadocs
+	use source && java-pkg_dosrc mail/src/main/java
+}
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
new file mode 100644
index 000000000000..3a3a33a02b82
--- /dev/null
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
+HOMEPAGE="https://java.net/projects/javamail/pages/Home"
+SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip -> ${P}.zip"
+
+# either of these
+LICENSE="CDDL GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	default
+
+	# build.xml expects it here
+	mkdir -p legal/src/main/resources/META-INF || die
+	cp mail/src/main/resources/META-INF/LICENSE.txt \
+		legal/src/main/resources/META-INF || die
+}
+
+EANT_DOC_TARGET="docs"
+EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
+
+src_install() {
+	java-pkg_dojar target/release/mail.jar
+
+	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt || die
+	dohtml -r doc/release/{*.html,images} || die
+
+	use doc && java-pkg_dojavadoc target/release/docs/javadocs
+	use source && java-pkg_dosrc mail/src/main/java
+}
diff --git a/dev-java/oracle-jdk-bin-1.8.0.172 b/dev-java/oracle-jdk-bin-1.8.0.172
deleted file mode 100644
index 3cbffca18e42..000000000000
--- a/dev-java/oracle-jdk-bin-1.8.0.172
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare prerm setup unpack
-DEPEND=app-arch/zip examples? ( x64-macos? ( app-arch/unzip ) ) >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Oracle's Java SE Development Kit
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm
-KEYWORDS=-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris
-LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:1.8 ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=javafx? ( alsa fontconfig )
-RESTRICT=fetch preserve-libs strip
-SLOT=1.8
-SRC_URI=amd64? ( jdk-8u172-linux-x64.tar.gz examples? ( jdk-8u172-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u172-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u172-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u172-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u172-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u172-linux-i586.tar.gz examples? ( jdk-8u172-linux-i586-demos.tar.gz ) ) x64-macos? ( jdk-8u172-macosx-x64.dmg examples? ( jdk-8u172-macosx-x86_64-demos.zip ) ) sparc64-solaris? ( jdk-8u172-solaris-sparcv9.tar.gz examples? ( jdk-8u172-solaris-sparcv9-demos.tar.gz ) ) x64-solaris? ( jdk-8u172-solaris-x64.tar.gz examples? ( jdk-8u172-solaris-x64-demos.tar.gz ) )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9cc1578dd07091766e58cfcf4237b86f
diff --git a/dev-java/oracle-jdk-bin-9.0.4-r2 b/dev-java/oracle-jdk-bin-9.0.4-r2
deleted file mode 100644
index 40786bd72990..000000000000
--- a/dev-java/oracle-jdk-bin-9.0.4-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prerm setup unpack
-DEPEND=>=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Oracle's Java SE Development Kit
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source
-KEYWORDS=-* ~amd64 ~x64-macos ~sparc64-solaris
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl gtk2? ( x11-libs/cairo x11-libs/gtk+:2 ) gtk3? ( x11-libs/cairo[glib] x11-libs/gtk+:3 ) ) ) !prefix? ( dev-libs/elfutils sys-libs/glibc:* ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:9 ) fontconfig? ( media-libs/fontconfig:1.0 ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )
-RESTRICT=fetch preserve-libs strip
-SLOT=9
-SRC_URI=amd64? ( jdk-9.0.4_linux-x64_bin.tar.gz ) x64-macos? ( jdk-9.0.4_osx-x64_bin.dmg ) sparc64-solaris? ( jdk-9.0.4_solaris-sparcv9_bin.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2072596e6d95192bc67da39d547f24b
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
new file mode 100644
index 000000000000..ca27f0ffe5c5
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -0,0 +1,23 @@
+AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
+AUX oracle-jdk-bin-9.env.sh 497 BLAKE2B 281d53c547c2067359af307846c29f31683cd18c8d7b305de278398eed254d0c3cdcd153b9ae67edfea7f09190f1da5d26f26026c0c4125b5ecbf8a730c9c433 SHA512 e9eee113974c0d570cccaed0a71917dd12d806248db128bafa1fcf744838ff9181f5b53b791e726e178e2164da1b2d901a43eefc37b25a3776288c137231b2d8
+AUX oracle-jdk-bin.env.sh 833 BLAKE2B 2e8254aff8d35795f073fb599c1c51dcd2ecb0356b4e90977577b9cd41376c3517a72e634bfb1420c37c8149af89044f48aa374480b26a19c875d4c1b78390eb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8
+DIST jdk-8u172-linux-arm32-vfp-hflt-demos.tar.gz 10423820 BLAKE2B af3c7edab4e0bd3c785914292ac227138af25a948fa580ab466937f169806254bc12476dd1b4b320ce4997f52d41ab4851a7c82c47f33bbd3080cc49c1f8d091 SHA512 8b18204d5bfb8545db71e7b3f5f6fd6d67077116a32c6cf33cbe192a88c768a97082dbd62a436b2c75f45b3d5aac8974f8bf653dd3902121f4881193dff226cb
+DIST jdk-8u172-linux-arm32-vfp-hflt.tar.gz 81781271 BLAKE2B cf69c1964126e6f79324ac5aaca552f6984925a5e2cd1dce8417a6c61792dba908e0cd92127405f8f10fafd2b7b6a33e76d5a4f766e72fe8bc928ffa9612c9e7 SHA512 451b1b4875775ee40c8b9260f1d6437d8f5d14ba12b578eb4bc855a04d061c5dc7a320b9ab962c8f26d9a73c8975122cd31c412b44654dd07e47de8a024f88fd
+DIST jdk-8u172-linux-arm64-vfp-hflt-demos.tar.gz 10438462 BLAKE2B f72f2360b75d35443b5845669cb48d517591ad870253c6ae2a7fc341bcf12f86351125691f973f6cebb6a286d1f1763a93f38e238a00eb3562676cfcdff8b026 SHA512 91cfc64aed933c6760dd32b07609fe27edf13c7974e9ed6e5e9c3eddf47416ed97caec525a028ecdd8cf70d20d8fc2655c250befff9c37f38cba9e338d4c56d8
+DIST jdk-8u172-linux-arm64-vfp-hflt.tar.gz 78538075 BLAKE2B 2dcfe46785c1ba53af5f6f662a323c832eb708c1c1db311e97188850bf34bc543da15af35571cff1163b463770756d405b01d9f0bab8fb62a0714499433d0264 SHA512 762d6cf3e6aef60d75b0d1096c8ff5b92d17141fb5176bf74d294bb8e1921313f0f33d0424e6aa523a9237ed29fb6e7fbd76480326aa55004cea8065b0ac8d47
+DIST jdk-8u172-linux-i586-demos.tar.gz 59159082 BLAKE2B 2e1b9fc6498e49f61294e94e7177239bfc4e714eae552deaaa25211e3b6d0e95b4a0f13cd9cd67adada356697e7958b1853307bdce227228038cc5b9e0b3c3a3 SHA512 01aa66b78f944292ffc890cc7ddb19a8c45dca092e2ed49ac16b2c0ad217e2f7226f1bc48c9709755ab3cc566f086f3271220a66963de7fd184f5abb3704f981
+DIST jdk-8u172-linux-i586.tar.gz 193889453 BLAKE2B 298c81f62df9d65c756245f10d18a914598050d2f68106158c68bb9102fefca563d24706ec99fa78733da0ce29d4ab41c3eb0397603e45a6d82883f34157a5dc SHA512 1b2a8a582e85f0ea6b2ae5358e5392b351a6bb4f1277c15281861387119cce9cc0c0c8efddf483aa79eddc273812874413af24c0bafa9e39281995f9cfa0719e
+DIST jdk-8u172-linux-x64-demos.tar.gz 59218933 BLAKE2B 6569f49ac37d84ee8e086f37db32577a399595f316ceeda2be787c6c0b2f41d42e5b739957b8e9c69a6eae06cd85028dccde39f2d05c50a04be7118c69d5c2d8 SHA512 287fe6a8f1b0efdfb97989cb1364854b914f3d4fca98be395fa4851bde2fef18aee05fede24bb342886dd2d3c55c92d9855bde7472e47ceb71ffc60eacbf21ff
+DIST jdk-8u172-linux-x64.tar.gz 190921804 BLAKE2B f9c85b335432d7572e97ba384fff4e83fe43125f361cc9a357b06e43326cd8350b3fcd608113e8f346a373d50be0f2b86958bda3d99abea6289bad610e734704 SHA512 b098de15802a1053053f955e87a2ad9bc56667f249180eebe70620f6ce0a2ff5377652b72cf99c11f73ed1ab7962ca01e6c4f2f52286c0cefe8fc8bfe1229889
+DIST jdk-8u172-macosx-x64.dmg 259908002 BLAKE2B 7849a02660fbeef008df859c84655e845ffa78e0e0fd343672c8eb0c1f93e9516d777b14bad25711e587ce24d83b63547e2f901c915a0addef6c94b5cf334ac6 SHA512 7d62c294597a76c716446054825741d0ea837ddc98fc95a254e768b3cf618a1e68ca99dfc472cfa3edd2e22796c7bfcef27837abbd159d757ebe5cd63fd4a0eb
+DIST jdk-8u172-macosx-x86_64-demos.zip 59765923 BLAKE2B 127ea9b087d0768c7b6f6812ac58bc32f5edacb49c2f8c80088fba27cb55e34d5c1a5b5ad4c131b7f32ee4ffbe704417e125261d92a87bfdf2b136b8fbc169e1 SHA512 15e49030c4c5459ac6f35f62e146a7fa61a6d25858396ddbfb15d2c49b07a35ffe36720a3e06c3fa4e3f05e58ccdaa00dcc3d065f7c33eff9d6fcf4fc2dbb1ae
+DIST jdk-8u172-solaris-sparcv9-demos.tar.gz 9794438 BLAKE2B 9498f2cf09619a125280964cbbde16f90713826399beac5af0c71b91d62a2f5f74599b78694cb171f46c276beb3636e9c00ada13ac1e01c133e5e001a25d220e SHA512 deae8eb5d3927c848d9350f79d79731b2813d5e3ea5fd7b111f2dee52eb4d4cc2d277329475656ecf801cb7379cdda1d6402e0994207d259335896e7484de2e1
+DIST jdk-8u172-solaris-sparcv9.tar.gz 104179591 BLAKE2B 0d17d4085ba19e5accab1495804799460ef5c327dad603fd8ec00e88558422aa0abbc0b98dc9bd78896eb06745d934c9c784e9697980f8f2fe3533e57d55f0da SHA512 373386058b25abd9f0c6ec3b0de528449e11281e36cdd94f66d7b976d78ccaeb6cf953d41c57552b74f46a21c8ca46489978d82a72748b32d1bc0ad65f2642f9
+DIST jdk-8u172-solaris-x64-demos.tar.gz 9760535 BLAKE2B 7c607f6e716f57adf6b51fc6c8061edbe56c8eef732725bd2175209659e2260084d06355a568fdf1ec57ee5b256bb3204e24d5017a9ed2d9d388bb7b5763af1b SHA512 2bfbf248b6b0948ccb17ee7323168ca8760a29dd5980f917cd5414be7ee4b8aa93158a003ba450592be73fa9ebec29a45d85301bf4ed848468adb13ad53b4b08
+DIST jdk-8u172-solaris-x64.tar.gz 101774902 BLAKE2B eacd050346e9ed3d939cb8ff79cb1c024e6c0adb6f6677fa348461b5661ea90b8d006d799d63fbfaebc6fd71e25ccd06751fb8dc252f06ec56acfee6f7a1cc21 SHA512 7de041389aac89060091b08aac55d713fb99a7805fce94605e9798bbcc228dbc65db265d9dcbac87953d7c82b9773debb26bbe83301cd8a344233cb7045964e4
+DIST jdk-9.0.4_linux-x64_bin.tar.gz 354635831 BLAKE2B 6d102ca812c7fcf03b611d95880af51916dde52f09f3a5b972abd6575c73e8cca1855fb50ac00aac3f4643a1e422b5fdb97a746608b5a4235d8664926a061730 SHA512 787addfcf3d4736507ad8fa54b22894a33d39bde01d9d187d5c9f3433b43c9e8b14404a8366d0bc8510faa8936274bbfa304109d3927aa323b3f8a285efaffd6
+DIST jdk-9.0.4_osx-x64_bin.dmg 400672048 BLAKE2B 0bcc3643ccbc72cd98aca71823e06fd60068a7e1d72c7ce59f8e4c26bb9461a207f57ef239b244ec05c8f843666f2854b07a5f05841819cfe79ed8fefafb3650 SHA512 34191b5802c2d369f890cb1b563f77ee040b9af6ee4fc8ae81974f46afea675401e2a02803fc4345e11bab1103397dd8b583d68bb81edcdd02902cb3e595cc52
+DIST jdk-9.0.4_solaris-sparcv9_bin.tar.gz 217025485 BLAKE2B 6b3d4f4701ff3349f8acce727fcfcb06ce420e54dd32d2e6b91b71aa898a8d6a293375ec2cb0c66f14a5df77a6f5b7016160572b995ad84a593e9d5c6c928184 SHA512 9418a725a33dfbedf7f692abfb92550f23fca594fa8c1b85934d601284261339f177a32af7440e0b09233b2e99b2fd7cef835c54252cec6a645ea322a389de14
+EBUILD oracle-jdk-bin-1.8.0.172.ebuild 8565 BLAKE2B 86b1dd234586f25ade3b9d045774405ab54d9f04951748c4e4020620cbc8d5fec8c35e8292bbcd45245a51ae60a56a4eccc3c90c8c69252df38d5c765df97b80 SHA512 97e116fb81d8ca8efd783c6ff20b223b3770af17b43ae9009d846a4133e2285fb526567571aa705dfad55a7adc7d08afc040d9b4805e198590d3c6013fc80d3a
+EBUILD oracle-jdk-bin-9.0.4-r2.ebuild 6803 BLAKE2B 8318572886e47fee4b4c94bf795a26203da64746c9a8f5c55f7c6a46305ac8b31792c784bb9d7e17160de8133a60b8a85e4ef5f5c9be89fa050d74e357df5fc8 SHA512 bbe8631108b393c382777df2651c0212efb8a1c532745ae584625a6bc6c918408bafa7bb27de2ec67982c8c33cb20d078de99b79752afed44bfab857afec1556
+MISC metadata.xml 1200 BLAKE2B 3ed6f9dd71a1c26a5292a56f89f8ce8ed72475b0c5139cb03afb47559ae464e0ed64ae4ed5a023bc2a2d316c77805a8820762a4dbfa091f612fd2729fe2f17f5 SHA512 1c104de4d08e61cb3cb14755536e7ed74df233325a673fcd83ca930335d35e77408653a4e2f962de792e186dd7ad9457e3898be159af61842610801ea00b9d9f
diff --git a/dev-java/oracle-jdk-bin/files/fontconfig.properties b/dev-java/oracle-jdk-bin/files/fontconfig.properties
new file mode 100644
index 000000000000..43cb5eed0c47
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/files/fontconfig.properties
@@ -0,0 +1,161 @@
+# Version
+
+version=1
+
+# Component Font Mappings
+
+allfonts.chinese-gb18030=-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1
+allfonts.chinese-gb18030.motif=-isas-song ti-medium-r-normal--*-%d-*-*-c-*-gb2312.1980-0
+allfonts.chinese-big5=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+allfonts.chinese-big5.motif=-taipei-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0
+allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+
+serif.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+serif.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+serif.plain.latin-1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
+serif.plain.latin-1.motif=-b&h-luxi serif-medium-r-normal--*-%d-*-*-p-*-iso8859-1
+
+serif.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+serif.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+serif.bold.latin-1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
+serif.bold.latin-1.motif=-b&h-luxi serif-bold-r-normal--*-%d-*-*-p-*-iso8859-1
+
+serif.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+serif.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+serif.italic.latin-1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.italic.latin-1.motif=-b&h-luxi serif-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+
+serif.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+serif.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+serif.bolditalic.latin-1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.bolditalic.latin-1.motif=-b&h-luxi serif-bold-i-normal--*-%d-*-*-p-*-iso8859-1
+
+sansserif.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+sansserif.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+sansserif.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
+
+sansserif.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+sansserif.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+sansserif.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
+
+sansserif.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+sansserif.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+sansserif.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+
+sansserif.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+sansserif.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
+
+monospaced.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+monospaced.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
+
+monospaced.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+monospaced.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
+
+monospaced.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+monospaced.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
+
+monospaced.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+monospaced.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
+
+dialog.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialog.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialog.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
+
+dialog.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialog.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialog.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
+
+dialog.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialog.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialog.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+
+dialog.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialog.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
+
+dialoginput.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialoginput.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
+
+dialoginput.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialoginput.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
+
+dialoginput.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialoginput.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
+
+dialoginput.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialoginput.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
+
+# Search Sequences
+
+sequence.allfonts=latin-1
+sequence.allfonts.Big5=latin-1,chinese-big5
+sequence.allfonts.GB2312=latin-1,chinese-gb18030
+sequence.allfonts.x-euc-jp-linux=latin-1,japanese-x0208
+sequence.allfonts.EUC-KR=latin-1,korean
+sequence.allfonts.GB18030=latin-1,chinese-gb18030
+sequence.fallback=lucida,chinese-big5,chinese-gb18030,japanese-x0208,korean
+
+# Exclusion Ranges
+
+exclusion.japanese-x0208=0390-03d6,2200-22ef,2701-27be
+
+# Font File Names
+
+filename.-arphic_technology_co.-ar_pl_mingti2l_big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts/bsmi00lp.ttf
+filename.-misc-baekmuk_batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/batang.ttf
+filename.-misc-baekmuk_gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/gulim.ttf
+filename.-misc-kochi_gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+filename.-misc-kochi_mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+filename.-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/hkscs-ming/min_uni.ttf
+
+# AWT X11 font paths
+awtfontpath.latin-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/Type1
+awtfontpath.chinese-big5=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts
+awtfontpath.chinese-gb18030=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts
+awtfontpath.japanese-x0208=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute
+awtfontpath.korean=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts
diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh
new file mode 100644
index 000000000000..503707550e23
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="Oracle JDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh
new file mode 100644
index 000000000000..508a5c647874
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="Oracle JDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
+MANPATH="${EPREFIX}/opt/${P}/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/classes"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
new file mode 100644
index 000000000000..1951d0d61240
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <longdescription>Oracle Java SE Development Kit, Official Binary Distribution</longdescription>
+  <use>
+    <flag name="commercial">Install features requiring a commercial license for production use</flag>
+    <flag name="derby">Install bundled Derby (Java database)</flag>
+    <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
+    <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
+    <flag name="gtk2">Enable GTK+ 2 support in JavaFX</flag>
+    <flag name="gtk3">Enable GTK+ 3 support in JavaFX</flag>
+    <flag name="javafx">Install JavaFX libraries</flag>
+    <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
+    <flag name="source">Install JVM (and optionally JavaFX) sources</flag>
+    <flag name="visualvm">Install VisualVM debugging tool</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.172.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.172.ebuild
new file mode 100644
index 000000000000..f71907bd1d48
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.172.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix versionator
+
+KEYWORDS="-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jdk-${MY_PV}-linux-x64.tar.gz"
+ARCH_FILES[arm]="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
+ARCH_FILES[arm64]="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
+ARCH_FILES[x86]="jdk-${MY_PV}-linux-i586.tar.gz"
+ARCH_FILES[x64-macos]="jdk-${MY_PV}-macosx-x64.dmg"
+ARCH_FILES[sparc64-solaris]="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+ARCH_FILES[x64-solaris]="jdk-${MY_PV}-solaris-x64.tar.gz"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	case "${keyword#\~}" in
+		*-linux) continue ;;
+		x64-macos) demo="jdk-${MY_PV}-macosx-x86_64-demos.zip" ;;
+		*) demo=${ARCH_FILES[${keyword#\~}]/./-demos.} ;;
+	esac
+
+	SRC_URI+="
+		${keyword#\~}? (
+			${ARCH_FILES[${keyword#\~}]}
+			examples? ( ${demo} )
+		)"
+done
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.8"
+IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
+REQUIRED_USE="javafx? ( alsa fontconfig )"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="app-arch/zip
+	examples? ( x64-macos? ( app-arch/unzip ) )"
+
+S="${WORKDIR}/jdk$(replace_version_separator 3 _  ${S_PV})"
+
+pkg_nofetch() {
+	local a
+	einfo "Please download these files and move them to your distfiles directory:"
+	einfo
+	for a in ${A} ; do
+		[[ ! -f ${DISTDIR}/${a} ]] && einfo "  ${a}"
+	done
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
+	einfo
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		mkdir -p "${T}"/dmgmount || die
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount || die
+		local jdkgen=$(get_version_component_range 2)
+		local uver=$(get_version_component_range 4)
+		( cd "${T}" &&
+		  xar -xf "${T}/dmgmount/JDK ${jdkgen} Update ${uver}.pkg" \
+		  jdk${PV//.}.pkg/Payload ) || die
+		zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
+		hdiutil detach "${T}"/dmgmount || die
+		mv Contents/Home "${S}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
+		# Mark this binary early to run it now.
+		pax-mark m ./bin/javap
+
+		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
+		eqawarn
+		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
+	fi
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr lib/missioncontrol jre/lib/jfr* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+		   {,jre/}bin/{javaws,policytool} \
+		   bin/appletviewer || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
+		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
+		   bin/*javafx* bin/javapackager || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf jre/lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf jre/lib/*/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v jre/lib/fontconfig.* || die
+
+	# Packaged as dev-util/visualvm but some users prefer this version.
+	use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JRE and other slots.
+	if [[ -d jre/lib/desktop/icons ]] ; then
+		local icon
+		pushd jre/lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JDK ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby ; then
+		cp -pPR	db "${ddest}" || die
+	fi
+
+	if use examples && [[ ${A} = *-demos.* ]] ; then
+		cp -pPR demo sample "${ddest}" || die
+	fi
+
+	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
+		"${ddest}"/jre/lib/security/ || die
+
+	if use source ; then
+		cp -v src.zip "${ddest}" || die
+
+		if use javafx ; then
+			cp -v javafx-src.zip "${ddest}" || die
+		fi
+	fi
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/jre/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		local lib
+		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
+			ebegin "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}"/jre/lib/${lib} \
+				"${ddest}"/jre/lib/${lib} || die
+			eend $?
+		done
+	fi
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
new file mode 100644
index 000000000000..d728121913c1
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix
+
+KEYWORDS="-* ~amd64 ~x64-macos ~sparc64-solaris"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jdk-${PV}_linux-x64_bin.tar.gz"
+ARCH_FILES[sparc64-solaris]="jdk-${PV}_solaris-sparcv9_bin.tar.gz"
+ARCH_FILES[x64-macos]="jdk-${PV}_osx-x64_bin.dmg"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
+done
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="${PV%%.*}"
+IUSE="alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source"
+REQUIRED_USE="javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/atk
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/gdk-pixbuf
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+
+			gtk2? (
+				x11-libs/cairo
+				x11-libs/gtk+:2
+			)
+			gtk3? (
+				x11-libs/cairo[glib]
+				x11-libs/gtk+:3
+			)
+		)
+	)
+	!prefix? (
+		dev-libs/elfutils
+		sys-libs/glibc:*
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	selinux? ( sec-policy/selinux-java )"
+
+pkg_nofetch() {
+	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
+	einfo "your distfiles directory:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jdk9-downloads-3848520.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase9-3934878.html"
+	einfo
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		S="${WORKDIR}/Contents/Home"
+		mkdir -p "${T}"/dmgmount || die
+		hdiutil attach "${DISTDIR}/${A}" -mountpoint "${T}"/dmgmount || die
+		( cd "${T}" &&
+		  xar -xf "${T}/dmgmount/JDK ${PV}.pkg" \
+		  jdk${PV//.}.pkg/Payload ) || die
+		zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
+		hdiutil detach "${T}"/dmgmount || die
+	else
+		S="${WORKDIR}/jdk-${PV}"
+		default
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr jmods/*.jfr.* lib/jfr* \
+			lib/missioncontrol || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf lib/lib*{[jx]awt,splashscreen}* \
+		   bin/{appletviewer,javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/lib*{decora,fx,glass,prism}* \
+		   lib/libgstreamer-lite.* lib/*fx* \
+		   bin/javapackager jmods/javafx* || die
+	else
+		if ! use gtk2 ; then
+			rm -vf lib/libglassgtk2.* || die
+		elif ! use gtk3 ; then
+			rm -vf lib/libglassgtk3.* || die
+		fi
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v lib/fontconfig.* || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JRE and other slots.
+	if [[ -d lib/desktop/icons ]] ; then
+		local icon
+		pushd lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JDK ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodir "${dest}"
+	cp -pPR bin conf include jmods lib "${ddest}" || die
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	"${ddest}/bin/java" -server -Xshare:dump || die
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		local lib
+		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
+			ebegin "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}"/lib/${lib} \
+				"${ddest}"/lib/${lib} || die
+			eend $?
+		done
+	fi
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-9.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 9. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/oracle-jre-bin-1.8.0.172 b/dev-java/oracle-jre-bin-1.8.0.172
deleted file mode 100644
index bdf8708a8e51..000000000000
--- a/dev-java/oracle-jre-bin-1.8.0.172
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare prerm setup
-DEPEND=app-arch/zip >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Oracle's Java SE Runtime Environment
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux
-KEYWORDS=-* amd64 x86
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-RESTRICT=fetch preserve-libs strip
-SLOT=1.8
-SRC_URI=amd64? ( jre-8u172-linux-x64.tar.gz ) x86? ( jre-8u172-linux-i586.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe5596c81be25f7854a6e5fe958bc6fb
diff --git a/dev-java/oracle-jre-bin-9.0.4-r1 b/dev-java/oracle-jre-bin-9.0.4-r1
deleted file mode 100644
index c0fac0fbfce8..000000000000
--- a/dev-java/oracle-jre-bin-9.0.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prerm setup unpack
-DEPEND=>=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Oracle's Java SE Runtime Environment
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa commercial cups +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux
-KEYWORDS=-* ~amd64 ~x64-macos ~sparc64-solaris
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl gtk2? ( x11-libs/cairo x11-libs/gtk+:2 ) gtk3? ( x11-libs/cairo[glib] x11-libs/gtk+:3 ) ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )
-RESTRICT=fetch preserve-libs strip
-SLOT=9
-SRC_URI=amd64? ( jre-9.0.4_linux-x64_bin.tar.gz ) x64-macos? ( jre-9.0.4_osx-x64_bin.tar.gz ) sparc64-solaris? ( jre-9.0.4_solaris-sparcv9_bin.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=812def0a25058ee503df09c4b6c47563
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
new file mode 100644
index 000000000000..80a32fe808d5
--- /dev/null
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -0,0 +1,11 @@
+AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
+AUX oracle-jre-bin-9.env.sh 493 BLAKE2B 938985505c591afe17468af2314fd3e15c79205d141eb032055f0dcdb252a4931662d719ac28870ae72c5fd2f0901addb3bb552fa071f637ed674061f313fea2 SHA512 d98fbbcb422258f604489e630d4a3743ab44f9bc9648fdadf62da82ab4a8ff53cf9713e28d448eaa6c9e7fa412158a2fcdb26cb91c4abb3f8100c084d14977dd
+AUX oracle-jre-bin.env.sh 749 BLAKE2B b8c1f54712f4d41fd78bae4e7ad9e351516487b3c4573593674c1f340c4f9bafe9a283c35f8c3f136e1f93a6b0c8f6cf85837b4532db62059c7e66f05d7e0610 SHA512 273fafcafabd64946932eb42552476aeea2a9fc1c803cbcaa4f86b4fc8c80d109abdad068bf2063d7ea7e7c2d2794d7dc96dca6aae5ef8787b98ad57f467fa69
+DIST jre-8u172-linux-i586.tar.gz 84306480 BLAKE2B c5763bf5631a5ac246e5bbb6eaec98bac59ece15a9779c2861b474584bc86caafa333575d03fe875c3fcd3c47cbb506b905c274bf2b621f810846411b7619d5d SHA512 a4773fe39b69f22e6a646cd6b8ebdf189252e5b686f4000e43fc418ef133ac1b3e24374693c41eed5b3063849f33bbbf70a3ffe04c52ef9b1b8ac1b8d1d0dd22
+DIST jre-8u172-linux-x64.tar.gz 81182269 BLAKE2B f9c7afc534cc9e8c60458a58a768692ee95cb9401c238974daeb4ada5aa26b45f7a0de2b1785de77fb85ceaefc717b49cf08238f31032437bb620343cd468c30 SHA512 e113138946eb95fb2c9ea8bdc5ca4b8d0c3e9ae35baaf12a04c0f5a0c9af390f181d2e39fa1c71eb8c91d734a944c9239fdc10dcfc9b8a19829dad24dd35447f
+DIST jre-9.0.4_linux-x64_bin.tar.gz 87045353 BLAKE2B ccf3c0d725ca1431261a0b38cc06851fc10651415982fa2d97f512972c088c2c158ee51710b59e04f89326dd4cbb4c1ef8ecf514af190fbdc2be07cd222fd5d8 SHA512 20310fe68c89d26a89523eb1fe583eb5706fe2458342f5be0dfb4badd1d9df6ba25b00463f080fceb7c22781ff1555a61b29d187d8b02e1f9e165120b8140c3b
+DIST jre-9.0.4_osx-x64_bin.tar.gz 74599903 BLAKE2B a1bd4d51ee645347fcb735e46ee3311d34933bb0dbb20b9a668ed7b817be1d0432f4152f53f57a9fc16d6b6b7f38ea4118f5cae86a8b71143db0091c9baf62de SHA512 fc4bc4a062313a7e33943ace27287ba6e551727f0cf81d9a18f9f8c2f57b0ae00bd0d8619a65f596d75d4869fea757fedae3efdd8ba3ced58fa28b7cf93b3a85
+DIST jre-9.0.4_solaris-sparcv9_bin.tar.gz 54879298 BLAKE2B fb3ce1eefdb12378b28f5af0f0bbc1d9f3252eee5646be237b2ddc0ead37ed253fb73900475777c3f67d39b47112e0c2db2a18f6a05da7c5c19cd965e5513827 SHA512 709219f51d7455c127a38953babad39b344dee1275ad0fe65a0116e8fb15a10482589ba881ccae7910acff8f00aa7856c726c03daa8f3947d742bbbc09a276dd
+EBUILD oracle-jre-bin-1.8.0.172.ebuild 6054 BLAKE2B e7319d43fc1a84633f7366f3bc1bf691db58aa40de51e163e57cda9be6c23736e35201b01629722d3cd2f35f55c805d7b75abf11db03812e363dfe37e734377e SHA512 8c8d6a0575e4807d74feebaafe10bcf4bff5aceaaf46e2e3bbce261ca4e2613fa2fae915a09a25a22da2e71351c38206ccb62f98dc16ffcfbba29a49309b2c87
+EBUILD oracle-jre-bin-9.0.4-r1.ebuild 6278 BLAKE2B fb43030f8341cdd68644921776ccc397bd2bccb5d1df0112e14bf33d2c9e6c1414323b13cf566d828ae53f6bd0db5af546bdad7137eb011309a37591a5650d7f SHA512 f52656f65e214e26bf9bdbbf411c75392f41247071d95ce2976fe2eb21ea17b41181376f2bb15a87839745bc76a85bb08a0779dc2702b3ed45bae9e20ffb61d3
+MISC metadata.xml 996 BLAKE2B 0ceaf014bbef2817e869d5364997a44f77be90717bd01a09114b18e9318f58b61e3f4048f3b22a7ee8430a1042695f313066e996c15db71ee0775cf73aa7f1ef SHA512 043f1e701ac085678dbbb662994f6b67c78634990d721c65de97b392555e3a2fe5bfaccbe00f48c5dbd7c4e48837c6662d70306bf7cb3485ee3b2efa440b7afe
diff --git a/dev-java/oracle-jre-bin/files/fontconfig.properties b/dev-java/oracle-jre-bin/files/fontconfig.properties
new file mode 100644
index 000000000000..43cb5eed0c47
--- /dev/null
+++ b/dev-java/oracle-jre-bin/files/fontconfig.properties
@@ -0,0 +1,161 @@
+# Version
+
+version=1
+
+# Component Font Mappings
+
+allfonts.chinese-gb18030=-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1
+allfonts.chinese-gb18030.motif=-isas-song ti-medium-r-normal--*-%d-*-*-c-*-gb2312.1980-0
+allfonts.chinese-big5=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+allfonts.chinese-big5.motif=-taipei-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0
+allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+
+serif.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+serif.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+serif.plain.latin-1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
+serif.plain.latin-1.motif=-b&h-luxi serif-medium-r-normal--*-%d-*-*-p-*-iso8859-1
+
+serif.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+serif.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+serif.bold.latin-1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
+serif.bold.latin-1.motif=-b&h-luxi serif-bold-r-normal--*-%d-*-*-p-*-iso8859-1
+
+serif.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+serif.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+serif.italic.latin-1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.italic.latin-1.motif=-b&h-luxi serif-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+
+serif.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+serif.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+serif.bolditalic.latin-1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.bolditalic.latin-1.motif=-b&h-luxi serif-bold-i-normal--*-%d-*-*-p-*-iso8859-1
+
+sansserif.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+sansserif.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+sansserif.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
+
+sansserif.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+sansserif.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+sansserif.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
+
+sansserif.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+sansserif.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+sansserif.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+
+sansserif.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+sansserif.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
+
+monospaced.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+monospaced.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
+
+monospaced.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+monospaced.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
+
+monospaced.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+monospaced.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
+
+monospaced.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+monospaced.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
+
+dialog.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialog.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialog.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
+
+dialog.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialog.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialog.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
+
+dialog.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialog.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialog.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+
+dialog.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialog.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
+
+dialoginput.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialoginput.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
+
+dialoginput.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialoginput.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
+
+dialoginput.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialoginput.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
+
+dialoginput.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+dialoginput.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
+dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
+
+# Search Sequences
+
+sequence.allfonts=latin-1
+sequence.allfonts.Big5=latin-1,chinese-big5
+sequence.allfonts.GB2312=latin-1,chinese-gb18030
+sequence.allfonts.x-euc-jp-linux=latin-1,japanese-x0208
+sequence.allfonts.EUC-KR=latin-1,korean
+sequence.allfonts.GB18030=latin-1,chinese-gb18030
+sequence.fallback=lucida,chinese-big5,chinese-gb18030,japanese-x0208,korean
+
+# Exclusion Ranges
+
+exclusion.japanese-x0208=0390-03d6,2200-22ef,2701-27be
+
+# Font File Names
+
+filename.-arphic_technology_co.-ar_pl_mingti2l_big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts/bsmi00lp.ttf
+filename.-misc-baekmuk_batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/batang.ttf
+filename.-misc-baekmuk_gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/gulim.ttf
+filename.-misc-kochi_gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+filename.-misc-kochi_mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+filename.-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/hkscs-ming/min_uni.ttf
+
+# AWT X11 font paths
+awtfontpath.latin-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/Type1
+awtfontpath.chinese-big5=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts
+awtfontpath.chinese-gb18030=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts
+awtfontpath.japanese-x0208=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute
+awtfontpath.korean=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts
diff --git a/dev-java/oracle-jre-bin/files/oracle-jre-bin-9.env.sh b/dev-java/oracle-jre-bin/files/oracle-jre-bin-9.env.sh
new file mode 100644
index 000000000000..7e6f9a0e6684
--- /dev/null
+++ b/dev-java/oracle-jre-bin/files/oracle-jre-bin-9.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="Oracle JRE ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh b/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh
new file mode 100644
index 000000000000..a52547ca506f
--- /dev/null
+++ b/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="Oracle JRE ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/$(get_system_arch)/:\${JAVA_HOME}/lib/$(get_system_arch)/server/"
+MANPATH="${EPREFIX}/opt/${P}/man"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH="\${JAVA_HOME}/lib/resources.jar:\${JAVA_HOME}/lib/rt.jar:\${JAVA_HOME}/lib/sunrsasign.jar:\${JAVA_HOME}/lib/jsse.jar:\${JAVA_HOME}/lib/jce.jar:\${JAVA_HOME}/lib/charsets.jar:\${JAVA_HOME}/classes"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/oracle-jre-bin/metadata.xml b/dev-java/oracle-jre-bin/metadata.xml
new file mode 100644
index 000000000000..b9fe447b1280
--- /dev/null
+++ b/dev-java/oracle-jre-bin/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <longdescription>Oracle Java SE Runtime Environment, Official Binary Distribution</longdescription>
+  <use>
+    <flag name="commercial">Install features requiring a commercial license for production use</flag>
+    <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
+    <flag name="gentoo-vm">Allow this JRE to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
+    <flag name="gtk2">Enable GTK+ 2 support in JavaFX</flag>
+    <flag name="gtk3">Enable GTK+ 3 support in JavaFX</flag>
+    <flag name="javafx">Install JavaFX libraries</flag>
+    <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild
new file mode 100644
index 000000000000..ca2117f3c69b
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix versionator
+
+KEYWORDS="-* amd64 x86"
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jre-${MY_PV}-linux-x64.tar.gz"
+ARCH_FILES[x86]="jre-${MY_PV}-linux-i586.tar.gz"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
+done
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.8"
+IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="app-arch/zip"
+
+S="${WORKDIR}/jre$(replace_version_separator 3 _  ${S_PV})"
+
+pkg_nofetch() {
+	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
+	einfo "your distfiles directory:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
+	einfo
+}
+
+src_prepare() {
+	default
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr lib/jfr* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
+		   bin/{javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
+		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/*/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/*/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v lib/fontconfig.* || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JDK and other slots.
+	if [[ -d lib/desktop/icons ]] ; then
+		local icon
+		pushd lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JRE ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR	bin lib man "${ddest}" || die
+
+	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
+		"${ddest}"/lib/security/ || die
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4-r1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4-r1.ebuild
new file mode 100644
index 000000000000..1b3a1f76ccf3
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4-r1.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix
+
+KEYWORDS="-* ~amd64 ~x64-macos ~sparc64-solaris"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jre-${PV}_linux-x64_bin.tar.gz"
+ARCH_FILES[sparc64-solaris]="jre-${PV}_solaris-sparcv9_bin.tar.gz"
+ARCH_FILES[x64-macos]="jre-${PV}_osx-x64_bin.tar.gz"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
+done
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="${PV%%.*}"
+IUSE="alsa commercial cups +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux"
+REQUIRED_USE="javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/atk
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/gdk-pixbuf
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+
+			gtk2? (
+				x11-libs/cairo
+				x11-libs/gtk+:2
+			)
+			gtk3? (
+				x11-libs/cairo[glib]
+				x11-libs/gtk+:3
+			)
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+pkg_nofetch() {
+	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
+	einfo "your distfiles directory:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jre9-downloads-3848532.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase9-3934878.html"
+	einfo
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		S="${WORKDIR}/jre-${PV}.jre/Contents/Home"
+	else
+		S="${WORKDIR}/jre-${PV}"
+	fi
+
+	default
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr lib/jfr* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf lib/lib*{[jx]awt,splashscreen}* \
+		   bin/javaws || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/lib*{decora,fx,glass,prism}* \
+		   lib/libgstreamer-lite.* lib/*fx* || die
+	else
+		if ! use gtk2 ; then
+			rm -vf lib/libglassgtk2.* || die
+		elif ! use gtk3 ; then
+			rm -vf lib/libglassgtk3.* || die
+		fi
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v lib/fontconfig.* || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JDK and other slots.
+	if [[ -d lib/desktop/icons ]] ; then
+		local icon
+		pushd lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JRE ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodir "${dest}"
+	cp -pPR	bin conf lib "${ddest}" || die
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	"${ddest}/bin/java" -server -Xshare:dump || die
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		local lib
+		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
+			ebegin "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}"/lib/${lib} \
+				"${ddest}"/lib/${lib} || die
+			eend $?
+		done
+	fi
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-9.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 9. This JRE must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/osgi-compendium-4.3.1 b/dev-java/osgi-compendium-4.3.1
deleted file mode 100644
index e887aae136ed..000000000000
--- a/dev-java/osgi-compendium-4.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/osgi-foundation:0 dev-java/tomcat-servlet-api:3.0 >=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=OSGi Service Platform Compendium API (Companion Code)
-EAPI=5
-HOMEPAGE=http://wiki.osgi.org/wiki/Release_4.3
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 OSGi-Specification-2.0
-RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/osgi-foundation:0 dev-java/tomcat-servlet-api:3.0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4f82570a3ff65f7b4659df644c60984f
diff --git a/dev-java/osgi-compendium/Manifest b/dev-java/osgi-compendium/Manifest
new file mode 100644
index 000000000000..e4857e4fcb61
--- /dev/null
+++ b/dev-java/osgi-compendium/Manifest
@@ -0,0 +1,3 @@
+DIST osgi.cmpn-4.3.1.jar 741615 BLAKE2B 6f6058c07fd7744f0369d05cdf607b4d4fe51bbdf567c6a6c951413b0627eb1dbb6e56f65641a8472198d0aedca378da4715c26ebe05aa4e7ef80adb1020175f SHA512 803e929b4b7cfee13a3ffa2c60ad03775afd8409c972bf26e3f79abc590466c2d885bdc339d9af2a3e8fda9cdf082d23a298362ac37935b0ede0719dee27e9f9
+EBUILD osgi-compendium-4.3.1.ebuild 837 BLAKE2B b0f26321ea27ff14f1c4929475305f89a45a9700a458a0c882407dcd2f9ca84fd00a94b218c401b483aa0103f3becac36b7248a1619b9cf21cfc1ac2e0a7a193 SHA512 cff2849dc1d4c9c853b47b28c5b7f0056f0ba94f518a72cf3b7d5f6be3d9cc6b18c4033c7efc5d13c753f9da82de305e4c98b8a15774f8ae0e2426d0611f36df
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/osgi-compendium/metadata.xml b/dev-java/osgi-compendium/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/osgi-compendium/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
new file mode 100644
index 000000000000..29c598b6ed44
--- /dev/null
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Service Platform Compendium API (Companion Code)"
+HOMEPAGE="http://wiki.osgi.org/wiki/Release_4.3"
+SRC_URI="https://osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
+
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/glassfish-persistence:0
+	dev-java/osgi-core-api:0
+	dev-java/osgi-foundation:0
+	dev-java/tomcat-servlet-api:3.0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+JAVA_GENTOO_CLASSPATH="
+	osgi-core-api
+	osgi-foundation
+	glassfish-persistence
+	tomcat-servlet-api-3.0
+"
+
+java_prepare() {
+	rm -r org || die
+}
diff --git a/dev-java/osgi-core-api-5.0.0 b/dev-java/osgi-core-api-5.0.0
deleted file mode 100644
index 2a6258bfa0e3..000000000000
--- a/dev-java/osgi-core-api-5.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=OSGi Service Platform Core API (Companion Code)
-EAPI=4
-HOMEPAGE=http://www.osgi.org/Specifications/HomePage
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=67b4ff654c4128fe52e97d9eb92442fb
diff --git a/dev-java/osgi-core-api-5.0.0-r1 b/dev-java/osgi-core-api-5.0.0-r1
deleted file mode 100644
index 6e5c4178962d..000000000000
--- a/dev-java/osgi-core-api-5.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=OSGi Service Platform Core API (Companion Code)
-EAPI=5
-HOMEPAGE=http://www.osgi.org/Specifications/HomePage
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f19534c7d9c3c6714cf53ad2fc5a0cf5
diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest
new file mode 100644
index 000000000000..eafe2f1258da
--- /dev/null
+++ b/dev-java/osgi-core-api/Manifest
@@ -0,0 +1,4 @@
+DIST osgi.core-5.0.0.jar 418232 BLAKE2B d7cfb8b2c6ff955ffc8252f248eb7bec562d16598e1a56fb50f12c099adae8b5268bc26003e166794eaee8fa6cb116ce388eb1981ef5a09394c05b7ea8655f0d SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3
+EBUILD osgi-core-api-5.0.0-r1.ebuild 578 BLAKE2B e696c120900d0726faeb42b6df8f9c95934c5a04d55a2838769dcf9fe68daf5987d4137cdef04a2b8627051b6c2ee6fe1fea7ceee6c3f09ff2dbb3923bd29f71 SHA512 c9df706529c2a57dd98b3054612d8e19dd1aff63db7a53cfefc4c3f6c50d7ace0a5240d707a8810bb232d6f8c220ba88747a7e1a2e0956bf798cb6d19ca256d4
+EBUILD osgi-core-api-5.0.0.ebuild 562 BLAKE2B 7bc84b27e2bebd6417a985a80c529ba84f847fb98359c0fb029d9c723b59b22c3a76c8efdd7ca0dbfca5186ba1ad2773c80b6ca92ae58cf1b33978c5839d77aa SHA512 1b62a12d5c66b1a67ce1560441745ccc288db9a39c40676f87aa753f387977f0560c624241b546acc4cc2f136449b0cfbc4679b7f18b9c607a41f8bbb7bb1837
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/osgi-core-api/metadata.xml b/dev-java/osgi-core-api/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/osgi-core-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..30e9dd6437d7
--- /dev/null
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
+HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
+SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+java_prepare() {
+	rm -r org || die
+}
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
new file mode 100644
index 000000000000..b00be73ca481
--- /dev/null
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
+HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
+SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+java_prepare() {
+	rm -r org || die
+}
diff --git a/dev-java/osgi-enterprise-api-5.0.0 b/dev-java/osgi-enterprise-api-5.0.0
deleted file mode 100644
index 2c7bf9198df0..000000000000
--- a/dev-java/osgi-enterprise-api-5.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup
-DEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/servlet-api:2.5 >=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=OSGi Enterprise Release 5 Companion Code
-EAPI=5
-HOMEPAGE=http://www.osgi.org/Main/HomePage
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 OSGi-Specification-2.0
-RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=bindist fetch
-SLOT=0
-SRC_URI=http://www.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bf845d50be067f9eb844b69191ac5b4d
diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
new file mode 100644
index 000000000000..b5c9d01d1318
--- /dev/null
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -0,0 +1,3 @@
+DIST osgi.enterprise-5.0.0.jar 479506 BLAKE2B 2bd53b50e469388d132a6d3ebd78d4040093f8c1d79299fd87412853d959f7559f04287567eeea47635fe287a3e9d3812ac9303a5d39ec35135ab3c58bd0b010 SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144
+EBUILD osgi-enterprise-api-5.0.0.ebuild 1045 BLAKE2B a78f0809cfc055eeb5b04122be3f26bc7a9e6bc2237ff7c421731b8fc643430a0adbb699215d670d7d5530272a53e8f551b1f9037b652ec39a2d69893a054b96 SHA512 c72d78a9262839e70109ff7a893864467261e711a66e7343d354078fc30d015cc71d9e933a5bdbb7df19046ef00c9161b65f2d869cbadfaf839a06e14a020041
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/osgi-enterprise-api/metadata.xml b/dev-java/osgi-enterprise-api/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/osgi-enterprise-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
new file mode 100644
index 000000000000..5ef88db0e2f5
--- /dev/null
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Enterprise Release 5 Companion Code"
+SRC_URI="http://www.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
+HOMEPAGE="http://www.osgi.org/Main/HomePage"
+
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RESTRICT="bindist fetch"
+
+CDEPEND="dev-java/glassfish-persistence:0
+	dev-java/osgi-core-api:0
+	java-virtuals/servlet-api:2.5"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+JAVA_GENTOO_CLASSPATH="glassfish-persistence,osgi-core-api,servlet-api-2.5"
+
+pkg_nofetch() {
+	einfo "Please download osgi.enterprise-${PV}.jar from"
+	einfo "  http://www.osgi.org/Download/Release5"
+	einfo "which you can find listed as"
+	einfo "  OSGi Enterprise Release 5 Companion Code"
+	einfo "after accepting the license."
+}
+
+java_prepare() {
+	rm -r org || die
+}
diff --git a/dev-java/osgi-foundation-1.2.0-r1 b/dev-java/osgi-foundation-1.2.0-r1
deleted file mode 100644
index 88c547d1f282..000000000000
--- a/dev-java/osgi-foundation-1.2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=OSGi R4 Foundation EE by Apache Felix
-EAPI=5
-HOMEPAGE=http://felix.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 OSGi-Specification-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/osgi-foundation-1.2.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=115c3fb4eec53990852908dec04d1f9d
diff --git a/dev-java/osgi-foundation/Manifest b/dev-java/osgi-foundation/Manifest
new file mode 100644
index 000000000000..9f91bdc42101
--- /dev/null
+++ b/dev-java/osgi-foundation/Manifest
@@ -0,0 +1,4 @@
+AUX osgi-foundation-1.2.0-build.xml 9886 BLAKE2B aacff8e000b02c742ee7e5d03d2c057b6baf56bce9cc1b9cd0031c39550e9ef07bcf85a7d89dd265cc523d638063e425b1553f146b5ce6af107440b1e0d61d43 SHA512 5f106bd612a65033e35beb4fb635d07199e10b69e692db5949424ecf7a8baf2bd6af0f35898bd465334356333d82d5c4941ef6ce7ce16c3939f425f4e58c6fcc
+DIST osgi-foundation-1.2.0.tar.xz 45176 BLAKE2B 4b5432dfaad9134f402b5f448a8d7ba5f626a7b160bbc953914352a28f745725da851b6c5f2122f820b52f2fd8ad463c2df5c8ae3e2b46ef8bb9d56d89d90f1b SHA512 6523dd6b4cd8205aa3359fae4640ff6b17a1944aec6bf23acf0d6e4eb33839a9b9049e8df0c55a4f35013b40b1df2391a53ed68df682a317c35dca504e9b996b
+EBUILD osgi-foundation-1.2.0-r1.ebuild 634 BLAKE2B 58f8045c4130ae1045c157dcc91ee1455c6f0ef55ad381e8b8da66a6a185e7b21ac3f9eb46990e1fbb755c8497f044f961bde92aa73ca4da6ce8ec6b697d4029 SHA512 1d19329f42a1dd4be69e250c31c7eea04facc05e03d1fe6a96ad5de43eeb2433fc5c82115c2b19818b6a4e063856c15143302fd0546ab8bc5b0ce95b5b2e3f2c
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/osgi-foundation/files/osgi-foundation-1.2.0-build.xml b/dev-java/osgi-foundation/files/osgi-foundation-1.2.0-build.xml
new file mode 100644
index 000000000000..a33f09709ada
--- /dev/null
+++ b/dev-java/osgi-foundation/files/osgi-foundation-1.2.0-build.xml
@@ -0,0 +1,218 @@
+<?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/11/13 9:36 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="org.osgi.foundation-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="org.osgi.foundation-1.2.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.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"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/>
+    <pathelement location="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.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.3" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <mkdir dir="${maven.build.outputDir}/META-INF"/>
+    <copy todir="${maven.build.outputDir}/META-INF">
+      <fileset dir="${maven.build.resourceDir.1}">
+        <include name="LICENSE*"/>
+        <include name="NOTICE*"/>
+      </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}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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"/>
+  </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}/junit/junit/3.8.1"/>
+    <get src="http://people.apache.org/repo/m2-snapshot-repository/junit/junit/3.8.1/junit-3.8.1.jar" 
+         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" 
+         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/easymock/easymock/1.2_Java1.3"/>
+    <get src="http://people.apache.org/repo/m2-snapshot-repository/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" 
+         dest="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" 
+         dest="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/osgi-foundation/metadata.xml b/dev-java/osgi-foundation/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/osgi-foundation/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..de894898fc85
--- /dev/null
+++ b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="OSGi R4 Foundation EE by Apache Felix"
+HOMEPAGE="http://felix.apache.org/"
+SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
+
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die
+}
+
+src_install() {
+	java-pkg_newjar target/org.osgi.foundation-${PV}.jar org.osgi.foundation.jar
+}
diff --git a/dev-java/osgi-obr-1.0.2 b/dev-java/osgi-obr-1.0.2
deleted file mode 100644
index 6f3ea7b9d005..000000000000
--- a/dev-java/osgi-obr-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/osgi-core-api:0 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=OSGi Service OBR by Apache
-EAPI=5
-HOMEPAGE=http://felix.apache.org
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/dist/felix/org.osgi.service.obr-1.0.2-project.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8c79dc7b9f79b2a007e3400919d5c5f6
diff --git a/dev-java/osgi-obr/Manifest b/dev-java/osgi-obr/Manifest
new file mode 100644
index 000000000000..03e387cde678
--- /dev/null
+++ b/dev-java/osgi-obr/Manifest
@@ -0,0 +1,4 @@
+AUX osgi-obr-1.0.2-build.xml 10866 BLAKE2B 4ed0fc6154cb2bee42f3c4cc51168d0d08cbdaff440149c15bb113041adac10a1f9fba682e0922c06977a135f90ba40412237cb3f9b28be2f5765372ad6c5ea7 SHA512 4c9fb92e0f5f36dbf02d749b74f58fb15a9ab5617ba84eed3b0a80941e874bdf6b391b7ddf44cbcf62d8cbd9b5b22655db0795e2cf3c9167e9cc15f668417ebd
+DIST org.osgi.service.obr-1.0.2-project.tar.gz 7939 BLAKE2B 6499f12ab5a63bd8f178d4a6be0d9ca8a75ef0a843b73962b3e71bdfaed77edef2f307ce80fba418580ae0a6c507f97103cf8acb292e79c301422cd7134b8fec SHA512 2af278c6309f8e2fd64c86c5e28a32935ee88e43489b2ca89be94bd2b996acbfcbf93a439f4e3c5f61d5d98df8d0897485982cd749f57d80574a3eb1fbb8ad21
+EBUILD osgi-obr-1.0.2.ebuild 768 BLAKE2B 857fe3a85d9ad3396548983afcc35c2ac2008629c3aa3c20b79f995fa2372d545f230e93131669c5ae3f284b6287a0db9d6d3183c4713be03dac2e211f35758b SHA512 a42ef99f5e739569270a6ad5a4d767517fae926c29e1e62cb81945a4489cd516c5ad749123bff010e13055635cd7bd2785b795396611a2b423d620dce99306f1
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/osgi-obr/files/osgi-obr-1.0.2-build.xml b/dev-java/osgi-obr/files/osgi-obr-1.0.2-build.xml
new file mode 100644
index 000000000000..4b933209494d
--- /dev/null
+++ b/dev-java/osgi-obr/files/osgi-obr-1.0.2-build.xml
@@ -0,0 +1,233 @@
+<?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/13/13 7:05 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="org.osgi.service.obr-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="org.osgi.service.obr-1.0.2"/>
+  <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="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/>
+    <pathelement location="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.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.3" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <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="LICENSE*"/>
+        <include name="NOTICE*"/>
+      </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}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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"/>
+  </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/felix/org.osgi.core/1.0.1"/>
+    <get src="http://people.apache.org/repo/m2-snapshot-repository/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar" 
+         dest="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar" 
+         dest="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/>
+    <get src="http://people.apache.org/repo/m2-snapshot-repository/junit/junit/3.8.1/junit-3.8.1.jar" 
+         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" 
+         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/easymock/easymock/1.2_Java1.3"/>
+    <get src="http://people.apache.org/repo/m2-snapshot-repository/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" 
+         dest="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" 
+         dest="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/osgi-obr/metadata.xml b/dev-java/osgi-obr/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/osgi-obr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/osgi-obr/osgi-obr-1.0.2.ebuild b/dev-java/osgi-obr/osgi-obr-1.0.2.ebuild
new file mode 100644
index 000000000000..4397353a0207
--- /dev/null
+++ b/dev-java/osgi-obr/osgi-obr-1.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="org.osgi.service.obr"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="OSGi Service OBR by Apache"
+HOMEPAGE="http://felix.apache.org"
+SRC_URI="mirror://apache/dist/felix/${MY_P}-project.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+CDEPEND="dev-java/osgi-core-api:0"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="osgi-core-api"
+
+src_install() {
+	java-pkg_newjar target/${MY_P}.jar
+}
diff --git a/dev-java/pat-1.5.3-r1 b/dev-java/pat-1.5.3-r1
deleted file mode 100644
index ca173fc534c5..000000000000
--- a/dev-java/pat-1.5.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Regular Expressions in Java
-EAPI=5
-HOMEPAGE=http://www.javaregex.com
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.javaregex.com/binaries/patsrcfree153.jar -> pat-1.5.3.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=13ef8c83cf82ec6e93afdf568e9685d1
diff --git a/dev-java/pat/Manifest b/dev-java/pat/Manifest
new file mode 100644
index 000000000000..ba98b9b03267
--- /dev/null
+++ b/dev-java/pat/Manifest
@@ -0,0 +1,3 @@
+DIST pat-1.5.3.jar 135452 BLAKE2B a70e015f8510a9077922423e3623c64fa4f84fd7aba53c7b64e4ce367f400b237ddf42d09745c0954c186e782ffeb53075b6ec2cc0730c6e3f5440180e9836ba SHA512 4c62906a9f236351f8de457198e746229c48dc983275a95546815fe5af0083a54e204226abaf71ef01cf407c8be34f8e5594f65b126d45ff3e4ba75630ccdabe
+EBUILD pat-1.5.3-r1.ebuild 603 BLAKE2B bf7a13d715e1f7aa9adc4cbbffb167719e5af23ec9f52de33a7c2dadb444f37f9804a341c56a417555f63de93632c9cbcf9ed475e5d313fdab3507199754e913 SHA512 c2824e617ef4bc004b30db33e2b553660f1f68e7cb223ea4fd4f88f425d05c9b5738dac9d95cf467d98d82dfc3b781b630567436911701826b6483ff0c756694
+MISC metadata.xml 378 BLAKE2B 54e9bfa2522d4c005730794853ba9418511fc412b4f02f90eea095d87a4490195a9cc72e0c8ece2154b462cf622fa12e50654605c887fac3ac57d4f3afbb307b SHA512 0d49a8cd2b00fbba9c006ceee45537e4c1dcfa5a361df41aa6ea759e00e2949885b38febf3d11664be5a0690e3a6c0a56d0fb13183b219b99a39c4844aa5c408
diff --git a/dev-java/pat/metadata.xml b/dev-java/pat/metadata.xml
new file mode 100644
index 000000000000..9dc5267010cc
--- /dev/null
+++ b/dev-java/pat/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		Package pat provides a mechanism for compiling and matching regular
+		expressions in java.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/pat/pat-1.5.3-r1.ebuild b/dev-java/pat/pat-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..a980ddd0eca1
--- /dev/null
+++ b/dev-java/pat/pat-1.5.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-pkg-simple
+
+MY_PV=$(delete_all_version_separators)
+MAJORMINOR=$(get_version_component_range 1-2)
+DOC_VER=$(delete_all_version_separators ${MAJORMINOR})
+
+DESCRIPTION="Regular Expressions in Java"
+HOMEPAGE="http://www.javaregex.com"
+SRC_URI="http://www.javaregex.com/binaries/${PN}srcfree${MY_PV}.jar -> ${P}.jar"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6"
diff --git a/dev-java/pdf-renderer-0.9.1 b/dev-java/pdf-renderer-0.9.1
deleted file mode 100644
index d714c4132bac..000000000000
--- a/dev-java/pdf-renderer-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=a 100% Java PDF renderer and viewer
-EAPI=4
-HOMEPAGE=https://pdf-renderer.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=LGPL-3
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://java.net/projects/pdf-renderer/downloads/download/PDFRenderer-full-0.9.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c1e804c8677dcff00e7c081f5c479c88
diff --git a/dev-java/pdf-renderer-1.0.5 b/dev-java/pdf-renderer-1.0.5
deleted file mode 100644
index 113a8e7abc85..000000000000
--- a/dev-java/pdf-renderer-1.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=a 100% Java PDF renderer and viewer
-EAPI=5
-HOMEPAGE=https://java.net/projects/pdf-renderer
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://repo1.maven.org/maven2/org/swinglabs/pdf-renderer/1.0.5/pdf-renderer-1.0.5-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6ef3a49c9e84dd52f899a2b0500fa224
diff --git a/dev-java/pdf-renderer/Manifest b/dev-java/pdf-renderer/Manifest
new file mode 100644
index 000000000000..27ab7945006b
--- /dev/null
+++ b/dev-java/pdf-renderer/Manifest
@@ -0,0 +1,5 @@
+DIST PDFRenderer-full-0.9.1.zip 3877379 BLAKE2B fb8db9b4accdb18e423c2b4d659af07fd3f750e61e87cf047972807cd0774d5c1e04c15a9678efcd138b1c207770edf7b565468f3e8de50f21f89bc0fba4c71e SHA512 a678b7f89068890a00317a84557c659b4401450a94d8f7776df652715891a4c41ab138dbfd35093197848635e44ca2e3a114465a6049e746df87ab668ea74a17
+DIST pdf-renderer-1.0.5-sources.jar 1736806 BLAKE2B b897d4f30ae0143a6eb7c3499c5d7c165cd4e81c950fbe3185066d5ab6dbe68d874a5ff7561d35a65e014a6d8b82f92de73574018f58dd3817a32488c5b09ed7 SHA512 086355441df0d59306839de3097d1e557870435dcb4ee878d4e7f3f46352a103ecfc1da4055f107c2c53a61f815f985f3e1e176dc9f99634afd58cf1faca940b
+EBUILD pdf-renderer-0.9.1.ebuild 775 BLAKE2B b16adbb2a0a2bb0c93521ac40b5b6a6915085a5f346bd06096d04216a15bd3e7eaec0b1821252783fb7bac50b21f8f879f64a01c6593ef1efb91e3e5ef9fce88 SHA512 27aa46678a3f31242ca0658a89a1f09bcca494fe77f1c9118224e621c7cefd40384ba6a2aed688e36506f6d354cfb9e15c38f477d26ce0cd7def19792b6bebc3
+EBUILD pdf-renderer-1.0.5.ebuild 509 BLAKE2B 021e603295c0c604ff24513a0fdd15f44383329c296960c86ff0f4740814a3adf921d8a72f0ca58e17c29f4657d2bb712fe942cb37e5c37d7137b70d5b93282e SHA512 186043909b93ca9ff85798522a0684e855743041b3a24a8596d651a422f947e176da0c9c550785a1448a3fed12f5646b7a20ee412447cfcf3efe8c839a31cafd
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/pdf-renderer/metadata.xml b/dev-java/pdf-renderer/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/pdf-renderer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild b/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild
new file mode 100644
index 000000000000..835e3e6b6624
--- /dev/null
+++ b/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="a 100% Java PDF renderer and viewer"
+HOMEPAGE="https://pdf-renderer.dev.java.net/"
+SRC_URI="http://java.net/projects/${PN}/downloads/download/PDFRenderer-full-${PV}.zip"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+}
+
+# There is a test target (default from Netbeans)
+# but no junit code
+
+src_install() {
+	java-pkg_dojar dist/*.jar
+
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src/com
+}
diff --git a/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild b/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
new file mode 100644
index 000000000000..6a0cd762677f
--- /dev/null
+++ b/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="a 100% Java PDF renderer and viewer"
+HOMEPAGE="https://java.net/projects/pdf-renderer"
+SRC_URI="http://repo1.maven.org/maven2/org/swinglabs/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}"
diff --git a/dev-java/pdfbox-1.8.11 b/dev-java/pdfbox-1.8.11
deleted file mode 100644
index b0b8ab817144..000000000000
--- a/dev-java/pdfbox-1.8.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/fontbox:1.8 dev-java/jempbox:1.8 dev-java/bcmail:1.45 dev-java/bcprov:1.45 >=dev-java/commons-logging-1.1.1:0 dev-java/icu4j:55 >=virtual/jdk-1.6 app-arch/unzip test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library and utilities for working with PDF documents
-EAPI=5
-HOMEPAGE=http://pdfbox.apache.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/fontbox:1.8 dev-java/jempbox:1.8 dev-java/bcmail:1.45 dev-java/bcprov:1.45 >=dev-java/commons-logging-1.1.1:0 dev-java/icu4j:55 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.8
-SRC_URI=mirror://apache/pdfbox/1.8.11/pdfbox-1.8.11-src.zip http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/pcfi-2010.08.09.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=38fe51f43ca520e1518bf68bf5bb2015
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
new file mode 100644
index 000000000000..df39a45009f9
--- /dev/null
+++ b/dev-java/pdfbox/Manifest
@@ -0,0 +1,4 @@
+DIST pcfi-2010.08.09.jar 6731455 BLAKE2B 438dda63e91494231fba890d995227e7c6428b25a698ad5905a7ca0f2a29f511ff4cc34136c96c878ca04ec7630a062bbff3bbf0400a332b4edb6a6972175920 SHA512 067394ddac4a48ba8ac94b03f907d0faf98a91be658689a34eb85fdce49515582426f6a1fa433bfa87ca417ce3a6fa3aa89d89126a36176d8e04f3359c36d10b
+DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
+EBUILD pdfbox-1.8.11.ebuild 2079 BLAKE2B 36c1ee6f0f1d517c7f7d0ce084c427e52993c7dd02e9795862de3c3234554dd245871e072402427b04c27232518e7d79e35b4e28fa4cc1f03adbce7b9bad891c SHA512 249af8e8327b87210e5919f7504978a9a258214accf957644e1a7803a7132b75532882a0ab87e19d35a7d7523eb5ecede5396657f55444f7874bda7b6d322ba8
+MISC metadata.xml 641 BLAKE2B 03d882aee9a768dead555ff0394a3700c55dc9fd72097a1014cd7a87fca6d6e900b675e4ec4707c6ca5baca40646650bca3bcfbd25cd215af679c3e574442b3b SHA512 df978af8abefb42c2eadf80184cfdc0889758d758656f7b7bef19b7d4f59da28e465683cec26d96d288dccce4d82a182d56abff28ee14eb718280d469bb4183f
diff --git a/dev-java/pdfbox/metadata.xml b/dev-java/pdfbox/metadata.xml
new file mode 100644
index 000000000000..0282d9706df5
--- /dev/null
+++ b/dev-java/pdfbox/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Apache PDFBoxâ„¢ library is an open source Java tool for working with PDF documents. This project allows creation of new PDF documents, manipulation of existing documents and the ability to extract content from documents. Apache PDFBox also includes several command line utilities.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">apache/pdfbox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/pdfbox/pdfbox-1.8.11.ebuild b/dev-java/pdfbox/pdfbox-1.8.11.ebuild
new file mode 100644
index 000000000000..213188bdd96e
--- /dev/null
+++ b/dev-java/pdfbox/pdfbox-1.8.11.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+BC_SLOT="1.45"
+ADOBE_FILES="pcfi-2010.08.09.jar"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library and utilities for working with PDF documents"
+HOMEPAGE="http://pdfbox.apache.org/"
+SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
+	http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/${ADOBE_FILES}"
+LICENSE="Apache-2.0"
+SLOT="1.8"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+IUSE="test"
+RESTRICT="test" # Explosive even when manually using unmodified build.xml.
+
+CDEPEND="dev-java/fontbox:${SLOT}
+	dev-java/jempbox:${SLOT}
+	dev-java/bcmail:${BC_SLOT}
+	dev-java/bcprov:${BC_SLOT}
+	>=dev-java/commons-logging-1.1.1:0
+	dev-java/icu4j:55"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_ENCODING="ISO-8859-1"
+JAVA_GENTOO_CLASSPATH="fontbox-${SLOT},jempbox-${SLOT},bcmail-${BC_SLOT},bcprov-${BC_SLOT},commons-logging,icu4j-55"
+
+src_unpack() {
+	unpack ${P}-src.zip
+}
+
+java_prepare() {
+	local DIR=target/classes/org/apache/${PN}/resources
+	mkdir -p "${DIR}/afm" || die
+
+	unzip -j -d "${DIR}" "${DISTDIR}/${ADOBE_FILES}" com/adobe/pdf/pcfi/glyphlist.txt || die
+	unzip -j -d "${DIR}/afm" "${DISTDIR}/${ADOBE_FILES}" com/adobe/pdf/pcfi/afm/*.afm || die
+
+	echo "${PN}.version=${PV}" > ${DIR}/${PN}.version || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main org.apache.${PN}.PDFBox
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find ${DIR} -name "*Test.java")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -encoding ${JAVA_ENCODING} -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/piccolo-1.04 b/dev-java/piccolo-1.04
deleted file mode 100644
index c369e489a3c7..000000000000
--- a/dev-java/piccolo-1.04
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A small, extremely fast XML parser for Java
-EAPI=5
-HOMEPAGE=http://piccolo.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/piccolo/piccolo-1.04-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9d9336f5e71e84b6c28435a6a5476627
diff --git a/dev-java/piccolo/Manifest b/dev-java/piccolo/Manifest
new file mode 100644
index 000000000000..583664d4711e
--- /dev/null
+++ b/dev-java/piccolo/Manifest
@@ -0,0 +1,3 @@
+DIST piccolo-1.04-src.zip 252316 BLAKE2B 04e0ba00f0b79880a100a1b904d06715a793f891af9d59ffae15579c59fd5ec2ef313241cd9d28975244bb08f2ca00b586e3415d526d47444ab84e99078c0399 SHA512 fa0809e8d9eb43713144bdf193975c62344269bc1b24d12159c98c98776de4633c95234bbbb023d445e00786903fcd9b49d37053f03d8d6a1e2c84b93668f947
+EBUILD piccolo-1.04.ebuild 638 BLAKE2B 9bd7f798a5db9e4c78e8f7ebf52d383435bf4e0e005b7ccda5b1be7745f0d3af876c0bae9cdfb9edd8d77ae707446cf3d1774b63ad648d8b5e68a462d27fabf6 SHA512 8940b9a289161a4046073d7bb99a25d4d271f760a09c1625642caceeea4df923756f583fbbe14a5ea92bcdd31552b92c470b806aabf2005e2f3a1ec403c9b9c0
+MISC metadata.xml 313 BLAKE2B 0c380194fdd1db81066bb843d9e22c214c2535acdc6ef5ee5f50b2160af430a89d30b3cfe963a5d18b9d5ea02006ab36686f2e86c9cc723a1e64e2fd1272b7a1 SHA512 31a0f248b18f09266f4a977db5af5bc4d7a5869042d77840f227a4aa1d14abbcafa3668bd0c8eae70e22817582b6d2dce444268f4bf77421a646a4bde165c9ed
diff --git a/dev-java/piccolo/metadata.xml b/dev-java/piccolo/metadata.xml
new file mode 100644
index 000000000000..ba02a17f99dd
--- /dev/null
+++ b/dev-java/piccolo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">piccolo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/piccolo/piccolo-1.04.ebuild b/dev-java/piccolo/piccolo-1.04.ebuild
new file mode 100644
index 000000000000..c8224f463a1c
--- /dev/null
+++ b/dev-java/piccolo/piccolo-1.04.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A small, extremely fast XML parser for Java"
+HOMEPAGE="http://piccolo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+EANT_BUILD_TARGET="build"
+
+src_install() {
+	java-pkg_dojar lib/Piccolo.jar
+
+	dodoc README.txt
+	use doc && java-pkg_dojavadoc doc/javadoc
+
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/piccolo2d-3.0-r1 b/dev-java/piccolo2d-3.0-r1
deleted file mode 100644
index cecf8a68452e..000000000000
--- a/dev-java/piccolo2d-3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/swt:3.8 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Structured 2D Graphics Framework
-EAPI=5
-HOMEPAGE=https://github.com/piccolo2d/piccolo2d.java
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-java/swt:3.8 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/piccolo2d/piccolo2d.java/archive/piccolo2d-complete-3.0.zip -> piccolo2d-3.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=77f9aedc88bd327f8651e00bfa9b4cd5
diff --git a/dev-java/piccolo2d/Manifest b/dev-java/piccolo2d/Manifest
new file mode 100644
index 000000000000..56b8cd3ee90b
--- /dev/null
+++ b/dev-java/piccolo2d/Manifest
@@ -0,0 +1,3 @@
+DIST piccolo2d-3.0.zip 786064 BLAKE2B f550bc7d39811998616000833543e048c879eeaf5006ba3d1cd19c7ac3c3c588fdf1c9b66986e5232dea49c1081082716e16542918319c18207cc2177d38ff10 SHA512 c57d0e86ea36e662027559c63c8e300629361849d4526d9271ea1ed3c8d55296ab1fab846c7a475c5d831fc6330052fa897ba8d3f89a196bca752a7ae802aa2a
+EBUILD piccolo2d-3.0-r1.ebuild 1112 BLAKE2B 4cd4c70be3584920e82e61ce1fca091311cb906a334a6cb6ed90863a214ed30fe8057928fc95882fa156d0811d63836d793beffcbf3a5509b7cc5c4f37a39703 SHA512 2f64269113b317883de2a7ebc5659a479610d53e57ff8384c025dd6062414cda7f977fa533df4adc0d27ee754d0ceb456c4093856304c0a07995ad4d26291e43
+MISC metadata.xml 379 BLAKE2B 91a8e052e0698a62a8596c658229b78e0750cc80e34ce81d3be41c833e106f2e2f0d7c5eb7d148b2674f4e218602b054e2435c52d9c0ce27ef546ad0ff43d9bc SHA512 dd13d25a0d532e7246cdc32b6e058dc9fa3979d4d28e459ecde801b103ca8e40cf9f154208c9ee364379f2f6c6059011269a75d658d68b207e7d013c7d0bdf02
diff --git a/dev-java/piccolo2d/metadata.xml b/dev-java/piccolo2d/metadata.xml
new file mode 100644
index 000000000000..f053cea1a4e7
--- /dev/null
+++ b/dev-java/piccolo2d/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">piccolo2d</remote-id>
+		<remote-id type="github">piccolo2d/piccolo2d.java</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild b/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild
new file mode 100644
index 000000000000..6193eb4112ae
--- /dev/null
+++ b/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Structured 2D Graphics Framework"
+HOMEPAGE="https://github.com/piccolo2d/piccolo2d.java"
+SRC_URI="https://github.com/${PN}/${PN}.java/archive/${PN}-complete-${PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+CDEPEND="dev-java/swt:3.8"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}.java-${PN}-complete-${PV}"
+JAVA_GENTOO_CLASSPATH="swt-3.8"
+JAVA_SRC_DIR="core extras swt"
+
+java_prepare() {
+	rm -rf core/src/test extras/src/test swt/src/test || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc Readme.txt ReleaseNotes.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/src/main/java/org/piccolo2d/examples/*
+		dodoc -r examples/src/main/java/org/piccolo2d/tutorial
+		dodoc -r swt-examples/src/main/java/org/piccolo2d/extras
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-java/picocontainer-1.1-r1 b/dev-java/picocontainer-1.1-r1
deleted file mode 100644
index 2021f496fb55..000000000000
--- a/dev-java/picocontainer-1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.5 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Small footprint Dependency Injection container
-EAPI=0
-HOMEPAGE=http://www.picocontainer.org
-IUSE=doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-RESTRICT=test
-SLOT=1
-SRC_URI=http://dist.codehaus.org/picocontainer/distributions/picocontainer-1.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0fc1fee732305fcd6c3bbc7ba86c5de1
diff --git a/dev-java/picocontainer/Manifest b/dev-java/picocontainer/Manifest
new file mode 100644
index 000000000000..16e97175829c
--- /dev/null
+++ b/dev-java/picocontainer/Manifest
@@ -0,0 +1,3 @@
+DIST picocontainer-1.1-src.tar.gz 83564 BLAKE2B 193d042400e4509e82c8dd521fc4ee8a246f0b8111cd875810260d510bef08970ac632f3e81c370290e6074dcc75348af7db71abc9047e49b323910d03e932f4 SHA512 adee3e5f46cc8f9a57db1c3e08b4730430daf92c090413ce061576c272b0a1a8bad94281a7a0bd4bdfa8fec8ca051bd15560d0a0fb0ca65cee39ea5ff1b15777
+EBUILD picocontainer-1.1-r1.ebuild 1226 BLAKE2B cb70328dc89644a88856df59f1026df5e4094e8fa8b3858e97fa242c5d6a1ceca87959a8d300c6014d40ee05056b6f48702e9255b3b8540bc0bef52ec6d3dded SHA512 796faf47ab39e427be485acb6e8a38f079ede29cf29de36f5c43e43674688400f4f8e94c922b01d5bda542a1329d6f6230a8cb15ecb5d3fb123bcc3e5081cd44
+MISC metadata.xml 628 BLAKE2B 0a6d660b64c4a9bd642e3f990fd715e02037fe67526e0215631f65afdececeaea34486a166e7e5a4b811fa6e7494a90f685a3e27fd5df15c0e2071eff332aa9b SHA512 24a5b116cc43b3dbefa809f4ba45c50b08f5a3f8ad2db6a93fa8618e2f9dee6b1a09163d03b036f3ecad5f7f475748fac05c6ab213d61031942b9a0e24ba3cab
diff --git a/dev-java/picocontainer/metadata.xml b/dev-java/picocontainer/metadata.xml
new file mode 100644
index 000000000000..7c03ea6b885a
--- /dev/null
+++ b/dev-java/picocontainer/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription>
+PicoContainer is very simple container for very simple components.  It
+honors the Inversion of control pattern (IoC) in a way that we calling
+it type 3 IoC.  See below for types. Components are typically going to
+live inside the same JVM. The idea is that this might scale from
+embedded containers for simple beans to enterprise and distributed
+applications.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/picocontainer/picocontainer-1.1-r1.ebuild b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
new file mode 100644
index 000000000000..a49d6d45238c
--- /dev/null
+++ b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Small footprint Dependency Injection container"
+HOMEPAGE="http://www.picocontainer.org"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="amd64 x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.5
+	source? ( app-arch/zip )
+	"
+#	test? (
+#	    >=dev-java/junit-3.8.1
+#	)"
+
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Don't run tests automatically
+	sed -i -e 's/compile,test/compile/' build.xml || die
+
+# doesn't pass internal test even when trying vanilla build.xml that fetches own libs
+#	if use test ; then
+#    	    mkdir -p target/lib
+#	    cd target/lib
+#	    java-pkg_jar-from junit junit-3.8.1.jar
+#	fi
+}
+
+src_compile() {
+	local antflags="-Dfinal.name=${PN} -Dnoget=true jar"
+	eant ${antflags} $(use_doc)
+}
+
+#src_test() {
+#	local antflags="-Dfinal.name=${PN} -Dnoget=true test"
+#	eant ${antflags}
+#}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/plexus-classworlds-2.2.3 b/dev-java/plexus-classworlds-2.2.3
deleted file mode 100644
index f6bec5d78bef..000000000000
--- a/dev-java/plexus-classworlds-2.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=The class loader framework of the Plexus project
-EAPI=5
-HOMEPAGE=https://github.com/codehaus
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=codehaus-classworlds
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d7974393ec3bae5d6466ebf1c53b4435
diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest
new file mode 100644
index 000000000000..a8cb7a967e34
--- /dev/null
+++ b/dev-java/plexus-classworlds/Manifest
@@ -0,0 +1,4 @@
+AUX 2.2.3-build.xml 5712 BLAKE2B 334710114da891baa655f4cf6811967af323fb957a97259f13326d3ce16b30d3b13c7cc9a05b26a275eb95d6e220a4b409d66332469699a1e2d063a50905f652 SHA512 575a086222b4cb9728b36c7a8d9eb64e73438023a0a83b94549962d88aea9591fb847c7d866a830e991bff296d66bf9ebd79c5a93922f040c9d5ce432fbc78cc
+DIST plexus-classworlds-2.2.3.tar.bz2 41744 BLAKE2B 41ddc64c066bdfb5f2398773790b9fec213070d3dad5e57f7b0643f4347386d5304c435cd60e5b1fad32f2d7fae7b48a2afd0189d115018ed5ee38901c80867a SHA512 d5f3d3dac4df569b91ddea9265b14a2459b0ecd4ac3e4547cbac341f50d18238071a7a560d9771a9f8724c59225ea7fa8645ed72c5a00a684519a46a024c3c61
+EBUILD plexus-classworlds-2.2.3.ebuild 923 BLAKE2B 27b4cbcd6e57cecc169036966c5428f34dd05ca37765110e6172f8e41b743cba474141496539e24d78cab94652e36b83e2a40ef3e2a9e04514b674761018b277 SHA512 d2e80f0e3f7d9e69a505a7c4b8e73fc244a29aa4d51b7716fa734ad2f4a82842f1c32a5b69dfb82c6aeac8457cdd8c80d4ea8e8ed26b0f35c4ca759c26dc87ff
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/plexus-classworlds/files/2.2.3-build.xml b/dev-java/plexus-classworlds/files/2.2.3-build.xml
new file mode 100644
index 000000000000..ed1e6fe4fb8f
--- /dev/null
+++ b/dev-java/plexus-classworlds/files/2.2.3-build.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="plexus-classworlds-from-maven" default="package" basedir=".">
+	<property file="${user.home}/.m2/maven.properties" />
+	<property file="maven-build.properties" />
+
+	<property name="maven.build.finalName" value="plexus-classworlds-2.2.3" />
+	<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" />
+
+	<path id="build.classpath" />
+	<path id="build.test.classpath" />
+
+	<target name="clean" description="Clean the output directory">
+		<delete dir="${maven.build.dir}" />
+	</target>
+
+	<target name="compile" description="Compile the code">
+		<mkdir dir="${maven.build.outputDir}" />
+		<javac destdir="${maven.build.outputDir}" excludes="org/codehaus/plexus/classworlds/event/*" encoding="UTF-8" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.4" verbose="false" fork="false" source="1.4">
+			<src>
+				<pathelement location="${maven.build.srcDir.0}" />
+			</src>
+			<classpath refid="build.classpath" />
+		</javac>
+	</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}" excludes="org/codehaus/plexus/classworlds/event/*" encoding="UTF-8" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.4" verbose="false" fork="false" source="1.4">
+			<src>
+				<pathelement location="${maven.build.testDir.0}" />
+			</src>
+			<classpath>
+				<path refid="build.test.classpath" />
+				<pathelement location="${maven.build.outputDir}" />
+			</classpath>
+		</javac>
+	</target>
+
+	<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="**/*Test.java" />
+					<include name="**/*TestCase.java" />
+					<exclude name="**/*Abstract*Test.java" />
+					<exclude name="**/*Abstract*TestCase.java" />
+					<exclude name="**/*TestUtil.java" />
+					<exclude name="**/*ConfiguratorTest.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" />
+					<exclude name="**/*Abstract*TestCase.java" />
+					<exclude name="**/*TestUtil.java" />
+					<exclude name="**/*ConfiguratorTest.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>
+
+	<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>
+
+	<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" />
+	</target>
+
+	<target name="jar" depends="package" description="Builds the jar for the application" />
+
+	<target name="test-offline">
+		<condition property="maven.mode.offline">
+			<equals arg1="${maven.settings.offline}" arg2="true" />
+		</condition>
+	</target>
+</project>
diff --git a/dev-java/plexus-classworlds/metadata.xml b/dev-java/plexus-classworlds/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/plexus-classworlds/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
new file mode 100644
index 000000000000..a75ec187a22e
--- /dev/null
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The class loader framework of the Plexus project"
+HOMEPAGE="https://github.com/codehaus"
+SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
+
+LICENSE="codehaus-classworlds"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+		test? ( dev-java/junit:4 )"
+RDEPEND=">=virtual/jre-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+EANT_TEST_ANT_TASKS="ant-junit"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
+}
+
+src_install() {
+	java-pkg_newjar "${S}/target/${P}.jar" "${PN}.jar"
+
+	use source && java-pkg_dosrc "${S}"/src/main/java/*
+	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/portletapi-1.0-r1 b/dev-java/portletapi-1.0-r1
deleted file mode 100644
index 4b4aba8b903b..000000000000
--- a/dev-java/portletapi-1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Portlet API implementation of JSR 168
-EAPI=5
-HOMEPAGE=http://portals.apache.org/jetspeed-2/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/portletapi-1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=20ddfca57941edc220545a899b58a6d4
diff --git a/dev-java/portletapi-2.0-r1 b/dev-java/portletapi-2.0-r1
deleted file mode 100644
index ddd5bb3a4fb6..000000000000
--- a/dev-java/portletapi-2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/tomcat-servlet-api:3.0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Portlet API 2.0 developed by the Java Community Process JSR-286
-EAPI=5
-HOMEPAGE=https://jcp.org/en/jsr/detail?id=286
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/tomcat-servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.0
-SRC_URI=https://repo1.maven.org/maven2/javax/portlet/portlet-api/2.0/portlet-api-2.0-sources.jar -> portletapi-2.0.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=637750794e80e3f84fcd9fb4009ec3a6
diff --git a/dev-java/portletapi/Manifest b/dev-java/portletapi/Manifest
new file mode 100644
index 000000000000..df74aaa06f37
--- /dev/null
+++ b/dev-java/portletapi/Manifest
@@ -0,0 +1,5 @@
+DIST portletapi-1.0.tar.gz 212229 BLAKE2B b1efcb7f78d056e6c4c9ed26bd6cbedd0ebcf0e6cc164f862bf3acd6e428feb8f373b3d313aa1cd934edbe9e5af98219bdcf4d173eafb6fc4b09bc5fdd1710bc SHA512 e47da8672be075036989774c90d7a512f7354e090eab3685af90295f07c2842d37a858665a5a2aa3b378e0172c65cbc520180f89e4f08673baeaf19105c0661b
+DIST portletapi-2.0.jar 124636 BLAKE2B f885bf1d042d0eb3230ab2588aa673dfc4fb4da7a8bca577abdac0eb31e9298c76b0600c1a7266d6ec8b072e4b89cafb08c60f4f1de0f5f878bef412a168ff0f SHA512 cf02030850d746b19b85bb3aa204fa7602af47fdda70d5be4c317dea01939abce96915d08186ac876b3081cd8023687e9c4bcef6f4f9a28e8a3456eaa56c8d8f
+EBUILD portletapi-1.0-r1.ebuild 467 BLAKE2B 8a33918de4973ccd714db16c67f5c628b04a9c74a03424ff5ae36b4abe09af90d0b64182978cfaffd91b32b5e07fdb42d6fb6dd9c1da636479c3dd6720d9e446 SHA512 68d8b78c0c0774e0970dca3e7b3c9402587509e827ec715ee0dd89af9d3a0807861f3f973ed1728efe103900970bcada510813e4a1d6d899e66ef5bc1d8c376b
+EBUILD portletapi-2.0-r1.ebuild 764 BLAKE2B 76c0e24366b288b65655d99d7e037c5662de3ba443b21c51a4eabb19762cd3a88b8067158fc628aa8142a7fc60261f86a804349718cb75abd148cc3697d76d64 SHA512 9aef2dccde8c2d03f2b1a5f218a9901f7f8d52df1187501fa74c1c18b9517ddcda613114cf56961eb8559ae1c090ceeb99f2e8113b04ddd5f84d15a22481e1a7
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/portletapi/metadata.xml b/dev-java/portletapi/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/portletapi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/portletapi/portletapi-1.0-r1.ebuild b/dev-java/portletapi/portletapi-1.0-r1.ebuild
new file mode 100644
index 000000000000..6ddc04673e50
--- /dev/null
+++ b/dev-java/portletapi/portletapi-1.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Portlet API implementation of JSR 168"
+HOMEPAGE="http://portals.apache.org/jetspeed-2/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6"
diff --git a/dev-java/portletapi/portletapi-2.0-r1.ebuild b/dev-java/portletapi/portletapi-2.0-r1.ebuild
new file mode 100644
index 000000000000..c4c81fe914f3
--- /dev/null
+++ b/dev-java/portletapi/portletapi-2.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="portlet-api"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Portlet API 2.0 developed by the Java Community Process JSR-286"
+HOMEPAGE="https://jcp.org/en/jsr/detail?id=286"
+SRC_URI="https://repo1.maven.org/maven2/javax/portlet/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="2.0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+CDEPEND="dev-java/tomcat-servlet-api:3.0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="javax"
+JAVA_GENTOO_CLASSPATH="tomcat-servlet-api-3.0"
diff --git a/dev-java/prefuse-20071021_beta b/dev-java/prefuse-20071021_beta
deleted file mode 100644
index 0b2dc56bbab0..000000000000
--- a/dev-java/prefuse-20071021_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/lucene:1 >=app-arch/unzip-5.50-r1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=UI toolkit for building highly interactive visualizations of un-/structured data
-EAPI=5
-HOMEPAGE=http://prefuse.org
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 dev-java/lucene:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2006
-SRC_URI=mirror://sourceforge/prefuse/prefuse-beta-20071021.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7d5b3e38cb30548dda878167acf90790
diff --git a/dev-java/prefuse/Manifest b/dev-java/prefuse/Manifest
new file mode 100644
index 000000000000..daa8708eda51
--- /dev/null
+++ b/dev-java/prefuse/Manifest
@@ -0,0 +1,3 @@
+DIST prefuse-beta-20071021.zip 4334966 BLAKE2B 3fd543ee65e67a8f0aa4eb5a2bac9f1cd74d0996709907563cdcf123292506888d9f044abb06867c08f043cfaf8383785adeebc9cc1227720a764a4759c82647 SHA512 289386d4614d5f04ac3dbe0bb0be41186540e278b36089a8dfd8f1accd813b229d85a1a36fb05f15d204b77c22e6e41eefa259cff42d8f26680574c6dec7e983
+EBUILD prefuse-20071021_beta.ebuild 1074 BLAKE2B 39a4156c696041232cbfa48e6f995b7eb5da439a9c8e62951127e73f9dfa67d3811422f961d806251ea04297e5a97d52173415108addc3be02219dada339d6e9 SHA512 14b4efbe29506731e89c1e9e23fd8617077d764daecac81d228d5c6cb3c91bab6f54ed3f18f93861d5c3301e29e896d135056419ca44648c9ed40793871fd6c1
+MISC metadata.xml 463 BLAKE2B 4533a338f44bf64fa4ec9875db7e6016ad374ad8fc579724697cbf1f098d9f7b96fded2a6836a4e0923820d5b25c5f9ff73e20d6e6082a21d5b48f0f2725caf6 SHA512 b3a36d44af155a6e546a49b098a2ceeca3885716c558fec5a4e15dc9f08f0e0dc5dfa4f8c723802d58b3ef3959e6199609eb8ac5cf538cb5435f8c56a19a0a42
diff --git a/dev-java/prefuse/metadata.xml b/dev-java/prefuse/metadata.xml
new file mode 100644
index 000000000000..618ca6a39cdf
--- /dev/null
+++ b/dev-java/prefuse/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		User interface toolkit for building highly interactive visualizations
+		of structured and unstructured data.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">prefuse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/prefuse/prefuse-20071021_beta.ebuild b/dev-java/prefuse/prefuse-20071021_beta.ebuild
new file mode 100644
index 000000000000..cbfe38609155
--- /dev/null
+++ b/dev-java/prefuse/prefuse-20071021_beta.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=${PV/_beta/}
+MY_P=${PN}-beta-${MY_PV}
+DESCRIPTION="UI toolkit for building highly interactive visualizations of un-/structured data"
+SRC_URI="mirror://sourceforge/prefuse/${MY_P}.zip"
+HOMEPAGE="http://prefuse.org"
+LICENSE="BSD"
+SLOT="2006"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP="dev-java/lucene:1"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}
+	>=app-arch/unzip-5.50-r1"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${PN}-beta
+
+java_prepare() {
+	find lib/ -name "*.jar" | xargs rm -v
+}
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+	local targets="prefuse"
+	use examples && targets="${targets} demos"
+	eant $(use_doc api) ${targets} \
+		-Dlucene.lib=$(java-pkg_getjars lucene-1)
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+
+	dodoc readme.txt || die
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples demos/*
+}
diff --git a/dev-java/proguard-4.5 b/dev-java/proguard-4.5
deleted file mode 100644
index 62b4241c41ef..000000000000
--- a/dev-java/proguard-4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Free Java class file shrinker, optimizer, and obfuscator
-EAPI=2
-HOMEPAGE=http://proguard.sourceforge.net/
-IUSE=ant j2me elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/proguard/proguard4.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d6fce5c3cf0e7f647215e6af3332b31d
diff --git a/dev-java/proguard-4.8 b/dev-java/proguard-4.8
deleted file mode 100644
index ba2f7e6fbdd7..000000000000
--- a/dev-java/proguard-4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Free Java class file shrinker, optimizer, and obfuscator
-EAPI=4
-HOMEPAGE=http://proguard.sourceforge.net/
-IUSE=ant j2me elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/proguard/proguard4.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b7c3c3d11614f424f72e2b3d285d3dbd
diff --git a/dev-java/proguard-5.2.1 b/dev-java/proguard-5.2.1
deleted file mode 100644
index 9a303ff37d66..000000000000
--- a/dev-java/proguard-5.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Free Java class file shrinker, optimizer, and obfuscator
-EAPI=5
-HOMEPAGE=http://proguard.sourceforge.net/
-IUSE=ant examples elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.5 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/proguard/proguard5.2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d1f2a0e9e5261c4be6123d78f37f0756
diff --git a/dev-java/proguard/Manifest b/dev-java/proguard/Manifest
new file mode 100644
index 000000000000..fe546c722fc7
--- /dev/null
+++ b/dev-java/proguard/Manifest
@@ -0,0 +1,7 @@
+DIST proguard4.5.tar.gz 1827325 BLAKE2B a8bc7f8527f98094c08d178b0544e44e09b3ee03b8a100bba7a978b70ca60b655a12fbca822bd0bb60c1d81c9b83cfb61ebe7bbde6b2f854de962ede23c75d82 SHA512 bf1d9c29a4b3e1ba8062632b0f7f97e8f8d3dd2fbfbdc4bbbe98fa76151721fa45b22a1d99890654c557f3a1b87b45038d4882c0cb192b907ec2c65f4e7429fa
+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.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/metadata.xml b/dev-java/proguard/metadata.xml
new file mode 100644
index 000000000000..e626ba121626
--- /dev/null
+++ b/dev-java/proguard/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<use>
+		<flag name="ant">Ant task for using ProGuard in build.xml scripts</flag>
+		<flag name="j2me">Adds support for J2ME Wireless Toolkit</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">proguard</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/proguard/proguard-4.5.ebuild b/dev-java/proguard/proguard-4.5.ebuild
new file mode 100644
index 000000000000..37a87d483852
--- /dev/null
+++ b/dev-java/proguard/proguard-4.5.ebuild
@@ -0,0 +1,64 @@
+# 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/proguard/proguard-4.8.ebuild b/dev-java/proguard/proguard-4.8.ebuild
new file mode 100644
index 000000000000..c10cdecaa146
--- /dev/null
+++ b/dev-java/proguard/proguard-4.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+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" -delete
+}
+
+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/proguard/proguard-5.2.1.ebuild b/dev-java/proguard/proguard-5.2.1.ebuild
new file mode 100644
index 000000000000..65571a4f9427
--- /dev/null
+++ b/dev-java/proguard/proguard-5.2.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc 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 examples"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5
+	>=dev-java/ant-core-1.7:0"
+
+S=${WORKDIR}/${MY_P}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_XML="buildscripts/build.xml"
+EANT_BUILD_TARGET="basic"
+EANT_DOC_TARGET=""
+
+java_prepare() {
+	find -name "*.jar" -delete || die
+}
+
+src_compile() {
+	local anttask=""
+
+	if use ant; then
+		anttask="anttask"
+		EANT_GENTOO_CLASSPATH="ant-core"
+	fi
+
+	java-pkg-2_src_compile ${anttask}
+
+	if use doc; then
+		local EXCLUDE="proguard.gradle:proguard.wtk"
+		use ant || EXCLUDE+=":proguard.ant"
+
+		local CP="$([[ -n ${EANT_GENTOO_CLASSPATH} ]] && java-pkg_getjars ${EANT_GENTOO_CLASSPATH})"
+		ejavadoc -d javadoc -sourcepath src -classpath "${CP}" -subpackages proguard -exclude "${EXCLUDE}"
+	fi
+}
+
+src_install() {
+	java-pkg_dojar lib/*.jar
+	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
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/protobuf-java-3.4.1 b/dev-java/protobuf-java-3.4.1
deleted file mode 100644
index 3d5675c7eb59..000000000000
--- a/dev-java/protobuf-java-3.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 ~dev-libs/protobuf-3.4.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
-IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/14
-SRC_URI=https://github.com/google/protobuf/archive/v3.4.1.tar.gz -> protobuf-3.4.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a2de8de4f32a881719b344614661fbf0
diff --git a/dev-java/protobuf-java-3.5.1.1 b/dev-java/protobuf-java-3.5.1.1
deleted file mode 100644
index a81e10ca8e62..000000000000
--- a/dev-java/protobuf-java-3.5.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 ~dev-libs/protobuf-3.5.1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
-IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/15
-SRC_URI=https://github.com/google/protobuf/archive/v3.5.1.1.tar.gz -> protobuf-3.5.1.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=190952cb1d19350e1802a3d610568118
diff --git a/dev-java/protobuf-java-3.5.2 b/dev-java/protobuf-java-3.5.2
deleted file mode 100644
index b8afea867511..000000000000
--- a/dev-java/protobuf-java-3.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=~dev-libs/protobuf-3.5.2 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
-IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/15
-SRC_URI=https://github.com/google/protobuf/archive/v3.5.2.tar.gz -> protobuf-3.5.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cf7ddd1731686bbbc7e7dc8c368958eb
diff --git a/dev-java/protobuf-java-3.6.0.1 b/dev-java/protobuf-java-3.6.0.1
deleted file mode 100644
index 3ad61dd795f5..000000000000
--- a/dev-java/protobuf-java-3.6.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=~dev-libs/protobuf-3.6.0.1 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/16
-SRC_URI=https://github.com/google/protobuf/archive/v3.6.0.1.tar.gz -> protobuf-3.6.0.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3bd68b3187881dd73e95e243d1d1451c
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
new file mode 100644
index 000000000000..5196fab3c2dc
--- /dev/null
+++ b/dev-java/protobuf-java/Manifest
@@ -0,0 +1,9 @@
+DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
+DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
+DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
+DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
+EBUILD protobuf-java-3.4.1.ebuild 2094 BLAKE2B a0a5f55af03a0ddbb447c00a407318e704518d2202b93d8cff929fb8bc9b5954d31e148ea0fbff642e6279b71552034aaf8d3e655f839e510a3520e2f6bd38a7 SHA512 c2646fff280006c14db9fc3fca89375137723d7fe3001b7a76825963af5e822cadc32e99fe66540f6471f99757800158a04bb0607169f17b970763c33333e38c
+EBUILD protobuf-java-3.5.1.1.ebuild 2091 BLAKE2B 3bef86c71300d1e06e603a43c15beef0a9fdf66d052923720b060422344741b6f49366b67782db63bcf2e41261163ff9720c0bf1b7d9b660034963f08b7a4792 SHA512 92aaecdf9edd8e1b6980f7279928ae7dffaa4f3716e2af21c65c501445d633d8a8da9c154fed0dc2253c8a04d69952d99d379417d6e992afa56e32f464d029d0
+EBUILD protobuf-java-3.5.2.ebuild 1810 BLAKE2B f6e5af06878a4c3eb03e9fb9dd86903c9de483cb6e8fd162d30161dbe55264743e32f8d2fffc76e0e674b94ab9627e023caf498a15a1b925474d38399fb5fd8a SHA512 2e50f06a9fe16aba53b05d364e112d72625266fae494ef40a1b66e3977b0acd28a9574c3b0ba9a90448830384864599f090793d5eccfb4ab45b96bcf73234a4a
+EBUILD protobuf-java-3.6.0.1.ebuild 1108 BLAKE2B d014cfd67c18770561a8a4a7abb45da69daa579b4f25224f9d904585ae419b75bb27493e3f736cc61fe8c9a359bb3498944b667d18361a6a0be685708b609ac4 SHA512 2e9818c35adc7e42448af1eaaa7e9acd072344d3b2caa6a8e473b83d198e55d3822337d3a3635ed2db369af9ccb519a63b8d20ec445d0555aa8a13be346cf556
+MISC metadata.xml 796 BLAKE2B 730596798d9434732683c07bf8f4df861e3a2a4f0b681b642f6226e749729cbba260623c3d116e0dcc059fcce12df365e7ef1890139a570de37bf5d994d9035d SHA512 10479327785c7afbb86288465782b3c4af5b8901a5d63c7989bdebdecdda2ea44990b99cf74e0a1ed87d686e74991b65237a1e3e04b6b87bee510c70e810503b
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
new file mode 100644
index 000000000000..8ed30cca824b
--- /dev/null
+++ b/dev-java/protobuf-java/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="nano">Enable code generator and runtime library designed specifically for resource-constrained systems, like Android</flag>
+	</use>
+	<slots>
+		<subslots>Soname version number of Protobuf</subslots>
+	</slots>
+	<upstream>
+		<remote-id type="github">google/protobuf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild
new file mode 100644
index 000000000000..1480aad8f919
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild
@@ -0,0 +1,66 @@
+# 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="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
+SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/14"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="nano"
+
+# Protobuf is only a build-time dep, but depends on the exact same version
+# (excluding revision), since we are using the same tarball.
+# But probably same subslot is sufficient.
+DEPEND=">=virtual/jdk-1.7
+	~dev-libs/protobuf-${PV}"
+
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	pushd "${S}/java" >/dev/null || die
+	einfo "Compiling Java library ..."
+	"${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="${S}/java/core/src/main/java"
+	JAVA_JAR_FILENAME="protobuf.jar"
+	java-pkg-simple_src_compile
+	popd >/dev/null || die
+	if use nano; then
+		einfo "Compiling Java Nano library ..."
+		pushd "${S}/javanano" >/dev/null || die
+		"${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+		JAVA_SRC_DIR="${S}/javanano/src/main/java"
+		JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
+		JAVA_JAR_FILENAME="protobuf-nano.jar"
+		java-pkg-simple_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
+	JAVA_SRC_DIR="${S}/java/core/src/main/java"
+	if use nano; then
+		JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
+		JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
+	fi
+	mv "${S}/java/target" . || die
+	if use nano; then
+		cp -Rvf "${S}/javanano/target" . || die
+	fi
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
new file mode 100644
index 000000000000..2bea730d3d21
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
@@ -0,0 +1,66 @@
+# 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="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
+SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="nano"
+
+# Protobuf is only a build-time dep, but depends on the exact same version
+# (excluding revision), since we are using the same tarball.
+# But probably same subslot is sufficient.
+DEPEND=">=virtual/jdk-1.7
+	~dev-libs/protobuf-${PV}"
+
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	pushd "${S}/java" >/dev/null || die
+	einfo "Compiling Java library ..."
+	"${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="${S}/java/core/src/main/java"
+	JAVA_JAR_FILENAME="protobuf.jar"
+	java-pkg-simple_src_compile
+	popd >/dev/null || die
+	if use nano; then
+		einfo "Compiling Java Nano library ..."
+		pushd "${S}/javanano" >/dev/null || die
+		"${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+		JAVA_SRC_DIR="${S}/javanano/src/main/java"
+		JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
+		JAVA_JAR_FILENAME="protobuf-nano.jar"
+		java-pkg-simple_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
+	JAVA_SRC_DIR="${S}/java/core/src/main/java"
+	if use nano; then
+		JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
+		JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
+	fi
+	mv "${S}/java/target" . || die
+	if use nano; then
+		cp -Rvf "${S}/javanano/target" . || die
+	fi
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
new file mode 100644
index 000000000000..f2abe82842a5
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
@@ -0,0 +1,60 @@
+# 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="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
+SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="nano"
+
+DEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	einfo "Compiling Java library..."
+	pushd java > /dev/null || die
+	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+	popd > /dev/null || die
+
+	if use nano; then
+		einfo "Compiling Java Nano library..."
+		pushd javanano > /dev/null || die
+		"${EPREFIX}/usr/bin/protoc" --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+		JAVA_SRC_DIR="src/main/java" JAVA_GENTOO_CLASSPATH_EXTRA="../java/core/src/main/java" JAVA_JAR_FILENAME="protobuf-nano.jar" java-pkg-simple_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	local JAVA_SRC_DIR="java/core/src/main/java"
+	local JAVA_JAR_FILENAME="java/protobuf.jar"
+	if use nano; then
+		JAVA_SRC_DIR+=" javanano/src/main/java"
+		JAVA_JAR_FILENAME+=" javanano/protobuf-nano.jar"
+	fi
+
+	mv java/target . || die
+	if use nano; then
+		cp -r javanano/target . || die
+	fi
+
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
new file mode 100644
index 000000000000..bc88cf88156b
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
@@ -0,0 +1,37 @@
+# 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="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
+SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/16"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/java"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+}
diff --git a/dev-java/qdox-1.12.1-r1 b/dev-java/qdox-1.12.1-r1
deleted file mode 100644
index b9ea6673517c..000000000000
--- a/dev-java/qdox-1.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip:0 dev-java/byaccj:0 >=dev-java/jflex-1.6.1:0 dev-java/jmock:1.0 test? ( dev-java/junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Parser for extracting class/interface/method definitions
-EAPI=5
-HOMEPAGE=https://github.com/codehaus/qdox
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.12
-SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=816722133499abb5cbe24284edd497db
diff --git a/dev-java/qdox-1.6.3 b/dev-java/qdox-1.6.3
deleted file mode 100644
index a7796150e1f2..000000000000
--- a/dev-java/qdox-1.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core =dev-java/junit-3.8* >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Parser for extracting class/interface/method definitions
-EAPI=0
-HOMEPAGE=https://github.com/codehaus/qdox
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/ant-core =dev-java/junit-3.8* >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=1.6
-SRC_URI=http://repository.codehaus.org/com/thoughtworks/qdox/qdox/1.6.3/qdox-1.6.3-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ab5eafc9eeb32b816e653c5e0ef5cde5
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
new file mode 100644
index 000000000000..52724722995d
--- /dev/null
+++ b/dev-java/qdox/Manifest
@@ -0,0 +1,6 @@
+AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb17f21935ad9511fcdf4428a79b5243e5eb8cfb5747eaaaafb97eb6edca980ce337d37ed48772ff5ea5 SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081
+DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
+DIST qdox-1.6.3-sources.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
+EBUILD qdox-1.12.1-r1.ebuild 2190 BLAKE2B 6ed08cbbbfd4fbc8eb710095e310b8c2a795039db3f3da520dbe2713d043dff08710747e1bee1f6fc10f51bf3a31e0cc7428948c4d6125499c40bbfe79465c98 SHA512 bae61bdf03378a6053c40b3663a8ee4d011520366a115364b02e90b54f55074cd4639201ac0ec46aecaaee1588b8b9894ca1b5544fd74b171f2344aa614e9376
+EBUILD qdox-1.6.3.ebuild 1305 BLAKE2B 9a3ddc56897f942722d9a6e9bd584252e3e631e28dffaf3b44592b16ffbfbde8d8c83923621a93a335970868025f9445319f0c544b4c4054f13a3cfde3ad5a92 SHA512 46edb87f7bf06b26e578194b59e20648b1df6bc616497991650bf6526e8a2c581b778279f4ea47dcb54f63c8d9687eecf3a2300868e32d523b0d0397f4861095
+MISC metadata.xml 489 BLAKE2B 88377b6fe8ec7278767a18b227778e6f5ec320221fc7293090c67ea268b695de6b131a08172031cc08d3baf8bfd347da0d18bc2ae5c632026eccf20b9d958267 SHA512 709f38b7f8bb7fabd77d9c17a15e537b7c5b46d6c3e203f24847377980ad6afe55adede125b703215b3ab00ad6cb02b8994b75a3db2a4b1b556775bb9f00ee8d
diff --git a/dev-java/qdox/files/jflex-1.6.1.patch b/dev-java/qdox/files/jflex-1.6.1.patch
new file mode 100644
index 000000000000..4e506246f2a2
--- /dev/null
+++ b/dev-java/qdox/files/jflex-1.6.1.patch
@@ -0,0 +1,27 @@
+https://github.com/jflex-de/jflex/commit/f312d563777d907bbb12d1e2ac79835ba83ca53c
+
+--- a/src/grammar/skeleton.inner	2012-11-04 16:16:30.000000000 +0000
++++ b/src/grammar/skeleton.inner	2015-11-02 20:57:37.566057363 +0000
+@@ -407,15 +407,15 @@
+       zzMarkedPos = zzMarkedPosL;
+ --- char count update
+ 
+---- actions
+-        default: 
+-          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
+-            zzAtEOF = true;
++      if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
++        zzAtEOF = true;
+ --- eofvalue
+-          } 
+-          else {
++      } 
++      else {
++--- actions
++          default: 
+ --- no match
+-          }
++        }
+       }
+     }
+   }
diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml
new file mode 100644
index 000000000000..5b3cc7523d73
--- /dev/null
+++ b/dev-java/qdox/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		High speed, small footprint parser for extracting class/interface/method
+		definitions from source files complete with JavaDoc @tags.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">codehaus/qdox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..f471a8ddecd7
--- /dev/null
+++ b/dev-java/qdox/qdox-1.12.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Parser for extracting class/interface/method definitions"
+HOMEPAGE="https://github.com/codehaus/qdox"
+SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.12"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip:0
+	dev-java/byaccj:0
+	>=dev-java/jflex-1.6.1:0
+	dev-java/jmock:1.0
+	test? ( dev-java/junit:0 )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/jflex-1.6.1.patch
+
+	if ! use test ; then
+		rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
+		rm -rf src/java/com/thoughtworks/qdox/junit
+		rm -rf src/test
+	fi
+}
+
+src_compile() {
+	jflex src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die
+	byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl src/grammar/parser.y || die
+	mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die
+
+	# create jar
+	mkdir -p build/classes || die
+
+	local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)"
+
+	if use test ; then
+		cp="${cp}:$(java-pkg_getjars --build-only junit)"
+	fi
+
+	ejavac -sourcepath . -d build/classes -classpath "${cp}" \
+		$(find . -name "*.java") || die "Cannot compile sources"
+
+	mkdir dist || die
+	cd build/classes || die
+	jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR"
+
+	# generate javadoc
+	if use doc ; then
+		cd "${S}"
+		mkdir javadoc || die
+		javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}"
+	fi
+}
+
+src_test() {
+	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \
+		com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_register-ant-task
+
+	use source && java-pkg_dosrc src/java/com
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/qdox/qdox-1.6.3.ebuild b/dev-java/qdox/qdox-1.6.3.ebuild
new file mode 100644
index 000000000000..8673fd2b4a17
--- /dev/null
+++ b/dev-java/qdox/qdox-1.6.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+DESCRIPTION="Parser for extracting class/interface/method definitions"
+HOMEPAGE="https://github.com/codehaus/qdox"
+SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
+LICENSE="Apache-2.0"
+SLOT="1.6"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE=""
+
+CDEPEND="dev-java/ant-core
+	=dev-java/junit-3.8*"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+S=${WORKDIR}
+
+src_compile() {
+	# create jar
+	mkdir -p build/classes
+	ejavac -sourcepath . -d build/classes -classpath $(java-pkg_getjars ant-core,junit) \
+		$(find . -name "*.java") || die "Cannot compile sources"
+	mkdir dist
+	cd build/classes
+	jar -cvf "${S}/dist/${PN}.jar" com || die "Cannot create JAR"
+
+	# generate javadoc
+	if use doc ; then
+		cd "${S}"
+		mkdir javadoc
+		javadoc -d javadoc -sourcepath . -subpackages com \
+			-classpath $(java-pkg_getjars ant-core,junit)
+	fi
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_register-ant-task
+
+	use source && java-pkg_dosrc com
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/radeox-1.0_beta2-r1 b/dev-java/radeox-1.0_beta2-r1
deleted file mode 100644
index dec7e3720a9b..000000000000
--- a/dev-java/radeox-1.0_beta2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 =dev-java/commons-logging-1* >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Radeox Wiki render engine
-EAPI=0
-HOMEPAGE=http://www.radeox.org
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 =dev-java/commons-logging-1* >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=ftp://snipsnap.org/radeox/radeox-1.0-BETA-2-src.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=268a498845f9d3b99987ae68e80e74af
diff --git a/dev-java/radeox/Manifest b/dev-java/radeox/Manifest
new file mode 100644
index 000000000000..0132f227174d
--- /dev/null
+++ b/dev-java/radeox/Manifest
@@ -0,0 +1,3 @@
+DIST radeox-1.0-BETA-2-src.tgz 1720998 BLAKE2B 2142933e8eca18578333c8d144c7cdd79b62c96433c479578e3b9a779de77f9535140f8cb69f399ca868a2dda445099cc60f4df35e7cf26fe3bd72b3acdc6363 SHA512 57e746e2cb3f6a39ab0e7e7171c4c47325712a61235a9622205d5f069cb4f82492ebec8482eb674619c9d58699a501461c863a97119ca674a337af5a331389d2
+EBUILD radeox-1.0_beta2-r1.ebuild 1105 BLAKE2B 8b1093201c55efb86c14e21cf93f0c3026b773149a42e62c422dc418b20e4899ca6a97bb9a44ffa9f331e79c622e134072a07be5db5df0f9492d677f9f5e3179 SHA512 413b63fdc6440aac3e59e2a29746e169061b6e413aa0d941106e3ba0c668e431da17c11ee39db0b700f736d29040cce4d586e236b1832e2c1d65c51498ab9269
+MISC metadata.xml 655 BLAKE2B 4a37407e7b85b3053cbd8287272c070f53c3be44c760c172cde49e85131d23bcc8fb7defbd7f8b3a1db83a0b6270a6b38be67e2996bc452cf1076114c3d830b6 SHA512 71964076f4e7cda88973c4f51c28f40df3400be100b322da00f811b68755ec2a4008bc4fb61dde3babdfa6a06d6c55b0e17addd86ee9f40a695c20ff9a4cfe96
diff --git a/dev-java/radeox/metadata.xml b/dev-java/radeox/metadata.xml
new file mode 100644
index 000000000000..c229ff6ebea8
--- /dev/null
+++ b/dev-java/radeox/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+Radeox API is a lightwight wiki markup rendering engine API to make render
+engines for wikis more portable.
+
+Radeox RE is a Wiki rendering engine implementation that implements the Radeox
+API in Java. The engine renders wiki markup to XHTML. The goal is to develop a
+feature rich, easy to maintain wiki library with a low bug count so writing your
+own Wiki implementation is a breeze.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..8b728eddce57
--- /dev/null
+++ b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Radeox Wiki render engine"
+HOMEPAGE="http://www.radeox.org"
+MY_PV="${PV/_beta/-BETA-}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="ftp://snipsnap.org/radeox/${MY_P}-src.tgz"
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="amd64 x86"
+IUSE=""
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/commons-logging-1*"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# TOOD:
+	# these would get bundled to the final jar
+	# we should try to run the tests though
+	rm -rf  src/org/radeox/example/ \
+		src/test/ src/org/radeox/test/
+
+	rm -v lib/*.jar || die
+	rm -v src/org/radeox/filter/*.class || die
+	rm -v src/org/radeox/*/*/*.class || die
+	cd lib
+	java-pkg_jar-from commons-logging
+}
+
+EANT_BUILD_TARGET="jar jar-api"
+
+src_install() {
+	dodoc Changes.txt README Radeox.version || die
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc src/org
+	java-pkg_dojar lib/{radeox,radeox-api}.jar
+}
diff --git a/dev-java/rat-0.11 b/dev-java/rat-0.11
deleted file mode 100644
index d5d766f272aa..000000000000
--- a/dev-java/rat-0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/ant-core:0 dev-java/commons-io:1 dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/commons-compress:0 dev-java/commons-collections:0 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache Rat is a release audit tool, focused on licenses.
-EAPI=5
-HOMEPAGE=https://creadur.apache.org/rat/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-core:0 dev-java/commons-io:1 dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/commons-compress:0 dev-java/commons-collections:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/org/apache/rat/apache-rat-core/0.11/apache-rat-core-0.11-sources.jar https://repo1.maven.org/maven2/org/apache/rat/apache-rat-tasks/0.11/apache-rat-tasks-0.11-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1e0034c3107bec2b36014dd366ca4abe
diff --git a/dev-java/rat/Manifest b/dev-java/rat/Manifest
new file mode 100644
index 000000000000..f02b2079722b
--- /dev/null
+++ b/dev-java/rat/Manifest
@@ -0,0 +1,4 @@
+DIST apache-rat-core-0.11-sources.jar 124710 BLAKE2B 354755c1e9be4952f3313ae948bd0ef034d0b5ca653f646af33f78b3ec0db4b137b44fa9d30352b82c25c94b0f097a2f533697aee5307b91df710ed7977ecdf0 SHA512 1f75e6830bffa7b1a2410aa421a548a4c78db6686c8f940471e38d1bb455201cbfd797be3bb5da027966ee39bb93e7c7b393e3d7ff330866235fafffe1ee6991
+DIST apache-rat-tasks-0.11-sources.jar 17602 BLAKE2B c960c73e708db5888bea6c12b19958ce7549d54fe2df644ebfc46d86b6724aaf2307a99e58cb1e8530ff1ff1ada57d9bdf26b00a3e902da516652125492e0ba3 SHA512 54430fd7f8c227fe9fa14bbd44adc1222e8b7de0bbc5a5b861f4df773f5db0fdaf80b6ab327e17cdf57af54447d13f3431e8cdf86728af6f8a84e85c89376565
+EBUILD rat-0.11.ebuild 1094 BLAKE2B 417f48a30848de17e555600e7957eb35e11cdad8094cd75a9b2268073f20725f2f2af03aa7ffc32196e089561c0a3f9773317a278d00bb49970ce912ee4427d8 SHA512 cc665ba195edf8b8b67b9a67e2ed0e677788edc9924336f943621ecdd469caaa5fe1bf521a90fade4aa336dff6bffcb83409565daed4e31ae097a475a22ee837
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/rat/metadata.xml b/dev-java/rat/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/rat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/rat/rat-0.11.ebuild b/dev-java/rat/rat-0.11.ebuild
new file mode 100644
index 000000000000..c5275947926b
--- /dev/null
+++ b/dev-java/rat/rat-0.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="apache-${PN}"
+
+DESCRIPTION="Apache Rat is a release audit tool, focused on licenses."
+HOMEPAGE="https://creadur.apache.org/rat/"
+
+SRC_URI="
+	https://repo1.maven.org/maven2/org/apache/${PN}/${MY_PN}-core/${PV}/${MY_PN}-core-${PV}-sources.jar
+	https://repo1.maven.org/maven2/org/apache/${PN}/${MY_PN}-tasks/${PV}/${MY_PN}-tasks-${PV}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/commons-io:1
+	dev-java/commons-cli:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-compress:0
+	dev-java/commons-collections:0
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	ant-core
+	commons-io-1
+	commons-cli-1
+	commons-compress
+	commons-lang-2.1
+	commons-collections
+"
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher "${MY_PN}" --main org.apache.rat.Report
+}
diff --git a/dev-java/reflectasm-1.11.0 b/dev-java/reflectasm-1.11.0
deleted file mode 100644
index b1da9a65a6dd..000000000000
--- a/dev-java/reflectasm-1.11.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/asm:4 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High performance Java reflection
-EAPI=5
-HOMEPAGE=https://github.com/EsotericSoftware/reflectasm/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD-2
-RDEPEND=dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/EsotericSoftware/reflectasm/archive/reflectasm-1.11.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e17bc1aef2d119f041c3fd4b7b9c9cf3
diff --git a/dev-java/reflectasm-1.11.1 b/dev-java/reflectasm-1.11.1
deleted file mode 100644
index df6ad386e1b4..000000000000
--- a/dev-java/reflectasm-1.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/asm:4 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High performance Java reflection
-EAPI=5
-HOMEPAGE=https://github.com/EsotericSoftware/reflectasm/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/EsotericSoftware/reflectasm/archive/reflectasm-1.11.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b4412ff39b57da0dfb11d8e21d1e849d
diff --git a/dev-java/reflectasm/Manifest b/dev-java/reflectasm/Manifest
new file mode 100644
index 000000000000..2d39624d016c
--- /dev/null
+++ b/dev-java/reflectasm/Manifest
@@ -0,0 +1,5 @@
+DIST reflectasm-1.11.0.zip 273527 BLAKE2B 9b2785fc0d394387cc62c6bef3e2b04811d06fa6d6c6ecde01b8e7462ec2cbb7ca226352ecb1f0e574751c74946ff277a306d65fd156dd77200f1d6b6c17f3cf SHA512 c012c6c7e859a9056478b15ae679db0597605ef04f95dead8c8a9751c3626d305acbf6b92597945419ef7d43e7a92550030001de25c6f8992483468d8222831a
+DIST reflectasm-1.11.1.zip 273930 BLAKE2B b7102fa0ee836f6de1abf9a6fa9be3e8c82225fb784901c85e180cd426151c307e17b3721b161c4fc1a52288bdec8888c3a400df52648726b1060d646fdcad76 SHA512 6b50e7d9d908363c30b2ccecdc2912b04b1a659b258acba2c46be72d8a8c4c58ec37e907a16304a6a3e8539c1dd436b14c999bfc65834b5d5aaa767ef041987b
+EBUILD reflectasm-1.11.0.ebuild 643 BLAKE2B 05bf1232683b21792a8c55159bc0f059e401bce4b9846b2e0d8e55d4983d165494a718cfd1b2ee252c52aa3cf7f96d9cee19678e071296aeefce7d84c50332dc SHA512 fc254e74e3a3738bec30c2991e27731e447015624bf72b44801e6d6f612f88c6fb3effda743a2d8244889fbedba4463091d8ced3fa90ac382bb33d6e3b447cc7
+EBUILD reflectasm-1.11.1.ebuild 646 BLAKE2B 82812e90514b0c27d40f6e586a85529737a4c5d08e266271fe11c77832461c25e1828636ffc8b0643b892c84a8fb665214931af8620d90b8f745e7c86cec8a83 SHA512 25fe37ce8ef44ce5d02d6b667406b7efb720fbe32cfeb66df4343f5e752c2be2f7ecae599ce08682e2fa1576e1899c4c9be1da6d88980b9038b4effbef664ccb
+MISC metadata.xml 328 BLAKE2B 23bbb48408cdadd4170c2b8d65188497c15b176e3d94eecaf402080fbce8365a8611f1402d0a0b5599e9d2d28f0dace40856edf4dd8037e460442f71e2be0503 SHA512 cad762e1f009e64cded3bea7ecd16deec28b2432c3b5e4e22572710d118052ceccb2d507c288f168b1a0551df9521bf0c52322caaf8e95f7d772897badafa954
diff --git a/dev-java/reflectasm/metadata.xml b/dev-java/reflectasm/metadata.xml
new file mode 100644
index 000000000000..14fb3725ae1c
--- /dev/null
+++ b/dev-java/reflectasm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">EsotericSoftware/reflectasm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/reflectasm/reflectasm-1.11.0.ebuild b/dev-java/reflectasm/reflectasm-1.11.0.ebuild
new file mode 100644
index 000000000000..2e3db628eff6
--- /dev/null
+++ b/dev-java/reflectasm/reflectasm-1.11.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High performance Java reflection"
+HOMEPAGE="https://github.com/EsotericSoftware/reflectasm/"
+SRC_URI="https://github.com/EsotericSoftware/${PN}/archive/${P}.zip"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+CDEPEND="dev-java/asm:4"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_GENTOO_CLASSPATH="
+	asm-4
+"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf test || die
+}
diff --git a/dev-java/reflectasm/reflectasm-1.11.1.ebuild b/dev-java/reflectasm/reflectasm-1.11.1.ebuild
new file mode 100644
index 000000000000..4826d55119bf
--- /dev/null
+++ b/dev-java/reflectasm/reflectasm-1.11.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High performance Java reflection"
+HOMEPAGE="https://github.com/EsotericSoftware/reflectasm/"
+SRC_URI="https://github.com/EsotericSoftware/${PN}/archive/${P}.zip"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/asm:4"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_GENTOO_CLASSPATH="
+	asm-4
+"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf test || die
+}
diff --git a/dev-java/reflections-0.9.10-r1 b/dev-java/reflections-0.9.10-r1
deleted file mode 100644
index a6929a01e91e..000000000000
--- a/dev-java/reflections-0.9.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/commons-vfs:2 dev-java/dom4j:1 dev-java/gson:2.6 dev-java/guava:20 dev-java/javassist:3 dev-java/jsr305:0 dev-java/slf4j-api:0 dev-java/tomcat-servlet-api:3.1 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java runtime metadata analysis
-EAPI=6
-HOMEPAGE=https://github.com/ronmamo/reflections
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-RDEPEND=>=virtual/jre-1.7 dev-java/commons-vfs:2 dev-java/dom4j:1 dev-java/gson:2.6 dev-java/guava:20 dev-java/javassist:3 dev-java/jsr305:0 dev-java/slf4j-api:0 dev-java/tomcat-servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://search.maven.org/remotecontent?filepath=org/reflections/reflections/0.9.10/reflections-0.9.10-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3317ac010aba1b01e1529c417ef57570
diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
new file mode 100644
index 000000000000..28eeb90b7df3
--- /dev/null
+++ b/dev-java/reflections/Manifest
@@ -0,0 +1,3 @@
+DIST reflections-0.9.10-sources.jar 53049 BLAKE2B 23491098dc648206161d983148bf11a1c4523df0593c903f9dbf03672b481d85aabaed7733a5d829b7f334e51d53dadde3fd439e62f9873ceb11f49f40a2cfef SHA512 940b80ed43aa900177e6c3551980eafe10f7ea16a1e5c0d24fc8c1e29f1e0155aae83e24f60af10f9743449ed38d2d3b211f3668fafbd95a6a2cb9c5581f56bf
+EBUILD reflections-0.9.10-r1.ebuild 710 BLAKE2B 8240c9fb9336f01b74837486e2d217af9e77510f3c08737afb7d1542e9c4df8bc6e7426ae5d7585fa83c47b16b0fa67a6e7a5ba4b9a35dc9fa58778cc3724c49 SHA512 fe11da9fc5ff0ba4565279056fb80caa5b5c99fb6c02c593d51fcbf38c782d9d15b851650ca058af949c0e9efadd5f432d15180f4822c2f80e3ac845227d29cb
+MISC metadata.xml 526 BLAKE2B 9d7cbd06f623684dc7bac9b98720c7cf16a8a48fe7507f65af4657cc7e1ccea992be23023c3b7d8d324a946eac87adc3c039c0b9d7f81af88608970af4d5673e SHA512 9627a7b711bc69d1175ebcc1cefe5a1241c3de4ca833d6f0778f8264d65a5835d8b9ed8efa7d1e98400299c02772e02e6528acccbd9c7c5bc59f13d530ef2e4a
diff --git a/dev-java/reflections/metadata.xml b/dev-java/reflections/metadata.xml
new file mode 100644
index 000000000000..48adac86596f
--- /dev/null
+++ b/dev-java/reflections/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>Reflections scans your classpath, indexes the metadata, allows you to query it on runtime and may save and collect that information for many modules within your project.</longdescription>
+	<upstream>
+		<remote-id type="github">ronmamo/reflections</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/reflections/reflections-0.9.10-r1.ebuild b/dev-java/reflections/reflections-0.9.10-r1.ebuild
new file mode 100644
index 000000000000..4750a28d85da
--- /dev/null
+++ b/dev-java/reflections/reflections-0.9.10-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 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="Java runtime metadata analysis"
+HOMEPAGE="https://github.com/ronmamo/reflections"
+SRC_URI="http://search.maven.org/remotecontent?filepath=org/${PN}/${PN}/${PV}/${P}-sources.jar"
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="dev-java/commons-vfs:2
+	dev-java/dom4j:1
+	dev-java/gson:2.6
+	dev-java/guava:20
+	dev-java/javassist:3
+	dev-java/jsr305:0
+	dev-java/slf4j-api:0
+	dev-java/tomcat-servlet-api:3.1"
+
+RDEPEND=">=virtual/jre-1.7
+	${CP_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CP_DEPEND}
+	app-arch/unzip"
diff --git a/dev-java/relaxng-datatype-1.0-r2 b/dev-java/relaxng-datatype-1.0-r2
deleted file mode 100644
index de931adcc1cd..000000000000
--- a/dev-java/relaxng-datatype-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Interface between RELAX NG validators and datatype libraries
-EAPI=6
-HOMEPAGE=http://relaxng.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/relaxng/relaxngDatatype-1.0.zip -> relaxng-datatype-1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9381e9c0e061e777906ba2f1c7696f70
diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest
new file mode 100644
index 000000000000..d2e235f00b73
--- /dev/null
+++ b/dev-java/relaxng-datatype/Manifest
@@ -0,0 +1,3 @@
+DIST relaxng-datatype-1.0.zip 74033 BLAKE2B 15b488e914cab28fb9ade71b491d961ffa4f683f66759e96cd53dcf69edd39d423b5562831698bb3e03191396c86a2a93369f14d278f3c55a90728031d1921d3 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79
+EBUILD relaxng-datatype-1.0-r2.ebuild 764 BLAKE2B 3115e7a4cbd43f7756f2a580ff63f73b5ba829bb01fc09e694c0368ec241138cc9dad7a695d43deb78a7499def4b27f33d68300894ede11f9cf101ecfb036dd8 SHA512 1d9c0a893e66ea67d1eb07d0db596390d5d15a8b2ccce89c9ca22c726de6df82810d49e15e1473dd5d3d607d652d310e6876123fe625d857482b5270b45e25d6
+MISC metadata.xml 313 BLAKE2B 151379a0c11efd556a9c630fdbc52358ba2ca7baa4a4701526d65d394c1fcc0ccce38f4b874e47b669c3cade9c6faaf0b5bb42ff1a652809c60cc039eac9a582 SHA512 97bbf1c308f5f2436f0c24dac17f5219cc71a8e9882037f9bf59689f75524521ea42c63989491779ca59fd2878e2c478779ed6945fcf2eab661f28be3d9e2a4b
diff --git a/dev-java/relaxng-datatype/metadata.xml b/dev-java/relaxng-datatype/metadata.xml
new file mode 100644
index 000000000000..cf10968b6f59
--- /dev/null
+++ b/dev-java/relaxng-datatype/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">relaxng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
new file mode 100644
index 000000000000..e2bae382dc23
--- /dev/null
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+MY_PN="relaxngDatatype"
+MY_P="${MY_PN}-${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
+HOMEPAGE="http://relaxng.org/"
+SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip -> ${P}.zip"
+
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+DOCS=( README.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs
+}
diff --git a/dev-java/relaxngcc-1.12-r3 b/dev-java/relaxngcc-1.12-r3
deleted file mode 100644
index 851620a0dd28..000000000000
--- a/dev-java/relaxngcc-1.12-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/msv:0 dev-java/xsdlib:0 dev-java/ant-core:0 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=RELAX NG Compiler Compiler
-EAPI=5
-HOMEPAGE=http://relaxngcc.sourceforge.net/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/msv:0 dev-java/xsdlib:0 dev-java/ant-core:0 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/relaxngcc/relaxngcc-20031218.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e698d05dce2e21199a36dc8008266d62
diff --git a/dev-java/relaxngcc/Manifest b/dev-java/relaxngcc/Manifest
new file mode 100644
index 000000000000..e2b0b2582030
--- /dev/null
+++ b/dev-java/relaxngcc/Manifest
@@ -0,0 +1,6 @@
+AUX 1.12-fix-jdk-1.7-enum.patch 925 BLAKE2B 56bc32e9317027c7ff5b9a72f5bc9074fd31ec9e6f4193f9ef3f3726cbc5cd479a3de5028ba99aa4648fd8de8143fdc94624c6db2f6af5bd864cc5577edc1e1f SHA512 5a459bdd6d4d9f173f4e0cd7f23476ef5655f5918cc291eda43c0b847ad190f81d10db55bb76126804dc84efe5122335c11849577130aae09c5e73ca801c5a40
+AUX build.xml-1.12-r1 1052 BLAKE2B f80d529a495fd5ab37788a3a50d03ffa6eb9f7196d6b31007d90fa1d94c7359ba8155340fef0550f7f67ab5b4f053e9920cb2941f3518097b4555dd1121d5e10 SHA512 cd0412dd263ac0e933216bdb99cdb3f45e0ff58f0c836d62a6bbaf57a3cc984980dd76ec9c7791c8719cdb56e80991ab4a5f716919570321169cfeeb8b191854
+AUX relaxngcc-1.12-SwitchBlockInfo.java.patch 509 BLAKE2B 198306ff259d830ce1db6fc2d4d38a926fb64fccdb81c07f51a64a3ef47cd4ab6258a7efa35deb1e6719dee0b5513e8b7068c786bff75b15b408d20c0a1a87e4 SHA512 d9e8fbf64b588a66a44af5a768adad5099f970a8c705898928a73704e6e809f5ba7a8d851bf4ed356dc47c0b0a0a4674583daf87e0271a7edf171e529886f815
+DIST relaxngcc-20031218.zip 2162036 BLAKE2B a5efd9941229e6dbc2d2d223e9d2799a0f56cc6010331175e16cfa2b77b886c060062fd7206bf7d1f9cbbc831a2d06efee176460ced81620ec8ceaed89334921 SHA512 df797243c095e79e9018d8f17deb3963631128718428ff325af6910e285e649f27c270b63101f2b5833ddde23814c54a662397000f433f8a32cea30917760d4b
+EBUILD relaxngcc-1.12-r3.ebuild 1384 BLAKE2B d64cac19e4b27abfdc3fba1642ac09335a2787aaa71134eca67ccee5a1fecb655e62f24bbf6a1b3a76639e2cd96485e06e4d47d928841824c1d0426100dc1485 SHA512 4c634f63561b9814807065ab30be9ef0e2d01877bfa088240d2070f0e5da54d566a4ad4570b285486f7be1c49a623397463691701146960b3e0d2faf5b0bc61e
+MISC metadata.xml 315 BLAKE2B d93ab01a7b525398306e5c60dfe4949a084b824f80b0099f5aa17dcc2b4d3a0997be633179e131c52972e594d5aaecb5d62bc40cb6df3a3eb606d0dd3d8a9e8e SHA512 3fd8f24dacd7aae0d04568ce951c8d9559e0c25dc52f7713136d3f4398c14873ff8420e0d12f858d3006397e9539a7278a21ec85cd549ee1aad516063738caa3
diff --git a/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch b/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch
new file mode 100644
index 000000000000..69de6caaa184
--- /dev/null
+++ b/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch
@@ -0,0 +1,15 @@
+diff --git a/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java b/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
+index b2f0e5e..bca566f 100644
+--- a/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
++++ b/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
+@@ -6850,8 +6850,8 @@ public class JavaBodyParser implements JavaBodyParserConstants {
+         jj_expentry[i] = jj_lasttokens[i];

+       }

+       boolean exists = false;

+-      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {

+-        int[] oldentry = (int[])(enum.nextElement());

++      for (java.util.Enumeration enumx = jj_expentries.elements(); enumx.hasMoreElements();) {

++        int[] oldentry = (int[])(enumx.nextElement());

+         if (oldentry.length == jj_expentry.length) {

+           exists = true;

+           for (int i = 0; i < jj_expentry.length; i++) {

diff --git a/dev-java/relaxngcc/files/build.xml-1.12-r1 b/dev-java/relaxngcc/files/build.xml-1.12-r1
new file mode 100644
index 000000000000..8f1362567653
--- /dev/null
+++ b/dev-java/relaxngcc/files/build.xml-1.12-r1
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<project name="relaxngcc" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac srcdir="src" destdir="build">
+      <classpath>
+        <fileset dir="lib" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="relaxngcc.jar">
+      <manifest>
+        <attribute name="Main-Class" value="relaxngcc.RelaxNGCC"/>
+      </manifest>
+      <fileset dir="build">
+        <include name="**/*.class"/>
+      </fileset>
+      <!--
+        For a list of resources to include, see the project.xml from the
+        upstream relaxngcc.jar contained in the base directory of the zip.
+      -->
+      <fileset dir="src">
+        <include name="plugin.jelly"/>
+        <include name="relaxngcc/runtime/*.java"/>
+        <include name="**/*.properties"/>
+        <include name="**/*.xsl"/>
+      </fileset>
+      <zipfileset src="relaxngcc.orig.zip">
+        <include name="project.xml"/>
+      </zipfileset>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/relaxngcc/files/relaxngcc-1.12-SwitchBlockInfo.java.patch b/dev-java/relaxngcc/files/relaxngcc-1.12-SwitchBlockInfo.java.patch
new file mode 100644
index 000000000000..7969a27da882
--- /dev/null
+++ b/dev-java/relaxngcc/files/relaxngcc-1.12-SwitchBlockInfo.java.patch
@@ -0,0 +1,11 @@
+--- src/relaxngcc/builder/SwitchBlockInfo.java.orig	2015-08-13 01:20:52.344000000 +0000
++++ src/relaxngcc/builder/SwitchBlockInfo.java	2015-08-13 01:21:27.424000000 +0000
+@@ -66,8 +66,6 @@
+             

+             if(prologue!=null) sv.add(prologue);

+             

+-            //elsecode, null‚È‚çerrorHandleMethod‚ŕ‚¶‚é

+-            

+             CDBlock terminal = elsecode;

+             if(terminal==null && errorHandleMethod!=null)

+                 terminal = new CDBlock(errorHandleMethod);

diff --git a/dev-java/relaxngcc/metadata.xml b/dev-java/relaxngcc/metadata.xml
new file mode 100644
index 000000000000..2f5a2039e705
--- /dev/null
+++ b/dev-java/relaxngcc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">relaxngcc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
new file mode 100644
index 000000000000..db4dfd79d2bc
--- /dev/null
+++ b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_DATE="20031218"
+
+DESCRIPTION="RELAX NG Compiler Compiler"
+HOMEPAGE="http://relaxngcc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_DATE}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/msv:0
+	dev-java/xsdlib:0
+	dev-java/ant-core:0
+	dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}-${MY_DATE}"
+
+java_prepare() {
+	mv relaxngcc.jar relaxngcc.orig.zip || die
+
+	rm -v *.jar || die
+	rm -v sample/*/*.class || die
+
+	mkdir lib || die
+	cd lib || die
+
+	java-pkg_jarfrom msv
+	java-pkg_jarfrom xsdlib
+	java-pkg_jarfrom ant-core
+	java-pkg_jarfrom iso-relax
+	java-pkg_jarfrom relaxng-datatype
+
+	cd "${S}" || die
+
+	cp "${FILESDIR}/build.xml-1.12-r1" build.xml || die "cp failed"
+
+	epatch \
+		"${FILESDIR}"/${PV}-*.patch \
+		"${FILESDIR}"/"${P}"-SwitchBlockInfo.java.patch
+
+	rm -rf "src/relaxngcc/maven"
+	java-pkg_filter-compiler jikes
+}
+
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_dojar "${PN}".jar
+
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples sample
+
+	dodoc readme.txt
+	use doc && dohtml -r doc/en/*
+}
diff --git a/dev-java/resin-servlet-api-3.0.25 b/dev-java/resin-servlet-api-3.0.25
deleted file mode 100644
index 1a9e92cf0809..000000000000
--- a/dev-java/resin-servlet-api-3.0.25
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Resin Servlet API 2.4/JSP API 2.0 implementation
-EAPI=0
-HOMEPAGE=http://www.caucho.com/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=2.4
-SRC_URI=http://www.caucho.com/download/resin-3.0.25-src.zip mirror://gentoo/resin-gentoo-patches-3.0.25.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6226c8ccfc3e05ab448e84fa7082d942
diff --git a/dev-java/resin-servlet-api-3.1.12 b/dev-java/resin-servlet-api-3.1.12
deleted file mode 100644
index 6092014bff1c..000000000000
--- a/dev-java/resin-servlet-api-3.1.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Resin Servlet API 2.5/JSP API 2.1 implementation
-EAPI=2
-HOMEPAGE=http://www.caucho.com/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.5
-SRC_URI=http://www.caucho.com/download/resin-3.1.12-src.zip mirror://gentoo/resin-gentoo-patches-3.1.12.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=57e74bb9d1d280ff99556a1c66f88b7d
diff --git a/dev-java/resin-servlet-api-4.0.27 b/dev-java/resin-servlet-api-4.0.27
deleted file mode 100644
index e8914448c142..000000000000
--- a/dev-java/resin-servlet-api-4.0.27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Resin Servlet API 3.0/JSP API 2.1 implementation
-EAPI=5
-HOMEPAGE=http://www.caucho.com/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=http://www.caucho.com/download/resin-4.0.27-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=09102a538f19241eeb276bf222da9910
diff --git a/dev-java/resin-servlet-api-4.0.46 b/dev-java/resin-servlet-api-4.0.46
deleted file mode 100644
index 27d80abd5b37..000000000000
--- a/dev-java/resin-servlet-api-4.0.46
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Resin Servlet API 3.0/JSP API 2.1 implementation
-EAPI=5
-HOMEPAGE=http://www.caucho.com/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=http://www.caucho.com/download/resin-4.0.46-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=554bbd3ab83a632806686636c74d6d27
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
new file mode 100644
index 000000000000..ca23d681ac81
--- /dev/null
+++ b/dev-java/resin-servlet-api/Manifest
@@ -0,0 +1,11 @@
+DIST resin-3.0.25-src.zip 10690692 BLAKE2B dde17819f958053bfe2e1ac0068db0a56c068185d676dce047769ffcd219036318e0f1adc0fee1757136aa4d5f8c75e112e286cb66d445bd30a283afe2c6ebba SHA512 f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
+DIST resin-3.1.12-src.zip 13579367 BLAKE2B 4c5205296f4fd35bbcfd2c0b9a665d83308def83d31df9e919d1823a2bf256f4668fd8b75c05681277e6f3d87a3a5a76c9761ebbd1aad9489b88245a3d0e39b5 SHA512 5d348482175962e4e0401437fa69ce3c7569e514ab7b02ef236937686cfb5185b5cef2deef831d510cf458a41d786457041f579d551c9f1f1aab49829015ff6f
+DIST resin-4.0.27-src.zip 17990178 BLAKE2B 2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6 SHA512 ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
+DIST resin-4.0.46-src.zip 40400255 BLAKE2B e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56 SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
+DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5 SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
+DIST resin-gentoo-patches-3.1.12.tar.bz2 1618 BLAKE2B 672ff977f307d0abe225bdc57bed8778d0855c175532a39f8984dae39aaecb4a708f569179e76d5dbdd47df25f9ca7ae75f7880c8adc85f74a3ab52dc3ecc8fb SHA512 12dfd508765c46a9c9ca782e1b63def2989a3d2e025b3e8a7b15e5b389976aeba898e1659044a737156d953c0eaca9a4a461a9c71dc601aaaeddac8cd5da03ea
+EBUILD resin-servlet-api-3.0.25.ebuild 873 BLAKE2B 463298c316c9b75b6d293d363aa7157d582f3569dd5d035dcfdf15c63421dbc92658c09b818a95f629c6d87f5b0d2a711287827b79221a953dc7912fe89d6c7e SHA512 0d77c497b00e905a8cba5733e74bb717e1052136f094cf9b1ec6838a4f59fcf79f2880b0443ec34795d08a77a49b3b81cd602b3503457b3211761a2027bcdeb4
+EBUILD resin-servlet-api-3.1.12.ebuild 1103 BLAKE2B 2a26ff67220cb360c1bd7909bae7b36076ddacfac8dac56009a846af90062d5cf1339ad5b582decc7d05847e8a558e9ac2d75a6404e0f12db7cf437e91a1a227 SHA512 368faeff8853b60deef26c056c82181e182810a92786e947e7a578797d8ebde6253701e4ced228dc06edc960be31e9210b7e0cccdf6062b03f428d21468df319
+EBUILD resin-servlet-api-4.0.27.ebuild 1127 BLAKE2B ef2e0779a6ba6ec6bc211fdbffb138aa6dc2442b8c556120e3d3b73abe79942851c3ddc19b560e26037ac04c4e900aaf0e6ea25147237586b7fc14a8260730b1 SHA512 c76c4f45a84e7b1806bdd2b0348e7251e84f4e571ad4c3651a42c5a49672257939a7e9e4a70230d63be6c240d1a4b79d291da5fa7bd94743cbb07332294083db
+EBUILD resin-servlet-api-4.0.46.ebuild 1130 BLAKE2B 2f6725b53f1474c6c02150b70c30f89087ded68f61f0510217203c2a8ecb5327ca5b2886e793163084d9e4839cc8cb7319912520d45b819ec0af0e2407ed68db SHA512 2dd96a756b7433887aa4f9b521c4e385a1dc1e5c887acd73525a42df41e28807ef1070e233f40081eb2d0cac9d0820a145bd95923344e549aaad8503f18e9f9c
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/resin-servlet-api/metadata.xml b/dev-java/resin-servlet-api/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/resin-servlet-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
new file mode 100644
index 000000000000..e2a5a17df679
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 2.4/JSP API 2.0 implementation"
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
+	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2.4"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/resin-${PV}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	mkdir "${S}/lib"
+
+	cd "${S}"
+	epatch "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
+
+}
+
+EANT_BUILD_TARGET="jsdk"
+EANT_DOC_TARGET=""
+
+src_install() {
+
+	java-pkg_newjar "lib/jsdk-24.jar"
+	use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
+
+}
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
new file mode 100644
index 000000000000..f0f872dfd98b
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 2.5/JSP API 2.1 implementation"
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
+	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2.5"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/resin-${PV}"
+
+src_prepare() {
+	mkdir -p "${S}/lib"
+	epatch "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
+}
+
+EANT_BUILD_TARGET="jsdk"
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_newjar "lib/jsdk-15.jar"
+	use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
+
+	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+}
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
new file mode 100644
index 000000000000..62503ad641b1
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="3.0"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/resin-${PV}"
+
+java_prepare() {
+	cd "${S}"
+	rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
+	java-ant_bsfix_files build-common.xml || die
+}
+
+EANT_BUILD_TARGET="servlet16"
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
+	use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
+
+	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+}
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
new file mode 100644
index 000000000000..0263bbaf7018
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="3.1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/resin-${PV}"
+
+java_prepare() {
+	cd "${S}"
+	rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
+	java-ant_bsfix_files build-common.xml || die
+}
+
+EANT_BUILD_TARGET="servlet16"
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
+	use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
+
+	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+}
diff --git a/dev-java/rhino-1.7.7-r1 b/dev-java/rhino-1.7.7-r1
deleted file mode 100644
index df4213506c41..000000000000
--- a/dev-java/rhino-1.7.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/emma:0 dev-java/junit:4 dev-java/ant-junit:0 dev-java/hamcrest-core:1.3 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An open-source implementation of JavaScript written in Java
-EAPI=5
-HOMEPAGE=http://www.mozilla.org/rhino/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=MPL-1.1 GPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.6
-SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_7_RELEASE.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=df724426752836f18a85e500e2efc0b5
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
new file mode 100644
index 000000000000..ec4dda43054f
--- /dev/null
+++ b/dev-java/rhino/Manifest
@@ -0,0 +1,4 @@
+AUX rhino-1.7.7-testsrc-build.xml.patch 1414 BLAKE2B c96d595d6c0bcd0225f8df9ac63e28a68cd6045b0f5395a13826fd7b7c7bce01ccc6963e58e2a07e41cd3c138de92cabd2627163cb16b5b2c21bc4f91b4a7eac SHA512 f7fa8d77a584399e6049414ed46b138c14f984148b6dda6e20e376c4312295728de24f31331d20c2b1dc62f81c8d9bd8732227ad64fcf430f2ba721b8de490fe
+DIST Rhino1_7_7_RELEASE.zip 6059127 BLAKE2B 431885bf287da524cfc82e6594802c93e75d48177b4056e9b893d7c852c3c3b30291d616a140981e520fdebacf5cbc8b802a6137f0e29a369f1d01cc771c6b77 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e
+EBUILD rhino-1.7.7-r1.ebuild 2052 BLAKE2B c48a12c3aa6f5cef28d58e3fd6f0f5b14dcd12dcab67f949f0961e76058da2ed36f0d8f9cefa0fe734e8c9f15fc09c556860d3fdee71541cd322c07a7d065337 SHA512 0a4e9beb1503b80e8ee801ced0e4a94f94a871179f19ee7c6a7242e02a097336a2a13ba798e182bb43fb4beaa727d3e05de6d18734490bb604e7855938d975bd
+MISC metadata.xml 509 BLAKE2B 7b61b016be8e7149ead29ef6ec73f2da96d3bc864650845b68d452dd2a5c3d6e1093b7e432a4be7ee7a8f4721ada8b998982876ef709ff2bb4f36568c30a0947 SHA512 73d3c55306da2299fb537dda46cd2551db5913d130bf069ef24b5481a233f84a164338aa31b37dbbcd351d4de2d90d7411d93010d531815977ebed73646d41cd
diff --git a/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch b/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch
new file mode 100644
index 000000000000..4760e980245d
--- /dev/null
+++ b/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch
@@ -0,0 +1,40 @@
+--- testsrc/build.xml.orig	2015-08-05 23:41:56.815000000 +0000
++++ testsrc/build.xml	2015-08-05 23:46:10.026000000 +0000
+@@ -46,15 +46,8 @@
+   -->
+   <property name="test.vm.mx" value="256m" />
+ 
+-  <target name="get-junit" unless="offline">
+-    <mkdir dir="lib"/>
+-    <get src="${test.junit.url}" dest="lib/junit.jar" usetimestamp="true"/>
+-    <get src="${test.hamcrest.url}" dest="lib/hamcrest.jar" usetimestamp="true"/>
+-  </target>
+-
+   <target name="junit-compile">
+     <mkdir dir="${test.classes}" />
+-    <antcall target="get-junit"/>
+     <javac
+       destdir="${test.classes}" debug="true"
+       encoding="UTF-8"
+@@ -75,7 +68,6 @@
+ 
+   <target name="compile">
+     <mkdir dir="${test.classes}" />
+-	<antcall target="get-junit"/>
+     <javac
+       srcdir="testsrc"
+       destdir="${test.classes}" debug="true"
+@@ -105,12 +97,7 @@
+     <delete dir="${test.classes}" />
+   </target>
+ 
+-  <target name="get-emma" unless="offline">
+-    <get src="${test.emma.url}" dest="lib/emma.jar" usetimestamp="true"/>
+-    <get src="${test.emma_ant.url}" dest="lib/emma_ant.jar" usetimestamp="true"/>
+-  </target>
+-
+-  <target name="coverage-instrument" depends="get-emma">
++  <target name="coverage-instrument">
+     <property name="coverage.dir" location="${build.dir}/coverage"/>
+     <property name="coverage.classes.dir" location="${build.dir}/coverage/classes"/>
+     <mkdir dir="${coverage.classes.dir}"/>
diff --git a/dev-java/rhino/metadata.xml b/dev-java/rhino/metadata.xml
new file mode 100644
index 000000000000..d039e67cf9e1
--- /dev/null
+++ b/dev-java/rhino/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Rhino is an implementation of JavaScript written entirely in Java.
+		It is typically embedded into Java applications to provide scripting
+		to end users.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">mozilla/rhino</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/rhino/rhino-1.7.7-r1.ebuild b/dev-java/rhino/rhino-1.7.7-r1.ebuild
new file mode 100644
index 000000000000..6183419c40ea
--- /dev/null
+++ b/dev-java/rhino/rhino-1.7.7-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc examples source test"
+inherit java-pkg-2 java-ant-2 versionator
+
+# rhino -> Rhino
+MY_PN="${PN^}"
+
+# 1.7.7 -> 1_7_7
+MY_PV="$(replace_all_version_separators _ ${PV})"
+
+# rhino1.7.7
+MY_P="${PN}${PV}"
+
+# Rhino1_7_7_RELEASE
+MY_RELEASE="${MY_PN}${MY_PV}_RELEASE"
+
+DESCRIPTION="An open-source implementation of JavaScript written in Java"
+SRC_URI="https://github.com/mozilla/${PN}/archive/${MY_RELEASE}.zip"
+HOMEPAGE="http://www.mozilla.org/rhino/"
+
+LICENSE="MPL-1.1 GPL-2"
+SLOT="1.6"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+IUSE=""
+
+# ../rhino-Rhino1_7_7_RELEASE
+S="${WORKDIR}/${PN}-${MY_RELEASE}"
+
+CDEPEND=""
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/emma:0
+		dev-java/junit:4
+		dev-java/ant-junit:0
+		dev-java/hamcrest-core:1.3
+	)
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-testsrc-build.xml.patch
+)
+
+EANT_TEST_TARGET="junit"
+
+# StackOverFlow errors arise on some tests.
+# Further, the test suite takes way too much time (> 5 min).
+# Maybe reduce the numbers of tests?
+RESTRICT="test"
+
+java_prepare() {
+	java-pkg_clean
+
+	epatch "${PATCHES[@]}"
+
+	if use test; then
+		mkdir lib || die
+		java-pkg_jar-from --build-only emma emma.jar lib/emma.jar
+		java-pkg_jar-from --build-only emma emma_ant.jar lib/emma_ant.jar
+		java-pkg_jar-from --build-only hamcrest-core-1.3 hamcrest-core.jar lib/hamcrest.jar
+		java-pkg_jar-from --build-only junit-4 junit.jar lib/junit.jar
+	fi
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	if use source; then
+		EANT_BUILD_TARGET="source-zip" \
+			java-pkg-2_src_compile
+	fi
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/${MY_P}/js.jar
+
+	java-pkg_dolauncher jsscript-${SLOT} \
+		--main org.mozilla.javascript.tools.shell.Main
+
+	use doc && java-pkg_dojavadoc "build/${MY_P}/javadoc"
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org
+}
diff --git a/dev-java/rngom-20100718-r1 b/dev-java/rngom-20100718-r1
deleted file mode 100644
index ff064b654a51..000000000000
--- a/dev-java/rngom-20100718-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/xsdlib:0 dev-java/relaxng-datatype:0 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=RNGOM is an open-source Java library for parsing RELAX NG grammars
-EAPI=5
-HOMEPAGE=https://rngom.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-java/xsdlib:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/org/kohsuke/rngom/rngom/20100718/rngom-20100718-sources.jar -> rngom-20100718.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b3231e1d679b800f1199db3e1a348108
diff --git a/dev-java/rngom/Manifest b/dev-java/rngom/Manifest
new file mode 100644
index 000000000000..7a3c6e0f6a78
--- /dev/null
+++ b/dev-java/rngom/Manifest
@@ -0,0 +1,3 @@
+DIST rngom-20100718.jar 196334 BLAKE2B 4c5c8087f60fd6a2b264af1e4c153ec5f6aefdd7e75b44d8d02ca1f516691bcd4274044b73ce438cb1df63928d0951fb23752e9bb4af61cdb22845fa56329051 SHA512 af634a3b30b726c9567bb2108dc9c041a60e2de4b395bf1efcca43060d22927896d10bf69b852a3e70b331659803f4dba074392f4be7de6cbdbc210ce90e25cb
+EBUILD rngom-20100718-r1.ebuild 1272 BLAKE2B 5648455290f1bc3e59b5eafe6b1a26f634f80c00fcf1c7afd18001bc75f6ecb0c4b878c3e3dae9a46848512bb4add883bdbf06fc6ff962dd775ef486b034c7b6 SHA512 d7cb4860af50e9e1c2b0ddb6b47beda964e04f1122035d64a3170a1328025d4298c76eab4ccbdb3142a0350b605cc4b2bcde507dabe947e5adee13c259e88488
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/rngom/metadata.xml b/dev-java/rngom/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/rngom/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/rngom/rngom-20100718-r1.ebuild b/dev-java/rngom/rngom-20100718-r1.ebuild
new file mode 100644
index 000000000000..3906f553ff8a
--- /dev/null
+++ b/dev-java/rngom/rngom-20100718-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="RNGOM is an open-source Java library for parsing RELAX NG grammars"
+HOMEPAGE="https://rngom.dev.java.net/"
+SRC_URI="https://repo1.maven.org/maven2/org/kohsuke/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/xsdlib:0
+	dev-java/relaxng-datatype:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	xsdlib
+	relaxng-datatype
+"
+
+JAVA_RM_FILES=(
+	Token.java
+	TokenMgrError.java
+	ParseException.java
+	UCode_UCodeESC_CharStream.java
+	org/kohsuke/rngom/parse/compact/CompactSyntax.java
+	org/kohsuke/rngom/parse/compact/EOFException.java
+	org/kohsuke/rngom/parse/compact/JavaCharStream.java
+	org/kohsuke/rngom/parse/compact/CompactParseable.java
+	org/kohsuke/rngom/parse/compact/EscapeSyntaxException.java
+	org/kohsuke/rngom/parse/compact/CompactSyntaxConstants.java
+	org/kohsuke/rngom/parse/compact/CompactSyntaxTokenManager.java
+)
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" . -name "*.properties"
+}
diff --git a/dev-java/rome-0.9-r3 b/dev-java/rome-0.9-r3
deleted file mode 100644
index cf1eb621ff24..000000000000
--- a/dev-java/rome-0.9-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/jdom:0 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java framework for RSS and Atom feeds
-EAPI=5
-HOMEPAGE=https://rometools.github.io/rome/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jdom:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/rome-0.9-src.zip -> rome-0.9.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3a03597f5356ed01f60b32249cb58f32
diff --git a/dev-java/rome/Manifest b/dev-java/rome/Manifest
new file mode 100644
index 000000000000..709e4a97dd58
--- /dev/null
+++ b/dev-java/rome/Manifest
@@ -0,0 +1,4 @@
+AUX rome-0.9-build.xml-test-upstream.patch 527 BLAKE2B 5c5d4f057298071912472b4a7bdfd7a8a184a78bc45bdb75e892497dd297771ff4a633f0ff9904545fdb12d43f1c0364fa55598670ea8d56e06cd1863b53c36c SHA512 bdbe4232e443228cb64be2f108ec021a9e8654e28c1c9a50f2bf453cb62d090cbfa47df1a0df14e01780c8b8c460331b45a4a974e121ac3d4ee93b82beca0781
+DIST rome-0.9.zip 248755 BLAKE2B dcd19b49a9c5aa9849f5807508e4d10c7effaa9ec9247ffd5039cda7a08afb525a095ac7bbb72d0443566d08a0ebf75919b3dae018aba8957a94c4389d7df82d SHA512 d4bc9945e2b77bdc38eca609ec353379c279cd700d8d85220a1723d1b019da2c18bd93ff98b062e519e7d87f2d2b6853f373fc7178cec0f83b34af45fce5f3ff
+EBUILD rome-0.9-r3.ebuild 956 BLAKE2B b3b21d78acab15f0ec31bc9c029dd16453185a07ed3e5582b30ad1a3e19be7c79b785d6bbce42653945dc31a1b87081019dfa87d41005e00304f8905b749e3cf SHA512 438b68bab99ecf29b493e74201017f9f4e4a5ce3747c86f7bf737b9481e68237192366bad2785ac14b85e2ac558a63662e43c5f26d96b9eafc6d777374fdf637
+MISC metadata.xml 214 BLAKE2B 5452fb11be445b7579865f9777af292067658bf101f6321db48ab1b478101fe031bb7914c6c24215bcdbe369dda396c164fcbbc4253ecb315de82141ee25f8b0 SHA512 d2b6ecfbbd79440de1909d9f195e5d4a6f9886b685ac1e6d7a1db39b8925b29942fac2998cde06040c921f2cc9ef2cbfbf836b60e191d894b00f75628476b1f7
diff --git a/dev-java/rome/files/rome-0.9-build.xml-test-upstream.patch b/dev-java/rome/files/rome-0.9-build.xml-test-upstream.patch
new file mode 100644
index 000000000000..95e53f4f7f73
--- /dev/null
+++ b/dev-java/rome/files/rome-0.9-build.xml-test-upstream.patch
@@ -0,0 +1,17 @@
+===================================================================
+RCS file: /opt/sourcecast/data/ccvs/repository/rome/build.xml,v
+retrieving revision 1.14
+retrieving revision 1.15
+diff -u -r1.14 -r1.15
+--- rome/build.xml	2006/12/04 21:47:37	1.14
++++ rome/build.xml	2006/12/26 14:35:46	1.15
+@@ -131,6 +131,9 @@
+       <fileset dir="src/data">
+         <include name="**/*.xml" />
+       </fileset>
++      <fileset dir="src/test">
++        <include name="**/*.properties" />
++      </fileset>
+     </copy>    
+   </target>
+   
diff --git a/dev-java/rome/metadata.xml b/dev-java/rome/metadata.xml
new file mode 100644
index 000000000000..33a02ea0f34d
--- /dev/null
+++ b/dev-java/rome/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/rome/rome-0.9-r3.ebuild b/dev-java/rome/rome-0.9-r3.ebuild
new file mode 100644
index 000000000000..b6e2db835c45
--- /dev/null
+++ b/dev-java/rome/rome-0.9-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java framework for RSS and Atom feeds"
+HOMEPAGE="https://rometools.github.io/rome/"
+SRC_URI="mirror://gentoo/${P}-src.zip -> ${P}.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/jdom:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+EANT_GENTOO_CLASSPATH="jdom"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+java_prepare() {
+	# Patch build.xml so the tests pass
+	epatch "${FILESDIR}/${P}-build.xml-test-upstream.patch"
+
+	# Keep Ant happy.
+	mkdir -p target/lib || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/rundoc-0.11-r1 b/dev-java/rundoc-0.11-r1
deleted file mode 100644
index 6906a2c16422..000000000000
--- a/dev-java/rundoc-0.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=an Apache ANT optional task that extracts snippets of code from text files
-EAPI=5
-HOMEPAGE=http://www.martiansoftware.com/lab/snip.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.martiansoftware.com/lab/rundoc/rundoc-0.11-src.zip -> rundoc-0.11.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b331493cee16a9663d2e72ceb9cbb3b9
diff --git a/dev-java/rundoc/Manifest b/dev-java/rundoc/Manifest
new file mode 100644
index 000000000000..f2060acb80f0
--- /dev/null
+++ b/dev-java/rundoc/Manifest
@@ -0,0 +1,3 @@
+DIST rundoc-0.11.zip 47013 BLAKE2B 1e4a9c90c71f2768c5f189bae947e5fa01cdb8141de94f529ef3837aad7642383603c015fcd54a0eff85e1509f8cdde3d1b0330993175f9834b6ff4341c2a758 SHA512 d16aef5455ac2c6bbae16e4a12df798eca88e9c15225af8dc28edfa0b88b73ca6119ca22c6c4319665fef1203b986f1401029318fb094fe30fe985497fb1c269
+EBUILD rundoc-0.11-r1.ebuild 724 BLAKE2B 153255b8cc9b6277efc3f0fb034635a9d78f5dd4ddd3261a31855f2c93cb84ba581a9cad505e1407962b8fcaec9d77c47871ea4f6ba53a1fad14343b44d47269 SHA512 60f602e0be62c6133d6fc8f509827bf0edb5778c7dcc8eea1c9ed4ebf2f88f23c7561e26912e54e9edbf27a89801ceeca2a9090b1042392a575e89c0f66fa818
+MISC metadata.xml 533 BLAKE2B 93747d0b48b9fb7b4cb3a11500df062dbc62cb372e9e9dc6b0d5cda39388e437fcc91c32447ef996fb91e4e044b8754da09454581a7835567154c9e0b9a78a26 SHA512 ffee15d0c974e775c7698764cf1fb97c6c5876dd0b2f5ef549a88488055930885ae0aad12b8f74add87effa2f617cc45626a1fbacf118941097d1c7d129601f8
diff --git a/dev-java/rundoc/metadata.xml b/dev-java/rundoc/metadata.xml
new file mode 100644
index 000000000000..91b30fd43cdf
--- /dev/null
+++ b/dev-java/rundoc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+
+	<longdescription lang="en">
+		rundoc is an Ant task designed to help with the single-sourcing of
+		program documentation. This task replaces special commands embedded
+		within text files with their output in a specified format. Currently,
+		only docbook format is supported.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/rundoc/rundoc-0.11-r1.ebuild b/dev-java/rundoc/rundoc-0.11-r1.ebuild
new file mode 100644
index 000000000000..9da02b564ff8
--- /dev/null
+++ b/dev-java/rundoc/rundoc-0.11-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="an Apache ANT optional task that extracts snippets of code from text files"
+HOMEPAGE="http://www.martiansoftware.com/lab/snip.html"
+SRC_URI="http://www.martiansoftware.com/lab/${PN}/${P}-src.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/rxtx-2.2_pre2 b/dev-java/rxtx-2.2_pre2
deleted file mode 100644
index 601075154a40..000000000000
--- a/dev-java/rxtx-2.2_pre2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core lfd? ( sys-apps/xinetd ) source? ( app-arch/zip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Native lib providing serial and parallel communication for Java
-EAPI=4
-HOMEPAGE=http://rxtx.qbang.org/
-IUSE=doc source lfd elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
-SLOT=2
-SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d99eaecbbdbe15b47c6ada5296cfa691
diff --git a/dev-java/rxtx-2.2_pre2-r1 b/dev-java/rxtx-2.2_pre2-r1
deleted file mode 100644
index f4bb6ecb86f6..000000000000
--- a/dev-java/rxtx-2.2_pre2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Native lib providing serial and parallel communication for Java
-EAPI=5
-HOMEPAGE=http://rxtx.qbang.org/
-IUSE=lfd elibc_FreeBSD doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=virtual/jre-1.6 lfd? ( sys-apps/xinetd ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=419b08828d0e665e7913f1e18e1c9ba7
diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest
new file mode 100644
index 000000000000..656b0b80ce5a
--- /dev/null
+++ b/dev-java/rxtx/Manifest
@@ -0,0 +1,9 @@
+AUX lockfiled.xinetd 202 BLAKE2B 38ecf8d5faadf521d5253e60183d13c3040a88035d5e039e11515e876a0ee80799d3fd31a736fb9176ae88b5e58ea40e2fff1beadb593770f2a4774acc10e32c SHA512 5ad71db04f2cc44348572876079b9548a3aafb84aa53aa6f6d422468c54911cc149cae94743d86eaf7dc62a1cc1479b95893dfa0909367778f20e1ad72b99fea
+AUX rxtx-2.1-7r2-lfd.diff 497 BLAKE2B 1e74708071d4645e0444d4ac2bffb8b952f17723d1ce98a784a75c5e1f1d22f2472ebbe0aa16c40b830be0255bd04b8d3a13ffe8d54b4d787e3a03e4d07f4be9 SHA512 fd06c021ad496036556f979e783864d6d88d1a0c039396eefacc569d66e6942b08b246970be640c73c0c2d209aa0c3247db61bdc19a99066789d4f4d0e4d390e
+AUX rxtx-2.1-7r2-nouts.diff 3583 BLAKE2B a92f5459ec2309f941ca7f8c3437a1c392da06972d4511905c73e1676fab4ad772a9d22aa3d639095798def629cba794f93add6e67878fff8441f628063ce421 SHA512 c7c6c11785089d321ee9680f4b67c590fe0c3cc0f031196eb71831ef7f319867fb156912c0c934a751d5d9e97774d6c26cab5c710055e919e97bcf39a789787d
+AUX rxtx-2.2_pre2-add-ttyACM.patch 328 BLAKE2B 93e5ddca58bf3886c1ed7d34ef6e718d844eb067b55d9ff4fde7faa083735b135a853ebad7f9baf9ce1877fbc5cc3ce9bbd88b342aac4f040a2c0b6045629b99 SHA512 c81ae4e3f6fe09722709b6a9ae09fd3a300c9ef94641a3aa9f821b6fd4e4c28f15e9f672d2bfe6b51715f9e6b2caa5f637be20a76027cb31098062f60a0b0d0f
+AUX rxtx-2.2_pre2-limits.patch 272 BLAKE2B 8f49c4a9dbf852f444a742ab3b2b5c846d3d0035307415dd3b4ba34bf3a37179e82d63e04eeb3b553e678fcfc5d0cc3ab0651fdcbf6be20228e35d13db3bf1b0 SHA512 0e4d5b8e622515c75613aeb8c5e4fc1786f1c05ef2619b65c4b1060776933172479957b9f9a15195c79f10c90a1802956eac32cd60939b9b0a15540901e62180
+DIST rxtx-2.2pre2.zip 1491209 BLAKE2B fe115833ee89cfe9a3ae58117ac4a4326e8f79e6fdc0528cb8dd2824e231c862e4b421c94784059e4cf03f6cc93a32636444916a5c8cebe002da470b460bf23b SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514
+EBUILD rxtx-2.2_pre2-r1.ebuild 2227 BLAKE2B 5d1452dbaddce8f467f46ed44a789e10dfa2717e6683c6823319129fea5960603a078795b7d75f2fd9db144b6ec331da9d14d9418928ff2dd383ff7c57f66271 SHA512 4a97e69b8601c3ec5ced216f3236c5e564fe2edc91f813ac0a620bd602b07bbc15d471c6f10c3d05d4a6720e12d914d0236e228723ad74f607f7a46dec6e6c1d
+EBUILD rxtx-2.2_pre2.ebuild 2300 BLAKE2B bac12b8d60a71184581a8c6fd72e02aae1d13359bdd47cd06599edd82c4e30e690556e4271ddb746a9db1f8da073cb58a3020d4213223bf67693125fb11f5c88 SHA512 04eea992fa9f8553ecd4fa8eef777db949996bfae176ed8f23e575034d334c1eff3ebb783452899edefbabae459ac04e5c59ca41fadb78ff530ce90d4191ed70
+MISC metadata.xml 333 BLAKE2B 1863349617d00ca1b5076d4a8f626e43afbe0be700385cd46a4c6a9636486ce100cb916ac6013b6fe8de41bc69dae4bfd95f96c60c960ca04730411e90fdb94d SHA512 fa687c6a61c8be4e5b80f14b9eb6ef7637f9de649e3c35dd81f81096c1bbafe67ee5979c551d958422fdbff1ebb08b43a1630d9cbdf283e56c4ea5aca1cd3ac7
diff --git a/dev-java/rxtx/files/lockfiled.xinetd b/dev-java/rxtx/files/lockfiled.xinetd
new file mode 100644
index 000000000000..8d6e95a5e444
--- /dev/null
+++ b/dev-java/rxtx/files/lockfiled.xinetd
@@ -0,0 +1,13 @@
+service lfd
+{
+	port		= 50001
+	bind		= localhost
+	type		= UNLISTED
+	flags		= REUSE
+	socket_type	= stream
+	wait		= no
+	user		= uucp
+	server		= /usr/sbin/in.lfd
+	log_on_failure	+= USERID
+	disable		= yes
+}
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff
new file mode 100644
index 000000000000..496d732ae2fa
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff
@@ -0,0 +1,14 @@
+--- src/lfd/lockdaemon.c.orig	2004-10-12 10:59:28.000000000 +0200
++++ src/lfd/lockdaemon.c	2006-10-29 22:46:58.000000000 +0100
+@@ -248,9 +248,8 @@
+ 
+ 	if ( check_group_uucp() )
+ 	{
+-		syslog( LOG_INFO, "check_lock_status: No permission to create lock file.
+-
+-		please see: How can I use Lock Files with rxtx? in INSTALL\n" );
++		syslog( LOG_INFO, "check_lock_status: No permission to create lock file.\n\n"
++			"please see: How can I use Lock Files with rxtx? in INSTALL\n" );
+ 		return 1;
+ 	}
+ 
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff
new file mode 100644
index 000000000000..fb05955c65f1
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff
@@ -0,0 +1,90 @@
+--- src/I2CImp.c.orig	2004-10-17 16:23:02.000000000 +0200
++++ src/I2CImp.c	2006-10-26 21:25:32.000000000 +0200
+@@ -87,6 +87,7 @@
+ 	if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #if defined(__linux__) 
++#if 0
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{
+@@ -98,6 +99,7 @@
+ 		fprintf(stderr, "\n\n\nRXTX WARNING:  This library was compiled to run with OS release %s and you are currently running OS release %s.  In some cases this can be a problem.  Try recompiling RXTX if you notice strange behavior.  If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
+ 		getchar();
+ 	}
++#endif
+ #endif /* __linux__ */
+ #endif /* WIN32 */
+ }
+--- src/RawImp.c.orig	2004-10-16 18:20:35.000000000 +0200
++++ src/RawImp.c	2006-10-26 21:25:59.000000000 +0200
+@@ -231,6 +231,7 @@
+ 	if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #if defined(__linux__) 
++#if 0
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{
+@@ -242,6 +243,7 @@
+ 		fprintf(stderr, "\n\n\nRXTX WARNING:  This library was compiled to run with OS release %s and you are currently running OS release %s.  In some cases this can be a problem.  Try recompiling RXTX if you notice strange behavior.  If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
+ 		getchar();
+ 	}
++#endif
+ #endif /* __linux__ */
+ #endif /* WIN32 */
+ }
+--- src/RS485Imp.c.orig	2004-10-16 18:20:35.000000000 +0200
++++ src/RS485Imp.c	2006-10-26 21:26:23.000000000 +0200
+@@ -87,6 +87,7 @@
+ 	if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #if defined(__linux__) 
++#if 0
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{
+@@ -98,6 +99,7 @@
+ 		fprintf(stderr, "\n\n\nRXTX WARNING:  This library was compiled to run with OS release %s and you are currently running OS release %s.  In some cases this can be a problem.  Try recompiling RXTX if you notice strange behavior.  If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
+ 		getchar();
+ 	}
++#endif
+ #endif /* __linux__ */
+ #endif /* WIN32 */
+ }
+--- src/SerialImp.c.orig	2006-01-29 23:19:04.000000000 +0100
++++ src/SerialImp.c	2006-10-26 21:26:59.000000000 +0200
+@@ -280,6 +280,7 @@
+ 	gettimeofday(&seloop, NULL);
+ #endif /* DEBUG_TIMING */
+ #if defined(DEBUG) && defined(__linux__)
++#if 0
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{
+@@ -295,6 +296,7 @@
+ 		getchar();
+ 	}
+ 	LEAVE( "RXTXPort:Initialize" );
++#endif
+ #endif /* DEBUG && __linux__ */
+ }
+ 
+--- src/SerialImp.cpp.orig	2004-10-12 10:59:27.000000000 +0200
++++ src/SerialImp.cpp	2006-10-26 21:27:44.000000000 +0200
+@@ -102,6 +102,7 @@
+ 	if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #ifdef DEBUG
++#if 0
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{
+@@ -114,6 +115,7 @@
+ 			name.release);
+ 		getchar();
+ 	}
++#endif
+ #endif /* DEBUG */
+ #endif /* __BEOS__ */
+ #endif /* WIN32 */
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch
new file mode 100644
index 000000000000..ac3a0a9dbee5
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch
@@ -0,0 +1,10 @@
+--- rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java.orig
++++ rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java
+@@ -574,6 +574,7 @@
+ 					if(osName.equals("Linux"))
+ 					{
+ 						String[] Temp = {
++						"ttyACM", // linux USB modems
+ 						"ttyS", // linux Serial Ports
+ 						"ttySA", // for the IPAQs
+ 						"ttyUSB", // for USB frobs
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
new file mode 100644
index 000000000000..1e4ff4af57b7
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
@@ -0,0 +1,10 @@
+--- src/lfd/lockdaemon.c.orig	2007-04-26 06:26:07.000000000 +0100
++++ src/lfd/lockdaemon.c	2016-02-17 20:41:09.137509089 +0000
+@@ -69,6 +69,7 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <pwd.h>
++#include <limits.h>
+ 
+ #define FHS
+ #define LOCKFILEPREFIX "LCK.."
diff --git a/dev-java/rxtx/metadata.xml b/dev-java/rxtx/metadata.xml
new file mode 100644
index 000000000000..fc99089425fa
--- /dev/null
+++ b/dev-java/rxtx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <use>
+    <flag name="lfd">Installs and uses LockFileServer daemon (lfd)</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
new file mode 100644
index 000000000000..4a59306f198f
--- /dev/null
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit toolchain-funcs versionator autotools java-pkg-2
+
+MY_PV="$(delete_version_separator 2)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Native lib providing serial and parallel communication for Java"
+HOMEPAGE="http://rxtx.qbang.org/"
+SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="lfd"
+
+RDEPEND=">=virtual/jre-1.6
+	lfd? ( sys-apps/xinetd )"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am || die
+	sed -i \
+		-e "s:UTS_RELEASE::g" \
+		-e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" \
+		-e "s:-source ... -target ...:$(java-pkg_javac-args):g" \
+		configure.in || die
+
+	epatch \
+		"${FILESDIR}/${PN}-2.1-7r2-lfd.diff" \
+		"${FILESDIR}/${PN}-2.1-7r2-nouts.diff" \
+		"${FILESDIR}/${P}-add-ttyACM.patch" \
+		"${FILESDIR}/${P}-limits.patch"
+
+	rm acinclude.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable lfd lockfile_server)
+}
+
+src_compile() {
+	emake
+
+	if use lfd ; then
+		# see INSTALL in src/ldf
+		$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/lfd/lockdaemon.c -o src/lfd/in.lfd || die
+	fi
+
+	if use doc ; then
+		emake docs
+	fi
+
+	# Fix for src zip creation
+	if use source ; then
+		mkdir -p src_with_pkg/gnu || die
+		ln -s ../../src src_with_pkg/gnu/io || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar RXTXcomm.jar
+	java-pkg_doso ${CHOST}/.libs/*.so
+
+	dodoc AUTHORS ChangeLog INSTALL PORTING TODO SerialPortInstructions.txt
+	docinto html
+	dodoc RMISecurityManager.html
+
+	if use lfd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/lockfiled.xinetd" lfd
+		dosbin src/lfd/in.lfd
+		dodoc src/lfd/LockFileServer.rfc
+	fi
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src_with_pkg/gnu
+}
+
+pkg_postinst() {
+	if use lfd ; then
+		elog "Don't forget to enable the LockFileServer"
+		elog "daemon (lfd) in /etc/xinetd.d/lfd"
+	else
+		elog "RXTX uses UUCP style device-locks. You should"
+		elog "add every user who needs to access serial ports"
+		elog "to the 'uucp' group:"
+		elog
+		elog "    usermod -aG uucp <user>"
+	fi
+}
diff --git a/dev-java/rxtx/rxtx-2.2_pre2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2.ebuild
new file mode 100644
index 000000000000..906a1b6e0471
--- /dev/null
+++ b/dev-java/rxtx/rxtx-2.2_pre2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs versionator autotools java-pkg-2
+
+MY_PV="$(delete_version_separator 2)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Native lib providing serial and parallel communication for Java"
+HOMEPAGE="http://rxtx.qbang.org/"
+SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="amd64 x86"
+IUSE="doc source lfd"
+
+RDEPEND=">=virtual/jre-1.4"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	dev-java/ant-core
+	lfd? ( sys-apps/xinetd )
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# some minor fixes
+	sed -i -e "s:UTS_RELEASE::g" configure.in || die
+	sed -i -e "s:|1.5\*:|1.5*|1.6*|1.7*:g" configure.in || die
+	sed -i -e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" configure.in || die
+	sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am || die
+
+	# some patches
+	epatch "${FILESDIR}/${PN}-2.1-7r2-lfd.diff"
+	epatch "${FILESDIR}/${PN}-2.1-7r2-nouts.diff"
+	epatch "${FILESDIR}/${P}-add-ttyACM.patch"
+
+	# update autotools stuff
+	rm acinclude.m4
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable lfd lockfile_server)
+}
+
+src_compile() {
+	emake
+
+	if use lfd ; then
+		# see INSTALL in src/ldf
+		$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/lfd/lockdaemon.c -o src/lfd/in.lfd || die "compiling lfd failed"
+	fi
+
+	if use doc ; then
+		emake docs
+	fi
+
+	#Fix for src zip creation
+	if use source ; then
+		mkdir -p src_with_pkg/gnu
+		ln -s ../../src src_with_pkg/gnu/io
+	fi
+}
+
+src_install() {
+	java-pkg_dojar RXTXcomm.jar
+	java-pkg_doso ${CHOST}/.libs/*.so
+
+	dodoc AUTHORS ChangeLog INSTALL PORTING TODO SerialPortInstructions.txt
+	dohtml RMISecurityManager.html
+
+	if use lfd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/lockfiled.xinetd" lfd
+		dosbin src/lfd/in.lfd
+		dodoc src/lfd/LockFileServer.rfc
+	fi
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src_with_pkg/gnu
+}
+
+pkg_postinst() {
+	if use lfd ; then
+		elog "Don't forget to enable the LockFileServer"
+		elog "daemon (lfd) in /etc/xinetd.d/lfd"
+	else
+		elog "RXTX uses UUCP style device-locks. You should"
+		elog "add every user who needs to access serial ports"
+		elog "to the 'uucp' group:"
+		elog
+		elog "    usermod -aG uucp <user>"
+	fi
+}
diff --git a/dev-java/saaj-1.3.19-r2 b/dev-java/saaj-1.3.19-r2
deleted file mode 100644
index 4de75c19ecac..000000000000
--- a/dev-java/saaj-1.3.19-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/mimepull:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 java-virtuals/saaj-api:0 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/xalan:0 java-virtuals/servlet-api:2.5 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=SOAP with Attachments API for Java
-EAPI=6
-HOMEPAGE=https://saaj.dev.java.net/
-IUSE=elibc_FreeBSD examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=dev-java/mimepull:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 java-virtuals/saaj-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sera/distfiles/saaj-1.3.19.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=758e158e14670019a9df7958a85f9941
diff --git a/dev-java/saaj/Manifest b/dev-java/saaj/Manifest
new file mode 100644
index 000000000000..c5adeb297292
--- /dev/null
+++ b/dev-java/saaj/Manifest
@@ -0,0 +1,4 @@
+AUX saaj-1.3.19-java-5-bootclasspath.patch 502 BLAKE2B 6c753863bb79bfa13caf57b944e654768d77a809829196fd540619cebe72e9ecd7098164938d934dbb93619db7fee9ba6419670cc240ef0b2e367585c5e08432 SHA512 8477fac7d1a33b0ac7fc365c0eb385597cc0ae5cb65bc6ad45ebfb70a023b343adafbfbcf71cd226e14f4e282eee5654a5b0d310703aa4386b4238a4c55f0bd1
+DIST saaj-1.3.19.tar.bz2 2266558 BLAKE2B ea198273be03e8c01d66c2b088df99761eee46e264ac80987845af0fe8fb3992f5dfdd323a5e719241759c31dcc1da0d52cf4506eef1577d2e617eda0565bf29 SHA512 12a439e296117abeac5de4694f2efec74c7f2b15cd86cb8759bfba6867f68dfe6c2f5b86ac2f8884eb86dddb3221e19f6c47c976cbcedcebe28570b51280ef71
+EBUILD saaj-1.3.19-r2.ebuild 1675 BLAKE2B 1d80a4b46e189bb79a07348ad41abae94463be2ecfdb66c6d35485e581d7c510fb2d33148fa809cf22d2acb0befdb24e9516c83910460c861713ec9517c2c6f3 SHA512 b43964117da68ae030ca47a8ac6b277732d8a0876a0c301dae90be8dbfa0fd50ca3ab9bbe30129f638555707dd7b3c67a5722b8848446cbb3ab4aff280a1967c
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch b/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch
new file mode 100644
index 000000000000..9b92b18944c9
--- /dev/null
+++ b/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch
@@ -0,0 +1,13 @@
+--- a/src/java/com/sun/xml/messaging/saaj/soap/ImageDataContentHandler.java
++++ b/src/java/com/sun/xml/messaging/saaj/soap/ImageDataContentHandler.java
+@@ -83,7 +83,9 @@
+      * @return The DataFlavors.
+      */
+     public DataFlavor[] getTransferDataFlavors() { 
+-        return (DataFlavor[]) Arrays.copyOf(flavor, flavor.length);
++        DataFlavor[] copyOf = new DataFlavor[flavor.length];
++        System.arraycopy(flavor, 0, copyOf, 0, flavor.length);
++        return copyOf;
+     }
+ 
+     /**
diff --git a/dev-java/saaj/metadata.xml b/dev-java/saaj/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/saaj/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/saaj/saaj-1.3.19-r2.ebuild b/dev-java/saaj/saaj-1.3.19-r2.ebuild
new file mode 100644
index 000000000000..5fb094560cfa
--- /dev/null
+++ b/dev-java/saaj/saaj-1.3.19-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="SOAP with Attachments API for Java"
+HOMEPAGE="https://saaj.dev.java.net/"
+
+# svn export https://svn.java.net/svn/saaj~svn/tags/saaj-impl-1.3.19 saaj-1.3.19
+# tar cjf saaj-1.3.19.tar.bz2 saaj-1.3.19
+SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# saaj-api only for java 5
+CDEPEND="
+	dev-java/mimepull:0
+	dev-java/xerces:2
+	dev-java/xml-commons-external:1.4
+	java-virtuals/saaj-api:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+# servlet-api 2.5 for java 5. 3.0 is java 6.
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/xalan:0
+		java-virtuals/servlet-api:2.5
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-java-5-bootclasspath.patch )
+
+HTML_DOCS=( docs )
+
+src_prepare() {
+	default
+
+	java-pkg_clean
+
+	# YES! There's nothing like using com.sun...internal ! YAY!
+	find src -name '*.java' -exec sed -i \
+		-e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \
+		-e 's,com.sun.org.apache.xalan.internal.xsltc.trax,org.apache.xalan.xsltc.trax,g' \
+		{} + || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="mimepull,saaj-api,xerces-2,xml-commons-external-1.4"
+
+EANT_TEST_TARGET="test-all"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},servlet-api-2.5,xalan"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar build/lib/saaj-impl.jar ${PN}.jar
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/*
+	einstalldocs
+}
diff --git a/dev-java/sablecc-3.7-r1 b/dev-java/sablecc-3.7-r1
deleted file mode 100644
index 66057e2dba65..000000000000
--- a/dev-java/sablecc-3.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java based compiler / parser generator
-EAPI=5
-HOMEPAGE=http://www.sablecc.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/sablecc/sablecc-3.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0f77efbd32781bcb53f20da78f1d323e
diff --git a/dev-java/sablecc-anttask-1.1.0-r2 b/dev-java/sablecc-anttask-1.1.0-r2
deleted file mode 100644
index 6f4c22b4be4b..000000000000
--- a/dev-java/sablecc-anttask-1.1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Ant task for sablecc
-EAPI=5
-HOMEPAGE=http://sablecc.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/sablecc/sablecc-anttask-1.1.0-src.tar.gz -> sablecc-anttask-1.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d8def591295e0a264501ab6298aa1ebf
diff --git a/dev-java/sablecc-anttask/Manifest b/dev-java/sablecc-anttask/Manifest
new file mode 100644
index 000000000000..d243023d4e19
--- /dev/null
+++ b/dev-java/sablecc-anttask/Manifest
@@ -0,0 +1,3 @@
+DIST sablecc-anttask-1.1.0.tar.gz 14045 BLAKE2B d69571be04ca6404f12f8d1a386386b5cf1f4742e35004c19801abfdf698f21d7b6650088ff5157e63e332b386bd329809949e091e608523dad08b70e7cea8e8 SHA512 23e8f3e911660549fd5bd6bcec4c97c58138fbc478bb958695b9b5327cf3da6985830d1c7a8db45516e2f708f7a9405921342b2a05bdce31c39c71569d62059d
+EBUILD sablecc-anttask-1.1.0-r2.ebuild 578 BLAKE2B acb9decceaa7fd569e2cf9759c9810399d3f62d87567bcfab1b102a52820dc2a0ca87ff32ec9cd926ff463d64630ada179622fbe55c98b4556a6c61b03909814 SHA512 a05ca9cc7c5b76e562f4e4c015f375333caff8a99ca712e4f64a2b01e649be734a0f216000c1e2bc9d2183d104c722785f69e1e7bc6f6af4113b582576b0d9e4
+MISC metadata.xml 313 BLAKE2B 5adae23844d519f05c3290eed3df91d78b96692449a28710edf70dd423c17e79b3f87df98c38769f619fff6334527d0d93332afe4063720819a01b4d2923f017 SHA512 352f5ed232f1b73b569c9b6a2615117b943994684b0f66e49b6255eb29b7717caca435d95488462bcd59dbfdc77b1b0562eef28bbb8b46c50c8498ab64a6e06a
diff --git a/dev-java/sablecc-anttask/metadata.xml b/dev-java/sablecc-anttask/metadata.xml
new file mode 100644
index 000000000000..273d81b33501
--- /dev/null
+++ b/dev-java/sablecc-anttask/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sablecc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r2.ebuild b/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..03cd8bbc11cf
--- /dev/null
+++ b/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Ant task for sablecc"
+HOMEPAGE="http://sablecc.org/"
+SRC_URI="mirror://sourceforge/sablecc/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-ant-task
+}
diff --git a/dev-java/sablecc/Manifest b/dev-java/sablecc/Manifest
new file mode 100644
index 000000000000..214cf0e17525
--- /dev/null
+++ b/dev-java/sablecc/Manifest
@@ -0,0 +1,3 @@
+DIST sablecc-3.7.tar.gz 556985 BLAKE2B 8acc8f74f640d66b2e420562f3d93f91e78edf98d30d88c5189bf023099fc44e0dcd18bae2e0692d768ba5c9ceaddd4e8f8dd94cbbce86acc6554991549039a2 SHA512 c53212ae10afc546796a46b8f1d731d3337c1fe184f12a285686b1f876b207a6cddcd789876d5c9d6b378583065bbb8ca7b5c3797d88b4eea3609ffe9a9c8f71
+EBUILD sablecc-3.7-r1.ebuild 685 BLAKE2B d639c1f14d384353acafc73edcd9d424dca4d9db04f42f10be313ac0dcb3b06c99081c5e054138396756d0c01154f7e572db800fdc5aa91eff51e1eac776a0c9 SHA512 f1d215525598e7800b2d8900cf07514ec39a8d68fcc28415adb24091a10e5283ba0d771613fcb43d8df145c084fa3e73fcbc97733f2df297d90e40b2c5f36a41
+MISC metadata.xml 313 BLAKE2B 5adae23844d519f05c3290eed3df91d78b96692449a28710edf70dd423c17e79b3f87df98c38769f619fff6334527d0d93332afe4063720819a01b4d2923f017 SHA512 352f5ed232f1b73b569c9b6a2615117b943994684b0f66e49b6255eb29b7717caca435d95488462bcd59dbfdc77b1b0562eef28bbb8b46c50c8498ab64a6e06a
diff --git a/dev-java/sablecc/metadata.xml b/dev-java/sablecc/metadata.xml
new file mode 100644
index 000000000000..273d81b33501
--- /dev/null
+++ b/dev-java/sablecc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sablecc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/sablecc/sablecc-3.7-r1.ebuild b/dev-java/sablecc/sablecc-3.7-r1.ebuild
new file mode 100644
index 000000000000..861695b504eb
--- /dev/null
+++ b/dev-java/sablecc/sablecc-3.7-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java based compiler / parser generator"
+HOMEPAGE="http://www.sablecc.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher "${PN}" --main org.sablecc.sablecc.SableCC
+	dodoc AUTHORS THANKS
+	dohtml README.html
+}
diff --git a/dev-java/sac-1.3-r2 b/dev-java/sac-1.3-r2
deleted file mode 100644
index e7523af7af95..000000000000
--- a/dev-java/sac-1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=SAC is a standard interface for CSS parser
-EAPI=5
-HOMEPAGE=http://www.w3.org/Style/CSS/SAC/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=W3C
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.w3.org/2002/06/sacjava-1.3.zip -> sac-1.3.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=339d2921a57cc787069b75baf5970368
diff --git a/dev-java/sac-1.3-r3 b/dev-java/sac-1.3-r3
deleted file mode 100644
index e9dabe7eead7..000000000000
--- a/dev-java/sac-1.3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=SAC is a standard interface for CSS parser
-EAPI=6
-HOMEPAGE=http://www.w3.org/Style/CSS/SAC/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=W3C
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.w3.org/2002/06/sacjava-1.3.zip -> sac-1.3.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fda018b2b72348d1608ea8d0358d2dfb
diff --git a/dev-java/sac/Manifest b/dev-java/sac/Manifest
new file mode 100644
index 000000000000..b1bba814e8dc
--- /dev/null
+++ b/dev-java/sac/Manifest
@@ -0,0 +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/metadata.xml b/dev-java/sac/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/sac/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/sac/sac-1.3-r2.ebuild b/dev-java/sac/sac-1.3-r2.ebuild
new file mode 100644
index 000000000000..919b79855870
--- /dev/null
+++ b/dev-java/sac/sac-1.3-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="org"
+
+java_prepare() {
+	java-pkg_clean
+}
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
+}
diff --git a/dev-java/sat4j-core-2.2.0 b/dev-java/sat4j-core-2.2.0
deleted file mode 100644
index da0797257041..000000000000
--- a/dev-java/sat4j-core-2.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight constraint programming with a SAT solver
-EAPI=2
-HOMEPAGE=http://www.sat4j.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-core-v20100623.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-core-2.2.0-build.xml
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3576990347e79a7b53889e7fe421f883
diff --git a/dev-java/sat4j-core-2.3.1-r1 b/dev-java/sat4j-core-2.3.1-r1
deleted file mode 100644
index 51a29e794ea7..000000000000
--- a/dev-java/sat4j-core-2.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight constraint programming with a SAT solver
-EAPI=2
-HOMEPAGE=http://www.sat4j.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.3
-SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-core-v20111030.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-core-2.3.1-build.xml
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=49f89a7b92d9725552b80396091ff817
diff --git a/dev-java/sat4j-core/Manifest b/dev-java/sat4j-core/Manifest
new file mode 100644
index 000000000000..72830a7867ed
--- /dev/null
+++ b/dev-java/sat4j-core/Manifest
@@ -0,0 +1,7 @@
+DIST sat4j-core-2.2.0-build.xml 9458 BLAKE2B e23879fb3e85a8f96313e4e6eba48e785b5940f32e0f3195fcc6d8ce5c89156694e24c3afa065e39b2c72044acf21cf6d8c50a2385494187a84da79893f3ebab SHA512 ab09e0773adaf578e87503373b6156d42430270472c07159ad8246ae6c2f20c02447776c1b925fb0d4eaeed6dd3f7c3b0f36a5a410f0e22d2594b9b4deeb4d7a
+DIST sat4j-core-2.3.1-build.xml 9458 BLAKE2B e23879fb3e85a8f96313e4e6eba48e785b5940f32e0f3195fcc6d8ce5c89156694e24c3afa065e39b2c72044acf21cf6d8c50a2385494187a84da79893f3ebab SHA512 ab09e0773adaf578e87503373b6156d42430270472c07159ad8246ae6c2f20c02447776c1b925fb0d4eaeed6dd3f7c3b0f36a5a410f0e22d2594b9b4deeb4d7a
+DIST sat4j-core-v20100623.zip 383901 BLAKE2B eb24cf0eed64da1d86243339644ab031e8ceceb37d6379ec5cc88e983099fb1451a55f1ffff88219eba786f015d7df3dc40284214675a0388371d6f878d3f317 SHA512 60020df4cb07a1498c3e77463b9f940a65de98de995d9f3cc0308133e264d891de4d835bf4dd28c09da34b758e4edf4a28b661805ab85028a4cb6a519e128276
+DIST sat4j-core-v20111030.zip 443396 BLAKE2B a3940480f41fc43707d5d348db30c56488deef8a7b45a1d44b6e5e84c807f41a472da5c2a15bad08c0392db2f772fc433188ea9040033fa3e6cb6b103e4a8ce5 SHA512 bb54221f70b99fb32786e37b6ab58e78cb353d8b614b76c7ef8898d0f0b2ec94f800e13f58712f994644cef24bcdc30a8ee76a513ca01db94ddb9fbff06e1550
+EBUILD sat4j-core-2.2.0.ebuild 1385 BLAKE2B fa6bc9d54618d3fae13bcd80ec2503a3709a5a4f266312d7447e94d78a443af878ccd2db37181b188ac47fd1f74c903f405ff6d554d72898466c0f2094ad3369 SHA512 36ae4e71af98bad416020af6bbfa9eb42341271a2498890788323f44cc4ed3c00c82867ee558d9b945e828269d73ca7245fa1bdff53a8bc1ce997483f8f56c48
+EBUILD sat4j-core-2.3.1-r1.ebuild 1387 BLAKE2B 986501c6dd042fe8da6c4c2c35e70d9db9cead1b0850ccbb9952b680394ecbe78b38bcc56c8cccd4e859c9df10520470504c3ce0e9083e79061654194df957eb SHA512 0ac619c5b750b8e33872cc83756be62e7c160cb1886e578bf4e683e6bb217678149bb6aa75041baef5e92d2e145152d5569de77d0449138beb1e675cf1b7dab9
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sat4j-core/metadata.xml b/dev-java/sat4j-core/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/sat4j-core/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/sat4j-core/sat4j-core-2.2.0.ebuild b/dev-java/sat4j-core/sat4j-core-2.2.0.ebuild
new file mode 100644
index 000000000000..2f749da534ce
--- /dev/null
+++ b/dev-java/sat4j-core/sat4j-core-2.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+MY_PN="org.${PN//-/.}"
+MY_PV="20100623"
+BUILD_PV="2.4"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight constraint programming with a SAT solver"
+HOMEPAGE="http://www.sat4j.org/"
+SRC_URI="http://download.forge.objectweb.org/sat4j/${PN}-v${MY_PV}.zip
+	http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${PN}-v${MY_PV}.zip
+}
+
+java_prepare() {
+	mkdir -p core/{lib,src} || die
+
+	# Don't complain about missing javadoc stylesheet.
+	touch core/lib/stylesheet.css
+
+	# Grab build.xml. Don't fetch from CVS. Version file is gone.
+	sed -e 's/depends="prepare,getsource"/depends="prepare"/g' \
+		-e '/<replace/d' \
+		"${DISTDIR}/${P}-build.xml" > build.xml || die
+
+	# Unpack manifest.
+	cd core || die
+	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
+
+	# Unpack sources.
+	cd src || die
+	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
+}
+
+EANT_BUILD_TARGET="core"
+EANT_DOC_TARGET="javadoc -Dmodule=core -Dlib=core/lib"
+
+src_install() {
+	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
+	use doc && java-pkg_dojavadoc api/core
+	use source && java-pkg_dosrc core/src/org
+}
diff --git a/dev-java/sat4j-core/sat4j-core-2.3.1-r1.ebuild b/dev-java/sat4j-core/sat4j-core-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..13a3083381cb
--- /dev/null
+++ b/dev-java/sat4j-core/sat4j-core-2.3.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+MY_PN="org.${PN//-/.}"
+MY_PV="20111030"
+BUILD_PV="2.4"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight constraint programming with a SAT solver"
+HOMEPAGE="http://www.sat4j.org/"
+SRC_URI="http://download.forge.objectweb.org/sat4j/${PN}-v${MY_PV}.zip
+	http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
+LICENSE="LGPL-2.1"
+SLOT="2.3"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${PN}-v${MY_PV}.zip
+}
+
+java_prepare() {
+	mkdir -p core/{lib,src} || die
+
+	# Don't complain about missing javadoc stylesheet.
+	touch core/lib/stylesheet.css
+
+	# Grab build.xml. Don't fetch from CVS. Version file is gone.
+	sed -e 's/depends="prepare,getsource"/depends="prepare"/g' \
+		-e '/<replace/d' \
+		"${DISTDIR}/${P}-build.xml" > build.xml || die
+
+	# Unpack manifest.
+	cd core || die
+	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
+
+	# Unpack sources.
+	cd src || die
+	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
+}
+
+EANT_BUILD_TARGET="core"
+EANT_DOC_TARGET="javadoc -Dmodule=core -Dlib=core/lib"
+
+src_install() {
+	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
+	use doc && java-pkg_dojavadoc api/core
+	use source && java-pkg_dosrc core/src/org
+}
diff --git a/dev-java/sat4j-pseudo-2.2.0 b/dev-java/sat4j-pseudo-2.2.0
deleted file mode 100644
index ae5a8fd19e08..000000000000
--- a/dev-java/sat4j-pseudo-2.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/sat4j-core:2 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Pseudo Boolean solvers
-EAPI=2
-HOMEPAGE=http://www.sat4j.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/sat4j-core:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-pb-v20100623.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-pseudo-2.2.0-build.xml
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8e785ba116eb746157dc52e2cd1c3497
diff --git a/dev-java/sat4j-pseudo-2.3.1 b/dev-java/sat4j-pseudo-2.3.1
deleted file mode 100644
index ca2deb583347..000000000000
--- a/dev-java/sat4j-pseudo-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/sat4j-core:2.3 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Pseudo Boolean solvers
-EAPI=2
-HOMEPAGE=http://www.sat4j.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/sat4j-core:2.3 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.3
-SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-pb-v20111030.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-pseudo-2.3.1-build.xml
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=14adaf21bade1a789bc42ea78c6accf9
diff --git a/dev-java/sat4j-pseudo/Manifest b/dev-java/sat4j-pseudo/Manifest
new file mode 100644
index 000000000000..656ce73be86e
--- /dev/null
+++ b/dev-java/sat4j-pseudo/Manifest
@@ -0,0 +1,7 @@
+DIST sat4j-pb-v20100623.zip 487925 BLAKE2B 512dbef4f9362a65eac2173a2ea8a92fdaf62bc1d4e001cdf741bfc91c9f7900397992373937c6358a6cf7f5395905f16bed2f21ee8a41eeac56f2d582b3055a SHA512 6aba2438070a3060fc26229fee1e30f8cfd37f2699c2ba28c4b7071fde2ad9be6ad22138b0e6beb7409b7eb57d3c44733c440ba2cf0ea36c7ea068e411a1a2e8
+DIST sat4j-pb-v20111030.zip 650535 BLAKE2B 8f1447cd280f05286bab193e94fa786c306c27d83c1c34ec5f257f6d95e72c8202aeb8e10c856785dab9706d17db4723db2a618e727dfcb887994ccea628b4fe SHA512 ee27501e8c4efb3cf960278fdca0111442e14edcf303ffb9adea2c0e6b5dc7dce2df0304ea1aa05a1b00000478f9283230c7594325195be557a7bb459250fd9a
+DIST sat4j-pseudo-2.2.0-build.xml 9458 BLAKE2B e23879fb3e85a8f96313e4e6eba48e785b5940f32e0f3195fcc6d8ce5c89156694e24c3afa065e39b2c72044acf21cf6d8c50a2385494187a84da79893f3ebab SHA512 ab09e0773adaf578e87503373b6156d42430270472c07159ad8246ae6c2f20c02447776c1b925fb0d4eaeed6dd3f7c3b0f36a5a410f0e22d2594b9b4deeb4d7a
+DIST sat4j-pseudo-2.3.1-build.xml 9458 BLAKE2B e23879fb3e85a8f96313e4e6eba48e785b5940f32e0f3195fcc6d8ce5c89156694e24c3afa065e39b2c72044acf21cf6d8c50a2385494187a84da79893f3ebab SHA512 ab09e0773adaf578e87503373b6156d42430270472c07159ad8246ae6c2f20c02447776c1b925fb0d4eaeed6dd3f7c3b0f36a5a410f0e22d2594b9b4deeb4d7a
+EBUILD sat4j-pseudo-2.2.0.ebuild 1594 BLAKE2B dc6b5a36ceef190a03a9555a58077dea1136c4efc8e849c1d9a0ec19eefdf190e07a54c8473c6b92b56814eccd7e583a9a35a5f94373e0c83dfa0cdebc818882 SHA512 73cf62efcedbddc0b1d6972d7a02773c56dd07dfc2cfecc908ba017c78e6ea3b561c152c2da0ec271f6440c1174c8da6d7e0aad052eaf4789c578fd63abef199
+EBUILD sat4j-pseudo-2.3.1.ebuild 1602 BLAKE2B 4cdb1a591415931b1bf796b32e4fb0b1388af92664447cb11d00ee8ea395c9301ff2a4c1fc99e5210033d49017ef2466377b67e45531cede1511ca428c6d55d1 SHA512 e8b614d0f90ed58492743a11b1843de6c6baa72120cff41ea055b41c186d400fe5ea6ed5c169e564dba952f2636aa1e5835fa6c3558bd1c8e28c4e243e72e2e2
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sat4j-pseudo/metadata.xml b/dev-java/sat4j-pseudo/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/sat4j-pseudo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/sat4j-pseudo/sat4j-pseudo-2.2.0.ebuild b/dev-java/sat4j-pseudo/sat4j-pseudo-2.2.0.ebuild
new file mode 100644
index 000000000000..b8b5bfbf3d9b
--- /dev/null
+++ b/dev-java/sat4j-pseudo/sat4j-pseudo-2.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+MY_PN="org.sat4j.pb"
+MY_PV="20100623"
+BUILD_PV="2.4"
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Pseudo Boolean solvers"
+HOMEPAGE="http://www.sat4j.org/"
+SRC_URI="http://download.forge.objectweb.org/sat4j/sat4j-pb-v${MY_PV}.zip
+	http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/sat4j-core:2"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack sat4j-pb-v${MY_PV}.zip
+}
+
+java_prepare() {
+	mkdir -p {core,pb}/{lib,src} || die
+
+	# Don't complain about missing javadoc stylesheet.
+	touch core/lib/stylesheet.css
+
+	# Grab build.xml. Don't fetch from CVS. Don't build core.
+	sed -e 's/depends="core"//g' \
+		-e 's/depends="prepare,getsource"/depends="prepare"/g' \
+		"${DISTDIR}/${P}-build.xml" > build.xml || die
+
+	# This is the version identifier used for custom builds.
+	echo 'CUSTOM' > core/src/sat4j.version || die
+
+	# Unpack manifest.
+	cd pb || die
+	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
+
+	# Unpack sources.
+	cd src || die
+	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="pseudo"
+EANT_GENTOO_CLASSPATH="sat4j-core-2"
+EANT_DOC_TARGET="javadoc -Dmodule=pb -Dlib=pb/lib"
+
+src_install() {
+	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
+	use doc && java-pkg_dojavadoc api/pb
+	use source && java-pkg_dosrc pb/src/org
+}
diff --git a/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.1.ebuild b/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.1.ebuild
new file mode 100644
index 000000000000..d405ae412f17
--- /dev/null
+++ b/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+MY_PN="org.sat4j.pb"
+MY_PV="20111030"
+BUILD_PV="2.4"
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Pseudo Boolean solvers"
+HOMEPAGE="http://www.sat4j.org/"
+SRC_URI="http://download.forge.objectweb.org/sat4j/sat4j-pb-v${MY_PV}.zip
+	http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
+LICENSE="LGPL-2.1"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/sat4j-core:2.3"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack sat4j-pb-v${MY_PV}.zip
+}
+
+java_prepare() {
+	mkdir -p {core,pb}/{lib,src} || die
+
+	# Don't complain about missing javadoc stylesheet.
+	touch core/lib/stylesheet.css
+
+	# Grab build.xml. Don't fetch from CVS. Don't build core.
+	sed -e 's/depends="core"//g' \
+		-e 's/depends="prepare,getsource"/depends="prepare"/g' \
+		"${DISTDIR}/${P}-build.xml" > build.xml || die
+
+	# This is the version identifier used for custom builds.
+	echo 'CUSTOM' > core/src/sat4j.version || die
+
+	# Unpack manifest.
+	cd pb || die
+	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
+
+	# Unpack sources.
+	cd src || die
+	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="pseudo"
+EANT_GENTOO_CLASSPATH="sat4j-core-2.3"
+EANT_DOC_TARGET="javadoc -Dmodule=pb -Dlib=pb/lib"
+
+src_install() {
+	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
+	use doc && java-pkg_dojavadoc api/pb
+	use source && java-pkg_dosrc pb/src/org
+}
diff --git a/dev-java/sax-2.2.1-r3 b/dev-java/sax-2.2.1-r3
deleted file mode 100644
index 77aa97826297..000000000000
--- a/dev-java/sax-2.2.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=SAX: Simple API for XML in Java
-EAPI=5
-HOMEPAGE=http://sax.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/sax/sax2r3.zip -> sax-2.2.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=91a19cc2f0f369662ad1a2a3736a9256
diff --git a/dev-java/sax-2.2.1-r4 b/dev-java/sax-2.2.1-r4
deleted file mode 100644
index 2b8a430bfb1e..000000000000
--- a/dev-java/sax-2.2.1-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=SAX: Simple API for XML in Java
-EAPI=6
-HOMEPAGE=http://sax.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/sax/sax2r3.zip -> sax-2.2.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7f4fd34397b85f272754ab2ad71092d4
diff --git a/dev-java/sax/Manifest b/dev-java/sax/Manifest
new file mode 100644
index 000000000000..34219d7aef4a
--- /dev/null
+++ b/dev-java/sax/Manifest
@@ -0,0 +1,4 @@
+DIST sax-2.2.1.zip 372488 BLAKE2B 27813712e81c8a42f746ac5d84f381f7d5d30b6e11988624a01616632b742ac90f834574c7c1288385b3d6720cd2f3ee0eb9df1644e7cca5eae813ef8a2f9f45 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648
+EBUILD sax-2.2.1-r3.ebuild 644 BLAKE2B a319b42284cddd4093a586e863c5ef05bc8b89cf9628e6679afd292b27cc6265604a5d8b62dbb9fc7bfff534f7d8ab273409f7d11b95ce67cf4f29ba3a2c4605 SHA512 f918377b9711a65b4fc89ca26d7c3910e2e1afc273d884b42ec1ec56da9acf5696a05e1920fd5a50ea8c3a74703c3d900fe3d5876bfd9d493da508ca69027a50
+EBUILD sax-2.2.1-r4.ebuild 687 BLAKE2B bbeaaebeb5e58de9ff876edb2d492c9cc90c16713b684735c5693f6719d58a36eccd4dda48cbd1751c5386f366c070e2b009bad43b7d67bac7526d0d398d977c SHA512 606d0e86d54844c9204e53a9b24e17901801db84924a18f23b053a5747ad8fd612f3b567c6cb9eadade3de0f0119bd64915d308e95e196d05123c495b9ef4e61
+MISC metadata.xml 309 BLAKE2B 9e480b093da836218b9c3c52bf91b2ac8a1c89bb750a485d662b018f18481984b850f8ed139c9f8b34677fa67e890f35af4e3009b93e92fc87e27c56fed9fca2 SHA512 f1412e1a93a748dd318a3238af4f0438d9b84762586bde5c3071e73fa0fd247e45f2e398e07f290059b487ea20866247f1df42a897b99e0001d52015d355db76
diff --git a/dev-java/sax/metadata.xml b/dev-java/sax/metadata.xml
new file mode 100644
index 000000000000..1837ffd81b78
--- /dev/null
+++ b/dev-java/sax/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sax</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/sax/sax-2.2.1-r3.ebuild b/dev-java/sax/sax-2.2.1-r3.ebuild
new file mode 100644
index 000000000000..e375b5c14a0c
--- /dev/null
+++ b/dev-java/sax/sax-2.2.1-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+MY_PN="sax2r3"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SAX: Simple API for XML in Java"
+HOMEPAGE="http://sax.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip"
+LICENSE="public-domain"
+
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/sax2r3"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ChangeLog CHANGES README
+}
diff --git a/dev-java/sax/sax-2.2.1-r4.ebuild b/dev-java/sax/sax-2.2.1-r4.ebuild
new file mode 100644
index 000000000000..52e3fe5c5d4c
--- /dev/null
+++ b/dev-java/sax/sax-2.2.1-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+MY_PN="sax2r3"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SAX: Simple API for XML in Java"
+HOMEPAGE="http://sax.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip"
+LICENSE="public-domain"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/sax2r3"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ChangeLog CHANGES README
+}
diff --git a/dev-java/saxon-6.5.5-r2 b/dev-java/saxon-6.5.5-r2
deleted file mode 100644
index 3fa277a8ad14..000000000000
--- a/dev-java/saxon-6.5.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=dev-java/jdom:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Set of tools for processing XML documents
-EAPI=6
-HOMEPAGE=http://saxon.sourceforge.net/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MPL-1.1
-RDEPEND=dev-java/jdom:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=6.5
-SRC_URI=mirror://sourceforge/saxon/saxon6-5-5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=48803469d024c8ce2d31a9b8f6cec124
diff --git a/dev-java/saxon-9.2.0.6-r2 b/dev-java/saxon-9.2.0.6-r2
deleted file mode 100644
index 84a1a7d20884..000000000000
--- a/dev-java/saxon-9.2.0.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A XSLT and XQuery Processor
-EAPI=6
-HOMEPAGE=http://saxon.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=MPL-1.0
-RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=9
-SRC_URI=mirror://sourceforge/saxon/saxonhe9-2-0-6source.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=aa4276c18bfdeea7034ac9954edb2bd6
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
new file mode 100644
index 000000000000..aecca257cda8
--- /dev/null
+++ b/dev-java/saxon/Manifest
@@ -0,0 +1,7 @@
+AUX 9.2-build.xml 2061 BLAKE2B fb4e505f9308caf2300b7a1159ff20a973576d974544b1be0b42b71566f8207af7ae48710522c4627bd4879ecfdf14f9f9b983802e6c98c4d1f00cdbc6a363e9 SHA512 9e7c02427041df22a7a5eddc6d9e709635493d079efaba66a9da6320af961d933176105028f8a96fef8f84599724829d582ff64d061d70364f048ed39308e67c
+AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13a97b2994496dd80e1c4e3cac893b35f813bccf4e0a877c7c3f1a6c5c12a9c6005b82efb2c42a70a49e93dc SHA512 2c95fc288bb35f68819edc95e8ce30f921b17196123ee7ce0c9908d210e8758c51204bc7dd222d6b7e4803dceb331bcd83120622fa2bcb6587d150a0f479ca02
+DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a
+DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
+EBUILD saxon-6.5.5-r2.ebuild 867 BLAKE2B a5879fbeb51e113e05dfbfe4dff8088e26621278c76f83cde4b47b6744cf83e9fb94fd25f661f25e57a3f8a5d513d903f3808dfb6fb6ba79d6e450cbccb03b5a SHA512 a8a6978c47998380b6c7ec09f7102584007aedd829cd95d0ff629d2df9062c5eb46ceecff88b2bb0fa575907810fb21fa14dc1253ff0da3f9962687935f53df1
+EBUILD saxon-9.2.0.6-r2.ebuild 1965 BLAKE2B a6fc49263e9322f3172a97a85721c614157449f3f9582ac9a74a5649c28078fda0588bd4ae3dea4367aae8f7b06eba69b64dcd13bac690303088755ba8298eef SHA512 204c2924bf4a4e9610a8b3e1377c47185129d92f714358df1f41c8a5191b15f9d86e74ac32af3c36232b411e1273ba870b74da464d5b76efeb1d3df941e07b9c
+MISC metadata.xml 311 BLAKE2B fdce161da5c8394b66ee6b1bcebbccd863cd5e70291afab04400c4d806afc955f803b5c5aa15601157f2784e434baf505dcbebdbff9817fe960961f8108d3b63 SHA512 2fc12b71b9e977a095610f8f784f19252d44e31442cc5d5ce513f601a2394f4bf491fc9065de88bbf45afe7b8f1ca33ea907e31aa26875f48846856f1bf51126
diff --git a/dev-java/saxon/files/9.2-build.xml b/dev-java/saxon/files/9.2-build.xml
new file mode 100644
index 000000000000..3bd9a64d4fe5
--- /dev/null
+++ b/dev-java/saxon/files/9.2-build.xml
@@ -0,0 +1,72 @@
+<!-- simple generic build file -->
+
+<project name="saxon" default="all" basedir=".">
+
+  <!-- Properties -->
+
+  <property name="name" value="saxon"/>
+  <property name="src" value="src"/>
+  <property name="build" value="build"/>
+  <property name="build.classes" value="${build}/classes"/>
+  <property name="build.doc" value="${build}/api"/>
+  <property name="build.lib" value="${build}/lib"/>
+  <property name="j2se.javadoc" value="http://java.sun.com/javase/@JDK@/docs/api"/>
+  <property name="jdom.javadoc" value="/usr/share/jdom-@JDOM@/api"/>
+
+  <!-- Targets -->
+
+  <!-- Prepare build directories -->
+  <target name="prepare">
+    <mkdir dir="${src}"/>
+    <mkdir dir="${build}"/>
+    <mkdir dir="${build.classes}"/>
+    <mkdir dir="${build.lib}"/>
+    <mkdir dir="${build.doc}"/>
+    <copy todir="${src}">
+      <fileset dir="." includes="com/**,org/**,net/**"/>
+    </copy>
+  </target>
+
+  <!-- Kill all the created directories -->
+  <target name="clean">
+    <delete dir="${build}"/>
+    <delete dir="${src}"/>
+  </target>
+
+  <!-- Build classes -->
+  <target name="classes" depends="prepare">
+    <javac srcdir="${src}" destdir="${build.classes}" encoding="ISO-8859-1"/>
+  </target>
+
+  <!-- Build jar archives -->
+
+  <target name="jar" depends="classes">
+    <jar jarfile="${build.lib}/${name}.jar"
+         basedir="${build.classes}">
+      <manifest>
+        <attribute name="Main-Class" value="net.sf.saxon.Transform"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <!-- Build the full JavaDocs -->
+  <target name="javadoc" depends="prepare">
+    <javadoc sourcepath="${src}"
+            destdir="${build.doc}"
+            doctitle="${name} JavaDoc"
+            windowtitle="${name} JavaDoc"
+            package="true"
+            author="true"
+            version="true"
+            packagenames="net.sf.saxon.*,org.w3c.xsl.*"
+            encoding="ISO-8859-1"
+      >
+      <link href="${j2se.javadoc}"/>
+      <link href="${jdom.javadoc}"/>
+    </javadoc>
+  </target>
+
+  <!-- Build everything -->
+  <target name="all" depends="jar,javadoc"/>
+
+</project>
diff --git a/dev-java/saxon/files/9.2-edition.properties b/dev-java/saxon/files/9.2-edition.properties
new file mode 100644
index 000000000000..bb5acee0b19c
--- /dev/null
+++ b/dev-java/saxon/files/9.2-edition.properties
@@ -0,0 +1,2 @@
+config=net.sf.saxon.Configuration
+platform=net.sf.saxon.java.JavaPlatform
diff --git a/dev-java/saxon/metadata.xml b/dev-java/saxon/metadata.xml
new file mode 100644
index 000000000000..d11a296ea609
--- /dev/null
+++ b/dev-java/saxon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">saxon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/saxon/saxon-6.5.5-r2.ebuild b/dev-java/saxon/saxon-6.5.5-r2.ebuild
new file mode 100644
index 000000000000..6ea74c425702
--- /dev/null
+++ b/dev-java/saxon/saxon-6.5.5-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple versionator
+
+MY_P="${PN}$(replace_all_version_separators -)"
+
+DESCRIPTION="Set of tools for processing XML documents"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+HOMEPAGE="http://saxon.sourceforge.net/"
+
+LICENSE="MPL-1.1"
+SLOT="6.5"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/jdom:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="jdom"
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="src"
+
+src_unpack() {
+	unpack ${A}
+	unzip -qq source.zip -d src || die "failed to unpack"
+}
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples samples
+}
diff --git a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
new file mode 100644
index 000000000000..d538db728ef6
--- /dev/null
+++ b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PV="$(replace_all_version_separators -)"
+
+DESCRIPTION="A XSLT and XQuery Processor"
+HOMEPAGE="http://saxon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}he${MY_PV}source.zip"
+
+LICENSE="MPL-1.0"
+SLOT="9"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+
+CDEPEND="
+	dev-java/xom:0
+	dev-java/jdom:0
+	dev-java/dom4j:1
+	dev-java/ant-core"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}"
+
+# prepare eclass variables
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+
+src_prepare() {
+	default
+
+	# Fedora-inspired removal.
+
+	# deadNET.
+	rm -rv net/sf/saxon/dotnet || die
+
+	# Depends on XQJ (javax.xml.xquery).
+	rm -rv net/sf/saxon/xqj || die
+
+	# This requires a EE edition feature (com.saxonica.xsltextn).
+	rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die
+
+	# <major>.<minor> version
+	local version="$(get_version_component_range 1-2)"
+
+	# generate build.xml with external javadoc links
+	sed -e "s:@JDK@:1.6:" \
+		-e "s:@JDOM@:1:" \
+		< "${FILESDIR}/${version}-build.xml" \
+		> "${S}/build.xml" \
+		|| die "build.xml generation failed!"
+
+	# prepare creates the dir for properties
+	eant prepare
+
+	# properties
+	cp -v \
+		"${FILESDIR}/${version}-edition.properties" \
+		"${S}/build/classes/edition.properties" || die
+}
+
+src_compile() {
+	local gcp="$(java-pkg_getjars dom4j-1,jdom,xom)"
+	gcp="${gcp}:$(java-pkg_getjars --build-only ant-core)"
+	eant -Dgentoo.classpath="${gcp}" jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform
+	java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query
+
+	java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc build/api
+
+	use source && java-pkg_dosrc src
+}
diff --git a/dev-java/saxpath-1.0-r3 b/dev-java/saxpath-1.0-r3
deleted file mode 100644
index 217bcc71d9ac..000000000000
--- a/dev-java/saxpath-1.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java XPath API
-EAPI=6
-HOMEPAGE=https://saxpath.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=JDOM
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS-sources.jar -> saxpath-1.0.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=024f83d67e4ba4404f766a561ff4b328
diff --git a/dev-java/saxpath/Manifest b/dev-java/saxpath/Manifest
new file mode 100644
index 000000000000..09a9279cc730
--- /dev/null
+++ b/dev-java/saxpath/Manifest
@@ -0,0 +1,3 @@
+DIST saxpath-1.0.jar 36257 BLAKE2B 0b6b2c943b3b472a01109c6f6b25d8e54b5afff7c44f980f4741ccb3bb689520e5e6e49fb17e918f35212fceb69e5aa551469fb923675b9287733799134bb967 SHA512 53e7781ea3efc1e16a839c9137fe7ab683e7a9e40283f0f5aa7afc1de75c4dc366a91a93ae5f256fc24e78fd3a4dcdcde6631bfa0d926b7dd0ddacd5c240ca96
+EBUILD saxpath-1.0-r3.ebuild 546 BLAKE2B da8def73140f1874856d1d95230813242d5a9caa0302b36e2800f4c140b21121f62bb65dc2d7a4affd84083e8ca070bfc127162eaaae7aef7f5d12af099613c1 SHA512 4561ede9c05653579428d64e2ca48ed7eef54c0a599c5dc37885b34d36a4c351becf9ad2ebfb411213356deeba17a94d4eac303f571b34acd5b13fda1bfc3564
+MISC metadata.xml 313 BLAKE2B f4d1330a2165d9293cfec36e9cd98feba4526f4b0c47694a4966aeff6cdc4d9b5021279081ed88e8b1039f04678497a7fa78aef18a86e341917a3366ecd22367 SHA512 bab31add81d5d0086ccb56af2b48076f31966c1cf671e0ab42eb055c6a28d20840f5693c2370fc03fa5768dbe95903ec18e9b0c07df357fa51a3e54da52bc835
diff --git a/dev-java/saxpath/metadata.xml b/dev-java/saxpath/metadata.xml
new file mode 100644
index 000000000000..cfd90c9bf25d
--- /dev/null
+++ b/dev-java/saxpath/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">saxpath</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/saxpath/saxpath-1.0-r3.ebuild b/dev-java/saxpath/saxpath-1.0-r3.ebuild
new file mode 100644
index 000000000000..283ee8807ff4
--- /dev/null
+++ b/dev-java/saxpath/saxpath-1.0-r3.ebuild
@@ -0,0 +1,19 @@
+# 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="Java XPath API"
+HOMEPAGE="https://saxpath.sourceforge.net"
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}-FCS/${P}-FCS-sources.jar -> ${P}.jar"
+
+LICENSE="JDOM"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/sblim-cim-client-2.2.1 b/dev-java/sblim-cim-client-2.2.1
deleted file mode 100644
index 5c03de83d955..000000000000
--- a/dev-java/sblim-cim-client-2.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A WBEM services client that includes an SLP client for CIM service discovery
-EAPI=5
-HOMEPAGE=http://sblim.wiki.sourceforge.net/CimClient
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=af75cdcd6f23c8bff48c95cb0b2defc9
diff --git a/dev-java/sblim-cim-client-2.2.1-r1 b/dev-java/sblim-cim-client-2.2.1-r1
deleted file mode 100644
index c6ee07714390..000000000000
--- a/dev-java/sblim-cim-client-2.2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A WBEM services client that includes an SLP client for CIM service discovery
-EAPI=5
-HOMEPAGE=http://sblim.wiki.sourceforge.net/CimClient
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9364d446f7c2067d58685825a2fb1f10
diff --git a/dev-java/sblim-cim-client/Manifest b/dev-java/sblim-cim-client/Manifest
new file mode 100644
index 000000000000..7b8f1da70802
--- /dev/null
+++ b/dev-java/sblim-cim-client/Manifest
@@ -0,0 +1,5 @@
+AUX 2.2.1-no-network-tests.patch 2189 BLAKE2B 279e37abe9d43333099ed671a4652283f125d1aba243beaa236e430cfb3b3996ca3b9815477347d747e834de2393f16b26e7ed2c3d980af0e8b631831dba9b60 SHA512 bc3834d913d168c66a71d993d1673dfcac2c752860c08f74f13defd51cf73298675d357d503ae4af2064e158123e4f04b37ea4590bd16d859a91323112875160
+DIST sblim-cim-client2-2.2.1-src.zip 1082959 BLAKE2B 7750fc15e5f8da1f98496e99a5b5adacb89ac72782af88d8fb467c1071c2a4a736f2ab68a00bc381f91e20b756eb98ad96540bdd4836ba35ca2759cc2848277c SHA512 b7e1f56b87fa24c97d8b3e97261195ff04ce13839e72f4b8824daa8b9854158ba10c0bddd16e0650197125510d68adf6f4458089d132278510e10bd2b25b4aa7
+EBUILD sblim-cim-client-2.2.1-r1.ebuild 968 BLAKE2B 736eda2fb5b383e38ffbbf454bfa64b1ae518ae16667c0f53ffcf28b170d598562f21f52bfebc8d18c678beb17b1c3b97eea7b9c1e8a70eb64894f2ea52e30ac SHA512 619ea7d2d9c2b6bfdedf545a725d0974a01204a92c18e777cabdebc969a5ad197fe6c14a15f3e822421dfa699358578fdcde88b563f396a2f5a8cf4430314731
+EBUILD sblim-cim-client-2.2.1.ebuild 890 BLAKE2B eab501209ba82371ae0ac7f2ac646f513c06c8fa86a19dd03ea8b8f91de43cc1bde4a5084e64520d8b96e3e9c13fd67e423e3e8074f3e1173e6b2b03e9d94f65 SHA512 27a228fc5eeb7a2341d0abeb65124153c21377514949580835304b27fe636056dbe76df08110f8ba646e9303a6b898dea475d6f7f8cb45e5cc3b7bb790d0f9d7
+MISC metadata.xml 487 BLAKE2B 3ac468868caa94f00b2f06259b16cae8a263731bfe01cdad3b1bcaf701d32a7a7d78b06ad4a5986f63d1bbf75e7b5909e5ddbfb628740fc4b12dfe2e7775bd72 SHA512 502f8ff73e7b292c109c2529b6c5f638bef938275374f99ba2f9a54202225dbe456d1724217019c0ef85647ca90e61926502cca7084187059b4c3beb1ff21127
diff --git a/dev-java/sblim-cim-client/files/2.2.1-no-network-tests.patch b/dev-java/sblim-cim-client/files/2.2.1-no-network-tests.patch
new file mode 100644
index 000000000000..28d7ef2b9e52
--- /dev/null
+++ b/dev-java/sblim-cim-client/files/2.2.1-no-network-tests.patch
@@ -0,0 +1,41 @@
+diff --git a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.discovery.txt b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.discovery.txt
+index 5b0ce56..cf79a8b 100644
+--- a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.discovery.txt
++++ b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.discovery.txt
+@@ -1,3 +1,2 @@
+-discovery.DiscovererSLPTest

+ discovery.WBEMServiceAdvertisementSLPTest

+-discovery.AdvertisementCatalogTest
+\ No newline at end of file
++discovery.AdvertisementCatalogTest

+diff --git a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.slp.txt b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.slp.txt
+index 68eab35..1437e75 100644
+--- a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.slp.txt
++++ b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.slp.txt
+@@ -1,3 +1,2 @@
+-slp.SLPTest

+ slp.ServiceURLTest

+-! testcases.slp.internal.txt
+\ No newline at end of file
++! testcases.slp.internal.txt

+diff --git a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.txt b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.txt
+index 43da29d..26bb35f 100644
+--- a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.txt
++++ b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.txt
+@@ -5,8 +5,6 @@ cim.CIMVersionTest
+ ! testcases.discovery.txt

+ ! testcases.util.txt

+ ! testcases.wbem.txt

+-http.SSLConfigurationTest

+ cimxml.CimXmlSerializerTest

+-http.HttpClientTest

+ http.HttpHeaderTest

+ logging.LogAndTraceBrokerTest

+diff --git a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.util.txt b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.util.txt
+index 4b34dd4..f0e7431 100644
+--- a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.util.txt
++++ b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.util.txt
+@@ -1,3 +1,2 @@
+-util.WBEMConfigurationTest

+ util.XMLHostStrTest

+ util.BadDoubleStringsTest

diff --git a/dev-java/sblim-cim-client/metadata.xml b/dev-java/sblim-cim-client/metadata.xml
new file mode 100644
index 000000000000..2fca60503e43
--- /dev/null
+++ b/dev-java/sblim-cim-client/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		An implementation of a WBEM services client that includes an IETF RFC
+		2614 compliant SLP client for CIM service discovery.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">sblim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..952d9e55d464
--- /dev/null
+++ b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A WBEM services client that includes an SLP client for CIM service discovery"
+HOMEPAGE="http://sblim.wiki.sourceforge.net/CimClient"
+SRC_URI="mirror://sourceforge/sblim/${PN}2-${PV}-src.zip"
+
+LICENSE="CPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5
+	test? ( dev-java/ant-junit )"
+
+S="${WORKDIR}/${PN}2-${PV}-src"
+
+EANT_BUILD_TARGET="package"
+EANT_DOC_TARGET="java-doc"
+EANT_TEST_TARGET="unittest"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PV}-no-network-tests.patch
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "build/lib/${PN}2-${PV}.jar"
+
+	dodoc build/lib/*.properties
+	dodoc ChangeLog README NEWS
+
+	use doc && java-pkg_dojavadoc build/doc
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
new file mode 100644
index 000000000000..93c55739e841
--- /dev/null
+++ b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A WBEM services client that includes an SLP client for CIM service discovery"
+HOMEPAGE="http://sblim.wiki.sourceforge.net/CimClient"
+SRC_URI="mirror://sourceforge/sblim/${PN}2-${PV}-src.zip"
+
+LICENSE="CPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5
+	test? ( dev-java/ant-junit )"
+
+S="${WORKDIR}/${PN}2-${PV}-src"
+
+EANT_BUILD_TARGET="package"
+EANT_DOC_TARGET="java-doc"
+
+EANT_TEST_TARGET="unittest"
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "build/lib/${PN}2-${PV}.jar"
+
+	dodoc build/lib/*.properties
+	dodoc ChangeLog README NEWS
+
+	use doc && java-pkg_dojavadoc build/doc
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/sbt-0.13.13 b/dev-java/sbt-0.13.13
deleted file mode 100644
index 7798d30dd1e6..000000000000
--- a/dev-java/sbt-0.13.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8 >=dev-lang/scala-2.11.8:2.11 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=sbt is a build tool for Scala and Java projects that aims to do the basics well
-EAPI=6
-HOMEPAGE=https://www.scala-sbt.org/
-IUSE=binary elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8 >=dev-lang/scala-2.11.8:2.11 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=!binary? ( https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-src.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.13/sbt-launch.jar -> sbt-launch-0.13.13.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.13-gentoo-binary.tar.xz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=55c9409c4846aa33ad204c7a2f038b63
diff --git a/dev-java/sbt-bin-0.12.4 b/dev-java/sbt-bin-0.12.4
deleted file mode 100644
index b3931fbae472..000000000000
--- a/dev-java/sbt-bin-0.12.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=sbt, a build tool for Scala.
-EAPI=5
-HOMEPAGE=https://scala-sbt.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.12.4/sbt-0.12.4.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5423f6d806916ac27e37160bff930ea0
diff --git a/dev-java/sbt-bin-0.13.15 b/dev-java/sbt-bin-0.13.15
deleted file mode 100644
index 01cf8d39c7b0..000000000000
--- a/dev-java/sbt-bin-0.13.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=sbt, a build tool for Scala
-EAPI=6
-HOMEPAGE=https://scala-sbt.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.15/sbt-0.13.15.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=acb4954178253f101dcffed9e19637b8
diff --git a/dev-java/sbt-bin-0.13.6 b/dev-java/sbt-bin-0.13.6
deleted file mode 100644
index 215163a6307f..000000000000
--- a/dev-java/sbt-bin-0.13.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=sbt, a build tool for Scala.
-EAPI=5
-HOMEPAGE=https://scala-sbt.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.6/sbt-0.13.6.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5423f6d806916ac27e37160bff930ea0
diff --git a/dev-java/sbt-bin-0.13.7 b/dev-java/sbt-bin-0.13.7
deleted file mode 100644
index fdeac110e257..000000000000
--- a/dev-java/sbt-bin-0.13.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=sbt, a build tool for Scala.
-EAPI=5
-HOMEPAGE=https://scala-sbt.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.7/sbt-0.13.7.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5423f6d806916ac27e37160bff930ea0
diff --git a/dev-java/sbt-bin-0.13.8 b/dev-java/sbt-bin-0.13.8
deleted file mode 100644
index 6efd7035ea00..000000000000
--- a/dev-java/sbt-bin-0.13.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=sbt, a build tool for Scala.
-EAPI=5
-HOMEPAGE=https://scala-sbt.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.8/sbt-0.13.8.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5423f6d806916ac27e37160bff930ea0
diff --git a/dev-java/sbt-bin-0.13.9 b/dev-java/sbt-bin-0.13.9
deleted file mode 100644
index 57d36e182a3e..000000000000
--- a/dev-java/sbt-bin-0.13.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=sbt, a build tool for Scala.
-EAPI=5
-HOMEPAGE=https://scala-sbt.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.9/sbt-0.13.9.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5423f6d806916ac27e37160bff930ea0
diff --git a/dev-java/sbt-bin-1.1.4 b/dev-java/sbt-bin-1.1.4
deleted file mode 100644
index e61fa10e9393..000000000000
--- a/dev-java/sbt-bin-1.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=sbt, a build tool for Scala
-EAPI=6
-HOMEPAGE=https://scala-sbt.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/sbt/sbt/releases/download/v1.1.4/sbt-1.1.4.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2a4511c9cc41ee760bda77602f3e51a5
diff --git a/dev-java/sbt-bin/Manifest b/dev-java/sbt-bin/Manifest
new file mode 100644
index 000000000000..a9019f8dce8d
--- /dev/null
+++ b/dev-java/sbt-bin/Manifest
@@ -0,0 +1,15 @@
+DIST sbt-0.12.4.tgz 980711 BLAKE2B 0739e50610a26faa169b582160319ccfda3dc5b23588010b715fea508686bfa11dc9a62b647d0cd7b272a54d9e8fee75b6de838ef9fc7c13760079e68ad64c5e SHA512 0f8d67d8bcdfe2c7fad04e663cb626e302fc42ba7675376c97f22a73cbf21f40fde08078f2a74a723b9a5d0a24177c7b551e65942a4f73237d27ba8ea18b0add
+DIST sbt-0.13.15.tgz 60301163 BLAKE2B a07e9a62990e0f1c04b078b0344731a063e4fc8509c317a6c28ff68d83008d0fd518250ad301d8134a057688e6094a750be5171916b9a38facfdddf88542b5a5 SHA512 9e8a4f92970b96ddb93c0f6d9bfb394bc10648511e65d2f3e7637c580877c91acfa0e5f73fc11b9992dab6b5c142ead314609f47c2aac3eb6da11d879f3da8a8
+DIST sbt-0.13.6.tgz 1066241 BLAKE2B b4cf59409b82fc851e9978421b324da549dd376d89b37887681d7d6d9a42c7e938c82d5ce21ff42e5ddd5cb0030b0682ff44097db427302f4264da63dbb138ff SHA512 428f6e597f34d3eba94f19dd83334a1b188ae24300eda508fac597197b11e9850163c30552917c42c647470faab328663e96274536dc9f3a4df8355aa4f9d976
+DIST sbt-0.13.7.tgz 1058904 BLAKE2B b199c28b97364434dc7b7d3a25e9c6598160c9900621f4c470abab6b415c66bec9ba2d573beee5064efc2a6466ee79acfea53514b29ab0994b25353199fa7c40 SHA512 6022ed88b2d25f947ab068b7971e51fdcf8df77cea3d0a03eceff6df4442f013fd13cbeda11cdfcc35cc23ee85e1661986c53921f48d4350e2fa8bf0ae5f3e1f
+DIST sbt-0.13.8.tgz 1059183 BLAKE2B 5ad55bda946891cde52bbae0483ed3ffa7507a0467a75ae1bed6f08e7befa7dfa04c61efeeda59d31586db432cc7f406347f4f68b2c0c172516b1a4eb1bec477 SHA512 79479308c631b78b71196dfe4f8b26bd9b75727272c17432fce5ddd61a0dcaf4e261dd1eb9a8376b1e7a836ba6d84917819d181c35d19b543360d803193286d8
+DIST sbt-0.13.9.tgz 1049367 BLAKE2B de8f70de43aa6ccd816c90b82ee92295d7b33fd43226fadce48f9bd00c515838ae275e513ed438a5b758541a75520d86b0b6f93e3a3d01f468b3b338fe672667 SHA512 cf0deb1a5a07ce3690a831a2ee0f499a5c904cd9a9038873ab78773717a12ce4dec668e00c3dd6b89e7919357c32b26ff97a78613de5c6252b495bc7fdc763f3
+DIST sbt-1.1.4.tgz 45858350 BLAKE2B 792b05bf9bf16968c6580f070e042395b13580c6137a6592ca66bc3b02df3b27676b49364db8c6d2ec259b22b09a7e7a2d364e940890be38a96ba079066c4fa2 SHA512 7b278ecd22d4778482c61ec2e9650c8dd199c341aaaa624fee6b7f8989203de3d4dac24c4181ee08f0da50c69901321a1e11a535f0911241c9f6bfdfab5e94b8
+EBUILD sbt-bin-0.12.4.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
+EBUILD sbt-bin-0.13.15.ebuild 861 BLAKE2B c69df18ba3556eda5140032c214a853748d86ecf37e3ccbbef8774611464f9a28af4e3372cc81fca9d78b2058a06b1b58a57e93a5fe8d3fc4c25c318b16de84e SHA512 8d527e1b536e867dd105c36d5290f7684750c8ba2c345230445c75a3f53aab8d9518f92cbd91f7ed67937be807295c4f2e1bdd8714c20932c42ec7b6d5ba9ac2
+EBUILD sbt-bin-0.13.6.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
+EBUILD sbt-bin-0.13.7.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
+EBUILD sbt-bin-0.13.8.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
+EBUILD sbt-bin-0.13.9.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
+EBUILD sbt-bin-1.1.4.ebuild 860 BLAKE2B b17b66c3d6a2f845a87bba126f99050e9e3cd19dce5650d8d91968730bb79a471f0c2224eb7aeaad8df7ad6447974bfe982ce39071c647f50f3f37c9ab33d2e6 SHA512 31a2bf25148fcbf9e387f51c535dd18cba311181ddd01cb6aa19637bb6269e83f596c70fb3d4bdeedb6e7d1136886722cdc54112747f9c07d41098a9f72d43df
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sbt-bin/metadata.xml b/dev-java/sbt-bin/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/sbt-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild b/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild
new file mode 100644
index 000000000000..0e22428166d5
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2
+
+DESCRIPTION="sbt, a build tool for Scala."
+HOMEPAGE="https://scala-sbt.org"
+SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
+
+java_prepare() {
+	java-pkg_init_paths_
+}
+
+src_install() {
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -f bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
+
+	insinto "${dest}/lib"
+	doins bin/* || die
+
+	insinto "${dest}"
+	doins -r conf || die
+
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+}
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.15.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.15.ebuild
new file mode 100644
index 000000000000..d02047237519
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-0.13.15.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+DESCRIPTION="sbt, a build tool for Scala"
+HOMEPAGE="https://scala-sbt.org"
+SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
+
+src_prepare() {
+	default
+	java-pkg_init_paths_
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -v bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
+
+	insinto "${dest}/lib"
+	doins bin/* || die
+
+	insinto "${dest}"
+	doins -r conf || die
+
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+}
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild
new file mode 100644
index 000000000000..0e22428166d5
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2
+
+DESCRIPTION="sbt, a build tool for Scala."
+HOMEPAGE="https://scala-sbt.org"
+SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
+
+java_prepare() {
+	java-pkg_init_paths_
+}
+
+src_install() {
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -f bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
+
+	insinto "${dest}/lib"
+	doins bin/* || die
+
+	insinto "${dest}"
+	doins -r conf || die
+
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+}
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild
new file mode 100644
index 000000000000..0e22428166d5
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2
+
+DESCRIPTION="sbt, a build tool for Scala."
+HOMEPAGE="https://scala-sbt.org"
+SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
+
+java_prepare() {
+	java-pkg_init_paths_
+}
+
+src_install() {
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -f bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
+
+	insinto "${dest}/lib"
+	doins bin/* || die
+
+	insinto "${dest}"
+	doins -r conf || die
+
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+}
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild
new file mode 100644
index 000000000000..0e22428166d5
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2
+
+DESCRIPTION="sbt, a build tool for Scala."
+HOMEPAGE="https://scala-sbt.org"
+SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
+
+java_prepare() {
+	java-pkg_init_paths_
+}
+
+src_install() {
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -f bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
+
+	insinto "${dest}/lib"
+	doins bin/* || die
+
+	insinto "${dest}"
+	doins -r conf || die
+
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+}
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild
new file mode 100644
index 000000000000..0e22428166d5
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2
+
+DESCRIPTION="sbt, a build tool for Scala."
+HOMEPAGE="https://scala-sbt.org"
+SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
+
+java_prepare() {
+	java-pkg_init_paths_
+}
+
+src_install() {
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -f bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
+
+	insinto "${dest}/lib"
+	doins bin/* || die
+
+	insinto "${dest}"
+	doins -r conf || die
+
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+}
diff --git a/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild b/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild
new file mode 100644
index 000000000000..7d39ba4f4053
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+DESCRIPTION="sbt, a build tool for Scala"
+HOMEPAGE="https://scala-sbt.org"
+SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
+
+src_prepare() {
+	default
+	java-pkg_init_paths_
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -v bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
+
+	insinto "${dest}/lib"
+	doins bin/* || die
+
+	insinto "${dest}"
+	doins -r conf || die
+
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+}
diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
new file mode 100644
index 000000000000..fd1a6f111cd8
--- /dev/null
+++ b/dev-java/sbt/Manifest
@@ -0,0 +1,7 @@
+DIST sbt-0.13.13-gentoo-binary.tar.xz 58011476 BLAKE2B 87f829a5a6c4047b5120b9685c1caa1477d6ab5789835bf890d241ae512bae65cc3b0b2b60c15c18e15891210b6687ad2c8cd7dcc581f5224fc8788a576ff754 SHA512 9763b67ac4838e6ccac1848c17a03608bed61669671a10c93afc4c81d6dad06a3463ac4e4a9b7b3fb91325df5df6e0148847669d482e3cacf4fde957c110ccc1
+DIST sbt-0.13.13-ivy2-deps.tar.xz 121677604 BLAKE2B 7f6e508104a99c36f8f928550f7c0e41b742cefef3f3fccf2999fe7a5873cf690d693c0ded1df481535b59a7340a997cc21ef3ffd403b147fd8a323d1ee28620 SHA512 3301447a563e9a83431bb67a6281a6045630669012f1cc5cdde7a2cbae3f7db75f87abed003ecf8243fd230e2adea2ba3666468358ae29c51e346940235f5ed5
+DIST sbt-0.13.13-sbt-deps.tar.xz 34750700 BLAKE2B 5856f19d19255a6c4a373086962f3bff195d03193bb74d8d3aee1cfb2749ef3638f5c26dff7cb7c455c5b4ce67e8cf4fa46bbf9a8363f80dc26092e6df768d81 SHA512 0bfd35a6926545da7340f7ee72e420121f2bb2f83d98d420b7f65b465d207b1b30a48788914e7b1fdf575a4fee870f2632b0717f1a7a2c19e2f2d5794d08b4da
+DIST sbt-0.13.13-src.tar.xz 35911028 BLAKE2B 42157af03ae3567a2acc67cc0c96a9ffe19b69d60fddfde1cd65bbc410c14b09e5da0febb8225e49693c380a444b752296c29a21cc7f2239ee49ccef5128a3ff SHA512 351f18108a23014ee7ffd5c4713f390728fb98b742efdc139e094e64df7800f399d088600d245631635b0f6f4cb69c6cd327aafa3b0bf8a233fcbf0cb4ac5702
+DIST sbt-launch-0.13.13.jar 1210231 BLAKE2B 754abad78cec4f6b040fb63dcb62e549768174b22cf3f9ab7d2419736d4f09b53863cf645b38d7d534deb1c6e897f55d8b1b5fa82462ca9d906c410d22c0c198 SHA512 78e7ce21c610e83a532b04491e13d53b4193205328adce473252d523fe0ca0f3892dba900f01ff6e28d94a17c3ba1ebbe7d85fd6ce9900c48263bc4816da37ef
+EBUILD sbt-0.13.13.ebuild 5721 BLAKE2B 8b60ee0c4f58902e750b8b1a3d76f71a78aaa260e8a7bc53308cc903b71cdeea05b4d3d8758a09fc706036c1a762a1d217751ffc2b47d2eb75859106ccd7d1b4 SHA512 17bf873d8433d4d3f7faeef2cd9c6cb994914eedfac66eb92a8f5feab334c215c43a185c1e3ecbab7d3e6cacbe594e567dd075acb9af9dda48281fb61b5f62b5
+MISC metadata.xml 525 BLAKE2B c70c7e88be5a5b06cbc422d6f354535711d06590780285ee1fd7e6668a0205795a4295869d61fb91b201df9ec2c275e4d74a07734fcc39bac9d4fbf2632f4b9d SHA512 53269c8f362ba0415988cfb9889a7af2c67a6788d85fbe4d9008fbed1cc0a3d3bddc2a6049c6d0ba23c28e3ad2d65f240a9085ceaccc5d55d4387e4dd90c5505
diff --git a/dev-java/sbt/metadata.xml b/dev-java/sbt/metadata.xml
new file mode 100644
index 000000000000..6ccffa7db3e9
--- /dev/null
+++ b/dev-java/sbt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>gienah@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+The interactive build tool.
+Use Scala to define your tasks. Then run them in parallel from the shell. 
+</longdescription>
+<use><flag name="binary">Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.</flag></use>
+</pkgmetadata>
diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild
new file mode 100644
index 000000000000..16862a31628e
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.13.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
+inherit eutils java-pkg-2 # git-r3
+
+L_PN="sbt-launch"
+L_P="${L_PN}-${PV}"
+
+SV="2.11"
+
+DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well"
+HOMEPAGE="https://www.scala-sbt.org/"
+EGIT_COMMIT="v${PV}"
+EGIT_REPO_URI="https://github.com/sbt/sbt.git"
+SRC_URI="
+	!binary? (
+		https://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.xz
+		https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
+		https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz
+		http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${L_P}.jar
+	)
+	binary? (
+		https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz
+	)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="binary"
+
+DEPEND=">=virtual/jdk-1.8
+	>=dev-lang/scala-2.11.8:${SV}"
+RDEPEND=">=virtual/jre-1.8
+	>=dev-lang/scala-2.11.8:${SV}"
+
+# test hangs or fails
+RESTRICT="test"
+
+JAVA_GENTOO_CLASSPATH="scala-${SV}"
+
+# Note: to bump sbt, some things to try are:
+# 1. Create the sbt src snapshot:
+# git clone https://github.com/sbt/sbt.git ${P}
+# cd ${P}
+# git checkout v${PV}
+# cd ..
+# XZ_OPT=-9 tar --owner=portage --group=portage \
+# -cJf /usr/portage/distfiles/${P}-src.tar.xz ${P}
+# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
+# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz and
+# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )
+# from SRC_URI
+# 3. Comment the sbt publishLocal line in src_compile.
+# 4. try:
+# FEATURES='noclean -test' emerge -v -1 dev-java/sbt
+# It should fail in src_install since the sbt publishLocal is not done.
+# Check if it downloads more stuff in
+# src_compile to ${WORKDIR}/.ivy2 and ${WORKDIR}/.sbt.
+# 5. If some of the downloads fail, it might be necessary to run the sbt compile
+# again manually to obtain all the dependencies, if so:
+# cd to ${S}
+# export EROOT=/
+# export WORKDIR='/var/tmp/portage/dev-java/${P}/work'
+# export SV="2.11"
+# export L_P=${P}
+# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}"
+# sbt compile
+# cd ${WORKDIR}
+# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
+# 6. cd ${WORKDIR}
+# XZ_OPT=-9 tar --owner=portage --group=portage \
+# -cJf /usr/portage/distfiles/${P}-ivy2-deps.tar.xz .ivy2/cache
+# XZ_OPT=-9 tar --owner=portage --group=portage \
+# -cJf /usr/portage/distfiles/${P}-sbt-deps.tar.xz .sbt
+# Uncomment the sbt publishLocal line in src_compile.
+# 7. It *might* download more dependencies for src_test, however the presence
+# of some of these may cause the src_compile to fail.  So download them
+# seperately as root so we can identify the
+# additional files.  As root:
+# cd ${S}
+# ${S}/${P} test
+# cd ${WORKDIR}
+# XZ_OPT=-9 tar --owner=portage --group=portage \
+# -cJf /usr/portage/distfiles/${P}-test-deps.tar.xz \
+# $(find .ivy2/cache .sbt -uid 0 -type f -print)
+# Note: It might not download anything in src_test, in which case
+# ${P}-test-deps.tar.xz is not required.
+# 8. Create the binary
+# cd $WORDKIR
+# XZ_OPT=-9 tar --owner=portage --group=portage \
+# -cJf /usr/portage/distfiles/${P}-gentoo-binary.tar.xz ${P} .ivy2/local
+# 9. Undo the earlier temporary edits to the ebuild.
+
+src_unpack() {
+	# if ! use binary; then
+	# 	git-r3_src_unpack
+	# fi
+	# Unpack tar files only.
+	for f in ${A} ; do
+		[[ ${f} == *".tar."* ]] && unpack ${f}
+	done
+}
+
+src_prepare() {
+	default
+	if ! use binary; then
+		mkdir "${WORKDIR}/${L_P}" || die
+		cp -p "${DISTDIR}/${L_P}.jar" "${WORKDIR}/${L_P}/${L_PN}.jar" || die
+		cat <<- EOF > "${WORKDIR}/${L_P}/sbt"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${L_P}/sbt-launch.jar" "\$@"
+		EOF
+		cat <<- EOF > "${S}/${P}"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${S}/launch/target/sbt-launch.jar" "\$@"
+		EOF
+		chmod u+x "${WORKDIR}/${L_P}/sbt" "${S}/${P}" || die
+		sed -e "s@scalaVersion := scala210,@scalaVersion := scala${SV/./},\n  scalaHome := Some(file(\"${EROOT}usr/share/scala-${SV}\")),@" \
+			-i "${S}/build.sbt" || die
+
+		# suppress this warning in build.log:
+		# [warn] Credentials file /var/tmp/portage/dev-java/${P}/work/.bintray/.credentials does not exist
+		mkdir -p "${WORKDIR}/.bintray" || die
+		cat <<- EOF > "${WORKDIR}/.bintray/.credentials"
+			realm = Bintray API Realm
+			host = api.bintray.com
+			user =
+			password =
+		EOF
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}"
+		einfo "=== sbt compile ..."
+		"${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true compile || die
+		einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..."
+		cat <<- EOF | "${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true || die
+			set every javaVersionPrefix in javaVersionCheck := Some("$(java-pkg_get-vm-version)")
+			publishLocal
+		EOF
+	fi
+}
+
+src_test() {
+	export PATH="${EROOT}usr/share/scala-${SV}/bin:${S}:${PATH}"
+	"${S}/${P}" -Dsbt.log.noformat=true test || die
+}
+
+src_install() {
+	# Place sbt-launch.jar at the end of the CLASSPATH
+	java-pkg_dojar $(find "${WORKDIR}"/.ivy2/local -name \*.jar -print | grep -v sbt-launch.jar) \
+				   $(find "${WORKDIR}"/.ivy2/local -name sbt-launch.jar -print)
+	local ja="-Dsbt.version=${PV} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
+	java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "${ja}"
+}
diff --git a/dev-java/servletapi-2.2-r3 b/dev-java/servletapi-2.2-r3
deleted file mode 100644
index 7c4dfd18428c..000000000000
--- a/dev-java/servletapi-2.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Servlet API 2.2 from jakarta.apache.org
-EAPI=0
-HOMEPAGE=http://jakarta.apache.org/
-IUSE=doc elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=2.2
-SRC_URI=mirror://gentoo/servletapi-2.2-20021101.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=730b22f733299da643ab0d29e3b9e101
diff --git a/dev-java/servletapi-2.2-r4 b/dev-java/servletapi-2.2-r4
deleted file mode 100644
index da1e296893e6..000000000000
--- a/dev-java/servletapi-2.2-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/ant-core:0 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Servlet API 2.2 from jakarta.apache.org
-EAPI=6
-HOMEPAGE=http://jakarta.apache.org/
-IUSE=doc elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.2
-SRC_URI=mirror://gentoo/servletapi-2.2-20021101.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2a91e9bb2d59edbcea0a2d296099ea62
diff --git a/dev-java/servletapi-2.3-r3 b/dev-java/servletapi-2.3-r3
deleted file mode 100644
index 2f360cb51030..000000000000
--- a/dev-java/servletapi-2.3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.4 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Servlet API 2.3 from jakarta.apache.org
-EAPI=0
-HOMEPAGE=http://jakarta.apache.org/
-IUSE=doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-SLOT=2.3
-SRC_URI=mirror://gentoo/servletapi-2.3-20021101.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a26942c1b56292aca1dd6c06e3868c1c
diff --git a/dev-java/servletapi-2.3-r4 b/dev-java/servletapi-2.3-r4
deleted file mode 100644
index 468adc6622f2..000000000000
--- a/dev-java/servletapi-2.3-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/ant-core-1.4 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Servlet API 2.3 from jakarta.apache.org
-EAPI=6
-HOMEPAGE=https://jakarta.apache.org/
-IUSE=doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=2.3
-SRC_URI=mirror://gentoo/servletapi-2.3-20021101.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=40c6e19d35bf1b468944aed4cf6bad8d
diff --git a/dev-java/servletapi-2.4-r5 b/dev-java/servletapi-2.4-r5
deleted file mode 100644
index 5e9ec125d02c..000000000000
--- a/dev-java/servletapi-2.4-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.5 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Servlet API 2.4 from jakarta.apache.org
-EAPI=0
-HOMEPAGE=http://jakarta.apache.org/
-IUSE=doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-SLOT=2.4
-SRC_URI=http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/src/apache-tomcat-5.5.20-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=322294144f5243cf9e8c374d4a0ea1ba
diff --git a/dev-java/servletapi-2.4-r6 b/dev-java/servletapi-2.4-r6
deleted file mode 100644
index 781349628c8e..000000000000
--- a/dev-java/servletapi-2.4-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/ant-core:0 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Servlet API 2.4 from jakarta.apache.org
-EAPI=6
-HOMEPAGE=https://jakarta.apache.org/
-IUSE=doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3
-SLOT=2.4
-SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/src/apache-tomcat-5.5.20-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=54ad7661f29cd0e23d596ecb2c69ee39
diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
new file mode 100644
index 000000000000..0d4eb744d889
--- /dev/null
+++ b/dev-java/servletapi/Manifest
@@ -0,0 +1,10 @@
+DIST apache-tomcat-5.5.20-src.tar.gz 4796377 BLAKE2B 34950d25c969006510dcff96deded7d0f05c7fa99cde0a8e59b22a93261dd6dca56c82aa281d1476324a4c3b608d2d31ffa6c4a03506d46ba187051ea5addf1c SHA512 1efab4625067ee423cd517b565b2d368bf3e19fd5fddedcb87644bdc5fc213cc7617e62438fd8da19d9dff99e13c5d6d9185f12849f7ce42efad52ff2d4df5f5
+DIST servletapi-2.2-20021101.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
+DIST servletapi-2.3-20021101.tar.gz 127874 BLAKE2B f78f8d0724e73ef4a21bbbef6a1b855c0a55c158dba2e3ed3ee7b6d48a60ce87881bbe6b38bf5098f48f1c3064bc73c072a485e550c1caf920710ecd6e27519f SHA512 a09a5e0cd7b8c557fca983646dc49284350ff9cac7a288013c6c4c7582923d1b16d6e6b68c73e74bc06fad628ab81da95e201106643b8f6564f984a9587bd03d
+EBUILD servletapi-2.2-r3.ebuild 872 BLAKE2B c77b6d7a1af5592371760d51f7e95240e933d9fa05cfdd8e7019fc1a8b9c38c32b63f08e4e7219e2456d93da407b25b0d26cb9bbc383a56b46cc1a57389aa3fd SHA512 4d856b7055049e5f9fbe98fb67c61989a309821da63e12c0a57530c068310860fce00fbecebd710c6e9b104a98143cf1432f423c858e53096dabac816f1a0516
+EBUILD servletapi-2.2-r4.ebuild 882 BLAKE2B ce5fc1d8d623da6e9758bf2c4c19deca4a5e7a626f3fa3f8cb0c09ff50439917ced8565451d822646aaadbb5ed92b2a6ec824095b2c76436a1e875d87ec5ac92 SHA512 ee9c52f8a21c6b0d293e6b9cba879b33ca9922fe921ece415a58299de5bcb5640aefb3fdd1dd43d5a8f9e6459eb6c3ced9ecc4c4db19601f1c5e448c53d373f9
+EBUILD servletapi-2.3-r3.ebuild 753 BLAKE2B 531bc8ee4a9530aae1cdd19a519073c71ec66e1393fe730d19420f921983d11a90a255c6a72cc417a9e159ad941a474e4b70f659f5ba7fd483bcdbdadcb0d530 SHA512 8b5259bf18610c8b38e2a71ac29566d71728cd22c1719203b8557fd5969f8562810b24aa86d187d79b257cb71e977832596ea6de31ff0deeee0ed74a2b15aa87
+EBUILD servletapi-2.3-r4.ebuild 763 BLAKE2B a27783abbcbbd66c59dcfc110769ca283f306fdf7496257ed372ffedd360f1dec2d7474ab2270796b8c2d3851e39bfc2484fac3a2aa621aa537a57bfe81c5b09 SHA512 4dbf71fa13fa765c2ca23e2cb937ad73135ee7cedf1cf5700bc1bc7f2417a2da6b88ca9257f5994c87d4567266df4d0ae20d5776e0bf8ed2d17f0846d1982030
+EBUILD servletapi-2.4-r5.ebuild 1259 BLAKE2B b31995bb2fceb65a435b808ba2cab5c04047520ad0de6b12185071f5f075d95661e3699f7d8219955a9a1aae1c15d869900c4934f9935ca2ca906bf223b73e9a SHA512 bbe7cab6ea34a4500bcd9aea94115bcc3023edc87a774f8e90e1b0f4f9728de476df6c0f3db5db0e14a3ae2c7b47f3033d9807d48bb9bd743357ac89dc0cd6ba
+EBUILD servletapi-2.4-r6.ebuild 1327 BLAKE2B 36594a4bede2001aaa886bdf6ede6376ecb84c3eaf38665b0dba3e3c2ca3c005f04d1fb46d104f5a311a65bb489bdab45a026a9220d386a6821bfb268860c0a5 SHA512 4fdafcd5392d748bb9331cfdc0c9139849682a0ed246a1f5e4cf5083270f135f88e8a257fe649d86b874e4732065cc00935192c57f82492081e5446e916b60dc
+MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/servletapi/metadata.xml b/dev-java/servletapi/metadata.xml
new file mode 100644
index 000000000000..61b379cee8a1
--- /dev/null
+++ b/dev-java/servletapi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+	The Apache Tomcat implementation of the Servlet API specification.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/servletapi/servletapi-2.2-r3.ebuild b/dev-java/servletapi/servletapi-2.2-r3.ebuild
new file mode 100644
index 000000000000..c2be8d3bd274
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.2-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Servlet API 2.2 from jakarta.apache.org"
+HOMEPAGE="http://jakarta.apache.org/"
+SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.4"
+RDEPEND=">=virtual/jre-1.3"
+LICENSE="Apache-1.1"
+SLOT="2.2"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="doc"
+S="${WORKDIR}/jakarta-servletapi-src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i 's/compile,javadoc/compile/' build.xml || die "sed failed"
+}
+
+EANT_BUILD_TARGET="all"
+
+src_install() {
+	java-pkg_dojar ../dist/servletapi/lib/servlet.jar
+
+	dodoc README || die
+	use doc && java-pkg_dojavadoc ../build/servletapi/docs/api
+	use source && java-pkg_dosrc src/share/javax
+}
diff --git a/dev-java/servletapi/servletapi-2.2-r4.ebuild b/dev-java/servletapi/servletapi-2.2-r4.ebuild
new file mode 100644
index 000000000000..e1a24d421468
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.2-r4.ebuild
@@ -0,0 +1,41 @@
+# 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="Servlet API 2.2 from jakarta.apache.org"
+HOMEPAGE="http://jakarta.apache.org/"
+SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	dev-java/ant-core:0
+	source? ( app-arch/zip )"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+LICENSE="Apache-1.1"
+SLOT="2.2"
+IUSE="doc"
+
+S="${WORKDIR}/jakarta-servletapi-src"
+
+EANT_BUILD_TARGET="all"
+
+src_prepare() {
+	default
+	sed -i 's/compile,javadoc/compile/' build.xml || die "sed failed"
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_dojar ../dist/servletapi/lib/servlet.jar
+	use doc && java-pkg_dojavadoc ../build/servletapi/docs/api
+	use source && java-pkg_dosrc src/share/javax
+}
diff --git a/dev-java/servletapi/servletapi-2.3-r3.ebuild b/dev-java/servletapi/servletapi-2.3-r3.ebuild
new file mode 100644
index 000000000000..5fc18936fa10
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.3-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Servlet API 2.3 from jakarta.apache.org"
+HOMEPAGE="http://jakarta.apache.org/"
+SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.3"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.4
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+S="${WORKDIR}/jakarta-servletapi-4"
+
+src_compile() {
+	eant all
+}
+
+src_install() {
+	java-pkg_dojar dist/lib/servlet.jar
+
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/share/javax
+	dodoc dist/README.txt
+}
diff --git a/dev-java/servletapi/servletapi-2.3-r4.ebuild b/dev-java/servletapi/servletapi-2.3-r4.ebuild
new file mode 100644
index 000000000000..2c264a869899
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.3-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Servlet API 2.3 from jakarta.apache.org"
+HOMEPAGE="https://jakarta.apache.org/"
+SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+LICENSE="Apache-1.1"
+SLOT="2.3"
+IUSE="doc source"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	>=dev-java/ant-core-1.4
+	source? ( app-arch/zip )"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/jakarta-servletapi-4"
+
+src_compile() {
+	eant all
+}
+
+src_install() {
+	java-pkg_dojar dist/lib/servlet.jar
+
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/share/javax
+	dodoc dist/README.txt
+}
diff --git a/dev-java/servletapi/servletapi-2.4-r5.ebuild b/dev-java/servletapi/servletapi-2.4-r5.ebuild
new file mode 100644
index 000000000000..6c22f6744b7c
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.4-r5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils java-pkg-2 java-ant-2
+
+TC_VERSION="5.5.20"
+DESCRIPTION="Servlet API 2.4 from jakarta.apache.org"
+HOMEPAGE="http://jakarta.apache.org/"
+SRC_URI="http://archive.apache.org/dist/tomcat/tomcat-5/v${TC_VERSION}/src/apache-tomcat-${TC_VERSION}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.4"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.5
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jdk-1.4"
+
+S="${WORKDIR}/apache-tomcat-${TC_VERSION}-src/servletapi"
+
+src_compile() {
+	local antflags="jar $(use_doc javadoc examples)"
+	eant ${antflags} -f jsr154/build.xml
+	eant ${antflags} -f jsr152/build.xml
+}
+
+src_install() {
+	mv jsr{154,152}/dist/lib/*.jar "${S}"
+
+	if use doc ; then
+		mkdir docs
+		cd "${S}"/jsr154/build
+		mv docs "${S}"/docs/servlet
+		mv examples "${S}"/docs/servlet/examples
+
+		cd "${S}"/jsr152/build
+		mv docs "${S}"/docs/jsp
+		mv examples "${S}"/docs/jsp/examples
+	fi
+
+	cd "${S}"
+	java-pkg_dojar *.jar
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
+}
diff --git a/dev-java/servletapi/servletapi-2.4-r6.ebuild b/dev-java/servletapi/servletapi-2.4-r6.ebuild
new file mode 100644
index 000000000000..13f902f52c07
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.4-r6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-pkg-2 java-ant-2
+
+TC_VERSION="5.5.20"
+DESCRIPTION="Servlet API 2.4 from jakarta.apache.org"
+HOMEPAGE="https://jakarta.apache.org/"
+SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-5/v${TC_VERSION}/src/apache-tomcat-${TC_VERSION}-src.tar.gz"
+
+SLOT="2.4"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-1.1"
+IUSE="doc source"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	dev-java/ant-core:0
+	source? ( app-arch/zip )"
+
+RDEPEND="
+	>=virtual/jdk-1.4"
+
+S="${WORKDIR}/apache-tomcat-${TC_VERSION}-src/servletapi"
+
+src_compile() {
+	local antflags="jar $(use_doc javadoc examples)"
+	eant ${antflags} -f jsr154/build.xml
+	eant ${antflags} -f jsr152/build.xml
+}
+
+src_install() {
+	mv jsr{154,152}/dist/lib/*.jar "${S}" || die
+
+	if use doc; then
+		mkdir docs || die
+		cd "${S}"/jsr154/build || die
+		mv docs "${S}"/docs/servlet || die
+		mv examples "${S}"/docs/servlet/examples || die
+
+		cd "${S}"/jsr152/build || die
+		mv docs "${S}"/docs/jsp || die
+		mv examples "${S}"/docs/jsp/examples || die
+	fi
+
+	cd "${S}" || die
+	java-pkg_dojar *.jar
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
+}
diff --git a/dev-java/shared-objects-1.4-r4 b/dev-java/shared-objects-1.4-r4
deleted file mode 100644
index e79c01519525..000000000000
--- a/dev-java/shared-objects-1.4-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Core factory for maximal sharing of arbitrary objects
-EAPI=5
-HOMEPAGE=http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATermLibrary
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.cwi.nl/projects/MetaEnv/shared-objects/shared-objects-1.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=94db2a353c974109de92bfa076a37532
diff --git a/dev-java/shared-objects/Manifest b/dev-java/shared-objects/Manifest
new file mode 100644
index 000000000000..56fca0e189b6
--- /dev/null
+++ b/dev-java/shared-objects/Manifest
@@ -0,0 +1,3 @@
+DIST shared-objects-1.4.tar.gz 45304 BLAKE2B da6e3a117e4fd8c626d22860a341eef3d48171d6259c4c22d3a386b2a1177af70218eaad928c10d479bc31d4226f9521fd07c8ac3e530f9f28e45a92a7f93b6c SHA512 f051458244a88e44c249167bfad0f88f0efa971fdadc578efcb83ff5ea805356fc68250bb4511ec181b5a062b4aba69463f212e913cf96ba98bdd3966e219f39
+EBUILD shared-objects-1.4-r4.ebuild 598 BLAKE2B 2a815d67f500ef795fe6051f01777b9c104fa8c623caec692909cd568669edb2f3d6309a1cab69b2f34a88a66ef95b57f51bec320bde75367cd28207c1cdca3d SHA512 f7d35ec52d9309c761c467a497b3b4eef18aa30f030b0ea31bbaeaeeb167fe444e9bf118b97c8ddaa85adbe62df8a6d5e27dc1d486a171e60b7303245a51a90a
+MISC metadata.xml 353 BLAKE2B 0dcefae2d966516c5cefd302af327b8a0d45ef40c61158eed9d1e0e679e28261fb10cbb87f1dd46e684700f5d8c6ae1fe5f93d839180b8320ab59664504ae9b5 SHA512 400b92deb52a44c66bca90bbc8bba37a66f803a611ac740cfd087769543372ea9a2861732f1a894219ac7ca98dc11919989a49d5afef05def23f7b9266f74f33
diff --git a/dev-java/shared-objects/metadata.xml b/dev-java/shared-objects/metadata.xml
new file mode 100644
index 000000000000..ccb440ab8c97
--- /dev/null
+++ b/dev-java/shared-objects/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+A Java Class implementing a core factory for maximal sharing of arbitrary objects.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/shared-objects/shared-objects-1.4-r4.ebuild b/dev-java/shared-objects/shared-objects-1.4-r4.ebuild
new file mode 100644
index 000000000000..f68f79559231
--- /dev/null
+++ b/dev-java/shared-objects/shared-objects-1.4-r4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core factory for maximal sharing of arbitrary objects"
+HOMEPAGE="http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATermLibrary"
+SRC_URI="http://www.cwi.nl/projects/MetaEnv/shared-objects/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="shared"
+
+src_configure() { :; }
diff --git a/dev-java/simplyhtml-0.13.1-r1 b/dev-java/simplyhtml-0.13.1-r1
deleted file mode 100644
index c2724d040014..000000000000
--- a/dev-java/simplyhtml-0.13.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/javahelp:0 dev-java/gnu-regexp:1 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Text processing application based on HTML and CSS files
-EAPI=5
-HOMEPAGE=http://simplyhtml.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=dev-java/javahelp:0 dev-java/gnu-regexp:1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/simplyhtml/SimplyHTML_src_0_13_1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1f3541238a04a8b3ead5e5ad78461243
diff --git a/dev-java/simplyhtml/Manifest b/dev-java/simplyhtml/Manifest
new file mode 100644
index 000000000000..6de3b8d0341e
--- /dev/null
+++ b/dev-java/simplyhtml/Manifest
@@ -0,0 +1,3 @@
+DIST SimplyHTML_src_0_13_1.tar.gz 473258 BLAKE2B b3d517d3f9388e9674ace860038e7ac001aabe3b8b1d1af4b8a0a0e883216bc5de3d1269f13f275dc4b4cb65b0742fc6ae2284f3ceaafd9067c2cb0582e5e959 SHA512 e37140ef7461f2c741f43ce14518e224cb41ddb42c4d396f8f934476a5fbbe4d121950dc3186ba1ae603068e81832a92240e99cd25d3778574c0d3f370d501ac
+EBUILD simplyhtml-0.13.1-r1.ebuild 1251 BLAKE2B 728fba61555329056e30f0c7a9a77d72cb51ea4be449f0cb5eb87121ebc1866eaf4059251ecba0e76856624550888b6bbef1e281b01453f5195e41afb54ef710 SHA512 c812b88a0ec17a6773090f39db390423ed0c61d13cb49a7073338065d445b7f83add4629612561be0a67b28cb5726a84d651bdda9733947c2024fbde64d521a8
+MISC metadata.xml 316 BLAKE2B bd020f0d1d0b4122a0ea3e9465864a08b52fb17234dccbfaff8fc647ab552bd5206a4a6df41bf83ba18577b83ab139ab6139327feb266e88c5dca1a578c6af11 SHA512 00e41e5c4ed97928aa67e96c81ef04305929bad8454b0d5608a73da37c6c90e1421c20627c95d8f280e4bcde27e640ed454521a0fa5376035cf7021d09e4a4ea
diff --git a/dev-java/simplyhtml/metadata.xml b/dev-java/simplyhtml/metadata.xml
new file mode 100644
index 000000000000..03b71de3b0e9
--- /dev/null
+++ b/dev-java/simplyhtml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">simplyhtml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild b/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
new file mode 100644
index 000000000000..fc91a2631935
--- /dev/null
+++ b/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PN="SimplyHTML"
+MY_PV="$(replace_all_version_separators _)"
+
+DESCRIPTION="Text processing application based on HTML and CSS files"
+HOMEPAGE="http://simplyhtml.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_src_${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE=""
+
+CDEPEND="
+	dev-java/javahelp:0
+	dev-java/gnu-regexp:1"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+	javahelp
+	gnu-regexp-1
+"
+EANT_BUILD_TARGET="jar"
+EANT_BUILD_XML="src/build.xml"
+
+java_prepare() {
+	# Avoid copying lib jars.
+	sed -i '/copy file/d' src/build.xml || die
+}
+
+src_install() {
+	local my_jars=(
+		"${MY_PN}.jar"
+		"${MY_PN}Help.jar"
+	)
+
+	for my_jar in "${my_jars[@]}"; do
+		java-pkg_dojar "dist/lib/${my_jar}"
+	done
+
+	dodoc readme.txt
+	use doc && java-pkg_dojavadoc dist/api
+	use source && java-pkg_dosrc src/com src/de
+}
diff --git a/dev-java/sjsxp-1.0.1-r3 b/dev-java/sjsxp-1.0.1-r3
deleted file mode 100644
index 7980cf30267c..000000000000
--- a/dev-java/sjsxp-1.0.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/xpp3:0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Sun Java Streaming XML Parser
-EAPI=5
-HOMEPAGE=http://sjsxp.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=bea.ri.jsr173
-RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/sjsxp-1.0.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=00a65c4a6642212ef280420b6401551a
diff --git a/dev-java/sjsxp/Manifest b/dev-java/sjsxp/Manifest
new file mode 100644
index 000000000000..b008c718f81e
--- /dev/null
+++ b/dev-java/sjsxp/Manifest
@@ -0,0 +1,3 @@
+DIST sjsxp-1.0.1.tar.bz2 414706 BLAKE2B 622cfe0e0c0084afd048dff6bf3fc0ffe086f41036fee549059d7fa6602c682fec5815960791d726079b1f0701502a60eed8701125da44a1d0ed4a923c819d62 SHA512 0e8e8841d87400f9978b8e053f3658f14f2c1b85007bc431681c6489ae78972cd892021821b00a37ba06098ba1bdf6954a3c294cddbb69e5cdb7936f4736daa5
+EBUILD sjsxp-1.0.1-r3.ebuild 631 BLAKE2B 59cb707f90d671d1ef5fc95b7295f22e04c6991f9df25d747fe78daa9ba3aaeefc7e939d2e6cba5f067e58d8c7b836481ed451bb82197dafda42ae521b73f36d SHA512 f2a6b9780e18bf82784e6cbfcde860dad4926e5346b9430c6692c220ccbb67653bc4d6d2e386657d9de51187e9a85fdf9e4c5b280fd9a3158694ccffa3b039b2
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sjsxp/metadata.xml b/dev-java/sjsxp/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/sjsxp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/sjsxp/sjsxp-1.0.1-r3.ebuild b/dev-java/sjsxp/sjsxp-1.0.1-r3.ebuild
new file mode 100644
index 000000000000..b95fc5c021f3
--- /dev/null
+++ b/dev-java/sjsxp/sjsxp-1.0.1-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Sun Java Streaming XML Parser"
+HOMEPAGE="http://sjsxp.dev.java.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="bea.ri.jsr173"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/xpp3:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/zephyr"
+
+JAVA_GENTOO_CLASSPATH="xpp3"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rv tests || die
+}
diff --git a/dev-java/skinlf-6.7-r1 b/dev-java/skinlf-6.7-r1
deleted file mode 100644
index a147e9896dbf..000000000000
--- a/dev-java/skinlf-6.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip:0 dev-java/laf-plugin:0 dev-java/xalan:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Skin Look and Feel - Skinning Engine for the Swing toolkit
-EAPI=5
-HOMEPAGE=http://skinlf.l2fprod.com/
-IUSE=elibc_FreeBSD examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 dev-java/xalan:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://skinlf.dev.java.net/files/documents/66/37801/skinlf-6.7-20060722.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2f9cdf5f5a9de82e67772996073b8026
diff --git a/dev-java/skinlf/Manifest b/dev-java/skinlf/Manifest
new file mode 100644
index 000000000000..d32b3008b4fb
--- /dev/null
+++ b/dev-java/skinlf/Manifest
@@ -0,0 +1,6 @@
+AUX skinlf-6.7-build.xml 10712 BLAKE2B c9fd2045a56b230ce4acb836a90bed998b39ee2d075bd4e05618ea90b36a7602acf57e143b7463baeefa3b817770ea2b663110877a9110adc6a0d365a8b2100e SHA512 0d4ecaabdcab41095bdf94388a92812095ae40afd81229d093183926ee4ff29672c98bda8c7dc549a692c26ba238751f623eafb8727f9214759d0ea4ee9bf45c
+AUX skinlf-6.7-common.xml 5452 BLAKE2B a71f3553dc85a0a08b6926389a87574133b004d642d28007699eafc51f120bc3e59af860d23d0bf4cfb3cbc3313accaa998b468ddd554b32de405a4c55da8b46 SHA512 0703e8b463d62355aabba1705d7c05aeb8c700c3a494d3898c356f781172dd09e777d1357ddeb0225753b85242f2d15052733c73c5656f263875570a3c4d896d
+AUX skinlf-6.7-image-utils-without-jimi.patch 2935 BLAKE2B e9d8a10a5f5848bb9c1d4b13c8e294907d72b93a98cd69fd6bea89bed997b8aa676f275d4c7244257b5b46092381461a30cd1f8b8d3099e173228d1a41eba493 SHA512 b05e63e4decb26e325c3a902d8f1391c0026c41114146462fa1cb87e9ff5431941a69615da96751689c8f3ff10fb31f277711b355778c621a7a3d38bfecba033
+DIST skinlf-6.7-20060722.zip 827174 BLAKE2B 72ada5c0b04023b0e51778698ce0b93da1d02457837cd5aedcb6f651e231e1c1a9dede2490bc182d18af9849f8f182542f71d6c864e02d4c2abbfc4c8bdab7f5 SHA512 e4df9c6a85b5bbdbd40af177595641a5ad55a5cb16e5a31217fb3f5badd25727e4b48fa78ba2374f4eb55224068807b5bd6df9fba7f2418b7b810b25cf2043b6
+EBUILD skinlf-6.7-r1.ebuild 1384 BLAKE2B d232c624eb3ea07ce6fddb6c7c18c84ab4e4b0f09a250e551be101731ae4620ebb32bd74534803606161dc11a7be1a1b468ff040ef4b74f9e6d42aec4e13addc SHA512 7aea3626973965005d19bfa764af9acf73525cb547357d72c64883d5d0c9d402d250cdd1b48d748101366b773cf873e5037eb6d1660cc19e9d6b0cc71eb68988
+MISC metadata.xml 230 BLAKE2B f980b23f7e5db048ac5b7b660bd9140a5212c9648c15ffcb566afcd151bb8f136ccbede3513a61cb587ab9bdd793622183b30718465fdb42d22491443ffb7d35 SHA512 476218dbd8032db6ef1b9ff1fe425808b717eb4b19668ffd21fea661bed536104bfb0c0766fd98de7c99be9677af6b17a5209ee70c7e9568e814bc6ed85d6a3e
diff --git a/dev-java/skinlf/files/skinlf-6.7-build.xml b/dev-java/skinlf/files/skinlf-6.7-build.xml
new file mode 100644
index 000000000000..42b4c1145aa2
--- /dev/null
+++ b/dev-java/skinlf/files/skinlf-6.7-build.xml
@@ -0,0 +1,276 @@
+<!DOCTYPE project [
+  <!ENTITY build-COMMON SYSTEM "common.xml">
+]>
+
+<!--
+  Skin Look And Feel Build
+-->
+<project name="skinlf" default="compile.java" basedir=".">
+
+  <!-- Allow user to override settings -->
+  <property file="${user.home}/skinlf-ant.properties" />
+  <property file="build.properties" />
+
+  <!-- Project Identification -->
+  <property name="project" value="skinlf"/>
+  <property name="version" value="6.7"/>
+  <property name="year"    value="2000-2006"/>
+  <property name="project.fullname" value="Skin Look And Feel"/>
+  <property name="project.nativeskin" value="nativeskin"/>
+
+  <property name="javadoc.packagenames" value="com.l2fprod.gui,com.l2fprod.gui.plaf.skin,com.l2fprod.gui.region,com.l2fprod.gui.nativeskin"/>
+
+
+
+  <path id="classpath">
+  	<fileset dir="lib" includes="**/*.jar"/>
+  </path>
+
+  <property name="classpath.asprop" refid="classpath"/>
+
+  &build-COMMON;
+
+  <target name="compile.javacc" depends="init">
+    <javacc target="src/com/l2fprod/gui/plaf/skin/impl/gtk/parser/GtkParser.jj"
+            outputdirectory="src/com/l2fprod/gui/plaf/skin/impl/gtk/parser"
+            javacchome="lib"
+            static="false"
+            javaunicodeescape="true" />
+  </target>
+
+  <target name="compile" depends="init">
+  </target>
+   
+  <!--
+    Utility targets to use the style converters
+  -->
+  <target name="convert.msstyles">
+    <fail unless="msstyle" message="Specify path to msstyle xml -Dmsstyle=pathtoxml"/>
+    <fail unless="skin"    message="Specify themepack folder -Dskin=pathtothemepackdir"/>
+    <java classname="com.l2fprod.tools.msstyles.MsStylesToSkinLF"
+          classpath="${classpath.asprop}:${java.src.dir}:${build.classes}"
+          fork="yes">
+      <arg value="${msstyle}" />
+      <arg value="${msstyle}.xml" />
+      <arg value="${skin}" />
+    </java>
+    <copy todir="${skin}">
+      <fileset dir="src/themepacks/skeletonthemepack" includes="**"/>
+    </copy>
+  </target>
+
+  <!--
+    Start Demos
+  -->
+  <target name="demo">
+    <java classname="examples.demo"
+          classpath="${classpath.asprop}:${java.src.dir}:${build.classes}"
+          fork="yes">
+      <arg value="${skin}" />
+    </java>
+  </target>
+
+  <!-- Dist targets -->
+  <target name="jar" depends="compile.java">
+    <jar destfile="${build.dir}/${project}.jar">
+      <fileset dir="${build.classes}" includes="*.class,com/**/*.class" excludes="**/region/**,**/nativeskin/**"/>
+      <fileset dir="${java.src.dir}" includes="com/**/*.properties"/>
+      <fileset dir="${java.src.dir}" includes="com/**/*.template"/>
+      <fileset dir="${java.src.dir}" includes="com/**/*.gif"/>
+      <manifest>
+        <attribute name="Built-by" value="${user.name}"/>
+        <attribute name="Main-Class" value="com.l2fprod.gui.plaf.skin.Skinit"/>
+		<attribute name="Class-Path" value="laf-plugin.jar"/>
+        <section name="com/l2fprod/gui/plaf/skin">
+          <attribute name="Specification-Title" value="${project.fullname}"/>
+          <attribute name="Specification-Version" value="${version}"/>
+          <attribute name="Specification-Vendor" value="L2FProd.com"/>
+          <attribute name="Implementation-Title" value="${project.fullname}"/>
+          <attribute name="Implementation-Version" value="${version}"/> 
+          <attribute name="Implementation-Vendor" value="L2FProd.com"/>
+        </section>
+      </manifest>
+    </jar>
+  </target>
+
+  <target name="obfuscate" depends="jar">
+    <taskdef name="proguard"
+             classname="proguard.ant.ProGuardTask"
+             classpath="lib/proguard.jar"/>
+    <move file="${build.dir}/${project}.jar"
+    	  tofile="${build.dir}/${project}-toobfuscate.jar"/>
+    <proguard
+              outjar="${build.dir}/${project}.jar"
+              obfuscate="yes"
+              usemixedclassnames="no"
+              overloadaggressively="yes"
+              printmapping="obfuscatemapping.txt"
+              printusage="obfuscateusage.txt">
+      <libraryjar name="${java.home}/lib/rt.jar"/>
+      <injar name="${build.dir}/${project}-toobfuscate.jar"/>
+      <keep access="public" type="class" name="Skinit">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.SkinApplet">
+        <method name="*"/>
+      </keep>      
+      <keep access="public" type="class" name="com.l2fprod.gui.SkinChooser">
+        <method name="*"/>
+      </keep>      
+      <keep access="public" type="class" name="com.l2fprod.gui.WindowSnapping">
+        <method name="*"/>
+      </keep>      
+      <keep access="public" type="class" name="com.l2fprod.gui.nativeskin.**">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.CompoundSkin">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.IncorrectVersionException">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.LinuxLookAndFeel">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.Skin">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinButton">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinFrame">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.Skinit">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinLookAndFeel">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinPersonality">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinPreviewWindow">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinProgress">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinScrollbar">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinSeparator">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinSlider">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinSplitPane">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinTab">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.impl.*">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.impl.gtk.GtkSkin">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.impl.kde.KdeSkin">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.gui.region.*">
+        <method name="*"/>
+      </keep>
+      <keep access="public" type="class" name="com.l2fprod.tools.**">
+        <method name="*"/>
+      </keep>
+      <keep type="class" name="com.l2fprod.util.**">
+        <method name="*"/>
+      </keep>
+    </proguard>
+  </target>
+
+  <target name="dist.pre" depends="jar">
+    <!-- examples.jar -->
+    <jar destfile="${build.dist.lib}/examples.jar">
+      <fileset dir="${build.classes}" includes="examples/**.class"/>
+      <fileset dir="${java.src.dir}" includes="examples/**.properties,examples/**.gif,examples/**.jpg"/>
+    </jar>
+    <!-- nativeskin.jar -->
+    <jar jarfile="${build.dist.lib}/nativeskin.jar">
+      <fileset dir="${build.classes}"
+               includes="com/l2fprod/gui/region/**,com/l2fprod/gui/nativeskin/**,com/l2fprod/util/OS**,,com/l2fprod/util/Access**"
+               excludes="**/*.html"/>
+    </jar>
+    <!-- batch files -->
+    <copy todir="${build.dist.bin}"
+	  flatten="yes"
+	  preservelastmodified="yes">
+      <fileset dir="src" includes="**/*.bat"/>
+    </copy>
+    <!-- dlls -->
+    <copy todir="${build.dist.lib}">
+      <fileset dir="src/native/win32" includes="*.dll"/>
+    </copy>
+    <!-- default theme -->
+    <zip destfile="${build.dist.lib}/themepack.zip">
+      <zipfileset dir="src/themepacks/whistlerthemepack"/>
+    </zip>
+  </target>
+
+  <!--
+    Publish the new version of SKinLF
+  -->
+  <target name="publish" depends="init">
+    <!-- copy zip to dist folder -->
+    <copy todir="${publish.download.dir}"
+          file="${project}-${version}-${build.version}.zip"/>
+
+    <filter token="WEB" value="${publish.web.url}"/>
+    <!-- update the jnlp website with the new release -->
+    <!-- put skinlf.jar in jnlp folder -->
+    <copy todir="${publish.skinlf.home}/jnlp/" filtering="on" overwrite="yes">
+      <fileset dir="src/jnlp" includes="*.jnlp"/>
+    </copy>
+    <copy file="${build.dist.lib}/${project}.jar" todir="${publish.skinlf.home}/jnlp/"/>
+    <copy file="${build.dist.lib}/examples.jar" todir="${publish.skinlf.home}/jnlp/"/>
+    <copy file="${build.dist.lib}/themepack.zip" todir="${publish.skinlf.home}/jnlp/"/>
+    <copy file="${build.dist.lib}/nativeskin.jar" todir="${publish.skinlf.home}/jnlp"/>
+    <jar destfile="${publish.skinlf.home}/jnlp/nativeskinlibs.jar"
+         basedir="${build.dist.lib}" includes="*.dll"/>
+
+    <!-- copy the documentation
+    <copy todir="${web.skinlf.home}/documentation">
+      <fileset dir="${javadoc.destdir}"/>
+    </copy>
+    -->
+    <!-- Sign all Jars -->
+    <signjar keystore="../common/keystore" alias="L2FProd.com" storepass="L2FProd.com">
+       <fileset dir="${publish.skinlf.home}/jnlp" includes="*.jar"/>
+    </signjar>
+
+  </target>
+
+  <target name="themes">
+    <zip destfile="${build.www.themedir}/cellshadedthemepack.zip"
+	 basedir="src/themepacks/cellshadedthemepack"/>
+    <zip destfile="${build.www.themedir}/whistlerthemepack.zip"
+	 basedir="src/themepacks/whistlerthemepack"/>
+    <zip destfile="${build.www.themedir}/xplunathemepack.zip"
+	 basedir="src/themepacks/xplunathemepack"/>
+    <zip destfile="${build.www.themedir}/toxicthemepack.zip"
+	 basedir="src/themepacks/toxicthemepack"/>
+    <zip destfile="${build.www.themedir}/beigeazulthemepack.zip"
+	 basedir="src/themepacks/beigeazulthemepack"/>
+
+
+    <!-- png for these themepacks are not in cvs -->
+    <zip destfile="${build.www.themedir}/aquathemepack.zip"
+	 basedir="src/themepacks/aquathemepack"/>
+    <zip destfile="${build.www.themedir}/alloythemepack.zip"
+	 basedir="src/themepacks/alloythemepack"/>
+  </target>
+
+</project>
diff --git a/dev-java/skinlf/files/skinlf-6.7-common.xml b/dev-java/skinlf/files/skinlf-6.7-common.xml
new file mode 100644
index 000000000000..c2803acc5bab
--- /dev/null
+++ b/dev-java/skinlf/files/skinlf-6.7-common.xml
@@ -0,0 +1,171 @@
+<!--
+  Common Target which could be reused by other projects later.
+-->
+
+<!-- COMMON PROPERTIES -->
+
+  <property name="debug" value="true"/>
+  <property name="optimize" value="false"/>
+
+  <!-- Java Related -->
+  <property name="java.src.dir" value="src"/>
+  <property name="javac.compiler" value="modern"/>
+
+  <!-- Destination Directory for the build -->
+  <property name="build.dir" value="build"/>
+  <property name="build.classes" value="${build.dir}/classes"/>
+  <property name="build.src" value="${build.dir}/src"/>
+  <property name="build.dist.dir" value="${project}-${version}"/>
+  <property name="build.dist.src" value="${build.dist.dir}/src"/>
+  <property name="build.dist.lib" value="${build.dist.dir}/lib"/>
+  <property name="build.dist.bin" value="${build.dist.dir}/bin"/>
+  <property name="build.www.dir" value="${build.dir}/www"/>
+
+<!-- COMMON TARGETS -->
+
+  <target name="init.properties">
+    <tstamp>
+      <format property="build.time" pattern="MM/dd/yyyy hh:mm aa" locale="en"/>
+      <format property="build.version" pattern="yyyyMMdd" locale="en"/>
+    </tstamp>
+    <filter token="VERSION" value="${version}"/>
+    <filter token="PROJECT.FULLNAME" value="${project.fullname}"/>
+    <filter token="DATE" value="${build.time}"/>
+    <filter token="YEAR" value="${year}"/>
+  </target>
+
+  <target name="init.directories">
+    <mkdir dir="${build.dir}"/>
+    <mkdir dir="${build.classes}"/>
+    <mkdir dir="${build.dist.dir}"/>
+    <mkdir dir="${build.dist.src}"/>
+    <mkdir dir="${build.dist.lib}"/>
+    <mkdir dir="${build.dist.bin}"/>
+  </target>
+
+  <target name="init" depends="init.properties,init.directories">
+  </target>
+
+  <target name="clean">
+    <delete dir="${build.dir}"/>
+    <delete dir="${build.dist.dir}"/>
+  </target>
+
+  <target name="fixcrlf">
+    <fixcrlf srcdir="${basedir}" eol="cr">
+      <include name="AUTHORS,LICENSE*,README,THANKS" />
+      <include name="**/*.java" />
+    </fixcrlf>
+  </target>
+
+<!-- Java Related Targets -->
+
+  <target name="compile.java" depends="init">
+    <depend srcdir="${java.src.dir}"
+            destdir="${build.classes}"
+            cache="${build.dir}/dependcache"
+            closure="yes"/>
+
+    <copy todir="${build.src}" filtering="yes">
+      <fileset dir="${java.src.dir}">
+        <include name="**/*.java"/>
+      </fileset>
+    </copy>
+    <javac srcdir="${build.src}"
+           destdir="${build.classes}"
+           classpathref="classpath"
+           compiler="${javac.compiler}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           debug="${debug}"
+           optimize="${optimize}"
+           target="1.3" source="1.3">
+    </javac>
+  </target>
+
+<!-- Distribution Target -->
+
+  <target name="dist" depends="jar,dist.pre">
+    <!-- project.jar -->
+    <copy todir="${build.dist.lib}"
+          file="${build.dir}/${project}.jar"
+          preservelastmodified="yes"/>
+    <!-- source code -->
+    <copy todir="${build.dist.src}"
+          preservelastmodified="yes">
+      <fileset dir="${build.src}" includes="**/*.java"/>
+      <fileset dir="${java.src.dir}" includes="**/*.properties"/>
+    </copy>
+    <!-- regular files -->
+    <copy todir="${build.dist.dir}"
+          filtering="yes"
+          preservelastmodified="yes">
+      <fileset dir="${basedir}">
+        <include name="AUTHORS"/>
+        <include name="INSTALL"/>
+        <include name="README"/>
+        <include name="THANKS"/>
+        <include name="LICENSE"/>
+        <include name="LICENSE_*"/>
+      </fileset>
+    </copy>
+    <xslt in="xdocs/CHANGES.xml"
+          out="${build.dist.dir}/CHANGES"
+          style="xdocs/xsl/text.xsl"/>
+    <!-- zip file -->
+    <zip destfile="${project}-${version}-${build.version}.zip">
+      <zipfileset dir="${build.dist.dir}"
+                  prefix="${project}-${version}" />
+    </zip>
+  </target>
+
+<!-- Source code formatting -->
+
+  <target name="jalopy" depends="init">
+  </target>
+
+<!-- Project Web Documentation -->
+
+  <target name="www" depends="init">
+    <mkdir dir="${build.www.dir}"/>
+    <xslt in="xdocs/www.xml"
+          out="${build.www.dir}/empty.html"
+          style="xdocs/xsl/tohtml.xsl">
+      <param name="output.dir" expression="${build.www.dir}"/>
+      <param name="timestamp" expression="${build.time}"/>
+    </xslt>
+    <copy todir="${build.www.dir}">
+      <fileset dir="xdocs">
+        <include name="images/**"/>
+        <include name="**.java"/>
+      </fileset>
+    </copy>
+    <mkdir dir="${build.www.dir}/javadoc"/>
+    <javadoc sourcepath="${java.src.dir}"
+             classpath="${classpath}"
+             destdir="${build.www.dir}/javadoc"
+             packagenames="${javadoc.packagenames}"
+             private="false" protected="true"
+             windowtitle="${project.fullname} ${version} API"
+             doctitle="${project.fullname} ${version}"
+             version="false" author="false" use="false"
+             stylesheetfile="xdocs/javadoc.css"
+             splitindex="true"
+             bottom="Copyright &#169; ${year} L2FProd.com. All Rights Reserved."/>
+    <delete file="${build.www.dir}/empty.html"/>
+  </target>
+
+  <target name="www.sync" depends="init">
+    <ftp server="${build.www.server}"
+	 userid="${build.www.userid}"
+	 password="${build.www.password}"
+	 remotedir="${build.www.remotedir}"
+	 action="put"
+	 verbose="yes"
+	 depends="yes">
+      <fileset dir="${build.www.dir}">
+        <include name="**/**"/>
+      </fileset>
+    </ftp>
+  </target>
+  
diff --git a/dev-java/skinlf/files/skinlf-6.7-image-utils-without-jimi.patch b/dev-java/skinlf/files/skinlf-6.7-image-utils-without-jimi.patch
new file mode 100644
index 000000000000..3e797bf08d86
--- /dev/null
+++ b/dev-java/skinlf/files/skinlf-6.7-image-utils-without-jimi.patch
@@ -0,0 +1,77 @@
+diff -ru skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java
+--- src/com/l2fprod/tools/ImageUtils.java	2006-01-24 20:09:36.000000000 +0100
++++ src/com/l2fprod/tools/ImageUtils.java	2006-01-24 20:19:19.000000000 +0100
+@@ -6,15 +6,12 @@
+ 

+ import javax.swing.ImageIcon;

+ 

+-import com.ibm.imageconversion.*;

+-import com.sun.jimi.core.*;

++import javax.imageio.*;

+ 

+ public class ImageUtils {

+ 

+   public static Component bitmapCreator = new javax.swing.JLabel();

+   

+-  static BMPDecoder decoder = new BMPDecoder();

+-  static BMPEncoder encoder = new BMPEncoder();

+ 

+   public static Image loadPng(String pathToImage) throws Exception {

+     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());

+@@ -22,29 +19,33 @@
+   }

+ 

+   public static void savePng(Image image, String pathToImage) throws Exception {

+-    Jimi.putImage(image, pathToImage);

++    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));

+   }

+ 

++  private static String getFileFmt(String pathToImage) throws Exception {

++    String fmt;

++    if (pathToImage.toLowerCase().endsWith(".png")) {

++      return "png";

++    }

++    if (pathToImage.toLowerCase().endsWith(".gif")) {

++      return "gif";

++    }

++    if (pathToImage.toLowerCase().endsWith(".bmp")) {

++      return "bmp";

++    }

++    return "";

++  }

++  

+   public static void createPicture(String pathToImage, int index, int maxParts,

+                                    String filename, boolean horizontal) {

+     try {

+       System.out.println("working with " + pathToImage);

+       Image image = null;

+-

+-      if (pathToImage.toLowerCase().endsWith(".png") ||

+-        	pathToImage.toLowerCase().endsWith(".gif")) {

+-        image = loadPng(pathToImage);

+-      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {

+-        decoder.setInputFilename(pathToImage);

+-        decoder.triggerAction();

+-        image = decoder.getResult();

+-      } else {

+-        throw new Error("do not know how to load " + pathToImage);

+-      }

++      image = Toolkit.getDefaultToolkit().getImage(pathToImage);

+ 

+       // if only one image, dump it as it

+-	    if (index == 0 && maxParts == 1) {

+-        Jimi.putImage(image, filename);

++      if (index == 0 && maxParts == 1) {

++        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));

+       } else {

+         if (horizontal) {

+           int partHeight = image.getHeight(bitmapCreator) / maxParts;

+@@ -55,7 +56,7 @@
+           image = grab(image, partWidth * index, 0,

+                        partWidth, image.getHeight(bitmapCreator));

+         }

+-        Jimi.putImage(image, filename);

++	ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));

+       }

+     } catch (Exception e) {

+       System.out.println("error while working with " + pathToImage);

diff --git a/dev-java/skinlf/metadata.xml b/dev-java/skinlf/metadata.xml
new file mode 100644
index 000000000000..0cd2a3b2609e
--- /dev/null
+++ b/dev-java/skinlf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>java@gentoo.org</email>
+<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/skinlf/skinlf-6.7-r1.ebuild b/dev-java/skinlf/skinlf-6.7-r1.ebuild
new file mode 100644
index 000000000000..96b555f81873
--- /dev/null
+++ b/dev-java/skinlf/skinlf-6.7-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="examples source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${P}-20060722"
+
+DESCRIPTION="Skin Look and Feel - Skinning Engine for the Swing toolkit"
+HOMEPAGE="http://skinlf.l2fprod.com/"
+SRC_URI="https://${PN}.dev.java.net/files/documents/66/37801/${MY_P}.zip"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/laf-plugin:0
+	dev-java/xalan:0"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip:0
+	${CDEPEND}"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-image-utils-without-jimi.patch"
+
+	cp "${FILESDIR}/${P}-build.xml" build.xml || die
+	cp "${FILESDIR}/${P}-common.xml" common.xml || die
+
+	cd lib || die
+
+	# assert_built_jar_equals is your friend, upstream your enemy
+	unzip ${PN}.jar '*.gif' '*.template' -d ../src || die
+	rm -v *.jar || die
+
+	java-pkg_jar-from xalan,laf-plugin
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+
+	# laf-plugin.jar is referenced in manifest's Class-Path
+	# doesn't work without it due to class loader trickery
+	# upstream solved this by absorbing laf-plugin in own jar...
+	java-pkg_dojar lib/laf-plugin.jar
+
+	use examples && java-pkg_doexamples src/examples
+	use source && java-pkg_dosrc src/com src/*.java
+
+	dodoc CHANGES README
+}
diff --git a/dev-java/slf4j-api-1.7.7 b/dev-java/slf4j-api-1.7.7
deleted file mode 100644
index 5c3331791663..000000000000
--- a/dev-java/slf4j-api-1.7.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple Logging Facade for Java
-EAPI=5
-HOMEPAGE=http://www.slf4j.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dccd62aeb43d26e27ca1f8feb660ba66
diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
new file mode 100644
index 000000000000..8c4afdabada1
--- /dev/null
+++ b/dev-java/slf4j-api/Manifest
@@ -0,0 +1,4 @@
+AUX 1.7.7-build.xml 8474 BLAKE2B d6651256fe317ca494c30901f8b71c932c58580a26a6f94a49da76377045a17ee096c81f2069728f2ab49409dbf0108d4294c68aeeea4bcc5cc50c2346f7f4b3 SHA512 9810581760b885c9d0cd8c99da566a8d144b2e612a9a66401a9cf9e9868135bca1d8b98b5e5a237acf0d65029ba6e510bbab85c03e36742f3b1ba15380852d95
+DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
+EBUILD slf4j-api-1.7.7.ebuild 996 BLAKE2B ddf56343573b90c51228656c6bb9457689c72d9ad2e225232501d36bd0ce7240d6c2a83031b79c84223056c199e43817065fa6ec8f3540bcea7644256b489275 SHA512 b3b8a8c1bb37c1a4326ff58c3628a3bcfd1fcf985be3840eb3254c1b63212c7e8607371ed991781743e875c7982662aa870894ae4438de1694f113dab0bf4d58
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/slf4j-api/files/1.7.7-build.xml b/dev-java/slf4j-api/files/1.7.7-build.xml
new file mode 100644
index 000000000000..fdd87b89bfed
--- /dev/null
+++ b/dev-java/slf4j-api/files/1.7.7-build.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="slf4j-api-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="slf4j-api-1.7.6"/>
+  <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"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.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}"
+           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>
+    <delete dir="${maven.build.outputDir}/org/slf4j/impl" />
+    <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.6"
+           verbose="false"
+           fork="false"
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/AllTest.java"/>
+          <exclude name="**/PackageTest.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/AllTest.java"/>
+          <exclude name="**/PackageTest.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"
+         manifest="${basedir}/target/classes/META-INF/MANIFEST.MF"
+         basedir="${maven.build.outputDir}"
+         excludes="**/package.html"/>
+  </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"/>
+</project>
diff --git a/dev-java/slf4j-api/metadata.xml b/dev-java/slf4j-api/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/slf4j-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
new file mode 100644
index 000000000000..d25423ff91c0
--- /dev/null
+++ b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple Logging Facade for Java"
+HOMEPAGE="http://www.slf4j.org/"
+SRC_URI="http://www.slf4j.org/dist/${P/-api/}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+	)"
+
+S="${WORKDIR}/${P/-api/}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+EANT_TEST_ANT_TASKS="ant-junit"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+java_prepare() {
+	cp "${FILESDIR}"/"${PV}"-build.xml build.xml || die
+	find "${WORKDIR}" -iname '*.jar' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/slf4j-ext-1.7.5 b/dev-java/slf4j-ext-1.7.5
deleted file mode 100644
index 8dc615452ba6..000000000000
--- a/dev-java/slf4j-ext-1.7.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip dev-java/slf4j-api:0 dev-java/javassist:3 dev-java/cal10n:0 dev-java/commons-lang:2.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple Logging Facade for Java
-EAPI=5
-HOMEPAGE=http://www.slf4j.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 dev-java/javassist:3 dev-java/cal10n:0 dev-java/commons-lang:2.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b55dd37b7e892e31a4ac8edd2b9baeb9
diff --git a/dev-java/slf4j-ext-1.7.7 b/dev-java/slf4j-ext-1.7.7
deleted file mode 100644
index 5d0ac93538b2..000000000000
--- a/dev-java/slf4j-ext-1.7.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/slf4j-api:0 dev-java/javassist:3 dev-java/cal10n:0 dev-java/commons-lang:2.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple Logging Facade for Java
-EAPI=5
-HOMEPAGE=http://www.slf4j.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 dev-java/javassist:3 dev-java/cal10n:0 dev-java/commons-lang:2.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=edf1a164c1662d3c3c17168930087d20
diff --git a/dev-java/slf4j-ext/Manifest b/dev-java/slf4j-ext/Manifest
new file mode 100644
index 000000000000..68d3b403780d
--- /dev/null
+++ b/dev-java/slf4j-ext/Manifest
@@ -0,0 +1,7 @@
+AUX 1.7.5-build.xml 4262 BLAKE2B b234c7a2bef328485ec3213bb7af1d1403a8dffa8f4d4b5187a6cbf4b2ab52ad1c3e10295f160d3393c9220f1426b6429a76cb63d3d2775655986019cc091685 SHA512 06b9f3342928c58b10b0dfc70b1f990209da58e14b6293b2d7b7add6db0463698b473d33c305d2469dc96f3d9c8b5cac98e931ddbdcc2c100c82a30c26fa6547
+AUX 1.7.7-build.xml 4262 BLAKE2B b234c7a2bef328485ec3213bb7af1d1403a8dffa8f4d4b5187a6cbf4b2ab52ad1c3e10295f160d3393c9220f1426b6429a76cb63d3d2775655986019cc091685 SHA512 06b9f3342928c58b10b0dfc70b1f990209da58e14b6293b2d7b7add6db0463698b473d33c305d2469dc96f3d9c8b5cac98e931ddbdcc2c100c82a30c26fa6547
+DIST slf4j-1.7.5.tar.gz 2862186 BLAKE2B b594581435ed4a0aca8730e248cee1f41d6cd36ead03fb0744edb6c2ef42d6dc99e4c7851a212350487fd64db648675ab484c05124cf7f22249d09d4c031b07f SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7
+DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
+EBUILD slf4j-ext-1.7.5.ebuild 1129 BLAKE2B 4f9db88e1ffc85cb0a83a096ade025551008c09a0a08d8b10ba40a5f729b6617e26eb6e1d16111f5030ddef1f265caa852f60f042425a4f03cc3535f96159d59 SHA512 9a4d0f93acf858157d59207d6f1e5fc9678a2ec24056743fe57d9d89c3fdda2908cfe125763d05f9b0dde5cfbf8218e01058d71f020117757515d9ab20e47de2
+EBUILD slf4j-ext-1.7.7.ebuild 1133 BLAKE2B 01611669345b83168180d8291a72bd1556d9793c9d13d3edcc3df2c83f0949973f5ec4e497c91cf506cf65506b2c8f1f0b875f93a5a6629d6ef4cd7dbb2853fb SHA512 bf5435e1cca6dc861477cf81489753e59b470694e85d21351abb44ab2d1f9133997e2d896f005b50d50cccaabe4524a8efa0ee4f1f7c952077423635d8aa0e7c
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/slf4j-ext/files/1.7.5-build.xml b/dev-java/slf4j-ext/files/1.7.5-build.xml
new file mode 100644
index 000000000000..0e118338196e
--- /dev/null
+++ b/dev-java/slf4j-ext/files/1.7.5-build.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="slf4j-ext" default="jar" basedir=".">
+	<property file="${user.home}/.m2/maven.properties" />
+	<property file="maven-build.properties" />
+
+	<property name="maven.build.finalName" value="${ant.project.name}" />
+	<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" />
+
+	<path id="build.classpath"/>
+	<path id="build.test.classpath" />
+
+	<target name="clean" description="Clean the output directory">
+		<delete dir="${maven.build.dir}" />
+	</target>
+
+	<target name="compile" description="Compile the code">
+		<mkdir dir="${maven.build.outputDir}" />
+		<javac destdir="${maven.build.outputDir}" nowarn="false" debug="false" optimize="true" deprecation="false" 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>
+
+	<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="false" optimize="true" deprecation="false" 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>
+	</target>
+
+	<target name="test" depends="compile-tests" 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="**/AllTest.java" />
+					<exclude name="**/PackageTest.java" />
+				</fileset>
+			</batchtest>
+			<batchtest todir="${maven.test.reports}" if="test">
+				<fileset dir="${maven.build.testDir.0}">
+					<include name="**/${test}.java" />
+					<exclude name="**/AllTest.java" />
+					<exclude name="**/PackageTest.java" />
+				</fileset>
+			</batchtest>
+		</junit>
+	</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>
+
+	<target name="jar" 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" />
+	</target>
+</project>
diff --git a/dev-java/slf4j-ext/files/1.7.7-build.xml b/dev-java/slf4j-ext/files/1.7.7-build.xml
new file mode 100644
index 000000000000..0e118338196e
--- /dev/null
+++ b/dev-java/slf4j-ext/files/1.7.7-build.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="slf4j-ext" default="jar" basedir=".">
+	<property file="${user.home}/.m2/maven.properties" />
+	<property file="maven-build.properties" />
+
+	<property name="maven.build.finalName" value="${ant.project.name}" />
+	<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" />
+
+	<path id="build.classpath"/>
+	<path id="build.test.classpath" />
+
+	<target name="clean" description="Clean the output directory">
+		<delete dir="${maven.build.dir}" />
+	</target>
+
+	<target name="compile" description="Compile the code">
+		<mkdir dir="${maven.build.outputDir}" />
+		<javac destdir="${maven.build.outputDir}" nowarn="false" debug="false" optimize="true" deprecation="false" 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>
+
+	<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="false" optimize="true" deprecation="false" 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>
+	</target>
+
+	<target name="test" depends="compile-tests" 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="**/AllTest.java" />
+					<exclude name="**/PackageTest.java" />
+				</fileset>
+			</batchtest>
+			<batchtest todir="${maven.test.reports}" if="test">
+				<fileset dir="${maven.build.testDir.0}">
+					<include name="**/${test}.java" />
+					<exclude name="**/AllTest.java" />
+					<exclude name="**/PackageTest.java" />
+				</fileset>
+			</batchtest>
+		</junit>
+	</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>
+
+	<target name="jar" 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" />
+	</target>
+</project>
diff --git a/dev-java/slf4j-ext/metadata.xml b/dev-java/slf4j-ext/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/slf4j-ext/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild
new file mode 100644
index 000000000000..5aef8e47489b
--- /dev/null
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple Logging Facade for Java"
+HOMEPAGE="http://www.slf4j.org/"
+SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/slf4j-api:0
+	dev-java/javassist:3
+	dev-java/cal10n:0
+	dev-java/commons-lang:2.1"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${P/-ext/}/${PN}"
+
+RESTRICT="test" # causes loop with log4j:2
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="slf4j-api,javassist-3,cal10n,commons-lang-2.1"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_ANT_TASKS="ant-junit"
+
+java_prepare() {
+	cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
+	find "${S}" -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/target/${PN}.jar
+	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
+	use source && java-pkg_dosrc "${S}"/src/main/java/org
+}
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
new file mode 100644
index 000000000000..a28025766e7d
--- /dev/null
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple Logging Facade for Java"
+HOMEPAGE="http://www.slf4j.org/"
+SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+COMMON_DEP="dev-java/slf4j-api:0
+	dev-java/javassist:3
+	dev-java/cal10n:0
+	dev-java/commons-lang:2.1"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${P/-ext/}/${PN}"
+
+RESTRICT="test" # causes loop with log4j:2
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="slf4j-api,javassist-3,cal10n,commons-lang-2.1"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_ANT_TASKS="ant-junit"
+
+java_prepare() {
+	cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
+	find "${S}" -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/target/${PN}.jar
+	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
+	use source && java-pkg_dosrc "${S}"/src/main/java/org
+}
diff --git a/dev-java/slf4j-log4j12-1.7.7 b/dev-java/slf4j-log4j12-1.7.7
deleted file mode 100644
index 3fe651d00573..000000000000
--- a/dev-java/slf4j-log4j12-1.7.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jdk-1.6 test? ( dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/ant-junit4:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple Logging Facade for Java (SLF4J) log4j bindings
-EAPI=5
-HOMEPAGE=http://www.slf4j.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=88bcdd78c78224103d61169f7d7bf98b
diff --git a/dev-java/slf4j-log4j12/Manifest b/dev-java/slf4j-log4j12/Manifest
new file mode 100644
index 000000000000..b7f34db476fb
--- /dev/null
+++ b/dev-java/slf4j-log4j12/Manifest
@@ -0,0 +1,4 @@
+AUX slf4j-log4j12-1.7.7-maven-build.xml 10522 BLAKE2B 3396e8ae9452a54072457696261ac59745fbf11ca10e240b9b81de7e37441cf83185115b8d37d2662bffca02a7ee4e99c90ba9c1f02878c3aa0fc2706ce836f4 SHA512 169e6b50e5ec5e44047dae2be9144e1626e2a5e95a0fb92c61e01164804433887e7e8b1c0108ef3bcc7dbbadeff9eab86c85977572a80825bdb5ac2914d65ce9
+DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
+EBUILD slf4j-log4j12-1.7.7.ebuild 1169 BLAKE2B fb73134918397ccf2bcc6281588a8ba78370bfde9e1b4d09fc4b95178438091eba9af8a5445397965330a557fb1d7bea28432175238efbe6d83414107e992bc1 SHA512 047fc8d5551d0539045aa406c218c4104de000e3b63659075a62879074e7f8caa8a922b8b5fe4c2b29da48e9308c9d925915d63bf9d28e08e95e7a0b7bcd6164
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.7-maven-build.xml b/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.7-maven-build.xml
new file mode 100644
index 000000000000..e88e8b290cc4
--- /dev/null
+++ b/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.7-maven-build.xml
@@ -0,0 +1,241 @@
+<?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/12/14 1:54 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="slf4j-log4j12-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="slf4j-log4j12-1.7.7"/>
+  <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/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
+    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
+    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.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}" 
+           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>
+  </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.6" 
+           verbose="false" 
+           fork="false" 
+           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, 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="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/AllTest.java"/>
+          <exclude name="**/PackageTest.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/AllTest.java"/>
+          <exclude name="**/PackageTest.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" 
+         manifest="${maven.build.resourceDir.0}/META-INF/MANIFEST.MF" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </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/slf4j-log4j12/metadata.xml b/dev-java/slf4j-log4j12/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/slf4j-log4j12/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
new file mode 100644
index 000000000000..87788627a484
--- /dev/null
+++ b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple Logging Facade for Java (SLF4J) log4j bindings"
+HOMEPAGE="http://www.slf4j.org/"
+SRC_URI="http://www.slf4j.org/dist/${P/-log4j12/}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+COMMON_DEPEND="
+	dev-java/log4j:0
+	dev-java/slf4j-api:0"
+
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/hamcrest-core:0
+		dev-java/junit:4
+		dev-java/ant-junit4:0
+	)"
+
+S=${WORKDIR}/${P/-log4j12/}/${PN}
+
+EANT_GENTOO_CLASSPATH="log4j,slf4j-api"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-maven-build.xml build.xml || die
+	find "${WORKDIR}" -iname '*.jar' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/slf4j-nop-1.7.7 b/dev-java/slf4j-nop-1.7.7
deleted file mode 100644
index dae851b05b51..000000000000
--- a/dev-java/slf4j-nop-1.7.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip test? ( dev-java/ant-junit:0 dev-java/junit:4 ) dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple Logging Facade for Java
-EAPI=5
-HOMEPAGE=http://www.slf4j.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=526245eca5f28dfa648ddd5fb385a913
diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest
new file mode 100644
index 000000000000..5e721245d5a0
--- /dev/null
+++ b/dev-java/slf4j-nop/Manifest
@@ -0,0 +1,4 @@
+AUX 1.7.7-build.xml 4261 BLAKE2B 400a954f4214f7282c4c0fd3b5dedb4af8703f58fa817865c14ec8e79aebaaaec957183285550c68f346534795095dcb3de239f2c43c667eea206bb8bd04ae95 SHA512 dc29b7acbc159eb592417a9457875d9f7c33ac21df87885f6a3faa8047f68550f16f2b8a24f5b8efaa123b1c8507ec6cd9d61ed154aff0406bdb008d62132120
+DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
+EBUILD slf4j-nop-1.7.7.ebuild 1080 BLAKE2B 066eed03353322d1c0f6ebe75120f887fc5809f29549297e009bb1f8ec5725b6d02b5d87dceb68f9b8c184d2799489b1a138f9169cbff3ff5a7ad3e94b1ebaed SHA512 d2436dcb4b5118743c425445d56a16073d0c68322fdf57262643119e84592ab9f0a2439a6308f3e6edd6d521284fb4722cf39f2678b2d877fb57048152b32b75
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/slf4j-nop/files/1.7.7-build.xml b/dev-java/slf4j-nop/files/1.7.7-build.xml
new file mode 100644
index 000000000000..9d898d340d34
--- /dev/null
+++ b/dev-java/slf4j-nop/files/1.7.7-build.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="slf4j-nop-from-maven" default="jar" basedir=".">
+	<property file="${user.home}/.m2/maven.properties" />
+	<property file="maven-build.properties" />
+
+	<property name="maven.build.finalName" value="slf4j-nop" />
+	<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" />
+
+	<path id="build.classpath"/>
+	<path id="build.test.classpath" />
+
+	<target name="clean" description="Clean the output directory">
+		<delete dir="${maven.build.dir}" />
+	</target>
+
+	<target name="compile" 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>
+
+	<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>
+	</target>
+
+	<target name="test" depends="compile-tests" 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="**/AllTest.java" />
+					<exclude name="**/PackageTest.java" />
+				</fileset>
+			</batchtest>
+			<batchtest todir="${maven.test.reports}" if="test">
+				<fileset dir="${maven.build.testDir.0}">
+					<include name="**/${test}.java" />
+					<exclude name="**/AllTest.java" />
+					<exclude name="**/PackageTest.java" />
+				</fileset>
+			</batchtest>
+		</junit>
+	</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>
+
+	<target name="jar" 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" />
+	</target>
+</project>
diff --git a/dev-java/slf4j-nop/metadata.xml b/dev-java/slf4j-nop/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/slf4j-nop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
new file mode 100644
index 000000000000..417575df7e97
--- /dev/null
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple Logging Facade for Java"
+HOMEPAGE="http://www.slf4j.org/"
+SRC_URI="http://www.slf4j.org/dist/${P/-nop/}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+CDEPEND="dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${P/-nop/}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="slf4j-api"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_ANT_TASKS="ant-junit"
+
+java_prepare() {
+	cp -v "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
+	find "${S}" -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
+	use source && java-pkg_dosrc "${S}"/src/main/java/org
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/slf4j-simple-1.7.7 b/dev-java/slf4j-simple-1.7.7
deleted file mode 100644
index 767bb7da18b0..000000000000
--- a/dev-java/slf4j-simple-1.7.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/slf4j-api:0 test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple Logging Facade for Java
-EAPI=5
-HOMEPAGE=http://www.slf4j.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=02470128a295cf0e398636d5451db3fe
diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest
new file mode 100644
index 000000000000..28ffac5a3fbe
--- /dev/null
+++ b/dev-java/slf4j-simple/Manifest
@@ -0,0 +1,4 @@
+AUX 1.7.7-build.xml 8491 BLAKE2B 585e41d7760e2d05fee17fb4c35de203eced8f9298bfd880d5f2e4a698cd78f8e00488227dad96dba805ce646f2d2fd1444fb87e29f929fc2cb96d919efd5c1d SHA512 8961b303c86000433af761d448c016c13d105d99547e67ace24bdb2f9f95427bdf4a0d4e02fdaefced1a574d2968f9af7e4429e33fb85d1ceb8439036c888917
+DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
+EBUILD slf4j-simple-1.7.7.ebuild 1096 BLAKE2B 1a82bebd4e26fe49d1f097d908c518ef5bc4b7755f22801e8c87b347afb79a446049e2e7de1aead2f13d63337601fe19f927476989aaf445012b9b5ac3e63921 SHA512 25ae34e58d5e134d327038934c4d582355bdc38e4b3da505999997118e829e016fbdac201168981691262f61f98b19141db8521b60a95db1f39d4c45708edb64
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/slf4j-simple/files/1.7.7-build.xml b/dev-java/slf4j-simple/files/1.7.7-build.xml
new file mode 100644
index 000000000000..f91d565e170a
--- /dev/null
+++ b/dev-java/slf4j-simple/files/1.7.7-build.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="slf4j-simple-from-maven" default="package" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="slf4j-simple-1.7.6"/>
+  <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/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.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}"
+           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="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/AllTest.java"/>
+          <exclude name="**/PackageTest.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/AllTest.java"/>
+          <exclude name="**/PackageTest.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"
+         manifest="${maven.build.resourceDir.0}/META-INF/MANIFEST.MF"
+         basedir="${maven.build.outputDir}"
+         excludes="**/package.html"/>
+  </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"/>
+</project>
diff --git a/dev-java/slf4j-simple/metadata.xml b/dev-java/slf4j-simple/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/slf4j-simple/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
new file mode 100644
index 000000000000..3cc4d3beaafe
--- /dev/null
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple Logging Facade for Java"
+HOMEPAGE="http://www.slf4j.org/"
+SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+IUSE="test"
+
+CDEPEND="
+	dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+	)"
+
+S="${WORKDIR}/${P/-simple/}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="slf4j-api"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_ANT_TASKS="ant-junit"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+java_prepare() {
+	cp "${FILESDIR}"/"${PV}"-build.xml build.xml || die
+	find "${S}" -name "*.jar" -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/smack-2.2.1 b/dev-java/smack-2.2.1
deleted file mode 100644
index 4e898f48d668..000000000000
--- a/dev-java/smack-2.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 dev-java/xpp3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An Open Source XMPP (Jabber) client library for instant messaging and presence
-EAPI=0
-HOMEPAGE=http://www.jivesoftware.org/smack/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/xpp3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=2.2
-SRC_URI=http://www.jivesoftware.org/builds/smack/smack-dev-2.2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2ad08fa5c197e08b8123c3e552864988
diff --git a/dev-java/smack/Manifest b/dev-java/smack/Manifest
new file mode 100644
index 000000000000..f29ad6b02b8d
--- /dev/null
+++ b/dev-java/smack/Manifest
@@ -0,0 +1,3 @@
+DIST smack-dev-2.2.1.tar.gz 4052596 BLAKE2B c8be42b444533557a6d2dbc363fb58349ec677898e03d8ffcace063bf98997c7bbff6a4b04dc88eb012660b8f03da80fd710b501724260ab8147ebd6014682b6 SHA512 a6f6f70a61dec69ec2f3c82544f83100bf4ef39aa657ed7a8ce635be8484d3ed2cb539961286482ccc9f607520e0646e14668a17b4004ae6bd157b3d894146f0
+EBUILD smack-2.2.1.ebuild 1083 BLAKE2B 630883ab51bc80e33fd723146207c935ea120fa7a142dc29b88c91a20cf519a6ef3eb014cb3d5540ac6f2059aaab33fd7086fa360f90fab241bb1dd670698d67 SHA512 cb0fb55f756a5ad7be9f37dab442cd05427272b29250067b6579aab6cc953495111207af975b8338101d8d914f9604ac9c7eeb6d4450def528b2321cdffc91ac
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/smack/metadata.xml b/dev-java/smack/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/smack/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/smack/smack-2.2.1.ebuild b/dev-java/smack/smack-2.2.1.ebuild
new file mode 100644
index 000000000000..50eef5789a61
--- /dev/null
+++ b/dev-java/smack/smack-2.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="${PN}-dev"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="An Open Source XMPP (Jabber) client library for instant messaging and presence"
+HOMEPAGE="http://www.jivesoftware.org/smack/"
+SRC_URI="http://www.jivesoftware.org/builds/${PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEP="dev-java/xpp3"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd "${S}"
+	rm -f *.jar build/lib/*.jar build/merge/*.jar build/*.jar
+
+	cd "${S}/build/lib/"
+	java-pkg_jar-from xpp3
+
+	sed -i -e '/zipfileset/d' "${S}/build/build.xml" || die
+
+}
+
+EANT_BUILD_XML="build/build.xml"
+EANT_EXTRA_ARGS="-Djavadoc.dest.dir=api"
+
+src_install() {
+
+	java-pkg_dojar *.jar
+
+	dohtml *.html
+
+	use doc && {
+		java-pkg_dohtml -r documentation/*
+		java-pkg_dojavadoc api
+	}
+	use source && java-pkg_dosrc source/*
+
+}
diff --git a/dev-java/snakeyaml-1.16 b/dev-java/snakeyaml-1.16
deleted file mode 100644
index 8be9bbb9c9e2..000000000000
--- a/dev-java/snakeyaml-1.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/joda-time:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A YAML 1.1 parser and emitter for Java 5
-EAPI=5
-HOMEPAGE=https://bitbucket.org/asomov/snakeyaml
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://bitbucket.org/asomov/snakeyaml/get/v1.16.tar.bz2 -> snakeyaml-1.16.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8278c06c265e08303d76fb124feb16bd
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
new file mode 100644
index 000000000000..67062f475acc
--- /dev/null
+++ b/dev-java/snakeyaml/Manifest
@@ -0,0 +1,3 @@
+DIST snakeyaml-1.16.tar.bz2 234954 BLAKE2B dea06c3501ceab4e92b4d125dc882ce7b7773d67ac5526fdf39fafb421f339fe892cfd3f8e80e413aa080fecbc94425842ccabd099d97e1c705eab7025c489e9 SHA512 77ef0b1fa2ebe7ab1618745c407436ac6965159e29e1271b0d571006b967bcd94658eb3a8047180ea7c3160eb66ecbac1f24414537a24a81c11fb735ce65e3a4
+EBUILD snakeyaml-1.16.ebuild 1306 BLAKE2B 29ca20cd99f68ec36a984d8c7c5dcfaf921c97b5b57fa045a4b139c5c9de700142de748d2cf3455aff6bcb5c18db90fda8a7267faf36b32ad7ff25eeb63f21ec SHA512 c01f82279a4990f1d6a23790d5c3eb69ffe996836fd1c594cc30bc72612398187b7ff2b8643e4593a79cdb9142ccfb536f6980e1d1818da0b57edbe5bed8f746
+MISC metadata.xml 320 BLAKE2B f5e0df5b735f9728165a2b8a6cd9c5f6d0142878f75ace80705d73e6948654f4761ef4fa4715b23ae4f5d97ed25e2ab6aa72582a80790a3f7a13d8c59f73ad40 SHA512 149372d821a11d3dfce7ec38ddb98c9b5b5e64c513fdd1e27b74dce17f398eec6d24b5a61ad62fb5e6e0ee31f206f1ed005db953f5f2358177f1a1d56420d5cc
diff --git a/dev-java/snakeyaml/metadata.xml b/dev-java/snakeyaml/metadata.xml
new file mode 100644
index 000000000000..8d37abe52245
--- /dev/null
+++ b/dev-java/snakeyaml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">asomov/snakeyaml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/snakeyaml/snakeyaml-1.16.ebuild b/dev-java/snakeyaml/snakeyaml-1.16.ebuild
new file mode 100644
index 000000000000..d0e257b8771e
--- /dev/null
+++ b/dev-java/snakeyaml/snakeyaml-1.16.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple vcs-snapshot
+
+DESCRIPTION="A YAML 1.1 parser and emitter for Java 5"
+HOMEPAGE="https://bitbucket.org/asomov/snakeyaml"
+SRC_URI="https://bitbucket.org/asomov/${PN}/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/joda-time:0
+		dev-java/junit:4 )"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	# Remove some tests with tricky dependencies.
+	rm -rv src/test/java/{examples/SpringTest.java,org/yaml/snakeyaml/{emitter/template/VelocityTest.java,issues/issue9}} || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md src/etc/announcement.msg
+}
+
+src_test() {
+	local DIR="src/test/java"
+	local CP="${DIR}/../resources:${DIR}:${PN}.jar:$(java-pkg_getjars joda-time,junit-4)"
+
+	local TESTS=$(find "${DIR}" -name "*Test.java" ! -name AbstractTest.java ! -name PyImportTest.java)
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/snappy-1.0.3_rc3 b/dev-java/snappy-1.0.3_rc3
deleted file mode 100644
index ee81b101f560..000000000000
--- a/dev-java/snappy-1.0.3_rc3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/xerial-core:0 ) dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Snappy compressor/decompressor for Java
-EAPI=5
-HOMEPAGE=https://github.com/xerial/snappy-java/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=https://github.com/xerial/snappy-java/archive/snappy-java-1.0.3-rc3.tar.gz -> snappy-java-1.0.3_rc3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9c87aad9bb1076d8f5cec730a1ad9f6e
diff --git a/dev-java/snappy-1.1.0.1 b/dev-java/snappy-1.1.0.1
deleted file mode 100644
index 784da84012a5..000000000000
--- a/dev-java/snappy-1.1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/xerial-core:0 dev-java/plexus-classworlds:0 ) dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Snappy compressor/decompressor for Java
-EAPI=5
-HOMEPAGE=https://github.com/xerial/snappy-java/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.1
-SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.0.1.tar.gz -> snappy-java-1.1.0.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=682a7afb07c4d74950986862764f2924
diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
new file mode 100644
index 000000000000..e338ce511d7d
--- /dev/null
+++ b/dev-java/snappy/Manifest
@@ -0,0 +1,10 @@
+AUX 1.0.3_rc3-gentoo.patch 407 BLAKE2B d49edbd556a7f7645e42b14f2284342a9b2036a6a891d7a9b46068c59d938dd6aa18503357b015de87a92d9ea74898bc2d7e49df91224285b90ca10760923b6e SHA512 026299b83596c93618c92dc5d1b02cd982e179fc9a65ddedcf482fdbd63c9a3a8fbe85e76590fc1dc67183c6dd332226ab7868e777e63dbf930d92b53a444c7e
+AUX 1.0.3_rc3-unbundle-snappy.patch 1823 BLAKE2B 8f412141c8db63fceaf6dec1e2d6dadc57c448a818a73304b0a76d9917f1d7f43d10eaffb8c29ae9b91e14561a701b9f3cb76ad75872db47776861195e7af22a SHA512 ddc823700111bf2f8635c6ec7291ad3665506fd24d9e5263bc46681cfd3d34e604397848a9b78929107d7de3bae0c3802bc8bb642dbac1f4984565d04cb71115
+AUX 1.1.0.1-gentoo.patch 407 BLAKE2B 1ee8af08605bfcf4b61b23784da9fdb7f116536742db4d0a6dda2b04c10115fb989c488632b495496899c2e7547549b997f120b96a7add64311584e0595d4763 SHA512 0e12de9c8b1c86791b43565312a12c50036cd501c5eea5bf45a09408121b99d79f58a1047acd26202afbac246f1264dfa86da785705f83f9db1356d824c9e40f
+AUX 1.1.0.1-unbundle-snappy.patch 1780 BLAKE2B 972bb8ed77fea8de8627bd15c9abc633def05cbcc696ff198ced852584c5dafb6abd89bba73afa7406f1fea008f1098b1ccd4951f0d59c6570583dd6c22c673a SHA512 75553615c0d6c5a24c14820b09021c225c89fcf2c680eabb27957cf45f3796344745f546939d0b98d78aca192c3cd23bfe7836f6f1c7a0b03748f084579b65df
+AUX 1.x-build.xml 8496 BLAKE2B 0ab98a4149d0d7b294efec29374c59af8599362fa40d04737d50d1106157d8e604e17ce06c9180c2d9ca2b612cb5d025a111fe620739f7109a0c384ae940d4dc SHA512 ed47379879bab5cbaa4111616c3cca526725e4fa3d8d42da72d19a21738cc42826e37756a181e6d541f27aa4abe7f2353be90c51f4d89d04413501e6ccdb4cb0
+DIST snappy-java-1.0.3_rc3.tar.gz 5466748 BLAKE2B a58847aa56d05659bcf53f0f7a6ba9c52611784bc6a8cc40d5838309e94c72bba8c8a1a27ca5249a223823a8cc1267dabeb12f369dae71999f55d5a64a111948 SHA512 eae4551d929f951be204218926cdea773a337ad584bd6fe49083526430a4e1ea80b395a627ecebc861232d36d2ec9034f2ebccac885da13e93fb74846298ba64
+DIST snappy-java-1.1.0.1.tar.gz 4909520 BLAKE2B 65daf3d01f1cb46dd0d51609e2d95fc954d56e41fbb2d22e9eca24fad16a6d4ba16083e633fb13e68dacf6c2fb0d10ec6fb1e6dcdda6dc611b58b172710fcd62 SHA512 32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e
+EBUILD snappy-1.0.3_rc3.ebuild 1451 BLAKE2B 12d41c164386a228231b3483f8dc6024a7430af3f55a4ea34339c7da98d19ce7eb8c57ee7a2171aef7b96e420f86d7d3b29dadfb74ecd9c27b1e054e34308f77 SHA512 268de9c4e6a5edbd07cb48dab62da2120187d359e16496457859a7e2772c1add9236c4b4bec3d64f28153b9a7db0d90594d2d3aac8e871e048c7373e4b09f271
+EBUILD snappy-1.1.0.1.ebuild 1466 BLAKE2B 4e46b14af58b6ebd415599bce40cb173c2f1452bcdd64c4b36216abe1e2e80a4fd611e28d6073b96a259cc38e49ea4edf52cd811bc733ef56d90bcc6b5c11a9d SHA512 ce574f4a7f8fe94d7bc72206b1330645249c7f538adb573a5a289d39475c4c05f38aeece92004a9dbb586511b2729fcfae977b99567476a5f756c24cab256d55
+MISC metadata.xml 319 BLAKE2B aa818743200d9cb65ddafa6f447c385862a603467950a6a71e6aba21f2510add3ab16fe39e11b02848bf97e15eb28827b2705b5288ee21a5b4b158574e10f915 SHA512 c652d81b9f2400efd81da0f61ed764ef80873e16b5e04d6c5689ec7633f34f83065edc2f2a7f7fd0443770e281befb5700c3416ea0aa74c548a85e337a9fed6e
diff --git a/dev-java/snappy/files/1.0.3_rc3-gentoo.patch b/dev-java/snappy/files/1.0.3_rc3-gentoo.patch
new file mode 100644
index 000000000000..58a17b0dbd04
--- /dev/null
+++ b/dev-java/snappy/files/1.0.3_rc3-gentoo.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index a9d5cdc..8026741 100644
+--- a/Makefile
++++ b/Makefile
+@@ -44,8 +44,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
+ 
+ 
+ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
+-	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
+-	$(STRIP) $@
++	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy $(LDFLAGS)
+ 
+ clean-native: 
+ 	rm -rf $(SNAPPY_OUT)
diff --git a/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch b/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch
new file mode 100644
index 000000000000..4885e7b5df80
--- /dev/null
+++ b/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch
@@ -0,0 +1,52 @@
+diff --git a/Makefile b/Makefile
+index b67855a..a9d5cdc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,8 @@ all: snappy
+ 
+ SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch)
+ SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz 
+-SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
++#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
++SNAPPY_CC:=
+ SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION)
+ SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
+ SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o)
+@@ -30,7 +31,8 @@ jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h
+ $(SRC)/org/xerial/snappy/SnappyNative.h: $(SRC)/org/xerial/snappy/SnappyNative.java
+ 	$(JAVAH) -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative
+ 
+-$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
++$(SNAPPY_SRC):
++# $(SNAPPY_UNPACKED)
+ 
+ $(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc
+ 	@mkdir -p $(@D)
+@@ -42,7 +44,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
+ 
+ 
+ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
+-	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) 
++	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
+ 	$(STRIP) $@
+ 
+ clean-native: 
+@@ -57,15 +59,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
+ 
+ snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }')
+ 
+-native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) 
+-snappy: $(TARGET)/$(snappy-jar-version).jar
++native: $(NATIVE_DLL) 
++snappy: native
+ 
+ $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) 
+ 	@mkdir -p $(@D)
+ 	cp $< $@
+ 	@mkdir -p $(NATIVE_TARGET_DIR)
+ 	cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
+-
++	cp $< $(TARGET)
+ 
+ $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL)
+ 	$(MVN) package -Dmaven.test.skip=true
diff --git a/dev-java/snappy/files/1.1.0.1-gentoo.patch b/dev-java/snappy/files/1.1.0.1-gentoo.patch
new file mode 100644
index 000000000000..61403dd9167f
--- /dev/null
+++ b/dev-java/snappy/files/1.1.0.1-gentoo.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index 04f0435..0249d09 100644
+--- a/Makefile
++++ b/Makefile
+@@ -60,8 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
+ 
+ 
+ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
+-	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
+-	$(STRIP) $@
++	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy $(LDFLAGS)
+ 
+ clean-native: 
+ 	rm -rf $(SNAPPY_OUT)
diff --git a/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch b/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch
new file mode 100644
index 000000000000..17fb2e1583ed
--- /dev/null
+++ b/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch
@@ -0,0 +1,51 @@
+diff --git a/Makefile b/Makefile
+index 0821c87..04f0435 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,8 @@ all: snappy
+ 
+ SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch)
+ SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz 
+-SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
++#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
++SNAPPY_CC:=
+ SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION)
+ SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
+ SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o)
+@@ -46,7 +47,8 @@ src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode: src/main/resou
+ 	$(JAVAC) -source 1.5 -target 1.5 -d $(TARGET)/temp $<
+ 	cp $(TARGET)/temp/org/xerial/snappy/SnappyNativeLoader.class $@
+ 
+-$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
++$(SNAPPY_SRC):
++# $(SNAPPY_UNPACKED)
+ 
+ $(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc
+ 	@mkdir -p $(@D)
+@@ -58,7 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
+ 
+ 
+ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
+-	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) 
++	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
+ 	$(STRIP) $@
+ 
+ clean-native: 
+@@ -73,14 +75,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
+ 
+ snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }')
+ 
+-native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) 
+-snappy: native $(TARGET)/$(snappy-jar-version).jar
++native: $(NATIVE_DLL) 
++snappy: native
+ 
+ $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) 
+ 	@mkdir -p $(@D)
+ 	cp $< $@
+ 	@mkdir -p $(NATIVE_TARGET_DIR)
+ 	cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
++	cp $< $(TARGET)/
+ 
+ 
+ $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL)
diff --git a/dev-java/snappy/files/1.x-build.xml b/dev-java/snappy/files/1.x-build.xml
new file mode 100644
index 000000000000..21d93bfcc1c6
--- /dev/null
+++ b/dev-java/snappy/files/1.x-build.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="snappy-java-from-maven" default="package" basedir=".">
+
+	<property file="${user.home}/.m2/maven.properties" />
+	<property file="maven-build.properties" />
+
+	<property name="maven.build.finalName" value="snappy" />
+	<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/java" />
+	<property name="maven.build.resourceDir.1" value="src/main/resources" />
+	<property name="maven.build.resourceDir.2" 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/java" />
+	<property name="maven.build.testResourceDir.1" 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">
+	</path>
+	<path id="build.test.classpath">
+	</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}" 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}">
+				<include name="org/xerial/snappy/VERSION" />
+			</fileset>
+		</copy>
+		<copy todir="${maven.build.outputDir}">
+			<fileset dir="${maven.build.resourceDir.1}">
+				<include name="org/xerial/snappy/*.bytecode" />
+				<include name="org/xerial/snappy/native/**" />
+			</fileset>
+		</copy>
+		<mkdir dir="${maven.build.outputDir}/META-INF/maven/org.xerial.snappy/snappy-java" />
+		<copy todir="${maven.build.outputDir}/META-INF/maven/org.xerial.snappy/snappy-java">
+			<fileset dir="${maven.build.resourceDir.2}">
+				<include name="LICENSE*" />
+			</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}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.6" verbose="false" fork="false" 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}">
+				<exclude name="**/*.java" />
+			</fileset>
+		</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="**/*Test.java" />
+					<include name="**/*TestCase.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="public" old="false" verbose="false" locale="en_US" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="UTF-8" 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="true" basedir="${maven.build.outputDir}" excludes="**/package.html" />
+	</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/snappy/metadata.xml b/dev-java/snappy/metadata.xml
new file mode 100644
index 000000000000..d57d516f6433
--- /dev/null
+++ b/dev-java/snappy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">xerial/snappy-java</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/snappy/snappy-1.0.3_rc3.ebuild b/dev-java/snappy/snappy-1.0.3_rc3.ebuild
new file mode 100644
index 000000000000..3d2afabf6e0d
--- /dev/null
+++ b/dev-java/snappy/snappy-1.0.3_rc3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="${PN}-java"
+MY_PV="${PV/_rc/-rc}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Snappy compressor/decompressor for Java"
+HOMEPAGE="https://github.com/xerial/snappy-java/"
+SRC_URI="https://github.com/xerial/${MY_PN}/archive/${MY_P}.tar.gz -> ${PN}-java-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/osgi-core-api:0
+	app-arch/snappy"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+		dev-java/xerial-core:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="osgi-core-api"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,xerial-core"
+EANT_TEST_ANT_TASKS="ant-junit"
+
+java_prepare() {
+	cp "${FILESDIR}"/1.x-build.xml "${S}"/build.xml || die
+	rm -r "${S}"/src/main/resources/org/xerial/snappy/native/ || die
+	epatch "${FILESDIR}"/${PV}-unbundle-snappy.patch
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+}
+
+src_compile() {
+	emake
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_doso "${S}"/target/libsnappyjava.so
+	java-pkg_dojar "${S}/target/${PN}.jar"
+
+	use source && java-pkg_dosrc "${S}"/src/main/java/*
+	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/snappy/snappy-1.1.0.1.ebuild b/dev-java/snappy/snappy-1.1.0.1.ebuild
new file mode 100644
index 000000000000..60983950c431
--- /dev/null
+++ b/dev-java/snappy/snappy-1.1.0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="${PN}-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Snappy compressor/decompressor for Java"
+HOMEPAGE="https://github.com/xerial/snappy-java/"
+SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${PN}-java-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/osgi-core-api:0
+	app-arch/snappy"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+		dev-java/xerial-core:0
+		dev-java/plexus-classworlds:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="osgi-core-api"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,xerial-core,plexus-classworlds"
+EANT_TEST_ANT_TASKS="ant-junit"
+
+java_prepare() {
+	cp "${FILESDIR}"/1.x-build.xml "${S}"/build.xml || die
+	rm -r "${S}"/src/main/resources/org/xerial/snappy/native/ || die
+	epatch "${FILESDIR}"/${PV}-unbundle-snappy.patch
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+}
+
+src_compile() {
+	emake
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_doso "${S}"/target/libsnappyjava.so
+	java-pkg_dojar "${S}/target/${PN}.jar"
+
+	use source && java-pkg_dosrc "${S}"/src/main/java/*
+	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/snip-0.11-r1 b/dev-java/snip-0.11-r1
deleted file mode 100644
index 7f65d42ec062..000000000000
--- a/dev-java/snip-0.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=an Apache ANT optional task that extracts snippets of code from text files
-EAPI=5
-HOMEPAGE=http://www.martiansoftware.com/lab/snip.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.martiansoftware.com/lab/snip/snip-0.11-src.zip -> snip-0.11.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b331493cee16a9663d2e72ceb9cbb3b9
diff --git a/dev-java/snip/Manifest b/dev-java/snip/Manifest
new file mode 100644
index 000000000000..eb29f15bd336
--- /dev/null
+++ b/dev-java/snip/Manifest
@@ -0,0 +1,3 @@
+DIST snip-0.11.zip 56801 BLAKE2B cf8c94fe9269faaf34f8377a626786a96387c5a253c98ce1591de80a22337ff0f9d75da6d9e264b2222d4e1c1a749cfd907f5239d6608b9541a2a61c6c4decc4 SHA512 43ded00e411247c69882494cec1ee5322a0be273982ee37b2501d143259686f6d5f52c99b430ebad96d799aa42bb240b4a5130cba0b3fc47d21c70513e97ba93
+EBUILD snip-0.11-r1.ebuild 724 BLAKE2B 153255b8cc9b6277efc3f0fb034635a9d78f5dd4ddd3261a31855f2c93cb84ba581a9cad505e1407962b8fcaec9d77c47871ea4f6ba53a1fad14343b44d47269 SHA512 60f602e0be62c6133d6fc8f509827bf0edb5778c7dcc8eea1c9ed4ebf2f88f23c7561e26912e54e9edbf27a89801ceeca2a9090b1042392a575e89c0f66fa818
+MISC metadata.xml 638 BLAKE2B 74eca64d6be100044468c0243df90ca060058de5181d6dcb51649ba664418192246606759ed21fc29f4a21b0c3b1c9f602d4bcd7f9eb436958e304a5190b9484 SHA512 198940a6ae7c17c2833b429e6003ecd0821b8d687a568b3f487fd4d3bf616556814b07481954e0abdeddccf411101ed3351bbe29e28e0b0e4f6024b3abd2d1c4
diff --git a/dev-java/snip/metadata.xml b/dev-java/snip/metadata.xml
new file mode 100644
index 000000000000..989601c681b1
--- /dev/null
+++ b/dev-java/snip/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		&gt;snip&lt; is an Ant task designed to help with the single-sourcing
+		of program documentation. This task extracts snippets of text from files,
+		placing them into properties in the Ant project. These properties can
+		then be used by any other Ant task, and are particularly useful when
+		referenced by &gt;filter&lt;s within the &gt;copy&lt; task.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/snip/snip-0.11-r1.ebuild b/dev-java/snip/snip-0.11-r1.ebuild
new file mode 100644
index 000000000000..9da02b564ff8
--- /dev/null
+++ b/dev-java/snip/snip-0.11-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="an Apache ANT optional task that extracts snippets of code from text files"
+HOMEPAGE="http://www.martiansoftware.com/lab/snip.html"
+SRC_URI="http://www.martiansoftware.com/lab/${PN}/${P}-src.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/spice-jndikit-1.4 b/dev-java/spice-jndikit-1.4
deleted file mode 100644
index e94769f67f6d..000000000000
--- a/dev-java/spice-jndikit-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JNDI Kit is a toolkit designed to help with the construction of JNDI providers
-EAPI=5
-HOMEPAGE=https://github.com/realityforge/jndikit
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/realityforge/jndikit/archive/1.4.zip -> spice-jndikit-1.4.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c3a1be00711f3a4dbbeb88d7d2d3c826
diff --git a/dev-java/spice-jndikit/Manifest b/dev-java/spice-jndikit/Manifest
new file mode 100644
index 000000000000..76e689ded088
--- /dev/null
+++ b/dev-java/spice-jndikit/Manifest
@@ -0,0 +1,3 @@
+DIST spice-jndikit-1.4.zip 55185 BLAKE2B 4d5068a3f2e12d287ecd657e2092a2e73e6637f2285dcea58b6d8c820508f21f1ceb508514813b34cf9c1a7536cbc530aba1edf0ca80603b3008e3afa240582a SHA512 798a1671cf79a9ecf7777a2b5b6caa0074dcca97cecb445c8dad9a44144cc71fed312f7a13d4b7e12f09eb23b0525b38bca62d67866db76f03ceb5a7a0501501
+EBUILD spice-jndikit-1.4.ebuild 868 BLAKE2B 2ba91fedd394e87c0fe49c7366a7759a4c1095b03fcb50765e99d03ab55aed61b9529ec299df4971d1045a68885dc04e6f73fd332e344c335ecae99ef7b137da SHA512 c42bbb64c7e51c2f34aaf7d09c3f9a958f75acb85364f6b5e3e9f316f2aa4c57ac7feb70388fd3a6992d362b112fc57c8f4d1d01c873997cb756329e89c9011a
+MISC metadata.xml 553 BLAKE2B d097fce9e744f8edd8d86284f5fc71cd4a987af0db70a475bca9db42c18127fe2bda1e04fb6bfb564483858e4aaf737d917a6deff7917643123996db89119f46 SHA512 53926ae768029abd0e9bc1a4bd55c641c0a6547e0db60e0538bef4f020ac018ab2617cd925f1c81852e1b92d6da5f97ee792f3f400329dc750da77e533517976
diff --git a/dev-java/spice-jndikit/metadata.xml b/dev-java/spice-jndikit/metadata.xml
new file mode 100644
index 000000000000..38b4a7041837
--- /dev/null
+++ b/dev-java/spice-jndikit/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+	Spice JNDIKit: JNDI Kit is a toolkit designed to help with the
+	construction of JNDI providers. The toolkit also provides users
+	with ready made memory-based and RMI-based contexts.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">realityforge/jndikit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/spice-jndikit/spice-jndikit-1.4.ebuild b/dev-java/spice-jndikit/spice-jndikit-1.4.ebuild
new file mode 100644
index 000000000000..b2557cff7bdc
--- /dev/null
+++ b/dev-java/spice-jndikit/spice-jndikit-1.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN##*-}"
+
+DESCRIPTION="JNDI Kit is a toolkit designed to help with the construction of JNDI providers"
+HOMEPAGE="https://github.com/realityforge/jndikit"
+SRC_URI="https://github.com/realityforge/${MY_PN}/archive/${PV}.zip -> ${P}.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	rm -rf src/test || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	pushd target/classes > /dev/null || die
+	rmic org.realityforge.spice.jndikit.rmi.server.RMINamingProviderImpl \
+		|| die "rmic failed"
+	popd > /dev/null || die
+}
diff --git a/dev-java/spin-1.5-r1 b/dev-java/spin-1.5-r1
deleted file mode 100644
index 7178e53400ad..000000000000
--- a/dev-java/spin-1.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Transparent threading solution for non-freezing Swing applications
-EAPI=5
-HOMEPAGE=http://spin.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/spin/spin-1.5-all.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8bfd524ca4facefc1b00aa755c67ad78
diff --git a/dev-java/spin/Manifest b/dev-java/spin/Manifest
new file mode 100644
index 000000000000..02fb35989864
--- /dev/null
+++ b/dev-java/spin/Manifest
@@ -0,0 +1,5 @@
+AUX 1.5-build.xml 8638 BLAKE2B ef4667e88f82c6284c592574822b88fe66fc5ca22626fd12164be6e18315b139e18636420cb7bb832167fe26f2b2bbf48a2e928a169f094786d770816cfd157d SHA512 8126661b264cac4a86dfbd646a8e88598075173479d1d952dcaa3c756793394bb50ff1bd5a57f4a4a86cad99d4b49cd5bd398ad608fb199a12adeecb64228583
+AUX 1.5-maven-build.properties 673 BLAKE2B b014639d8fccc8845dc632a06b25f8a0a4c00ed96b76ac8d8ff74cc2957d98d56f585a53b2cd3028d1d9d6d9b0a96c3fc29dc85dddf21678d6e8f60fcbe73a6f SHA512 1004515f5a89a2d22409cd7553fb11767a4580d1288393516f4dc3c0efa0c149d7bc3e46fac93800e6481fc7885302730e52e9e518d6d7224a0d9220d0f3c3a2
+DIST spin-1.5-all.zip 482286 BLAKE2B d1b1de891290ed465f2886bea046d9aa106626be91e5ac37dcd795bb0ef5e558b3d81b1e86cfb168d660f4c2884d321d560bece50645822a0334848225c6638b SHA512 ce1fad3b138781359d472727b186722d6f1f23b7002dd1ada294efd80b3a9caf5de15207cdd682fcbfcafa85c63895c7dd9683fefb5ce5b09cc4115ae3733466
+EBUILD spin-1.5-r1.ebuild 1012 BLAKE2B dbcc56a3a70e6f85803ff8ed8872aff88d575831c437ae255030f3442abaf52eccc256b3bd9ac797e8f0c1d6abb76328abffaa1b222dd390bda8b31f7b33e58d SHA512 1e5a42026101717f93dcb30384bbedc74c222f5acc34042f09630df8ea3f869d9b6731526bc7af1e377a3ba7a7319f70bfe0bd769c12a4ff72bc01e715c4a707
+MISC metadata.xml 310 BLAKE2B 2bc43a823a410b7196f5e49bdeed6ee3c5dd46c81ac677b922fbed6f55375c59e3d16dee2b8943734f0e3ad6da29822ca6d8490dae29c22dc9407ae4b702e0e2 SHA512 4ed6297527aa1e31d6570464b166e1facdc53b2c2d89d2e062975d7230a1ea4623e90451ac25b521a0d9449fee8c27c255b23102601af1596a5998e3582ec8af
diff --git a/dev-java/spin/files/1.5-build.xml b/dev-java/spin/files/1.5-build.xml
new file mode 100644
index 000000000000..ac58aec49131
--- /dev/null
+++ b/dev-java/spin/files/1.5-build.xml
@@ -0,0 +1,197 @@
+<?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 4/20/07 5:09 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="spin-from-maven" default="dist" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environnement properties                                         -->
+  <!-- ====================================================================== -->
+
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="spin-1.5"/>
+  <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/java"/>
+  <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/main/java"/>
+  <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="true"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- 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}" classpath="${gentoo.classpath}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.4" 
+           verbose="false" 
+           fork="false" 
+           source="1.4">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+    </javac>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.0}">
+        <include name="**/*"/>
+        <exclude name="**/*.java"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="junit-present, compile" 
+          description="Compile the test code" 
+          if="junit.present">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.classpath}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.4" 
+           verbose="false" 
+           fork="false" 
+           source="1.4">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}">
+        <include name="**/*"/>
+        <exclude name="**/*.java"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="junit-present, compile-tests" 
+          if="junit.present" 
+          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>
+        <pathelement path="${gentoo.classpath}"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <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="junit-present" 
+          depends="test-junit-present" 
+          unless="junit.present">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> Junit isn&apos;t 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" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </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"/>
+
+  <!-- ====================================================================== -->
+  <!-- Dist target                                                            -->
+  <!-- ====================================================================== -->
+
+  <target name="dist" depends="package,test" description="Package the application and run tests"/>
+</project>
\ No newline at end of file
diff --git a/dev-java/spin/files/1.5-maven-build.properties b/dev-java/spin/files/1.5-maven-build.properties
new file mode 100644
index 000000000000..1d9c9b68034b
--- /dev/null
+++ b/dev-java/spin/files/1.5-maven-build.properties
@@ -0,0 +1,16 @@
+#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
+#Fri Apr 20 17:09:04 EEST 2007
+project.build.outputDirectory=${maven.build.outputDir}
+project.build.directory=${maven.build.dir}
+maven.test.reports=${maven.build.dir}/test-reports
+maven.build.finalName=spin-1.5
+maven.reporting.outputDirectory=${maven.build.dir}/site
+maven.build.testResourceDir.0=src/test/java
+maven.build.outputDir=${maven.build.dir}/classes
+maven.build.resourceDir.0=src/main/java
+maven.build.testOutputDir=${maven.build.dir}/test-classes
+maven.settings.offline=false
+maven.build.dir=target
+maven.settings.interactiveMode=true
+maven.build.testDir.0=src/test/java
+maven.build.srcDir.0=src/main/java
diff --git a/dev-java/spin/metadata.xml b/dev-java/spin/metadata.xml
new file mode 100644
index 000000000000..28ae24c42657
--- /dev/null
+++ b/dev-java/spin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">spin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/spin/spin-1.5-r1.ebuild b/dev-java/spin/spin-1.5-r1.ebuild
new file mode 100644
index 000000000000..ba1292591bb0
--- /dev/null
+++ b/dev-java/spin/spin-1.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Transparent threading solution for non-freezing Swing applications"
+HOMEPAGE="http://spin.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}-all.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP="dev-java/cglib:3"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp "${FILESDIR}/${PV}-build.xml" build.xml || die
+	cp "${FILESDIR}/${PV}-maven-build.properties" maven-build.properties || die
+	rm -v lib/*.jar || die
+	java-pkg_filter-compiler jikes
+}
+
+EANT_GENTOO_CLASSPATH="cglib-3"
+
+# Needs X
+RESTRICT="test"
+
+src_test() {
+	ANT_TASKS="ant-junit" eant 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/spring-aop-3.2.4 b/dev-java/spring-aop-3.2.4
deleted file mode 100644
index 77ada60d9617..000000000000
--- a/dev-java/spring-aop-3.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 dev-java/mockito:0 dev-java/ant-junit4:0 dev-java/xmlunit:1 ) dev-java/spring-core:3.2 dev-java/spring-beans:3.2 dev-java/aopalliance:1 dev-java/aspectj:0 dev-java/commons-logging:0 dev-java/commons-pool:0 dev-java/jamon:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A comprehensive programming and configuration model for enterprise applications
-EAPI=5
-HOMEPAGE=http://www.springsource.org/spring-framework
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/spring-core:3.2 dev-java/spring-beans:3.2 dev-java/aopalliance:1 dev-java/aspectj:0 dev-java/commons-logging:0 dev-java/commons-pool:0 dev-java/jamon:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.2
-SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a44f80ef803a617a21ecb3234336b289
diff --git a/dev-java/spring-aop/Manifest b/dev-java/spring-aop/Manifest
new file mode 100644
index 000000000000..284287d9ed99
--- /dev/null
+++ b/dev-java/spring-aop/Manifest
@@ -0,0 +1,4 @@
+DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 BLAKE2B da3bc9130a054c874303fa10d796566cc1a7a043adce0aa15fdcf67b4bb529a97af9611357f3a8c2e192b0bf89fa0e2877416d19a1a742891de74d2b7acac1a2 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9
+DIST spring-framework-3.2.4.tar.gz 8925304 BLAKE2B ecc8b52f8dad35f7118f1231355f71a2f1e89afe4d1105afe3878e9f9150f519eae6660403856af09b79f178870bfa99657f3502389d2192f6c9860f6e6e35b6 SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b
+EBUILD spring-aop-3.2.4.ebuild 1652 BLAKE2B 77f55efc7e91022e213274cf37613750cfb365ade56a03d0d9a25250374f4629ee5b03f85ee21800d0faec51946eb261ca4798d01b47716e401c9860655d0581 SHA512 6be489c83a2b077d3d82ef3428adef9974b2740c61e676b735280616db4e07fcca2a6513bb47e396972403eb116bfe40b04963a8101216f37ecfb1d4c2c8d58f
+MISC metadata.xml 805 BLAKE2B 2c05c3f6f6f5a67e33ef1ca66d02b9a8c99671fc12a6adf04ebfdaa945362ae5e9ef19baae4400c944e637db0567190c3606ee54aba5c3d51529afc38f126304 SHA512 76da7349ca93ef13fb154f1531a175e9dba0536614191d9f801c157bdfdbce407eb06a7677224468dc7a19868010604bafd8db2b1348f1fce16b0bd2dd414005
diff --git a/dev-java/spring-aop/metadata.xml b/dev-java/spring-aop/metadata.xml
new file mode 100644
index 000000000000..73672eec8b78
--- /dev/null
+++ b/dev-java/spring-aop/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Spring Framework provides a comprehensive programming and configuration model for
+		modern Java-based enterprise applications - on any kind of deployment platform. A key
+		element of Spring is infrastructural support at the application level: Spring focuses
+		on the "plumbing" of enterprise applications so that teams can focus on application-level
+		business logic, without unnecessary ties to specific deployment environments.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">SpringSource/spring-framework</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/spring-aop/spring-aop-3.2.4.ebuild b/dev-java/spring-aop/spring-aop-3.2.4.ebuild
new file mode 100644
index 000000000000..66f482a9c876
--- /dev/null
+++ b/dev-java/spring-aop/spring-aop-3.2.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
+HOMEPAGE="http://www.springsource.org/spring-framework"
+SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
+		https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="dev-java/spring-core:${SLOT}
+	dev-java/spring-beans:${SLOT}
+	dev-java/aopalliance:1
+	dev-java/aspectj:0
+	dev-java/commons-logging:0
+	dev-java/commons-pool:0
+	dev-java/jamon:1"
+
+DEPEND=">=virtual/jdk-1.7
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+		dev-java/mockito:0
+		dev-java/ant-junit4:0
+		dev-java/xmlunit:1
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+S="${WORKDIR}/spring-framework-${PV}.RELEASE/"
+
+EANT_BUILD_XML=${S}/${PN}/build.xml
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="spring-core-${SLOT}
+	spring-beans-${SLOT}
+	aopalliance-1
+	aspectj
+	commons-logging
+	commons-pool
+	jamon-1"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
+	hamcrest-library-1.3
+	hamcrest-core-1.3
+	junit-4
+	mockito
+	xmlunit-1"
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}/dist/${PN}.jar
+
+	use source && java-pkg_dosrc "${S}"/${PN}/src/main/java/org/
+	use doc && java-pkg_dojavadoc "${S}"/${PN}/dist/apidocs/
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/spring-beans-3.2.4 b/dev-java/spring-beans-3.2.4
deleted file mode 100644
index f7b530871b45..000000000000
--- a/dev-java/spring-beans-3.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 dev-java/mockito:0 dev-java/ant-junit4:0 dev-java/xmlunit:1 ) dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/javax-inject:0 dev-java/spring-core:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A comprehensive programming and configuration model for enterprise applications
-EAPI=5
-HOMEPAGE=http://www.springsource.org/spring-framework
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/javax-inject:0 dev-java/spring-core:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.2
-SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6da32f2574f814c9ef223e11ac2579a5
diff --git a/dev-java/spring-beans/Manifest b/dev-java/spring-beans/Manifest
new file mode 100644
index 000000000000..5867eba01161
--- /dev/null
+++ b/dev-java/spring-beans/Manifest
@@ -0,0 +1,4 @@
+DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 BLAKE2B da3bc9130a054c874303fa10d796566cc1a7a043adce0aa15fdcf67b4bb529a97af9611357f3a8c2e192b0bf89fa0e2877416d19a1a742891de74d2b7acac1a2 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9
+DIST spring-framework-3.2.4.tar.gz 8925304 BLAKE2B ecc8b52f8dad35f7118f1231355f71a2f1e89afe4d1105afe3878e9f9150f519eae6660403856af09b79f178870bfa99657f3502389d2192f6c9860f6e6e35b6 SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b
+EBUILD spring-beans-3.2.4.ebuild 1548 BLAKE2B 81a80a81ef8c5b2becf0e4fb848d907166741d5199a5322544481231e990f4baed02c54eb61d69b54c2007b252125e8e95de9a734dc016fc6955729873fe86a7 SHA512 a0ca2cb7d7484c99cc3a5a91b336a2ad4a8588548fa71386c74a36bd0423e2bc71196efc8ebabeeb08b80a043a97520d4cdb44c7a29d12814fd96defa0198007
+MISC metadata.xml 805 BLAKE2B 2c05c3f6f6f5a67e33ef1ca66d02b9a8c99671fc12a6adf04ebfdaa945362ae5e9ef19baae4400c944e637db0567190c3606ee54aba5c3d51529afc38f126304 SHA512 76da7349ca93ef13fb154f1531a175e9dba0536614191d9f801c157bdfdbce407eb06a7677224468dc7a19868010604bafd8db2b1348f1fce16b0bd2dd414005
diff --git a/dev-java/spring-beans/metadata.xml b/dev-java/spring-beans/metadata.xml
new file mode 100644
index 000000000000..73672eec8b78
--- /dev/null
+++ b/dev-java/spring-beans/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Spring Framework provides a comprehensive programming and configuration model for
+		modern Java-based enterprise applications - on any kind of deployment platform. A key
+		element of Spring is infrastructural support at the application level: Spring focuses
+		on the "plumbing" of enterprise applications so that teams can focus on application-level
+		business logic, without unnecessary ties to specific deployment environments.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">SpringSource/spring-framework</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/spring-beans/spring-beans-3.2.4.ebuild b/dev-java/spring-beans/spring-beans-3.2.4.ebuild
new file mode 100644
index 000000000000..faa27415ff95
--- /dev/null
+++ b/dev-java/spring-beans/spring-beans-3.2.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
+HOMEPAGE="http://www.springsource.org/spring-framework"
+SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
+		https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/commons-logging:0
+	java-virtuals/servlet-api:3.0
+	dev-java/javax-inject:0
+	dev-java/spring-core:${SLOT}"
+
+DEPEND=">=virtual/jdk-1.7
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+		dev-java/mockito:0
+		dev-java/ant-junit4:0
+		dev-java/xmlunit:1
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+S="${WORKDIR}/spring-framework-${PV}.RELEASE/"
+
+EANT_BUILD_XML=${S}/${PN}/build.xml
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="spring-core-${SLOT},commons-logging,servlet-api-3.0,javax-inject"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
+	hamcrest-library-1.3
+	hamcrest-core-1.3
+	junit-4
+	mockito
+	xmlunit-1"
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}/dist/${PN}.jar
+
+	use source && java-pkg_dosrc "${S}"/${PN}/src/main/java/org/
+	use doc && java-pkg_dojavadoc "${S}"/${PN}/dist/apidocs/
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/spring-core-3.2.4 b/dev-java/spring-core-3.2.4
deleted file mode 100644
index 642db54b97f3..000000000000
--- a/dev-java/spring-core-3.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( >=dev-java/junit-4.11:4 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/mockito:0 dev-java/xmlunit:1 ) dev-java/commons-logging:0 dev-java/log4j:0 dev-java/aspectj:0 dev-java/asm:4 dev-java/cglib:3 dev-java/jopt-simple:4.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/jarjar:1 dev-java/ant-junit:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A comprehensive programming and configuration model for enterprise applications
-EAPI=5
-HOMEPAGE=http://www.springsource.org/spring-framework
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/log4j:0 dev-java/aspectj:0 dev-java/asm:4 dev-java/cglib:3 dev-java/jopt-simple:4.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.2
-SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=87c519da68f83820ecdeff40ab0a67db
diff --git a/dev-java/spring-core/Manifest b/dev-java/spring-core/Manifest
new file mode 100644
index 000000000000..f7e126e31f1e
--- /dev/null
+++ b/dev-java/spring-core/Manifest
@@ -0,0 +1,4 @@
+DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 BLAKE2B da3bc9130a054c874303fa10d796566cc1a7a043adce0aa15fdcf67b4bb529a97af9611357f3a8c2e192b0bf89fa0e2877416d19a1a742891de74d2b7acac1a2 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9
+DIST spring-framework-3.2.4.tar.gz 8925304 BLAKE2B ecc8b52f8dad35f7118f1231355f71a2f1e89afe4d1105afe3878e9f9150f519eae6660403856af09b79f178870bfa99657f3502389d2192f6c9860f6e6e35b6 SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b
+EBUILD spring-core-3.2.4.ebuild 1944 BLAKE2B c5fdb88f3b58a9bcdaef7c5e9a1b4dbe8e69c033ae9f036d2797cd3ac0889442ef915c48a2d28ccdd69b9ae90c53a2685e6e6029f50d338cd284bf5e415fbf61 SHA512 f89c1e8261c1d62108571cb3e01da012d5c309b37be2fbe6921a50e64a023dd4326a9fb1206d44268a0a4a24c100bf46fd6830fb0dc1f30d40d753215848d300
+MISC metadata.xml 805 BLAKE2B 2c05c3f6f6f5a67e33ef1ca66d02b9a8c99671fc12a6adf04ebfdaa945362ae5e9ef19baae4400c944e637db0567190c3606ee54aba5c3d51529afc38f126304 SHA512 76da7349ca93ef13fb154f1531a175e9dba0536614191d9f801c157bdfdbce407eb06a7677224468dc7a19868010604bafd8db2b1348f1fce16b0bd2dd414005
diff --git a/dev-java/spring-core/metadata.xml b/dev-java/spring-core/metadata.xml
new file mode 100644
index 000000000000..73672eec8b78
--- /dev/null
+++ b/dev-java/spring-core/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Spring Framework provides a comprehensive programming and configuration model for
+		modern Java-based enterprise applications - on any kind of deployment platform. A key
+		element of Spring is infrastructural support at the application level: Spring focuses
+		on the "plumbing" of enterprise applications so that teams can focus on application-level
+		business logic, without unnecessary ties to specific deployment environments.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">SpringSource/spring-framework</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/spring-core/spring-core-3.2.4.ebuild b/dev-java/spring-core/spring-core-3.2.4.ebuild
new file mode 100644
index 000000000000..6d952cd9bc70
--- /dev/null
+++ b/dev-java/spring-core/spring-core-3.2.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+WANT_ANT_TASKS="dev-java/jarjar:1 dev-java/ant-junit:0"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
+HOMEPAGE="http://www.springsource.org/spring-framework"
+SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
+		https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/commons-logging:0
+	dev-java/log4j:0
+	dev-java/aspectj:0
+	dev-java/asm:4
+	dev-java/cglib:3
+	dev-java/jopt-simple:4.4
+"
+
+DEPEND=">=virtual/jdk-1.7
+	test? (
+		>=dev-java/junit-4.11:4
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/mockito:0
+		dev-java/xmlunit:1
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+S="${WORKDIR}/spring-framework-${PV}.RELEASE/"
+
+EANT_BUILD_XML=${S}/${PN}/build.xml
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	commons-logging
+	log4j
+	aspectj
+	jopt-simple-4.4
+	asm-4"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
+	hamcrest-library-1.3
+	hamcrest-core-1.3
+	junit-4
+	mockito
+	xmlunit-1
+	junit-4"
+
+java_prepare() {
+	# see build.xml
+	mkdir "${S}/${PN}/lib/" || die
+	java-pkg_jar-from --build-only --into "${S}/${PN}/lib/" asm-4
+	java-pkg_jar-from --build-only --into "${S}/${PN}/lib/" cglib-3 cglib.jar
+
+	# broken test.
+	rm -v ${PN}/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}/dist/{${PN},asm-renamed,cglib-renamed}.jar
+
+	use source && java-pkg_dosrc "${S}"/${PN}/src/main/java/org/
+	use doc && java-pkg_dojavadoc "${S}"/${PN}/dist/apidocs/
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/spring-expression-3.2.4 b/dev-java/spring-expression-3.2.4
deleted file mode 100644
index 4e640ce42c16..000000000000
--- a/dev-java/spring-expression-3.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 dev-java/mockito:0 dev-java/ant-junit4:0 dev-java/xmlunit:1 ) dev-java/spring-core:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A comprehensive programming and configuration model for enterprise applications
-EAPI=5
-HOMEPAGE=http://www.springsource.org/spring-framework
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/spring-core:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.2
-SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3c685354f3d4ce61d3c30ce6991c0c0d
diff --git a/dev-java/spring-expression/Manifest b/dev-java/spring-expression/Manifest
new file mode 100644
index 000000000000..2689c7eb9e06
--- /dev/null
+++ b/dev-java/spring-expression/Manifest
@@ -0,0 +1,4 @@
+DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 BLAKE2B da3bc9130a054c874303fa10d796566cc1a7a043adce0aa15fdcf67b4bb529a97af9611357f3a8c2e192b0bf89fa0e2877416d19a1a742891de74d2b7acac1a2 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9
+DIST spring-framework-3.2.4.tar.gz 8925304 BLAKE2B ecc8b52f8dad35f7118f1231355f71a2f1e89afe4d1105afe3878e9f9150f519eae6660403856af09b79f178870bfa99657f3502389d2192f6c9860f6e6e35b6 SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b
+EBUILD spring-expression-3.2.4.ebuild 1420 BLAKE2B 86b8cce1581ff349c10588ea74c2227a6a2f1eadffc1ffbeebe5a6270a53760ac9275101f14885023e2d6fdfe3b1b0e6a41bbdde642a131ad87b0e9bec5922e4 SHA512 43f276f57f682098f787f93ed2967574a2ae6fda6b2981cdad9242e521f47da6de949a15c184624031cfc42e1842a9162b90ce7141c8b9bedd6e0cac71b8bbda
+MISC metadata.xml 805 BLAKE2B 2c05c3f6f6f5a67e33ef1ca66d02b9a8c99671fc12a6adf04ebfdaa945362ae5e9ef19baae4400c944e637db0567190c3606ee54aba5c3d51529afc38f126304 SHA512 76da7349ca93ef13fb154f1531a175e9dba0536614191d9f801c157bdfdbce407eb06a7677224468dc7a19868010604bafd8db2b1348f1fce16b0bd2dd414005
diff --git a/dev-java/spring-expression/metadata.xml b/dev-java/spring-expression/metadata.xml
new file mode 100644
index 000000000000..73672eec8b78
--- /dev/null
+++ b/dev-java/spring-expression/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Spring Framework provides a comprehensive programming and configuration model for
+		modern Java-based enterprise applications - on any kind of deployment platform. A key
+		element of Spring is infrastructural support at the application level: Spring focuses
+		on the "plumbing" of enterprise applications so that teams can focus on application-level
+		business logic, without unnecessary ties to specific deployment environments.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">SpringSource/spring-framework</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/spring-expression/spring-expression-3.2.4.ebuild b/dev-java/spring-expression/spring-expression-3.2.4.ebuild
new file mode 100644
index 000000000000..28c4fb285110
--- /dev/null
+++ b/dev-java/spring-expression/spring-expression-3.2.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
+HOMEPAGE="http://www.springsource.org/spring-framework"
+SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
+		https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="dev-java/spring-core:${SLOT}"
+
+DEPEND=">=virtual/jdk-1.7
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+		dev-java/mockito:0
+		dev-java/ant-junit4:0
+		dev-java/xmlunit:1
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+S="${WORKDIR}/spring-framework-${PV}.RELEASE/"
+
+EANT_BUILD_XML=${S}/${PN}/build.xml
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="spring-core-${SLOT}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
+	hamcrest-library-1.3
+	hamcrest-core-1.3
+	junit-4
+	mockito
+	xmlunit-1"
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}/dist/${PN}.jar
+
+	use source && java-pkg_dosrc "${S}"/${PN}/src/main/java/org/
+	use doc && java-pkg_dojavadoc "${S}"/${PN}/dist/apidocs/
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/spring-instrument-3.2.4 b/dev-java/spring-instrument-3.2.4
deleted file mode 100644
index b349c5d499f6..000000000000
--- a/dev-java/spring-instrument-3.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/ant-junit4:0 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 dev-java/mockito:0 dev-java/spring-core:3.2 dev-java/xmlunit:1 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A comprehensive programming and configuration model for enterprise applications
-EAPI=5
-HOMEPAGE=http://www.springsource.org/spring-framework
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.2
-SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1d85fc4c425acee734ecc5e20f392c36
diff --git a/dev-java/spring-instrument/Manifest b/dev-java/spring-instrument/Manifest
new file mode 100644
index 000000000000..598820ab7026
--- /dev/null
+++ b/dev-java/spring-instrument/Manifest
@@ -0,0 +1,5 @@
+AUX spring-instrument-3.2.4-build.xml 4010 BLAKE2B 4f7ef7b3fd0e28207892cd7ba09d8162136497d75d9cb1b87e2e698e2e4fc36a0f84e625af72cbdb9beb3373e20de58ecd64fc3f2c866678297e7043dfbe64aa SHA512 1c92972268d7889c568942abf40fb202c05c9a7ca14c34162212f54ec73ebd5160acedd99d96dcf576480afda88d82d57dc79ee087eabed321dd7f81e5a7ac32
+DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 BLAKE2B da3bc9130a054c874303fa10d796566cc1a7a043adce0aa15fdcf67b4bb529a97af9611357f3a8c2e192b0bf89fa0e2877416d19a1a742891de74d2b7acac1a2 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9
+DIST spring-framework-3.2.4.tar.gz 8925304 BLAKE2B ecc8b52f8dad35f7118f1231355f71a2f1e89afe4d1105afe3878e9f9150f519eae6660403856af09b79f178870bfa99657f3502389d2192f6c9860f6e6e35b6 SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b
+EBUILD spring-instrument-3.2.4.ebuild 1498 BLAKE2B 86a2c152fa8e9ea6efc24fa16a46e858d2f3b6e1f20146bcdcc051639f53467acc2f466a4255e9a9c6fba069ab0fe8bd306a4ae455dea08b3995e966bcfd621d SHA512 22f7bf12c27fbaa7042c06d76257108f5d159bc724174860c63de95262f61d90528a22baf84864c24927a7ac5d3749214796d8d9704796d21daab4c165ee5797
+MISC metadata.xml 805 BLAKE2B 2c05c3f6f6f5a67e33ef1ca66d02b9a8c99671fc12a6adf04ebfdaa945362ae5e9ef19baae4400c944e637db0567190c3606ee54aba5c3d51529afc38f126304 SHA512 76da7349ca93ef13fb154f1531a175e9dba0536614191d9f801c157bdfdbce407eb06a7677224468dc7a19868010604bafd8db2b1348f1fce16b0bd2dd414005
diff --git a/dev-java/spring-instrument/files/spring-instrument-3.2.4-build.xml b/dev-java/spring-instrument/files/spring-instrument-3.2.4-build.xml
new file mode 100644
index 000000000000..3175f36774f8
--- /dev/null
+++ b/dev-java/spring-instrument/files/spring-instrument-3.2.4-build.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="spring-instrument" default="jar" basedir=".">
+
+	<property name="src.dir" value="${basedir}/src/main/java" />
+	<property name="resources.dir" value="${basedir}/src/main/resources" />
+
+	<property name="test.src.dir" value="${basedir}/src/test/java" />
+	<property name="test.resources.dir" value="${basedir}/src/test/resources" />
+	
+	<property name="reports.tests" value="${basedir}/test-output" />
+	<property name="classes.dir" value="${basedir}/classes" />
+	<property name="classes.dir.test" value="${basedir}/classes-test" />
+	<property name="dist.dir" value="${basedir}/dist" />
+
+	<property name="jar.file" value="${dist.dir}/${ant.project.name}.jar" />
+	
+	<target name="clean" description="Clean the output directory">
+		<delete dir="${classes.dir}" />
+	</target>
+
+	<target name="compile" depends="clean">
+		<mkdir dir="${classes.dir}" />
+
+		<javac destdir="${classes.dir}" nowarn="false" debug="true" optimize="true" deprecation="false" target="1.5" verbose="false" fork="false" source="1.5">
+			<src>
+				<pathelement location="${src.dir}" />
+			</src>
+		</javac>
+	</target>
+
+	<!-- this target gets called from the other spring-* build.xml files to compile the required test utils -->
+	<target name="compile-instrument-testutils">
+		<mkdir dir="${classes.dir.test}" />
+		<javac destdir="${classes.dir.test}" nowarn="false" debug="true" optimize="true" deprecation="false" target="1.5" verbose="false" fork="false" source="1.5">
+			<src path="${test.src.dir}" />
+
+			<!-- these excludes are a little bit fuzzy, but they should work -->
+			<exclude name="org/springframework/**/*Tests.java"/>
+			<exclude name="org/springframework/**/*TestCase.java"/>
+
+			<classpath>
+				<pathelement location="${classes.dir}" />
+			</classpath>
+		</javac>
+		
+		<copy todir="${classes.dir.test}" verbose="true">
+			<fileset dir="${test.resources.dir}"/>
+		</copy>
+	</target>
+
+	<target name="compile-tests" depends="compile-instrument-testutils">
+		<ant antfile="${basedir}/../spring-core/build.xml" target="compile-core-testutils" dir="${basedir}/../spring-core/" inheritall="false" />
+
+		<mkdir dir="${classes.dir.test}" />
+		<javac destdir="${classes.dir.test}" nowarn="false" debug="true" optimize="true" deprecation="false" target="1.5" verbose="false" fork="false" source="1.5">
+			<src path="${test.src.dir}" />
+			<exclude name="**/DirectFieldAccessorTests.java"/> <!-- tries to instantiate a JPanel which needs an X-Server -->
+
+			<classpath>
+				<pathelement location="${classes.dir}" />
+
+				<pathelement location="${basedir}/../spring-core/classes-test" />
+			</classpath>
+		</javac>
+
+		<copy todir="${classes.dir.test}" verbose="true">
+			<fileset dir="${test.resources.dir}"/>
+		</copy>
+	</target>
+
+	<target name="test" depends="jar, compile-tests">
+		<mkdir dir="${reports.tests}" />
+		<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+			<sysproperty key="log4j.configuration" value="log4j.xml"/>
+
+			<classpath>
+				<pathelement location="${jar.file}" />
+				<pathelement location="${classes.dir.test}" />
+				<pathelement location="${test.src.dir}" />
+
+				<pathelement location="${basedir}/../spring-core/classes-test" />
+			</classpath>
+
+			<sysproperty key="basedir" value="." />
+
+			<formatter type="xml" />
+			<formatter type="plain" usefile="false" />
+
+			<batchtest todir="${reports.tests}">
+				<fileset dir="${classes.dir.test}">
+					<include name="**/*Tests.class" />
+					<exclude name="**/*Abstract*.*" />
+					<exclude name="**/*$*.class" />
+					
+					<exclude name="**/org/springframework/beans/factory/support/security/CallbacksSecurityTests*" />
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
+
+	<target name="javadoc">
+		<javadoc sourcepath="${src.dir}" packagenames="*" destdir="${dist.dir}/apidocs" />
+	</target>
+
+	<target name="jar" depends="compile">
+		<jar jarfile="${jar.file}" compress="true" index="false" basedir="${classes.dir}" excludes="**/package.html" />
+	</target>
+</project>
diff --git a/dev-java/spring-instrument/metadata.xml b/dev-java/spring-instrument/metadata.xml
new file mode 100644
index 000000000000..73672eec8b78
--- /dev/null
+++ b/dev-java/spring-instrument/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Spring Framework provides a comprehensive programming and configuration model for
+		modern Java-based enterprise applications - on any kind of deployment platform. A key
+		element of Spring is infrastructural support at the application level: Spring focuses
+		on the "plumbing" of enterprise applications so that teams can focus on application-level
+		business logic, without unnecessary ties to specific deployment environments.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">SpringSource/spring-framework</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild b/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild
new file mode 100644
index 000000000000..5e393cf162e4
--- /dev/null
+++ b/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
+HOMEPAGE="http://www.springsource.org/spring-framework"
+SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
+	https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-1.7
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+		dev-java/mockito:0
+		dev-java/spring-core:${SLOT}
+		dev-java/xmlunit:1
+	)"
+
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/spring-framework-${PV}.RELEASE/"
+
+EANT_BUILD_XML=${S}/${PN}/build.xml
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH=""
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
+	hamcrest-library-1.3
+	hamcrest-core-1.3
+	junit-4
+	mockito
+	spring-core-${SLOT}
+	xmlunit-1"
+
+java_prepare() {
+	find . -name '*.jar' -print -delete || die
+
+	cp "${FILESDIR}"/${P}-build.xml "${EANT_BUILD_XML}" || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}/dist/${PN}.jar
+
+	use source && java-pkg_dosrc "${S}"/${PN}/src/main/java/org/
+	use doc && java-pkg_dojavadoc "${S}"/${PN}/dist/apidocs/
+}
diff --git a/dev-java/spymemcached-2.9.1-r1 b/dev-java/spymemcached-2.9.1-r1
deleted file mode 100644
index 8a8a08fd2523..000000000000
--- a/dev-java/spymemcached-2.9.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A simple, asynchronous, single-threaded memcached client written in java
-EAPI=5
-HOMEPAGE=https://code.google.com/p/spymemcached/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.5 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://spymemcached.googlecode.com/files/spymemcached-2.9.1-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=410acf131707a404ea3256ebb344d3a0
diff --git a/dev-java/spymemcached/Manifest b/dev-java/spymemcached/Manifest
new file mode 100644
index 000000000000..b96dcc062dda
--- /dev/null
+++ b/dev-java/spymemcached/Manifest
@@ -0,0 +1,3 @@
+DIST spymemcached-2.9.1-sources.jar 305723 BLAKE2B fb79ecc9d808a47da09e749bb54ef73b40638735a04e827c8b0487a8e44c5baf1daf4ddd434920b9d97ee81f65baefaf23f36f14da79d0ceeaa405938603a32f SHA512 3d7b593a095094e4b564eef8112f8f9ad0e812f313b5a943e669115c1aa4662795e9321a75e030ab7bb954a810ffb92c399041ed4b29e8f703aecf80d7603614
+EBUILD spymemcached-2.9.1-r1.ebuild 710 BLAKE2B 7150c81b8f97da0bf6264affa9a625359e98dd0660309b40073e9103c05b979349f8bb8f03bb40b4f2026a59cc58c3021cad2eb34dcefd0e580d46a61debbd11 SHA512 771319e8fc31a81f2d5e1ee12a8018c4ab896fcb45d64041b8c623e8409d8da0dcdcf4171fcb5620da50a549eb0f66232641e3018a0d6d95035bd54ba8bd17ef
+MISC metadata.xml 318 BLAKE2B e35924d7b1c657bbc0a445352156bc420ba501ad86c0b6812122c2780d8dec5b1d704062c24c0049ce0d23ce01c1187d1c706f07b3b9b125bc282857232a9850 SHA512 67100a68ab4d88b02e279fb87b835a6fef444a8893cba844d1217784379830e0d73df6625ed4fd9e782fe85d665b7ef0f3e3d178266074bfa266128667f9867e
diff --git a/dev-java/spymemcached/metadata.xml b/dev-java/spymemcached/metadata.xml
new file mode 100644
index 000000000000..f120820fba70
--- /dev/null
+++ b/dev-java/spymemcached/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">spymemcached</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild b/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..bb946411bb78
--- /dev/null
+++ b/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A simple, asynchronous, single-threaded memcached client written in java"
+HOMEPAGE="https://code.google.com/p/spymemcached/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}-sources.jar"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/log4j:0
+	dev-java/slf4j-api:0"
+
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="log4j,slf4j-api"
+
+java_prepare() {
+	rm net/spy/memcached/spring/MemcachedClientFactoryBean.java || die
+}
diff --git a/dev-java/squareness-jlf-2.3.0-r1 b/dev-java/squareness-jlf-2.3.0-r1
deleted file mode 100644
index 364004f54b00..000000000000
--- a/dev-java/squareness-jlf-2.3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/laf-plugin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Squareness Java Look and Feel
-EAPI=5
-HOMEPAGE=http://squareness.beeger.net/
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/squareness/squareness_jlf_src-2.3.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a460b84cbeea73767f2b2c36962e343d
diff --git a/dev-java/squareness-jlf/Manifest b/dev-java/squareness-jlf/Manifest
new file mode 100644
index 000000000000..fbb31127a9b7
--- /dev/null
+++ b/dev-java/squareness-jlf/Manifest
@@ -0,0 +1,4 @@
+AUX build.xml 455 BLAKE2B d7dab4d19f0764c4f96b9329f57b4132cc53ec7e819b38d1c4829dfbb718d89969a1aac8e7a6be4ec9c224b12c1f5f18f220e304e0334bab0ef2447baa72bcb2 SHA512 af90575487cc91fb601e537c9e85af8d500a0f27321997af10c6f5182e95e029f954b85a29d03d18553bded6cb9bc5d505e31ffc51dc88c89f0db1b1fe95cfcb
+DIST squareness_jlf_src-2.3.0.zip 67307 BLAKE2B c7719eae69fd710e0f30fc2f4cee025a56c846bbc78631a390292730bb82d2b753bc24a367e5568e5ddec0f7444a3903fda9e4d09a5e0d57a46561ed713bdf74 SHA512 9c3d1de6f682968b2e2db37afdaa571f53857897415df04489ecac1c545ddc0a8342df94c658797979a6024e6e69bbc9a8828029ec428248848c933c9f901a71
+EBUILD squareness-jlf-2.3.0-r1.ebuild 731 BLAKE2B b4c1bf6a77adf5544eda6de33a042e99f0faca19107f195cb5f93c7144ad6422c2e097007fcd479b9be8c05e92c9586ee9a1c8d58da047e3d922e01116278292 SHA512 18900c1cbcb86da2eecf57c47d1ec9e097e463ffa2715fcdc834a4c22d2af8182cced06ae1fb9fcf17dc17c2f123bb6710c9c7728518b7508a47acad86cd5ec9
+MISC metadata.xml 296 BLAKE2B 815f4376df03d1dad4e3f5de1b64f2e8ea1f222973895e65c81547461038d126faba90f5f240b39010545853f066c176792d7146aea617a5ccfc5c8c96c2384b SHA512 f6dbd063144823d97b76ecbda9dee65e629f11b5c151da9d4cc83bce53f61307368fecf9089c1ca6e8d968068a21577d940bd3591347c023e1693480e40aae20
diff --git a/dev-java/squareness-jlf/files/build.xml b/dev-java/squareness-jlf/files/build.xml
new file mode 100644
index 000000000000..d4d7fdc7cf1a
--- /dev/null
+++ b/dev-java/squareness-jlf/files/build.xml
@@ -0,0 +1,17 @@
+<project name="squareness-jlf" default="jar">
+	<target name="compile">
+		<mkdir dir="build"/>
+		<javac srcdir="." destdir="build" classpath="${gentoo.classpath}">
+		</javac>
+	</target>
+
+	<target name="jar" depends="compile">
+		<jar destfile="squareness-jlf.jar" basedir="build"/>
+	</target>
+
+	<target name="javadoc" depends="compile">
+		<mkdir dir="docs"/>
+		<javadoc sourcepath="." destdir="docs" classpath="${gentoo.classpath}"/>
+	</target>
+
+</project>
diff --git a/dev-java/squareness-jlf/metadata.xml b/dev-java/squareness-jlf/metadata.xml
new file mode 100644
index 000000000000..f535386f372f
--- /dev/null
+++ b/dev-java/squareness-jlf/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">squareness</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild b/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..0bcbf798fece
--- /dev/null
+++ b/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Squareness Java Look and Feel"
+HOMEPAGE="http://squareness.beeger.net/"
+SRC_URI="mirror://sourceforge/squareness/${PN/-/_}_src-${PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="${JAVA_PKG_IUSE}"
+
+S="${WORKDIR}"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/laf-plugin:0"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/laf-plugin:0"
+
+EANT_GENTOO_CLASSPATH="laf-plugin"
+
+java_prepare() {
+	cp "${FILESDIR}"/build.xml build.xml || die
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc net
+}
diff --git a/dev-java/stax-1.2.0 b/dev-java/stax-1.2.0
deleted file mode 100644
index 4b8ace6d0e52..000000000000
--- a/dev-java/stax-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A standard XML processing API that allows you to stream XML data
-EAPI=0
-HOMEPAGE=https://github.com/codehaus
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://dist.codehaus.org/stax/distributions/stax-src-1.2.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8fae5e3dfa27e7a008856080fc714159
diff --git a/dev-java/stax-ex-1.0-r5 b/dev-java/stax-ex-1.0-r5
deleted file mode 100644
index fc43ac1f865e..000000000000
--- a/dev-java/stax-ex-1.0-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Extensions to complement JSR-173 StAX API
-EAPI=6
-HOMEPAGE=http://stax-ex.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://stax-ex.java.net/files/documents/4480/44372/stax-ex-1.0-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=698dd2e0a756aed4fa0c5472043304df
diff --git a/dev-java/stax-ex-1.7.6 b/dev-java/stax-ex-1.7.6
deleted file mode 100644
index f9d67229eae5..000000000000
--- a/dev-java/stax-ex-1.7.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Extensions to complement JSR-173 StAX API
-EAPI=5
-HOMEPAGE=http://stax-ex.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=CDDL GPL-2
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=https://maven.java.net/content/groups/public/org/jvnet/staxex/stax-ex/1.7.6/stax-ex-1.7.6-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=59b8a247274e523314de95f61fc3dc79
diff --git a/dev-java/stax-ex/Manifest b/dev-java/stax-ex/Manifest
new file mode 100644
index 000000000000..4d9c7460713b
--- /dev/null
+++ b/dev-java/stax-ex/Manifest
@@ -0,0 +1,5 @@
+DIST stax-ex-1.0-src.tar.gz 15446 BLAKE2B dbf1e1bf70ea008e03fa7382ade4213e266faa051a4803d995fb1676c607739a13904b12b3e5961c23a892076814d97dfb123dc26de67ed62ebf20fcb3facfd5 SHA512 acb58c7b182c7aced70099027af8e29b03e42e11f97104a75dfcbe8fad6f989733d67d31c203a95072f04d7e008240fdba59b5abfb6c5362268e12c138204938
+DIST stax-ex-1.7.6-sources.jar 49384 BLAKE2B dc65a16f3ad86cadeed2a2a3ac15b082a00fae910ab6fec4a6ccfae8969ed162b1a7b8f426889f03c555856b2a5d5556990306e55070c8219dd65d1ff28348bb SHA512 74bff2e094d29f63fb718c249b7e0fc004ca00e7f374af6634484d0c96ee8f1dbfd793706906e375b473b86b34e7a2c55c1d6b65a1d1b10b0125498b9365efe0
+EBUILD stax-ex-1.0-r5.ebuild 535 BLAKE2B ed9b7da0035932c20f04e5b15b7d575cc8a9da995972776884dfae469804e3a634fd15042badb406460bac71264647d484d89026845e81f237da62c4f711cef3 SHA512 6a798dcab359f386266dd7b2f47b416d75aacb24e4b989f8e1c8a1ece04038f92e120ca90e32dec4c1c16fa8cac26fe8441da9eb9cfcfd3312659ef183b3bed5
+EBUILD stax-ex-1.7.6.ebuild 551 BLAKE2B 2ec94db653018c40c487fc0aedef62f9472a681f1b0a961a7c9032e8e7051186c0124f53a82289517f5ac143dc76e391d708707253bbb70ced68ac2b10512205 SHA512 a29bbd5b49aaedfd7110234342bf2d3392f7c694a3105b044f27f430fa858cc691339e1e70650e9ce2eb72e636fdbbade5aede54d8d8b3226c4cca116507d4e7
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/stax-ex/metadata.xml b/dev-java/stax-ex/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/stax-ex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/stax-ex/stax-ex-1.0-r5.ebuild b/dev-java/stax-ex/stax-ex-1.0-r5.ebuild
new file mode 100644
index 000000000000..d0e9b1b1191e
--- /dev/null
+++ b/dev-java/stax-ex/stax-ex-1.0-r5.ebuild
@@ -0,0 +1,26 @@
+# 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="Extensions to complement JSR-173 StAX API"
+HOMEPAGE="http://stax-ex.java.net/"
+SRC_URI="https://stax-ex.java.net/files/documents/4480/44372/${P}-src.tar.gz"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+	default
+	rm "${S}"/build.xml || die
+}
diff --git a/dev-java/stax-ex/stax-ex-1.7.6.ebuild b/dev-java/stax-ex/stax-ex-1.7.6.ebuild
new file mode 100644
index 000000000000..1d5307c0d826
--- /dev/null
+++ b/dev-java/stax-ex/stax-ex-1.7.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extensions to complement JSR-173 StAX API"
+HOMEPAGE="http://stax-ex.java.net/"
+SRC_URI="https://maven.java.net/content/groups/public/org/jvnet/${PN/-/}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="CDDL GPL-2"
+SLOT="1"
+KEYWORDS="amd64 ~ppc64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEPEND}"
diff --git a/dev-java/stax/Manifest b/dev-java/stax/Manifest
new file mode 100644
index 000000000000..1a3809672d26
--- /dev/null
+++ b/dev-java/stax/Manifest
@@ -0,0 +1,4 @@
+AUX 1.2.0-build-version.patch 438 BLAKE2B 516b97e885a94e7819f860eb2bc1e8623160884199262d0382092f735ba83d3e634ba20aaa7e095ab5d755def9be478457c6137729fb1b6237e41bb4af14e6ac SHA512 f001f61d2cf0346a5e39c1b5392357e293a0f35ccee45dd3bc9b96a346f63280088572ac2b23b01637d11c8f0b888fd91687407d70d1bdd9903cdeb9a9c7028d
+DIST stax-src-1.2.0.zip 310738 BLAKE2B 09d7c2c60c947ca06c02e660337a1da208ece8a3302b9fc234ee768e7a6d7ab41d958885e0b67cdac4e346f9b641a4de1b36498ef8cd91196b4dce6481168dc3 SHA512 41686d961c7a211ee02e9432a141ff75326414da9576608a3567ca7e154ed24ad804cd01849364a5ec8def1a6e5048197850bafd67fc5ff2b6a10307a0fec9af
+EBUILD stax-1.2.0.ebuild 1213 BLAKE2B d52189cceb713256946026474b4780c576c9ffb9f3b46000e3c794d7ee1fbe555855e7a816644f22acfcced857fb6cec07ab7a824a82b6dcfcc5cfbd0d9cf67a SHA512 da5b43375574ad7edca28acf053fbdbda3a0aa6e44a0f57f8e3c52b5913d35deaa15c26fb12b8bb4eaa41d33a24281bd5c0282c426ff646e662de2cc349685e0
+MISC metadata.xml 565 BLAKE2B 6e86ddf8323cff40e45306b90374aa3e179ead4534a2c066b0f220816dffee9e03d57656ab88088c3bf209506835d4b720f4ca849f71468777a396b6c53f1ed4 SHA512 b54fb4d000aa14a4bc583007aaf576e9cba96a17c8aed6ba1024dd925bca04a2015048490ed426522a696e614a159eeea17a587a2d6f61be8b38cb608ed06f21
diff --git a/dev-java/stax/files/1.2.0-build-version.patch b/dev-java/stax/files/1.2.0-build-version.patch
new file mode 100644
index 000000000000..4880d1f00776
--- /dev/null
+++ b/dev-java/stax/files/1.2.0-build-version.patch
@@ -0,0 +1,11 @@
+--- stax/build.xml	2006-06-16 18:17:56.000000000 +0200
++++ build.xml	2007-02-24 19:21:46.875023427 +0100
+@@ -23,7 +23,7 @@
+   />
+ 
+   <!-- API properties -->
+-  <property name="api_version" value="1.0.1"/>
++  <property name="api_version" value="1.2.0"/>
+   <property name="api_src_dir" value="${build_dir}/api_src"/>
+   <property name="api_dir" value="api"/>
+   <property name="jar_api" value="${build_dir}/stax-api-${api_version}.jar"/>
diff --git a/dev-java/stax/metadata.xml b/dev-java/stax/metadata.xml
new file mode 100644
index 000000000000..12faefe93cd7
--- /dev/null
+++ b/dev-java/stax/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+Features of StAX API: Standard pull parser interface,
+Read/Write API: two levels, "raw" cursor access; object-based "event" access,
+Efficient XML access (especiall cursor API), Gives application control over
+parsing: "reverse Hollywood": you can call us, instead of waiting us to call you.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/stax/stax-1.2.0.ebuild b/dev-java/stax/stax-1.2.0.ebuild
new file mode 100644
index 000000000000..efab6107fec5
--- /dev/null
+++ b/dev-java/stax/stax-1.2.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A standard XML processing API that allows you to stream XML data"
+HOMEPAGE="https://github.com/codehaus"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${PN}-src-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+
+#	test? ( dev-java/ant-junit dev-java/ant-trax dev-java/xerces )
+DEPEND="
+	>=virtual/jdk-1.4
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_unpack(){
+	unpack ${A}
+	cd "${S}" || die "cd failed"
+	epatch "${FILESDIR}/1.2.0-build-version.patch"
+}
+
+EANT_BUILD_TARGET="ri_bin_dist"
+
+# A lot of these fail and that seems expected based on upstream
+# svn logs
+RESTRICT="test"
+
+src_test() {
+	mkdir lib
+	java-ant_rewrite-classpath build.xml
+	ANT_TASKS="ant-junit ant-trax" \
+		EANT_GENTOO_CLASSPATH="junit,xerces-2" eant test
+}
+
+src_install() {
+	java-pkg_newjar ${S}/build/stax-api-${PV}.jar stax-api.jar
+	java-pkg_newjar ${S}/build/stax-${PV}-dev.jar stax-dev.jar
+
+	if use doc; then
+		java-pkg_dojavadoc "${S}/build/javadoc"
+	fi
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/stax2-api-4.0.0 b/dev-java/stax2-api-4.0.0
deleted file mode 100644
index 24dc233467f3..000000000000
--- a/dev-java/stax2-api-4.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=java-virtuals/stax-api:0 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Extended Stax (STandard Api for Xml procesing) API
-EAPI=5
-HOMEPAGE=https://github.com/FasterXML/stax2-api
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=java-virtuals/stax-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/stax2-api/archive/stax2-api-4.0.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ddb6e90bd4154dafae813c350b6d3474
diff --git a/dev-java/stax2-api-4.0.0-r1 b/dev-java/stax2-api-4.0.0-r1
deleted file mode 100644
index 4baac468cf27..000000000000
--- a/dev-java/stax2-api-4.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Extended Stax (STandard Api for Xml procesing) API
-EAPI=5
-HOMEPAGE=https://github.com/FasterXML/stax2-api
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/stax2-api/archive/stax2-api-4.0.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4289990ce691ba6a0d534d4b2c38e582
diff --git a/dev-java/stax2-api/Manifest b/dev-java/stax2-api/Manifest
new file mode 100644
index 000000000000..2d6f68b1423d
--- /dev/null
+++ b/dev-java/stax2-api/Manifest
@@ -0,0 +1,4 @@
+DIST stax2-api-4.0.0.tar.gz 127125 BLAKE2B 43d29aa29ce010b950489811fd4128b37b86a329464bc02ae9259fceefd407b1f7b4f3cff1da27395003b6c893946e863c6f443e7e7708a487685740713ddac0 SHA512 a8636de873c97534fe17738efb9892d38c52a1a6adfec9502b727082f24b57dc5bfd10a67b5f5d9e196a53d7ee461978dcf8e6c306168bd1cf96a6d67c655b5b
+EBUILD stax2-api-4.0.0-r1.ebuild 629 BLAKE2B f14e3910c11dca344b7860c2a88792011758b2dfa96768c69d708fc6c6f2440ec17edf53b754e22c9b056d2403c8c79b370f88c652e3acea620d4606a924b225 SHA512 6104826e7a18439e1e0c8983ae6670ceba1920c848ed4e6a21d62df682c92b943e3659df32cfc83ccd1726424134e8deb04be9df39a11a79dcfaf31dee9489d3
+EBUILD stax2-api-4.0.0.ebuild 706 BLAKE2B 9bbcbb76f2941283897541b51f75e01b17302c00c30b003d974393744eb4bf492685db641e1132e41b33cf1e385d2c96f823763e9c029262789482662bde3b1a SHA512 ff448fdcc22f9a63efd3955b33c2241343b3799a1b4298c32dd314213c6d686f55893a17935f6c487b2a786f0a7a28ed9b557f512017c94fbf14b3f7a196466b
+MISC metadata.xml 490 BLAKE2B 53a191b4d6a0b130deda8b41200fa4c44281fe48a4ce658dee84ce6160f72c28fade0e34b117ab2e915d6f8f5695c49efe07bf0500787c26aaa15c65a6caa366 SHA512 831b369d2f9fdc3753e4951d289a3256805e5d30928225acff71d60c7e72ce5886dabc2c7c61f9aca8d3c8f31ce4f4131a7207f27423217b21a0dad75266a8cc
diff --git a/dev-java/stax2-api/metadata.xml b/dev-java/stax2-api/metadata.xml
new file mode 100644
index 000000000000..fa93f6583abd
--- /dev/null
+++ b/dev-java/stax2-api/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <longdescription>Stax2 API is an extension to standard Stax API ("STandard Api for Xml procesing"), pull-parser API of JDK, added in JDK 6.</longdescription>
+  <upstream>
+    <remote-id type="github">FasterXML/stax2-api</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild b/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..7ac668e79e29
--- /dev/null
+++ b/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extended Stax (STandard Api for Xml procesing) API"
+HOMEPAGE="https://github.com/FasterXML/stax2-api"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}-${P}/src"
+JAVA_SRC_DIR="main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ../README.md ../release-notes/VERSION
+}
diff --git a/dev-java/stax2-api/stax2-api-4.0.0.ebuild b/dev-java/stax2-api/stax2-api-4.0.0.ebuild
new file mode 100644
index 000000000000..63a661dec1c3
--- /dev/null
+++ b/dev-java/stax2-api/stax2-api-4.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extended Stax (STandard Api for Xml procesing) API"
+HOMEPAGE="https://github.com/FasterXML/stax2-api"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="java-virtuals/stax-api:0
+	>=virtual/jre-1.5"
+
+DEPEND="java-virtuals/stax-api:0
+	>=virtual/jdk-1.5"
+
+S="${WORKDIR}/${PN}-${P}/src"
+JAVA_SRC_DIR="main/java"
+JAVA_GENTOO_CLASSPATH="stax-api"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ../README.md ../release-notes/VERSION
+}
diff --git a/dev-java/stringtemplate-3.2.1-r1 b/dev-java/stringtemplate-3.2.1-r1
deleted file mode 100644
index 799d5538b7eb..000000000000
--- a/dev-java/stringtemplate-3.2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=dev-java/antlr-2.7.7-r7:0 >=virtual/jdk-1.6 test? ( >=dev-java/junit-4.11:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java template engine
-EAPI=5
-HOMEPAGE=http://www.stringtemplate.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/antlr/stringtemplate3/archive/3.2.1.tar.gz -> stringtemplate-3.2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2d2e7f6817e7abc11a2a953ba57d4cbe
diff --git a/dev-java/stringtemplate-4.0.8 b/dev-java/stringtemplate-4.0.8
deleted file mode 100644
index 1cf63c1e23af..000000000000
--- a/dev-java/stringtemplate-4.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java template engine
-EAPI=5
-HOMEPAGE=http://www.stringtemplate.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-PDEPEND=>=dev-java/antlr-3.5.2:3.5
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4
-SRC_URI=https://github.com/antlr/stringtemplate4/archive/4.0.8.tar.gz -> stringtemplate-4.0.8.tar.gz http://www.antlr3.org/download/antlr-3.5.2-complete.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6ec35eecfb5a5e3c8b1cb2bef651e849
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
new file mode 100644
index 000000000000..8dc4bb360545
--- /dev/null
+++ b/dev-java/stringtemplate/Manifest
@@ -0,0 +1,8 @@
+AUX 3.2.1-test-fixes.patch 1706 BLAKE2B e3bb6f698109d0290b67221807eb8648642e40aed936502ce4c86d57c2d44355bdaa70ce5147bb8f2a86fcb8123f5e5982e61acd2fb9fcd93f7f216916def4aa SHA512 c161e28851d40e6b9615f7880f746f0a2426a1f705609cfbb10f66c1c3fc3935bc5ee6f4f76991d57e6261bba05269e3ce1eb33fe72e50e7199dab629372cee7
+AUX 4.0.8-test-fixes.patch 1503 BLAKE2B 3d5e19d7084e0553b0d94fcfc3278bda557442719a907145a4d9a4fa26d206b0b2d1299cc122cf4ace014d97b2d93dd9588b3a929323822af3c472594fc03a4a SHA512 505bca326ae571974c6fdec1fc0d5e66066db5175960ff6dbec682f41244502e52cbd05f2e6119029954b546e52305addc14202223e4c3f2f04118c527606b4b
+DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
+DIST stringtemplate-3.2.1.tar.gz 1039803 BLAKE2B 6f6ab7e1d5bc1e2bb01960c0baaea0bd07267af26ff481c1e1586392e0a8938676cab3e54c22b2804bed2806befd938d4d09715de45cea12212e424e2e30fc4c SHA512 fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714
+DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3 SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
+EBUILD stringtemplate-3.2.1-r1.ebuild 1451 BLAKE2B fac962bb19d1011548ba6c7ab45744ab912deedbb9af4d27138c3d51f46f042a64f65d3404dfca3ed9104f0d3a5e2bca3ba86da5024d6a1576c7367bf0b8930e SHA512 0057643878f937518d0505511b92a8342688e3dc4f910370f07e9b856041265b482abcb249ff8ed5e44e4a5e4da3e07b5727bfe5a11e36a4d3a41768c6017498
+EBUILD stringtemplate-4.0.8.ebuild 2147 BLAKE2B 9d7a24c8b8a6e3bf6180b08207c501fc0d73e5569055ee0d0e9f69911144f17b3db8a08cb2d15df7d0a8ca0ab34ddb219818e5c0fd34778a15706428c7a6f819 SHA512 5c25aa9130785faff5d1c8454401527077b403d7522128ced29c344acddff4ddab20ce5469de0aa58c4d8db18400a2511e255fe2530ab565fe1a0ce884ff0788
+MISC metadata.xml 322 BLAKE2B a9d59ec72b635debef4618887bd9389b4db013017a0a952b28b5f07e7a2caef78976b51de098085b94cc16046fe5642a5b6da9e2a197aa51d39daac6b25f1c19 SHA512 76ac99f8c99d34b533c08ae008a9eb2ac2a3b64589df3d43460c93b78c3c53c45b944837cc7f5514e90afc2117554fb545306e74a2b2bcb5c8339c656998c449
diff --git a/dev-java/stringtemplate/files/3.2.1-test-fixes.patch b/dev-java/stringtemplate/files/3.2.1-test-fixes.patch
new file mode 100644
index 000000000000..fd625abd0668
--- /dev/null
+++ b/dev-java/stringtemplate/files/3.2.1-test-fixes.patch
@@ -0,0 +1,53 @@
+https://github.com/antlr/stringtemplate3/pull/3
+
+--- test/org/antlr/stringtemplate/test/TestStringTemplate.java.orig	2015-09-18 22:04:18.131902875 +0100
++++ test/org/antlr/stringtemplate/test/TestStringTemplate.java	2015-09-18 22:04:21.651848456 +0100
+@@ -36,6 +36,10 @@
+ import java.text.SimpleDateFormat;
+ import java.util.*;
+ 
++import org.junit.FixMethodOrder;
++import org.junit.runners.MethodSorters;
++
++@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+ public class TestStringTemplate extends TestCase {
+     static final String newline = System.getProperty("line.separator");
+ 
+@@ -87,7 +91,7 @@
+ 		assertEquals(expecting,I.toString());
+ 	}
+ 
+-	public void testNoGroupLoader() throws Exception {
++	public void testAaaNoGroupLoader() throws Exception {
+ 		// this also tests the group loader
+ 		StringTemplateErrorListener errors = new ErrorBuffer();
+ 		String tmpdir = System.getProperty("java.io.tmpdir");
+@@ -2214,8 +2218,12 @@
+ 		s.add("2");
+ 		s.add("3");
+ 		st.setAttribute("items", s);
+-		expecting = "<li>3</li><li>2</li><li>1</li>";
+-		assertEquals(expecting, st.toString());
++		String[] split = st.toString().split("(</?li>){1,2}");
++		Arrays.sort(split);
++		assertEquals("",  split[0]);
++		assertEquals("1", split[1]);
++		assertEquals("2", split[2]);
++		assertEquals("3", split[3]);
+ 	}
+ 
+ 	public void testDumpMapAndSet() throws Exception {
+@@ -2235,8 +2243,11 @@
+ 		s.add("2");
+ 		s.add("3");
+ 		st.setAttribute("items", s);
+-		expecting = "3,2,1";
+-		assertEquals(expecting, st.toString());
++		String[] split = st.toString().split(",");
++		Arrays.sort(split);
++		assertEquals("1", split[0]);
++		assertEquals("2", split[1]);
++		assertEquals("3", split[2]);
+ 	}
+ 
+ 	public class Connector3 {
diff --git a/dev-java/stringtemplate/files/4.0.8-test-fixes.patch b/dev-java/stringtemplate/files/4.0.8-test-fixes.patch
new file mode 100644
index 000000000000..9480abe3ed3f
--- /dev/null
+++ b/dev-java/stringtemplate/files/4.0.8-test-fixes.patch
@@ -0,0 +1,38 @@
+diff -Naur test.orig/org/stringtemplate/v4/test/TestGroups.java test/org/stringtemplate/v4/test/TestGroups.java
+--- test.orig/org/stringtemplate/v4/test/TestGroups.java	2014-03-25 11:55:55.000000000 +0000
++++ test/org/stringtemplate/v4/test/TestGroups.java	2015-09-13 11:01:07.999800299 +0100
+@@ -29,6 +29,7 @@
+ 
+ import org.junit.Assert;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.stringtemplate.v4.ST;
+ import org.stringtemplate.v4.STErrorListener;
+ import org.stringtemplate.v4.STGroup;
+@@ -527,6 +528,7 @@
+ 		assertEquals(expected, result);
+ 	}
+ 
++	@Ignore
+ 	@Test public void testUnknownNamedArg() throws Exception {
+ 		String dir = getRandomDir();
+ 		String groupFile =
+diff -Naur test.orig/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java
+--- test.orig/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java	2014-03-25 11:55:55.000000000 +0000
++++ test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java	2015-09-13 11:01:05.011850826 +0100
+@@ -28,6 +28,7 @@
+ package org.stringtemplate.v4.test;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.stringtemplate.v4.STErrorListener;
+ import org.stringtemplate.v4.STGroup;
+ import org.stringtemplate.v4.STGroupFile;
+@@ -36,6 +37,7 @@
+ import static org.junit.Assert.assertEquals;
+ 
+ public class TestGroupSyntaxErrors extends BaseTest {
++	@Ignore
+ 	@Test public void testMissingImportString() throws Exception {
+ 		String templates =
+ 			"import\n" +
diff --git a/dev-java/stringtemplate/metadata.xml b/dev-java/stringtemplate/metadata.xml
new file mode 100644
index 000000000000..5757a6a3f8e7
--- /dev/null
+++ b/dev-java/stringtemplate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">antlr/stringtemplate4</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..22164ff6a6e3
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java template engine"
+HOMEPAGE="http://www.stringtemplate.org/"
+SRC_URI="https://github.com/antlr/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+CDEPEND=">=dev-java/antlr-2.7.7-r7:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( >=dev-java/junit-4.11:4 )"
+
+S="${WORKDIR}/${P}"
+JAVA_GENTOO_CLASSPATH="antlr"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	# https://github.com/antlr/stringtemplate3/pull/3
+	epatch "${FILESDIR}/${PV}-test-fixes.patch"
+
+	java-pkg_clean
+}
+
+src_compile() {
+	local G; for G in action template angle.bracket.template eval group interface; do # from build.xml
+		antlr -o src/org/antlr/stringtemplate/language/{,${G}.g} || die
+	done
+
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc {CHANGES,README}.txt
+}
+
+src_test() {
+	cd test || die
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+
+	local TESTS=$(find * -name "Test*.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
new file mode 100644
index 000000000000..7b0d10d82352
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANTLR3="3.5.2"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java template engine"
+HOMEPAGE="http://www.stringtemplate.org/"
+SRC_URI="https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
+	http://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar"
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+# StringTemplate has a cyclic dependency on ANTLR 3. The runtime classes
+# are needed at build time and runtime and the tool is also needed at
+# build time. To break out of this, we use a prebuilt copy of ANTLR 3 at
+# build time and manually register a dependency on the package, which
+# will be present at runtime thanks to this PDEPEND. No prebuilt
+# software is actually installed onto the system.
+PDEPEND=">=dev-java/antlr-${ANTLR3}:3.5"
+
+S="${WORKDIR}/${PN}4-${PV}"
+JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/antlr-${ANTLR3}-complete.jar"
+JAVA_SRC_DIR="src"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+java_prepare() {
+	# These tests are broken but are probably fixed in current master.
+	epatch "${FILESDIR}/${PV}-test-fixes.patch"
+
+	# Some of these tests requires a graphical display.
+	rm -v test/org/stringtemplate/v4/test/TestEarlyEvaluation.java || die
+}
+
+src_compile() {
+	java -jar "${JAVA_GENTOO_CLASSPATH_EXTRA}" -lib ${JAVA_SRC_DIR}/org/stringtemplate/v4/compiler $(find ${JAVA_SRC_DIR} -name "*.g") || die
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-dependency antlr-3.5 antlr-runtime.jar
+	dodoc {CHANGES,contributors,README}.txt
+}
+
+src_test() {
+	cd test || die
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4):${JAVA_GENTOO_CLASSPATH_EXTRA}"
+
+	local TESTS=$(find * -name "Test*.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/sun-dtdparser-1.0 b/dev-java/sun-dtdparser-1.0
deleted file mode 100644
index bb0bf93f0d65..000000000000
--- a/dev-java/sun-dtdparser-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Sun DTDParser
-EAPI=0
-HOMEPAGE=https://jaxb2-sources.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/dtd-parser-1.0-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8126f555f47b25b336c670676c6d40c4
diff --git a/dev-java/sun-dtdparser/Manifest b/dev-java/sun-dtdparser/Manifest
new file mode 100644
index 000000000000..9e635be10aca
--- /dev/null
+++ b/dev-java/sun-dtdparser/Manifest
@@ -0,0 +1,3 @@
+DIST dtd-parser-1.0-src.zip 67545 BLAKE2B a1f38085bb88625c36156e2b08b2e8bc12e1d53c5d54172914304da0678edaead7bbe44153a77c993177be58aab3c782e3e3f716056808a1367bb11130c70868 SHA512 7a8b2d27316121e33640ff51819e9edb362197b5af340a92e24b5fcd7cd885efdf3951e12cf5056670273eceffc17c3860b56d437c7cfb2fc12b47abcf82ecfa
+EBUILD sun-dtdparser-1.0.ebuild 713 BLAKE2B f04045fffdc940acdba3f2ecf7d9729615ad6a690576f803c0008f038ccacbaa792e51c8d9e5a28a7a9df90af8ac0fededa7dfda8d38f99edccb5fbbbfa2c375 SHA512 be8a12de6e977068e805e39a69aeed301b47fe0e550b62cd8fb2d899f434d12b853ad3e1e1554aac2578b9add1370ebe89a89ba6a59a654c57833cbc297e7032
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/sun-dtdparser/metadata.xml b/dev-java/sun-dtdparser/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/sun-dtdparser/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild b/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
new file mode 100644
index 000000000000..385bd2683dc1
--- /dev/null
+++ b/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Sun DTDParser"
+HOMEPAGE="https://jaxb2-sources.dev.java.net/"
+# Downloadable from https://jaxb2-sources.dev.java.net/
+SRC_URI="mirror://gentoo/dtd-parser-${PV}-src.zip"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/dtd-parser-${PV}"
+
+src_install() {
+	java-pkg_newjar "${S}/target/dtd-parser-1.0.jar"
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc dist/docs/api
+}
diff --git a/dev-java/sun-httpserver-bin-2.0.1-r1 b/dev-java/sun-httpserver-bin-2.0.1-r1
deleted file mode 100644
index 9259dfc3b2bd..000000000000
--- a/dev-java/sun-httpserver-bin-2.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=app-arch/unzip >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Sun sun.net.httpserver classes
-EAPI=5
-HOMEPAGE=http://jax-ws.dev.java.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-SLOT=2
-SRC_URI=https://jax-ws.dev.java.net/jax-ws-201-m1/JAXWS2.0.1m1_source_20060817.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=429442c35d45c0cfc34915fd3ec199f9
diff --git a/dev-java/sun-httpserver-bin/Manifest b/dev-java/sun-httpserver-bin/Manifest
new file mode 100644
index 000000000000..e027244a4fee
--- /dev/null
+++ b/dev-java/sun-httpserver-bin/Manifest
@@ -0,0 +1,3 @@
+DIST JAXWS2.0.1m1_source_20060817.jar 8993405 BLAKE2B 85661cb9c5c60035c0d9f506f20671d3602a2ffc22d94a608f6d926d4caa966ac7edc77decbf218254b786c41afc2a49621861592c6612688b628c7b182c64ed SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314
+EBUILD sun-httpserver-bin-2.0.1-r1.ebuild 733 BLAKE2B a42a81482928e7eba3eec4c6497f7a70befdca1c4c8ced120d7617c60a5a5e7d038a7a3b9358dc14c3a45ec371ea79ae7ea5a8e16806fd9d137ed9d78ef9be3f SHA512 2c50ca6f9527aab2eaa5bb13fca39b8f4ee28111fb573294eec5cef47632de624f972d43e1e659b8842327d8a4603667a5f111948f848e8634f3cf523b50f46e
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/sun-httpserver-bin/metadata.xml b/dev-java/sun-httpserver-bin/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/sun-httpserver-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..f4d927f6dc62
--- /dev/null
+++ b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2
+
+DESCRIPTION="Sun sun.net.httpserver classes"
+HOMEPAGE="http://jax-ws.dev.java.net/"
+DATE="20060817"
+MY_P="JAXWS${PV}m1_source_${DATE}.jar"
+SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
+
+LICENSE="CDDL"
+SLOT="2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND="app-arch/unzip
+	${RDEPEND}"
+
+S="${WORKDIR}/jaxws-si"
+
+src_unpack() {
+	MY_JAVA=$(java-config -J)
+
+	echo "A" | ${MY_JAVA} -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
+
+	unpack ./jaxws-src.zip || die "unzip failed"
+
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_dojar lib/http.jar
+}
diff --git a/dev-java/sun-jacc-api-20070102 b/dev-java/sun-jacc-api-20070102
deleted file mode 100644
index 0d7ade30f5b1..000000000000
--- a/dev-java/sun-jacc-api-20070102
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 =dev-java/servletapi-2.4* >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Authorization Contract for Containers
-EAPI=0
-HOMEPAGE=http://java.sun.com/j2ee/javaacc/index.html
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.4 =dev-java/servletapi-2.4* >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-SLOT=0
-SRC_URI=mirror://gentoo/sun-jacc-api-20070102.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e24cdceeb0e15138628ef08c124c67b7
diff --git a/dev-java/sun-jacc-api/Manifest b/dev-java/sun-jacc-api/Manifest
new file mode 100644
index 000000000000..efad3765306b
--- /dev/null
+++ b/dev-java/sun-jacc-api/Manifest
@@ -0,0 +1,4 @@
+AUX 20070102-jcc-api.patch 466 BLAKE2B 8eb0bd009e64568480ea3c8558d66bd55d3788966601f2ec6184ac38db3df102ccdfcec297bf440050aa2ee73b6bc71665c03f8b51a57fab4221b5048258ab75 SHA512 763d0c0ec83e74ed1d288ff01fa1404dece9f25cff25332f944131457cbb0b24597df45221e4124edd4441504f23596ca0db63a697d2543597c70c83114f66f8
+DIST sun-jacc-api-20070102.tar.bz2 25672 BLAKE2B bd5657ac3e612e13f73de3788c9ce1bd02a22f62112d6d741a4262b5abbf5ced598ff43b2e1582d3163cb3deb2774e6476d529cc42b7e447ab55f6a03a617c89 SHA512 cccc71e327fd7a947e5b2430a0733f9a22c57388c38476dd253d808a2baaf7474113f809f7f47073b9fd8d0e9f9dea81e8c7192991fb10cd975e8db29b62252b
+EBUILD sun-jacc-api-20070102.ebuild 1075 BLAKE2B 482690c332f2300a0160222b22ffb18028f10d02d92279aef338199d2ca25ab33be8646859640fd4b2fed186939c4770a1c5d4699506fbe1ad331103a149c843 SHA512 30f9a3cccf70243f4123f7dec1416345e20e019a573c621e89471bdc5f3beaa2925214873efb801557fce5334d489c80e342952878c44f65c1595ff89a827175
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sun-jacc-api/files/20070102-jcc-api.patch b/dev-java/sun-jacc-api/files/20070102-jcc-api.patch
new file mode 100644
index 000000000000..064b0bb356d2
--- /dev/null
+++ b/dev-java/sun-jacc-api/files/20070102-jcc-api.patch
@@ -0,0 +1,11 @@
+--- build.xml	2005-12-25 05:26:06.000000000 +0100
++++ build.xml	2007-01-08 18:27:13.000000000 +0100
+@@ -75,7 +76,7 @@
+     <target name="assemble" depends="init"
+             description="Create JACC API jar files">               
+ 
+-        <jar jarfile="${javaee.jar}" update="yes">
++        <jar jarfile="jcc-api.jar">
+             <fileset dir="${component.classes.dir}">
+                 <include name="javax/security/jacc/**/*.class"/>
+             </fileset>
diff --git a/dev-java/sun-jacc-api/metadata.xml b/dev-java/sun-jacc-api/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/sun-jacc-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/sun-jacc-api/sun-jacc-api-20070102.ebuild b/dev-java/sun-jacc-api/sun-jacc-api-20070102.ebuild
new file mode 100644
index 000000000000..bbfad7328ca8
--- /dev/null
+++ b/dev-java/sun-jacc-api/sun-jacc-api-20070102.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Authorization Contract for Containers"
+HOMEPAGE="http://java.sun.com/j2ee/javaacc/index.html"
+# cvs -d :pserver:nichoj@cvs.dev.java.net:/cvs checkout glassfish/jacc-api
+# cd glassfish
+# mv jacc-api sun-jacc-api-${P}
+# tar --exclude=CVS -cjvf sun-jacc-api-${P}.tar.bz2 sun-jacc-api-${P}
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+COMMON_DEP="=dev-java/servletapi-2.4*"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# we need to patch the build file since we don't want to update an
+	# existing jar-archive but build a new one (called jcc-api.jar)
+	epatch "${FILESDIR}/20070102-jcc-api.patch"
+	java-pkg_jar-from servletapi-2.4 servlet-api.jar
+}
+
+src_compile() {
+	eant -Djavaee.jar=servlet-api.jar
+}
+
+src_install() {
+	java-pkg_dojar jcc-api.jar
+}
diff --git a/dev-java/sun-jaf-1.1.1 b/dev-java/sun-jaf-1.1.1
deleted file mode 100644
index 7dd95b9c477c..000000000000
--- a/dev-java/sun-jaf-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Sun's JavaBeans Activation Framework (JAF)
-EAPI=0
-HOMEPAGE=http://java.sun.com/products/javabeans/glasgow/jaf.html
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/sun-jaf-1.1.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a9c2729372b52af193ce6fadac7cb6a9
diff --git a/dev-java/sun-jaf-1.1.1-r1 b/dev-java/sun-jaf-1.1.1-r1
deleted file mode 100644
index c26d3c01b9f0..000000000000
--- a/dev-java/sun-jaf-1.1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Sun's JavaBeans Activation Framework (JAF)
-EAPI=6
-HOMEPAGE=http://java.sun.com/products/javabeans/glasgow/jaf.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/sun-jaf-1.1.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d7e6e6f73427f8be88a136b811dd7240
diff --git a/dev-java/sun-jaf/Manifest b/dev-java/sun-jaf/Manifest
new file mode 100644
index 000000000000..135aa35f5808
--- /dev/null
+++ b/dev-java/sun-jaf/Manifest
@@ -0,0 +1,4 @@
+DIST sun-jaf-1.1.1.tar.bz2 125305 BLAKE2B bf7676f3b47e9cf4c169a7625160604c7973d2bb8f6a087f7a7759c924efc0c24fbc6d59f03fb89dc874b2ad03e311b5029fc066fe5083c1accdc73fa9666ea6 SHA512 c7287056514324aa5feeed3d4afaf861869974dd565f7810e0161fe590f070ec894e7005ffac4dd42cf075313237027d7d7c88cbf583e28e05df361536d73001
+EBUILD sun-jaf-1.1.1-r1.ebuild 603 BLAKE2B 15be8c5346fc16252a2e939c4ea732e2d9524b65ab3fde7f7aa8f66ecad32db09da37407e4dcce322eee19be9c28964ead1619c501bb5291fbcbaa54c02d7c0e SHA512 45f7f0445c3d2e886fdd02646f2d54c9f730b84400165135d000e7bdfb409fba869fad7c1c9d58f560b528d2c4e4025eb1759ecfeaf4d30be894eea7f98c7afd
+EBUILD sun-jaf-1.1.1.ebuild 1274 BLAKE2B c5906b41dec356a5a44a52141975ee58b8cd282ee80917a7b9c69a2849b39ee9998a12d40a7a7707d9663335e4ba1d7266e603ecb2f8f9db4fb7e83bdcbe5b3b SHA512 f8ea38b4d0b6c75f3dc0c0a811d68c3152e8b44191f71377b7e257780c59245b9543f368114bf2d39aac2991375e8f79d05ebd2cf30313c61eee95f6cb12f02f
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sun-jaf/metadata.xml b/dev-java/sun-jaf/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/sun-jaf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..c7d4d045ff91
--- /dev/null
+++ b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
@@ -0,0 +1,21 @@
+# 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="Sun's JavaBeans Activation Framework (JAF)"
+HOMEPAGE="http://java.sun.com/products/javabeans/glasgow/jaf.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+LICENSE="CDDL"
+SLOT="0"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/glassfish/activation"
diff --git a/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild b/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
new file mode 100644
index 000000000000..f54d71922707
--- /dev/null
+++ b/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Sun's JavaBeans Activation Framework (JAF)"
+HOMEPAGE="http://java.sun.com/products/javabeans/glasgow/jaf.html"
+# CVS:
+# View: https://glassfish.dev.java.net/source/browse/glassfish/activation/?only_with_tag=JAF-1_1
+# How-To: https://glassfish.dev.java.net/servlets/ProjectSource
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+# Remember to pray that bootstrap HEAD works
+#cvs -d:pserver:guest@cvs.dev.java.net:/cvs export -r JAF-${PV/./_} glassfish/activation
+#cvs -d:pserver:guest@cvs.dev.java.net:/cvs export -r HEAD glassfish/bootstrap
+#find . -name \*.jar -delete
+#tar cvjf ${P}.tar.bz glassfish
+#upload
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+S="${WORKDIR}/glassfish/activation"
+
+JAVA_PKG_BSFIX="off"
+
+EANT_DOC_TARGET="docs"
+
+src_install() {
+	java-pkg_dojar build/release/activation.jar
+	use doc && java-pkg_dojavadoc build/release/docs/javadocs
+	use source && java-pkg_dosrc src/java
+}
diff --git a/dev-java/sun-jai-bin-1.1.3 b/dev-java/sun-jai-bin-1.1.3
deleted file mode 100644
index 403839ecf460..000000000000
--- a/dev-java/sun-jai-bin-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-DESCRIPTION=JAI is a class library for managing images
-EAPI=0
-HOMEPAGE=https://jai.dev.java.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=sun-bcla-jai
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7f1f39023e8e3e206ae8899ffde4d37d
diff --git a/dev-java/sun-jai-bin-1.1.3-r1 b/dev-java/sun-jai-bin-1.1.3-r1
deleted file mode 100644
index a91aa903a9da..000000000000
--- a/dev-java/sun-jai-bin-1.1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-DESCRIPTION=JAI is a class library for managing images
-EAPI=0
-HOMEPAGE=https://jai.dev.java.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64
-LICENSE=sun-bcla-jai
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-RESTRICT=mirror
-SLOT=0
-SRC_URI=!amd64? ( http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz ) amd64? ( http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bfb52a302cb45af91b4fef20a21442c7
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
new file mode 100644
index 000000000000..7c282a28bd9a
--- /dev/null
+++ b/dev-java/sun-jai-bin/Manifest
@@ -0,0 +1,5 @@
+DIST jai-1_1_3-lib-linux-amd64.tar.gz 3510451 BLAKE2B c16dc0e04127bf57df6390dc9d99a1e44040c0fe81ccacc88698493d3fd3483aae12d664a89bc13939655d21ce2d92b64537b073c0d1063bbf91e18129da5eb4 SHA512 5089b696baabdea9622683aa7a3569daf724fd7fa8a4f1c95073b9e96ff5c37fc55a9e3a6fe499abafe61f5f4a109770bd27172ae6711ab7b4da3de55d8b0f56
+DIST jai-1_1_3-lib-linux-i586.tar.gz 3501711 BLAKE2B eec4976124a9701367e7b61c652ed619df69fa12eb02c5288d9d1ba4845ca7e2315514fba1f75f15c8bbb90cba981972961e8d1e843a8a8ac2b000e5e4917975 SHA512 bd142eea557b68d10d26a18b6b0d04e5cb42212e98268035b1b3615d6489bbc4fa07ad141fd04fc5ae3c74f1703c9ade77130cbf8a61603b4b271e3a0e06e860
+EBUILD sun-jai-bin-1.1.3-r1.ebuild 1099 BLAKE2B e676b1f401b9d4c16a604fd56db30d94cb30d1511e8ac1d57f68429828523809e8e93d24b9e78469133c02c07886ac57a6a8e89fbf304891a7a44acca0c33c33 SHA512 ece3afc3dd782f133a85bb5b3578034878464290f08b0c6361cfe62ba53b6a3c78cf1e77e536e4c34e6ace9620c257441c5ca5fcef6a82662bc5ca8378ff9938
+EBUILD sun-jai-bin-1.1.3.ebuild 968 BLAKE2B 932fd60c60f522e0e0f1942ee5dbc759ec26b05f66c8486c9410898d2f46fcd14d34080f5bc6de27153a61c682a8aadf6395c38254801757544bcad8f59f54df SHA512 863bfcb88aa6dc625d44d79b12116c584b660b852c36095c10b27aff814ef6a28dfc175f8aa5c7bbf43147056ae275f4eb7a17e403b51898b03221a1a1f85f28
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jai-bin/metadata.xml b/dev-java/sun-jai-bin/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/sun-jai-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..50218694eb44
--- /dev/null
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit java-pkg-2
+
+MY_PV=${PV//./_}
+DESCRIPTION="JAI is a class library for managing images"
+HOMEPAGE="https://jai.dev.java.net/"
+
+BASE=http://download.java.net/media/jai/builds/release/${MY_PV}
+MY_P="jai-${MY_PV}"
+SRC_URI="
+	!amd64? ( ${BASE}/${MY_P}-lib-linux-i586.tar.gz )
+	amd64? ( ${BASE}/${MY_P}-lib-linux-amd64.tar.gz )"
+
+LICENSE="sun-bcla-jai"
+SLOT="0"
+KEYWORDS="amd64"
+DEPEND=""
+RDEPEND=">=virtual/jre-1.3"
+IUSE=""
+RESTRICT="mirror"
+QA_PREBUILT="*"
+
+S=${WORKDIR}/${MY_P}/
+
+src_unpack() {
+	unpack ${A}
+	rm "${S}/LICENSE-jai.txt"
+}
+
+src_compile() { :; }
+
+src_install() {
+	dodoc *.txt || die
+
+	cd lib
+	java-pkg_dojar *.jar
+	use x86 && java-pkg_doso *.so
+	use amd64 && java-pkg_doso *.so
+}
+
+pkg_postinst() {
+	elog "This ebuild now installs into /opt/${PN} and /usr/share/${PN}"
+	elog 'To use you need to pass the following to java'
+	if use x86 || use amd64; then
+		elog '-Djava.library.path=$(java-config -i sun-jai-bin)'
+	fi
+	elog '-classpath $(java-config -p sun-jai-bin)'
+}
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
new file mode 100644
index 000000000000..20d0c2afe551
--- /dev/null
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit java-pkg-2
+
+MY_PV=${PV//./_}
+DESCRIPTION="JAI is a class library for managing images"
+HOMEPAGE="https://jai.dev.java.net/"
+SRC_URI="http://download.java.net/media/jai/builds/release/${MY_PV}/jai-${MY_PV}-lib-linux-i586.tar.gz"
+LICENSE="sun-bcla-jai"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.3"
+IUSE=""
+RESTRICT="mirror"
+QA_PREBUILT="*"
+
+S=${WORKDIR}/jai-${MY_PV}/
+
+src_unpack() {
+	unpack ${A}
+	rm "${S}"/LICENSE-jai.txt
+}
+
+src_compile() { :; }
+
+src_install() {
+	dodoc *.txt
+
+	cd lib
+	java-pkg_dojar *.jar
+	use x86 && java-pkg_doso *.so
+}
+
+pkg_postinst() {
+	elog "This ebuild now installs into /opt/${PN} and /usr/share/${PN}"
+	elog 'To use you need to pass the following to java'
+	use x86 && elog '-Djava.library.path=$(java-config -i sun-jai-bin)'
+	elog '-classpath $(java-config -p sun-jai-bin)'
+}
diff --git a/dev-java/sun-java3d-bin-1.3.2-r1 b/dev-java/sun-java3d-bin-1.3.2-r1
deleted file mode 100644
index f1d3286b74d3..000000000000
--- a/dev-java/sun-java3d-bin-1.3.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch postinst preinst setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-DESCRIPTION=Sun Java3D API Core
-EAPI=0
-HOMEPAGE=https://j3d-core.dev.java.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=-* amd64 x86
-LICENSE=sun-jrl sun-jdl
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-RESTRICT=fetch
-SLOT=0
-SRC_URI=amd64? ( java3d-1_3_2-linux-amd64.zip ) x86? ( java3d-1_3_2-linux-i586.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=750fbf9b892bf4c50f4d68a36c5a3502
diff --git a/dev-java/sun-java3d-bin-1.4.0_pre5-r1 b/dev-java/sun-java3d-bin-1.4.0_pre5-r1
deleted file mode 100644
index 814843074c0b..000000000000
--- a/dev-java/sun-java3d-bin-1.4.0_pre5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-DESCRIPTION=Sun Java3D API Core
-EAPI=0
-HOMEPAGE=https://j3d-core.dev.java.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=-* amd64 x86
-LICENSE=sun-jrl sun-jdl
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-SLOT=0
-SRC_URI=amd64? ( http://download.java.net/media/java3d/builds/stable/1_4_0-build5/java3d-1_4_0-build5-linux-amd64.zip ) x86? ( http://download.java.net/media/java3d/builds/stable/1_4_0-build5/java3d-1_4_0-build5-linux-i586.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dd16aa693ac6eccb18791f918b52bc79
diff --git a/dev-java/sun-java3d-bin-1.5.2 b/dev-java/sun-java3d-bin-1.5.2
deleted file mode 100644
index af29ade2fd97..000000000000
--- a/dev-java/sun-java3d-bin-1.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Sun Java3D API Core
-EAPI=6
-HOMEPAGE=https://j3d-core.dev.java.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=sun-jrl sun-jdl
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=amd64? ( http://download.java.net/media/java3d/builds/release/1.5.2/j3d-1_5_2-linux-amd64.zip ) x86? ( http://download.java.net/media/java3d/builds/release/1.5.2/j3d-1_5_2-linux-i586.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=403c95499b0709daebee0a6c440929bb
diff --git a/dev-java/sun-java3d-bin/Manifest b/dev-java/sun-java3d-bin/Manifest
new file mode 100644
index 000000000000..40f75be3dfed
--- /dev/null
+++ b/dev-java/sun-java3d-bin/Manifest
@@ -0,0 +1,10 @@
+DIST j3d-1_5_2-linux-amd64.zip 1956319 BLAKE2B 05e229dedddde18c261e652adfe6dd87e9bad90ea8129fd351f9122210049a587dcbf1a6e982d06f75f8936762d37b7b2710b374462c6a0e356acfb7bb8dffb9 SHA512 6105b460d09f68c7a1ab289e23717016329900d1e113b516965ee3015fe47836d2165bb450c43f7fa5f7a42ff819c70581193990d153226cb41dcecb1b9c71bf
+DIST j3d-1_5_2-linux-i586.zip 1956020 BLAKE2B fe2dc4275b021a302a3914ae2243f75142f40370dcf01e256d4557c5dd10fdeb060b4a8cbf5e274c8ae38dc984ad6dc488a8d15aff621b0fdd5e2185c1523cea SHA512 1504d2dbcdc9a49be84f1a6327669764febc83f4e5c4365894b8a4bc15b14857262bc0d548b678820ad3aee8f349f2515cfa9a06dfdc0e8bb9afd50de0c4ca56
+DIST java3d-1_3_2-linux-amd64.zip 1241855 BLAKE2B 342b09f8643060115e642ba9da302772b1514322f1157059fdb8e9d83e8c307fa970a90d1d2dccc88fd54e26c31c8b6beef2ae61855463e6ca25613fb78716af SHA512 6781be7d5c510b9ed4fb533e58eed792ceade0245b7ace00947f6cbac711b589d787500322d3ad4e6478c61e017cf2be9c7542a59a6a0af780d9e0a06b5a5f78
+DIST java3d-1_3_2-linux-i586.zip 1235329 BLAKE2B f380465fa6442e129bcc4c2c7b0f1c2d00775735ccb1755eff0cbfa063bdceb23209fe157c1127a36dc24e5fa7988194e2b5e830a3ff43891dd8e0b00cc2d855 SHA512 5fb459ead7cfdae468017bc40cb6f8831a8fadbd27fd3c62404b9cf5ebdacef092e8a4153058731c2a004672bc69f4061b664412ed937a7b49a15ca580762839
+DIST java3d-1_4_0-build5-linux-amd64.zip 1281828 BLAKE2B 90f1faa775d1c0f29cb32dc36801dbb697721f9509a45b9cbf9e26750e928359dad5e7458d98412ed3c473ed108e4ec937d6ef1fd8bad75d5feb3a5e152a8967 SHA512 ec1074e5ad40964a80e2ec3332f67d1b7067db6aa5d99379f9e488e2c6a342b0c3d0c78aadd995bd647047efdeb0f040c8e8c7e4557a5161b6a8919fe93cff81
+DIST java3d-1_4_0-build5-linux-i586.zip 1274577 BLAKE2B 38bab843a406b563f21dbffd51aff26937035c48488c4c50fdc8268fa8fcd73455219b927018958c2a87b35085aa51c8abe565564690047a2da6628e914c5722 SHA512 1b6b87d660b98029c8a5a2cfc9435538c89032b4318243ee5dc01629c72f8f4ea189ee383150821b291a6bbe2b3284ef7c6da6404851a8d6adfe6fea0af3ac59
+EBUILD sun-java3d-bin-1.3.2-r1.ebuild 1081 BLAKE2B 30edfc0c0f912b5bc59aec81ef47c3ea7e7f4e981dd8b308dbcc6c14bbbb3ed5bd271433b521374c62f1480c687c83b9347a373b104d9f449138a38b684b1384 SHA512 c642ac5626c0f99bd2de378b1bd3f098932e92b694575331d02658f46ca18b4fd884607cf230cd73ad439d6362dcfaf25babcf3892b2ef7bc02234738419673c
+EBUILD sun-java3d-bin-1.4.0_pre5-r1.ebuild 1195 BLAKE2B 5ca9b49e29ba94b7a111bc7debae5f5f5eaa00eca0e6c3ed0a3b98591bd9f0cc0120b1bfbf4d17aa2cb393fda10adc0f6052a0100d0b86e7c931dfd4680882bc SHA512 eb65d52d2f7f1915d150aeb975f214d91292967690bb50be306a3ce5e5e50d0d070dbda75f1464503c49a6455eba0a60e73011a20e63578feeed792a48fea8ca
+EBUILD sun-java3d-bin-1.5.2.ebuild 1142 BLAKE2B 21d2b10cec2764e564cc018379702eba298e1904cc592992d7d6223f9c4855aacb97c8f4ea7c4dc47146e6981a2743ad6d5b984311093c26411e74dc3e8d317c SHA512 110605860513f90c977a00219c4f509a3415976a99ca012758e186cfe174d134efed78a8756d7c5ce704773c00ccdd97e88fa1d023f98b7823e09440390855c4
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-java3d-bin/metadata.xml b/dev-java/sun-java3d-bin/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/sun-java3d-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..6c09cc29e65b
--- /dev/null
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit java-pkg-2
+
+DESCRIPTION="Sun Java3D API Core"
+HOMEPAGE="https://j3d-core.dev.java.net/"
+SRC_URI="amd64? ( java3d-${PV//./_}-linux-amd64.zip )
+	x86? ( java3d-${PV//./_}-linux-i586.zip )"
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="sun-jrl sun-jdl"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.3"
+RESTRICT="fetch"
+
+S=${WORKDIR}/${A/.zip/}
+
+pkg_nofetch() {
+	einfo "Please download java3d-${PV//./_}-linux-${ARCH/x86/i586}.zip from"
+	einfo "${HOMEPAGE} and place it in ${DISTDIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	unzip -q j3d-132-linux-${ARCH}.zip || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	dodoc COPYRIGHT.txt README.txt
+
+	java-pkg_dojar lib/ext/*.jar
+	java-pkg_doso lib/${ARCH/x86/i386}/*.so
+}
+
+pkg_postinst() {
+	elog "This ebuild installs into /opt/${PN} and /usr/share/${PN}"
+	elog 'To use you need to pass the following to java'
+	elog '-Djava.library.path=$(java-config -i sun-java3d-bin) -cp $(java-config -p sun-java3d-bin)'
+}
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild
new file mode 100644
index 000000000000..ac4cd0e8ee6e
--- /dev/null
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit java-pkg-2
+
+MY_PV=${PV//./_}
+MY_PV=${MY_PV//_pre/-build}
+MY_IPV=${MY_PV//_/}
+
+DESCRIPTION="Sun Java3D API Core"
+HOMEPAGE="https://j3d-core.dev.java.net/"
+SRC_URI="
+	amd64? (
+		http://download.java.net/media/java3d/builds/stable/${MY_PV}/java3d-${MY_PV}-linux-amd64.zip
+	)
+	x86? (
+		http://download.java.net/media/java3d/builds/stable/${MY_PV}/java3d-${MY_PV}-linux-i586.zip
+	)"
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="sun-jrl sun-jdl"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+QA_PREBUILT="*"
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/${A/.zip/}"
+	unzip -q j3d-${MY_IPV}-linux-${ARCH}.zip || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	cd "${WORKDIR}/${A/.zip/}"
+	dodoc COPYRIGHT.txt README.txt
+
+	java-pkg_dojar lib/ext/*.jar
+	java-pkg_doso lib/${ARCH/x86/i386}/*.so
+}
+
+pkg_postinst() {
+	elog "This ebuild installs into ${JAVA_PKG_LIBDEST} and ${JAVA_PKG_JARDEST}"
+	elog 'To use this when writing your own applications you can use for example:'
+	elog '-Djava.library.path=$(java-config -i sun-java3d-bin) -cp $(java-config -p sun-java3d-bin)'
+}
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.5.2.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.5.2.ebuild
new file mode 100644
index 000000000000..89c0a7779b51
--- /dev/null
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.5.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PV=${PV//./_}
+MY_PV=${MY_PV//_pre/-build}
+MY_IPV=${MY_PV//_/}
+
+DESCRIPTION="Sun Java3D API Core"
+HOMEPAGE="https://j3d-core.dev.java.net/"
+SRC_URI="
+	amd64? (
+		http://download.java.net/media/java3d/builds/release/${PV}/j3d-${MY_PV}-linux-amd64.zip
+	)
+	x86? (
+		http://download.java.net/media/java3d/builds/release/${PV}/j3d-${MY_PV}-linux-i586.zip
+	)"
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="sun-jrl sun-jdl"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}/${A/.zip/}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	unpack ./j3d-jre.zip
+}
+
+src_compile() { :; }
+
+src_install() {
+	dodoc COPYRIGHT.txt README.txt
+
+	java-pkg_dojar lib/ext/*.jar
+	java-pkg_doso lib/${ARCH/x86/i386}/*.so
+}
+
+pkg_postinst() {
+	elog "This ebuild installs into ${JAVA_PKG_LIBDEST} and ${JAVA_PKG_JARDEST}"
+	elog 'To use this when writing your own applications you can use for example:'
+	elog '-Djava.library.path=$(java-config -i sun-java3d-bin) -cp $(java-config -p sun-java3d-bin)'
+}
diff --git a/dev-java/sun-jimi-1.0-r3 b/dev-java/sun-jimi-1.0-r3
deleted file mode 100644
index e657645c5941..000000000000
--- a/dev-java/sun-jimi-1.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup
-DEPEND=>=virtual/jdk-1.3 app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Jimi is a class library for managing images
-EAPI=5
-HOMEPAGE=http://www.oracle.com/technetwork/java/index.html
-IUSE=elibc_FreeBSD doc
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=jimi1_0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=053636c1c9b9ec2f480a54988a4bcf40
diff --git a/dev-java/sun-jimi/Manifest b/dev-java/sun-jimi/Manifest
new file mode 100644
index 000000000000..8fe54ecf0f3c
--- /dev/null
+++ b/dev-java/sun-jimi/Manifest
@@ -0,0 +1,3 @@
+DIST jimi1_0.zip 3880977 BLAKE2B b286cdc725cad2037d19bb188145ca0cd0799993011a8f22aa671e8807afd96dd3a9f3035a82dff9823ccba503e711db6b2ef377fc039c7050fc105655114ce6 SHA512 28ae3b3044910fca80dbdf23fee5f0d050df64ef48a09c41a836f3ff78365258c747f69a958579abda68d6d6f1c6b6a3ea5e960d36f2199afdb06258a25173d5
+EBUILD sun-jimi-1.0-r3.ebuild 1094 BLAKE2B 723c18d75e561d8eb8e06da3bffae128bcf1937ecd7bacfa49385de4f19a24fb1752e838b3624e88629fb8a218f57cb10eba8cd594a095b39a987a545fcda5bf SHA512 e67ccf0d46c4043f5183875630495d0113343fdb3b0dc9d8505d57d59ec105c0462f14b721ac7bf957e9bc177198ec1e5f6478c0d11f619c0ca9531cc2f2bebc
+MISC metadata.xml 603 BLAKE2B eb5162c96ffdfd1e0b07f8c6fc950b7c90bef41e49514d69121a546e60e0d7affe6d630e328fa4e3df505cc1dd68d5caf318a6ed9ab25496bc11b312286cbffa SHA512 9bb4826797c652c42446acc1c40de86e79b4a96fab91b36835439794f7f1df27fb1d03d73bf6e9e6e8762cc998a3026ab04309d176e9968bc2f19423c147ce7f
diff --git a/dev-java/sun-jimi/metadata.xml b/dev-java/sun-jimi/metadata.xml
new file mode 100644
index 000000000000..74ea6711cb29
--- /dev/null
+++ b/dev-java/sun-jimi/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+
+Jimi is a class library for managing images. Its primary function is image I/O.
+Jimi was formerly a product of Activated Intelligence. Sun is making it
+available for developers who have code with dependencies on Jimi or for those
+who need image I/O functionality in applications running under 1.1.x versions of
+the Java Platform.
+
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild b/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
new file mode 100644
index 000000000000..ba659b246e78
--- /dev/null
+++ b/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2
+
+DESCRIPTION="Jimi is a class library for managing images"
+HOMEPAGE="http://www.oracle.com/technetwork/java/index.html"
+SRC_URI="jimi1_0.zip"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.3"
+DEPEND=">=virtual/jdk-1.3
+	app-arch/unzip"
+
+RESTRICT="fetch"
+
+S=${WORKDIR}/Jimi
+
+pkg_nofetch() {
+	local download_url="http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-java-client-419417.html#7259-jimi_sdk-1.0-oth-JPR"
+	einfo "Please download ${A} from the following url and place it in ${DISTDIR}"
+	einfo "${download_url} "
+}
+
+java_prepare() {
+	rm -r src/classes/* || die
+}
+
+src_compile() {
+	cd "${S}/src"
+	ejavac -classpath . -d classes $(cat main_classes.txt) || die "failes to	compile"
+	jar -cf ${PN}.jar -C classes . || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar src/${PN}.jar
+
+	dodoc Readme
+	use doc && java-pkg_dohtml -r docs/*
+}
diff --git a/dev-java/sun-jms-1.1-r2 b/dev-java/sun-jms-1.1-r2
deleted file mode 100644
index ec3251c6e8b0..000000000000
--- a/dev-java/sun-jms-1.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst setup unpack
-DEPEND=app-arch/unzip >=virtual/jdk-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-DESCRIPTION=The Java Message Service (JMS) API
-EAPI=0
-HOMEPAGE=http://java.sun.com/products/jms/
-IUSE=doc elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=sun-bcla-jms
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-RESTRICT=fetch
-SLOT=0
-SRC_URI=jms-1_1-fr-apidocs.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4273058653c89ac78d86abc81e6ff7e8
diff --git a/dev-java/sun-jms/Manifest b/dev-java/sun-jms/Manifest
new file mode 100644
index 000000000000..37ef9c53f0cf
--- /dev/null
+++ b/dev-java/sun-jms/Manifest
@@ -0,0 +1,3 @@
+DIST jms-1_1-fr-apidocs.zip 361922 BLAKE2B 75342eaeb56ba329948a226f48304e0a520e83f7284d5d8b46b981531b7f8c78283e38b2a488177349aaabb70276fd4ca09bc86993800906aea1469a6549f318 SHA512 ac2c7925b7f5bd3918f0c69a7b18dfa2a15f58243aef7cb429c0571ea218860fc146fd355c905e17310072263f64385b9010eafb1050158f42f498d7f21dfe1d
+EBUILD sun-jms-1.1-r2.ebuild 1331 BLAKE2B 6ab882edd58dc1367cd52b45553a450ed8a3f74f1379aa680bfc5949b1373c935cf21cbe6c73cbe62f96b210f19295c375d37db1c7bea8b1f1593b9096345247 SHA512 623535c760b14b0472df293fbb41ce8de759eaf04fc7a578dd922a0314909c71a67174d452e6afeb73acd9fa29bd38a194f58f3898ec72fed668ec7471bf7492
+MISC metadata.xml 420 BLAKE2B d00cdddbce707b1fbe67e796c7f62bc4f942c6f4e3c5af1aa3a643846dabded18b41b1e35d4e93cca068d2d0656fd5a88d65abfdc303cf5b6293d8fcd39be61d SHA512 60f2556340ffa7951c69e1bef1a5eda1905a02f3a1e72199c7af02225844c805fa2154ce6629b6d8bafcece22fc3d1c75349021af6932dff3ffaf952fdcb818c
diff --git a/dev-java/sun-jms/metadata.xml b/dev-java/sun-jms/metadata.xml
new file mode 100644
index 000000000000..00af286f523b
--- /dev/null
+++ b/dev-java/sun-jms/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Java Message Service (JMS) API is a messaging standard that
+		allows application components to create, send, receive, and read
+		messages.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
new file mode 100644
index 000000000000..481a44dc1977
--- /dev/null
+++ b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit java-pkg-2
+
+DOWNLOAD_PAGE="http://download.oracle.com/otndocs/jcp/7542-jms-1.1-fr-doc-oth-JSpec/"
+At="jms-${PV/./_}-fr-apidocs.zip"
+DESCRIPTION="The Java Message Service (JMS) API"
+HOMEPAGE="http://java.sun.com/products/jms/"
+SRC_URI="${At}"
+LICENSE="sun-bcla-jms"
+SLOT=0
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+RDEPEND=">=virtual/jre-1.3"
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.3"
+RESTRICT="fetch"
+
+S="${WORKDIR}/${PN//sun-/}${PV}"
+
+pkg_nofetch() {
+	einfo
+	einfo " Due to license restrictions, we cannot fetch the"
+	einfo " distributables automagically."
+	einfo
+	einfo " 1. Visit ${DOWNLOAD_PAGE}"
+	einfo " 2. Accept the License Agreement"
+	einfo " 3. Download ${At}"
+	einfo " 4. Move the file to ${DISTDIR}"
+	einfo
+}
+
+src_unpack() {
+	unpack ${A}
+	rm -v "${S}"/lib/*.jar
+}
+
+src_compile() {
+	mkdir build
+	cd src/share
+	ejavac -nowarn -d "${S}"/build $(find . -name "*.java") || die "failed too build"
+	if use doc ; then
+		mkdir "${S}"/api
+		javadoc -d "${S}"/api -quiet javax.jms
+	fi
+
+	cd "${S}"
+	jar cf jms.jar -C build . || die "failed too create jar"
+}
+
+src_install() {
+	java-pkg_dojar jms.jar
+	use doc && java-pkg_dohtml -r api
+}
diff --git a/dev-java/sun-jmx-1.2.1-r3 b/dev-java/sun-jmx-1.2.1-r3
deleted file mode 100644
index 98af264a616a..000000000000
--- a/dev-java/sun-jmx-1.2.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java Management Extensions for managing and monitoring
-EAPI=4
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html
-IUSE=elibc_FreeBSD doc examples
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=jmx-1_2_1-ri.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bce55c4e55c6a02abb5f4b014c6842c3
diff --git a/dev-java/sun-jmx/Manifest b/dev-java/sun-jmx/Manifest
new file mode 100644
index 000000000000..34a25f8e6bd1
--- /dev/null
+++ b/dev-java/sun-jmx/Manifest
@@ -0,0 +1,3 @@
+DIST jmx-1_2_1-ri.zip 1624569 BLAKE2B 7262ee10ab49d7371da988f6f636c22e7ad8cc06bd61db5490659899424465f2ed85000d176e6dc5cb7631942079fde19cde35837cda677fa463cdf53c94780c SHA512 39c933ec39f3fcc631d6d8f3aa88724bb0aa11ff62dfbac61762d07c718dff4ba1e16b1b565c7aa1ede7d616516e68d0dbe8c227db34a6d30bd8f29880c7a5d1
+EBUILD sun-jmx-1.2.1-r3.ebuild 1259 BLAKE2B 18c3213f6f2a692b2c796ac8733057db4c9ca1798618355913637ba8b4fa057dbdb2bc20daf31356e0f93aaaca4d007ab1cfe6489f36461a2b0952810afdb1de SHA512 4fb11fd7227ee9cea809a9822b6d1b899dc035663a15c0a4a739087295ffcbb4425ef389103fc0d4aa305e1e90b23c338ded324ddec809094a43b1d186ba9c8e
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jmx/metadata.xml b/dev-java/sun-jmx/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/sun-jmx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
new file mode 100644
index 000000000000..12307dbd4772
--- /dev/null
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc examples"
+
+inherit java-pkg-2
+
+MY_P=jmx-${PV//./_}
+DESCRIPTION="Java Management Extensions for managing and monitoring"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html"
+SRC_URI="${MY_P}-ri.zip"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+RESTRICT="fetch"
+
+S="${WORKDIR}/${MY_P}-bin"
+
+DOWNLOADSITE="http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-java-plat-419418.html"
+
+src_compile() { :; }
+
+pkg_nofetch() {
+	einfo
+	einfo " Due to license restrictions, we cannot fetch the"
+	einfo " distributables automagically."
+	einfo
+	einfo " 1. Visit ${DOWNLOADSITE} and follow instructions"
+	einfo " 2. Download ${SRC_URI}"
+	einfo " 3. Move file to ${DISTDIR}"
+	einfo " 4. Run emerge on this package again to complete"
+	einfo
+}
+
+src_install() {
+	java-pkg_dojar lib/*.jar
+	if use doc; then
+		java-pkg_dojavadoc doc/api
+		java-pkg_dohtml -r doc/doc doc/index.html
+	fi
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/super-csv-2.3.1 b/dev-java/super-csv-2.3.1
deleted file mode 100644
index 6129ee47edf8..000000000000
--- a/dev-java/super-csv-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A fast, programmer-friendly, free CSV library for Java
-EAPI=5
-HOMEPAGE=http://super-csv.github.io/
-IUSE=elibc_FreeBSD source doc test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/super-csv/super-csv/archive/v2.3.1.zip -> super-csv-2.3.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7d3585a2eaf8f531285ee87e0ab511ac
diff --git a/dev-java/super-csv/Manifest b/dev-java/super-csv/Manifest
new file mode 100644
index 000000000000..09848eaa116e
--- /dev/null
+++ b/dev-java/super-csv/Manifest
@@ -0,0 +1,4 @@
+AUX super-csv-2.3.1-build.xml 10120 BLAKE2B 0a4cb4f3fac442c971a2572d5e251d33b304d817722baabdc72684a5ce5c698c20d689354789d555e033beb443fa2381a12595f301616a19bdfb809a415378be SHA512 c00ce7e07a0fc35de8bbe5de901eae64f42fa0d2b277ca54a4fc58474f7f57c4c091a214290acfaddac30bc8180f1a6b621aca67fe320c028f2623d87985b2c5
+DIST super-csv-2.3.1.zip 16624601 BLAKE2B 0d8b6f21f8f8b50dfb981bbce0e7012e85ea0b4512777da36094943ee6ce303c12c05e1c55d0e5c22cfd9b7c651723617dd83e58b301f3f041128f24e16faa3e SHA512 6b418e4875e5c553572fc8fbb8fac47f5bd9647aa6261bcb5115234b0d23ed606e88b862fe3203837ed389cb2216ab707909bb6ed1cd18297b8d481973170515
+EBUILD super-csv-2.3.1.ebuild 934 BLAKE2B 7f3717c03afafb272e96029c17be2f06da296bccd58e655625103102e5469f8b0412cafd2691c90588b416cc15d1fc729bccbaf434790db0a7cf0f0d04ec24a0 SHA512 419c92da25faa1c2813e2b42c744b16a889579db5a09bc1ab01a86eda95516f33db59dd2404b14f840b6f28e557b4f44f99a591cc07186542b78829c488cd1d0
+MISC metadata.xml 431 BLAKE2B 09f55578bcf6cfe8d966bd547b105e4b233cf7e90d79e418f2c2c9f6b7ef3c163921539b006f0ac01fe058c49bfdf6b9ca918322ed82060b5b7a4019b5eb4aff SHA512 64643e48ccc8537b92b7255824e10acb0ea09d273cd7ae1ea9d8ac110eca614acbb9e34c690e238c4f11caaa6d46175807ceffe1bf841f2b87005a0395acd84e
diff --git a/dev-java/super-csv/files/super-csv-2.3.1-build.xml b/dev-java/super-csv/files/super-csv-2.3.1-build.xml
new file mode 100644
index 000000000000..94a8f2125a29
--- /dev/null
+++ b/dev-java/super-csv/files/super-csv-2.3.1-build.xml
@@ -0,0 +1,235 @@
+<?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 10/14/15 7:02 AM                      -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="super-csv" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="super-csv-2.3.1"/>
+  <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"/>
+  <path id="build.test.classpath">
+    <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" 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>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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" 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="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">
+      <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
+      <link href="http://dozer.sourceforge.net/apidocs"/>
+      <link href="http://www.joda.org/joda-time/apidocs"/>
+    </javadoc>
+  </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"/>
+  </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/super-csv/metadata.xml b/dev-java/super-csv/metadata.xml
new file mode 100644
index 000000000000..4437de6dfc91
--- /dev/null
+++ b/dev-java/super-csv/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">super-csv/super-csv</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/super-csv/super-csv-2.3.1.ebuild b/dev-java/super-csv/super-csv-2.3.1.ebuild
new file mode 100644
index 000000000000..3b686ea92fca
--- /dev/null
+++ b/dev-java/super-csv/super-csv-2.3.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="source doc test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A fast, programmer-friendly, free CSV library for Java"
+HOMEPAGE="http://super-csv.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+IUSE=""
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="${PN}/build.xml"
+
+java_prepare() {
+	cp -v "${FILESDIR}/${P}-build.xml" "${S}/${PN}/build.xml" || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${PN}/target/${P}.jar" "${PN}.jar"
+	dodoc README.md
+	use doc && java-pkg_dojavadoc "${PN}/target/site/apidocs"
+	use source && java-pkg_dosrc "${PN}/src/main/java"
+}
diff --git a/dev-java/svgsalamander-0.0-r2 b/dev-java/svgsalamander-0.0-r2
deleted file mode 100644
index 5a55e7bc5a94..000000000000
--- a/dev-java/svgsalamander-0.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 dev-java/javacc:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-nodeps dev-java/ant-trax >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=a SVG engine for Java
-EAPI=5
-HOMEPAGE=https://svgsalamander.dev.java.net/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/ant-core:0 dev-java/javacc:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/svgsalamander-0.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d9cec4124050563c0926ef5c76872fd5
diff --git a/dev-java/svgsalamander/Manifest b/dev-java/svgsalamander/Manifest
new file mode 100644
index 000000000000..ddc38d0d49dd
--- /dev/null
+++ b/dev-java/svgsalamander/Manifest
@@ -0,0 +1,3 @@
+DIST svgsalamander-0.0.tar.bz2 2404011 BLAKE2B fd737a90c4988c4e9506223c4cc33bb7b6b5906e1ba3871f903362281e0c745468d909ec39c5e11860b5b200f784a3deb8bbcc20ffaf5454ccf6b2eec5b3dd55 SHA512 70b182d204bac88b33b1c7058c35ae8e83c4ca178829e8c136dee8e1edd9bc6e99dfbd82c8b4c8c556bea110f15dc9e38e7ee266a16cef0ef6792463bb6a8906
+EBUILD svgsalamander-0.0-r2.ebuild 1112 BLAKE2B 12b5a527771c6cc1bef86f01a16a6acfd8e7f129b48a9845d678e2f0826c30e2b37c30b848628f54e4d5b397d418683e1602a2b5a365505dc00348b0027e0a11 SHA512 f1a88fdea1f357bf24c25dd98b08fb1298a7fd4eebf5944a3b6964242700bd6228291ce5c7d0c394f4fa6539aa751334ce599ccd65913c5d96f37f8d46b0a28b
+MISC metadata.xml 641 BLAKE2B 03029ac2e398924f33584b3dfc22760eaa1c7fda2216a29b43b187c4d774ffafb10b67cec9e9b1e06db92de2f1d97493eacd47dcb6bccb9380325916a0d55b81 SHA512 d28f09d1bda1f31b10e69dda13cb6ce52de10e8f9df27f63273bcad31a016c8c133e31d97309f03022470957e9136c4de7c904dfa5683ef60a68c0985e9a4ed9
diff --git a/dev-java/svgsalamander/metadata.xml b/dev-java/svgsalamander/metadata.xml
new file mode 100644
index 000000000000..7c1dfadbb140
--- /dev/null
+++ b/dev-java/svgsalamander/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+	SVG Salamander is an SVG engine for Java that's designed to be small,
+	fast, and allow programmers to use it with a minimum of fuss. It's in
+	particular targeted for making it easy to integrate SVG into Java games
+	and making it much easier for artists to design 2D game content - from
+	rich interactive menus to charts and graphcs to complex animations.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild
new file mode 100644
index 000000000000..4a87e81f9237
--- /dev/null
+++ b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc examples source"
+WANT_ANT_TASKS="ant-nodeps ant-trax"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="a SVG engine for Java"
+HOMEPAGE="https://svgsalamander.dev.java.net/"
+# Created from
+# https://svgsalamander.dev.java.net/svn/svgsalamander/tags/release-${PV}
+# with bundled jars removed.
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/javacc:0
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+java_prepare() {
+	# Delete these so that we don't need junit
+	# They run a dialog any way so not useful for us
+	rm -vr test/* || die
+
+	cd lib || die
+	java-pkg_jar-from --build-only javacc
+	java-pkg_jar-from ant-core
+}
+
+src_install() {
+	java-pkg_dojar build/jar/*.jar
+	java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc build/javadoc
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/com
+}
diff --git a/dev-java/swarmcache-1.0_pre20050106-r2 b/dev-java/swarmcache-1.0_pre20050106-r2
deleted file mode 100644
index 0065715dfa2b..000000000000
--- a/dev-java/swarmcache-1.0_pre20050106-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/jgroups:0 dev-java/ant-core:0 dev-java/commons-logging:0 dev-java/commons-collections:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Cluster-aware Caching for Java
-EAPI=6
-HOMEPAGE=http://swarmcache.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2
-RDEPEND=dev-java/jgroups:0 dev-java/ant-core:0 dev-java/commons-logging:0 dev-java/commons-collections:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/swarmcache-1.0_pre20050106.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7f70f231b115cd0ed925f0d830ee2d68
diff --git a/dev-java/swarmcache/Manifest b/dev-java/swarmcache/Manifest
new file mode 100644
index 000000000000..364bb4fc52b3
--- /dev/null
+++ b/dev-java/swarmcache/Manifest
@@ -0,0 +1,3 @@
+DIST swarmcache-1.0_pre20050106.tar.bz2 34632 BLAKE2B c33ac3c27e7a034a375fe64c6df044aa65c15ef5d926243d5ffa20a831ee70980b6116eef0c333138f4488509bfa1c96cbeb7cf9a815079ba6830a2baa066be0 SHA512 21c05d83a6e05f3c31a1785e0286d2f584375e3aa97e9fa2dd18a0aca5f3678817a6a019524e6b55c2f047547296cec83c9e108c9272401b592ea0f8338878d7
+EBUILD swarmcache-1.0_pre20050106-r2.ebuild 674 BLAKE2B d46417189ce426ed2075803cb3aa7d59c3fe3fd48c028b65c7b5f1dec878bd6ffa3e5d8f13460ddce592fa72bb0711d5161385555208aad75f5743bfb2719bbb SHA512 b6f8a86b1cccd0e262d727914fdd6e823cd6bc5fe19a3e1529b079ad22bd27e215f63948ff64bc82771439fec8c4c494605cedfd761785ee3c48061216a6ba31
+MISC metadata.xml 316 BLAKE2B 6adc8bc24794557402b5e1eed5f33c8e420791de51dbc0d97b6d6110f4a39b7b5b28eb625f2b64062d743e8dc204961063bc66f5b4d63a0ff46a9dab8dc96cfb SHA512 77c639a56c22f43f936a864153af61bfb55ddc9738a76451bc337e08371ee5947c5cee2ee41674e480a74d9d78b69054400671c329511be499250c16b35a57d9
diff --git a/dev-java/swarmcache/metadata.xml b/dev-java/swarmcache/metadata.xml
new file mode 100644
index 000000000000..8ce9a5a15af7
--- /dev/null
+++ b/dev-java/swarmcache/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">swarmcache</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild
new file mode 100644
index 000000000000..26b7ff630e5b
--- /dev/null
+++ b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild
@@ -0,0 +1,37 @@
+# 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="Cluster-aware Caching for Java"
+HOMEPAGE="http://swarmcache.sourceforge.net"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+LICENSE="LGPL-2"
+SLOT="0"
+
+CDEPEND="
+	dev-java/jgroups:0
+	dev-java/ant-core:0
+	dev-java/commons-logging:0
+	dev-java/commons-collections:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	jgroups
+	ant-core
+	commons-logging
+	commons-collections
+"
diff --git a/dev-java/swing-layout-1.0.4-r1 b/dev-java/swing-layout-1.0.4-r1
deleted file mode 100644
index a9c9a9f8b58b..000000000000
--- a/dev-java/swing-layout-1.0.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Professional cross platform layouts with Swing
-EAPI=6
-HOMEPAGE=https://swing-layout.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://gentoo/swing-layout-1.0.4-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d07dc965273ede8c547dd8216de78497
diff --git a/dev-java/swing-layout/Manifest b/dev-java/swing-layout/Manifest
new file mode 100644
index 000000000000..8e954a3e404f
--- /dev/null
+++ b/dev-java/swing-layout/Manifest
@@ -0,0 +1,3 @@
+DIST swing-layout-1.0.4-src.zip 69859 BLAKE2B ccf30c659e6dacecbd0bbe4f3cedbbb7088c108f7af615f7ba465a36f70181da4744c364529ded933ba5c402dddf6f640d8ea1ebd739bb425861605a71315f27 SHA512 83fe876b7d35ba204158ea9ee7a313b330c4f0e8b0ea81b3b487e75aa5e14a00c744aa30af049d9feaafc888875ab194fe73a5838b8073852596704e36517dae
+EBUILD swing-layout-1.0.4-r1.ebuild 506 BLAKE2B 19386f4f5d579fd2782b5f88867d60ef1c290bfc04d01b9ecd5f5faf99812aa030859aec8f17a47d59b01532fc1037d3beb40fb495e189b39077e6f882ee7773 SHA512 17c1ec85b611fad3b8c734d1ec9298d65c95cfc3afcfc8e6db3f5e2450654a076921a4f9ba8dbe6a0c63d060e0bd04c4dfc7ba812dfda3580b7cb6859d663188
+MISC metadata.xml 451 BLAKE2B 5f22464298452bd9cc845a3ec638e4482fb720e672c4fa3b635a75669b095fe88c6bb92bf1fc8b7c701558ab1af99d1520243f2585d252b4f4b6817eaf664e1a SHA512 b10da46476f60d58b851fecab6419d3677abcd1775c23aea1cedcf7ba9d1ca3cac8e5bd79ef4b038833ff060b6ec881d8ef40cf54e70e6d60c9110bd788858db
diff --git a/dev-java/swing-layout/metadata.xml b/dev-java/swing-layout/metadata.xml
new file mode 100644
index 000000000000..6d837ec7a8a7
--- /dev/null
+++ b/dev-java/swing-layout/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+	Swing Layout Extensions makes it easy to create professional
+	cross platform layouts with Swing. This project has an eye
+	towards the needs of GUI builders, such as NetBeans.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/swing-layout/swing-layout-1.0.4-r1.ebuild b/dev-java/swing-layout/swing-layout-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..13cbbd704cfb
--- /dev/null
+++ b/dev-java/swing-layout/swing-layout-1.0.4-r1.ebuild
@@ -0,0 +1,30 @@
+# 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="Professional cross platform layouts with Swing"
+HOMEPAGE="https://swing-layout.dev.java.net/"
+SRC_URI="mirror://gentoo/${P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	default
+}
diff --git a/dev-java/swingx-1.6.4 b/dev-java/swingx-1.6.4
deleted file mode 100644
index 3832f61a5ae9..000000000000
--- a/dev-java/swingx-1.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A collection of powerful, useful, and just plain fun Swing components
-EAPI=5
-HOMEPAGE=https://java.net/projects/swingx/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.5 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.6
-SRC_URI=https://java.net/projects/swingx/downloads/download/releases/swingx-all-1.6.4-sources.jar https://java.net/projects/swingx/downloads/download/releases/swingx-mavensupport-1.6.4-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c3dfc928408132dcbd5220a51e3d8bfd
diff --git a/dev-java/swingx-beaninfo-1.6.4 b/dev-java/swingx-beaninfo-1.6.4
deleted file mode 100644
index 1c6a256deae6..000000000000
--- a/dev-java/swingx-beaninfo-1.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/swingx:1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=SwingX Beaninfo
-EAPI=5
-HOMEPAGE=https://java.net/projects/swingx/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 dev-java/swingx:1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://java.net/downloads/swingx/releases/swingx-beaninfo-1.6.4-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f6bda4b99401ba57c4fbb563caacbc18
diff --git a/dev-java/swingx-beaninfo/Manifest b/dev-java/swingx-beaninfo/Manifest
new file mode 100644
index 000000000000..a660680756be
--- /dev/null
+++ b/dev-java/swingx-beaninfo/Manifest
@@ -0,0 +1,3 @@
+DIST swingx-beaninfo-1.6.4-sources.jar 185813 BLAKE2B 6475c08c495b246ab34b605f63131616645c4533c1603c2d53303b809f77509756ef09106bdf3ae9f963ed1ca3b83f7dc5be31740a6f1568564ec5308081a61e SHA512 9461a00404c8cd1aa7c473e060c855667fedd357688ca1be5e78d6d7f56e15ff5345cf593bc03c173172a42c190c5f76682c01d226f51472f9b1757fcca52ac9
+EBUILD swingx-beaninfo-1.6.4.ebuild 619 BLAKE2B c56ee050a5385b1ec4ffc540b3bde3d2b716025bbc5a6a3a78388efe40e9e37bab6cd0609e2b9f80c10f8a684d0a4543f016cc0bb42e7809eface5a3724276d2 SHA512 d3a6a148173d59b2a156ede023be68b8cef07b1270901eb8f79c45e765186599cdcd37102b63809e2dce065c6135aa5d0a31e9c84ace7168fe8554639eec119e
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/swingx-beaninfo/metadata.xml b/dev-java/swingx-beaninfo/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/swingx-beaninfo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4.ebuild b/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4.ebuild
new file mode 100644
index 000000000000..d16f79a73d8a
--- /dev/null
+++ b/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SwingX Beaninfo"
+HOMEPAGE="https://java.net/projects/swingx/"
+SRC_URI="https://java.net/downloads/swingx/releases/${P}-sources.jar"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/swingx:1.6"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="swingx-1.6"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar .
+}
diff --git a/dev-java/swingx-ws-1.0-r1 b/dev-java/swingx-ws-1.0-r1
deleted file mode 100644
index 761d7e2fd520..000000000000
--- a/dev-java/swingx-ws-1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-httpclient:3 dev-java/jdom:0 dev-java/json:0 dev-java/jtidy:0 dev-java/rome:0 dev-java/swingx:1.6 dev-java/swingx-beaninfo:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Utilities and widgets to integrate Swing GUIs with web applications
-EAPI=6
-HOMEPAGE=https://java.net/projects/swingx-ws/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/commons-httpclient:3 dev-java/jdom:0 dev-java/json:0 dev-java/jtidy:0 dev-java/rome:0 dev-java/swingx:1.6 dev-java/swingx-beaninfo:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/org/swinglabs/swingx-ws/1.0/swingx-ws-1.0-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fda1ea2cf95461f85bdf8e7cd631d784
diff --git a/dev-java/swingx-ws-1.0_p20110515-r1 b/dev-java/swingx-ws-1.0_p20110515-r1
deleted file mode 100644
index fe75d7d4f015..000000000000
--- a/dev-java/swingx-ws-1.0_p20110515-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/jdom:0 dev-java/json:0 dev-java/rome:0 dev-java/jtidy:0 dev-java/xerces:2 dev-java/swingx:1.6 dev-java/swing-layout:1 dev-java/swingx-beaninfo:0 dev-java/commons-httpclient:3 dev-java/xml-commons-external:1.4 >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Utilities and widgets to integrate Swing GUIs with web applications
-EAPI=6
-HOMEPAGE=https://java.net/projects/swingx-ws/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/jdom:0 dev-java/json:0 dev-java/rome:0 dev-java/jtidy:0 dev-java/xerces:2 dev-java/swingx:1.6 dev-java/swing-layout:1 dev-java/swingx-beaninfo:0 dev-java/commons-httpclient:3 dev-java/xml-commons-external:1.4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=bt747
-SRC_URI=mirror://sourceforge/bt747/Development/swingx-ws-2011_05_15-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=958c1295e93ec8d0ef96da1e6e30bb52
diff --git a/dev-java/swingx-ws/Manifest b/dev-java/swingx-ws/Manifest
new file mode 100644
index 000000000000..f757caf04eeb
--- /dev/null
+++ b/dev-java/swingx-ws/Manifest
@@ -0,0 +1,5 @@
+DIST swingx-ws-1.0-sources.jar 281598 BLAKE2B bf978c90d302183818a9da0bc2151b03bc4284d83bac9064a9dfc4db1a1bc95f28e835c45e6aa57a6b47a407926d01273c8ec0ea3bfa22052608c0106ca52a53 SHA512 722f8642e3a7c7825dd44cf01eca624b1d8a6bbfa829dbd7be326b53bf9d5467f48293489bbac6466ba9e74d991caaa6c9d56f0b7a08d205133926413517ca28
+DIST swingx-ws-2011_05_15-src.zip 7010679 BLAKE2B 529507f3a7f48d38eb755001b2d442d040adf884a31a49c00f57fc638855e96b195a50813196fdb7318860b0a547eb8220fdd2d05ed613c2cd7d83cb8b7dd7fd SHA512 1929bcd5d615e336fbf77f5c0406a15f0b8aae1ea2167106b8efe2708bf365b39a2313d2a22b5f77ca9559b161db5c50dc18d0cc4cebfcf7a0e4e0c978d4d5da
+EBUILD swingx-ws-1.0-r1.ebuild 1392 BLAKE2B b9b473f8dd3bb53e8a707c03f2356cd5716556078e45dd21c290ecaee4308149cdd88609ff314845aa2384334352bc1ddc671a70dbbbd2647c7a411ba9cce96c SHA512 7fba5f418d1f17920d2e5813a33692c615c028455457637e8e7ba8e9a479ceebe39500dd98ab3184291836552f0cbd3ebaf9498694b2b91519a49b905507eb16
+EBUILD swingx-ws-1.0_p20110515-r1.ebuild 1740 BLAKE2B 5463bd477386719d2aa4e089ec1ad99ef98280c773a56910949ad991af39f4c8c8015606714d200225e74431ea26022d69839f3f97980345319eeb1461f168fd SHA512 d3d3dc25a9c6e60f8d781aed453d160237b886ee5042aaa54c1fa04c74dbde3a1a2745b4fe62db8df88a795c739e2bbfac5cd4a65c32e5e627e862ac18603719
+MISC metadata.xml 459 BLAKE2B 33dce90cfd998c8a2c5ae695840604ff6092fe43765f6825af684689d30f69b6cd806b3b3ddf591c587bd397426dc8186449597bcdb9e14052ab029de9cb7ecb SHA512 ba6627622238e8d5ebfac52de63029eee448edd37a4819cc08677abd2f04601be6f29943785ff5abb16e602e919d04ec15427de0b371962cf03e1d35da6315d9
diff --git a/dev-java/swingx-ws/metadata.xml b/dev-java/swingx-ws/metadata.xml
new file mode 100644
index 000000000000..89a4387936f7
--- /dev/null
+++ b/dev-java/swingx-ws/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>Set of utilities and widgets to simplify interaction of Swing based GUIs with the web applications of any kind.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">bt747</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild b/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild
new file mode 100644
index 000000000000..bb050ca9a791
--- /dev/null
+++ b/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 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="Utilities and widgets to integrate Swing GUIs with web applications"
+HOMEPAGE="https://java.net/projects/swingx-ws/"
+SRC_URI="http://central.maven.org/maven2/org/swinglabs/${PN}/${PV}/${P}-sources.jar"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+	dev-java/commons-httpclient:3
+	dev-java/jdom:0
+	dev-java/json:0
+	dev-java/jtidy:0
+	dev-java/rome:0
+	dev-java/swingx:1.6
+	dev-java/swingx-beaninfo:0
+	dev-java/xerces:2
+	dev-java/xml-commons-external:1.4"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+src_prepare() {
+	default
+
+	# Fixes for newer swingx-beaninfo.
+	sed -i "s:BeanInfoSupport:org.jdesktop.beans.\0:g" org/jdesktop/swingx/*.java || die
+	find -name "*.java" -exec sed -i -r "s:org\.jdesktop\.swingx\.(editors|BeanInfoSupport|EnumerationValue):org.jdesktop.beans.\1:g" {} + || die
+
+	# GraphicsUtilities moved in later SwingX versions.
+	sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \
+		org/jdesktop/swingx/mapviewer/AbstractTileFactory.java || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar .
+}
diff --git a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild
new file mode 100644
index 000000000000..d417f67fd56f
--- /dev/null
+++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-2011_05_15-src"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Utilities and widgets to integrate Swing GUIs with web applications"
+HOMEPAGE="https://java.net/projects/swingx-ws/"
+SRC_URI="mirror://sourceforge/bt747/Development/${MY_P}.zip"
+LICENSE="LGPL-2.1"
+SLOT="bt747"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+	dev-java/jdom:0
+	dev-java/json:0
+	dev-java/rome:0
+	dev-java/jtidy:0
+	dev-java/xerces:2
+	dev-java/swingx:1.6
+	dev-java/swing-layout:1
+	dev-java/swingx-beaninfo:0
+	dev-java/commons-httpclient:3
+	dev-java/xml-commons-external:1.4"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}/src"
+JAVA_SRC_DIR="beaninfo java"
+
+src_prepare() {
+	default
+	java-pkg_clean "${WORKDIR}"
+
+	# SwingWorker has been built-in since Java 6.
+	find java -name "*.java" -exec sed -i -r "s:org\.jdesktop\.swingworker\.:javax.swing.:g" {} + || die
+
+	# Fixes for newer swingx-beaninfo.
+	sed -i "s:BeanInfoSupport:org.jdesktop.beans.\0:g" beaninfo/org/jdesktop/swingx/*.java || die
+	find beaninfo -name "*.java" -exec sed -i -r "s:org\.jdesktop\.swingx\.(editors|BeanInfoSupport|EnumerationValue):org.jdesktop.beans.\1:g" {} + || die
+
+	# GraphicsUtilities moved in later SwingX versions.
+	sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \
+		java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	local DIR
+	for DIR in ${JAVA_SRC_DIR}; do
+		java-pkg_addres ${PN}.jar ${DIR}
+	done
+}
diff --git a/dev-java/swingx/Manifest b/dev-java/swingx/Manifest
new file mode 100644
index 000000000000..c0d298cae35a
--- /dev/null
+++ b/dev-java/swingx/Manifest
@@ -0,0 +1,4 @@
+DIST swingx-all-1.6.4-sources.jar 1296323 BLAKE2B a0d7073df80a30053f7e0bd653ae615c88f6e7c6ab46d09f1f823b7abba5de38d0293469ec8349389d2c1379f942698bf44ed43503d63438e92737cf2dca3b8c SHA512 d58964507b3e11b74089040f07699076c84520ab46feb8cb6aeea3e0f23c0cdb14f66d2c019ff8f7f0e911599efe543a47c103f7b1fc4829a483d65458f3fb55
+DIST swingx-mavensupport-1.6.4-sources.jar 2793 BLAKE2B 20910dc8c1935bc88b5f91dfec98f1b379a0b50c2e4fe40a55be04a66b16161d469c296a693d7dbc25d7ed3dadcca483ce9f533d75bb1883e998b6768b88348e SHA512 48fde1b0367373516e549919912f08e751fc4e0f964a9f8ae86d9d93813006253782ce2097e54663dd5eb639ab82dbf59fe61defedecd64a0e36e25a14a40d45
+EBUILD swingx-1.6.4.ebuild 845 BLAKE2B ad70120c22589de641fdb27df15e4ce6313039074f4b7573fff005bfb61e1611a89e83c0c197a7bcca189ebb3324813ab3494ec1578b9013deb9bb78337fb62a SHA512 db538dacce74b9c619da1977e3af6ef406ad20fe3f67f2ad781543962a1eb96084ea695143a1b9c2b1095b0c876d0c1d799762eb950f6b6ed5fb252ce0fdfad9
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/swingx/metadata.xml b/dev-java/swingx/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/swingx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/swingx/swingx-1.6.4.ebuild b/dev-java/swingx/swingx-1.6.4.ebuild
new file mode 100644
index 000000000000..98db1f30a104
--- /dev/null
+++ b/dev-java/swingx/swingx-1.6.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of powerful, useful, and just plain fun Swing components"
+HOMEPAGE="https://java.net/projects/swingx/"
+SRC_URI="https://java.net/projects/${PN}/downloads/download/releases/${PN}-all-${PV}-sources.jar
+	https://java.net/projects/${PN}/downloads/download/releases/${PN}-mavensupport-${PV}-sources.jar"
+
+LICENSE="LGPL-2.1"
+SLOT="1.6"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/metainf-services:0"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="metainf-services"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/api
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/swt-3.7.2-r2 b/dev-java/swt-3.7.2-r2
deleted file mode 100644
index 093441dd0abc..000000000000
--- a/dev-java/swt-3.7.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 virtual/pkgconfig >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=GTK based SWT Library
-EAPI=4
-HOMEPAGE=http://www.eclipse.org/
-IUSE=cairo gnome opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3
-SLOT=3.7
-SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7bfb72bcfc4512d935f0da156ebfa526
diff --git a/dev-java/swt-3.8.2-r2 b/dev-java/swt-3.8.2-r2
deleted file mode 100644
index 5d05e79964b4..000000000000
--- a/dev-java/swt-3.8.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 virtual/pkgconfig >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( gnome-base/gnome-vfs:2 gnome-base/libgnome gnome-base/libgnomeui ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=GTK based SWT Library
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/
-IUSE=cairo gnome opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( gnome-base/gnome-vfs:2 gnome-base/libgnome gnome-base/libgnomeui ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3
-SLOT=3.8
-SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=64eeb20e208e0cf4effade81e08291e5
diff --git a/dev-java/swt-4.2-r3 b/dev-java/swt-4.2-r3
deleted file mode 100644
index 35348d45fd13..000000000000
--- a/dev-java/swt-4.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jdk-1.4 app-arch/unzip virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=GTK based SWT Library
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/
-IUSE=cairo gnome opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
-SLOT=4.2
-SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f789ebe822a7ac494784cafcc8a315e0
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
new file mode 100644
index 000000000000..7553c8e7b68e
--- /dev/null
+++ b/dev-java/swt/Manifest
@@ -0,0 +1,23 @@
+AUX as-needed-and-flag-fixes-3.6.patch 7755 BLAKE2B 8e15b6cba2fa403b63647eab5e9b1ffc293d6db67cac2c2ecdc437cbe540433ef4077a333e9290a36c9615204a8361864b322442be9030e66d4d8bfa1569a8ed SHA512 9c2061b82d0a9a10fc99500ea27192cbf74001ab48254f528f00c15ca28e56de697c3861975691d0f8e4d6079a77236a8389ba07612c98031297e3289f4bf083
+AUX build.xml 458 BLAKE2B 5e37fe8b8428e23f477c2767a2a96b1dc02aa6a8d4caa70b9f900c84d734f72665bb7cfeb7fd24dd6b54189ef4a242b1a6b9ab9d4d0bb0b370d59b491f09d2bd SHA512 49f3a4cc04d4d9cf0609aa97e01fa409a8f2dbb953ab3a52bc9984799d0bf4092d2a63fe665d8ba6ca0428089984b6ef47bc78900c613373ca1a7b588f6c5525
+AUX swt-3.7-manifest 750 BLAKE2B b0182c7e25e66be2443e3dcf0d64be1a92b836b8cd461cd6a92e7b73985a91a0c853fb8a3b784fa1edb70e2261f4a94e7273a505e4b130fcfe7b1c372b41efa1 SHA512 e4f6aa5ce58cdc697c234a2a4be43de0510d3c082a2737627a35df74d378a50edc0f7d3e62221f402eed602fcdc50fa7eff969b12602189fd400e1f1580f0d8f
+AUX swt-3.7.2-gio_launch-URI-x86.patch 4287 BLAKE2B 54c55cd48cb4f4d64deae90769aa84b7d2785c070c2e5b3e647037ca986d152b8ea71bb58c0d9749e8efb50fca53ab3fc9dbb4ae4355a86dc2285f253e74e064 SHA512 c82364b7e7bc255ed592a254201346a4159789ddbf486f22c026fdefce3f0d26bc91b42535228050eee4ec9b4e7a840008b60b2c7cb98896d6b8f1d875b5bef7
+AUX swt-3.7.2-gio_launch-URI.patch 4287 BLAKE2B 45c2655ca657b968b1fa6dc74fee4e30330339da12ffac079eaf616cf1f2e9a3a8e984789d38c43019ade81d9a5a444b0a763df3026732dbc515a3a6b329efb5 SHA512 4954c7464bb2ab7b9c23fd771d3dd49dd826d4a919d3ee85914ca8360708f26d396aaaa6564cc826fcff6ea892d916097e118c4ed0a1ed60cb8217e5c3ebf94d
+AUX swt-3.8-as-needed-and-flag-fixes.patch 8852 BLAKE2B 963f9cccc06c41b6bbd88d5430d66b500094c19708bb903cae7b125342556eb42d193c91fb6c3ca94c589a75060e3a16c3f8cec2ccd02c3f5a4176d5ec2c6a91 SHA512 523dfb0c0fa2bb2c8c0647ef214465c7ebbc93a7a179b204efc46065a925170dc2659238bbb0abefc73b145322b9668340d36ff8a95fc5083890223b48d6e644
+AUX swt-3.8-manifest 750 BLAKE2B 46ff2102bf58343aa6443accc445c1531920f5913876189f471eba38961c4850cc121f52410570f8cae374f2112ec9466cffaccb218daf9558d43c32f39cd24c SHA512 ce465f77e2fc3340ccaf3ecce67697666972331f849ef196eeebfed3dd1342691a5641ec20b91bc5b480ea0acc9edf194ec9f4bc597c2778d0bd0382923d1bc5
+AUX swt-3.8.2-gthread.patch 1225 BLAKE2B 44dd188433a0e3f70ae53c2df79ffe1fe9839e82847568f611e1c04d380b6cd5837c7f96055ea3132c401de3e73f4b41e6b9bf070f515778cf0b5ddbdaa8942f SHA512 035ea3dda893481f67ac0447e0c7382a9761eb3ee77b65ca77038bd17117b68a2d93058c8414d9b2656ceeecde3e6ebc06c0f27e044f217fe8f44945104dcbd4
+AUX swt-4.2-as-needed-and-flag-fixes.patch 7840 BLAKE2B 96edb84193506ed8c4c293970def5c1c38fb0cd66561030e1e07f214a70f84c657260e1adbdf41f2eb404d4069794cca9b5422dea344ceaf028fbc75cf9aaa26 SHA512 00cc50a0432bb17272a40c3606c9a5729171708af5581c861a5bfae3d1b694289de92164961bfceb841813fb9161befdc2114616556296e81401f133f07c1db1
+AUX swt-4.2-manifest 739 BLAKE2B 031d2e59e4b20c8aacdb4c5b03ff3bdfd14f9373386766993efeb833995d4858b09ac157bdc847820271bd0a354f5c0280aa0746eb0038413782c5cf59f7ba4c SHA512 f17bdc21083c70896d82d12d6918bb121db838b895d1db95dbbf9bbc0368b1b26e6b6acf5a90b709ff961f3640911111932391fa45ae898d1de8a387d17594b1
+DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0
+DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6968bb41c44cee403f063c159962d9d43a5c9529026819ddb1c8eea98cd11ed818075c37f4e9851d2e95532dc166e570ce SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426
+DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7
+DIST swt-3.8.2-gtk-linux-ppc64.zip 5933708 BLAKE2B d49633d9d5049d1a6f9bbdcf5a364b73802194fbaf02aa5064c7a1c917e0aad80c829b026a1a41b7903ed0d8066af89ff24683897ced8cbe8c41406a7696c408 SHA512 cb9f2c7aed0b18bae6546272076c23c91d9e1a38404f0a70ddc6408047d961befe2839db177066312b82d8365bee6bcffb6e92aaa7a869ad37d9f49ab780e337
+DIST swt-3.8.2-gtk-linux-x86.zip 5558694 BLAKE2B 8dd0ce9f2c6b8dc448c85a6c509f39ef2da000e0589da52330b83dec87601d100320af778983b2083ca8f9e2890a2d4c731cb2810d9054a9e50e7940ad14bea2 SHA512 afe1563e92fe9af0a58e7dbae731976991a6afacf6415ab88ebf557f99a5154169ad7103519524f71142c4160d55a9b0a9f7379b21486430318e4160e6f01c00
+DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f65e48543538a386103767700fb0af5ea0cf3da73eefe57b8cc6b3d78cb8f29345869f5474513648560395a69cbd4c9b8ee8a4 SHA512 43a27cb6fc891d7da35f5fcfc6ccb689d2b2c58de70b628b1e7cf07131f0641598b627eeedafb6a8dca715a336a7fb4fb6a03bb29fea3e115a4af571b1574cf8
+DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
+DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
+DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
+EBUILD swt-3.7.2-r2.ebuild 4606 BLAKE2B 9d782b21565f93a1d69e83f3f65ade694bbc1034f24ac2b1a59ceaa1c2da0defcd00e27d43c43907e04661b3a29094282dfca952caa99d4ece750b72491f28ec SHA512 6ca872bd210d5823d369abc031d3e412a3e3f869f541c37f4fcfc084bedefb1e3144f3aeb7d1bfc039b0337641c1582bcde76a279a5a0f6a2b5b0f5c4232495d
+EBUILD swt-3.8.2-r2.ebuild 4437 BLAKE2B 19f84cd5506ca1306754a26f601d9a1a18b6e3f3091e7f38fb768db833621c741502794417ab7099a1edec0546ba6c79785c918bb26aa0acfb3bdc5dc788b860 SHA512 c4e25e86c66d29d74d5bc100d97214b3742369ab7bbf96f38fd95ed28c7c03838f3260dcd45f755c90a07ba4f0f0a066702f7f8b2396e66569fe6f513770ab28
+EBUILD swt-4.2-r3.ebuild 4682 BLAKE2B 1e47fc517f3eba4ff626129f5b4810dba8930da995aa03788806d324192443e56570c280e3e732f4a58b6b3aad125574b22e8d024de11b56cced051675cb382c SHA512 15ffbb9e0cdaca5bc782327052d049efce05686d2a27ab84f44c9388e82a2f83ce42adab9e2c8110580b7572b18b111d5dcdf5ab601021cc2a321a84ffeca130
+MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
new file mode 100644
index 000000000000..16194fdc5f51
--- /dev/null
+++ b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
@@ -0,0 +1,243 @@
+--- make_linux.mak~	2010-06-08 17:30:58.000000000 +0000
++++ make_linux.mak	2010-08-09 22:48:01.515433721 +0000
+@@ -66,7 +66,7 @@
+ # Uncomment for Native Stats tool
+ #NATIVE_STATS = -DNATIVE_STATS
+ 
+-MOZILLACFLAGS = -O \
++MOZILLACFLAGS = $(CXXFLAGS) \
+ 	-DSWT_VERSION=$(SWT_VERSION) \
+ 	$(NATIVE_STATS) \
+ 	-DMOZILLA_STRICT_API=1 \
+@@ -107,7 +107,7 @@
+ WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
+-CFLAGS = -O -Wall \
++CFLAGS += \
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DLINUX -DGTK \
+@@ -131,13 +131,13 @@
+ make_swt: $(SWT_LIB) $(SWTPI_LIB)
+ 
+ $(SWT_LIB): $(SWT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
+ 
+ callback.o: callback.c callback.h
+ 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
+ 
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
+ 
+ swt.o: swt.c swt.h
+ 	$(CC) $(CFLAGS) -c swt.c
+@@ -156,7 +156,7 @@
+ make_cairo: $(CAIRO_LIB)
+ 
+ $(CAIRO_LIB): $(CAIRO_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+ 
+ cairo.o: cairo.c cairo.h swt.h
+ 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+@@ -172,7 +172,7 @@
+ make_cde: $(CDE_LIB)
+ 
+ $(CDE_LIB): $(CDE_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
+ 
+ #
+ # AWT lib
+@@ -180,7 +180,7 @@
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
++	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+ 
+ #
+ # Atk lib
+@@ -188,7 +188,7 @@
+ make_atk: $(ATK_LIB)
+ 
+ $(ATK_LIB): $(ATK_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+ 
+ atk.o: atk.c atk.h
+ 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -205,7 +205,7 @@
+ make_gnome: $(GNOME_LIB)
+ 
+ $(GNOME_LIB): $(GNOME_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
+ 
+ gnome.o: gnome.c 
+ 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+@@ -222,7 +222,7 @@
+ make_mozilla:$(MOZILLA_LIB)
+ 
+ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
++	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
+ 
+ xpcom.o: xpcom.cpp
+ 	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
+@@ -242,7 +242,7 @@
+ make_xulrunner:$(XULRUNNER_LIB)
+ 
+ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcomxul.o: xpcom.cpp
+ 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+@@ -262,7 +262,7 @@
+ make_xpcominit:$(XPCOMINIT_LIB)
+ 
+ $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcominit.o: xpcominit.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+@@ -279,7 +279,7 @@
+ make_webkit: $(WEBKIT_LIB)
+ 
+ $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
+ 
+ webkit.o: webkitgtk.c 
+ 	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o
+@@ -296,7 +296,7 @@
+ make_glx: $(GLX_LIB)
+ 
+ $(GLX_LIB): $(GLX_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+ 
+ glx.o: glx.c 
+ 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
+--- make_freebsd.mak~	2010-06-08 17:30:58.000000000 +0000
++++ make_freebsd.mak	2010-08-09 22:50:26.173246263 +0000
+@@ -64,7 +64,7 @@
+ # Uncomment for Native Stats tool
+ #NATIVE_STATS = -DNATIVE_STATS
+ 
+-MOZILLACFLAGS = -O \
++MOZILLACFLAGS += \
+ 	-DSWT_VERSION=$(SWT_VERSION) \
+ 	$(NATIVE_STATS) \
+ 	-DMOZILLA_STRICT_API=1 \
+@@ -91,7 +91,7 @@
+ XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
+-CFLAGS = -O -Wall \
++CFLAGS += \
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DFREEBSD -DGTK \
+@@ -115,13 +115,13 @@
+ make_swt: $(SWT_LIB) $(SWTPI_LIB)
+ 
+ $(SWT_LIB): $(SWT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
+ 
+ callback.o: callback.c callback.h
+ 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
+ 
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
+ 
+ swt.o: swt.c swt.h
+ 	$(CC) $(CFLAGS) -c swt.c
+@@ -140,7 +140,7 @@
+ make_cairo: $(CAIRO_LIB)
+ 
+ $(CAIRO_LIB): $(CAIRO_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+ 
+ cairo.o: cairo.c cairo.h swt.h
+ 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+@@ -156,7 +156,7 @@
+ make_cde: $(CDE_LIB)
+ 
+ $(CDE_LIB): $(CDE_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
+ 
+ #
+ # AWT lib
+@@ -164,7 +164,7 @@
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
++	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+ 
+ #
+ # Atk lib
+@@ -172,7 +172,7 @@
+ make_atk: $(ATK_LIB)
+ 
+ $(ATK_LIB): $(ATK_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+ 
+ atk.o: atk.c atk.h
+ 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -189,7 +189,7 @@
+ make_gnome: $(GNOME_LIB)
+ 
+ $(GNOME_LIB): $(GNOME_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
+ 
+ gnome.o: gnome.c 
+ 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+@@ -206,7 +206,7 @@
+ make_mozilla:$(MOZILLA_LIB)
+ 
+ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
++	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
+ 
+ xpcom.o: xpcom.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
+@@ -226,7 +226,7 @@
+ make_xulrunner:$(XULRUNNER_LIB)
+ 
+ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcomxul.o: xpcom.cpp
+ 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+@@ -252,7 +252,7 @@
+ make_xpcominit:$(XPCOMINIT_LIB)
+ 
+ $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcominit.o: xpcominit.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+@@ -269,7 +269,7 @@
+ make_glx: $(GLX_LIB)
+ 
+ $(GLX_LIB): $(GLX_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+ 
+ glx.o: glx.c 
+ 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
diff --git a/dev-java/swt/files/build.xml b/dev-java/swt/files/build.xml
new file mode 100644
index 000000000000..ea775871bf09
--- /dev/null
+++ b/dev-java/swt/files/build.xml
@@ -0,0 +1,17 @@
+<project name="SWT" default="jar" basedir=".">
+   <property name="src" location="."/>
+   <property name="build" location="build"/>
+
+   <target name="init">
+      <tstamp/>
+      <mkdir dir="${build}"/>
+   </target>
+
+   <target name="compile" depends="init" description="Compile the SWT toolset">
+      <javac srcdir="${src}" destdir="${build}"/>
+   </target>
+
+   <target name="jar">
+      <jar destfile="swt.jar" basedir="${build}"/>
+   </target>
+</project>
diff --git a/dev-java/swt/files/swt-3.7-manifest b/dev-java/swt/files/swt-3.7-manifest
new file mode 100644
index 000000000000..bddcbb48b041
--- /dev/null
+++ b/dev-java/swt/files/swt-3.7-manifest
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
+Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
+Bundle-Version: 3.7
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
+Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
+ org.eclipse.swt.internal.cairo; x-internal:=true,
+ org.eclipse.swt.internal.cde; x-internal:=true,
+ org.eclipse.swt.internal.gnome; x-internal:=true,
+ org.eclipse.swt.internal.gtk; x-internal:=true,
+ org.eclipse.swt.internal.opengl.glx; x-internal:=true
+ org.eclipse.swt.internal.webkit; x-internal:=true
+
diff --git a/dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch b/dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch
new file mode 100644
index 000000000000..cab0e0cdb573
--- /dev/null
+++ b/dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch
@@ -0,0 +1,121 @@
+Program.launch will first attempt to open files using libgio and then fallback
+to gnome-vfs.  gio_launch uses g_file_new_for_path which fails when passed a
+URI.  If swt was built with USE="-gnome" then the fallback fails as well,
+making it appear that a package has a dependency on swt[gnome] when it does
+not.
+
+Caused by: java.lang.UnsatisfiedLinkError: Could not load SWT library. Reasons: 
+        no swt-gnome-gtk-3740 in java.library.path
+        no swt-gnome-gtk in java.library.path
+        Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk-3740.so
+        Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk.so
+
+Use g_file_new_for_commandline_arg instead.
+
+https://bugs.gentoo.org/424151
+
+
+--- a/os.c
++++ b/os.c
+@@ -3059,6 +3059,30 @@ fail:
+ }
+ #endif
+ 
++#ifndef NO__1g_1file_1new_1for_1commandline_1arg
++JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg)
++	(JNIEnv *env, jclass that, jbyteArray arg0)
++{
++	jbyte *lparg0=NULL;
++	jintLong rc = 0;
++	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
++	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
++/*
++	rc = (jintLong)g_file_new_for_commandline_arg(lparg0);
++*/
++	{
++		LOAD_FUNCTION(fp, g_file_new_for_commandline_arg)
++		if (fp) {
++			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
++		}
++	}
++fail:
++	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
++	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
++	return rc;
++}
++#endif
++
+ #ifndef NO__1g_1file_1new_1for_1path
+ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path)
+ 	(JNIEnv *env, jclass that, jbyteArray arg0)
+--- a/os_custom.h
++++ b/os_custom.h
+@@ -280,6 +280,7 @@
+ #define g_file_icon_get_file_LIB LIB_GIO
+ #define g_file_info_get_content_type_LIB LIB_GIO
+ #define g_file_info_get_modification_time_LIB LIB_GIO
++#define g_file_new_for_commandline_arg_LIB LIB_GIO
+ #define g_file_new_for_path_LIB LIB_GIO
+ #define g_file_new_for_uri_LIB LIB_GIO
+ #define g_file_read_LIB LIB_GIO
+--- a/os_stats.c
++++ b/os_stats.c
+@@ -18,8 +18,8 @@
+ 
+ #ifdef NATIVE_STATS
+ 
+-int OS_nativeFunctionCount = 1396;
+-int OS_nativeFunctionCallCount[1396];
++int OS_nativeFunctionCount = 1397;
++int OS_nativeFunctionCallCount[1397];
+ char * OS_nativeFunctionNames[] = {
+ #ifndef JNI64
+ 	"Call__IIII",
+@@ -250,6 +250,7 @@ char * OS_nativeFunctionNames[] = {
+ 	"_1g_1file_1icon_1get_1file",
+ 	"_1g_1file_1info_1get_1content_1type",
+ 	"_1g_1file_1info_1get_1modification_1time",
++	"_1g_1file_1new_1for_1commandline_1arg",
+ 	"_1g_1file_1new_1for_1path",
+ 	"_1g_1file_1new_1for_1uri",
+ 	"_1g_1file_1query_1info",
+--- a/os_stats.h
++++ b/os_stats.h
+@@ -258,6 +258,7 @@ typedef enum {
+ 	_1g_1file_1icon_1get_1file_FUNC,
+ 	_1g_1file_1info_1get_1content_1type_FUNC,
+ 	_1g_1file_1info_1get_1modification_1time_FUNC,
++	_1g_1file_1new_1for_1commandline_1arg_FUNC,
+ 	_1g_1file_1new_1for_1path_FUNC,
+ 	_1g_1file_1new_1for_1uri_FUNC,
+ 	_1g_1file_1query_1info_FUNC,
+--- a/src/org/eclipse/swt/internal/gtk/OS.java
++++ b/src/org/eclipse/swt/internal/gtk/OS.java
+@@ -2113,6 +2113,16 @@ public static final int /*long*/ g_file_new_for_path(byte[] fileName) {
+ 	}
+ }
+ /** @method flags=dynamic */
++public static final native int /*long*/ _g_file_new_for_commandline_arg(byte[] fileName);
++public static final int /*long*/ g_file_new_for_commandline_arg(byte[] fileName) {
++	lock.lock();
++	try {
++		return _g_file_new_for_commandline_arg(fileName);
++	} finally {
++		lock.unlock();
++	}
++}
++/** @method flags=dynamic */
+ public static final native int /*long*/ _g_file_new_for_uri(byte[] fileName);
+ public static final int /*long*/ g_file_new_for_uri(byte[] fileName) {
+ 	lock.lock();
+--- a/src/org/eclipse/swt/program/Program.java
++++ b/src/org/eclipse/swt/program/Program.java
+@@ -954,7 +954,7 @@ static boolean gio_isExecutable(String fileName) {
+ static boolean gio_launch(String fileName) {
+ 	boolean result = false;
+ 	byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
+-	int /*long*/ file = OS.g_file_new_for_path (fileNameBuffer);
++	int /*long*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer);
+ 	if (file != 0) {
+ 		int /*long*/ uri = OS.g_file_get_uri (file);
+ 		if (uri != 0) {
diff --git a/dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch b/dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch
new file mode 100644
index 000000000000..bbb28573072b
--- /dev/null
+++ b/dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch
@@ -0,0 +1,121 @@
+Program.launch will first attempt to open files using libgio and then fallback
+to gnome-vfs.  gio_launch uses g_file_new_for_path which fails when passed a
+URI.  If swt was built with USE="-gnome" then the fallback fails as well,
+making it appear that a package has a dependency on swt[gnome] when it does
+not.
+
+Caused by: java.lang.UnsatisfiedLinkError: Could not load SWT library. Reasons: 
+        no swt-gnome-gtk-3740 in java.library.path
+        no swt-gnome-gtk in java.library.path
+        Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk-3740.so
+        Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk.so
+
+Use g_file_new_for_commandline_arg instead.
+
+https://bugs.gentoo.org/424151
+
+
+--- a/os.c
++++ b/os.c
+@@ -3059,6 +3059,30 @@ fail:
+ }
+ #endif
+ 
++#ifndef NO__1g_1file_1new_1for_1commandline_1arg
++JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg)
++	(JNIEnv *env, jclass that, jbyteArray arg0)
++{
++	jbyte *lparg0=NULL;
++	jintLong rc = 0;
++	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
++	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
++/*
++	rc = (jintLong)g_file_new_for_commandline_arg(lparg0);
++*/
++	{
++		LOAD_FUNCTION(fp, g_file_new_for_commandline_arg)
++		if (fp) {
++			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
++		}
++	}
++fail:
++	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
++	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
++	return rc;
++}
++#endif
++
+ #ifndef NO__1g_1file_1new_1for_1path
+ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path)
+ 	(JNIEnv *env, jclass that, jbyteArray arg0)
+--- a/os_custom.h
++++ b/os_custom.h
+@@ -280,6 +280,7 @@
+ #define g_file_icon_get_file_LIB LIB_GIO
+ #define g_file_info_get_content_type_LIB LIB_GIO
+ #define g_file_info_get_modification_time_LIB LIB_GIO
++#define g_file_new_for_commandline_arg_LIB LIB_GIO
+ #define g_file_new_for_path_LIB LIB_GIO
+ #define g_file_new_for_uri_LIB LIB_GIO
+ #define g_file_read_LIB LIB_GIO
+--- a/os_stats.c
++++ b/os_stats.c
+@@ -18,8 +18,8 @@
+ 
+ #ifdef NATIVE_STATS
+ 
+-int OS_nativeFunctionCount = 1396;
+-int OS_nativeFunctionCallCount[1396];
++int OS_nativeFunctionCount = 1397;
++int OS_nativeFunctionCallCount[1397];
+ char * OS_nativeFunctionNames[] = {
+ #ifndef JNI64
+ 	"Call__IIII",
+@@ -250,6 +250,7 @@ char * OS_nativeFunctionNames[] = {
+ 	"_1g_1file_1icon_1get_1file",
+ 	"_1g_1file_1info_1get_1content_1type",
+ 	"_1g_1file_1info_1get_1modification_1time",
++	"_1g_1file_1new_1for_1commandline_1arg",
+ 	"_1g_1file_1new_1for_1path",
+ 	"_1g_1file_1new_1for_1uri",
+ 	"_1g_1file_1query_1info",
+--- a/os_stats.h
++++ b/os_stats.h
+@@ -258,6 +258,7 @@ typedef enum {
+ 	_1g_1file_1icon_1get_1file_FUNC,
+ 	_1g_1file_1info_1get_1content_1type_FUNC,
+ 	_1g_1file_1info_1get_1modification_1time_FUNC,
++	_1g_1file_1new_1for_1commandline_1arg_FUNC,
+ 	_1g_1file_1new_1for_1path_FUNC,
+ 	_1g_1file_1new_1for_1uri_FUNC,
+ 	_1g_1file_1query_1info_FUNC,
+--- a/src/org/eclipse/swt/internal/gtk/OS.java
++++ b/src/org/eclipse/swt/internal/gtk/OS.java
+@@ -2113,6 +2113,16 @@ public static final long /*int*/ g_file_new_for_path(byte[] fileName) {
+ 	}
+ }
+ /** @method flags=dynamic */
++public static final native long /*int*/ _g_file_new_for_commandline_arg(byte[] fileName);
++public static final long /*int*/ g_file_new_for_commandline_arg(byte[] fileName) {
++	lock.lock();
++	try {
++		return _g_file_new_for_commandline_arg(fileName);
++	} finally {
++		lock.unlock();
++	}
++}
++/** @method flags=dynamic */
+ public static final native long /*int*/ _g_file_new_for_uri(byte[] fileName);
+ public static final long /*int*/ g_file_new_for_uri(byte[] fileName) {
+ 	lock.lock();
+--- a/src/org/eclipse/swt/program/Program.java
++++ b/src/org/eclipse/swt/program/Program.java
+@@ -954,7 +954,7 @@ static boolean gio_isExecutable(String fileName) {
+ static boolean gio_launch(String fileName) {
+ 	boolean result = false;
+ 	byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
+-	long /*int*/ file = OS.g_file_new_for_path (fileNameBuffer);
++	long /*int*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer);
+ 	if (file != 0) {
+ 		long /*int*/ uri = OS.g_file_get_uri (file);
+ 		if (uri != 0) {
diff --git a/dev-java/swt/files/swt-3.8-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-3.8-as-needed-and-flag-fixes.patch
new file mode 100644
index 000000000000..ce5c54e408e2
--- /dev/null
+++ b/dev-java/swt/files/swt-3.8-as-needed-and-flag-fixes.patch
@@ -0,0 +1,243 @@
+--- a/make_freebsd.mak
++++ b/make_freebsd.mak
+@@ -64,7 +64,7 @@ GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
+ # Uncomment for Native Stats tool
+ #NATIVE_STATS = -DNATIVE_STATS
+ 
+-MOZILLACFLAGS = -O \
++MOZILLACFLAGS += \
+ 	-DSWT_VERSION=$(SWT_VERSION) \
+ 	$(NATIVE_STATS) \
+ 	-DMOZILLA_STRICT_API=1 \
+@@ -91,7 +91,7 @@ XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomx
+ XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
+-CFLAGS = -O -Wall \
++CFLAGS += \
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DFREEBSD -DGTK \
+@@ -115,13 +115,13 @@ all: make_swt make_atk make_gnome make_glx
+ make_swt: $(SWT_LIB) $(SWTPI_LIB)
+ 
+ $(SWT_LIB): $(SWT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
+ 
+ callback.o: callback.c callback.h
+ 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
+ 
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
+ 
+ swt.o: swt.c swt.h
+ 	$(CC) $(CFLAGS) -c swt.c
+@@ -140,7 +140,7 @@ os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h
+ make_cairo: $(CAIRO_LIB)
+ 
+ $(CAIRO_LIB): $(CAIRO_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+ 
+ cairo.o: cairo.c cairo.h swt.h
+ 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+@@ -156,7 +156,7 @@ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h
+ make_cde: $(CDE_LIB)
+ 
+ $(CDE_LIB): $(CDE_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
+ 
+ #
+ # AWT lib
+@@ -164,7 +164,7 @@ $(CDE_LIB): $(CDE_OBJECTS)
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
++	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+ 
+ #
+ # Atk lib
+@@ -172,7 +172,7 @@ $(AWT_LIB): $(AWT_OBJECTS)
+ make_atk: $(ATK_LIB)
+ 
+ $(ATK_LIB): $(ATK_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+ 
+ atk.o: atk.c atk.h
+ 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -189,7 +189,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
+ make_gnome: $(GNOME_LIB)
+ 
+ $(GNOME_LIB): $(GNOME_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
+ 
+ gnome.o: gnome.c 
+ 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+@@ -206,7 +206,7 @@ gnome_stats.o: gnome_stats.c gnome_stats.h
+ make_mozilla:$(MOZILLA_LIB)
+ 
+ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
++	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
+ 
+ xpcom.o: xpcom.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
+@@ -226,7 +226,7 @@ xpcom_stats.o: xpcom_stats.cpp
+ make_xulrunner:$(XULRUNNER_LIB)
+ 
+ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcomxul.o: xpcom.cpp
+ 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+@@ -252,7 +252,7 @@ xpcomxulglue_stats.o: xpcomglue_stats.cpp
+ make_xpcominit:$(XPCOMINIT_LIB)
+ 
+ $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcominit.o: xpcominit.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+@@ -269,7 +269,7 @@ xpcominit_stats.o: xpcominit_stats.cpp
+ make_glx: $(GLX_LIB)
+ 
+ $(GLX_LIB): $(GLX_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+ 
+ glx.o: glx.c 
+ 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
+--- a/make_linux.mak
++++ b/make_linux.mak
+@@ -66,7 +66,7 @@ GLXLIBS = -lGL -lGLU -lm
+ # Uncomment for Native Stats tool
+ #NATIVE_STATS = -DNATIVE_STATS
+ 
+-MOZILLACFLAGS = -O \
++MOZILLACFLAGS = $(CXXFLAGS) \
+ 	-DSWT_VERSION=$(SWT_VERSION) \
+ 	$(NATIVE_STATS) \
+ 	-DMOZILLA_STRICT_API=1 \
+@@ -106,7 +106,7 @@ XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
+ WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
+-CFLAGS = -O -Wall \
++CFLAGS += \
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DLINUX -DGTK \
+@@ -130,13 +130,13 @@ all: make_swt make_atk make_glx make_webkit
+ make_swt: $(SWT_LIB) $(SWTPI_LIB)
+ 
+ $(SWT_LIB): $(SWT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
+ 
+ callback.o: callback.c callback.h
+ 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
+ 
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
+ 
+ swt.o: swt.c swt.h
+ 	$(CC) $(CFLAGS) -c swt.c
+@@ -155,7 +155,7 @@ os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h
+ make_cairo: $(CAIRO_LIB)
+ 
+ $(CAIRO_LIB): $(CAIRO_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+ 
+ cairo.o: cairo.c cairo.h swt.h
+ 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+@@ -171,7 +171,7 @@ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h
+ make_cde: $(CDE_LIB)
+ 
+ $(CDE_LIB): $(CDE_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
+ 
+ #
+ # AWT lib
+@@ -179,7 +179,7 @@ $(CDE_LIB): $(CDE_OBJECTS)
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
++	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+ 
+ #
+ # Atk lib
+@@ -187,7 +187,7 @@ $(AWT_LIB): $(AWT_OBJECTS)
+ make_atk: $(ATK_LIB)
+ 
+ $(ATK_LIB): $(ATK_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+ 
+ atk.o: atk.c atk.h
+ 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -204,7 +204,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
+ make_gnome: $(GNOME_LIB)
+ 
+ $(GNOME_LIB): $(GNOME_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
+ 
+ gnome.o: gnome.c 
+ 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+@@ -221,7 +221,7 @@ gnome_stats.o: gnome_stats.c gnome_stats.h
+ make_mozilla:$(MOZILLA_LIB)
+ 
+ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
++	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
+ 
+ xpcom.o: xpcom.cpp
+ 	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
+@@ -242,7 +242,7 @@ make_xulrunner:$(XULRUNNER_LIB)
+ 
+ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+ 	echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc --shared -xc - -o libswt-xulrunner-fix.so
+-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcomxul.o: xpcom.cpp
+ 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+@@ -262,7 +262,7 @@ xpcomxul_stats.o: xpcom_stats.cpp
+ make_xpcominit:$(XPCOMINIT_LIB)
+ 
+ $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcominit.o: xpcominit.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+@@ -279,7 +279,7 @@ xpcominit_stats.o: xpcominit_stats.cpp
+ make_webkit: $(WEBKIT_LIB)
+ 
+ $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
+ 
+ webkit.o: webkitgtk.c 
+ 	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o
+@@ -296,7 +296,7 @@ webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h
+ make_glx: $(GLX_LIB)
+ 
+ $(GLX_LIB): $(GLX_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+ 
+ glx.o: glx.c 
+ 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
diff --git a/dev-java/swt/files/swt-3.8-manifest b/dev-java/swt/files/swt-3.8-manifest
new file mode 100644
index 000000000000..ee9e31c373d6
--- /dev/null
+++ b/dev-java/swt/files/swt-3.8-manifest
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
+Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
+Bundle-Version: 3.8
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
+Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
+ org.eclipse.swt.internal.cairo; x-internal:=true,
+ org.eclipse.swt.internal.cde; x-internal:=true,
+ org.eclipse.swt.internal.gnome; x-internal:=true,
+ org.eclipse.swt.internal.gtk; x-internal:=true,
+ org.eclipse.swt.internal.opengl.glx; x-internal:=true
+ org.eclipse.swt.internal.webkit; x-internal:=true
+
diff --git a/dev-java/swt/files/swt-3.8.2-gthread.patch b/dev-java/swt/files/swt-3.8.2-gthread.patch
new file mode 100644
index 000000000000..6f99a59382ba
--- /dev/null
+++ b/dev-java/swt/files/swt-3.8.2-gthread.patch
@@ -0,0 +1,44 @@
+From c973b9b9be568ebbce618985bc5ee440babf8ab1 Mon Sep 17 00:00:00 2001
+From: Jakub Adam <jakub.adam@ktknet.cz>
+Date: Thu, 27 Jun 2013 10:16:49 +0200
+Subject: [PATCH 1/2] fix-glib-2.35-compatibility
+
+g_thread_init() and g_thread_supported() are deprecated and don't
+have to be used anymore.
+
+---
+ os.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+--- a/os.c
++++ b/os.c
+@@ -4444,9 +4444,9 @@ fail:
+ JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init)
+ 	(JNIEnv *env, jclass that, jintLong arg0)
+ {
+-	OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC);
++	/*OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC);
+ 	g_thread_init((GThreadFunctions *)arg0);
+-	OS_NATIVE_EXIT(env, that, _1g_1thread_1init_FUNC);
++	OS_NATIVE_EXIT(env, that, _1g_1thread_1init_FUNC);*/
+ }
+ #endif
+ 
+@@ -4454,11 +4454,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init)
+ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1thread_1supported)
+ 	(JNIEnv *env, jclass that)
+ {
+-	jboolean rc = 0;
++	/*jboolean rc = 0;
+ 	OS_NATIVE_ENTER(env, that, _1g_1thread_1supported_FUNC);
+ 	rc = (jboolean)g_thread_supported();
+ 	OS_NATIVE_EXIT(env, that, _1g_1thread_1supported_FUNC);
+-	return rc;
++	return rc;*/
++	return 1;
+ }
+ #endif
+ 
+-- 
+1.7.10.4
+
diff --git a/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch
new file mode 100644
index 000000000000..98773c155697
--- /dev/null
+++ b/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch
@@ -0,0 +1,243 @@
+--- make_linux.mak-	2012-07-02 00:49:48.729100052 +0000
++++ make_linux.mak	2012-07-02 00:53:16.753499389 +0000
+@@ -66,7 +66,7 @@
+ # Uncomment for Native Stats tool
+ #NATIVE_STATS = -DNATIVE_STATS
+ 
+-MOZILLACFLAGS = -O \
++MOZILLACFLAGS = $(CXXFLAGS) \
+ 	-DSWT_VERSION=$(SWT_VERSION) \
+ 	$(NATIVE_STATS) \
+ 	-DMOZILLA_STRICT_API=1 \
+@@ -106,7 +106,7 @@
+ WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
+-CFLAGS = -O -Wall \
++CFLAGS += \
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DLINUX -DGTK \
+@@ -130,13 +130,13 @@
+ make_swt: $(SWT_LIB) $(SWTPI_LIB)
+ 
+ $(SWT_LIB): $(SWT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
+ 
+ callback.o: callback.c callback.h
+ 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
+ 
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
+ 
+ swt.o: swt.c swt.h
+ 	$(CC) $(CFLAGS) -c swt.c
+@@ -155,7 +155,7 @@
+ make_cairo: $(CAIRO_LIB)
+ 
+ $(CAIRO_LIB): $(CAIRO_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+ 
+ cairo.o: cairo.c cairo.h swt.h
+ 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+@@ -171,7 +171,7 @@
+ make_cde: $(CDE_LIB)
+ 
+ $(CDE_LIB): $(CDE_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
+ 
+ #
+ # AWT lib
+@@ -179,7 +179,7 @@
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
++	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+ 
+ #
+ # Atk lib
+@@ -187,7 +187,7 @@
+ make_atk: $(ATK_LIB)
+ 
+ $(ATK_LIB): $(ATK_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+ 
+ atk.o: atk.c atk.h
+ 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -204,7 +204,7 @@
+ make_gnome: $(GNOME_LIB)
+ 
+ $(GNOME_LIB): $(GNOME_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
+ 
+ gnome.o: gnome.c 
+ 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+@@ -221,7 +221,7 @@
+ make_mozilla:$(MOZILLA_LIB)
+ 
+ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
++	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
+ 
+ xpcom.o: xpcom.cpp
+ 	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
+@@ -242,7 +242,7 @@
+ 
+ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+ 	echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc --shared -xc - -o libswt-xulrunner-fix.so
+-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcomxul.o: xpcom.cpp
+ 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+@@ -262,7 +262,7 @@
+ make_xpcominit:$(XPCOMINIT_LIB)
+ 
+ $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcominit.o: xpcominit.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+@@ -279,7 +279,7 @@
+ make_webkit: $(WEBKIT_LIB)
+ 
+ $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
+ 
+ webkit.o: webkitgtk.c 
+ 	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o
+@@ -296,7 +296,7 @@
+ make_glx: $(GLX_LIB)
+ 
+ $(GLX_LIB): $(GLX_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+ 
+ glx.o: glx.c 
+ 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
+--- make_freebsd.mak-	2012-07-02 00:53:28.553351871 +0000
++++ make_freebsd.mak	2012-07-02 00:55:37.369741444 +0000
+@@ -64,7 +64,7 @@
+ # Uncomment for Native Stats tool
+ #NATIVE_STATS = -DNATIVE_STATS
+ 
+-MOZILLACFLAGS = -O \
++MOZILLACFLAGS += \
+ 	-DSWT_VERSION=$(SWT_VERSION) \
+ 	$(NATIVE_STATS) \
+ 	-DMOZILLA_STRICT_API=1 \
+@@ -91,7 +91,7 @@
+ XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
+-CFLAGS = -O -Wall \
++CFLAGS += \
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DFREEBSD -DGTK \
+@@ -115,13 +115,13 @@
+ make_swt: $(SWT_LIB) $(SWTPI_LIB)
+ 
+ $(SWT_LIB): $(SWT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
+ 
+ callback.o: callback.c callback.h
+ 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
+ 
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
+ 
+ swt.o: swt.c swt.h
+ 	$(CC) $(CFLAGS) -c swt.c
+@@ -140,7 +140,7 @@
+ make_cairo: $(CAIRO_LIB)
+ 
+ $(CAIRO_LIB): $(CAIRO_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+ 
+ cairo.o: cairo.c cairo.h swt.h
+ 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+@@ -156,7 +156,7 @@
+ make_cde: $(CDE_LIB)
+ 
+ $(CDE_LIB): $(CDE_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
+ 
+ #
+ # AWT lib
+@@ -164,7 +164,7 @@
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
++	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+ 
+ #
+ # Atk lib
+@@ -172,7 +172,7 @@
+ make_atk: $(ATK_LIB)
+ 
+ $(ATK_LIB): $(ATK_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+ 
+ atk.o: atk.c atk.h
+ 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -189,7 +189,7 @@
+ make_gnome: $(GNOME_LIB)
+ 
+ $(GNOME_LIB): $(GNOME_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
+ 
+ gnome.o: gnome.c 
+ 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+@@ -206,7 +206,7 @@
+ make_mozilla:$(MOZILLA_LIB)
+ 
+ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
++	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
+ 
+ xpcom.o: xpcom.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
+@@ -226,7 +226,7 @@
+ make_xulrunner:$(XULRUNNER_LIB)
+ 
+ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcomxul.o: xpcom.cpp
+ 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+@@ -252,7 +252,7 @@
+ make_xpcominit:$(XPCOMINIT_LIB)
+ 
+ $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcominit.o: xpcominit.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+@@ -269,7 +269,7 @@
+ make_glx: $(GLX_LIB)
+ 
+ $(GLX_LIB): $(GLX_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+ 
+ glx.o: glx.c 
+ 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
diff --git a/dev-java/swt/files/swt-4.2-manifest b/dev-java/swt/files/swt-4.2-manifest
new file mode 100644
index 000000000000..36736a0db72d
--- /dev/null
+++ b/dev-java/swt/files/swt-4.2-manifest
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Fragment-Host: org.eclipse.swt; bundle-version=4.2.0
+Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
+Bundle-Version: 4.2
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
+Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
+ org.eclipse.swt.internal.cairo; x-internal:=true,
+ org.eclipse.swt.internal.cde; x-internal:=true,
+ org.eclipse.swt.internal.gnome; x-internal:=true,
+ org.eclipse.swt.internal.gtk; x-internal:=true,
+ org.eclipse.swt.internal.opengl.glx; x-internal:=true
+ org.eclipse.swt.internal.webkit; x-internal:=true
diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml
new file mode 100644
index 000000000000..40abe82a75f0
--- /dev/null
+++ b/dev-java/swt/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		SWT is the software component that delivers native widget functionality for the
+		Eclipse platform in an operating system independent manner.  It is analogous to
+		AWT/Swing in Java with a difference - SWT uses a rich set of native widgets.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r2.ebuild
new file mode 100644
index 000000000000..aa38b1de0654
--- /dev/null
+++ b/dev-java/swt/swt-3.7.2-r2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+
+SLOT="3.7"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE="cairo gnome opengl"
+COMMON=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6.8:2
+		>=dev-libs/atk-1.10.2
+		cairo? ( >=x11-libs/cairo-1.4.14 )
+		gnome?	(
+				=gnome-base/libgnome-2*
+				=gnome-base/gnome-vfs-2*
+				=gnome-base/libgnomeui-2*
+				)
+		opengl?	(
+			virtual/opengl
+			virtual/glu
+		)
+		x11-libs/libXtst"
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		>=x11-libs/libXtst-1.1.0
+		virtual/pkgconfig
+		${COMMON}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON}"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+java_prepare() {
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+	# Fix Makefiles to respect flags and work with --as-needed
+	epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
+
+	case ${ARCH} in
+		ppc|x86) epatch "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;;
+		*)       epatch "${FILESDIR}"/${P}-gio_launch-URI.patch ;;
+	esac
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'x86' ]] ; then
+		AWT_ARCH="i386"
+	elif [[ $(tc-arch) == 'ppc' ]] ; then
+		AWT_ARCH="ppc"
+	elif [[ $(tc-arch) == 'ppc64' ]] ; then
+		AWT_ARCH="ppc64"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
+
+	local platform="linux"
+
+	use elibc_FreeBSD && platform="freebsd"
+
+	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		${make} make_gnome
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt"
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/" || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+	use x86-fbsd && swtArch=x86
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	dohtml about.html || die
+}
diff --git a/dev-java/swt/swt-3.8.2-r2.ebuild b/dev-java/swt/swt-3.8.2-r2.ebuild
new file mode 100644
index 000000000000..64b28cc018f3
--- /dev/null
+++ b/dev-java/swt/swt-3.8.2-r2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+
+SLOT="3.8"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE="cairo gnome opengl"
+COMMON=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6.8:2
+		>=dev-libs/atk-1.10.2
+		cairo? ( >=x11-libs/cairo-1.4.14 )
+		gnome?	(
+				gnome-base/gnome-vfs:2
+				gnome-base/libgnome
+				gnome-base/libgnomeui
+				)
+		opengl?	(
+			virtual/opengl
+			virtual/glu
+		)
+		x11-libs/libXtst"
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		>=x11-libs/libXtst-1.1.0
+		virtual/pkgconfig
+		${COMMON}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON}"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+java_prepare() {
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+
+	mkdir -p "${S}/src"
+	mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+	epatch "${FILESDIR}"/${PN}-3.8-as-needed-and-flag-fixes.patch
+	epatch "${FILESDIR}"/${P}-gthread.patch
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'x86' ]] ; then
+		AWT_ARCH="i386"
+	elif [[ $(tc-arch) == 'ppc' ]] ; then
+		AWT_ARCH="ppc"
+	elif [[ $(tc-arch) == 'ppc64' ]] ; then
+		AWT_ARCH="ppc64"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
+
+	local platform="linux"
+
+	use elibc_FreeBSD && platform="freebsd"
+
+	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		${make} make_gnome
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/" || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+	use x86-fbsd && swtArch=x86
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	dohtml about.html
+}
diff --git a/dev-java/swt/swt-4.2-r3.ebuild b/dev-java/swt/swt-4.2-r3.ebuild
new file mode 100644
index 000000000000..fdfce91451a6
--- /dev/null
+++ b/dev-java/swt/swt-4.2-r3.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="4.2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cairo gnome opengl"
+
+COMMON_DEP="
+	>=dev-libs/atk-1.10.2
+	>=dev-libs/glib-2.32
+	>=x11-libs/gtk+-2.6.8:2
+	x11-libs/libXtst
+	cairo? ( >=x11-libs/cairo-1.4.14 )
+	gnome?	(
+		=gnome-base/gnome-vfs-2*
+		=gnome-base/libgnome-2*
+		=gnome-base/libgnomeui-2*
+	)
+	opengl?	(
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	app-arch/unzip
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/libXtst-1.1.0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+java_prepare() {
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+	# Fix Makefiles to respect flags and work with --as-needed
+	epatch "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
+
+	# Define missing g_thread_supported() to be 0.
+	sed -i '1s/^/#define g_thread_supported() 0\n\n/' "${S}"/os_custom.h || die
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'x86' ]] ; then
+		AWT_ARCH="i386"
+	elif [[ $(tc-arch) == 'ppc' ]] ; then
+		AWT_ARCH="ppc"
+	elif [[ $(tc-arch) == 'ppc64' ]] ; then
+		AWT_ARCH="ppc64"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
+
+	local platform="linux"
+
+	use elibc_FreeBSD && platform="freebsd"
+
+	# Bug #461784, g_thread_init is deprecated since glib-2.32.
+	append-cflags -DNO__1g_1thread_1init
+
+	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		${make} make_gnome
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt"
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/" || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+	use x86-fbsd && swtArch=x86
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	dohtml about.html
+}
diff --git a/dev-java/tablelayout-1.0 b/dev-java/tablelayout-1.0
deleted file mode 100644
index 80233973885e..000000000000
--- a/dev-java/tablelayout-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Layout manager that makes creating user interfaces fast and easy
-EAPI=5
-HOMEPAGE=https://tablelayout.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.oracle.com/technetwork/java/tablelayout.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=84d2c101a460d304e77098775687b994
diff --git a/dev-java/tablelayout/Manifest b/dev-java/tablelayout/Manifest
new file mode 100644
index 000000000000..5a8b6f1ae344
--- /dev/null
+++ b/dev-java/tablelayout/Manifest
@@ -0,0 +1,3 @@
+DIST tablelayout.jar 112151 BLAKE2B cf084118517271987fd92027ee88914bdfe0199b79502d77dfd194fa4f19d2a5ffe7a208206443c1819ed10b7465ded1493e4cdbf33000bacd7e2885ec0c1877 SHA512 b6e9ef07b50165679df8338123cc636b8165ab989e71afc9d1279e257bb171675aa46cc304e65d7e301c66117149675bd987c07d6cf5b03cd1c7768144e22902
+EBUILD tablelayout-1.0.ebuild 693 BLAKE2B 2516ca37d407572a685a9c16d6ee96f9508bd283e8bdd07cb0830fa22fc80c86a937a3f1f57471795db7061f8ab1e5c4a9f76956fa02872f312a74a32939c2c1 SHA512 57ca795fa25e7d05508282e9c24dea8bf5d5deeeef562615e3298eb3c42c7d483436c98f04049ee0757d989983b26037b464618dc35d715fc1b42f7fec58606c
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tablelayout/metadata.xml b/dev-java/tablelayout/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/tablelayout/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/tablelayout/tablelayout-1.0.ebuild b/dev-java/tablelayout/tablelayout-1.0.ebuild
new file mode 100644
index 000000000000..b0689be25fcf
--- /dev/null
+++ b/dev-java/tablelayout/tablelayout-1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Layout manager that makes creating user interfaces fast and easy"
+HOMEPAGE="https://tablelayout.dev.java.net/"
+SRC_URI="http://www.oracle.com/technetwork/java/${PN}.jar"
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 ~ppc64 x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+java_prepare() {
+	find . -type f -name \*.class -exec rm -v {} \; || die
+
+	# two commmas cause a compiling error :/
+	sed -i -e 's#Dimension(40, 20);;#Dimension(40, 20);#g;' \
+		example/TypicalGui.java || die
+}
diff --git a/dev-java/tagsoup-1.2.1 b/dev-java/tagsoup-1.2.1
deleted file mode 100644
index 1b1803158f75..000000000000
--- a/dev-java/tagsoup-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/saxon:9 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A SAX-compliant parser written in Java
-EAPI=4
-HOMEPAGE=http://mercury.ccil.org/~cowan/XML/tagsoup/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://mercury.ccil.org/~cowan/XML/tagsoup/tagsoup-1.2.1-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fa65f246930586bfdaacea11b5bbd202
diff --git a/dev-java/tagsoup/Manifest b/dev-java/tagsoup/Manifest
new file mode 100644
index 000000000000..d416e92a44b0
--- /dev/null
+++ b/dev-java/tagsoup/Manifest
@@ -0,0 +1,3 @@
+DIST tagsoup-1.2.1-src.zip 222757 BLAKE2B 79a43edfa9aed7f08bfaedbe758b2a08d5ff596e268cc415707aee9076bcdbf8de0b4c2a855b9558ff2cf598ed4811a7a690aef6c5004e34484ffe3087bef8e9 SHA512 3bb1608746270663f6ed45318457e3ee27419929411689d962cffc0ab0c32ec4b858020043be46e929014b696c753a01b49d6eea9a98f18d81fb9205e99ac0a1
+EBUILD tagsoup-1.2.1.ebuild 1099 BLAKE2B c77f5066d6aaac5ad22ee09d0f714afc808d4dcbaecc9506f58568413f23a012ba531b95c034dc8d70546c03e80e06f68ae302a2341d50e29d9e3e71da66a252 SHA512 a0cb991662cb75a51a10080ea82c3aa73ffba29d05e163a80ae4f1e488dfce20ef66b6477804af1cbd48a25bb7fdc47c5f19108d86126c2537187a52a1602e79
+MISC metadata.xml 501 BLAKE2B e343c2ff8cc35280a493830bff0fbd4486a37fcc22d79eb8b74e6712250e9c879b50f8beede300189d233cdfa9579f02b921573f6e3af1bb399d34099764caf6 SHA512 e8abb4f880b76ee62dd56e0caa65868efa920f080cae9c137a9ff2646e77c2e22e5bb687e584f1b9621bb10140d6725626b01adad7df85f19ce55d80b4706ba1
diff --git a/dev-java/tagsoup/metadata.xml b/dev-java/tagsoup/metadata.xml
new file mode 100644
index 000000000000..6ba5054b0614
--- /dev/null
+++ b/dev-java/tagsoup/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		This is the home page of TagSoup, a SAX-compliant parser written
+		in Java that, instead of parsing well-formed or valid XML, parses
+		HTML as it is found in the wild: nasty and brutish, though quite
+		often far from short.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/tagsoup/tagsoup-1.2.1.ebuild b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
new file mode 100644
index 000000000000..b31f93d18bc4
--- /dev/null
+++ b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A SAX-compliant parser written in Java"
+HOMEPAGE="http://mercury.ccil.org/~cowan/XML/tagsoup/"
+SRC_URI="http://mercury.ccil.org/~cowan/XML/tagsoup/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.4"
+DEPEND="
+	>=virtual/jdk-1.4
+	dev-java/saxon:9
+	app-arch/unzip"
+
+EANT_BUILD_TARGET="dist"
+EANT_DOC_TARGET="docs-api"
+# Fails to detect a TransformerFactory. #421733
+# See also https://issues.apache.org/jira/browse/XALANJ-1549 for why the default is no good either.
+EANT_ANT_TASKS="saxon-9"
+EANT_EXTRA_ARGS="-Dtransformer.factory=net.sf.saxon.TransformerFactoryImpl"
+
+src_install() {
+	java-pkg_newjar dist/lib/${PN}-1.2.jar ${PN}.jar
+	java-pkg_dolauncher
+
+	doman ${PN}.1 || die
+	dodoc CHANGES README TODO || die
+
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc src/{java,templates}/*
+}
diff --git a/dev-java/tapestry-3.0.4-r3 b/dev-java/tapestry-3.0.4-r3
deleted file mode 100644
index 0877889cfd1b..000000000000
--- a/dev-java/tapestry-3.0.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-codec:0 dev-java/commons-digester:0 dev-java/commons-fileupload:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jakarta-oro:2.0 dev-java/javassist:2 dev-java/ognl:3.0 dev-java/tomcat-servlet-api:2.4 >=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Dynamic, robust, highly scalable web framework in Java
-EAPI=6
-HOMEPAGE=https://tapestry.apache.org/
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-codec:0 dev-java/commons-digester:0 dev-java/commons-fileupload:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jakarta-oro:2.0 dev-java/javassist:2 dev-java/ognl:3.0 dev-java/tomcat-servlet-api:2.4 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=mirror://apache/tapestry/Tapestry-3.0.4-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1f560b9de9be0ee7dfd2a907a10bdcae
diff --git a/dev-java/tapestry/Manifest b/dev-java/tapestry/Manifest
new file mode 100644
index 000000000000..904d84ed504d
--- /dev/null
+++ b/dev-java/tapestry/Manifest
@@ -0,0 +1,6 @@
+AUX Version.properties 162 BLAKE2B ebc22304b272f3862d87d0f838408c8e1d839c80d76f86f83e265b3f737273d8baedd5eced689f119e079e7d164820ae0a9ff3916b8b0969ca2ad14ebcf34f19 SHA512 f2b2c2fab2c670cd21f9b5a1ed0940d5a568230c3a0b13b59bee92310c47755c12f020454e2891c2561c978a2427677b15690ab21159ed6d79676e3e83e4622f
+AUX build.properties 1141 BLAKE2B 02c5b606d35bf1e94b147f04da4f6c626276fd85e8634514c00c7a610726c734ee83ef8c9e5f283703eaf12bfa958ebce345ef2d74138d49b1524ca5fa29f642 SHA512 3cfe36782bed225811884e97a2261719c6d7c82470621e54701114c0e4e18ca0ba673f5f97861840c0e822ede9dd86097d8c77aecf3a392de82cd5573049d0bc
+AUX common.properties 2850 BLAKE2B e1745cd8c7cc162f3c8d8d797b88ecbc1fa4e35831d581639fbab512c31311793f8beee3f147c267d675e0960f0a753c3f5e74230f825551973d58c9367b0623 SHA512 a00b28fde7e90100c017238150fd7c830cacc4bc6a24e7a9bd90fbd32bd6bf8a3787a8a178f6ed78033621a47503b1517e9485ffc60d5ffbfe5752254713283b
+DIST Tapestry-3.0.4-src.zip 1174780 BLAKE2B 2f2ad5e3860ed6852962b282431df15ae4f6f17f0d08e4246dcef69bcdd033acafe881ea3ba33bd38c2dcf8843caf37fb0b46da84c5b107c2d1c4a0d77aaf89a SHA512 ab94cee9745fceeecbc98a27ace90567b3bc8ab880408da0a32526ba3a68b24f90daeca5d2ea0180b5693ae4fd12f01f0db98e78f176cdc0a0370b5554aa9d10
+EBUILD tapestry-3.0.4-r3.ebuild 1683 BLAKE2B e921c3f2c0941d673980b5feecf12aee3de03b661f3b34bf8193bb556d7e82d411e635245bb37cd98d0a445dcabe79ecbb318b7bcbb585db0d3b703d419e8539 SHA512 a1fc2c507a330c0469902627b56ff7884901ca957645c4dc582dd9c3784b0eb0640b584ea656e49bb6d2e419b2f26667f2fd64a2c50ed51649c3c59793b393ee
+MISC metadata.xml 750 BLAKE2B 57a35e8c3abe2476a1d35896ef702db76748f91065a68fca93b8f9f5117c7bc6d3ad9a100bf9c4164e2aea8e2f51db5ae77debe651e5a915d48aa6b120c19f4e SHA512 65e251c97e3c5fff6f3bd40910a5ee7b2e5152a86d3638aeb870283f8e415c833da3666647fc25add19e96c0534d5fac39090646cccc9cc10a2b07f5bcc5885f
diff --git a/dev-java/tapestry/files/Version.properties b/dev-java/tapestry/files/Version.properties
new file mode 100644
index 000000000000..4b67c327efa1
--- /dev/null
+++ b/dev-java/tapestry/files/Version.properties
@@ -0,0 +1,5 @@
+# $Id: Version.properties 390452 2006-03-31 11:34:17 -0500 (Fri, 31 Mar 2006) jkuhnert $
+#
+# Stores the version number of the framework.
+
+framework.version=3.0.4
diff --git a/dev-java/tapestry/files/build.properties b/dev-java/tapestry/files/build.properties
new file mode 100644
index 000000000000..b82007cc4202
--- /dev/null
+++ b/dev-java/tapestry/files/build.properties
@@ -0,0 +1,32 @@
+# $Id: build.properties.sample 243768 2004-02-04 13:04:22Z mindbridge $
+# This file is used to configure the Tapestry build.
+# Copy it as "build.properties" and fill in the necessary data.
+
+# The absolute path to the directory where external distributions 
+# used in the building process will be downloaded and installed
+base.path=/usr/share/java
+
+# The absolute path to the directory containing the JBoss installation.
+# Required to execute the configure and run-jboss targets.
+jboss.dir=
+
+# The absolute path to the directory containing the Tomcat installation.
+# Required to execute the deploy-tomcat target.
+# 
+tomcat.dir=
+
+# The absolute path to the directory containing the Jetty installation.
+# Required to execute the run-workbench target.
+jetty.dir=
+
+# The absolute path to the directory containing the Jython installation.
+# Required to execute the junit target.
+jython.dir=
+
+# Home for xml-forrest, used to build documentation.
+# Available from :pserver:anoncvs@cvs.apache.org:/home/cvspublic as module xml-forrest
+# Build forrest, then set to the shbat directory, i.e.
+# C:/workspace/xml-forrest/build/dist/shbat
+
+forrest.home=
+
diff --git a/dev-java/tapestry/files/common.properties b/dev-java/tapestry/files/common.properties
new file mode 100644
index 000000000000..775eec976ea3
--- /dev/null
+++ b/dev-java/tapestry/files/common.properties
@@ -0,0 +1,94 @@
+# $Id: common.properties 385802 2006-03-14 13:47:10Z jkuhnert $
+#
+# Specifies some general properties used throughout.
+# Each build.xml must specify root.dir (as a relative path).
+
+lib.dir=lib
+
+root.lib.dir=${root.dir}/${lib.dir}
+
+ext.dist.dir=${root.dir}/ext-dist
+
+root.config.dir=${root.dir}/config
+
+framework.jar=tapestry-${framework.version}.jar
+contrib.jar=tapestry-contrib-${framework.version}.jar
+
+examples.dir=${root.lib.dir}/examples
+
+vlib.war=vlib.war
+vlib.ear=vlib.ear
+vlibbeans.jar=vlibbeans.jar
+workbench.war=workbench.war
+wap.war=wap.war
+
+ext.download.dir=${ext.dist.dir}/downloads
+
+# Names of directories under lib
+
+ext.dir=ext
+j2ee.dir=j2ee
+runtime.dir=runtime
+
+jboss.lib.dir=${jboss.dir}/lib
+jboss.client.dir=${jboss.dir}/client
+jboss.server.all.lib.dir=${jboss.dir}/server/all/lib
+
+# Directory containing source code and package resources
+src.dir=src
+
+# Directory containing compiled Java code
+classes.dir=classes
+
+# Used as part of copyrights
+
+copyright.years=2000-2004
+
+# ----- JUnit Unit Test Suite, version 3.8 or later -----
+junit.home=${ext.download.dir}/junit3.8.1
+junit.lib=${junit.home}
+junit.jar=${junit.lib}/junit.jar
+junit.ext.jar=${ext.dist.dir}/junit.jar
+junit.loc=http://telia.dl.sourceforge.net/sourceforge/junit/junit3.8.1.zip
+
+# ----- JDOM Library, version 1.0 -----
+jdom.home=${ext.download.dir}/jdom-1.0
+jdom.lib=${jdom.home}
+jdom.jar=${jdom.lib}/build/jdom.jar
+jdom.ext.jar=${ext.dist.dir}/jdom-1.0.jar
+jdom.loc=http://www.jdom.org/dist/binary/jdom-1.0.tar.gz
+
+# ----- McKoi Pure Java Database, version 1.0.2 -----
+mckoi.home=${ext.download.dir}/mckoi1.0.2
+mckoi.lib=${mckoi.home}
+mckoi.jar=${mckoi.lib}/mckoidb.jar
+mckoi.ext.jar=${ext.dist.dir}/mckoidb.jar
+mckoi.loc=http://www.mckoi.com/database/ver/mckoi1.0.2.zip
+
+# ----- DocBook XML, version 4.1.2 -----
+docbookxml.file=${ext.dist.dir}/docbkx412.zip
+docbookxml.loc=http://www.docbook.org/xml/4.1.2/docbkx412.zip
+
+# ----- DocBook XSL, version 1.64.1 -----
+docbookxsl.file=${ext.dist.dir}/docbook-xsl-1.64.1.zip
+docbookxsl.loc=http://telia.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.64.1.zip
+
+# ----- Apache Forrest, version 0.5.1 -----
+forrestdl.home=${ext.download.dir}/apache-forrest-0.5.1-bin
+forrestdl.ant.xml=${forrestdl.home}/forrest.antproxy.xml
+forrestdl.loc=http://archive.apache.org/dist/forrest/pre-0.6/apache-forrest-0.5.1-bin.zip
+
+# ---- OGNL ----
+ognl.version=2.6.7
+ognl.loc=http://ognl.org/${ognl.version}/ognl-${ognl.version}.jar
+ognl.dest=${root.lib.dir}/${ext.dir}/ognl-${ognl.version}.jar
+
+# ---- Javassist ----
+
+javassist.version=2.5.1
+javassist.loc=http://umn.dl.sourceforge.net/sourceforge/jboss/javassist-${javassist.version}.zip
+javassist.dest=${ext.download.dir}/javassist-${javassist.version}
+javassist.ext.jar=${root.lib.dir}/${ext.dir}/javassist-${javassist.version}.jar
+javassist.jar=${javassist.dest}/javassist.jar
+
+
diff --git a/dev-java/tapestry/metadata.xml b/dev-java/tapestry/metadata.xml
new file mode 100644
index 000000000000..63cc3f846416
--- /dev/null
+++ b/dev-java/tapestry/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription lang="en">
+Tapestry is a powerful, open-source, all-Java framework for creating leading edge web applications in Java.
+
+Tapestry reconceptualizes web application development in terms of objects, methods and properties instead of URLs and query parameters.
+
+Tapestry is an alternative to scripting environments such as JavaServer Pages or Velocity. Tapestry goes far further, providing a complete framework for creating extremely dynamic applications with minimal amounts of coding.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/tapestry/tapestry-3.0.4-r3.ebuild b/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
new file mode 100644
index 000000000000..19824e4645a7
--- /dev/null
+++ b/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
@@ -0,0 +1,69 @@
+# 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="Dynamic, robust, highly scalable web framework in Java"
+HOMEPAGE="https://tapestry.apache.org/"
+SRC_URI="mirror://apache/${PN}/Tapestry-${PV}-src.zip"
+
+IUSE="${JAVA_PKG_IUSE}"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+	dev-java/bsf:2.3
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-codec:0
+	dev-java/commons-digester:0
+	dev-java/commons-fileupload:0
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/jakarta-oro:2.0
+	dev-java/javassist:2
+	dev-java/ognl:3.0
+	dev-java/tomcat-servlet-api:2.4
+"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.4
+"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.4
+"
+
+S="${WORKDIR}/Tapestry-${PV}"
+
+EANT_GENTOO_CLASSPATH="commons-logging,commons-fileupload,commons-lang-2.1"
+EANT_GENTOO_CLASSPATH+=",commons-codec,commons-beanutils-1.7,commons-digester"
+EANT_GENTOO_CLASSPATH+=",tomcat-servlet-api-2.4,ognl-3.0,bsf-2.3,jakarta-oro-2.0"
+EANT_GENTOO_CLASSPATH+=",javassist-2"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_prepare() {
+	default
+
+	mkdir config lib || die
+	cp "${FILESDIR}/Version.properties" config/ || die
+	cp "${FILESDIR}/build.properties" config/ || die
+	cp "${FILESDIR}/common.properties" config/ || die
+}
+
+src_compile() {
+	cd "${S}/framework" || die
+	eant -Dgentoo.classpath="$(java-pkg_getjars ${EANT_GENTOO_CLASSPATH})"
+	use doc && javadoc -sourcepath src/ org.apache.tapestry -d ../javadoc
+}
+
+src_install() {
+	java-pkg_newjar "lib/${P}.jar"
+	use source && java-pkg_dosrc framework/src/org
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/telnetd-2.0-r1 b/dev-java/telnetd-2.0-r1
deleted file mode 100644
index f357d275ef0f..000000000000
--- a/dev-java/telnetd-2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A telnet daemon for use in Java applications
-EAPI=5
-HOMEPAGE=http://telnetd.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/telnetd/telnetd-2.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d977d6b5eee0c6a2467de618095be42b
diff --git a/dev-java/telnetd/Manifest b/dev-java/telnetd/Manifest
new file mode 100644
index 000000000000..8c08c06d8d72
--- /dev/null
+++ b/dev-java/telnetd/Manifest
@@ -0,0 +1,3 @@
+DIST telnetd-2.0.tar.gz 421949 BLAKE2B 915e8843336e9df87ef9aa2b906c505523a10f8895a02092228df15ea239c3aa5a300f1933d78023d6d39b0d33e8690a9056b6737460edf61f5dfa57a44acb14 SHA512 1d25d624b2f8308bee0b3fa9f2aefb1cbbf5abfa415e857ac1ed5d958c218592dc63b322afe76c50afa4b361f85903c1c469a145503bff2bde51783a45f3664f
+EBUILD telnetd-2.0-r1.ebuild 866 BLAKE2B 1f53c4ba4fa0a711542dc34d2452e00c326d1d6c54732e9cdec96f6479be76b1235bf891a13ba63964a4710abd1f70db350bf618deb37a52477d634774ea4aaa SHA512 d75da0b8534b33f34db5f877c0f4b2d4d9578c25bfb86a037fe11e12a52ef75f8b8bddf5c4747d60aa69c60520670bafce6da2e6576a20d3c2dc7ba05da1ff7a
+MISC metadata.xml 313 BLAKE2B ff3a10000f98a27c3457fc9581f061dda80e0953b4e0ab3e301593c5442b47b921ec1b1ebf4cad76cf0dbb6ff1df42e97d28acd37ad0e31901b0552e94797cb9 SHA512 751dfc198f778e080ff6f011594ddf25a6c4c3f71c03ab9fa8be3fab36937fb1dce81f891ee92e15f7acee5ea6bb53ee0bfaf7695d66dda45762426bae16fd87
diff --git a/dev-java/telnetd/metadata.xml b/dev-java/telnetd/metadata.xml
new file mode 100644
index 000000000000..7b49ae9cf1e5
--- /dev/null
+++ b/dev-java/telnetd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">telnetd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/telnetd/telnetd-2.0-r1.ebuild b/dev-java/telnetd/telnetd-2.0-r1.ebuild
new file mode 100644
index 000000000000..65c5919afd5e
--- /dev/null
+++ b/dev-java/telnetd/telnetd-2.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A telnet daemon for use in Java applications"
+HOMEPAGE="http://telnetd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/telnetd/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/commons-logging:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="commons-logging"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" src -name "*.properties"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher "j${PN}" --main net.wimpi.telnetd.TelnetD
+}
diff --git a/dev-java/testng-6.9.10 b/dev-java/testng-6.9.10
deleted file mode 100644
index de5af1a07e09..000000000000
--- a/dev-java/testng-6.9.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev-java/snakeyaml:0 dev-java/jcommander:0 >=virtual/jdk-1.7 test? ( dev-java/assertj-core:2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Testing framework inspired by JUnit and NUnit with new features
-EAPI=5
-HOMEPAGE=http://testng.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev-java/snakeyaml:0 dev-java/jcommander:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e8628278a39c54082302839e2c63697d
diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
new file mode 100644
index 000000000000..6204c925ed38
--- /dev/null
+++ b/dev-java/testng/Manifest
@@ -0,0 +1,3 @@
+DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e
+EBUILD testng-6.9.10.ebuild 1752 BLAKE2B b353be7f15254d660c500b6c39c3910354f2cdee1aed557cc958667b3d350407355b74f9e181d0102f7a86e713e21899435e83c64824d90d83138d068abd8b86 SHA512 827f51b3f53200be76d64720f02e30746091f50ea684589f1fc1df692e7712a17508fa83f3aeb1270e5063bcdfa18f93c18ea52c5411ee1461a973d73745a118
+MISC metadata.xml 314 BLAKE2B 827119483a30d9ad2a35c20ad9149f941326fe6eb74c0a10401bf8b96ae07b233fc4177f87b1fae02c6d766304ff3002d70c8b9aaa9ff87f9ae951793e191d6d SHA512 dc86504b0f3aa0bcd4adf4470e7391a05eb5cead186f79b0fc35ee3dd57ca1c927454e4150463376ca37ba5396e9f75328bdb8969613457a9ddadbd5ab81cf98
diff --git a/dev-java/testng/metadata.xml b/dev-java/testng/metadata.xml
new file mode 100644
index 000000000000..741d9407384d
--- /dev/null
+++ b/dev-java/testng/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cbeust/testng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/testng/testng-6.9.10.ebuild b/dev-java/testng/testng-6.9.10.ebuild
new file mode 100644
index 000000000000..6a886240f14c
--- /dev/null
+++ b/dev-java/testng/testng-6.9.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features"
+HOMEPAGE="http://testng.org/"
+SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="test" # Occasionally fail or run *REALLY* slowly.
+
+CDEPEND="dev-java/bsh:0
+	dev-java/guice:4
+	dev-java/junit:4
+	dev-java/ant-core:0
+	dev-java/snakeyaml:0
+	dev-java/jcommander:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? ( dev-java/assertj-core:2 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="ant-core,bsh,guice-4,jcommander,junit-4,snakeyaml"
+
+java_prepare() {
+	java-pkg_clean ! -path "./src/*"
+
+	cp -v src/generated/java/org/testng/internal/VersionTemplateJava \
+	   src/main/java/org/testng/internal/Version.java || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_test() {
+	local DIR=src/test/java
+	local RES=src/test/resources
+	local CP=${PN}.jar:$(java-pkg_getjars --with-dependencies "${JAVA_GENTOO_CLASSPATH},assertj-core-2")
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	java -cp "${RES}:${DIR}:${CP}" -Dtest.resources.dir=${RES} org.testng.TestNG -listener test.invokedmethodlistener.MyListener src/test/resources/testng.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main org.testng.TestNG
+	java-pkg_register-ant-task
+
+	dodoc {ANNOUNCEMENT,CHANGES,TODO}.txt
+
+	if use doc; then
+		docinto html
+		dodoc -r doc
+	fi
+}
diff --git a/dev-java/texhyphj-1.1 b/dev-java/texhyphj-1.1
deleted file mode 100644
index 0e3cb28a73b3..000000000000
--- a/dev-java/texhyphj-1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Re-implementation of Franklin Mark Liang's hyphenation algorithm in Java
-EAPI=5
-HOMEPAGE=http://www.davidashen.net/texhyphj.html https://sourceforge.net/projects/texhyphj/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://ftp.davidashen.net/TeXHyphenator-J/texhyphj-1.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6dffc109a684d5a138fec9378f90abbc
diff --git a/dev-java/texhyphj/Manifest b/dev-java/texhyphj/Manifest
new file mode 100644
index 000000000000..f2b610bd69fb
--- /dev/null
+++ b/dev-java/texhyphj/Manifest
@@ -0,0 +1,3 @@
+DIST texhyphj-1.1.tar.gz 118115 BLAKE2B 39a4d4b94e74d6814fbc98dcb24e2a88f9c76c845534598ef1a65171de22bb33117267a8b9246b1aff93ccdbd9a6255f34a97457b85fe41ae05153b197155c61 SHA512 fe410695be95ab6359e396c0694cad35baad6c8dd27ce4947ba22acaa19ed954596d40131fe1131d12ddd0ecf5f45287952221a6b9019cf25594dbb314b15beb
+EBUILD texhyphj-1.1.ebuild 597 BLAKE2B 372aca6a40271e6df10daf1d4771ba703c188450b5d4443ec384a9b8c314d8adcdb27163ab229fdf2dc301a006019899ab9ab0fe1abd8730383e0cf91f3ecd15 SHA512 a99040e218d691cbc8c43d8df40747955e175ed723b20e83b1dc71df1bd0e362be02a0c169f37cf5d95582c1bcad16dde97880b2d785c17515f0fe04d1854ec1
+MISC metadata.xml 314 BLAKE2B 8d9f085156a93faa04085c6175e8fa22ab2a69660f94749e2ee3a26530c6d23c50848574dc47019bc141c19df81e07c371d6b2ec067f2c5e9e9ca6eb43b90564 SHA512 1ca9e74a5d1f1b077f12a9eb4579f46dcf9a477b959ae27da7a41e1ec20b005e4e6d973584c02b7530f9d066594a1f456a11d48d01bb8c4def9d157f468ef1ff
diff --git a/dev-java/texhyphj/metadata.xml b/dev-java/texhyphj/metadata.xml
new file mode 100644
index 000000000000..d931fe8f7d2b
--- /dev/null
+++ b/dev-java/texhyphj/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">texhyphj</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/texhyphj/texhyphj-1.1.ebuild b/dev-java/texhyphj/texhyphj-1.1.ebuild
new file mode 100644
index 000000000000..c3adbe617a2d
--- /dev/null
+++ b/dev-java/texhyphj/texhyphj-1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Re-implementation of Franklin Mark Liang's hyphenation algorithm in Java"
+HOMEPAGE="http://www.davidashen.net/texhyphj.html https://sourceforge.net/projects/texhyphj/"
+SRC_URI="http://ftp.davidashen.net/TeXHyphenator-J/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
diff --git a/dev-java/tijmp-0.8 b/dev-java/tijmp-0.8
deleted file mode 100644
index 8f295461e763..000000000000
--- a/dev-java/tijmp-0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java Memory Profiler for java 1.6+
-EAPI=2
-HOMEPAGE=http://www.khelekore.org/jmp/tijmp/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://www.khelekore.org/jmp/tijmp/tijmp-0.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ab93a14124703b8e2f6e6dbcbe02d78c
diff --git a/dev-java/tijmp/Manifest b/dev-java/tijmp/Manifest
new file mode 100644
index 000000000000..90ef26b15e2b
--- /dev/null
+++ b/dev-java/tijmp/Manifest
@@ -0,0 +1,5 @@
+AUX tijmp-0.8-respect-javacflags.patch 433 BLAKE2B 22999d08accccc8a00bb27e4db93b47faad83481083ecfef8b33c43e670093d15c6f483f5f15f1e02069e14d7dfa9df2d67846e2455ff73a01a5a209a8ac702e SHA512 01de85f6dd0609a85faecf398de83862dc99741d7447127ae8fbd57a16ead7b1493cee0479700e1027c45c4ee5a9561352868c2a45293f29a6e2fe8ee501f972
+AUX tijmp-jni.h.patch 1121 BLAKE2B 0eec0e65ceafe1f9a60b8f5482947f61a4434d9d6c4b2ec449741dc04e3ccbb5122f15dfdab5a30e8e1d3a4bb0c328781cf52f69f7d55655d060cee89670cbdb SHA512 3733c220c23a5c252ca088f9cc8c37780193bbbc1efe12c0f21ce5c5c9a875a43c3a4947c8bd52cb4c3ede4549ba9fdc4107d1a3207a0563813fc5b351c6e2a3
+DIST tijmp-0.8.tar.gz 347809 BLAKE2B d18fd0ba9145fb9277404a24fa26a65e4cbba34e62dfa0b080bc380d61a3dd11aab23e2c7fb982a97cb40fa216b1b3347c949cee52f7462f0113c3adef993c8d SHA512 911efd93c1548db45fcf8fd924675329aa82c6853ffe93074768646d08f80f4b076f336dba0da293d1acb084a12eb62c68803fa9408e2b64b2b82ab62db1de25
+EBUILD tijmp-0.8.ebuild 1129 BLAKE2B 0b58ddba5d1ad18f8b5da4094fe4ad03131c2d44dd2997425d75e73761fc683118c5d54c57542de65c34dc8c34b44c9e1679b71e15b71e74312ed34a56d106ea SHA512 ecfc77ee4f96f66b6dd32c7f613646d51e037cfc534d34a9de117a10fad57399d9a352618fcef66033f2e76c1898b6a58e088ef3a96b469786c1c648c2722727
+MISC metadata.xml 481 BLAKE2B 6b151d4c0ca3047811c3902cbe5dafd42cdbc05cb6d44a35e116be42276fabc8dd9ef90a8e4b05c58f3ed228dfa0df37ac1c8b5eeb4859373abf9e7624a093dc SHA512 52940eb0d565ae1419ea5b10d90997551cf1a9accf3ae2369b37a7afbd7e5cf0a11e0fa0afa84baeeac34d516a734b779a40ffd74f06767549ae0ad82010661e
diff --git a/dev-java/tijmp/files/tijmp-0.8-respect-javacflags.patch b/dev-java/tijmp/files/tijmp-0.8-respect-javacflags.patch
new file mode 100644
index 000000000000..96902aedf4ec
--- /dev/null
+++ b/dev-java/tijmp/files/tijmp-0.8-respect-javacflags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,7 +18,7 @@
+ java_files := $(foreach dir,$(dirs),$(find_files))
+ class_files := $(patsubst $(jdir)/%.java,%.class,$(java_files))
+ 
+-JCFLAGS := -source 1.6 -encoding ISO-8859-1 -Xlint:unchecked -deprecation
++JCFLAGS := $(JAVACFLAGS) -encoding ISO-8859-1 -Xlint:unchecked -deprecation
+ 
+ # standard java compilation..
+ JAVACOMPILE := $(JAVAC) $(JCFLAGS) -sourcepath $(jdir) -d $(top_builddir)
diff --git a/dev-java/tijmp/files/tijmp-jni.h.patch b/dev-java/tijmp/files/tijmp-jni.h.patch
new file mode 100644
index 000000000000..e9f18cc4ee68
--- /dev/null
+++ b/dev-java/tijmp/files/tijmp-jni.h.patch
@@ -0,0 +1,34 @@
+# Patch by Vlastimil Babka <caster@gentoo.org>
+# Some JDK's such as ibm-jdk-bin don't have jni_md.h, so make the test more robust
+--- configure.ac.orig	2009-01-10 00:29:01.000000000 +0100
++++ configure.ac	2010-04-05 12:17:35.000000000 +0200
+@@ -24,22 +24,16 @@
+   JAVA_HOME=/usr/local/jdk
+ fi
+ 
+-jni_md=no
+-AC_CHECK_HEADERS($JAVA_HOME/include/$java_os/jni_md.h,
+-	jni_md=found)
++dnl ok, maybe we dont always need include/$java_os but we use an -I for it anyway...
++CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/$java_os"
+ 
+-if test $jni_md = no
+-then 
+-AC_CHECK_HEADERS($JAVA_HOME/include/jni_md.h,
+-	jni_md=found)
+-fi
++jni_h=no
++AC_CHECK_HEADERS($JAVA_HOME/include/jni.h,
++	jni_h=found)
+ 
+-if test $jni_md = no
++if test $jni_h = no
+ then
+-  	AC_MSG_ERROR(Does JAVA_HOME point to the java SDK directory?)
+-else
+-dnl ok, maybe we dont need include/$java_os but we use an -I for it anyway...
+-  	CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/$java_os"
++  	AC_MSG_ERROR(Could not find jni.h. Does JAVA_HOME point to the java SDK directory?)
+ fi
+ 
+ AC_CHECK_HEADER($JAVA_HOME/include/jvmti.h,
diff --git a/dev-java/tijmp/metadata.xml b/dev-java/tijmp/metadata.xml
new file mode 100644
index 000000000000..517a7a99e840
--- /dev/null
+++ b/dev-java/tijmp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+JMP is a profiler for java that can be used to trace objects usage and
+method timings. JMP uses the JVMPI interface to gather statistics
+and interact with the JVM. JMP uses a GTK+ interface to show the status.
+</longdescription>
+
+</pkgmetadata>
diff --git a/dev-java/tijmp/tijmp-0.8.ebuild b/dev-java/tijmp/tijmp-0.8.ebuild
new file mode 100644
index 000000000000..9fea8db45ca0
--- /dev/null
+++ b/dev-java/tijmp/tijmp-0.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit autotools java-pkg-2
+
+DESCRIPTION="Java Memory Profiler for java 1.6+"
+HOMEPAGE="http://www.khelekore.org/jmp/tijmp/"
+SRC_URI="http://www.khelekore.org/jmp/tijmp/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+java_prepare() {
+	epatch "${FILESDIR}/${PN}-jni.h.patch"
+	epatch "${FILESDIR}/${P}-respect-javacflags.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf --docdir="/usr/share/doc/${PF}"
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" jardir="/usr/share/${PN}/lib/" install || die
+	java-pkg_regjar "${D}/usr/share/${PN}/lib/${PN}.jar"
+	java-pkg_regso "${D}/usr/$(get_libdir)/lib${PN}.so"
+
+	cat > "${T}/tijmp" <<-"EOF"
+		#!/bin/sh
+		java -Dtijmp.jar="$(java-config -p tijmp)" -agentlib:tijmp "${@}"
+EOF
+	dobin "${T}/tijmp"
+}
+
+pkg_postinst() {
+	einfo "For your convenience, ${PN} wrapper can be used to run java"
+	einfo "with profiling. Just use it in place of the 'java' command."
+}
diff --git a/dev-java/tomcat-jstl-compat-1.2.5-r1 b/dev-java/tomcat-jstl-compat-1.2.5-r1
deleted file mode 100644
index 8c6af7100144..000000000000
--- a/dev-java/tomcat-jstl-compat-1.2.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/tomcat-jstl-spec:0 dev-java/tomcat-jstl-impl:0 java-virtuals/servlet-api:3.0 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JSP Standard Tag Library (JSTL) - Compat jar
-EAPI=5
-HOMEPAGE=https://tomcat.apache.org/taglibs/standard/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/tomcat-jstl-spec:0 dev-java/tomcat-jstl-impl:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-compat-1.2.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0b314a1e79c47565c2ccd2d5dd28c445
diff --git a/dev-java/tomcat-jstl-compat/Manifest b/dev-java/tomcat-jstl-compat/Manifest
new file mode 100644
index 000000000000..2a03b0b91092
--- /dev/null
+++ b/dev-java/tomcat-jstl-compat/Manifest
@@ -0,0 +1,4 @@
+AUX tomcat-jstl-compat-1.2.5-build.xml 8436 BLAKE2B 7441db9ba5fcd306024dbdcc6777b09e3d0d1bd47ab25842c4eebc6799a7d9c46210dd38749c38fc38e64a0f64e552a2942b5faa93de8d5378c7303296c88f49 SHA512 a03eb25054c14fef478c6ed90b0c814c0bb48f39e778f225974a426fa86c39bfc53ded15dbc83ac45bf010f22b47cbf23384f96b1352f920297e680e77ebf6a2
+DIST tomcat-jstl-compat-1.2.5.zip 615779 BLAKE2B f5c307625a84a7170659683913282df1cf7e8b6a021ffed9895aa0e770a35d8db5351660c96668091ed59e5be35d2e8ad9359f524cbfe5a380e89ebe4fe08b43 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
+EBUILD tomcat-jstl-compat-1.2.5-r1.ebuild 1449 BLAKE2B f29075a5be950a7733201569143fb307bd0309c25f9313d347d4684f047dddd095b9b577e79f2fdeea855f9a95e3ecdbcbebcb7a582f8fcb12d46164d23c551a SHA512 23f5bcd12b0ec8927f681a6842a8c64dfa1123e52ee8d450d89c199c707768688ddc15991dfa85b38534fc7ec90996b9db5dce0e6e2c2310a40e9584a4a8781b
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-jstl-compat/files/tomcat-jstl-compat-1.2.5-build.xml b/dev-java/tomcat-jstl-compat/files/tomcat-jstl-compat-1.2.5-build.xml
new file mode 100644
index 000000000000..db0c23f69b09
--- /dev/null
+++ b/dev-java/tomcat-jstl-compat/files/tomcat-jstl-compat-1.2.5-build.xml
@@ -0,0 +1,194 @@
+<?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 6/2/15 10:03 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="taglibs-standard-compat-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="taglibs-standard-compat-1.2.5"/>
+  <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">
+  </path>
+  <path id="build.test.classpath">
+  </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.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}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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="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">
+      <link href="http://download.oracle.com/javase/1.5.0/docs/api"/>
+    </javadoc>
+  </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="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/tomcat-jstl-compat/metadata.xml b/dev-java/tomcat-jstl-compat/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/tomcat-jstl-compat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..6cd82ef7d554
--- /dev/null
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+MY_COMPAT="${MY_PN}-compat"
+
+DESCRIPTION="JSP Standard Tag Library (JSTL) - Compat jar"
+HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="
+	dev-java/tomcat-jstl-spec:0
+	dev-java/tomcat-jstl-impl:0
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec,tomcat-jstl-impl"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="compat/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/compat/build.xml || die
+}
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/compat/target/${MY_COMPAT}-${PV}.jar ${MY_COMPAT}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/compat/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/compat/src/*
+	fi
+}
diff --git a/dev-java/tomcat-jstl-el-1.2.5-r1 b/dev-java/tomcat-jstl-el-1.2.5-r1
deleted file mode 100644
index 6d20ee201d9f..000000000000
--- a/dev-java/tomcat-jstl-el-1.2.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 java-virtuals/servlet-api:3.0 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JSP Standard Tag Library (JSTL) - EL jar
-EAPI=5
-HOMEPAGE=https://tomcat.apache.org/taglibs/standard/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-el-1.2.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b35c235a6d96d48e3b0b464fb588d1c8
diff --git a/dev-java/tomcat-jstl-el/Manifest b/dev-java/tomcat-jstl-el/Manifest
new file mode 100644
index 000000000000..a794cc2f26d0
--- /dev/null
+++ b/dev-java/tomcat-jstl-el/Manifest
@@ -0,0 +1,4 @@
+AUX tomcat-jstl-el-1.2.5-build.xml 10138 BLAKE2B a5715431485ad9c77943df2e1b672e05e5f5e6c122575dd1ef5c344a617aeebd5ca7fdf5da8900f12af851d765c9796984afa60a486256fc00b8e7bf3548396d SHA512 381bcecbf2350a0efcc85131983abc7d93c44cc8926455760922e9cf45dc8da24b24746a75355187b00956e6c050ad08d632e93258f6c9c24c8b36dd8df8d7fc
+DIST tomcat-jstl-el-1.2.5.zip 615779 BLAKE2B f5c307625a84a7170659683913282df1cf7e8b6a021ffed9895aa0e770a35d8db5351660c96668091ed59e5be35d2e8ad9359f524cbfe5a380e89ebe4fe08b43 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
+EBUILD tomcat-jstl-el-1.2.5-r1.ebuild 1426 BLAKE2B 7456538a62b9e47e51417066fad0de0d75d7c1f0f3d90de6067bc33f81c7389cf1dd47ef1e55fed43c44d15120971c336e58bd280d3b5d9f58cc213da7789d27 SHA512 6d0d8f3bcdf2a350d974c696db3a8450fd168dfdeabdc7dfbae9e4d4f7e6c205cff800c4b0f1a16d9b6db9ad1d19b38474aa3652d3fbe962cfda9b7dd0542488
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-jstl-el/files/tomcat-jstl-el-1.2.5-build.xml b/dev-java/tomcat-jstl-el/files/tomcat-jstl-el-1.2.5-build.xml
new file mode 100644
index 000000000000..8b1c1c8e5a2c
--- /dev/null
+++ b/dev-java/tomcat-jstl-el/files/tomcat-jstl-el-1.2.5-build.xml
@@ -0,0 +1,241 @@
+<?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 6/2/15 9:43 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="taglibs-standard-jstlel-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="taglibs-standard-jstlel-1.2.5"/>
+  <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">
+  </path>
+  <path id="build.test.classpath">
+  </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.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}" 
+           encoding="UTF-8" 
+           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="**/*Test.java"/>
+          <include name="**/*TestCase.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" 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="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">
+      <link href="http://download.oracle.com/javase/1.5.0/docs/api"/>
+    </javadoc>
+  </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="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/tomcat-jstl-el/metadata.xml b/dev-java/tomcat-jstl-el/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/tomcat-jstl-el/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..acb770d95175
--- /dev/null
+++ b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+MY_EL="${MY_PN}-jstlel"
+
+DESCRIPTION="JSP Standard Tag Library (JSTL) - EL jar"
+HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="
+	dev-java/tomcat-jstl-impl:0
+	dev-java/tomcat-jstl-spec:0
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec,tomcat-jstl-impl"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="jstlel/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/jstlel/build.xml || die
+}
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/jstlel/target/${MY_EL}-${PV}.jar ${MY_EL}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/jstlel/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/jstlel/src/*
+	fi
+}
diff --git a/dev-java/tomcat-jstl-impl-1.2.5-r1 b/dev-java/tomcat-jstl-impl-1.2.5-r1
deleted file mode 100644
index bdd64b85612b..000000000000
--- a/dev-java/tomcat-jstl-impl-1.2.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/xalan:0 dev-java/tomcat-jstl-spec:0 dev-java/tomcat-servlet-api:3.1 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JSP Standard Tag Library (JSTL) - Implementation jar
-EAPI=5
-HOMEPAGE=https://tomcat.apache.org/taglibs/standard/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/xalan:0 dev-java/tomcat-jstl-spec:0 dev-java/tomcat-servlet-api:3.1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-impl-1.2.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3b156f83be6e54ca69e340ae6ac21b8d
diff --git a/dev-java/tomcat-jstl-impl/Manifest b/dev-java/tomcat-jstl-impl/Manifest
new file mode 100644
index 000000000000..03bb006d9553
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/Manifest
@@ -0,0 +1,6 @@
+AUX tomcat-jstl-impl-1.2.5-ImportSupport.patch 1141 BLAKE2B 6781a2d1ab7b706895f44c3c5d25360e0b003a69aac44ebee97f488461d312d26c06fbbe2b8784a4744ca2f30474d0f89fa6d628af3e35b26599955ab5d460d5 SHA512 0d283548eb5ee98dc92a59084ed162c239c077f8f47e88fa48e10e9304f101085df31dcdbf045acea914e1b555c0cdabbf714741618b63030c121e13f2413382
+AUX tomcat-jstl-impl-1.2.5-SetSupport.patch 1334 BLAKE2B ff3c948f782dd19f9d697045addb44e75c62f76890d450bceb6a6c743aa9688eee6cc627f23292f818d33698e274901b247d64fbe06c6a050b96550ed023ef93 SHA512 1a4f969c03312a02485e1eb37b3bcc0ce0153095f163c7c776c3a10e26c7b2c909fff1f3d16c7b2e178eac190f84432f0adeb2c3eda6004d699ad7d3377f3b22
+AUX tomcat-jstl-impl-1.2.5-build.xml 10337 BLAKE2B 68f960261f773c48e06b0a41386770a63af71a8c04dcae794f235de17f9eb20905326166aa3e8aed9a966b1e5ee252f0c0846364648bd692e36bbbd1ec050448 SHA512 e2ecf367a8d30f64c65bc4cf2b84bd017fe7d2dc32cf6030b25e0b0dd3533609243b71c0f7805196901e702da12feb3c5b60cc4f6859f9aa2419e1732a589e8e
+DIST tomcat-jstl-impl-1.2.5.zip 615779 BLAKE2B f5c307625a84a7170659683913282df1cf7e8b6a021ffed9895aa0e770a35d8db5351660c96668091ed59e5be35d2e8ad9359f524cbfe5a380e89ebe4fe08b43 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
+EBUILD tomcat-jstl-impl-1.2.5-r1.ebuild 1738 BLAKE2B 5fb462e1d63f1a69b98006b0c5ee89016dfc87e394cc0eb7a870bb0d9c4308ae8f1e90db58dc6bf4a970455922a267dfa7df13e6fd39eb2cd687b4739c91b48f SHA512 69944c7638fa6bafc3b1b31a1945eea649ab3b25888fe560762079377b56b7b03c5325f5509766ce21194f15417330d17b7e0eff0ad7d034cfd5b1890209b214
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-ImportSupport.patch b/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-ImportSupport.patch
new file mode 100644
index 000000000000..f43dfc1f903b
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-ImportSupport.patch
@@ -0,0 +1,35 @@
+--- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java.orig	2015-06-01 22:34:34.882000000 +0000
++++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java	2015-06-01 22:35:29.078000000 +0000
+@@ -36,6 +36,7 @@
+ import javax.servlet.ServletContext;
+ import javax.servlet.ServletException;
+ import javax.servlet.ServletOutputStream;
++import javax.servlet.WriteListener;
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+ import javax.servlet.http.HttpServletResponseWrapper;
+@@ -430,6 +431,24 @@
+             public void write(int b) throws IOException {
+                 bos.write(b);
+             }
++
++            @Override
++            public boolean isReady() {
++                return true;
++            }
++
++            @Override
++            public void setWriteListener(WriteListener writeListener) {
++            }
++
++            @Override
++            public void close() throws IOException {
++            }
++
++            @Override
++            public void flush() throws IOException {
++            }
++
+         };
+ 
+         /**
diff --git a/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-SetSupport.patch b/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-SetSupport.patch
new file mode 100644
index 000000000000..9ed4ed84a38d
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-SetSupport.patch
@@ -0,0 +1,33 @@
+--- impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java.orig	2015-06-01 22:59:35.208000000 +0000
++++ impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java	2015-06-01 22:59:54.191000000 +0000
+@@ -334,30 +334,12 @@
+     }
+ 
+     @Test
+-    public void testResultFromBodyContent() throws JspException {
+-        tag = new MockSetSupport();
+-        BodyContent bodyContent = createMock(BodyContent.class);
+-        expect(bodyContent.getString()).andStubReturn("  Hello  ");
+-        replay(bodyContent);
+-        tag.setBodyContent(bodyContent);
+-        Assert.assertEquals(VALUE, tag.getResult());
+-    }
+-
+-    @Test
+     public void testResultFromNullBodyContent() throws JspException {
+         tag = new MockSetSupport();
+         tag.setBodyContent(null);
+         Assert.assertEquals(tag.getResult(), "");
+     }
+ 
+-    @Test
+-    public void testResultFromEmptyBodyContent() throws JspException {
+-        tag = new MockSetSupport();
+-        BodyContent bodyContent = createMock(BodyContent.class);
+-        expect(bodyContent.getString()).andStubReturn(null);
+-        Assert.assertEquals("", tag.getResult());
+-    }
+-
+     public static class MockSetSupport extends SetSupport {
+         private final boolean valueSpecified;
+         private final Object value;
diff --git a/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-build.xml b/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-build.xml
new file mode 100644
index 000000000000..fce6b8d72338
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-build.xml
@@ -0,0 +1,244 @@
+<?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 6/1/15 9:48 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="taglibs-standard-impl-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="taglibs-standard-impl-1.2.5"/>
+  <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">
+  </path>
+  <path id="build.test.classpath">
+  </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.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}" 
+           encoding="UTF-8" 
+           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="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+          <exclude name="**/ExprSupportTest.java"/>
+          <exclude name="**/EscapeXMLTest.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"/>
+          <exclude name="**/ExprSupportTest.java"/>
+          <exclude name="**/EscapeXMLTest.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="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">
+      <link href="http://download.oracle.com/javase/1.5.0/docs/api"/>
+    </javadoc>
+  </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="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/tomcat-jstl-impl/metadata.xml b/dev-java/tomcat-jstl-impl/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..42d13cb63240
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+MY_IMPL="${MY_PN}-impl"
+
+DESCRIPTION="JSP Standard Tag Library (JSTL) - Implementation jar"
+HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="
+	dev-java/xalan:0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/tomcat-servlet-api:3.1"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec,xalan"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="impl/build.xml"
+
+JAVA_RM_FILES=(
+	impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
+)
+
+PATCHES=(
+	# This patch overrides a couple of methods.
+	"${FILESDIR}"/${P}-ImportSupport.patch
+	# This one disables one test case which doesn't work.
+	"${FILESDIR}"/${P}-SetSupport.patch
+)
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml || die
+
+	epatch "${PATCHES[@]}"
+}
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/impl/target/${MY_IMPL}-${PV}.jar ${MY_IMPL}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/impl/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/impl/src/*
+	fi
+}
diff --git a/dev-java/tomcat-jstl-spec-1.2.5-r1 b/dev-java/tomcat-jstl-spec-1.2.5-r1
deleted file mode 100644
index bfcbb938882a..000000000000
--- a/dev-java/tomcat-jstl-spec-1.2.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=java-virtuals/servlet-api:3.0 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JSP Standard Tag Library (JSTL) - Specification jar
-EAPI=5
-HOMEPAGE=https://tomcat.apache.org/taglibs/standard/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-spec-1.2.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=80680f00201543ce8406ed3ddb38ce83
diff --git a/dev-java/tomcat-jstl-spec/Manifest b/dev-java/tomcat-jstl-spec/Manifest
new file mode 100644
index 000000000000..0502f5511bcd
--- /dev/null
+++ b/dev-java/tomcat-jstl-spec/Manifest
@@ -0,0 +1,4 @@
+AUX tomcat-jstl-spec-1.2.5-build.xml 9490 BLAKE2B 3616a227199fc79e3f65ca8f1d6d9804bcbbd52528122583d3aa5dfc7ddd27755149b794a64cdc86db76f39ad75957769202eb617e59f1dadc5721482424ced5 SHA512 7375c12b07eb3ce07e03826219f1e239a507cea6052605ceac5261ab9cfbb2c28a8d88d95ee8fb90c8172847317adccb4969ac5e8e4caf0c20f39f46ab20542e
+DIST tomcat-jstl-spec-1.2.5.zip 615779 BLAKE2B f5c307625a84a7170659683913282df1cf7e8b6a021ffed9895aa0e770a35d8db5351660c96668091ed59e5be35d2e8ad9359f524cbfe5a380e89ebe4fe08b43 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
+EBUILD tomcat-jstl-spec-1.2.5-r1.ebuild 1337 BLAKE2B c460db912a50ed3a9ac7ed6f41502c69e150debff8fa1727eaa567f15b7a1c22a42c2e5faf68e4f796f00f2a773147298878c083513c291b4e1a927c2bf1b1ab SHA512 518f5eeb6503a1bb19fcc3959094a28a624fe79e39ee92a20967f3ab88d29872a203ce8a2b29467f0ae238bd1bc9e237b9afa30e3b844fee39618b68d96cbe30
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-jstl-spec/files/tomcat-jstl-spec-1.2.5-build.xml b/dev-java/tomcat-jstl-spec/files/tomcat-jstl-spec-1.2.5-build.xml
new file mode 100644
index 000000000000..27ba9e5bcb07
--- /dev/null
+++ b/dev-java/tomcat-jstl-spec/files/tomcat-jstl-spec-1.2.5-build.xml
@@ -0,0 +1,225 @@
+<?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/25/15 5:16 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="taglibs-standard-spec-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="taglibs-standard-spec-1.2.5"/>
+  <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">
+  </path>
+  <path id="build.test.classpath">
+  </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.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </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="UTF-8" 
+           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>
+  </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="**/*Test.java"/>
+          <include name="**/*TestCase.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" 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="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">
+      <link href="http://download.oracle.com/javase/1.5.0/docs/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" 
+         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"/>
+
+</project>
diff --git a/dev-java/tomcat-jstl-spec/metadata.xml b/dev-java/tomcat-jstl-spec/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/tomcat-jstl-spec/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..53f1365c8541
--- /dev/null
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+MY_SPEC="${MY_PN}-spec"
+
+DESCRIPTION="JSP Standard Tag Library (JSTL) - Specification jar"
+HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="java-virtuals/servlet-api:3.0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="spec/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/spec/build.xml || die
+}
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/spec/target/${MY_SPEC}-${PV}.jar ${MY_SPEC}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/spec/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/spec/src/*
+	fi
+}
diff --git a/dev-java/tomcat-native-1.2.16 b/dev-java/tomcat-native-1.2.16
deleted file mode 100644
index cb6361dd5ce0..000000000000
--- a/dev-java/tomcat-native-1.2.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Native APR library for Tomcat
-EAPI=5
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=static-libs test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1 dev-libs/openssl:= >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.16/source/tomcat-native-1.2.16-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=27f1862a67d002e9e875d33c39598a24
diff --git a/dev-java/tomcat-native-1.2.17 b/dev-java/tomcat-native-1.2.17
deleted file mode 100644
index 39a9cdb4a8f0..000000000000
--- a/dev-java/tomcat-native-1.2.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=static-libs test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ad41b948f33807bb5b48979f6efc62ec
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
new file mode 100644
index 000000000000..607cb5c53f7e
--- /dev/null
+++ b/dev-java/tomcat-native/Manifest
@@ -0,0 +1,5 @@
+DIST tomcat-native-1.2.16-src.tar.gz 405109 BLAKE2B e153caeb82c4ac4d2a8c7c24373204edf6e691068e70c858618caf72faaee1f4d10c4529ba758e24422e8580e8b3e95d28cc942998568106ec60b8de7c196c51 SHA512 0345f85fbab406f25c25c8fc06bf55f3d166fa14bfcf542bddb5dc5db4c8c7bd0c5b71603d85261d71152ead3023b112144f2ffa5ede14ae8595013f79c802aa
+DIST tomcat-native-1.2.17-src.tar.gz 408967 BLAKE2B 482b0416be01bcbe9ba55555715de37c6071502ed57f179115c3d351684621487b90e05dd488b1c2137e4813a785c1fe229241f191468bc88f7f0dd3a31562c0 SHA512 8fa946855fd14525ec0abe7b09975bbd34d6127352e90730a8afb77e16cd91715417e812a40017fee65939a9ce95faf39a9193222f441cda0ad2eb7f690e77b9
+EBUILD tomcat-native-1.2.16.ebuild 1238 BLAKE2B 2fea3080d1f68c5718caaf3e4a4780a66e511e3d2dc5b960adc86e788f1c6257dfd69dec607690d76178bb5fb4f2bb2723b2549c9b73b8dcb67a8fcb36a34887 SHA512 c86d56772be860e570f5ade50c5baa51c6267e689c767834aaed6965f9a483404d00b55558e10def1d8b0af9713cacd5e8018d41625403bc8cbc658c18db7727
+EBUILD tomcat-native-1.2.17.ebuild 1155 BLAKE2B 1a170dd795495595c0938b27017c5e017822f4ff515dc3ee60d645494c4999a378cc760ac0a49e0bc1b3e25183a0659b533f7158aae8d05e9eb1106b5e04a295 SHA512 2cce0be375c489a52c61fd629e6c2c499a27538df65f472e14fb4e6272aedd29fb6240831e3ad91990c41375b685d81255a61da350893e3ddd7c003e11f37358
+MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/metadata.xml b/dev-java/tomcat-native/metadata.xml
new file mode 100644
index 000000000000..2228187b5ce8
--- /dev/null
+++ b/dev-java/tomcat-native/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Native library for Tomcat to use the Apache Portable Runtime to
+		provide superior scalability, performance, and better integration with
+		native server technologies. The Apache Portable Runtime is a highly
+		portable library that is at the heart of Apache HTTP Server 2.x. APR
+		has many uses, including access to advanced IO functionality (such as
+		sendfile, epoll and OpenSSL), OS level functionality (random number
+		generation, system status, etc), and native process handling (shared
+		memory, NT pipes and Unix sockets).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.16.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.16.ebuild
new file mode 100644
index 000000000000..bebd76103701
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.16.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Native APR library for Tomcat"
+
+SLOT="0"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+HOMEPAGE="https://tomcat.apache.org/"
+KEYWORDS="amd64 ~x86"
+LICENSE="Apache-2.0"
+IUSE="static-libs test"
+
+RDEPEND="dev-libs/apr:1
+	dev-libs/openssl:=
+	>=virtual/jre-1.7"
+
+DEPEND=">=virtual/jdk-1.7
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+src_configure(){
+	cd native || die
+	econf --with-apr=/usr/bin/apr-1-config  \
+		--with-ssl=/usr || die "Could not configure native sources"
+}
+
+src_compile() {
+	eant jar -f build.xml
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native
+	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
+
+	! use static-libs && prune_libtool_files --modules
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog
+	elog " APR should be available with Tomcat, for more information"
+	elog " please see https://tomcat.apache.org/tomcat-6.0-doc/apr.html"
+	elog
+	elog " Please report any bugs to https://bugs.gentoo.org/"
+	elog
+}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.17.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.17.ebuild
new file mode 100644
index 000000000000..b9e42b33f4c0
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.17.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="static-libs test"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0=
+	>=virtual/jre-1.8"
+
+DEPEND=">=virtual/jdk-1.8
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+
+	cd native || die
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	eant jar
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native || die
+	default
+
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}
diff --git a/dev-java/tomcat-servlet-api-3 b/dev-java/tomcat-servlet-api-3
deleted file mode 100644
index e93cbd16723f..000000000000
--- a/dev-java/tomcat-servlet-api-3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 2.2/JSP API 1.2 implementation
-EAPI=0
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=2.2
-SRC_URI=mirror://apache/jakarta/tomcat-3/src/jakarta-servletapi-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f260092b522b92c7d331d5844738a93b
diff --git a/dev-java/tomcat-servlet-api-4.1.36 b/dev-java/tomcat-servlet-api-4.1.36
deleted file mode 100644
index e40f5d6624f9..000000000000
--- a/dev-java/tomcat-servlet-api-4.1.36
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 2.3/JSP API 1.2 implementation
-EAPI=0
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=2.3
-SRC_URI=mirror://apache/tomcat/tomcat-4/v4.1.36/src/apache-tomcat-4.1.36-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=44c81c713ca42972e11d58dbe9096924
diff --git a/dev-java/tomcat-servlet-api-5.5.27-r1 b/dev-java/tomcat-servlet-api-5.5.27-r1
deleted file mode 100644
index 0131c1629306..000000000000
--- a/dev-java/tomcat-servlet-api-5.5.27-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.5 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 2.4/JSP API 2.0 implementation
-EAPI=0
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=doc source elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-SLOT=2.4
-SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.27/src/apache-tomcat-5.5.27-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b9505f6724cc52ba349e33301c048312
diff --git a/dev-java/tomcat-servlet-api-5.5.34 b/dev-java/tomcat-servlet-api-5.5.34
deleted file mode 100644
index 49fe5f1388cb..000000000000
--- a/dev-java/tomcat-servlet-api-5.5.34
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.5 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 2.4/JSP API 2.0 implementation
-EAPI=0
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=doc source elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-SLOT=2.4
-SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.34/src/apache-tomcat-5.5.34-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7ad1564b05c218aa953ff63fe5157a27
diff --git a/dev-java/tomcat-servlet-api-6.0.44-r1 b/dev-java/tomcat-servlet-api-6.0.44-r1
deleted file mode 100644
index cbc0c0234c58..000000000000
--- a/dev-java/tomcat-servlet-api-6.0.44-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 2.5/JSP API 2.1 implementation
-EAPI=5
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.5
-SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.44/src/apache-tomcat-6.0.44-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=aa244fe54e74cfc621130ba8e5b50865
diff --git a/dev-java/tomcat-servlet-api-6.0.45 b/dev-java/tomcat-servlet-api-6.0.45
deleted file mode 100644
index ecc966fc6083..000000000000
--- a/dev-java/tomcat-servlet-api-6.0.45
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 2.5/JSP API 2.1 implementation
-EAPI=5
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.5
-SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5a59dffb3ab53cf2a69a9b0a1fa64cee
diff --git a/dev-java/tomcat-servlet-api-6.0.53 b/dev-java/tomcat-servlet-api-6.0.53
deleted file mode 100644
index e2275101e1f0..000000000000
--- a/dev-java/tomcat-servlet-api-6.0.53
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 2.5/JSP API 2.1 implementation
-EAPI=5
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.5
-SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.53/src/apache-tomcat-6.0.53-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=78e6df7787e33e61ca61baaa6c998d1e
diff --git a/dev-java/tomcat-servlet-api-7.0.82 b/dev-java/tomcat-servlet-api-7.0.82
deleted file mode 100644
index 6bf12adf54be..000000000000
--- a/dev-java/tomcat-servlet-api-7.0.82
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.82/src/apache-tomcat-7.0.82-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e82a26a2a780d2ae0e3a0f9cd2647c49
diff --git a/dev-java/tomcat-servlet-api-7.0.85 b/dev-java/tomcat-servlet-api-7.0.85
deleted file mode 100644
index 8d59883f34cc..000000000000
--- a/dev-java/tomcat-servlet-api-7.0.85
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.85/src/apache-tomcat-7.0.85-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2ca803da3197dde1655ea947a8cd7b89
diff --git a/dev-java/tomcat-servlet-api-7.0.88 b/dev-java/tomcat-servlet-api-7.0.88
deleted file mode 100644
index 2a1019dae5ac..000000000000
--- a/dev-java/tomcat-servlet-api-7.0.88
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.88/src/apache-tomcat-7.0.88-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=779a8bed93a93b69d5ac1757890a916c
diff --git a/dev-java/tomcat-servlet-api-8.0.50 b/dev-java/tomcat-servlet-api-8.0.50
deleted file mode 100644
index 6383972e16d8..000000000000
--- a/dev-java/tomcat-servlet-api-8.0.50
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=5
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.50/src/apache-tomcat-8.0.50-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1b3f03355b813721a9204e8e46d68185
diff --git a/dev-java/tomcat-servlet-api-8.0.52 b/dev-java/tomcat-servlet-api-8.0.52
deleted file mode 100644
index fc77549ccbaa..000000000000
--- a/dev-java/tomcat-servlet-api-8.0.52
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=5
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.52/src/apache-tomcat-8.0.52-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c1fe3ba0136216ce36f0693ecde026b6
diff --git a/dev-java/tomcat-servlet-api-8.5.23 b/dev-java/tomcat-servlet-api-8.5.23
deleted file mode 100644
index f09a766a878a..000000000000
--- a/dev-java/tomcat-servlet-api-8.5.23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.23/src/apache-tomcat-8.5.23-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7fa97a50c5e386ce2850b0a2e7001f7b
diff --git a/dev-java/tomcat-servlet-api-8.5.30 b/dev-java/tomcat-servlet-api-8.5.30
deleted file mode 100644
index 33e9f1f7842d..000000000000
--- a/dev-java/tomcat-servlet-api-8.5.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.30/src/apache-tomcat-8.5.30-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6cb28624e7504c7ac433a8c198dde806
diff --git a/dev-java/tomcat-servlet-api-8.5.31 b/dev-java/tomcat-servlet-api-8.5.31
deleted file mode 100644
index 3176b1bef874..000000000000
--- a/dev-java/tomcat-servlet-api-8.5.31
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.31/src/apache-tomcat-8.5.31-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=466a50287d6629c3864557c848e828eb
diff --git a/dev-java/tomcat-servlet-api-9.0.7 b/dev-java/tomcat-servlet-api-9.0.7
deleted file mode 100644
index d70e0f6acb49..000000000000
--- a/dev-java/tomcat-servlet-api-9.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.7/src/apache-tomcat-9.0.7-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=156566c5990eb94a484ffdef37774979
diff --git a/dev-java/tomcat-servlet-api-9.0.8 b/dev-java/tomcat-servlet-api-9.0.8
deleted file mode 100644
index 6fc74410e0e1..000000000000
--- a/dev-java/tomcat-servlet-api-9.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.8/src/apache-tomcat-9.0.8-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2b8827f71321f04c309f7a1cccf79d5d
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
new file mode 100644
index 000000000000..4df1941ec244
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -0,0 +1,41 @@
+AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb
+AUX 3.0-build.xml 3192 BLAKE2B ff380d3f1a79b751ac1aa35e949af97c2257775cf9a15f67320bef45af7a5379392d3ea70507ced89d454c663551a4ddb90ff1de1a9a3a3c76a0a3e2a35df775 SHA512 fff70f29b7b8025ce10261c9afc140b0765aee35821fbbdc161872ecec4819832ed12a71bb54e9eea96ecf8418f51a11a8716b07bfdfb957dde6bc1abe8ee7e8
+AUX 3.1-build.xml 3193 BLAKE2B 2bd250b67ae737c0197eb00b0aff4452444a9b5c99e3d25ebb3a16f7c31f4a65fc7d45b1f4abb7b7530e00ebc9334491f9eabb793d46ab144c718cad61b8f01f SHA512 efa6753a44e7f18c04bff98b68262112ee192857a8b15899e6927de1754c25788fb551251207433f0a7cf69703e310e6f577853d6eb6f6f6e48f2a57ca4921c8
+AUX 4.0-build.xml 3193 BLAKE2B 2bd250b67ae737c0197eb00b0aff4452444a9b5c99e3d25ebb3a16f7c31f4a65fc7d45b1f4abb7b7530e00ebc9334491f9eabb793d46ab144c718cad61b8f01f SHA512 efa6753a44e7f18c04bff98b68262112ee192857a8b15899e6927de1754c25788fb551251207433f0a7cf69703e310e6f577853d6eb6f6f6e48f2a57ca4921c8
+AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
+AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
+DIST apache-tomcat-4.1.36-src.tar.gz 3715200 BLAKE2B 0af7c15e821c7b437c4a12c07aa6943184d3bb6c08f925c09e0357f3b7cdd87b17d5303725560508480646e89cfcbaae671527ca4879adb26085855e15139b93 SHA512 f2f36fbad5114c8a74154602249280226b839cbb75b2a584d6a6efbc11dcd2a5e27a67ee9b7ca2f12689cabfe1110035f95b27690ce6c304bbbb6389dfa97cd2
+DIST apache-tomcat-5.5.27-src.tar.gz 7382057 BLAKE2B 289c586c9664efb63f921bffab80a180639ff4c14cc1f676cb7aff27c9416a20e142bc56862c0a06b26d30bc5a7415b07c0b7c3263286af860b27ee940f745b4 SHA512 32c605aad92b7d554b9e0f28a4d3e707b3cbfc0661a969eb2479512517f8e9e8848b820132d711c41f5c0fa863028b38e1fa903e7c0205599e9e58a86ab4733a
+DIST apache-tomcat-5.5.34-src.tar.gz 3720299 BLAKE2B 9ec9171f7fb5aa43a3d7df0d3e06932b214d9740c56e95468f45d2f4ea0e157f9bd33dcc715ace9f950761b1fbfd7a5cbf9fec47f98feb1088641a24de4a8f4a SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519
+DIST apache-tomcat-6.0.44-src.tar.gz 3447711 BLAKE2B 7baf1fc24a7c9aba7e2ddac63fe0c0975178616bfad8cd625d2910d18ad9b00cd85c98ba4a1ada251119629b96ff464ac623857f6928e3b9465708cdf5bc7513 SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
+DIST apache-tomcat-6.0.45-src.tar.gz 3494054 BLAKE2B 5dc7ac1c941b3b307ff6ccc53b59ddcd141c5ece00424a89025272d170e00ed14462f9805be0e26750f60ff1eb223e2829e7d215502f526e800bf2ffffaee30a SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab
+DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
+DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
+DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8d41c58fb96ed1330560a4064ac3b3eeb030c76ff066c2a2f950d6f2c1576bde214f963f1a12342536a8e2ab8ac179dd166bfb SHA512 f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044
+DIST apache-tomcat-7.0.88-src.tar.gz 4733229 BLAKE2B 2e2009f64ae8f027e93bd7f3cec21f98fbb1f5c741b6525da1638c6188ebe44aa8b43d984abd769385992a997226392c59ec059e408873261a04d9e96a4603c3 SHA512 2ad5c11ec7c5e8e68fba6c0427b0479969a56e7ccb3f0b1ee6c6f139d5f2b718ee9c56f044e982013108ee6e06c43037d0061e539203e95453e9cae7cb38711d
+DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff
+DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d0a8da8314f1ef79d0b047971bca30a5b0cc937faf013b5090f6e6b8aec4127b6185dc54ae589f5b57143b62c71c09f8bd5e9d SHA512 6d846213db0b15f9add8d80f30f304afdaf879ab6d7f85d212183a93f4f360ebfeeb079813bdea83cbd13f507504473028bbf8279e89b800b6f150b83086fa56
+DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
+DIST apache-tomcat-8.5.30-src.tar.gz 5143270 BLAKE2B 3bdcff663ca509efc3b2ee92ce140a3a22abf7fc0e32b5fa9a0ee713bdc1065ebde0b77cf624cedc2e0893194518d10e1f5df5b2f41edf76cb61157ac4d02862 SHA512 53729cfd1859872109f816df2642e3cd776a7faf8c55b1d50df0459f12958aacbf36debe6e8f10c19ab0a5bb2973fa63a2fec57f83ecaf19f4cf9d82e4a20265
+DIST apache-tomcat-8.5.31-src.tar.gz 5154531 BLAKE2B cce0388e5c8c5fb5fcb3dba3b5961dc21d9f19d9a2f6177660a41410bddf241f73dda1e52c3875e28cfa13041c85a458a92c9a23c509b645f042cfa472081fde SHA512 659137ef4809af329ae4dd6f5825a603c1408ef3e48153abe7480a722e7f4bebef68a64af9cbef4a4ad9a7e8da76494f825035bbadbb983a097525f476f32f33
+DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
+DIST apache-tomcat-9.0.8-src.tar.gz 5115250 BLAKE2B 8eaf0aa963711f90278d6d20986f4ba583c64e9e2b1f0b82ccc676a854a2078fe29c3b691d49af529074c9eea02ba78802cc9a4bb5cd7a3e561f6dfcb342c50b SHA512 22a3c9a2c9f2fa87b218ec5deb50248af201e83111bbeb7fcfbb7dde5aba3e2d61b53bc40500b3e364a9fb94b576ad8a4683979534274af0f3bcdfb86aa045e7
+DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
+EBUILD tomcat-servlet-api-3.ebuild 849 BLAKE2B 88f6dc377d4c33eb50a3559f5b1b275cbbddf077c119e792afc567458d74e4f6fa710a97e71543c19caecafb8a7e26ee0cfb4cf34006a2aaae9a97924cb9463b SHA512 085c9e220972fb0f923b710a33a76977aaf76c8abee84c5c0c80ff40932585fdb0cd3a00705a60ef615558a0c20f93522cfd705fc5e5c0af70fe9eb2e640ee5a
+EBUILD tomcat-servlet-api-4.1.36.ebuild 982 BLAKE2B f7c7e92165fcd0181b65bd9fd905f818653c44262b36672986140a78466d16933f980dc75e886f46f495d775777506bfe76ad37efc2903c2f09e5e21190dc26a SHA512 c5bf0955bcde88055150fc42af73b43eaa6657106918c5aad142ebb9a09ace3554ab49c07270e9ad2c5730af0fd7dcde9ae9de76e9dc40e52ac5f51c90bf5c75
+EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1406 BLAKE2B 804845f9eb553b2f24edfa30e8fcc4047c379bd185730f0681ddd23605c513f9adf921d7eb724729b2894a888ab030de47b7f6c1764ef9d8425eaa4cb2cb65a8 SHA512 5419209691c73817366f0ffdc7f9b3c1f75562e318d7b45c77f433ddfc3aeeb6b5fcb61ca23e05947772207b35221e6eac9a9a7b3e2f461bc71f52ed024c0b6a
+EBUILD tomcat-servlet-api-5.5.34.ebuild 1419 BLAKE2B 8c55639dd2ef3367f74b6371561922851d0514cdcc8a7a87f48d7f86e4bb97dbbe5097633e8d3dad317387cab4383edbf63b326d543f2e99927bc7aaa4b73ffe SHA512 a8725711c6e98068fd30e1642125bc092dc9eeb9cd706611c0526e47fa110d5ff7059e25476435c66abcfeee73ec220855c4dd7cb6eb0a204a4024af43bbf410
+EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 941 BLAKE2B c253c51b56d719fc6abe9cc714ef2ffbc2e4dcd8fa1ebe61b77968cb15f8d8e224300c491e445350396b67713a0474598f6c8d761361b3d49c05411f29df900f SHA512 b0a47a4631bbfcc5986ed9f61565782aed2437e169210bcae2df459adcaf6fd9727133006701650735ace3d0203235f22b845dca2791abb79c0564c8ad03c764
+EBUILD tomcat-servlet-api-6.0.45.ebuild 944 BLAKE2B ec11ffa4834b9dc0966892c0d221640ec7ef75633806394b69b0bfa79d51728ba552809cf3c462d063198982de879a2acb32be2ecf5d5dd30d5db8eae60a0b78 SHA512 a9ec48dabbf5d7668c7e23b8e891faff8be25bd3f4beae55b0e8d95cff271ab81c03f13bdd2f127fe40aacb70f4db845452f8ffd66c82f4b11604d4cbfd46141
+EBUILD tomcat-servlet-api-6.0.53.ebuild 943 BLAKE2B c7b1a81fcb5f243e1888df39fc624a11385809ae602b4af2547b8a8a04ba4b1f4baf66703e9cd16ccf380b0dabe90c93b95c282c6605db03186d180a491c94c4 SHA512 d6bcfceea13c347ef6b467c3e2b18313465717d3c855c5011f3d5a0b130bc7a6f19c1f02eb647bdc328d16ceb8582ed7f3b68ca13c60bd29861a68700bb52e02
+EBUILD tomcat-servlet-api-7.0.82.ebuild 906 BLAKE2B 2169547e97371a8532c797f02e31ad1e17b04d2f03f7ab3041dac4ac1f23e699cdea60fb5779436d259cb3fdba6c59cd083d9cf4f874e8dad3f3194919c38c6c SHA512 ea84aa02351af9a21ffdad739619e1b8bc22b0978a03f464fedd7400257ed253040c2bd89be2749f00889f009988dd4083a5ceb81a89d3d6d5e8a5b6bfc07dbb
+EBUILD tomcat-servlet-api-7.0.85.ebuild 907 BLAKE2B 4d44c9e83f65cb6997d11bc0cc586980ee5adb884b0e41b4a4f7e9e1634507d1cdf2d077e5e53138003d04e893c6f240afd54db14d00d0f98385e4dfe0cc41e1 SHA512 36a32450116f61421399c8ccd31ab78d37f743ea5f1c8a58f6a045e0a50cb5d505ba0e448d0335c463a50f9e3132859c7cb6a8517ac88147dcce656bf3528377
+EBUILD tomcat-servlet-api-7.0.88.ebuild 908 BLAKE2B cfcc0e873d630eeb6f43cff3cbc8d48587563baa299e4ef8550cdcd02cf6289ba96d4f70653c0328cee35898d8b560596d13f8fae24ccff9672a2b4ee3fa7694 SHA512 f670f2f7885177a3fe36088033f143673ed1b104877daad5f6c895da7e2964301e018e5ad80b5eeb5cfa2aa2e226a99fe034dc752edb133cfed758be9bbeb7f4
+EBUILD tomcat-servlet-api-8.0.50.ebuild 964 BLAKE2B 1b68372c27f23b04a1c042e7f689f32ce5b9a6b29d397cc94c41eab20194489ea551d66dc69e8e1689b17ff9a158d31387677893d22ba5dd759d5bc1dc78e780 SHA512 f7cb5af08726a44158c0ffa080737c2ddbd8f14f2c29768392af2a413fa0c98e87b5f96828c569fa34241e5dbde8857fa5790dfd69c347c592ce207ca633536e
+EBUILD tomcat-servlet-api-8.0.52.ebuild 965 BLAKE2B 8137fd074339a70166e04ecbdd631dbeb32ae21804918a65d79bd30b9790c54bfc9acffae5bfc6390b86d1b230959eba5043539bc367cafc0bb7f4eb6582b33c SHA512 f4e9c7c4be07457d48d8162a2e68c12a21289cc58b509cc2cc2570bd11a60d74ff83e98c31ed09a96a12e376eb22042a21ed08319a74c21fe6b3faa663bd4f05
+EBUILD tomcat-servlet-api-8.5.23.ebuild 1010 BLAKE2B fb16fa9955dd865619850de21cdae0e44130895b3f886ec96ad5cff37f45f8a13b5caaddc083f46d2eab6b00e174689e652a5a0ead58fb4626e40612c1fd5784 SHA512 1ceaa37c6434f32e10705b0663bc39e2ccc5507c621a2ede604feec69a49bcb46ddd49fff33a5ccce50d4daa228170a3db30e31624ae84dfc83b538de10f7824
+EBUILD tomcat-servlet-api-8.5.30.ebuild 1012 BLAKE2B 9b0a3428cace85369df81f0396d28a6d1a616be8d47702bd8a86fdaea6f97add9ebfd005e9834b39c48ab27767a2284bc2dc9d4299c80bc6f3b249639c593d39 SHA512 5f9c4742f04f8d607e54a7abd01d4dcaacd461a0751785f5c153d8547b20a70fe6c5d243a9d4f8c8f84c7d4230c05d66f4c8041940d7e00741afa11a952619f7
+EBUILD tomcat-servlet-api-8.5.31.ebuild 1013 BLAKE2B 1500538e35d723b1f5f78eb587db6169a531ae47c8cd66a05c19fddae518b4119ac84922100e840de84ff8cb647f974b55b3374b599560b62cfb1f743dffe18c SHA512 0f8c8fea52bfd4f9ef321a258e6dde507fa99a3d5d3626be1bc4c6972d3a6e57bde977d3dbbf3e5de3e3b877fbbb2ede8857d94e5cadd420a5994e21558a16c3
+EBUILD tomcat-servlet-api-9.0.7.ebuild 1007 BLAKE2B 93f6cdc024db1fd4959c86661de3d58e4a3457e54e94bc26d28cfa14f276b17ae61113252b9004de8492f815fd4b02744e055c8082d3fe50918376e61dcca071 SHA512 4cbd09d197fa558fb2172bfb637c06c6f028939038ad3071074019de4663c833d24f8f96a1c7ca628241ae65ef16fc88a06b226f210070170844ad95e2890c51
+EBUILD tomcat-servlet-api-9.0.8.ebuild 1008 BLAKE2B 315c88c9c197728d0587b70a6601d9bcf96d2b8a638c6cea32a06bf0d3e12161a6bcd2484fd4552bdc0e042a2a7a604e304636bea99e5f2f6bbf2f20b2cda407 SHA512 fe215a2c4c26d54748eff5a1250b65d16c2913e0040eb7b31295de9b4be46a84b725a8c34307db9211e17c77abbd7e49725c1ecd99519964d0995eaa30711fe6
+MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/files/2.5-build-r1.xml b/dev-java/tomcat-servlet-api/files/2.5-build-r1.xml
new file mode 100644
index 000000000000..585ed9f07843
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/2.5-build-r1.xml
@@ -0,0 +1,90 @@
+<project name="Tomcat Serlvet API 2.5/JSP API 2.1" default="deploy" basedir=".">
+
+  <property name="compile.source" value="1.5"/>
+
+  <property name="tomcat.build"      value="${basedir}/output/build"/>
+  <property name="tomcat.classes"    value="${basedir}/output/classes"/>
+  <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>
+  <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
+  <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>
+
+  <!-- Just build Tomcat -->
+  <target name="build-prepare">
+
+    <available classname="junit.framework.TestCase" property="junit.present" />
+
+    <mkdir dir="${tomcat.build}"/>
+    <mkdir dir="${tomcat.build}/lib"/>
+    <mkdir dir="${tomcat.classes}"/>
+
+  </target>
+
+  <target name="compile">
+
+    <!-- Compile internal server components -->
+    <javac srcdir="java" destdir="${tomcat.classes}"
+           debug="${compile.debug}"
+           deprecation="${compile.deprecation}"
+           source="${compile.source}"
+           optimize="${compile.optimize}"
+           excludes="**/CVS/**,**/.svn/**">
+      <exclude name="java/javax/annotation/**" />
+      <exclude name="java/javax/ejb/**" />
+      <exclude name="java/javax/mail/**" />
+      <exclude name="java/javax/persistence/**" />
+      <exclude name="java/javax/xml/**" />
+      <exclude name="org/**" />
+    </javac>
+    <tstamp>
+      <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+      <format property="TSTAMP" pattern="hh:mm:ss"/>
+    </tstamp>
+    <!-- Copy static resource files -->
+    <filter token="VERSION" value="${version}"/>
+    <filter token="VERSION_NUMBER" value="${version.number}"/>
+    <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+    <copy todir="${tomcat.classes}" filtering="true">
+      <fileset dir="java">
+        <include name="**/*.properties"/>
+        <include name="**/*.dtd"/>
+        <include name="**/*.tasks"/>
+        <include name="**/*.xsd"/>
+        <include name="**/*.xml"/>
+      </fileset>
+    </copy>
+
+  </target>
+
+  <target name="jar" depends="build-prepare,compile">
+    <!-- Servlet 2.5 Implementation JAR File -->
+    <jar  jarfile="${servlet-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/*" />
+        <include name="javax/servlet/http/*" />
+        <include name="javax/servlet/resources/*" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.1 Implementation JAR File -->
+    <jar  jarfile="${jsp-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/jsp/**" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.1 EL Implementation JAR File -->
+    <jar jarfile="${el-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/el/**" />
+      </fileset>
+    </jar>
+
+  </target>
+
+</project>
diff --git a/dev-java/tomcat-servlet-api/files/3.0-build.xml b/dev-java/tomcat-servlet-api/files/3.0-build.xml
new file mode 100644
index 000000000000..c685394d83f9
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/3.0-build.xml
@@ -0,0 +1,92 @@
+<project name="Tomcat Serlvet API 2.5/JSP API 2.1" default="deploy" basedir=".">
+
+  <property name="compile.source" value="1.5"/>
+
+  <property name="tomcat.build"      value="${basedir}/output/build"/>
+  <property name="tomcat.classes"    value="${basedir}/output/classes"/>
+  <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>
+  <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
+  <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>
+
+  <!-- Just build Tomcat -->
+  <target name="build-prepare">
+
+    <available classname="junit.framework.TestCase" property="junit.present" />
+
+    <mkdir dir="${tomcat.build}"/>
+    <mkdir dir="${tomcat.build}/lib"/>
+    <mkdir dir="${tomcat.classes}"/>
+
+  </target>
+
+  <target name="compile">
+
+    <!-- Compile internal server components -->
+    <javac srcdir="java" destdir="${tomcat.classes}"
+           debug="${compile.debug}"
+           deprecation="${compile.deprecation}"
+           source="${compile.source}"
+           optimize="${compile.optimize}"
+           excludes="**/CVS/**,**/.svn/**">
+      <exclude name="java/javax/annotation/**" />
+      <exclude name="java/javax/ejb/**" />
+      <exclude name="java/javax/mail/**" />
+      <exclude name="java/javax/persistence/**" />
+      <exclude name="java/javax/xml/**" />
+      <exclude name="org/**" />
+    </javac>
+    <tstamp>
+      <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+      <format property="TSTAMP" pattern="hh:mm:ss"/>
+    </tstamp>
+    <!-- Copy static resource files -->
+    <filter token="VERSION" value="${version}"/>
+    <filter token="VERSION_NUMBER" value="${version.number}"/>
+    <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+    <copy todir="${tomcat.classes}" filtering="true">
+      <fileset dir="java">
+        <include name="**/*.properties"/>
+        <include name="**/*.dtd"/>
+        <include name="**/*.tasks"/>
+        <include name="**/*.xsd"/>
+        <include name="**/*.xml"/>
+      </fileset>
+    </copy>
+
+  </target>
+
+  <target name="jar" depends="build-prepare,compile">
+    <!-- Servlet 3.0 Implementation JAR File -->
+    <jar  jarfile="${servlet-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/*" />
+        <include name="javax/servlet/annotation/*" />
+        <include name="javax/servlet/descriptor/*" />
+        <include name="javax/servlet/http/*" />
+        <include name="javax/servlet/resources/*" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.2 Implementation JAR File -->
+    <jar  jarfile="${jsp-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/jsp/**" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.2 EL Implementation JAR File -->
+    <jar jarfile="${el-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/el/**" />
+      </fileset>
+    </jar>
+
+  </target>
+
+</project>
diff --git a/dev-java/tomcat-servlet-api/files/3.1-build.xml b/dev-java/tomcat-servlet-api/files/3.1-build.xml
new file mode 100644
index 000000000000..ea0ef877570d
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/3.1-build.xml
@@ -0,0 +1,93 @@
+
+<project name="Tomcat Serlvet API 3.1/JSP API 2.3" default="deploy" basedir=".">
+
+  <property name="compile.source" value="1.7"/>
+
+  <property name="tomcat.build"      value="${basedir}/output/build"/>
+  <property name="tomcat.classes"    value="${basedir}/output/classes"/>
+  <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>
+  <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
+  <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>
+
+  <!-- Just build Tomcat -->
+  <target name="build-prepare">
+
+    <available classname="junit.framework.TestCase" property="junit.present" />
+
+    <mkdir dir="${tomcat.build}"/>
+    <mkdir dir="${tomcat.build}/lib"/>
+    <mkdir dir="${tomcat.classes}"/>
+
+  </target>
+
+  <target name="compile">
+
+    <!-- Compile internal server components -->
+    <javac srcdir="java" destdir="${tomcat.classes}"
+           debug="${compile.debug}"
+           deprecation="${compile.deprecation}"
+           source="${compile.source}"
+           optimize="${compile.optimize}"
+           excludes="**/CVS/**,**/.svn/**">
+      <exclude name="java/javax/annotation/**" />
+      <exclude name="java/javax/ejb/**" />
+      <exclude name="java/javax/mail/**" />
+      <exclude name="java/javax/persistence/**" />
+      <exclude name="java/javax/xml/**" />
+      <exclude name="org/**" />
+    </javac>
+    <tstamp>
+      <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+      <format property="TSTAMP" pattern="hh:mm:ss"/>
+    </tstamp>
+    <!-- Copy static resource files -->
+    <filter token="VERSION" value="${version}"/>
+    <filter token="VERSION_NUMBER" value="${version.number}"/>
+    <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+    <copy todir="${tomcat.classes}" filtering="true">
+      <fileset dir="java">
+        <include name="**/*.properties"/>
+        <include name="**/*.dtd"/>
+        <include name="**/*.tasks"/>
+        <include name="**/*.xsd"/>
+        <include name="**/*.xml"/>
+      </fileset>
+    </copy>
+
+  </target>
+
+  <target name="jar" depends="build-prepare,compile">
+    <!-- Servlet 3.1 Implementation JAR File -->
+    <jar  jarfile="${servlet-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/*" />
+        <include name="javax/servlet/annotation/*" />
+        <include name="javax/servlet/descriptor/*" />
+        <include name="javax/servlet/http/*" />
+        <include name="javax/servlet/resources/*" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.3 Implementation JAR File -->
+    <jar  jarfile="${jsp-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/jsp/**" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.3 EL Implementation JAR File -->
+    <jar jarfile="${el-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/el/**" />
+      </fileset>
+    </jar>
+
+  </target>
+
+</project>
diff --git a/dev-java/tomcat-servlet-api/files/4.0-build.xml b/dev-java/tomcat-servlet-api/files/4.0-build.xml
new file mode 100644
index 000000000000..ea0ef877570d
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/4.0-build.xml
@@ -0,0 +1,93 @@
+
+<project name="Tomcat Serlvet API 3.1/JSP API 2.3" default="deploy" basedir=".">
+
+  <property name="compile.source" value="1.7"/>
+
+  <property name="tomcat.build"      value="${basedir}/output/build"/>
+  <property name="tomcat.classes"    value="${basedir}/output/classes"/>
+  <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>
+  <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
+  <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>
+
+  <!-- Just build Tomcat -->
+  <target name="build-prepare">
+
+    <available classname="junit.framework.TestCase" property="junit.present" />
+
+    <mkdir dir="${tomcat.build}"/>
+    <mkdir dir="${tomcat.build}/lib"/>
+    <mkdir dir="${tomcat.classes}"/>
+
+  </target>
+
+  <target name="compile">
+
+    <!-- Compile internal server components -->
+    <javac srcdir="java" destdir="${tomcat.classes}"
+           debug="${compile.debug}"
+           deprecation="${compile.deprecation}"
+           source="${compile.source}"
+           optimize="${compile.optimize}"
+           excludes="**/CVS/**,**/.svn/**">
+      <exclude name="java/javax/annotation/**" />
+      <exclude name="java/javax/ejb/**" />
+      <exclude name="java/javax/mail/**" />
+      <exclude name="java/javax/persistence/**" />
+      <exclude name="java/javax/xml/**" />
+      <exclude name="org/**" />
+    </javac>
+    <tstamp>
+      <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+      <format property="TSTAMP" pattern="hh:mm:ss"/>
+    </tstamp>
+    <!-- Copy static resource files -->
+    <filter token="VERSION" value="${version}"/>
+    <filter token="VERSION_NUMBER" value="${version.number}"/>
+    <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+    <copy todir="${tomcat.classes}" filtering="true">
+      <fileset dir="java">
+        <include name="**/*.properties"/>
+        <include name="**/*.dtd"/>
+        <include name="**/*.tasks"/>
+        <include name="**/*.xsd"/>
+        <include name="**/*.xml"/>
+      </fileset>
+    </copy>
+
+  </target>
+
+  <target name="jar" depends="build-prepare,compile">
+    <!-- Servlet 3.1 Implementation JAR File -->
+    <jar  jarfile="${servlet-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/*" />
+        <include name="javax/servlet/annotation/*" />
+        <include name="javax/servlet/descriptor/*" />
+        <include name="javax/servlet/http/*" />
+        <include name="javax/servlet/resources/*" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.3 Implementation JAR File -->
+    <jar  jarfile="${jsp-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/jsp/**" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.3 EL Implementation JAR File -->
+    <jar jarfile="${el-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/el/**" />
+      </fileset>
+    </jar>
+
+  </target>
+
+</project>
diff --git a/dev-java/tomcat-servlet-api/files/jsp-api-2.0-manifest b/dev-java/tomcat-servlet-api/files/jsp-api-2.0-manifest
new file mode 100644
index 000000000000..dfaa006ea009
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/jsp-api-2.0-manifest
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %bundleName

+Bundle-Vendor: %vendorName

+Bundle-Localization: plugin

+Import-Package: javax.servlet; version=2.4,javax.servlet.http; version=2.4,javax.servlet.resources; version=2.4

+Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; version=2.0, javax.servlet.jsp.resources; version=2.0,

+ javax.servlet.jsp.tagext; version=2.0

+Bundle-Version: 2.0

+Bundle-SymbolicName: javax.servlet.jsp

+

diff --git a/dev-java/tomcat-servlet-api/files/servlet-api-2.4-manifest b/dev-java/tomcat-servlet-api/files/servlet-api-2.4-manifest
new file mode 100644
index 000000000000..77e19f1d9ae8
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/servlet-api-2.4-manifest
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %bundleName

+Bundle-Vendor: %vendorName

+Bundle-Localization: plugin

+Export-Package: javax.servlet;version="2.4",javax.servlet.http;version="2.4",javax.servlet.resources;version="2.4"

+Bundle-Version: 2.4.0

+Bundle-SymbolicName: javax.servlet

+

diff --git a/dev-java/tomcat-servlet-api/metadata.xml b/dev-java/tomcat-servlet-api/metadata.xml
new file mode 100644
index 000000000000..61b379cee8a1
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+	The Apache Tomcat implementation of the Servlet API specification.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
new file mode 100644
index 000000000000..c2dfb471923e
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="${PN/tomcat/}"
+MY_PN="jakarta-${MY_PN//-/}-src"
+DESCRIPTION="Tomcat's Servlet API 2.2/JSP API 1.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/jakarta/tomcat-3/src/${MY_PN}.tar.gz"
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+LICENSE="Apache-1.1"
+SLOT="2.2"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+S="${WORKDIR}/${MY_PN}"
+
+EANT_BUILD_TARGET="all"
+
+src_install() {
+	java-pkg_dojar ../dist/servletapi/lib/servlet.jar
+
+	use doc && java-pkg_dohtml -r ../dist/servletapi/docs/*
+	use source && java-pkg_dosrc src/share/javax
+	dodoc README || die
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
new file mode 100644
index 000000000000..2f41ffe1c392
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="apache-${P/-servlet-api/}-src"
+DESCRIPTION="Tomcat's Servlet API 2.3/JSP API 1.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-4/v${PV}/src/${MY_P}.tar.gz"
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+S="${WORKDIR}/${MY_P}/servletapi"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	einfo "Removing bundled jars and classes"
+	find "${WORKDIR}/${MY_P}" '(' -name '*.class' -o -name '*.jar' ')' -delete
+}
+
+EANT_BUILD_TARGET="all"
+
+src_install() {
+	java-pkg_dojar dist/lib/servlet.jar
+
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/share/javax
+	dodoc dist/README.txt
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
new file mode 100644
index 000000000000..cf40088c58ee
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils java-pkg-2 java-ant-2 java-osgi
+
+MY_P="apache-${P/-servlet-api/}-src"
+DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.5
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/${MY_P}/servletapi"
+
+src_compile() {
+	local antflags="jar $(use_doc javadoc examples)"
+	eant ${antflags} -f jsr154/build.xml
+	eant ${antflags} -f jsr152/build.xml
+}
+
+src_install() {
+	mv jsr{154,152}/dist/lib/*.jar "${S}"
+
+	if use doc ; then
+		mkdir docs
+		cd "${S}/jsr154/build"
+		mv docs "${S}/docs/servlet"
+		mv examples "${S}/docs/servlet/examples"
+
+		cd "${S}/jsr152/build"
+		mv docs "${S}/docs/jsp"
+		mv examples "${S}/docs/jsp/examples"
+	fi
+
+	cd "${S}"
+	java-osgi_dojar-fromfile --no-auto-version "jsp-api.jar" "${FILESDIR}/jsp-api-2.0-manifest" "Java Server Pages API Bundle"
+	java-osgi_dojar-fromfile --no-auto-version "servlet-api.jar" "${FILESDIR}/servlet-api-2.4-manifest" "Servlet API Bundle"
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
new file mode 100644
index 000000000000..845323077d03
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils java-pkg-2 java-ant-2 java-osgi
+
+MY_P="apache-${P/-servlet-api/}-src"
+DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.5
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/${MY_P}/servletapi"
+
+src_compile() {
+	local antflags="jar $(use_doc javadoc examples)"
+	eant ${antflags} -f jsr154/build.xml
+	eant ${antflags} -f jsr152/build.xml
+}
+
+src_install() {
+	mv jsr{154,152}/dist/lib/*.jar "${S}"
+
+	if use doc ; then
+		mkdir docs
+		cd "${S}/jsr154/build"
+		mv docs "${S}/docs/servlet"
+		mv examples "${S}/docs/servlet/examples"
+
+		cd "${S}/jsr152/build"
+		mv docs "${S}/docs/jsp"
+		mv examples "${S}/docs/jsp/examples"
+	fi
+
+	cd "${S}"
+	java-osgi_dojar-fromfile --no-auto-version "jsp-api.jar" "${FILESDIR}/jsp-api-2.0-manifest" "Java Server Pages API Bundle"
+	java-osgi_dojar-fromfile --no-auto-version "servlet-api.jar" "${FILESDIR}/servlet-api-2.4-manifest" "Servlet API Bundle"
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
new file mode 100644
index 000000000000..8ecab83cc461
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.5"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build-r1.xml" build.xml || die "Could not replace build.xml"
+	rm -r */*/build.xml java/javax/{annotation,ejb,mail,persistence,xml}/ || die
+	find -name '*.jar' -delete || die
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
new file mode 100644
index 000000000000..2fec3f8c4603
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.5"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build-r1.xml" build.xml || die "Could not replace build.xml"
+	rm -r */*/build.xml java/javax/{annotation,ejb,mail,persistence,xml}/ || die
+	find -name '*.jar' -delete || die
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
new file mode 100644
index 000000000000..f0f2a14f33b2
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.5"
+KEYWORDS="amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build-r1.xml" build.xml || die "Could not replace build.xml"
+	rm -r */*/build.xml java/javax/{annotation,ejb,mail,persistence,xml}/ || die
+	find -name '*.jar' -delete || die
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild
new file mode 100644
index 000000000000..8349619ca6c6
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild
new file mode 100644
index 000000000000..aeaf64e366fa
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.88.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.88.ebuild
new file mode 100644
index 000000000000..f0304e00ca2a
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.88.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild
new file mode 100644
index 000000000000..8a7cc91eceec
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.52.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.52.ebuild
new file mode 100644
index 000000000000..be4a03387b4a
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.52.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
new file mode 100644
index 000000000000..df5d6f08c21c
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.30.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.30.ebuild
new file mode 100644
index 000000000000..06c703b27fb1
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.30.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.31.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.31.ebuild
new file mode 100644
index 000000000000..c543bdd19c25
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.31.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild
new file mode 100644
index 000000000000..a0340d723de1
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.8.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.8.ebuild
new file mode 100644
index 000000000000..f00a9f12c2d2
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/toolbar-1.1.0-r2 b/dev-java/toolbar-1.1.0-r2
deleted file mode 100644
index defe6053010c..000000000000
--- a/dev-java/toolbar-1.1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=An improved version of JToolBar
-EAPI=5
-HOMEPAGE=http://toolbar.tigris.org
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://toolbar.tigris.org/files/documents/869/25285/toolbar-1.1.0-src.zip -> toolbar-1.1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d6742ea1ab2e449f57db63c288c836e5
diff --git a/dev-java/toolbar/Manifest b/dev-java/toolbar/Manifest
new file mode 100644
index 000000000000..9b6463b91fe3
--- /dev/null
+++ b/dev-java/toolbar/Manifest
@@ -0,0 +1,3 @@
+DIST toolbar-1.1.0.zip 72829 BLAKE2B 8ea170b5c1643dc2e9bd914c3267f964640ab75fd5d179e7fb751b1b85985533fd2425b20df777c8c1e087cf223af46b9e5ddc02f2123948a5cfd27067fc6a30 SHA512 57f4b7970beb78f979bd3970dfc528e0a26e38828dcb8a2cc81c8f886e900f81fe53ca6cae7b5cfa3ce93cc273fa2f440cb0bd720ba6052e84e9f2df1e77099e
+EBUILD toolbar-1.1.0-r2.ebuild 566 BLAKE2B c3676cfc152301de9623b96b1a49c9ff98245edd5c7aa60838abb4072816e6b2348720e0d02d129286884dc39bb371c10818b14e65a2574a737e6a86b2350af3 SHA512 b01ebbea7010bacb83a7a3aedf86554b23849816e8ac5cdd2f3dd2e8edd5d52fcd54a373012decdf04fddc3b13793ced41d8f75a1945d7f63790adae0aa47a78
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/toolbar/metadata.xml b/dev-java/toolbar/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/toolbar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/toolbar/toolbar-1.1.0-r2.ebuild b/dev-java/toolbar/toolbar-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..057a3016ebfc
--- /dev/null
+++ b/dev-java/toolbar/toolbar-1.1.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An improved version of JToolBar"
+HOMEPAGE="http://toolbar.tigris.org"
+SRC_URI="http://toolbar.tigris.org/files/documents/869/25285/toolbar-${PV}-src.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	rm -rv test || die
+}
diff --git a/dev-java/touchgraph-graphlayout-1.22-r1 b/dev-java/touchgraph-graphlayout-1.22-r1
deleted file mode 100644
index 67724cdfa1d1..000000000000
--- a/dev-java/touchgraph-graphlayout-1.22-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=TouchGraph provides a set of interfaces for graph visualization
-EAPI=5
-HOMEPAGE=http://touchgraph.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/touchgraph/TGGL_122_jre11.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9a7e167141b173b7ac928a96610acb78
diff --git a/dev-java/touchgraph-graphlayout/Manifest b/dev-java/touchgraph-graphlayout/Manifest
new file mode 100644
index 000000000000..36cb467970fe
--- /dev/null
+++ b/dev-java/touchgraph-graphlayout/Manifest
@@ -0,0 +1,3 @@
+DIST TGGL_122_jre11.zip 202777 BLAKE2B 108b09934a5463460147f82409b09d5d2e755ac30996c6bffbfe07b89abea11d2c609e2d9f6d79ed4f425961898cdf3a8b46a8b7ee2191782d96f5cb5496cf42 SHA512 5c638972264ada2cb91ea1667c0b770629120a01496f7834ef3e4999ad5867ff911e772ea1361e33c168d8681c6f19f46ada33ea637daf4474f66a5cc97610a5
+EBUILD touchgraph-graphlayout-1.22-r1.ebuild 639 BLAKE2B 10886a1e536461546a6f066cd4d5d9172be684f631987b1b5bac60840329dd7f8a3ffc593e9ef7ab240be7fad463bdb1db789b52d6d208ccbc79cd77ed13cb82 SHA512 543beb1f93c8a8c194bc900bf89a6d2d0569e200cdb9bb82a49035a5803ec6f9d38cede2aa95912a7feb6c206447f5132029dba47a642c6cd83800a7d547dcd5
+MISC metadata.xml 316 BLAKE2B f368004d8bf0f3f4b836ce366f5474629d0f2e77ba031ff48236bb8173bd24e64cefd109615bc52edbcaeac634f381359493293f7a262c24585f03393209ef72 SHA512 aad7058d0838227cb1bd18470dea28eeaceeb4a07a36a7cd86964ea77a7a3cebadef9af42a99fe817618f5d3f2fe7fd1703fe6752561057a5cd8fd83bddfa26b
diff --git a/dev-java/touchgraph-graphlayout/metadata.xml b/dev-java/touchgraph-graphlayout/metadata.xml
new file mode 100644
index 000000000000..52b243489488
--- /dev/null
+++ b/dev-java/touchgraph-graphlayout/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">touchgraph</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
new file mode 100644
index 000000000000..252ec5063ff4
--- /dev/null
+++ b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="TGGraphLayout"
+
+DESCRIPTION="TouchGraph provides a set of interfaces for graph visualization"
+HOMEPAGE="http://touchgraph.sourceforge.net"
+SRC_URI="mirror://sourceforge/touchgraph/TGGL_${PV//./}_jre11.zip"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_PN}"
+
+JAVA_SRC_DIR="com"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc "TGGL ReleaseNotes.txt"
+}
diff --git a/dev-java/treelayout-1.0.2 b/dev-java/treelayout-1.0.2
deleted file mode 100644
index fc457d4e29bf..000000000000
--- a/dev-java/treelayout-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Efficiently create compact tree layouts in Java
-EAPI=5
-HOMEPAGE=https://github.com/abego/treelayout
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/abego/treelayout/archive/v1.0.2.tar.gz -> treelayout-1.0.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0bede0c19e35672400b1c787a3673ae6
diff --git a/dev-java/treelayout/Manifest b/dev-java/treelayout/Manifest
new file mode 100644
index 000000000000..93cfe145f590
--- /dev/null
+++ b/dev-java/treelayout/Manifest
@@ -0,0 +1,3 @@
+DIST treelayout-1.0.2.tar.gz 1007086 BLAKE2B c5ef3f0bc2a7c99a983f648efcca65a4a4fd9d72710b7a1a8263629435da6a79a328778983475565dfc23738978bf658067e3e63e7c36db84a54189821c0da07 SHA512 89a627d8ab2f248bb9b22139de0a28f310deb555f78825f29f4acfd0df7b4c212c8df241b004f8452a4be8a0f7717ee996df3eef4dd88ca905f4ad211df92655
+EBUILD treelayout-1.0.2.ebuild 973 BLAKE2B 6a8196aa981ba9342bb3edbf0ad9e64ca30a07a71d9a410d370ce3163b216f5751e57e8045336c3abbf1cbfd4b4037bbc1f6a98a5c3ff89a9a2f5d43a7dda0a5 SHA512 24e85b8d21357b9816190b0a28c51a131dd38d24e7916fe2beb23bbf6a9d0a3e6f4e4f252216146313b202a0088d36cbea1161fab088a67b6fab99e5bd5995b3
+MISC metadata.xml 677 BLAKE2B d1ed5c57f1b7ca4678e569abeefa3fe9ef1fe8113b6152ce27d5daa34faf84a90a612b3cc7f6f4977015cacb71c55457f2e4b26a5d5d07dc25424b8e3cb9bc7d SHA512 2abe1f3836f0efbfa2d52873e93d396b496e4bf52b7b0ac2b7c1641329a7756a04295a6600473160b863dc64866dbd2d69b8443599090dd36a77dee99fc9d42b
diff --git a/dev-java/treelayout/metadata.xml b/dev-java/treelayout/metadata.xml
new file mode 100644
index 000000000000..9012e398b6b9
--- /dev/null
+++ b/dev-java/treelayout/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>The TreeLayout creates tree layouts for arbitrary trees. It is not restricted to a specific output or format, but can be used for any kind of two dimensional diagram. Examples are Swing based components, SVG files, and many more. This is possible because TreeLayout separates the layout of a tree from the actual rendering.</longdescription>
+	<upstream>
+		<remote-id type="github">abego/treelayout</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/treelayout/treelayout-1.0.2.ebuild b/dev-java/treelayout/treelayout-1.0.2.ebuild
new file mode 100644
index 000000000000..5bd891235098
--- /dev/null
+++ b/dev-java/treelayout/treelayout-1.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Efficiently create compact tree layouts in Java"
+SRC_URI="https://github.com/abego/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/abego/treelayout"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc64 x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}/org.abego.${PN}"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_PKG_BSFIX_NAME="build-impl.xml"
+EANT_BUILD_XML="nbproject/build-impl.xml"
+
+src_configure() {
+	EANT_EXTRA_ARGS="-Dplatform.home=${JAVA_HOME}"
+}
+
+src_install() {
+	java-pkg_newjar dist/org.abego.${PN}.core.jar
+	dodoc CHANGES.txt doc/abegoTreeLayout.pdf
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src/main/java/*
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/trident-1.3 b/dev-java/trident-1.3
deleted file mode 100644
index 951577181a40..000000000000
--- a/dev-java/trident-1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/swt:3.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java animation library
-EAPI=5
-HOMEPAGE=https://kenai.com/projects/trident/pages/Home
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/swt:3.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://kenai.com/projects/trident/downloads/download/version%201.3%20-%20stable/trident-all.zip -> trident-1.3.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2f80b86c7c62e5e4588953bc93f543a5
diff --git a/dev-java/trident/Manifest b/dev-java/trident/Manifest
new file mode 100644
index 000000000000..0aad2d0124b4
--- /dev/null
+++ b/dev-java/trident/Manifest
@@ -0,0 +1,4 @@
+AUX 1.3-build.xml.patch 2112 BLAKE2B e014eb8632086256f7abf0068bc076b544dae4e4bcb1f8ffb7cd7ea132d87663f44e672aef93e6d18071d555486f9e526a70d2436d72c26c75592b82636310d1 SHA512 f4790f0f7551d2734c0db2495c1dff5f6580c1734aab596fd0e419447b8c085d3ba2b4010dea972e6e3c400141d619a10baed10a2d4b8f4135e9855e9ec9b6e6
+DIST trident-1.3.zip 112050 BLAKE2B 62f5ae9266714524c50e92c00d3d13810d47727596b0247786c056490b5366015fd35b2e859925734eae26c01b8070474d24e0770ac2eb644024f32754a6c5b7 SHA512 2ecccf80c654ad8cff6a2907d4f81409034bd5cc07542e87db7b53a646fb63ee38a472eb778f6f77f6cf1885f8dc5b85d50a6a033ab430e7e03a07000463f68b
+EBUILD trident-1.3.ebuild 998 BLAKE2B 8356f3bfcfc2e909b897738f4b40bf23e01eda8b8aa2aee5b8a62e8db2c6ff24ce849567e0a70260db1ca71a3a89e295ba7bf95884e1edc4c9bbdb3e790829ae SHA512 859285924da73f45e601a0cb9553e301f908718f79cce6ad104688fc8f9486f13324ea8cb8aaabe212184e0004671c01b9edede2ffcbc128787243159c804282
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/trident/files/1.3-build.xml.patch b/dev-java/trident/files/1.3-build.xml.patch
new file mode 100644
index 000000000000..c82c3a18df3f
--- /dev/null
+++ b/dev-java/trident/files/1.3-build.xml.patch
@@ -0,0 +1,29 @@
+diff --git a/build.xml b/build.xml
+index 808ea3c..36e5859 100644
+--- a/build.xml
++++ b/build.xml
+@@ -84,7 +84,7 @@
+ 

+ 	<target name="compile.module.trident.production" description="compile module trident production classes">

+ 		<mkdir dir="${trident.output.dir}" />

+-		<javac source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" destdir="${trident.output.dir}" debug="${javac.debug}" nowarn="${javac.generate.no.warnings}" memoryMaximumSize="${javac.max.memory}" fork="true" executable="${module.jdk.home.trident}/bin/javac">

++		<javac source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" destdir="${trident.output.dir}" debug="${javac.debug}" nowarn="${javac.generate.no.warnings}" memoryMaximumSize="${javac.max.memory}" fork="true">

+ 			<compilerarg line="${javac.args.trident}" />

+ 			<bootclasspath refid="trident.module.bootclasspath" />

+ 			<classpath refid="trident.module.classpath" />

+@@ -102,7 +102,7 @@
+ 

+ 	<target name="compile.module.trident.test" description="compile module trident test classes">

+ 		<mkdir dir="${trident.output.dir}" />

+-		<javac source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" destdir="${trident.output.dir}" debug="${javac.debug}" nowarn="${javac.generate.no.warnings}" memoryMaximumSize="${javac.max.memory}" fork="true" executable="${module.jdk.home.trident}/bin/javac">

++		<javac source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" destdir="${trident.output.dir}" debug="${javac.debug}" nowarn="${javac.generate.no.warnings}" memoryMaximumSize="${javac.max.memory}" fork="true">

+ 			<compilerarg line="${javac.args.trident}" />

+ 			<bootclasspath refid="trident.module.bootclasspath" />

+ 			<classpath refid="trident.module.classpath" />

+@@ -189,4 +189,4 @@
+ 	<target name="clean" depends="clean.module.trident" description="cleanup all" />

+ 

+ 	<target name="all" depends="timestamp, init, clean, compile.module.trident, jar, compile.module.trident.test, jar-tst" description="build all" />

+-</project>
+\ No newline at end of file
++</project>

diff --git a/dev-java/trident/metadata.xml b/dev-java/trident/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/trident/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/trident/trident-1.3.ebuild b/dev-java/trident/trident-1.3.ebuild
new file mode 100644
index 000000000000..4310cd5b1f56
--- /dev/null
+++ b/dev-java/trident/trident-1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java animation library"
+HOMEPAGE="https://kenai.com/projects/trident/pages/Home"
+SRC_URI="https://kenai.com/projects/trident/downloads/download/version%20${PV}%20-%20stable/${PN}-all.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RESTRICT="test"
+
+CDEPEND="dev-java/swt:3.7"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="timestamp init clean compile.module.trident jar"
+EANT_GENTOO_CLASSPATH="swt-3.7"
+EANT_EXTRA_ARGS="-Djdk.home=${JAVA_HOME}"
+
+java_prepare() {
+	mkdir build/classes -p || die
+	rm -r src/org/pushingpixels/trident/android/ || die
+	epatch "${FILESDIR}"/${PV}-*.patch
+}
+
+src_install() {
+	java-pkg_dojar drop/${PN}.jar
+
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/trove-3.0.2-r3 b/dev-java/trove-3.0.2-r3
deleted file mode 100644
index 747729c72fc4..000000000000
--- a/dev-java/trove-3.0.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=GNU Trove: High performance collections for Java
-EAPI=6
-HOMEPAGE=http://trove4j.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/trove4j/trove-3.0.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7c6250b94795ca945b80c453557fdf05
diff --git a/dev-java/trove/Manifest b/dev-java/trove/Manifest
new file mode 100644
index 000000000000..6064f06e6989
--- /dev/null
+++ b/dev-java/trove/Manifest
@@ -0,0 +1,3 @@
+DIST trove-3.0.2.tar.gz 5880161 BLAKE2B a3dbb6a967ad9a519bd04abbbbf9e6af483360991956ff79532462a9ad471d409744017a3b24e4a09d2377243406e5d7cd542b452da8f59a1a97b454a2f60a8c SHA512 27460a66bad6f206eaeae02453c94333456db5a9c566246d495fb4184d42de6033b66d1bf74060f799cf4298d531afeb9597b92da4e2963b43dd4ef072ee750b
+EBUILD trove-3.0.2-r3.ebuild 804 BLAKE2B a45abfcf97789427544d1b181d6f1b1d1ae5b282ff6e4037ae7ccd4698d99e4d1d39a32521fbe7fea573b816428246c107e4684161eac702d7a947dae4702274 SHA512 fa0cea4d9739bbc1f3624de5b9032822b14c787321b6317b0ee1d078eb533fdedf053722b9800b532bdb93ec5647e28cc2d4f543d79bc228e34549516c3f9f48
+MISC metadata.xml 313 BLAKE2B 033a387e2850f70d371e4362736a66f796d8aa33ab9c46dc4d49a919533c0d9f6cf55588a58ae3d9a413cec5c98daaa65530e095dad86154d467a1749cd02b59 SHA512 8d83dca7ca9717cd91fab6805a9ec4fdab65161643d583cfe2134fbcbaea07ceb236773e88365b137a6e2fb5215c821f54955dd641d0037025b826d29ec0d2de
diff --git a/dev-java/trove/metadata.xml b/dev-java/trove/metadata.xml
new file mode 100644
index 000000000000..9aad7e757182
--- /dev/null
+++ b/dev-java/trove/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">trove4j</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/trove/trove-3.0.2-r3.ebuild b/dev-java/trove/trove-3.0.2-r3.ebuild
new file mode 100644
index 000000000000..2fb1f501a0cd
--- /dev/null
+++ b/dev-java/trove/trove-3.0.2-r3.ebuild
@@ -0,0 +1,40 @@
+# 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="GNU Trove: High performance collections for Java"
+SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
+HOMEPAGE="http://trove4j.sourceforge.net"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PV}"
+
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	mv "${PV}/${P}-src.jar" . || die
+	rm -rf "${PV}" || die
+	mkdir "${P}" || die
+	unzip -d "${P}" -qq "${P}-src.jar" || die
+	export S="${WORKDIR}/${P}"
+}
+
+src_prepare() {
+	default
+	find . -type f ! -name "*.java" -exec rm -v {} \; || die
+}
diff --git a/dev-java/txw2-runtime-20110809 b/dev-java/txw2-runtime-20110809
deleted file mode 100644
index 4a94659c5593..000000000000
--- a/dev-java/txw2-runtime-20110809
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=TXW is a library that allows you to write XML documents
-EAPI=5
-HOMEPAGE=https://txw.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/com/sun/xml/txw2/txw2/20110809/txw2-20110809-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=01a6b43b243ad6b77066aabda54ea780
diff --git a/dev-java/txw2-runtime/Manifest b/dev-java/txw2-runtime/Manifest
new file mode 100644
index 000000000000..5a50ab91ca4c
--- /dev/null
+++ b/dev-java/txw2-runtime/Manifest
@@ -0,0 +1,3 @@
+DIST txw2-20110809-sources.jar 96939 BLAKE2B 1f132eff17058b833d4b1e55930c2aa0bc5bc6a744dfa68daf83e07c9babc6a0298deff57c19e178fda6e618e0adbbd3dda98246af3cf55829348cbc239917d5 SHA512 1f0779b0c0f38a0a71f495a6167876fa7df1de7a38343717edcc50d54df45c98c47eeed30c692de68e9c9a7f217cde463288e73a6d274f732578550220c27fc8
+EBUILD txw2-runtime-20110809.ebuild 578 BLAKE2B 439f995592ae3240688c27216dd28dd15341769180d05cece561e3255f4d79a6f4ad84e9f121e667d3ad7961683c6a598ef7b172128011b47b44191aa6c4834f SHA512 5b8295c11c2fd42ba8a814963c45aab5d33273830b223db683d4be53a6daeb0f365590ae482d8081f82487b0f5ad5ccb0619ac9408eb12444ef5dd5234bf261d
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/txw2-runtime/metadata.xml b/dev-java/txw2-runtime/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/txw2-runtime/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild b/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild
new file mode 100644
index 000000000000..b3e9baf6d521
--- /dev/null
+++ b/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="TXW is a library that allows you to write XML documents"
+HOMEPAGE="https://txw.dev.java.net/"
+SRC_URI="http://central.maven.org/maven2/com/sun/xml/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+JAVA_SRC_DIR="com"
diff --git a/dev-java/typesafe-config-1.2.1 b/dev-java/typesafe-config-1.2.1
deleted file mode 100644
index ba079153adc4..000000000000
--- a/dev-java/typesafe-config-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/zip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A library of arguably useful Java utilities
-EAPI=5
-HOMEPAGE=https://github.com/typesafehub/config
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/typesafehub/config/archive/v1.2.1.zip -> typesafe-config-1.2.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b0ccde796d9b1769cbfbfca6016c42b8
diff --git a/dev-java/typesafe-config-1.3.0-r2 b/dev-java/typesafe-config-1.3.0-r2
deleted file mode 100644
index fe42a8a8a8a7..000000000000
--- a/dev-java/typesafe-config-1.3.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 app-arch/zip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A library of arguably useful Java utilities
-EAPI=5
-HOMEPAGE=https://github.com/typesafehub/config
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/typesafehub/config/archive/v1.3.0.zip -> typesafe-config-1.3.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0fd4adbd85e38551ff06e8af47e10b02
diff --git a/dev-java/typesafe-config/Manifest b/dev-java/typesafe-config/Manifest
new file mode 100644
index 000000000000..d0f0c8b4e6c6
--- /dev/null
+++ b/dev-java/typesafe-config/Manifest
@@ -0,0 +1,5 @@
+DIST typesafe-config-1.2.1.zip 287878 BLAKE2B bf4d1001bb84d0102b91b7ff383d9313302d95fd854928a40ecfbaae7a18309cf3f8509af0968fa21cedc485a1691c135395ccea5f9e6ba1c94856f2bb7ce81c SHA512 178f0df81f081b9355951debd3a5435c7d6aae25893f049917a25861015eba18a305d5370d914b89a7c46e55b5d9f3939ddd0656cfa9a4691bd16cf32c796502
+DIST typesafe-config-1.3.0.zip 363061 BLAKE2B 94c3f1f4eaaa831a15ef10619b672fb1882cfc472ab4d4ebb3494805f281152f7d01c56cee5f06a70319822d3e4254d540d4a5dde0f1c321b79fc4fbc18da6b8 SHA512 8b9821de442dc24b8b7be4c5ebc91d57214a32dceda8dc160cfaf801f70b34d2a2df6f8b2cbb744d18be3fbc887f1666f431b52882edcbde408d8adf3681fec4
+EBUILD typesafe-config-1.2.1.ebuild 513 BLAKE2B 4ffefc33dd21ce468a19f2e1ff4dd05859bbfa19d7580cd4c24b3502bb98cee083f6e89e5cc53977cda5b4cd8b60350e867492916136b02b872a5b3c1d0232df SHA512 3325f637f60431c531ecdfdc8f865c83d11efc5c42a91fd36dcbbb6c42267381736cbdbc44cf4d9be97fbaad9dc32d24d986b06b6755713046a4946e275ce20c
+EBUILD typesafe-config-1.3.0-r2.ebuild 509 BLAKE2B f0696ec35b225513b6752aa0b00a2ef9de02953ba1ccc33f534f4b47626d8ab83e613a83c89935f9cdc6a1bb8561fd763db52acf53304e8f05437a7e0185d099 SHA512 1929afe71a44f7a2d1cc6907de131887c7adfd60b947dc5be85c66bb4e25888c03aef87faba5cbcb39f18bb5c20eca908da23c9a01d83b9e64b56eb3704ba531
+MISC metadata.xml 329 BLAKE2B 81388ae70dc17275e60d222ce636859b7f6dd9d58a3754018cdd648720d58549ada91a444fa92bdb0bb4750e23d98643334119a06044d490883087a6659fe25e SHA512 3cd9eea5ad8ba9ff81a44829541064af00336c217a17cfdd95dc0384211de25884054d2b45af68f333655c5dd469fc44f27245a74d0d0aa136941b017fc8bc5a
diff --git a/dev-java/typesafe-config/metadata.xml b/dev-java/typesafe-config/metadata.xml
new file mode 100644
index 000000000000..c3532e38e4f6
--- /dev/null
+++ b/dev-java/typesafe-config/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">typesafehub/config</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild b/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild
new file mode 100644
index 000000000000..e845f4083571
--- /dev/null
+++ b/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library of arguably useful Java utilities"
+HOMEPAGE="https://github.com/typesafehub/config"
+SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/zip"
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..af863fe4372a
--- /dev/null
+++ b/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library of arguably useful Java utilities"
+HOMEPAGE="https://github.com/typesafehub/config"
+SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.8"
+
+DEPEND=">=virtual/jdk-1.8
+	app-arch/zip"
diff --git a/dev-java/unkrig-nullanalysis-0_pre1644 b/dev-java/unkrig-nullanalysis-0_pre1644
deleted file mode 100644
index faaabbd10e33..000000000000
--- a/dev-java/unkrig-nullanalysis-0_pre1644
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Some classes to test for various null conditions
-EAPI=5
-HOMEPAGE=http://commons.unkrig.de
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c1e3e967e811cb6a8506aaf8f196e00c
diff --git a/dev-java/unkrig-nullanalysis/Manifest b/dev-java/unkrig-nullanalysis/Manifest
new file mode 100644
index 000000000000..b81dd66a9512
--- /dev/null
+++ b/dev-java/unkrig-nullanalysis/Manifest
@@ -0,0 +1,3 @@
+DIST unkrig-nullanalysis-0_pre1644.tar.bz2 2322 BLAKE2B 49873e7c5eaa6b367350f3569d4d36945222b8048ed67fa7c77337133d67b68dda5344057fe80caaf34e54378da579e0525179e72ac8ef88865571c0381a2d14 SHA512 6e4f069023043ac24f7e68f748ad4c6cfaf16312310abfd9c6d395b34491b68a7c3cca6b3a36b18c4dd656cc15f17755dbd4ce3e6379da06f82a2691453c3c03
+EBUILD unkrig-nullanalysis-0_pre1644.ebuild 491 BLAKE2B 7df6f21d39725143579e9465b55ddbd8be15b31fde4c73d26303bf44425d888854d6349e3e7343c0ae04425f8b056aa54352f6fcce19d8677143b2b32fb41591 SHA512 3e04419c0b8ee9085de9ef6312b3ed2c262e8115173a5df4d3ad67b961e42c6f6c74ed8db7c9f7e0dd7ce3dadd9fd7434d1e28856ee7e12456068241e06636d3
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/unkrig-nullanalysis/metadata.xml b/dev-java/unkrig-nullanalysis/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/unkrig-nullanalysis/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild b/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild
new file mode 100644
index 000000000000..a47290e3483e
--- /dev/null
+++ b/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Some classes to test for various null conditions"
+HOMEPAGE="http://commons.unkrig.de"
+SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+JAVA_SRC_DIR="src"
diff --git a/dev-java/upnplib-1.0.7 b/dev-java/upnplib-1.0.7
deleted file mode 100644
index fe1ef1af778a..000000000000
--- a/dev-java/upnplib-1.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/commons-jxpath:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=UPnP port mapping library for Java based on sbbi-upnplib
-EAPI=5
-HOMEPAGE=https://github.com/RPTools/upnplib
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=virtual/jre-1.7 dev-java/commons-jxpath:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/RPTools/upnplib/archive/33d17845e34c7c8b897224d0d1c243951398f853.tar.gz -> upnplib-1.0.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=75c7a6d103415791b2c681ecbb2c1c01
diff --git a/dev-java/upnplib/Manifest b/dev-java/upnplib/Manifest
new file mode 100644
index 000000000000..7af9b70d4288
--- /dev/null
+++ b/dev-java/upnplib/Manifest
@@ -0,0 +1,3 @@
+DIST upnplib-1.0.7.tar.gz 349943 BLAKE2B 509474e1478a791ef01d70380976e17628a8c68115b068602875091d3b10c1c2ecfcd4be6b7917d9605da8c4c7ef6da8437c3dd905811513c42f132789071a31 SHA512 b44d1f539ebf2ff3860f3d3fd664343148c81437a6e3fb69f2941c6dafcdf9a48a1f682d8ed250848edc656dc38858cf3a630dc026e9e3be340ef5b39fd7b8cd
+EBUILD upnplib-1.0.7.ebuild 894 BLAKE2B 6c748e74c39f7d85de37f2009a06b9730f7564c5736e09b848ebf6188cbd5b3b6d473ff7053f75829f792089946fa5a8e9316e53e6bd2ddfc71ef5e2f019c135 SHA512 e178fa93e7c923e7b002aa41ae1e740c2501bf7b4d4f6132e8b23f7557afb857c4885506b38e963cf443ac64a74890351722505c7c9827a7d9c1a0850977965a
+MISC metadata.xml 316 BLAKE2B 0737bb488f621820dbe5b0cf5514d5e2016e1b1a5b4b72a0d4f5990a1e3f3ad43a5e647bd409a9d2392c02d7d6421a122ae3567db43f2ed584b9aabdaa7a3660 SHA512 1397f2315f70f90e11ee43e9ed0b1dc243ed06329933a3adc2320e8423c33f478f2f7f9bc69b4e7429d85c861697feca37d500d3e1ec90bcfcc74240a22fea16
diff --git a/dev-java/upnplib/metadata.xml b/dev-java/upnplib/metadata.xml
new file mode 100644
index 000000000000..1dd6ecadb95d
--- /dev/null
+++ b/dev-java/upnplib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">RPTools/upnplib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/upnplib/upnplib-1.0.7.ebuild b/dev-java/upnplib/upnplib-1.0.7.ebuild
new file mode 100644
index 000000000000..b9406fece2ba
--- /dev/null
+++ b/dev-java/upnplib/upnplib-1.0.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+COMMIT="33d17845e34c7c8b897224d0d1c243951398f853"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="UPnP port mapping library for Java based on sbbi-upnplib"
+HOMEPAGE="https://github.com/RPTools/upnplib"
+SRC_URI="https://github.com/RPTools/upnplib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/commons-jxpath:0
+	dev-java/log4j:0"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="commons-jxpath,log4j"
+JAVA_SRC_DIR="src"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+java_prepare() {
+	# mx4j has been last-rited.
+	rm -rv src/net/sbbi/upnp/jmx/ || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use doc && dodoc README.md docs/html/*.pdf
+}
diff --git a/dev-java/validation-api-1.1.0 b/dev-java/validation-api-1.1.0
deleted file mode 100644
index 5a763000cee6..000000000000
--- a/dev-java/validation-api-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Bean Validation (JSR-303) API
-EAPI=5
-HOMEPAGE=http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=https://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar -> validation-api-1.1.0.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=84b0be6a7cd0a0a6714241b9b7675944
diff --git a/dev-java/validation-api/Manifest b/dev-java/validation-api/Manifest
new file mode 100644
index 000000000000..5c520419c407
--- /dev/null
+++ b/dev-java/validation-api/Manifest
@@ -0,0 +1,3 @@
+DIST validation-api-1.1.0.jar 94671 BLAKE2B c28f6b2ca52094f33e82d2e7c71e52ef57c503c5d50f34646ee28a9f61ea7e4da7f494f41b5f8a34ce6108ca1b75fa2d0f08eb9aab15cf033e825afc2eefdf19 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8
+EBUILD validation-api-1.1.0.ebuild 557 BLAKE2B 85ffd53d4c49e2822e32425717daff1d3bd7c8b734eadf082ecd9cc1faaece990ac557cc8b2610cfb69ac2c6500a0c14248a8d6a8cbe8e48bb1e07a5c4687820 SHA512 0145dad1a8a358d64a9f9e65c5dfca7da5a95bfb066027ef94b07cbfee1f4f59be7cfa3b1b0ac6163674ee84f2cc190a7e7903fac746d2b834e1043dcef0e85d
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/validation-api/metadata.xml b/dev-java/validation-api/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/validation-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/validation-api/validation-api-1.1.0.ebuild b/dev-java/validation-api/validation-api-1.1.0.ebuild
new file mode 100644
index 000000000000..19740c19abb0
--- /dev/null
+++ b/dev-java/validation-api/validation-api-1.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bean Validation (JSR-303) API"
+HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA"
+SRC_URI="https://repo1.maven.org/maven2/javax/validation/${PN}/${PV}.Final/${P}.Final-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
diff --git a/dev-java/vecmath-1.6.0_pre12 b/dev-java/vecmath-1.6.0_pre12
deleted file mode 100644
index e46faf020893..000000000000
--- a/dev-java/vecmath-1.6.0_pre12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/ant-core >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Sun J3D: 3D vector math package
-EAPI=5
-HOMEPAGE=https://vecmath.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/hharrison/vecmath/archive/1.6.0-pre12.tar.gz -> vecmath-1.6.0_pre12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=50f4b389050a187f8eeda3446df1c448
diff --git a/dev-java/vecmath/Manifest b/dev-java/vecmath/Manifest
new file mode 100644
index 000000000000..57c27a809274
--- /dev/null
+++ b/dev-java/vecmath/Manifest
@@ -0,0 +1,3 @@
+DIST vecmath-1.6.0_pre12.tar.gz 121968 BLAKE2B d93e159a5d235ebf3724880ba19195466955844272e6ebcd4f59061967305e2bc63bef21d651aab3f8998358816602ea529b7d25f71a9b030e74594ee3a983b5 SHA512 b885a83b91af7c3560e7f8e94d7a8da3b00ad7db4a0f2edef19c1525fe7ae48e897d865ef2bb64800bde197bc9c969517c9c526d6ed27d25cfe87815a64bc5d7
+EBUILD vecmath-1.6.0_pre12.ebuild 804 BLAKE2B 41322635fd87a0ddb313010052ef7ed0ed26c713dc1b4e60ecd6d00bd14a6672e724450a954f439e38df8f0fa9ad96c5c0ce88ca910d9f6ff776b7b01739ec83 SHA512 da7f20c953d40b1ee5920132823cbd657712e99cf814e017c685de5a48e6220b30ba81064738ecd84df67a2f5bc01c7af0a854879eff68a5021e303b63f92ee1
+MISC metadata.xml 405 BLAKE2B 3f8eb80b854cf3b3f8de935d3c27ed68ac216ec6de9d353e6803984ba7233b0cf7294dc5ea7abbfc0ab4fa10a6dd5a3c8630198a8225df51988264eb5377a3d8 SHA512 a133b08ff3f6125ba1f3b7bae14f62b9615f1588a54a9c9d44f4c6598616766d7e54610e616f0d2687aa3e6cb36ebaf924a6b3acc1f73c66aff5f7cb7c176ead
diff --git a/dev-java/vecmath/metadata.xml b/dev-java/vecmath/metadata.xml
new file mode 100644
index 000000000000..fc75a8b361f3
--- /dev/null
+++ b/dev-java/vecmath/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+	3D vector math package, javax.vecmath
+</longdescription>
+	<upstream>
+		<remote-id type="github">hharrison/vecmath</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/vecmath/vecmath-1.6.0_pre12.ebuild b/dev-java/vecmath/vecmath-1.6.0_pre12.ebuild
new file mode 100644
index 000000000000..a6cfc8778ec7
--- /dev/null
+++ b/dev-java/vecmath/vecmath-1.6.0_pre12.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Sun J3D: 3D vector math package"
+HOMEPAGE="https://vecmath.dev.java.net/"
+
+MY_PV=$(replace_version_separator 3 '-')
+SRC_URI="https://github.com/hharrison/vecmath/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+	dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+EANT_DOC_TARGET="docs"
+EANT_BUILD_TARGET="jar"
+
+src_install() {
+	java-pkg_dojar "build/jars/${PN}.jar"
+
+	use source && java-pkg_dosrc "${S}/src/*"
+
+	dodoc *.txt docs/*.txt
+	if use doc; then
+		java-pkg_dojavadoc "build/javadoc/"
+		dohtml -r *.html
+	fi
+}
diff --git a/dev-java/velocity-1.7-r2 b/dev-java/velocity-1.7-r2
deleted file mode 100644
index 5a577d7244c9..000000000000
--- a/dev-java/velocity-1.7-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/jdom:0 dev-java/log4j:0 dev-java/ant-core:0 dev-java/werken-xpath:0 dev-java/jakarta-oro:2.0 dev-java/avalon-logkit:2.0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/commons-collections:0 java-virtuals/servlet-api:2.3 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java framework for easy creation/rendering of documents
-EAPI=5
-HOMEPAGE=http://velocity.apache.org
-IUSE=test elibc_FreeBSD examples doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jdom:0 dev-java/log4j:0 dev-java/ant-core:0 dev-java/werken-xpath:0 dev-java/jakarta-oro:2.0 dev-java/avalon-logkit:2.0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/commons-collections:0 java-virtuals/servlet-api:2.3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/velocity/engine/1.7/velocity-1.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f6738a10cdc4c5e284fa94cb46fefd7b
diff --git a/dev-java/velocity-dvsl-1.0 b/dev-java/velocity-dvsl-1.0
deleted file mode 100644
index 80234b03a48f..000000000000
--- a/dev-java/velocity-dvsl-1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/ant-core:0 dev-java/dom4j:1 dev-java/velocity:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Declarative Velocity Style Language.
-EAPI=5
-HOMEPAGE=http://velocity.apache.org/dvsl/devel/
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-core:0 dev-java/dom4j:1 dev-java/velocity:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/velocity/dvsl/1.0/velocity-dvsl-1.0-src.zip -> velocity-dvsl-1.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6bcb23959a562c6f52d60347ad9c4e93
diff --git a/dev-java/velocity-dvsl/Manifest b/dev-java/velocity-dvsl/Manifest
new file mode 100644
index 000000000000..328b29ac8752
--- /dev/null
+++ b/dev-java/velocity-dvsl/Manifest
@@ -0,0 +1,3 @@
+DIST velocity-dvsl-1.0.zip 91539 BLAKE2B 747c735804b24d6d775c658e505a5fbe22289e98ede55577354da7ec0a7908031312febeef8f698aba033d0c9b1553b4e46eb6a5cbf6683ba4f16f87b178fa32 SHA512 0f431347706143a76d93d58f44a534a566780e27ba3ec43e48e4268b88a5fc523850a693800b730bee3a26d1c03339b24603f7eacabf716d199a9974d95c1d01
+EBUILD velocity-dvsl-1.0.ebuild 907 BLAKE2B 6c9f6d111248907a9d1df34d64aef9029d51ad0c213d2d09f2985359ee51c8c891f150a558cfe4ab6cda6cd3b05b11e50547ce17b2978be2108e865010b2a327 SHA512 084301cf6bbae94261e0ca65ba69c3d4c6631cb98ff2ba93d912d349681a0e10609e80c736fb76307ac6d79abc36382742335ec5b5b97fa52b466f5e446aa686
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/velocity-dvsl/metadata.xml b/dev-java/velocity-dvsl/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/velocity-dvsl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
new file mode 100644
index 000000000000..42c7d261a5bc
--- /dev/null
+++ b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Declarative Velocity Style Language."
+HOMEPAGE="http://velocity.apache.org/dvsl/devel/"
+SRC_URI="mirror://apache/velocity/dvsl/${PV}/${P}-src.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RESTRICT="test"
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/dom4j:1
+	dev-java/velocity:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="
+	dom4j-1
+	ant-core
+	velocity
+"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rv src/test || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher "${PN}" --main org.apache.dvsl.DVSL
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
new file mode 100644
index 000000000000..c8c029c6844d
--- /dev/null
+++ b/dev-java/velocity/Manifest
@@ -0,0 +1,3 @@
+DIST velocity-1.7.tar.gz 5882643 BLAKE2B 4c1499bb015fe1c6b87257a60d247b1b0fb8558e6f879a3d04cf9ef0561ed69b89491c9ebba55cc54d14f6d377b300ee0f7e55ae4118236bba60dc632b5686b3 SHA512 542c9cc0efa118693bf1c952ac4b0c7c3d0229ef804afaa4f0f1c01ad40b0112055c21df7f800c302bf173d58461a864b29b9bc4b9174029d9748f88f2fcf9ab
+EBUILD velocity-1.7-r2.ebuild 1158 BLAKE2B fd1b951233aa2b2c141bb49d4835d04cf089239ebc6445d8f21bb7e5927bbc952f0ab53456e0ac122e3d4669ff792f5b0414d8931c35d553be921f67dfefb061 SHA512 64a0917d557e3e9b8fb0621d853c72be3b5ec51cbc9694f32e69d322a313a31ee3492049c70e1f5b0ce61eff4262372f94b641371cf15a235567d4805f02483f
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/velocity/metadata.xml b/dev-java/velocity/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/velocity/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
new file mode 100644
index 000000000000..fd655d63ddbc
--- /dev/null
+++ b/dev-java/velocity/velocity-1.7-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="examples doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java framework for easy creation/rendering of documents"
+HOMEPAGE="http://velocity.apache.org"
+SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="
+	dev-java/jdom:0
+	dev-java/log4j:0
+	dev-java/ant-core:0
+	dev-java/werken-xpath:0
+	dev-java/jakarta-oro:2.0
+	dev-java/avalon-logkit:2.0
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/commons-collections:0
+	java-virtuals/servlet-api:2.3
+"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	jdom
+	log4j
+	ant-core
+	werken-xpath
+	jakarta-oro-2.0
+	servlet-api-2.3
+	commons-logging
+	commons-lang-2.1
+	avalon-logkit-2.0
+	commons-collections
+"
+
+JAVA_SRC_DIR="src"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rv test src/test || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/vldocking-3.0.5 b/dev-java/vldocking-3.0.5
deleted file mode 100644
index 252ae4e58ab3..000000000000
--- a/dev-java/vldocking-3.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/slf4j-log4j12:0 dev-java/slf4j-api:0 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Docking solution for Java Swing
-EAPI=5
-HOMEPAGE=https://github.com/cmadsen/vldocking
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RDEPEND=dev-java/slf4j-log4j12:0 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/cmadsen/vldocking/archive/vldocking-3.0.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c53dae5bd83796c6b49ebcdf6b6d1e9d
diff --git a/dev-java/vldocking/Manifest b/dev-java/vldocking/Manifest
new file mode 100644
index 000000000000..57dc4b15807e
--- /dev/null
+++ b/dev-java/vldocking/Manifest
@@ -0,0 +1,3 @@
+DIST vldocking-3.0.5.zip 1734159 BLAKE2B 98ff048558b2c520192b83e56c4900072761c8e0f80d594b2166b10249cf6ba572102070914ca417879609f9b9ebb75a5fbd6d460859f131c2f4a403058d8f5d SHA512 a9943a767baa68b8cd8a75fad1e6e05e6f0083551c32c9af2b20258e2fe1fcc181a7700cc668b862e0cc2b04392a987ecfb92bf5203f273c72a8e2a2f4a72cd8
+EBUILD vldocking-3.0.5.ebuild 641 BLAKE2B 5befa88a850b73e7bd7493558819eeccdbf60d9db35cc5a5afe8f43375006c5630b3d3e603dd7a33e4d9718a8a7b25bcf9795b129982b44b8771a236f4728109 SHA512 8f95ffb948230631b6eb638279722a129f0130217360d9b72bb28f08155429fa583db491be5536ee9ad9384de5ea800730f13f4d4a4f3be6e40e5297b5fb4b75
+MISC metadata.xml 429 BLAKE2B 29fb4665fa9f45b84fd39fbaa3ef9aca742a73e793144a1b0b425d0fe5ecac37d99856d80333d1d1a5df701d38638e7a970ea6fd5f194b0b824b6a02af4e4dfc SHA512 3230ed1a84230d6967079c7bde82646fd7a5ec2f37bee6c2f2a75c365f5f2496a213072027959a59010b567f5a7e76e3edab20e753ef931823955cb5bf7bf85d
diff --git a/dev-java/vldocking/metadata.xml b/dev-java/vldocking/metadata.xml
new file mode 100644
index 000000000000..2324a7c65c62
--- /dev/null
+++ b/dev-java/vldocking/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">cmadsen/vldocking</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/vldocking/vldocking-3.0.5.ebuild b/dev-java/vldocking/vldocking-3.0.5.ebuild
new file mode 100644
index 000000000000..75e885bd5de0
--- /dev/null
+++ b/dev-java/vldocking/vldocking-3.0.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Docking solution for Java Swing"
+HOMEPAGE="https://github.com/cmadsen/vldocking"
+SRC_URI="https://github.com/cmadsen/${PN}/archive/${P}.zip"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-api:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	slf4j-log4j12
+	slf4j-api
+"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/werken-xpath-0.9.4_beta-r4 b/dev-java/werken-xpath-0.9.4_beta-r4
deleted file mode 100644
index d4fc02a2da6b..000000000000
--- a/dev-java/werken-xpath-0.9.4_beta-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/jdom:0 >=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-antlr >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=W3C XPath-Rec implementation for DOM4J
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/werken-xpath/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=JDOM
-RDEPEND=>=virtual/jre-1.4 dev-java/jdom:0 >=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/werken.xpath-0.9.4-beta-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dfd0bc1fc52c6fe27e9506525c85dd26
diff --git a/dev-java/werken-xpath/Manifest b/dev-java/werken-xpath/Manifest
new file mode 100644
index 000000000000..09ad09addb20
--- /dev/null
+++ b/dev-java/werken-xpath/Manifest
@@ -0,0 +1,8 @@
+AUX werken-xpath-0.9.4_beta-gentoo.patch 1313 BLAKE2B 77a304e9d140ab67e1d32d0fc91c5c62562d623f47491a724bb9807d29d97aa8e00d659c1c4151710884150e0d29a5cec53f3c9a8dc3ce00318cb0bc27507397 SHA512 bc1dea4402c1a4b4d99cdac96502ab7134613a9584f491c46abf194158c1524366037f086d250ca8cebb1972e298dd943a4af5919107af2b54863d4400e39bfe
+AUX werken-xpath-0.9.4_beta-jdom-1.0.patch 2325 BLAKE2B f3a7f3b02830cbb3705f501bed9fe135b37e75ca9f07e927b83490e25047c5863e9108a2c630680888b41b2e71ce0e8892f76ffb2c613ca862828cfbd1fbc61f SHA512 29c3d85870d0c49b36823ba633c9a3440a5c61f140c0827aee7b78c3a241a97f3cf5e285d43deed2f85487cb38b9682b4298d1dfd3934c038ca1be90dbb086bc
+AUX werken-xpath-0.9.4_beta-jpp-compile.patch 1189 BLAKE2B ae2c82957a0651084f918a79407418b18191876a7113f9ffe9968ebe24e89eb2fd368571997605e68473836caf21dfbfa96e9d0c3ae78a420cc2585590e06c13 SHA512 e7dbb75305a22463f7a3a975ca21002fb9aa19fcaff8cff07890a74cadcde292023d8e714c801019e1cd42c1f69270f7ae31c547feabfae2d4972dc99d5719a4
+AUX werken-xpath-0.9.4_beta-jpp-jdom.patch 3606 BLAKE2B 619f023176c841c876a7d0e7fd181b686a2d42b815ea3caa7973ed94bfe8ad5cc1264890e5032ef017aaa548b317c28d9e709101a2599ccee5bca9d5b65081e3 SHA512 de979a742d7d8f7fbcc68613ba4697fc4a4dc7d146d86712d71ae09c4e0b6f09c27361bd80743534aa5f2e864def2c5b8a09bd1d6fa2e15a852b74b73ff616c6
+AUX werken-xpath-0.9.4_beta-jpp-tests.patch 353 BLAKE2B 2b941351292a8fadb8b48ad3c3836cf9420db30fcf1a449a9d53aecd7f724ff76d7cbbf80fddd7330adbf3a7d98ac42b6ed3155a4fd266e1f01caed1fcc1163c SHA512 80adb52ad882970be6177cd1f8ea3ece8fbd3388b02b1c1766f3c5c869c42e358be9682fdd4a189225158d75d59b558ac0cfe55d8e9530de383ef86b654c99e4
+DIST werken.xpath-0.9.4-beta-src.tar.gz 1652916 BLAKE2B 4dde7f4be8c4cf401d1edb69b96d6ffffd4c3d53c75194db04a7351ee0ffd90d94bc59855d14dd45162cd2f4b29b02b373ecb4f7a00bf267ed58e2c1e7aece33 SHA512 c58878ee0b6e88651335e2be60d0afcd65fc164864e826bb209ec660e97315233b25341733a4118ed3ee003f61998d84e480706bda5be4630c599efb616b845d
+EBUILD werken-xpath-0.9.4_beta-r4.ebuild 1355 BLAKE2B 24fbe9aa3e66fe735ce9997a07e7cd0c85001aefd1cd884cf5b30131cb59591024a799953d17b45efcdca4dd7ff5ac1212066a9ab8b2ea61359f707e7de05cda SHA512 9872d9584539c631629f213e60fae1da24d96487dba38cc6e1fa818ef585ec07767b4415f771c4890b76ad98fa06d9274adcf24744a38c06e65857d974358270
+MISC metadata.xml 318 BLAKE2B be2cb60066e3fbccd9201112d37d447b49de3fd37a9c42a287f0b7f7b7466efdbe9c179f0ced41d7af9b0119be17328a234997377dfefb481596355fa1c3838c SHA512 64e77592f9351e55f3775ec892c2d0b6967ddd0f98cac9ae4b75f023cf24be1cc3df514062ccd5d247f8202d33b71965fb09878dee0c07edfc84734cdebe11b3
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-gentoo.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-gentoo.patch
new file mode 100644
index 000000000000..1cd61fc818ad
--- /dev/null
+++ b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-gentoo.patch
@@ -0,0 +1,35 @@
+diff -ru werken.xpath/build.xml werken.xpath-patched/build.xml
+--- werken.xpath/build.xml	2000-11-19 21:45:16.000000000 -0500
++++ werken.xpath-patched/build.xml	2005-07-14 21:14:01.000000000 -0400
+@@ -49,6 +49,9 @@
+     <!-- JDK1.1 collections -->
+     <property name="coll.import" value="com.sun.java.util.collections"/>
+     <available classname="${coll.import}.Collection" property="coll.present"/>
++	<path id="lib.classpath">
++		<fileset dir="${lib.dir}" includes="**/*.jar"/>
++	</path>
+   </target>
+ 
+   <!-- =================================================================== -->
+@@ -174,7 +177,8 @@
+     <javac srcdir="${build.src}"
+            destdir="${build.dest}"
+            debug="${debug}"
+-           optimize="${optimize}">
++           optimize="${optimize}"
++		   classpathref="lib.classpath">
+     </javac>
+   </target>
+ 
+diff -ru werken.xpath/src/com/werken/xpath/Test.java werken.xpath-patched/src/com/werken/xpath/Test.java
+--- werken.xpath/src/com/werken/xpath/Test.java	2000-10-23 23:45:32.000000000 -0400
++++ werken.xpath-patched/src/com/werken/xpath/Test.java	2005-07-14 21:22:42.000000000 -0400
+@@ -57,7 +57,7 @@
+       System.err.println("Results :: " + results);
+ 
+     }
+-    catch (JDOMException jde)
++    catch (Exception jde)
+     {
+       jde.printStackTrace(System.err);
+     }
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jdom-1.0.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jdom-1.0.patch
new file mode 100644
index 000000000000..099f7110a5da
--- /dev/null
+++ b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jdom-1.0.patch
@@ -0,0 +1,86 @@
+--- werken.xpath/src/com/werken/xpath/ElementNamespaceContext.java
++++ werken.xpath/src/com/werken/xpath/ElementNamespaceContext.java
+@@ -62,12 +62,12 @@
+ 
+       lineage.push(_element);
+ 
+-      Element elem = _element.getParent();
++      Element elem = _element.getParentElement();
+ 
+       while (elem != null)
+       {
+         lineage.push(elem);
+-        elem = elem.getParent();
++        elem = elem.getParentElement();
+       }
+ 
+       List      nsList = null;
+--- werken.xpath/src/com/werken/xpath/impl/ParentStep.java
++++ werken.xpath/src/com/werken/xpath/impl/ParentStep.java
+@@ -28,7 +28,7 @@
+   {
+     if ( node instanceof Element )
+     {
+-      return ((Element)node).getParent();
++      return ((Element)node).getParentElement();
+     }
+ 
+     return null;
+@@ -50,7 +50,7 @@
+ 
+       if ( each instanceof Element )
+       {
+-        parent = ((Element)each).getParent();
++        parent = ((Element)each).getParentElement();
+ 
+         if (parent != null)
+         {
+--- werken.xpath/src/com/werken/xpath/util/Partition.java
++++ werken.xpath/src/com/werken/xpath/util/Partition.java
+@@ -67,7 +67,7 @@
+ 
+   public static List followingSiblings(Element node)
+   {
+-    Element parent = node.getParent();
++    Element parent = node.getParentElement();
+ 
+     if (parent == null)
+     {
+@@ -95,7 +95,7 @@
+ 
+   public static List preceedingSiblings(Element node)
+   {
+-    Element parent = node.getParent();
++    Element parent = node.getParentElement();
+ 
+     if (parent == null)
+     {
+@@ -137,7 +137,7 @@
+       results.addAll( Partition.descendants( each ) );
+     }
+ 
+-    Element parent = node.getParent();
++    Element parent = node.getParentElement();
+ 
+     if (parent != null)
+     {
+@@ -170,7 +170,7 @@
+       results.addAll( Partition.descendants( each ) );
+     }
+ 
+-    Element parent = node.getParent();
++    Element parent = node.getParentElement();
+ 
+     if (parent != null)
+     {
+--- werken.xpath/test/src/com/werken/xpath/test/Driver.java
++++ werken.xpath/test/src/com/werken/xpath/test/Driver.java
+@@ -47,7 +47,7 @@
+ 
+         System.out.println("Using test-cases in [" + args[0] + "]");
+ 
+-        File dataDir = driverXML.getParentFile();
++        File dataDir = driverXML.getParentElementFile();
+ 
+         Driver driver = Driver(dataDir,
+                                    driverXML);
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-compile.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-compile.patch
new file mode 100644
index 000000000000..516158f63083
--- /dev/null
+++ b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-compile.patch
@@ -0,0 +1,24 @@
+diff -Nru werken.xpath.orig/src/com/werken/xpath/impl/Op.java werken.xpath/src/com/werken/xpath/impl/Op.java
+--- werken.xpath.orig/src/com/werken/xpath/impl/Op.java	2000-08-27 03:16:03.000000000 +0300
++++ werken.xpath/src/com/werken/xpath/impl/Op.java	2003-03-02 01:44:52.000000000 +0200
+@@ -19,7 +19,7 @@
+   public final static Op GT        = new Op(">");
+   public final static Op LT_EQUAL  = new Op("<=");
+   public final static Op GT_EQUAL  = new Op(">=");
+-  public final static Op MOD       = new Op("%");;
++  public final static Op MOD       = new Op("%");
+   public final static Op DIV       = new Op("/");
+   public final static Op PLUS      = new Op("+");
+   public final static Op MINUS     = new Op("-");
+diff -Nru werken.xpath.orig/src/com/werken/xpath/impl/UnAbbrStep.java werken.xpath/src/com/werken/xpath/impl/UnAbbrStep.java
+--- werken.xpath.orig/src/com/werken/xpath/impl/UnAbbrStep.java	2000-10-31 22:20:56.000000000 +0200
++++ werken.xpath/src/com/werken/xpath/impl/UnAbbrStep.java	2003-03-02 01:45:04.000000000 +0200
+@@ -175,7 +175,7 @@
+       }
+     }
+ 
+-    return aggregateResults;;
++    return aggregateResults;
+   }
+ 
+   private List applyPredicates(List nodeSet,
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-jdom.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-jdom.patch
new file mode 100644
index 000000000000..ba2b268f1c89
--- /dev/null
+++ b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-jdom.patch
@@ -0,0 +1,86 @@
+diff -Nru werken.xpath.orig/src/com/werken/xpath/function/StringFunction.java werken.xpath/src/com/werken/xpath/function/StringFunction.java
+--- werken.xpath.orig/src/com/werken/xpath/function/StringFunction.java	2000-10-24 06:30:00.000000000 +0300
++++ werken.xpath/src/com/werken/xpath/function/StringFunction.java	2003-03-02 01:56:03.000000000 +0200
+@@ -71,7 +71,7 @@
+ 
+   public static String evaluate(Element elem)
+   {
+-    List content = elem.getMixedContent();
++    List content = elem.getContent();
+ 
+     Iterator contentIter = content.iterator();
+     Object each = null;
+diff -Nru werken.xpath.orig/src/com/werken/xpath/impl/NodeTypeStep.java werken.xpath/src/com/werken/xpath/impl/NodeTypeStep.java
+--- werken.xpath.orig/src/com/werken/xpath/impl/NodeTypeStep.java	2000-10-26 04:09:41.000000000 +0300
++++ werken.xpath/src/com/werken/xpath/impl/NodeTypeStep.java	2003-03-02 01:56:03.000000000 +0200
+@@ -84,16 +84,16 @@
+     {
+       if ( isAbsolute() )
+       {
+-        results.addAll(  applyToNodes( ((Element)node).getDocument().getMixedContent() ) );
++        results.addAll(  applyToNodes( ((Element)node).getDocument().getContent() ) );
+       }
+       else
+       {
+-        results.addAll( applyToNodes( ((Element)node).getMixedContent() ) );
++        results.addAll( applyToNodes( ((Element)node).getContent() ) );
+       }
+     }
+     else if ( node instanceof Document )
+     {
+-      results.addAll( applyToNodes( ((Document)node).getMixedContent() ) );
++      results.addAll( applyToNodes( ((Document)node).getContent() ) );
+     }
+ 
+     return results;
+diff -Nru werken.xpath.orig/src/com/werken/xpath/impl/UnAbbrStep.java werken.xpath/src/com/werken/xpath/impl/UnAbbrStep.java
+--- werken.xpath.orig/src/com/werken/xpath/impl/UnAbbrStep.java	2000-10-31 22:20:56.000000000 +0200
++++ werken.xpath/src/com/werken/xpath/impl/UnAbbrStep.java	2003-03-02 01:56:03.000000000 +0200
+@@ -227,7 +227,7 @@
+ 
+     if ( node instanceof Element )
+     {
+-      List children = ((Element)node).getMixedContent();
++      List children = ((Element)node).getContent();
+       
+       results.addAll( applyTo( children,
+                                support,
+@@ -235,7 +235,7 @@
+     }
+     else if ( node instanceof Document )
+     {
+-      List children = ((Document)node).getMixedContent();
++      List children = ((Document)node).getContent();
+       
+       results.addAll( applyTo( children,
+                                support,
+@@ -256,7 +256,7 @@
+ 
+     if ( node instanceof Element )
+     {
+-      List children = ((Element)node).getMixedContent();
++      List children = ((Element)node).getContent();
+       
+       results.addAll( applyTo( children,
+                                support,
+@@ -264,7 +264,7 @@
+     }
+     else if ( node instanceof Document )
+     {
+-      List children = ((Document)node).getMixedContent();
++      List children = ((Document)node).getContent();
+ 
+       results.addAll( applyTo( children,
+                                support,
+diff -Nru werken.xpath.orig/test/src/com/werken/xpath/test/Driver.java werken.xpath/test/src/com/werken/xpath/test/Driver.java
+--- werken.xpath.orig/test/src/com/werken/xpath/test/Driver.java	2000-11-09 19:43:30.000000000 +0200
++++ werken.xpath/test/src/com/werken/xpath/test/Driver.java	2003-03-02 01:56:55.000000000 +0200
+@@ -412,7 +412,7 @@
+                     elemID = "";
+                 }
+ 
+-                resultNode.addAttribute("id", elemID);
++                resultNode.setAttribute("id", elemID);
+                 node.addContent( resultNode );
+                 results.addContent( node );
+             }
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch
new file mode 100644
index 000000000000..d26e6185aff3
--- /dev/null
+++ b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch
@@ -0,0 +1,10 @@
+--- runtests.sh~	2000-10-31 23:42:01.000000000 +0200
++++ runtests.sh	2003-03-02 01:59:55.000000000 +0200
+@@ -9,6 +9,6 @@
+ XPATH_CP=./build/werken.xpath.jar
+ TEST_CP=./build/test/classes/
+ 
+-CP=$ANTLR_CP:$JDOM_CP:$XPATH_CP:$TEST_CP:$XERCES_CP
++CP=$ANTLR_CP:$JDOM_CP:$XPATH_CP:$TEST_CP:$XERCES_CP:$CLASSPATH
+ 
+ java -classpath $CP $TEST_DRIVER $TESTS_XML
diff --git a/dev-java/werken-xpath/metadata.xml b/dev-java/werken-xpath/metadata.xml
new file mode 100644
index 000000000000..93f0dea9b7f9
--- /dev/null
+++ b/dev-java/werken-xpath/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">werken-xpath</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
new file mode 100644
index 000000000000..904444297829
--- /dev/null
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-antlr"
+
+inherit java-pkg-2 java-ant-2 eutils versionator
+
+MY_PN=${PN/-/.}
+MY_PV=$(replace_version_separator 3 '-')
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="W3C XPath-Rec implementation for DOM4J"
+HOMEPAGE="https://sourceforge.net/projects/werken-xpath/"
+SRC_URI="mirror://gentoo/${MY_P}-src.tar.gz"
+# This tarball was acquired from jpackage's src rpm of the package by the same name
+
+LICENSE="JDOM"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP="
+	dev-java/jdom:0
+	>=dev-java/antlr-2.7.7-r7:0"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_PN}
+
+EANT_BUILD_TARGET="package"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="antlr,jdom"
+
+java_prepare() {
+	# Courtesy of JPackages :)
+	epatch "${FILESDIR}"/${P}-jpp-compile.patch
+	epatch "${FILESDIR}"/${P}-jpp-jdom.patch
+	epatch "${FILESDIR}"/${P}-jpp-tests.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	# API updates to support jdom-1
+	epatch "${FILESDIR}"/${P}-jdom-1.0.patch
+
+	java-pkg_clean
+	rm -rv lib/bin || die
+}
+
+src_install() {
+	java-pkg_newjar build/${MY_PN}.jar
+
+	dodoc README TODO LIMITATIONS
+	use doc && java-pkg_dojavadoc build/apidocs
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/ws-commons-util-1.0.1-r1 b/dev-java/ws-commons-util-1.0.1-r1
deleted file mode 100644
index ba7e0451e9ff..000000000000
--- a/dev-java/ws-commons-util-1.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Utility classes that allow high performance XML processing based on SAX
-EAPI=5
-HOMEPAGE=http://ws.apache.org/commons/util/
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/ws/commons/util/sources/ws-commons-util-1.0.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=71abc402370c8ebe6ca75cc67c6d2ad6
diff --git a/dev-java/ws-commons-util/Manifest b/dev-java/ws-commons-util/Manifest
new file mode 100644
index 000000000000..6d37452933b6
--- /dev/null
+++ b/dev-java/ws-commons-util/Manifest
@@ -0,0 +1,3 @@
+DIST ws-commons-util-1.0.1-src.tar.gz 24838 BLAKE2B ca39646a40513eaf1905cd910779a045b24f0b4901c1818a10367f7326a7a50122d031a9b91ab6884baae15388e1e91903f21b3bb23cabb09e3f0dfe4738ca0d SHA512 4eefe61daf462105ca8cfb8ec42ef42ef414d1426b201da044fe9a72e9ab7d3fd34bd80d19d8f6220f1f91d9de7cab3d8d2dec4c267784ba3d3bbd69a1c62c4c
+EBUILD ws-commons-util-1.0.1-r1.ebuild 610 BLAKE2B cc0eeb93b0ad96b230639dfc7a4aca31e9798c562f8af64216b5806a56ee5b52b75859074702789046033fbcaa830ece09f39d9c00f1f87a3846a142914fd3c2 SHA512 456607419ceaff657a1d959e2a2c68783ab2ee7dc2c7918c2f14e0940278acf35fcc0cbb90aa2a03abb17f74d769c65e9c719b79174177e3cb17bf57d69c66fb
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ws-commons-util/metadata.xml b/dev-java/ws-commons-util/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ws-commons-util/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild b/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..3e6b2e2c676e
--- /dev/null
+++ b/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Utility classes that allow high performance XML processing based on SAX"
+HOMEPAGE="http://ws.apache.org/commons/util/"
+SRC_URI="mirror://apache/ws/commons/util/sources/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	mv "${S}"/"${P}"/src . || die
+	rm -rf "${S}"/"${P}" src/test || die
+}
diff --git a/dev-java/wsdl4j-1.6.2 b/dev-java/wsdl4j-1.6.2
deleted file mode 100644
index 36c8af71b292..000000000000
--- a/dev-java/wsdl4j-1.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=>=virtual/jdk-1.4 test? ( =dev-java/junit-3.8* ) app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Web Services Description Language for Java Toolkit (WSDL4J)
-EAPI=0
-HOMEPAGE=http://wsdl4j.sourceforge.net
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/wsdl4j/wsdl4j-src-1.6.2.zip test? ( mirror://sourceforge/jwsdltck/jwsdltck-bin-1.2.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=06d39af1aa46f1d7b7f08316d5f1ad8b
diff --git a/dev-java/wsdl4j/Manifest b/dev-java/wsdl4j/Manifest
new file mode 100644
index 000000000000..90c326e7251a
--- /dev/null
+++ b/dev-java/wsdl4j/Manifest
@@ -0,0 +1,5 @@
+AUX 1.6.2-tests-sandbox.patch 548 BLAKE2B aba74bdc87f3a35b46a80e20968e926f604a2dc13bfd48569f62fc72b7c8e2bbcb5df33af712c19a548a8c9668195cc340be92fa60e21ab36b0ab0c089de1d23 SHA512 bed0bcf00856309d8f628d4a41774a112bd26c651e9fdfa00af3113d780f430e6b50213fe0f743b486aafb78f11cdd924c4dd8eef64300715a8e88c64c11368b
+DIST jwsdltck-bin-1.2.zip 599377 BLAKE2B 0f99dc93a1b22019c572fe55585ee285c72e1dabcecc5cf93fa635b12a39a43686f0ff704a0c9ea25c682a882c4580fd82cf2015a9d4417dd28bc87d0b32a670 SHA512 a8f86d9895c588d752d266413e77c2a8db241e9cf9c199909f2e9d1d1b3b1b03eaa6b5841c62b0e7a7c779089eb6721797fdb4f2db841789a6a19884bd48711b
+DIST wsdl4j-src-1.6.2.zip 172400 BLAKE2B 96fa6a9098993ba20a277004515a4cd29bae84450b86398ceb1dc7835f14f17b39e5daf87d557b4378860c9d24e5928a80bb30b2d953fdc8fcae7d97ae8454f5 SHA512 55d0b8eb6a08cecd4a48223a9f29fe6ed0e00ec4dca99f44a04882efdba448601bb7dadcaa347e32e3ff5bb9e3334503d6666ca2a6276c7bb48b80acea57b751
+EBUILD wsdl4j-1.6.2.ebuild 1379 BLAKE2B 62573ab9c6c4129bc3b56be19193b5bc0f1ee9466b6f0698df63fd3bed3fc6ea71dab0680eebc3cd94054030f86b69bffadfd70243f5da2380b420052d898f30 SHA512 92ef127ddac2d70d6ee02dfec6c9ec80698c639f7a93ed15241bfa29b57fd7cf0d174dd1bbaf8a3e26c09601a9f2cdca931fcf876c1298391b110213742a455d
+MISC metadata.xml 314 BLAKE2B 0148774951355ef90d4345572a6a0fecfcc8340b6fd88ed7a18f40b719844e1e9c530b0dfc4917f9b11640871642e4cae06714f7083161136efbe56b2c15caa4 SHA512 2d7d312851cbed77b5a2156bb5d157f8f8fe911ef9c4eb16b645ca4b17892a7d70a02a9d07f8c36fb92a285717c68718e798d37eb140f2391e4ab828a60110fa
diff --git a/dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch b/dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch
new file mode 100644
index 000000000000..7901a11a6fc0
--- /dev/null
+++ b/dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch
@@ -0,0 +1,11 @@
+diff -ur wsdl4j-1_6_2.old/build.xml wsdl4j-1_6_2/build.xml
+--- wsdl4j-1_6_2.old/build.xml	2007-06-09 01:12:11.000000000 +0300
++++ wsdl4j-1_6_2/build.xml	2007-06-09 01:13:09.000000000 +0300
+@@ -279,6 +279,7 @@
+   <target name="test" depends="compile" if="junit.present">
+     <junit printsummary="on">
+       <sysproperty key="jwsdltck_home" value="./test"/>
++	  <sysproperty key="java.home" value="${temp.dir}"/>
+       <sysproperty key="javax.wsdl.factory.WSDLFactoryCandidate"
+                    value="com.ibm.wsdl.factory.WSDLFactoryImpl"/>
+ 
diff --git a/dev-java/wsdl4j/metadata.xml b/dev-java/wsdl4j/metadata.xml
new file mode 100644
index 000000000000..524efd7086e7
--- /dev/null
+++ b/dev-java/wsdl4j/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jwsdltck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
new file mode 100644
index 000000000000..0c4ab5f3f3c5
--- /dev/null
+++ b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit versionator java-pkg-2 java-ant-2
+
+DESCRIPTION="Web Services Description Language for Java Toolkit (WSDL4J)"
+HOMEPAGE="http://wsdl4j.sourceforge.net"
+
+TCK="jwsdltck"
+TCK_V="1.2"
+
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip
+	test? ( mirror://sourceforge/${TCK}/${TCK}-bin-${TCK_V}.zip )"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( =dev-java/junit-3.8* )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${PN}-$(replace_all_version_separators _)"
+TCK_S="${WORKDIR}/${TCK}-$(replace_all_version_separators _ ${TCK_V})"
+
+src_unpack() {
+	unpack ${A}
+	if use test; then
+		rm -v "${TCK_S}"/lib/*.jar || die
+		epatch "${FILESDIR}/1.6.2-tests-sandbox.patch"
+	fi
+}
+
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="javadocs"
+
+src_test() {
+	ln -s "${TCK_S}" test
+	cd "${TCK_S}"
+	java-ant_rewrite-classpath
+	local junit="$(java-pkg_getjars junit)"
+	eant -Dbuild.lib="${S}/test/lib" compile \
+		-Dgentoo.classpath="${S}/build/lib/${PN}.jar:${junit}"
+	cd "${S}"
+	mkdir "${T}/lib"
+	ANT_TASKS="ant-junit" eant test -Dtemp.dir="${T}"
+}
+
+src_install() {
+	java-pkg_dojar build/lib/*.jar
+
+	use doc && java-pkg_dojavadoc build/javadocs/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/wstx-3.2.9-r1 b/dev-java/wstx-3.2.9-r1
deleted file mode 100644
index 0eb0b844ba6f..000000000000
--- a/dev-java/wstx-3.2.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/sax:0 dev-java/msv:0 dev-java/relaxng-datatype:0 test? ( dev-java/ant-junit:0 ) app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Woodstox is a high-performance validating namespace-aware XML-processor
-EAPI=5
-HOMEPAGE=https://github.com/FasterXML/woodstox
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/sax:0 dev-java/msv:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.2
-SRC_URI=mirror://gentoo/wstx-src-3.2.9.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=edb56e0437c58c79c7108df0363e1d92
diff --git a/dev-java/wstx/Manifest b/dev-java/wstx/Manifest
new file mode 100644
index 000000000000..3b429be9f3ee
--- /dev/null
+++ b/dev-java/wstx/Manifest
@@ -0,0 +1,4 @@
+AUX wstx-3.2.9-build.xml.patch 389 BLAKE2B ddb6b3e359aaffeab92a7cf21bfd00070a178c9baf594d0d742dd393f2cbe5fa81d13ce8c2a1555eeecc9efe58e3797274547d3b9c9e746247fa34727a438132 SHA512 e9fb8f3c81957970b9b2fb73bdeb8d3b91d1fe30712829aa3dfa2efc3b0be5b97f0a3b668c99570d5d6ebd1893d0dfd11d8f1961af700a8ff4826ce3250ffcb5
+DIST wstx-src-3.2.9.zip 2218419 BLAKE2B 98daf8a6bca50085cfa3f281c65567da5a51fd376042f6bb4fcb6bd1f77a442acbae8e27507e9aea8bc5da8da969f30c38a8e253f55d535f6669a3a0690c850e SHA512 316679a6586e453b85ffe4dd573a92019282b0d2028e931f33fafa8b0f3aef856c8326c72049ce42645e4b520bbd1bd91e74005f090dc22dc7ca7c76a0640117
+EBUILD wstx-3.2.9-r1.ebuild 1223 BLAKE2B 0851a5c8a77b35f0a0a4ffb0cd6e53b9cc4016f128953ea905e92238b9863ec06231b9ee06b5b2901306117614a4747924576422dc7e7e73b56e3c8318ca036e SHA512 e2808aac94bf465fc0041189edd97fc61e9a4039046fe27efbcd4684d8003e50c4910e348123e0ae2fed403feb4220370b05c6f5c2751a8dd0398103a6a53c2f
+MISC metadata.xml 498 BLAKE2B 527aeb1edb2d32a86b920d0fe640c3665f62ed3c03d0512ae7bb7c3b2c011b94b487804dfa07bba68bc03ea46b69a05c2f4fad0e66738891615120a220d4807c SHA512 fe5cf72ac01bc004dc57fbf57a49e1c28b3b8191f236d5ef025dee65bfad7b44028abd374c02b4cc1107564e2a1706ef8c44e23c5b89a0dfda950cac4a6f75c1
diff --git a/dev-java/wstx/files/wstx-3.2.9-build.xml.patch b/dev-java/wstx/files/wstx-3.2.9-build.xml.patch
new file mode 100644
index 000000000000..58f689039cf6
--- /dev/null
+++ b/dev-java/wstx/files/wstx-3.2.9-build.xml.patch
@@ -0,0 +1,13 @@
+--- a/build.xml
++++ b/build.xml
+@@ -104,10 +104,6 @@
+         <include name="org/codehaus/stax2/**/*.class" />
+     </patternset>
+ 
+-    <!-- 02-Mar-2009, TSa: Let's try automating Maven builds
+-      -->
+-    <import file="build-maven-deploy.xml" />
+-
+     <!-- And then something nifty, for creating minimal jars! -->
+ 
+     <classfileset id="j2meInputMinimal" dir="${BuildClassesDir}">
diff --git a/dev-java/wstx/metadata.xml b/dev-java/wstx/metadata.xml
new file mode 100644
index 000000000000..596d71c6cea1
--- /dev/null
+++ b/dev-java/wstx/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		Woodstox is a high-performance validating namespace-aware StAX-compliant
+		(JSR-173) Open Source XML-processor written in Java.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">FasterXML/woodstox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/wstx/wstx-3.2.9-r1.ebuild b/dev-java/wstx/wstx-3.2.9-r1.ebuild
new file mode 100644
index 000000000000..0db6b6957de9
--- /dev/null
+++ b/dev-java/wstx/wstx-3.2.9-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Woodstox is a high-performance validating namespace-aware XML-processor"
+HOMEPAGE="https://github.com/FasterXML/woodstox"
+SRC_URI="mirror://gentoo/${PN}-src-${PV}.zip"
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="test"
+
+CDEPEND="
+	dev-java/sax:0
+	dev-java/msv:0
+	dev-java/relaxng-datatype:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? ( dev-java/ant-junit:0 )
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="javadoc"
+
+# Don't need to make a folder
+S="${WORKDIR}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+java_prepare() {
+	rm -v lib/msv/*.jar || die
+	rm -v lib/*.jar || die
+
+	# Get rid of a missing include.
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+}
+
+EANT_GENTOO_CLASSPATH="sax,msv,relaxng-datatype"
+
+src_test(){
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar build/"${PN}"-api-"${PV}".jar "${PN}"-api.jar
+	java-pkg_newjar build/"${PN}"-asl-"${PV}".jar "${PN}".jar
+	use doc && java-pkg_dojavadoc build/javadoc
+	use source && java-pkg_dosrc src
+}
diff --git a/dev-java/xalan-2.7.2 b/dev-java/xalan-2.7.2
deleted file mode 100644
index 970b53478a1f..000000000000
--- a/dev-java/xalan-2.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jdk-1.3 doc? ( app-arch/unzip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Transforming XML documents into HTML, text, or other XML document types
-EAPI=5
-HOMEPAGE=http://xalan.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jre-1.3 ~dev-java/xalan-serializer-2.7.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz doc? ( mirror://apache/xalan/xalan-j/binaries/xalan-j_2_7_2-bin.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6d5cecaed24df7ca6c66d2356aff1143
diff --git a/dev-java/xalan-serializer-2.7.2 b/dev-java/xalan-serializer-2.7.2
deleted file mode 100644
index 507c4090912d..000000000000
--- a/dev-java/xalan-serializer-2.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=DOM Level 3 serializer from Apache Xalan, shared by Xalan and Xerces
-EAPI=5
-HOMEPAGE=http://xalan.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6ccfc2a0cfdbd7840d6f3fe43ada8a98
diff --git a/dev-java/xalan-serializer/Manifest b/dev-java/xalan-serializer/Manifest
new file mode 100644
index 000000000000..fea0314a771f
--- /dev/null
+++ b/dev-java/xalan-serializer/Manifest
@@ -0,0 +1,3 @@
+DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8
+EBUILD xalan-serializer-2.7.2.ebuild 1187 BLAKE2B 1eaa01ed3864bd624ebd7a78461d23ed8705138ccf23d897cf4490d23210240f7e274b972ce488d1086b62a486be3c716ce72c8b0d413f40e5259fa85e2dcacd SHA512 69e2910d0284fbde84f3802ee30e179f788d43d81d2816c70b8729ddf6be3a0dc47bb3429161d32797754ffcfb64849dcfc6d8d09721f84f247cc8b8ae74c135
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xalan-serializer/metadata.xml b/dev-java/xalan-serializer/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/xalan-serializer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
new file mode 100644
index 000000000000..db89ae90c1d3
--- /dev/null
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_PN="xalan-j"
+MY_PV="$(replace_all_version_separators _)"
+MY_P="${MY_PN}_${MY_PV}"
+
+DESCRIPTION="DOM Level 3 serializer from Apache Xalan, shared by Xalan and Xerces"
+HOMEPAGE="http://xalan.apache.org/"
+SRC_URI="mirror://apache/xalan/${MY_PN}/source/${MY_P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=virtual/jre-1.3"
+DEPEND=">=virtual/jdk-1.3"
+
+EANT_BUILD_TARGET="serializer.jar"
+EANT_DOC_TARGET="serializer.javadocs"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	# kill all non-serializer sources to ease javadocs and dosrc
+	find src/org/ -type f ! -path "src/org/apache/xml/serializer/*" -delete || die
+
+	# remove bundled jars
+	find -name "*.jar" -delete || die
+	rm src/*.tar.gz || die
+}
+
+src_install() {
+	java-pkg_dojar build/serializer.jar
+
+	use doc && java-pkg_dojavadoc build/docs/apidocs
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
new file mode 100644
index 000000000000..7881f925af05
--- /dev/null
+++ b/dev-java/xalan/Manifest
@@ -0,0 +1,4 @@
+DIST xalan-j_2_7_2-bin.zip 17740075 BLAKE2B 244fd71011fa957ff1988dbbb58e40af4ad218aafbd92f2a6ec305d59ec0fb221a283442b24e4290f6d2e853cfad39d689c1397b4d18f34f4c94403610079328 SHA512 ae2be0bfc5e794b159c2d16718275a6ce6e8f63d681e2d13875f233d334a37aba872206c6c1f70565698ceaf4c66261c7df6db6c524e6e8da5dafe2f17cefddf
+DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8
+EBUILD xalan-2.7.2.ebuild 1833 BLAKE2B 7a390c747ee190010b9884b7d8c70497595eb341a31b1b6e85b4fbfd6e880d6c6f670e9e6018f64647fbb781ba11f78c93d87d1c5eb708ebf55aaebcb64251c0 SHA512 eadca11ef9dcbec73a8f6a048fb518d6fbe6f8c8976ec37c71d014d7acbd640baee7a8422ab2ee7db38f280fe96019619989a109f35e75f45cc3c2fee0625018
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xalan/metadata.xml b/dev-java/xalan/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/xalan/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xalan/xalan-2.7.2.ebuild b/dev-java/xalan/xalan-2.7.2.ebuild
new file mode 100644
index 000000000000..d5c0c149b9de
--- /dev/null
+++ b/dev-java/xalan/xalan-2.7.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# NOTE: Building the docs is much more hassle than it's worth. It
+# requires com.sun.image.codec, which has long gone from JDKs, and
+# Apache StyleBook, which is long dead though it is bundled here.
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_PN="${PN}-j"
+MY_PV="$(replace_all_version_separators _)"
+MY_P="${MY_PN}_${MY_PV}"
+SRC_DIST="${MY_P}-src.tar.gz"
+BIN_DIST="${MY_P}-bin.zip"
+
+DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types"
+HOMEPAGE="http://xalan.apache.org/"
+SRC_URI="mirror://apache/${PN}/${MY_PN}/source/${SRC_DIST}
+	doc? ( mirror://apache/${PN}/${MY_PN}/binaries/${BIN_DIST} )"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND="dev-java/javacup:0
+	dev-java/bcel:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.3
+	~dev-java/xalan-serializer-${PV}:${SLOT}"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.3
+	doc? ( app-arch/unzip )"
+
+EANT_GENTOO_CLASSPATH="bcel,javacup"
+EANT_BUILD_TARGET="unbundledjar"
+EANT_DOC_TARGET=""
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	# disable building of serializer.jar
+	sed -i -e 's/depends="prepare,serializer.jar"/depends="prepare"/' \
+		build.xml || die "sed build.xml failed"
+
+	# remove bundled jars
+	find -name "*.jar" -delete || die
+	rm src/*.tar.gz || die
+}
+
+src_install() {
+	java-pkg_newjar build/${PN}-unbundled.jar
+	java-pkg_dolauncher ${PN} --main org.apache.xalan.xslt.Process
+	java-pkg_register-dependency ${PN}-serializer
+
+	dodoc NOTICE.txt readme.html
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/xerces-2.11.0 b/dev-java/xerces-2.11.0
deleted file mode 100644
index bbc464425b23..000000000000
--- a/dev-java/xerces-2.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0 >=virtual/jdk-1.4 >=dev-java/xjavac-20110814:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=The next generation of high performance, fully compliant XML parsers
-EAPI=4
-HOMEPAGE=http://xml.apache.org/xerces2-j/index.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9ffd2e1270002799b5efc9fb82976770
diff --git a/dev-java/xerces-2.11.0-r1 b/dev-java/xerces-2.11.0-r1
deleted file mode 100644
index 9b43a54d89f7..000000000000
--- a/dev-java/xerces-2.11.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0 >=virtual/jdk-1.6 >=dev-java/xjavac-20110814:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=The next generation of high performance, fully compliant XML parsers
-EAPI=5
-HOMEPAGE=http://xml.apache.org/xerces2-j/index.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=85d990900febad61cf21d82754404cfb
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
new file mode 100644
index 000000000000..242b0ad063c0
--- /dev/null
+++ b/dev-java/xerces/Manifest
@@ -0,0 +1,5 @@
+AUX xerces-2.11.0-build.xml.patch 1685 BLAKE2B e7fe7be5efe89a5c6d19ed885e0a6ceb8acdafab6137a320b7733d37768d3ca19d301539c1e750353fb15bc4dd3739f52cd099d92479ac8bdd7a995b1356e53d SHA512 e0b1b195104d65e12a25fb6f6a39e8de5f91b1c258b8cca18fae781802e20fe0cdfe4049968ef7411a2f18aad3ac562f655dbb57b62b5b502ef8ee3a1f3f7db7
+DIST Xerces-J-src.2.11.0.tar.gz 1792762 BLAKE2B 84c82834cb0c5f97b90190378d51b438c2eac4a7a92921ed5c6ea330d3fdcfdef45c3540d181f2ac26feb58c390dc3a327fe49ef527f88b4e0f032c43c0baa43 SHA512 de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411
+EBUILD xerces-2.11.0-r1.ebuild 1528 BLAKE2B facae44fa13b7c1fb5faf512969ed4f026d9d236d10d8a51f56f89efaa95e569cdaaf1f2257acfa31cf3e8b31aaad159428394e8166b4ba408030b85c4274258 SHA512 d5b7a351bc08e75185fca0f63298887906642b09e57172e41e7ddad0f001954ff8029c7366416b40a8a71d48d7e2e15324b276c0a2176e7db3eed33c7a158027
+EBUILD xerces-2.11.0.ebuild 1646 BLAKE2B 58ea1cdd93ca0a65fd4dd1d3d8d6f52addf69f70e71bff5c4ae1226d0b9e82468dab3a9b7a9a48e9feb4e90eb84ac53a1934e288d3a37d334497ad9bdf42660e SHA512 63dbfdc7236c78028157c902f510d386b1dfedb66a32bfaed3f9a5d09c227d722b36fbad9391f1cac3881ee0f60a54755752bb6fd9323808ac47e5397fb871d1
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch b/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
new file mode 100644
index 000000000000..61afcddad9a4
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
@@ -0,0 +1,46 @@
+Author: Ralph Sennhauser <sera@gentoo.org>
+
+Don't reference non existing jar in taskdef. #351394
+Don't let user properties leak into build env.
+Don't bundle stuff from xml-commons-external.
+
+--- a/build.xml
++++ b/build.xml
+@@ -39,18 +39,13 @@ Authors:
+   <property name="tools.dir" value="./tools"/>

+ 

+   <!-- enable compilation under JDK 1.4 and above -->

+-  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">

+-    <classpath>

+-      <pathelement location="${tools.dir}/bin/xjavac.jar"/>

+-    </classpath>

+-  </taskdef>

++  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>

+ 

+   <!-- Allow properties following these statements to be overridden -->

+   <!-- Note that all of these don't have to exist.  They've just been defined

+        incase they are used. -->

+   <property file="build.properties"/>

+   <property file=".ant.properties"/>

+-  <property file="${user.home}/.ant.properties"/>

+   <property file="default.properties"/>  

+  

+   <target name="init">

+@@ -247,7 +242,7 @@ Authors:
+     <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"

+       tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>

+ 

+-    <!-- now deal with API's:  -->

++    <!-- now deal with API's:

+     <unzip src="${src.apis.zip}" dest="${build.src}">

+         <patternset

+             includes="org/xml/sax/** 

+@@ -269,7 +264,7 @@ Authors:
+                 org/w3c/dom/views/**

+                 org/w3c/dom/xpath/**"

+         />

+-    </unzip>

++    </unzip>  -->

+     

+     <!-- substitute tokens as needed -->

+     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 

diff --git a/dev-java/xerces/metadata.xml b/dev-java/xerces/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/xerces/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xerces/xerces-2.11.0-r1.ebuild b/dev-java/xerces/xerces-2.11.0-r1.ebuild
new file mode 100644
index 000000000000..5a696217d556
--- /dev/null
+++ b/dev-java/xerces/xerces-2.11.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils versionator java-pkg-2 java-ant-2
+
+DIST_PN="Xerces-J"
+SRC_PV="$(replace_all_version_separators _ )"
+DESCRIPTION="The next generation of high performance, fully compliant XML parsers"
+HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
+SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+# they are missing from the upstream tarball"
+RESTRICT="test"
+
+CDEPEND="
+	dev-java/xml-commons-external:1.4
+	>=dev-java/xml-commons-resolver-1.2:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	>=dev-java/xjavac-20110814:1"
+
+S="${WORKDIR}/${PN}-${SRC_PV}"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_ANT_TASKS="xjavac-1"
+EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.4"
+EANT_DOC_TARGET="javadocs"
+# known small bug - javadocs use custom taglets, which come as bundled jar in
+# xerces-J-tools.${PV}.tar.gz. Should find the taglets source instead.
+EANT_EXTRA_ARGS="-Dadditional.param="
+
+src_install() {
+	java-pkg_dojar build/xercesImpl.jar
+
+	dodoc README NOTICE
+	dohtml Readme.html
+
+	use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/xerces/xerces-2.11.0.ebuild b/dev-java/xerces/xerces-2.11.0.ebuild
new file mode 100644
index 000000000000..ec1b7dadb09a
--- /dev/null
+++ b/dev-java/xerces/xerces-2.11.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils versionator java-pkg-2 java-ant-2
+
+DIST_PN="Xerces-J"
+SRC_PV="$(replace_all_version_separators _ )"
+DESCRIPTION="The next generation of high performance, fully compliant XML parsers"
+HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
+SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# they are missing from the upstream tarball"
+RESTRICT="test"
+
+COMMON_DEP="
+	dev-java/xml-commons-external:1.4
+	>=dev-java/xml-commons-resolver-1.2:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	>=dev-java/xjavac-20110814:1"
+
+S="${WORKDIR}/${PN}-${SRC_PV}"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_ANT_TASKS="xjavac-1"
+EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.4"
+EANT_DOC_TARGET="javadocs"
+# known small bug - javadocs use custom taglets, which come as bundled jar in
+# xerces-J-tools.${PV}.tar.gz. Should find the taglets source instead.
+EANT_EXTRA_ARGS="-Dadditional.param="
+
+src_install() {
+	java-pkg_dojar build/xercesImpl.jar
+
+	dodoc README NOTICE
+	dohtml Readme.html
+
+	use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/xerial-core-2.0.1 b/dev-java/xerial-core-2.0.1
deleted file mode 100644
index 2dab2e61dcc3..000000000000
--- a/dev-java/xerial-core-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An open-source DBMS for XML/JSON/Relational data
-EAPI=5
-HOMEPAGE=https://code.google.com/p/xerial/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/xerial-core/xerial-core-2.0.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=654c972a7c7906472c5d010773355f3b
diff --git a/dev-java/xerial-core/Manifest b/dev-java/xerial-core/Manifest
new file mode 100644
index 000000000000..6cfec17775e0
--- /dev/null
+++ b/dev-java/xerial-core/Manifest
@@ -0,0 +1,4 @@
+AUX 2.0.1-build.xml 5674 BLAKE2B dc70ae55f105e36306cc30e71b64fb1008003b2a330dd12b7531a81191e82a6ea376eedd58495b788fa2a526badb5b33b0e72a4627c5cbe0db3ebefbd9eee924 SHA512 fe6cae55b06099f1718fe2d2b70f680b3549c20047884f879d4fcdc7f8765d4b18a5f8b80478b09913013958834f2602ded4e0b9580db96467d89b1bd5c23650
+DIST xerial-core-2.0.1.tar.bz2 519709 BLAKE2B 3d81bda265e3b3b37a50a62061298f23de7c2947a9d50ba6eac336c3ec09fcaaeea84d456e344b0d2ae16710870025a869c2359a17f0956c8dda557804e9d5ff SHA512 39236e8a653301a6899ce80d3240d505e91f0cfc8878fa1a698113d06f3af3fd7adef540d72da1c0e1fb7101542c43e92fb9388243d95c3185a561532c18c6fb
+EBUILD xerial-core-2.0.1.ebuild 924 BLAKE2B eeea14596a52313896ec32d3fad773bebb08a8ee73fbb43f7ee16e818896920e3bbc2a230b1de586ec33900701c908b7826c37e44d77ced69806fa5cfb901651 SHA512 1d0e2abac6e6733e1992ea76d87788e489654af275849e4e78a5bfd5bf29fa9ea5f845b82684a39421b4ab4d9332f49140093fc5e7da89570bc42f94b7cf997f
+MISC metadata.xml 312 BLAKE2B bf3b2f7e957b8d7c4e728529c04a4f5e42b867633a2a4c3a54b0b7f8d53571c86c64a53e128d22e83cb8cf42388bbaaf99f5fcda59ec843fca99f10e60afa495 SHA512 d05fc7f764fdac881ed3354826a38146c9b9ab49a383a76045b1abfd415ea2973fbe37e450312db2822e020c744d8d5ad0281124db6b2d712ab01acb0dbbbd16
diff --git a/dev-java/xerial-core/files/2.0.1-build.xml b/dev-java/xerial-core/files/2.0.1-build.xml
new file mode 100644
index 000000000000..76a6adfcb189
--- /dev/null
+++ b/dev-java/xerial-core/files/2.0.1-build.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="xerial-core-from-maven" default="package" basedir=".">
+	<property file="${user.home}/.m2/maven.properties" />
+	<property file="maven-build.properties" />
+
+	<property name="maven.build.finalName" value="xerial-core-2.0.1" />
+	<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/java" />
+	<property name="maven.build.resourceDir.1" 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/java" />
+	<property name="maven.build.testResourceDir.1" 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" />
+
+	<path id="build.classpath" />
+	<path id="build.test.classpath" />
+
+	<target name="clean" description="Clean the output directory">
+		<delete dir="${maven.build.dir}" />
+	</target>
+
+
+	<target name="compile" description="Compile the code">
+		<mkdir dir="${maven.build.outputDir}" />
+		<javac destdir="${maven.build.outputDir}" 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}">
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
+	</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.6" verbose="false" fork="false" 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}">
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
+		<copy todir="${maven.build.testOutputDir}">
+			<fileset dir="${maven.build.testResourceDir.1}" />
+		</copy>
+	</target>
+
+	<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="**/*Test.java" />
+					<include name="**/*TestCase.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>
+
+	<target name="javadoc" description="Generates the Javadoc of the application">
+		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" charset="ISO-8859-1" linksource="false" breakiterator="false">
+			<doctitle>&lt;![CDATA[xerial-core-2.0.1 API]]&gt;</doctitle>
+		</javadoc>
+	</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" />
+	</target>
+
+	<target name="jar" depends="package" description="Builds the jar for the application" />
+
+	<target name="test-offline">
+		<condition property="maven.mode.offline">
+			<equals arg1="${maven.settings.offline}" arg2="true" />
+		</condition>
+	</target>
+
+</project>
diff --git a/dev-java/xerial-core/metadata.xml b/dev-java/xerial-core/metadata.xml
new file mode 100644
index 000000000000..f32e99b53360
--- /dev/null
+++ b/dev-java/xerial-core/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">xerial</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/xerial-core/xerial-core-2.0.1.ebuild b/dev-java/xerial-core/xerial-core-2.0.1.ebuild
new file mode 100644
index 000000000000..edaab8c4a833
--- /dev/null
+++ b/dev-java/xerial-core/xerial-core-2.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An open-source DBMS for XML/JSON/Relational data"
+HOMEPAGE="https://code.google.com/p/xerial/"
+SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+	)"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+EANT_TEST_ANT_TASKS="ant-junit"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
+}
+
+src_install() {
+	java-pkg_newjar "${S}/target/${P}.jar" "${PN}.jar"
+
+	use source && java-pkg_dosrc "${S}"/src/main/java/*
+	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/xjavac-2.4.0 b/dev-java/xjavac-2.4.0
deleted file mode 100644
index b904e6fd9c71..000000000000
--- a/dev-java/xjavac-2.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Xerses Java Parser
-EAPI=6
-HOMEPAGE=https://xerces.apache.org/xerces-j
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/xjavac-2.4.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a4f8620c34baefae37d4e8ce28170af5
diff --git a/dev-java/xjavac-20110814 b/dev-java/xjavac-20110814
deleted file mode 100644
index 24ef888f6f05..000000000000
--- a/dev-java/xjavac-20110814
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=The implementation of the javac compiler for IBM JDK 1.4 (needed for xerces-2)
-EAPI=2
-HOMEPAGE=http://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=1
-SRC_URI=mirror://gentoo/xjavac-20110814.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1d596313effae982234c69f9242e6ab4
diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest
new file mode 100644
index 000000000000..7e0ec4062130
--- /dev/null
+++ b/dev-java/xjavac/Manifest
@@ -0,0 +1,6 @@
+AUX xjavac-20041208-build.xml 1088 BLAKE2B 45fff43f290db1e415427a3558556bfc89de78b59fbd8dc8794016c600de6cac64c1cde973925949d383f4321c8c85019e799d775a8262876e02b9692f4c5d2a SHA512 5ed5cfe711a4666d2db2dbe91ba8ac0d1dc9e95cf5be82891382632db6e4a250775aabbd38111134d82a09fa9d7d81efead52256e7511a726144689e1e389469
+DIST xjavac-2.4.0.tar.gz 2472 BLAKE2B 4693c2fa74a2951909ff6dc55638e7f3de19fecf82bcfeba0abfeaff82f941ea9d02dde3de969e850da9c5bfc98684b0a34be391d6db6c3fe12de0a734137afd SHA512 6a12c605f6f455f20981214d1ce8ed752070ae2b268e9279692a3b05921c84857636055d9c4d7b1de92bafbaa4b528f36983dc2eca0ca883a7fa340320e503a0
+DIST xjavac-20110814.tar.gz 2217 BLAKE2B 2a2faa87f958c1a089ae600798eca190c7784f5343887fd6236447e433f500bf134f9241dfd98aca4a1a0223811f9a426c0f7a3c73c4b7c4fd6c682e30561cd3 SHA512 f4c5aa437d135a8495c926387df68df8f47878e206ea8f279a7c3e8e32561dbac5a8c8002f77a2bf03863f42475cad5068e3c1031121b64b32fb4d15242c3b3e
+EBUILD xjavac-2.4.0.ebuild 665 BLAKE2B e700eccc7deff99e5121184a349cb8a50e9ad364b78091e8fed10d2955a41919ff469b34539d30ad80407b41f15ac6f2ccd65fdb8899c01b8526dcae5fac9eff SHA512 a9c4908b869f9a6bf7d954e2e197e10f377a3a249c503147821a826767793ec9191fcc788408b183f85fdbcbc58a6e926b5718e5f36bcecf37c1338432d8af47
+EBUILD xjavac-20110814.ebuild 952 BLAKE2B f143d3429c9eaceb2948303ad39947d0dc2caf2a85a2c7cbb5d80b4c4e2f44c5f6b1dad864b08d57c4491794d55e4a62b60980216614692287246d701e2bd2c2 SHA512 f9323cf655ac2e5328255732a4267062757b4205f49301e76386ebb54c4b7234088c2a8961f48ca880742bb23a10ab3c97b3a84f099fe6aca15be1137c2b5981
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xjavac/files/xjavac-20041208-build.xml b/dev-java/xjavac/files/xjavac-20041208-build.xml
new file mode 100644
index 000000000000..5c9a466ca8e8
--- /dev/null
+++ b/dev-java/xjavac/files/xjavac-20041208-build.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<project name="xjavac" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="." />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="docs" />
+	<property name="dist.dir" value="dist" />
+	<property name="lib.dir" value="lib" />
+	<property name="jarfile" value="${dist.dir}/xjavac.jar" />
+	<property name="target.jdk" value="1.4" />
+	
+	<!-- init -->
+	<target name="init">
+		<mkdir dir="${dist.dir}" />
+		<mkdir dir="${build.dir}" />
+		<mkdir dir="${docs.dir}" />
+	</target>	
+
+	<!-- compile everything -->
+	<target name="compile" depends="init">
+		<mkdir dir="${build.dir}" />
+		<javac srcdir="${src.dir}" 
+			destdir="${build.dir}"
+			classpath="${classpath}"
+			source="${target.jdk}"
+			target="${target.jdk}"/>
+	</target>
+
+	<!-- build the jar file -->
+	<target name="jar" depends="compile">
+		<jar jarfile="${jarfile}" basedir="${build.dir}" />
+	</target>
+	
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}" />
+		<delete dir="${docs.dir}" />
+		<delete dir="${dist.dir}" />
+	</target>
+</project>
diff --git a/dev-java/xjavac/metadata.xml b/dev-java/xjavac/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/xjavac/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xjavac/xjavac-2.4.0.ebuild b/dev-java/xjavac/xjavac-2.4.0.ebuild
new file mode 100644
index 000000000000..8198e0008d8d
--- /dev/null
+++ b/dev-java/xjavac/xjavac-2.4.0.ebuild
@@ -0,0 +1,29 @@
+# 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="Xerses Java Parser"
+HOMEPAGE="https://xerces.apache.org/xerces-j"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.7"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.7"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
diff --git a/dev-java/xjavac/xjavac-20110814.ebuild b/dev-java/xjavac/xjavac-20110814.ebuild
new file mode 100644
index 000000000000..9478e4db552b
--- /dev/null
+++ b/dev-java/xjavac/xjavac-20110814.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The implementation of the javac compiler for IBM JDK 1.4 (needed for xerces-2)"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+#Note that the tarball has xjavac-ibm-1_5.patch already applied (not in upstream)
+IUSE=""
+HOMEPAGE="http://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java"
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.7"
+
+java_prepare() {
+	cp "${FILESDIR}/${PN}-20041208-build.xml" ./build.xml || die "failed to cp build.xml"
+}
+
+src_compile() {
+	eant jar -Dclasspath=$(java-pkg_getjars ant-core)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+}
diff --git a/dev-java/xml-commons-1.4.01 b/dev-java/xml-commons-1.4.01
deleted file mode 100644
index a160e43dd589..000000000000
--- a/dev-java/xml-commons-1.4.01
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache XML Commons
-EAPI=5
-HOMEPAGE=http://xml.apache.org/commons/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-1.1 public-domain W3C-document W3C
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/xerces/xml-commons/source/xml-commons-external-1.4.01-src.tar.gz -> xml-commons-1.4.01.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=695f23cc19b504f706b35b546fd70f7d
diff --git a/dev-java/xml-commons-external-1.3.04 b/dev-java/xml-commons-external-1.3.04
deleted file mode 100644
index 5d7c2a0861a0..000000000000
--- a/dev-java/xml-commons-external-1.3.04
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP
-EAPI=0
-HOMEPAGE=http://xml.apache.org/commons/
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=1.3
-SRC_URI=mirror://gentoo/xml-commons-external-1.3.04.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=39d185cdfeebbed3b3871476a7eaf330
diff --git a/dev-java/xml-commons-external-1.4.01-r1 b/dev-java/xml-commons-external-1.4.01-r1
deleted file mode 100644
index 61829832b930..000000000000
--- a/dev-java/xml-commons-external-1.4.01-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP
-EAPI=5
-HOMEPAGE=http://xerces.apache.org/xml-commons/components/external/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.4
-SRC_URI=https://repo1.maven.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar -> xml-commons-external-1.4.01.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3660bfbb10315a3287ac5e741f84f07e
diff --git a/dev-java/xml-commons-external/Manifest b/dev-java/xml-commons-external/Manifest
new file mode 100644
index 000000000000..12da6cef96c0
--- /dev/null
+++ b/dev-java/xml-commons-external/Manifest
@@ -0,0 +1,5 @@
+DIST xml-commons-external-1.3.04.tar.bz2 659665 BLAKE2B b7f51fab7162b905142c5256f1d03d519b4ab387edf8b4c3d738ac138cf6ad71f29fd568c99423f840be6eb02bb50e89cfab3c729d2d5071d8a66e30836d8f5e SHA512 8bc71a0850e751ae4a5057833d57b2235734facbae43c733b0a9d86e5be99af016b737f12f5566c736f71374a709dee9954089db8fbeff4fb4cbb236a9fd6abb
+DIST xml-commons-external-1.4.01.jar 656529 BLAKE2B c51ca760c23759d4f4ad11fcb44caa1cb0bcb2785d9095ed56dba9b0d5fe57370a9d9aaeed5a8e0c1fa67918237ce693590bac791200add2e85155ab87ffe40b SHA512 f00773eec613453d0e1b7b0857b01c51d1926079f38e172953c4ef0350f063439acc8b5967f947c8d15a73e5d53e8887c3bf30122d5f7c553bcef349e5a8cb9a
+EBUILD xml-commons-external-1.3.04.ebuild 1152 BLAKE2B 250f12e24a07b9de4d2f8df29d9542b6db382f1553695fa32c9256031f783a841441bfafbb375aa4118c6a9f94828ebed5aa8d8ca9e3bf7b7c2cf169ae9b7289 SHA512 95847f06f31c8b3647e4651b42f1a15d4f93c682b7febc4d3277fc70f2611556a0692a7160ff77edf40503e958b98971d786203c0f419185534ec654094e1c0a
+EBUILD xml-commons-external-1.4.01-r1.ebuild 764 BLAKE2B 0575c2815534cf378e89545687c78f2a7487b2d16b9cd991ff8e8f50a8166a8b7524b9b25dfa3d1dc649d501b0971798a62b1d085cb9a2ea57ade1150e7ea351 SHA512 3e355a0090ef8ee0206e423042674215678b5aa959d6018c1aa979cb5eb50dcc72218f45395c3502173ee1c1459f07920b1213af05ba1fd07b4994ecb3f54a68
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xml-commons-external/metadata.xml b/dev-java/xml-commons-external/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/xml-commons-external/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
new file mode 100644
index 000000000000..3e9ee47ef9c9
--- /dev/null
+++ b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP"
+HOMEPAGE="http://xml.apache.org/commons/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+# upstream source tar.gz is missing build.xml and other stuff, so we get it like this
+# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_04/java/external/ xml-commons-external-1.3.04
+# tar cjf xml-commons-external-1.3.04.tar.bz2 xml-commons-external-1.3.04
+
+LICENSE="Apache-2.0"
+SLOT="1.3"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
+
+src_install() {
+	java-pkg_dojar build/xml-apis.jar build/xml-apis-ext.jar
+
+	dodoc NOTICE README.* || die
+
+	if use doc; then
+		java-pkg_dojavadoc build/docs/javadoc
+		java-pkg_dohtml -r build/docs/dom
+	fi
+	use source && java-pkg_dosrc src/javax src/org
+}
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
new file mode 100644
index 000000000000..864f0fd76e94
--- /dev/null
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="xml-apis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP"
+HOMEPAGE="http://xerces.apache.org/xml-commons/components/external/"
+SRC_URI="https://repo1.maven.org/maven2/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="1.4"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
diff --git a/dev-java/xml-commons-resolver-1.2-r1 b/dev-java/xml-commons-resolver-1.2-r1
deleted file mode 100644
index 2aa22c99c480..000000000000
--- a/dev-java/xml-commons-resolver-1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=An XML Entity and URI Resolver
-EAPI=6
-HOMEPAGE=http://xml.apache.org/commons/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/xml/commons/xml-commons-resolver-1.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b50ff3c55dce0aa58e5ba60718b391a2
diff --git a/dev-java/xml-commons-resolver/Manifest b/dev-java/xml-commons-resolver/Manifest
new file mode 100644
index 000000000000..09914b63f8bd
--- /dev/null
+++ b/dev-java/xml-commons-resolver/Manifest
@@ -0,0 +1,3 @@
+DIST xml-commons-resolver-1.2.tar.gz 262701 BLAKE2B 54258372fb2d08dd08777bb8355b13c26f426d843e47c6790a6174f82998b9a20bc1bfb8073c5bab8c4d521db54600c8eb3ffdb6c03ce6091073ada655e7c6b2 SHA512 0c91057da3198fc488c7b2c20afb029aa4441ad979159c378d532b02caa294d27e730ae2f9857062af5e3815a603a6110c5441dd3fe6b36c342a78beac3c8a6f
+EBUILD xml-commons-resolver-1.2-r1.ebuild 819 BLAKE2B bf72e8529e04df92e120bdc53da0469b64fe5fdfe8e3c6d3f4e2641179247fed901a99136f99ac0850323e2cbfcd36fb500d3fb031da64dab6e547a6b85d12f7 SHA512 03e429403c1e8104a090ad5af0d32391a8a80a38dd0b019a5a920c6a6db79ae56cd5277300cde55b6840c89a9841fd1c95f7ae9a07f38a0ec294f579afd0e63b
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xml-commons-resolver/metadata.xml b/dev-java/xml-commons-resolver/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/xml-commons-resolver/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild
new file mode 100644
index 000000000000..f70a3a4ec7f5
--- /dev/null
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild
@@ -0,0 +1,36 @@
+# 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="An XML Entity and URI Resolver"
+HOMEPAGE="http://xml.apache.org/commons/"
+SRC_URI="mirror://apache/xml/commons/${P}.tar.gz"
+
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+DOCS=( KEYS LICENSE.resolver.txt NOTICE-resolver.txt )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	rm -rv src/org/apache/xml/resolver/tests || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs
+}
diff --git a/dev-java/xml-commons/Manifest b/dev-java/xml-commons/Manifest
new file mode 100644
index 000000000000..d5124a46d9f7
--- /dev/null
+++ b/dev-java/xml-commons/Manifest
@@ -0,0 +1,3 @@
+DIST xml-commons-1.4.01.tar.gz 358779 BLAKE2B 8e1f42b25279eb2ed8bc33be5ac421b91e256cc1ef170b91f38800417502cb546598fb4c3d4619ab7b3637a9b7173d2d5fefd39af12f75c7b10cfb219396cda7 SHA512 9e8f77f7dc65a492548fa2313b49855ad0880fe663acdac865a1b235ea3bc0ba347c4fad3ca16f0c92a60df42a0a802a74525b56ea58dc575cd2d94013561868
+EBUILD xml-commons-1.4.01.ebuild 591 BLAKE2B 97329e12494a6d46f4565e09d721cc48fafcc2337ab82218097eff6c4896eb708dd688c374313e822281d84193671311a47ba763a4d3fcd7850b6158d2fcfab8 SHA512 dacbcd0cfa5c10d4f178af51188281add62475e3bb02acd213f00bb346747eb83ef4392430b3846c9f1c51e261f37dce168b479252a37a43f3e14152955386fd
+MISC metadata.xml 653 BLAKE2B 75fdc42387f3ed46c83044e3d8feb3be13e6924b24bdb388752b9406fc6bb510fffec696ba27b8003a31f268200f5dcecec3e6e1ac8d5f9deb6ce422d607b170 SHA512 969511cbcf2b402bf8da5c10b79a0fd0f4918cbf67d4ecca7a699834cccd2e96994f3b9b9aa5d8a32ada62a418056a3811d64ddc8ce15660487b68c79cb0fc79
diff --git a/dev-java/xml-commons/metadata.xml b/dev-java/xml-commons/metadata.xml
new file mode 100644
index 000000000000..aa326dec0d1e
--- /dev/null
+++ b/dev-java/xml-commons/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		These are some of the components that are provided by the Apache XML Commons
+		project.
+
+		* Resolver - An XML Entity and URI Resolver donated by Norman Walsh.
+		* Which - A simple environment checking utility for Apache projects by Shane Curcuru
+		* External Interfaces (xml-apis) - An Apache-hosted set of externally-defined standards interfaces, namely DOM, SAX, and JAXP.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/xml-commons/xml-commons-1.4.01.ebuild b/dev-java/xml-commons/xml-commons-1.4.01.ebuild
new file mode 100644
index 000000000000..25d9caa3b6a6
--- /dev/null
+++ b/dev-java/xml-commons/xml-commons-1.4.01.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+MY_PN="${PN}-external"
+MY_P="${MY_PN}-${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache XML Commons"
+HOMEPAGE="http://xml.apache.org/commons/"
+SRC_URI="mirror://apache/xerces/${PN}/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-1.1 public-domain W3C-document W3C"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_SRC_DIR="org javax"
diff --git a/dev-java/xml-security-1.5.7-r1 b/dev-java/xml-security-1.5.7-r1
deleted file mode 100644
index 4b787b6feab6..000000000000
--- a/dev-java/xml-security-1.5.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/commons-logging:0 dev-java/xalan:0 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An implementation of the primary security standards for XML
-EAPI=5
-HOMEPAGE=http://santuario.apache.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-logging:0 dev-java/xalan:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/santuario/java-library/1_5_7/xml-security-bin-1_5_7.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d93c6a4c3a5797a04b68f16f00ae9504
diff --git a/dev-java/xml-security/Manifest b/dev-java/xml-security/Manifest
new file mode 100644
index 000000000000..6554f99489f4
--- /dev/null
+++ b/dev-java/xml-security/Manifest
@@ -0,0 +1,4 @@
+AUX 1.5.7-build.xml.patch 1124 BLAKE2B e51aa373776a51657f6047c8baf15ff0041aa82dcf660846e4218b85b67f7049d4e138c789f24094e170db5a29656fdd6be5501f38197d64fdcef748884a78a9 SHA512 9fd53bf8efde00c0602b007e5d54d00c923432357eb56c727f6f09845a43557b8b168704842e206ac5c78d6718bfd8f3629ee808b6e08e9f18e3097aa7f099e1
+DIST xml-security-bin-1_5_7.zip 9164667 BLAKE2B ea0756f745c27767634bafaae1b3584ba6843cd9d6fe4d9c7cb080058015a576dc8a3f117d32ed3b139a42373057d7dc4ad33f0e25db4abbbaf140a0cc115e01 SHA512 ae8e538fe7c90013a89d139358efc06d8921b1b0050a686dcacd123f5a8a8f100be163e88fef59998ea0ba27ebe9855f06d1f33b1ac92fa3f31acbce9934bd36
+EBUILD xml-security-1.5.7-r1.ebuild 1527 BLAKE2B c276fcef727f2f6850136bfc2d1301def71799bca71cf6e00889a372b77eb26e3b21366cb3d877eddd341a62e5acf91097a19098a00851b5885edda5efedbb0a SHA512 bcf0de359de308d8988e7c5911eb0975cb95eeb566c4803b4c1ffd45b35a3b92cf82168b41022feb76b42dbddc91fb5b1b45326f949a70063052c1d38433d33a
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xml-security/files/1.5.7-build.xml.patch b/dev-java/xml-security/files/1.5.7-build.xml.patch
new file mode 100644
index 000000000000..294c059574d6
--- /dev/null
+++ b/dev-java/xml-security/files/1.5.7-build.xml.patch
@@ -0,0 +1,38 @@
+diff --git a/xml-security-1_5_5/build.xml b/xml-security-1_5_5/build.xml
+index d959d67..d91f98e 100644
+--- a/xml-security-1_5_5/build.xml
++++ b/xml-security-1_5_5/build.xml
+@@ -668,7 +668,7 @@
+     </target>
+ 
+     <target name="build.jar"
+-	    depends="manifest,build.src,build.test,build.samples">
++	    depends="manifest,build.src">
+ 
+ 	<!-- Main Library -->
+ 	<jar basedir="${dir.build.bin}"
+@@ -678,24 +678,6 @@
+ 	     manifest="${jar.manifest}">
+ 	  <metainf file="${dir.manifest}/*.txt"/>
+ 	</jar>
+-
+-	<!-- Samples -->
+-	<jar basedir="${dir.build.samples}" 
+-	     excludes="org/apache/xml/security/temp/**" 
+-	     includes="org/apache/**, javax/xml/crypto/**"
+-	     destfile="${jar.samples}" 
+-	     manifest="${jar.manifest}">
+-	  <metainf file="${dir.manifest}/*.txt"/>
+-	</jar>
+-		
+-	<!-- Tests -->
+-	<jar basedir="${dir.build.test}" 
+-	     excludes="org/apache/xml/security/temp/**" 
+-	     includes="org/apache/**, javax/xml/crypto/**"
+-	     destfile="${jar.tests}" 
+-	     manifest="${jar.manifest}">
+-	  <metainf file="${dir.manifest}/*.txt"/>
+-	</jar>
+     </target>
+ 
+     <target name="build.src.jar"
diff --git a/dev-java/xml-security/metadata.xml b/dev-java/xml-security/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/xml-security/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xml-security/xml-security-1.5.7-r1.ebuild b/dev-java/xml-security/xml-security-1.5.7-r1.ebuild
new file mode 100644
index 000000000000..2f0dfc584976
--- /dev/null
+++ b/dev-java/xml-security/xml-security-1.5.7-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=${PV//./_}
+DESCRIPTION="An implementation of the primary security standards for XML"
+HOMEPAGE="http://santuario.apache.org/"
+SRC_URI="mirror://apache/santuario/java-library/${MY_PV}/${PN}-bin-${MY_PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/commons-logging:0
+	dev-java/xalan:0
+"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="commons-logging,xalan"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}"/build/xmlsec-${PV}.jar
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_TARGET="build.test test"
+WANT_ANT_TASKS="ant-junit"
+
+# Buggy tests.
+JAVA_RM_FILES=(
+	src/test/java/org/apache/xml/security/test/encryption/BaltimoreEncTest.java
+	src/test/java/org/apache/xml/security/test/encryption/XMLCipherTest.java
+	src/test/java/org/apache/xml/security/test/utils/OldApiTest.java
+)
+
+java_prepare() {
+	epatch "${FILESDIR}/${PV}-build.xml.patch"
+	find "${S}" -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/build/xmlsec-${PV}.jar ${PN}.jar
+
+	use source && java-pkg_dosrc "${S}"/src/main/java/*
+	use doc && java-pkg_dojavadoc "${S}"/build/docs/html/javadoc
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/xml-writer-0.2-r1 b/dev-java/xml-writer-0.2-r1
deleted file mode 100644
index e58d5c912fa8..000000000000
--- a/dev-java/xml-writer-0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A simple XML Writer
-EAPI=5
-HOMEPAGE=http://www.megginson.com/downloads/
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.megginson.com/downloads/xml-writer-0.2.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=957c130a9698360ae600982b0f7d291e
diff --git a/dev-java/xml-writer/Manifest b/dev-java/xml-writer/Manifest
new file mode 100644
index 000000000000..161c9c0073a3
--- /dev/null
+++ b/dev-java/xml-writer/Manifest
@@ -0,0 +1,3 @@
+DIST xml-writer-0.2.zip 51666 BLAKE2B 7b2655f18878ab2c13e42538b07faf463c581dae10fda416bf0548d7baaa13ae457c2a7636b54297826b2c4622aa9d9770886ccf512f7b8e337b288a07cd1928 SHA512 6097d3515b0b6b06710c0913dbd378b2008a485d28000f7397151464747f0156f7e427efd33a8d0f43494b6c3d80470207fcbc742b338f3adec7d4d0f3a2b6d5
+EBUILD xml-writer-0.2-r1.ebuild 652 BLAKE2B a589dbd3e6608655b158ad0b67401f3b2f260986b7b5bac534a295e32845453acfc662eb0d3ff51c722d0d241e8b93d902c6cf16ce0b4285f2dc22c3f398e691 SHA512 964df4000c73f96791d2eee136bf1cb19988651a774b72076e11008d005c9dbbc0854b6d9ccf2e26d3205ef0878791b94ebbb03861e7337ac5082b541f56ea79
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xml-writer/metadata.xml b/dev-java/xml-writer/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/xml-writer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xml-writer/xml-writer-0.2-r1.ebuild b/dev-java/xml-writer/xml-writer-0.2-r1.ebuild
new file mode 100644
index 000000000000..1aea28db10e2
--- /dev/null
+++ b/dev-java/xml-writer/xml-writer-0.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A simple XML Writer"
+HOMEPAGE="http://www.megginson.com/downloads/"
+SRC_URI="http://www.megginson.com/downloads/${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples *.java sample.xml
+}
diff --git a/dev-java/xml-xmlbeans-2.6.0 b/dev-java/xml-xmlbeans-2.6.0
deleted file mode 100644
index b99e0051222a..000000000000
--- a/dev-java/xml-xmlbeans-2.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=dev-java/saxon:9 dev-java/jsr173:0 dev-java/annogen:0 dev-java/piccolo:0 dev-java/ant-core:0 dev-java/xml-commons-resolver:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An XML-Java binding tool
-EAPI=5
-HOMEPAGE=http://xmlbeans.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/saxon:9 dev-java/jsr173:0 dev-java/annogen:0 dev-java/piccolo:0 dev-java/ant-core:0 dev-java/xml-commons-resolver:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=http://archive.apache.org/dist/xmlbeans/source/xmlbeans-2.6.0-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=aaafed38e99a7b6df1193542a5623d3b
diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest
new file mode 100644
index 000000000000..41567bbec037
--- /dev/null
+++ b/dev-java/xml-xmlbeans/Manifest
@@ -0,0 +1,7 @@
+AUX xml-xmlbeans-2.6.0-SchemaCompiler.java.patch 802 BLAKE2B 472a1d8cc749b0fe9689eb1eeabd12244397cad290daae41c8ae5b918502377d0ecb7c30d7952bc005ca9f5dae99f2dde1da3c04c47665904bb516717249ea33 SHA512 24ff76b5c046ac1e1837e75f7a3becbb64acf5966f584215e99d1b0f47a3ac5465ae53746d97ad8246f352452db7722e6135e95b660fda1d02010c4ec87a88ea
+AUX xml-xmlbeans-2.6.0-jam.patch 3594 BLAKE2B 426b7a1d4051aa029abe56f377604216f0c64523867267d892ba2dde70fbb3b0600bf522e387a99e64d5582e3610dca65478c834a95bca9cbe80903cb71d3dc0 SHA512 e105cbd5efa08f80685d506dc22a6e9a1ef29df78cd6ca64f3de1a70a7ea93dad4e51f93ee38fcf73a823f01fe50981c4693d619fdad67cdd481279f64ad4a5c
+AUX xml-xmlbeans-2.6.0-piccolo.patch 776 BLAKE2B e7a7795099c710a249136e3831c0f5198e4b41c03709445e0917508cbe82d5d84558a8b8e309937cd3926062ef60a260d400e61d7e8182537f3dcc6529f7ee2c SHA512 e32ac926cae60ff5d10e0647988c3dcfea986a9b0cab9667dd3c73bad6b49fb74585350022b43e24dbc30fef09d87823210e9dc38e830486145924904431e6be
+AUX xml-xmlbeans-2.6.0-remove-jamsupport.patch 1656 BLAKE2B 35ef1a12f1e8c4dbf03ac3870b714fc246cc81d609aa7453ac5755476fe8a1fe7d46fb7e8e725cbdd06282cebbdb0c6ab85c394202004f7e91dcff54545bc827 SHA512 54b570f2960340eecf4368caeaf5d7c84ece7e691bda7460532d5d778e78a6b41a7e776de02b53fa5d5385f66639353758d76d710c1c3e2332ceb2854b9c84fe
+DIST xmlbeans-2.6.0-src.zip 9005098 BLAKE2B e8fb7b22eab718245a24856893268dbc1a09b3228596f274e470ea55aca4c0d01c05ef8e3cbd2ddbdedfd16c66991ee5f8c4001cb68ff9876d5749f47d640006 SHA512 162dc3d283ebf9f7fae823a2ae8d835b708c2cbeed48349c85996e60b2b8dfe0e51b17bd37eb34327c6452b2c0fc7df8a4902816b145993e36ca614ceb43b2b7
+EBUILD xml-xmlbeans-2.6.0.ebuild 2339 BLAKE2B 9ce6a87c268fe18b0ff45f6053ccafaa716197d4421fbdfc8283a9d27ab9365f40edbe7bd922cc79c9c1010db759b751fbe0133efd801c6b26122800f9a7e23c SHA512 4a8a0c89c1c537cd9b6a30bb526761f2b06c95d80442397293c05be145e37f8989ce57ce397757c13f780610e3a989ba0f44e7673f6586a34ce36051e83324a2
+MISC metadata.xml 1185 BLAKE2B 0647d5d81e325691c54342510e249e98b26e07157d5f892d5b34ed54be045a7971ec925825afe9062d38bf5278bb316385c2e46901f6b65890cab3559b30897c SHA512 5f4554c860fb8b6b2bcf0b7cb8b0f8f147c187091cd64597aede3a3543570f586eb3c0fa4d69e2e2391bd5e839bb8ab089d05a05099554d206691c120c9321ff
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch
new file mode 100644
index 000000000000..9f2958bc243a
--- /dev/null
+++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch
@@ -0,0 +1,14 @@
+--- src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java.orig	2015-11-11 15:58:46.578486000 +0000
++++ src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java	2015-11-11 15:59:05.351486000 +0000
+@@ -217,8 +217,9 @@
+         boolean debug = (cl.getOpt("debug") != null);
+ 
+         String allowmdef = cl.getOpt("allowmdef");
+-        Set mdefNamespaces = (allowmdef == null ? Collections.EMPTY_SET :
+-                new HashSet(Arrays.asList(XmlListImpl.split_list(allowmdef))));
++        Set mdefNamespaces = Collections.EMPTY_SET;
++        // Set mdefNamespaces = (allowmdef == null ? Collections.EMPTY_SET :
++        //         new HashSet(Arrays.asList(XmlListImpl.split_list(allowmdef))));
+ 
+         List extensions = new ArrayList();
+         if (cl.getOpt("extension") != null) {
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch
new file mode 100644
index 000000000000..8081f71775f6
--- /dev/null
+++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch
@@ -0,0 +1,64 @@
+diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
+--- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java	2010-04-14 08:30:34.000000000 +0300
++++ src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java	2012-09-05 23:03:48.617016181 +0300
+@@ -27,10 +27,10 @@
+ import org.apache.xmlbeans.XmlError;
+ import org.apache.xmlbeans.InterfaceExtension;
+ import org.apache.xmlbeans.PrePostExtension;
+-import org.apache.xmlbeans.impl.jam.JamClassLoader;
+-import org.apache.xmlbeans.impl.jam.JamService;
+-import org.apache.xmlbeans.impl.jam.JamServiceFactory;
+-import org.apache.xmlbeans.impl.jam.JamServiceParams;
++import org.codehaus.jam.JamClassLoader;
++import org.codehaus.jam.JamService;
++import org.codehaus.jam.JamServiceFactory;
++import org.codehaus.jam.JamServiceParams;
+ import org.apache.xmlbeans.impl.schema.StscState;
+ 
+ import javax.xml.namespace.QName;
+diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
+--- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java	2010-04-14 08:30:34.000000000 +0300
++++ src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java	2012-09-05 23:09:00.320097542 +0300
+@@ -18,10 +18,10 @@
+ import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig;
+ import org.apache.xmlbeans.InterfaceExtension;
+ import org.apache.xmlbeans.XmlObject;
+-import org.apache.xmlbeans.impl.jam.JMethod;
+-import org.apache.xmlbeans.impl.jam.JClass;
+-import org.apache.xmlbeans.impl.jam.JParameter;
+-import org.apache.xmlbeans.impl.jam.JamClassLoader;
++import org.codehaus.jam.JMethod;
++import org.codehaus.jam.JClass;
++import org.codehaus.jam.JParameter;
++import org.codehaus.jam.JamClassLoader;
+ 
+ public class InterfaceExtensionImpl implements InterfaceExtension
+ {
+diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java
+--- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java	2010-04-14 08:30:34.000000000 +0300
++++ src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java	2012-09-05 23:06:48.081760004 +0300
+@@ -17,9 +17,9 @@
+ 
+ import org.apache.xmlbeans.XmlObject;
+ import org.apache.xmlbeans.PrePostExtension;
+-import org.apache.xmlbeans.impl.jam.JamClassLoader;
+-import org.apache.xmlbeans.impl.jam.JClass;
+-import org.apache.xmlbeans.impl.jam.JMethod;
++import org.codehaus.jam.JamClassLoader;
++import org.codehaus.jam.JClass;
++import org.codehaus.jam.JMethod;
+ import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig;
+ 
+ 
+diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java
+--- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java	2010-04-14 08:30:34.000000000 +0300
++++ src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java	2012-09-05 23:06:33.710940667 +0300
+@@ -3,7 +3,7 @@
+ import javax.xml.namespace.QName;
+ 
+ import org.apache.xmlbeans.UserType;
+-import org.apache.xmlbeans.impl.jam.JamClassLoader;
++import org.codehaus.jam.JamClassLoader;
+ import org.apache.xmlbeans.impl.xb.xmlconfig.Usertypeconfig;
+ 
+ public class UserTypeImpl implements UserType
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch
new file mode 100644
index 000000000000..866dc0f6ed53
--- /dev/null
+++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch
@@ -0,0 +1,14 @@
+diff -ur /tmp/xmlbeans-2.6.0.orig/src/store/org/apache/xmlbeans/impl/store/Locale.java src/store/org/apache/xmlbeans/impl/store/Locale.java
+--- /tmp/xmlbeans-2.6.0.orig/src/store/org/apache/xmlbeans/impl/store/Locale.java	2012-09-05 14:31:47.743396340 +0300
++++ src/store/org/apache/xmlbeans/impl/store/Locale.java	2012-09-05 14:35:31.527582989 +0300
+@@ -106,8 +106,8 @@
+ import org.apache.xmlbeans.impl.values.TypeStoreUser;
+ import org.apache.xmlbeans.impl.values.TypeStoreUserFactory;
+ 
+-import org.apache.xmlbeans.impl.piccolo.xml.Piccolo;
+-import org.apache.xmlbeans.impl.piccolo.io.FileFormatException;
++import com.bluecast.xml.Piccolo;
++import com.bluecast.io.FileFormatException;
+ 
+ public final class Locale
+     implements DOMImplementation, SaajCallback, XmlLocale
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch
new file mode 100644
index 000000000000..23467d2b24a6
--- /dev/null
+++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch
@@ -0,0 +1,37 @@
+--- a/build.xml
++++ b/build.xml
+@@ -433,7 +433,6 @@
+         <jar jarfile="build/private/xmlbeans-${version.base}${version.rc}-sources.jar" index="false">
+             <fileset dir="src/common" includes="**/*.java"/>
+             <fileset dir="src/configschema" includes="**/*.java"/>
+-            <fileset dir="src/jamsupport" includes="**/*.java"/>
+             <fileset dir="src/marshal" includes="**/*.java"/>
+             <fileset dir="src/repackage" includes="**/*.java"/>
+             <fileset dir="src/saaj_api" includes="**/*.java"/>
+@@ -488,7 +487,7 @@
+                  store.classes, saaj_api.classes,
+                  marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes,
+                  xmlinputstream.classes, resolver.jar, xbean_xpath.jar,
+-                 piccolo.classes, tools.classes, jamsupport.classes">
++                 piccolo.classes, tools.classes">
+         <jar jarfile="build/lib/xbean.jar" index="true">
+             <fileset dir="build/classes/xmlpublic"
+                 excludes="javax/**"/>
+@@ -711,17 +710,6 @@
+             </classpath>
+         </javac>
+     </target>
+-
+-
+-    <!-- support for running JAM under JDK1.5 ========================= -->
+-
+-    <target name="jamsupport.classes" depends="dirs,jam.classes">
+-        <javac srcdir="src/jamsupport" destdir="build/classes/jam" source="${javac.source}" target="${javac.target}" debug="on">
+-            <classpath id="jamsupport.compile.path">
+-                <pathelement location="build/classes/jam"/>
+-            </classpath>
+-        </javac>
+-    </target>
+ 
+     <!-- saaj_api target ============================================== -->
+ 
diff --git a/dev-java/xml-xmlbeans/metadata.xml b/dev-java/xml-xmlbeans/metadata.xml
new file mode 100644
index 000000000000..16bd04df50d9
--- /dev/null
+++ b/dev-java/xml-xmlbeans/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+
+<longdescription>
+
+XMLBeans is a tool that allows you to access the full power of XML in a Java
+friendly way. It is an XML-Java binding tool. The idea is that you can take
+advantage the richness and features of XML and XML Schema and have these
+features mapped as naturally as possible to the equivalent Java language and
+typing constructs. XMLBeans uses XML Schema to compile Java interfaces and
+classes that you can then use to access and modify XML instance data. Using
+XMLBeans is similar to using any other Java interface/class, you will see things
+like getFoo or setFoo just as you would expect when working with Java. While a
+major use of XMLBeans is to access your XML instance data with strongly typed
+Java classes there are also API's that allow you access to the full XML infoset
+(XMLBeans keeps full XML Infoset fidelity) as well as to allow you to reflect
+into the XML schema itself through an XML Schema Object model.
+
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
new file mode 100644
index 000000000000..caeeefcb60e9
--- /dev/null
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="xmlbeans-${PV}"
+
+DESCRIPTION="An XML-Java binding tool"
+HOMEPAGE="http://xmlbeans.apache.org/"
+SRC_URI="http://archive.apache.org/dist/xmlbeans/source/${MY_P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/saxon:9
+	dev-java/jsr173:0
+	dev-java/annogen:0
+	dev-java/piccolo:0
+	dev-java/ant-core:0
+	dev-java/xml-commons-resolver:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-jamsupport.patch
+	"${FILESDIR}"/${P}-piccolo.patch
+	"${FILESDIR}"/${P}-jam.patch
+	"${FILESDIR}"/${P}-SchemaCompiler.java.patch
+)
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+
+	# Preserve the old xbean jar, which is required for bootstrapping schemas.
+	mv external/lib/oldxbean.jar "${T}"/ || die
+
+	# Remove bundled binary files.
+	find . -name '*.jar' -exec rm -v {} + || die
+
+	pushd external/lib > /dev/null || die
+
+	find . -iname '*.zip' -exec rm -v {} + || die
+
+	# Symlink the dependencies.
+	java-pkg_jar-from jsr173{,.jar,_1.0_api_bundle.jar}
+	java-pkg_jar-from jsr173{,.jar,_1.0_api.jar}
+
+	mkdir xml-commons-resolver-1.1 || die
+	java-pkg_jar-from xml-commons-resolver{,.jar} xcresolver.zip
+	java-pkg_jar-from xml-commons-resolver{,.jar,-1.1/resolver.jar}
+
+	# Put back the preserved old xbean jar.
+	mv "${T}"/oldxbean.jar . || die
+
+	popd > /dev/null || die
+
+	# Create empty directories to let the build pass.
+	mkdir -p build/classes/{jam,piccolo} || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+	annogen
+	piccolo
+	ant-core
+	saxon-9
+"
+
+EANT_BUILD_TARGET="deploy"
+EANT_DOC_TARGET="docs"
+
+EANT_EXTRA_ARGS="-Dpiccolo.classes.notRequired=true"
+EANT_EXTRA_ARGS+=" -Djam.classes.notRequired=true"
+EANT_EXTRA_ARGS+=" -Dsaxon9.jar.exists=true"
+
+src_install() {
+	java-pkg_dojar build/lib/xbean*.jar
+
+	dodoc NOTICE.txt README.txt
+	if use doc; then
+		java-pkg_dojavadoc build/docs/reference
+		java-pkg_dohtml -r docs
+	fi
+
+	use source && java-pkg_dosrc src/*
+}
+
+pkg_postinst() {
+	ewarn "This package uses an old binary xbean to bootstrap its schemas."
+	ewarn "If you do not trust the binary part of this build, please unmerge."
+}
diff --git a/dev-java/xmldb-20011111-r2 b/dev-java/xmldb-20011111-r2
deleted file mode 100644
index 4b5c5ba14bea..000000000000
--- a/dev-java/xmldb-20011111-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/xalan:0 dev-java/xerces:2 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=XML:DB Java library
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/xmldb-org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-1.1
-RDEPEND=dev-java/xalan:0 dev-java/xerces:2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/xmldb-org/xmldb-api-11112001.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4d9902dcca14a6ceb016e6b82a09bf0a
diff --git a/dev-java/xmldb/Manifest b/dev-java/xmldb/Manifest
new file mode 100644
index 000000000000..c1933f10f66b
--- /dev/null
+++ b/dev-java/xmldb/Manifest
@@ -0,0 +1,5 @@
+AUX xmldb-20011111-enum.patch 618 BLAKE2B 2e75eee88aaf768cd8394e82313448c6f0d5840fe5139dc9301cbd679b8ee05521f0e85b5e47e26224a06a2a5b1f88102592558d8677a560aa74edb66a1f61ad SHA512 5c9649f72dfdcdc054f11fdfd055b46e1b0d84949cedb1c29a8beafd05056c3a0206a38e3f022dfa83262f9a4a85b0cded7e3c899e207f51b31dc47cd2f0246f
+AUX xmldb-20011111-unreachable.patch 301 BLAKE2B c5cfa08eada500432b1c0d35ba74686727b6fcd8c8675cff9b2b2833e26055bb39e2586807e8f3099d49b83de074eb15387978f247bc5d01197d7c2956564104 SHA512 5cb8ee4323596b427fd15a1c0764ebdf377c7acc5a2111c17dc24b826965d61f4e576885dcceca600eb5dd850cee9a98c48f4b3fe5272f7f9d4558834e451786
+DIST xmldb-api-11112001.tar.gz 36553 BLAKE2B 458c0d043e47580776dc9348fc650c135d14c316ca4f5722d30c753e222e5b29cc524d962daa4729bc9cfbbe0adbd5519735e6333811bf202575d375cd3971ec SHA512 20123801a57b5350ade4dc82aba5ba2492cfbbe2e0389aaba4b73cdd3a8d07981a895ec2318885358102e48644cdaa30a18996ab9315891e506506fbc25658a2
+EBUILD xmldb-20011111-r2.ebuild 958 BLAKE2B 2c13db66ddec83db16da9ea343a5f42143d69720afb2b0963debb603be579c9eca314964403fa9e3f883e9ec0a6897ebc020d5d8444ac15400f4a427df7d7280 SHA512 f13d0421d61030a1d2b7de2e76ac7f6883adbc3bff0aabc4f0bc9efddc879c2391bac811fd13483b102a820cc0f2e2f2e3f32b3407291592ff16014a2d7cdf08
+MISC metadata.xml 594 BLAKE2B f5ba9a86091967e5f55fa090e3b6816919bd98a6ce0fd4f0bcc3cb8a5e474867b52cda19bd30bed1f3f215235134c9e842d2bdead35dcd770becf17dde2836f9 SHA512 7ef7cbbdfb0678d0cb201cf9d941ef1c539b7141b7378e9e3dbb80caddbfe27b04ec63c0e1b775760f1a46a6c66c606183d0c83eb9d6d5f086017c9ff9cd7bab
diff --git a/dev-java/xmldb/files/xmldb-20011111-enum.patch b/dev-java/xmldb/files/xmldb-20011111-enum.patch
new file mode 100644
index 000000000000..33a4b22b179f
--- /dev/null
+++ b/dev-java/xmldb/files/xmldb-20011111-enum.patch
@@ -0,0 +1,15 @@
+--- a/org/xmldb/api/sdk/modules/SetContentHandler.java	2017-03-17 21:49:05.540172602 +0000
++++ b/org/xmldb/api/sdk/modules/SetContentHandler.java	2017-03-17 21:49:22.860172942 +0000
+@@ -168,9 +168,9 @@
+          }
+       }
+
+-      Enumeration enum = namespaces.keys();
+-      while ( enum.hasMoreElements() ) {
+-         String key = (String) enum.nextElement();
++      Enumeration myEnum = namespaces.keys();
++      while ( myEnum.hasMoreElements() ) {
++         String key = (String) myEnum.nextElement();
+          newContent.append(" xmlns");
+          if (key.length() > 0) {
+             newContent.append(":");
diff --git a/dev-java/xmldb/files/xmldb-20011111-unreachable.patch b/dev-java/xmldb/files/xmldb-20011111-unreachable.patch
new file mode 100644
index 000000000000..a0476158c550
--- /dev/null
+++ b/dev-java/xmldb/files/xmldb-20011111-unreachable.patch
@@ -0,0 +1,11 @@
+--- a/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java	2002-01-30 04:46:43.000000000 -0500
++++ b/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java	2005-06-26 21:37:59.000000000 -0400
+@@ -133,7 +133,7 @@
+          }
+       }
+ 
+-      return result;;
++      return result;
+    }
+ }
+ 
diff --git a/dev-java/xmldb/metadata.xml b/dev-java/xmldb/metadata.xml
new file mode 100644
index 000000000000..eacb98ec28e9
--- /dev/null
+++ b/dev-java/xmldb/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+XML:DB provides a community for collaborative development of specifications
+for XML databases and data manipulation technologies. Along with each
+specification an open source reference implementation will be developed to
+validate the ideas.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xmldb-org</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/xmldb/xmldb-20011111-r2.ebuild b/dev-java/xmldb/xmldb-20011111-r2.ebuild
new file mode 100644
index 000000000000..4d1a0eb41ce1
--- /dev/null
+++ b/dev-java/xmldb/xmldb-20011111-r2.ebuild
@@ -0,0 +1,52 @@
+# 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
+
+MY_PN="${PN}-api"
+MY_PV="11112001"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="XML:DB Java library"
+HOMEPAGE="https://sourceforge.net/projects/xmldb-org/"
+SRC_URI="mirror://sourceforge/xmldb-org/${MY_P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND="
+	dev-java/xalan:0
+	dev-java/xerces:2"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="
+	xalan
+	xerces-2
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-enum.patch"
+	"${FILESDIR}/${P}-unreachable.patch"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	# Must hard-depend on dev-java/junit otherwise.
+	rm -rv org/xmldb/api/tests || die
+}
diff --git a/dev-java/xmlgraphics-commons-2.0.1 b/dev-java/xmlgraphics-commons-2.0.1
deleted file mode 100644
index 073d9b33e3e1..000000000000
--- a/dev-java/xmlgraphics-commons-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/mockito:0 dev-java/ant-junit:0 dev-java/xml-commons-resolver:0 ) dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A library of several reusable components used by Apache Batik and Apache FOP
-EAPI=5
-HOMEPAGE=https://xmlgraphics.apache.org/commons/index.html
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.0.1-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fdc8c79ac844f968a12dd709e1c54d71
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
new file mode 100644
index 000000000000..8d65bf959b10
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -0,0 +1,3 @@
+DIST xmlgraphics-commons-2.0.1-src.tar.gz 2716982 BLAKE2B 52d878455886f85a04ec27d04568a6a0a955860978243d6840f61083fd13597a2f066cc9821f2fced27245c98c6cb6e09caa3ad200d45069f640166a7c772cbd SHA512 fca5c593ceec18b040a0a57b74ba5377d5e070030f48b7835285986382795b19072bdf6320fd7e37182e4127883b795249ee1cb4255bcdfb1b00da1cf6032018
+EBUILD xmlgraphics-commons-2.0.1.ebuild 1261 BLAKE2B 06dd7f0b2c9e57f3bfda985b9983bb6b9300e979313ed588a71d44cebe5091215658c4c6acdde37f0f5f5bf87e7432213a434e367da791d614f86a3600ae98ce SHA512 44bdde6e9e5f43ef5f2ecc71074e939c20dac9a723326a4e6bb43e50e9826effe977b76567d9ac9e7272b53a16a9c779550fce7a334fd8772483a5ca6bd6c536
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xmlgraphics-commons/metadata.xml b/dev-java/xmlgraphics-commons/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
new file mode 100644
index 000000000000..080a086917d9
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A library of several reusable components used by Apache Batik and Apache FOP"
+HOMEPAGE="https://xmlgraphics.apache.org/commons/index.html"
+SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+
+CDEPEND="dev-java/commons-io:1
+	>=dev-java/commons-logging-1:0"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/mockito:0
+		dev-java/ant-junit:0
+		dev-java/xml-commons-resolver:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+		${CDEPEND}"
+
+java_prepare() {
+	find "${S}" -name '*.jar' -print -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="jar-main"
+EANT_DOC_TARGET="javadocs"
+
+EANT_GENTOO_CLASSPATH="
+	commons-io-1
+	commons-logging
+"
+
+EANT_TEST_GENTOO_CLASSPATH="
+	${EANT_GENTOO_CLASSPATH}
+	xml-commons-resolver
+	mockito
+"
+
+EANT_TEST_TARGET="junit-basic"
+
+src_test() {
+	EANT_ANT_TASKS="ant-junit" \
+		java-pkg-2_src_test
+}
+
+src_install(){
+	java-pkg_newjar build/${P}.jar
+
+	use source && java-pkg_dosrc src/java/org
+	use doc && java-pkg_dojavadoc build/javadocs
+}
diff --git a/dev-java/xmlrpc-3.1.3 b/dev-java/xmlrpc-3.1.3
deleted file mode 100644
index 15aa2e30d6ff..000000000000
--- a/dev-java/xmlrpc-3.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) dev-java/commons-httpclient:3 dev-java/commons-codec:0 dev-java/ws-commons-util:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Apache XML-RPC is a Java implementation of XML-RPC
-EAPI=5
-HOMEPAGE=http://ws.apache.org/xmlrpc/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-httpclient:3 dev-java/commons-codec:0 dev-java/ws-commons-util:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3
-SRC_URI=https://archive.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-3.1.3-src.tar.bz2 https://dev.gentoo.org/~ercpe/distfiles/dev-java/xmlrpc/xmlrpc-3.1.3-build.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d4505da5368b09057275021d438d142d
diff --git a/dev-java/xmlrpc/Manifest b/dev-java/xmlrpc/Manifest
new file mode 100644
index 000000000000..89c9702eb0fd
--- /dev/null
+++ b/dev-java/xmlrpc/Manifest
@@ -0,0 +1,4 @@
+DIST apache-xmlrpc-3.1.3-src.tar.bz2 134788 BLAKE2B e37c588ddd7017d5dda9fb8241baafbff0e93a567bb45b7f102e712149b5b8f0bf75385ae68f2318a3696e3da7239a466afbc979a8a9842a60a7050031c2dcbc SHA512 6ace33922604b9ee48ce578a5988252ae288fe37c303f98757ab283854f97a8c21b01103fe87ca5eb21ce8c04ffcc5bbf2b0328726348bfb2d43cb29d7b5c5af
+DIST xmlrpc-3.1.3-build.tar.gz 3133 BLAKE2B e1cc23334ea561be3900dd70df6157a9818d02dd0b1e93fb63bc033218d51ce080130c2820abbff53d3bd24120ba814c4c099a295f705c01d8256a1d10d1e7dd SHA512 e1613c21a8145994f88ab68c3e64503f6217bb962249a08055f5c24257c0aa3adeb868710c65842c64e2a3e9e1d52dd614a30454be027eb1a939b6f0fc966b57
+EBUILD xmlrpc-3.1.3.ebuild 1603 BLAKE2B e55d4d7efcadbb4a337fa716af783dd4216ff59c35e4480b0a9ba71fa2f10fb7bfa1ffa29d10146eee5cacbbfe49fae06d9f8d2670669313f555b67c56a997b6 SHA512 7e0656bcb29436c558b25c08557c4074bce1e12fada529933b58335ae8d42980222e25967c20aa11095b9f864095312454bc50a7d4d8acc0c9e6131fc1c636ae
+MISC metadata.xml 449 BLAKE2B 011fe7cc6a50256054367b90f784d316e85a8706deda835fb69b7952f0597da65185fffa6565edeeed490e234a55a3cd2b3bae1885fb413bb937cf0e47f8bee4 SHA512 77e3706f3bdc80624dcccc20204ce6f5fdc1c47af5afd39375a1ebce7436207636e9b9c962a5439f082af6e22d88f2d19b2c384970d715f699916cc901c59fc2
diff --git a/dev-java/xmlrpc/metadata.xml b/dev-java/xmlrpc/metadata.xml
new file mode 100644
index 000000000000..535c71949d07
--- /dev/null
+++ b/dev-java/xmlrpc/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Apache XML-RPC (previously known as Helma XML-RPC) is a Java
+		implementation of XML-RPC, a popular protocol that uses XML over
+		HTTP to implement remote procedure calls.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild b/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild
new file mode 100644
index 000000000000..ef2e39853971
--- /dev/null
+++ b/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Apache XML-RPC is a Java implementation of XML-RPC"
+HOMEPAGE="http://ws.apache.org/xmlrpc/"
+SRC_URI="https://archive.apache.org/dist/ws/${PN}/sources/apache-${P}-src.tar.bz2
+		https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}-build.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/commons-httpclient:3
+	dev-java/commons-codec:0
+	dev-java/ws-commons-util:0
+	dev-java/commons-logging:0
+	java-virtuals/servlet-api:2.4
+	"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+IUSE=""
+
+S="${WORKDIR}/apache-${P}-src"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-httpclient-3,commons-codec,ws-commons-util"
+EANT_GENTOO_CLASSPATH+=",commons-logging" # client
+EANT_GENTOO_CLASSPATH+=",servlet-api-2.4" # server
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/common/target/${PN}-common.jar"
+
+java_prepare() {
+	# Doesn't work.
+	rm -v \
+		server/src/test/java/org/apache/xmlrpc/test/SerializerTest.java
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,ant-junit"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar common/target/xmlrpc-common.jar server/target/xmlrpc-server.jar client/target/xmlrpc-client.jar
+
+	use doc && java-pkg_dojavadoc {common,server,client}/target/site/apidocs
+	use source && java-pkg_dosrc {common,server,client}/src/main/java/*
+}
diff --git a/dev-java/xmlstreambuffer-1.5.3 b/dev-java/xmlstreambuffer-1.5.3
deleted file mode 100644
index 1cce73627e03..000000000000
--- a/dev-java/xmlstreambuffer-1.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 dev-java/stax-ex:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A stream-based representation of an XML infoset in Java
-EAPI=5
-HOMEPAGE=https://xmlstreambuffer.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL GPL-2
-RDEPEND=>=virtual/jre-1.5 dev-java/stax-ex:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/xml/stream/buffer/streambuffer/1.5.3/streambuffer-1.5.3-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=11179c564cf043adabbffbf78259b1b7
diff --git a/dev-java/xmlstreambuffer/Manifest b/dev-java/xmlstreambuffer/Manifest
new file mode 100644
index 000000000000..f2ac0934d5fd
--- /dev/null
+++ b/dev-java/xmlstreambuffer/Manifest
@@ -0,0 +1,3 @@
+DIST streambuffer-1.5.3-sources.jar 63319 BLAKE2B f41af2d3ab6bd085779fb7aa4e5025727762878f408f0b1908a6471ed31c6674d576db6eb7dd269e3f071bd12beab899e46df5699971711401099dcfe4fe8fd9 SHA512 5f906af01bc2a796efb8f3221c60da3faf20c2a695d0d86afcc1439857ce55a90ecd9df6853b3717e28736c02524e05735770300eecbe83ba58c217c9da92740
+EBUILD xmlstreambuffer-1.5.3.ebuild 658 BLAKE2B 5ab0a9d869767b34602272e34071eb0870b2398886183a85671d62bf28efaf86681fed1c53b8fe008e7802524924ed7c9a45bcffb4efb55e04868b281425429b SHA512 b6d39cc06677483d8df56cd587bfb0320f9fae1ed0cba66fff27a33c6ab854967fb91d089502e36eec9d9a3fdb662b4af9641f6f6eb6c7d49b27fba4d3657b97
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/xmlstreambuffer/metadata.xml b/dev-java/xmlstreambuffer/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/xmlstreambuffer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild b/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
new file mode 100644
index 000000000000..52d9d6ba51ca
--- /dev/null
+++ b/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN=${PN/xml/}
+
+DESCRIPTION="A stream-based representation of an XML infoset in Java"
+HOMEPAGE="https://xmlstreambuffer.java.net/"
+SRC_URI="https://maven.java.net/content/repositories/releases/com/sun/xml/stream/buffer/${MY_PN}/${PV}/${MY_PN}-${PV}-sources.jar"
+
+LICENSE="CDDL GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEP="dev-java/stax-ex:1"
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+JAVA_GENTOO_CLASSPATH="stax-ex-1"
diff --git a/dev-java/xmlunit-1.6 b/dev-java/xmlunit-1.6
deleted file mode 100644
index 007aaee6f0e5..000000000000
--- a/dev-java/xmlunit-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip:0 doc? ( app-text/docbook-xsl-stylesheets:0 ) test? ( dev-java/ant-junit:0 dev-java/ant-core:0 ) dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=XMLUnit extends JUnit and NUnit to enable unit testing of XML
-EAPI=5
-HOMEPAGE=http://xmlunit.sourceforge.net/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://sourceforge/xmlunit/xmlunit-1.6-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=65d9ced889708dcc2b73b49c16ba6a4b
diff --git a/dev-java/xmlunit/Manifest b/dev-java/xmlunit/Manifest
new file mode 100644
index 000000000000..c77a66b9ac67
--- /dev/null
+++ b/dev-java/xmlunit/Manifest
@@ -0,0 +1,3 @@
+DIST xmlunit-1.6-src.zip 830899 BLAKE2B 74bc5238667444fac0a6780090a76cf9c2a6fa4f0536bdde36858190cbd0528873b14b5ee05e098840be1b01e0ccfa3d2243ef63f92dae6cbfef1d84732f1f33 SHA512 a7d15905d959ab5bfeb1807c80eab3e0aa58d501a2136335961da842b9571b95b4aab18189e9a21e59afac960ea83f9a2d32e3af398f63c0f839587b60b9f96b
+EBUILD xmlunit-1.6.ebuild 1107 BLAKE2B 2d74e0b4b38e2a8bfd7624573de1f7fd50deca0da2eb74d0c9e8f6e6a130dd7b2b55fba7f929cce7c8dd98f9079b0dcee0765837a6557713a81745d7c040d787 SHA512 2f2b130513571653bdf2535af57aa844b6205fd1943d5156220a7d3aed4c18e0f84f786ed5cb8bafebfb0116d5e258bc10d28fbd66643ddfb9fe70b06ae56f9d
+MISC metadata.xml 313 BLAKE2B a20fffbb3de91d48f2cec7edd9252f6e1e32e4cec7e825d8794742b8d30f0862d2a1daac0fa02d962cb6205eb7b42dd589890e861b46bc2ef4638efcf9abb914 SHA512 385494ac2513d58cfbbd905478df522a330e0b84afe4f35871d360c6ebcd099537c2a0fda301ea10dfed80bddcf57324325f3821442713dc85153de8b1e163c9
diff --git a/dev-java/xmlunit/metadata.xml b/dev-java/xmlunit/metadata.xml
new file mode 100644
index 000000000000..28e3792f3d46
--- /dev/null
+++ b/dev-java/xmlunit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xmlunit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/xmlunit/xmlunit-1.6.ebuild b/dev-java/xmlunit/xmlunit-1.6.ebuild
new file mode 100644
index 000000000000..b6e5dc47b97b
--- /dev/null
+++ b/dev-java/xmlunit/xmlunit-1.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+HOMEPAGE="http://xmlunit.sourceforge.net/"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="amd64 ppc64 x86"
+
+CDEPEND="dev-java/junit:0"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip:0
+	doc? ( app-text/docbook-xsl-stylesheets:0 )
+	test? (
+		dev-java/ant-junit:0
+		dev-java/ant-core:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit"
+
+EANT_DOC_TARGET="users-guide-html javadocs"
+EANT_ANT_TASKS="ant-core"
+EANT_EXTRA_ARGS="-Ddb5.xsl=/usr/share/sgml/docbook/xsl-stylesheets"
+
+src_test() {
+	ANT_TASKS="ant-junit ant-core" eant test
+}
+
+src_install() {
+	java-pkg_newjar "build/lib/${P}.jar"
+
+	dodoc README.txt
+
+	if use doc; then
+		java-pkg_dojavadoc build/doc/api
+		dohtml build/doc/userguide/html/*
+	fi
+
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/xmpcore-5.1.2 b/dev-java/xmpcore-5.1.2
deleted file mode 100644
index 04595e0486f9..000000000000
--- a/dev-java/xmpcore-5.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library based on the Adobe C++ XMPCore library with a similar API
-EAPI=5
-HOMEPAGE=https://www.adobe.com/devnet/xmp.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/com/adobe/xmp/xmpcore/5.1.2/xmpcore-5.1.2-sources.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8b8478f54d606fdb446a645350537d94
diff --git a/dev-java/xmpcore/Manifest b/dev-java/xmpcore/Manifest
new file mode 100644
index 000000000000..0d19caf15b10
--- /dev/null
+++ b/dev-java/xmpcore/Manifest
@@ -0,0 +1,3 @@
+DIST xmpcore-5.1.2-sources.jar 136918 BLAKE2B 521a2ae6093a51a0845ede16e56d4f9e2525ff7c7ad2c877ecd08a6673befd76002a1c35c635966d8664a2ef601f0d10a1e8a9562dc4c0564d4eaf48ea27cac0 SHA512 ad4c78a68f1d32a358b79bfb4acacbcc56eaa294af5afbb29eb916a1a488dba547e72c4d94809222fae63fd7c66940d9ce7cb6c06598f9c7b8691d0feaabdad8
+EBUILD xmpcore-5.1.2.ebuild 499 BLAKE2B df5454aedbbc68ccf30499839eba794a9abd592df75fb36f93845420d50963b2a4b92811bb392e3a43d6df1f79e0c5ceba2d8bf2c382b5b8195b1f1ecf4ac1ca SHA512 08ee2a9ba00868f2d69f2e9498f5e8b216b16e81e34c568ad5832609bc58c29ee163623c82e3c1a3808ae37ab3df5b902e88ccd8289c03295be110348f2f93ec
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xmpcore/metadata.xml b/dev-java/xmpcore/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/xmpcore/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xmpcore/xmpcore-5.1.2.ebuild b/dev-java/xmpcore/xmpcore-5.1.2.ebuild
new file mode 100644
index 000000000000..bc4a6b95771f
--- /dev/null
+++ b/dev-java/xmpcore/xmpcore-5.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library based on the Adobe C++ XMPCore library with a similar API"
+HOMEPAGE="https://www.adobe.com/devnet/xmp.html"
+SRC_URI="http://central.maven.org/maven2/com/adobe/xmp/${PN}/${PV}/${P}-sources.jar"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/xom-1.2.10 b/dev-java/xom-1.2.10
deleted file mode 100644
index 922fbbe56cb2..000000000000
--- a/dev-java/xom-1.2.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/jarjar:1 dev-java/xerces:2 dev-java/xml-commons-external:1.3 examples? ( java-virtuals/servlet-api:2.4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A new XML object model
-EAPI=5
-HOMEPAGE=http://cafeconleche.org/XOM/index.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2
-RDEPEND=>=virtual/jre-1.4 dev-java/xerces:2 dev-java/xml-commons-external:1.3 examples? ( java-virtuals/servlet-api:2.4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://cafeconleche.org/XOM/xom-1.2.10.tar.gz http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b396e7f1e5dc52540b8e387a1e8ff9ad
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
new file mode 100644
index 000000000000..d73d586b6cee
--- /dev/null
+++ b/dev-java/xom/Manifest
@@ -0,0 +1,6 @@
+AUX xom-1.2.6.patch 2096 BLAKE2B 041c55199398e37fcb4a481d7deb1c8c3fb8d980fa6ebc207236cf1e85e91c7b28f2c5e551153ac52b17272b8f02324dce7ae2b9948f9c0880a900eed84d9f62 SHA512 7d864f9178a5fd846572a17eb345a74510e7a3880c203054d7156849c10c678421ed688965d821daafcff91888be9a485c5409937055a56139066aaa6d32aca0
+AUX xom-strip-fallback-parser.patch 690 BLAKE2B c8135a026905fc16560be949598a48e02000aa29b3d1ddc6b40bd16ceb7ae60983ce703715f01e550fa2b643bcb1febb032387ab5431367d9dbc54079ed5f551 SHA512 e61defbc5c8da65561709be6431b0b15069759ec94de2f1f356d518b8b9d90a7ab1ccfd6db6148a3dbcc999b19c9607cd7586ef4c30f70e627968e726e953830
+DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff0bb254d5d7a80aeb725595564805bda795ee9d1b1c92ec3b1d59aad3a9cb82d8f2bac5ef0e66a3feca04bb63345 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309
+DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680
+EBUILD xom-1.2.10.ebuild 2180 BLAKE2B 6d72a78523641f9bf871d64d846e7641719e31a344c63f532107b356a297c6f88d444026d237c8835a51fd48dd6ac129b201e42494ed88343a0e9c55ece7bdab SHA512 4acb2e5879b5eba4e358b39aa80980f62b663ab37bac936e91d8d338e56bd8d9364646ef845d684593550fe6c5d75d57d17274b5aaa87d84a9c0ada59dbce002
+MISC metadata.xml 407 BLAKE2B 2486554418b17502be636181d1dc619a50143016a72e05d5bef8a42c631b9f09913040bc868cefae0759075f26853c605e6a11179b20f3ca3081dd091536b56e SHA512 4ec08597d54cbea6121f240565ff7b7ee614c370357b551bebd18d31749c1863e30bc8b7935caa00051f9946cc927cd34c1bad02be07eca40c89d2c6e0e7b2f6
diff --git a/dev-java/xom/files/xom-1.2.6.patch b/dev-java/xom/files/xom-1.2.6.patch
new file mode 100644
index 000000000000..3187e437306b
--- /dev/null
+++ b/dev-java/xom/files/xom-1.2.6.patch
@@ -0,0 +1,49 @@
+diff -Nur XOM/build.xml XOM_patched/build.xml
+--- XOM/build.xml	2010-06-21 06:03:14.000000000 +0300
++++ XOM_patched/build.xml	2011-03-13 07:05:01.000000000 +0200
+@@ -21,7 +21,6 @@
+ subject line. The XOM home page is http://www.xom.nu/
+ -->
+ <project name="XOM" default="help" basedir=".">
+-
+     <description>
+       Build XOM
+     </description>
+@@ -71,7 +70,7 @@
+     <property name="jaxen.dir"       value="${build.dir}/jaxen-classes"/>
+ 
+     <property name="xml-apis.jar"   value="${lib.dir}/xml-apis.jar"/>
+-    <property name="parser.jar"     value="${lib.dir}/dtd-xercesImpl.jar"/>
++    <property name="parser.jar"     value="${lib.dir}/xercesImpl.jar"/>
+     <property name="xslt.jar"       value="${lib.dir}/xalan.jar"/>
+     <property name="serializer.jar" value="${lib.dir}/serializer.jar"/>
+     <property name="tagsoup.jar"    value="${lib2.dir}/tagsoup-1.2.jar"/>
+@@ -226,7 +225,7 @@
+            encoding="UTF-8"
+     	   fork="true"
+            includeAntRuntime="false"
+-           excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java">
++excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/">
+        <classpath refid="compile.class.path"/>
+     </javac>
+     <copy file="${build.src}/nu/xom/characters.dat" tofile="${build.dest}/nu/xom/characters.dat"/>
+@@ -323,7 +322,7 @@
+ 
+   <target name="jar" depends="compile" description="Create xom.jar">
+   	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+-  	        classpath="${lib.dir}/jarjar-1.0.jar"/>
++  	        classpath="${lib.dir}/jarjar.jar"/>
+     <jarjar jarfile="${build.dir}/${name}-${version}.jar"
+          basedir="${build.dest}"
+          index="no"
+@@ -862,8 +861,8 @@
+   </target>
+ 
+ 
+-  <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen">
+-    <javac srcdir="${build.dir}/jaxen-${jaxenversion}/src/java/main"
++  <target name="compile-jaxen" description="Compile Jaxen">
++    <javac srcdir="lib/jaxen-${jaxenversion}/src/java/main"
+            destdir="${build.dir}/jaxen-classes"
+            debug="${debug}"
+            optimize="${optimize}"
diff --git a/dev-java/xom/files/xom-strip-fallback-parser.patch b/dev-java/xom/files/xom-strip-fallback-parser.patch
new file mode 100644
index 000000000000..49a324ef2dad
--- /dev/null
+++ b/dev-java/xom/files/xom-strip-fallback-parser.patch
@@ -0,0 +1,18 @@
+Author: Ralph Sennhauser <sera@gentoo.org>
+
+Don't build and install fallback parser relying on internel classes of
+SUNs/Oracles JVM >= 1.5. This allows building xom using ibm-jdk-bin. #399119
+
+--- /tmp/build.xml
++++ /tmp/build.xml
+@@ -235,10 +235,6 @@
+   	<echo file="${build.dest}/nu/xom/version.txt">${version}</echo>
+ 
+     <copy file="${build.src}/nu/xom/compositions.dat" tofile="${build.dest}/nu/xom/compositions.dat" />
+-
+-    <!-- This file requires Java 1.5 to generate so we compile it with a 
+-         different target and copy it over here. -->
+-    <copy file="classes15/nu/xom/JDK15XML1_0Parser.class" tofile="${build.dest}/nu/xom/JDK15XML1_0Parser.class"/>
+   </target>
+ 
+ 
diff --git a/dev-java/xom/metadata.xml b/dev-java/xom/metadata.xml
new file mode 100644
index 000000000000..6d01ad88c62b
--- /dev/null
+++ b/dev-java/xom/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		XOM is a new XML object model. It is a tree-based API for processing
+		XML with Java that strives for correctness and simplicity.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/xom/xom-1.2.10.ebuild b/dev-java/xom/xom-1.2.10.ebuild
new file mode 100644
index 000000000000..94ce28945741
--- /dev/null
+++ b/dev-java/xom/xom-1.2.10.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+JAXEN_V="1.1.6"
+JAXEN_P="jaxen-${JAXEN_V}"
+
+DESCRIPTION="A new XML object model"
+HOMEPAGE="http://cafeconleche.org/XOM/index.html"
+# Bundled jaxen as its moved under XOM's namespace
+SRC_URI="http://cafeconleche.org/XOM/${P}.tar.gz
+	http://dist.codehaus.org/jaxen/distributions/${JAXEN_P}-src.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+COMMON_DEPEND="dev-java/xerces:2
+		dev-java/xml-commons-external:1.3
+		examples? ( java-virtuals/servlet-api:2.4 )"
+
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+		dev-java/jarjar:1
+		${COMMON_DEPEND}"
+
+S="${WORKDIR}/XOM"
+
+# Test require network access to pass.
+# They need a redirected http document on public web.
+RESTRICT="test"
+
+java_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.6.patch"
+	epatch "${FILESDIR}/${PN}-strip-fallback-parser.patch" #399119
+
+	# Delete test files as they aren't installed
+	rm -vr src/nu/xom/tests || die
+
+	# Delete bundled jars
+	rm -v *.jar lib/*.jar || die
+
+	# Delete bundled classes
+	find . -name "*.class" -delete -print || die
+
+	# Move bundled jaxen to where the build.xml expects it
+	mv "${WORKDIR}"/${JAXEN_P}/ lib/ || die
+
+	java-pkg_jar-from --into lib/ xml-commons-external-1.3
+	java-pkg_jar-from --into lib/ xerces-2
+	java-pkg_jar-from --build-only --into lib/ jarjar-1
+
+	# Tagsoup is only needed to run betterdoc but we use the pregenerated ones.
+}
+
+src_compile() {
+	local ant_flags="-Ddebug=off"
+	use examples && ant_flags="${ant_flags} -Dservlet.jar=$(java-pkg_getjar servlet-api-2.4 servlet-api.jar)"
+
+	ANT_TASKS="jarjar-1" eant jar ${ant_flags}\
+		$(use examples && echo samples)
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	use examples && java-pkg_dojar build/xom-samples.jar
+	dodoc Todo.txt
+
+	use doc && java-pkg_dojavadoc apidocs/
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples
+}
diff --git a/dev-java/xp-0.5-r4 b/dev-java/xp-0.5-r4
deleted file mode 100644
index 51b9fab5f386..000000000000
--- a/dev-java/xp-0.5-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=XP is an XML 1.0 parser written in Java
-EAPI=6
-HOMEPAGE=http://www.jclark.com/xml/xp
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=ftp://ftp.jclark.com/pub/xml/xp.zip -> xp-0.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f926a3273a55ed48b83de8e8ae6de7a2
diff --git a/dev-java/xp/Manifest b/dev-java/xp/Manifest
new file mode 100644
index 000000000000..361719c07dcd
--- /dev/null
+++ b/dev-java/xp/Manifest
@@ -0,0 +1,4 @@
+AUX xp-0.5-fix-jdk-1.7-enum.patch 1320 BLAKE2B a69336ffcbbed7b41981b6beb29562b94f408ea9e7ab5145c32612b73702b091ea665ad2c2b2d6af8e6b83e46db90a773a0058d3b2ab37d68158e84b4e098802 SHA512 37f9b6969edb07d8b824aabcf07b182f77cd0cdac1bec2e84133526fe48fc2cc5fc15d050ee16e7ab46def72a9d1fcb627d426049b258d2bf063feed9928ca14
+DIST xp-0.5.zip 281324 BLAKE2B c9bf54836b67773f2bcdf34cd0548acc9e2cad039aaae1ff397f63b9f3715742ad9e0494b696415f83ffc50d14e47462c0efcf52e9332f8cf469441094bceb74 SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6
+EBUILD xp-0.5-r4.ebuild 536 BLAKE2B b855ec36a79d3dfa56ac801c1ff70c0661c1a75716e4b903420703cf3890c4e2b5b157bc3957809c547f990496c8f634b0fe0c4b7508927e6e1d2be32329898c SHA512 e91ec6508506814073d9007f5e2bd0e48a258892c0ee7589cd72eedb55ae6116d7a28d05b24c6428f1745cd6e1f0e8cb0244c60d6836adfa71fca5d0c92f6efe
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch b/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch
new file mode 100644
index 000000000000..d2c11ab3ed59
--- /dev/null
+++ b/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch
@@ -0,0 +1,30 @@
+diff --git a/com/jclark/xml/sax/Driver.java b/com/jclark/xml/sax/Driver.java
+index 2b0d90a..d1efd3e 100644
+--- a/com/jclark/xml/sax/Driver.java
++++ b/com/jclark/xml/sax/Driver.java
+@@ -160,9 +160,9 @@ public class Driver extends ApplicationImpl
+ 

+     DTD dtd = event.getDTD();

+ 

+-    for (Enumeration enum = dtd.entityNames(DTD.NOTATION);

+-	 enum.hasMoreElements(); ) {

+-      String name = (String)enum.nextElement();

++    for (Enumeration enumx = dtd.entityNames(DTD.NOTATION);

++	 enumx.hasMoreElements(); ) {

++      String name = (String)enumx.nextElement();

+       Entity entity = dtd.getEntity(DTD.NOTATION, name);

+       String systemId = entity.getSystemId();

+       if (systemId != null) {

+@@ -173,9 +173,9 @@ public class Driver extends ApplicationImpl
+       }

+       dtdHandler.notationDecl(name, entity.getPublicId(), systemId);

+     }

+-    for (Enumeration enum = dtd.entityNames(DTD.GENERAL_ENTITY);

+-	 enum.hasMoreElements();) {

+-      String name = (String)enum.nextElement();

++    for (Enumeration enumx = dtd.entityNames(DTD.GENERAL_ENTITY);

++	 enumx.hasMoreElements();) {

++      String name = (String)enumx.nextElement();

+       Entity entity = dtd.getEntity(DTD.GENERAL_ENTITY, name);

+       String notationName = entity.getNotationName();

+       if (notationName != null) {

diff --git a/dev-java/xp/metadata.xml b/dev-java/xp/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/xp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xp/xp-0.5-r4.ebuild b/dev-java/xp/xp-0.5-r4.ebuild
new file mode 100644
index 000000000000..c39c99adaa5b
--- /dev/null
+++ b/dev-java/xp/xp-0.5-r4.ebuild
@@ -0,0 +1,28 @@
+# 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="XP is an XML 1.0 parser written in Java"
+HOMEPAGE="http://www.jclark.com/xml/xp"
+SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
diff --git a/dev-java/xpp2-2.1.10-r2 b/dev-java/xpp2-2.1.10-r2
deleted file mode 100644
index 324517aa567f..000000000000
--- a/dev-java/xpp2-2.1.10-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.3 test? ( dev-java/junit:4 ) dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A streaming pull XML parser used to quickly process input elements
-EAPI=5
-HOMEPAGE=http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-1.1 IBM
-RDEPEND=>=virtual/jre-1.3 dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dd87980d4a35e05b986cd2b96fd41539
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
new file mode 100644
index 000000000000..62eb2ae0b361
--- /dev/null
+++ b/dev-java/xpp2/Manifest
@@ -0,0 +1,3 @@
+DIST PullParser2.1.10.tgz 2310288 BLAKE2B 0c1f3aedf88aae18e7cab40b04055fa7a20f6bfe05973e6cbe3b459b408dfa193834d22a6d77b3d1ba3802e115d89f73e3f423efc7571efc8f09bb73625950d6 SHA512 87a091e415a31cde27ca1193735743b60f516feb336a9a3577792636e54ab8d671a22e74eb8aa41268f6251c688c68fe92a28f735ec78b96b919909f80c59590
+EBUILD xpp2-2.1.10-r2.ebuild 1718 BLAKE2B 8ea25c2ad23d66eb7ab261fe261a16eff8c6aba449b3fc23cdae9b74124b3956e90f00d570a8cd3f82d85311f74ddfdaad1608b3db26981f885080aef8568ff5 SHA512 2e65db2bf9cb673d9a920ff2f51560a0ef54b4648c70db28bb56f5f3e406d2ca81d8c9d46e9aad30f87efcbf4ba9e147b1cea00ba2c136a5c15fe926852c9006
+MISC metadata.xml 458 BLAKE2B 5a23e3b43da0a680538428c1cbd29dc6555459408a7d9520410a5da0f904cd9bfc1864e27b7f3aae2a94afca4c0f276c5cdaf09612a77759a64b7fb0c2f345ed SHA512 9004485c7ad032ec1f11aa89e7bc286f52d45f3886cca36912d12891f409d6d70cff063cf3790b7e05f4e280e1a953987dab155feecea461d5a3ff5cea0a430a
diff --git a/dev-java/xpp2/metadata.xml b/dev-java/xpp2/metadata.xml
new file mode 100644
index 000000000000..a901ec9b3fac
--- /dev/null
+++ b/dev-java/xpp2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription>
+Xml Pull Parser (in short XPP) is a streaming pull XML parser and should be used when there is a need to process quickly and efficiently all input elements (for example in SOAP processors)
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild b/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
new file mode 100644
index 000000000000..540d963e8527
--- /dev/null
+++ b/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="PullParser"
+MY_P="${MY_PN}${PV}"
+
+DESCRIPTION="A streaming pull XML parser used to quickly process input elements"
+HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
+SRC_URI="http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/${MY_PN}2/${MY_P}.tgz"
+
+LICENSE="Apache-1.1 IBM"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# Some failures, partly because we haven't patched Xerces but probably
+# also because this software is ancient. :(
+RESTRICT="test"
+
+CDEPEND="dev-java/xerces:2"
+DEPEND=">=virtual/jdk-1.3
+	test? ( dev-java/junit:4 )
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.3
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+EANT_GENTOO_CLASSPATH="xerces-2"
+EANT_EXTRA_ARGS="-Dx2_present=true -Djunit.present=true"
+EANT_BUILD_TARGET="intf intf_jar impl x2impl"
+EANT_DOC_TARGET="api"
+EANT_TEST_TARGET="junit"
+
+java_prepare() {
+	rm -r build/ lib/ || die
+
+	# Our usual rewriting stomps over the existing classpath, which
+	# isn't helpful here.
+	sed -i -r \
+		-e 's/\bclasspath="/\0${gentoo.classpath}:/g' \
+		-e 's/\$\{java\.class\.path\}/${gentoo.classpath}/g' \
+		build.xml || die
+}
+
+src_install() {
+	local suffix
+
+	for suffix in "" -intf -standard -x2; do
+		java-pkg_newjar build/lib/${MY_PN}${suffix}-${PV}.jar ${MY_PN}${suffix}.jar
+	done
+
+	dodoc README.html
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc $(find src/java -name org -o -name javax)
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/xpp3-1.1.4c-r3 b/dev-java/xpp3-1.1.4c-r3
deleted file mode 100644
index b7604ce643fb..000000000000
--- a/dev-java/xpp3-1.1.4c-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=An implementation of XMLPULL V1 API
-EAPI=5
-HOMEPAGE=http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-1.1 IBM JDOM LGPL-2.1+
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar -> xpp3-1.1.4c.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2b34f6c9d31ecab442c7d9f457689f8c
diff --git a/dev-java/xpp3-1.1.4c-r4 b/dev-java/xpp3-1.1.4c-r4
deleted file mode 100644
index d42d37f41163..000000000000
--- a/dev-java/xpp3-1.1.4c-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=An implementation of XMLPULL V1 API
-EAPI=6
-HOMEPAGE=http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-1.1 IBM JDOM LGPL-2.1+
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar -> xpp3-1.1.4c.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7077d35d971f53fa3570db316a7f771f
diff --git a/dev-java/xpp3/Manifest b/dev-java/xpp3/Manifest
new file mode 100644
index 000000000000..eedfb0d78c70
--- /dev/null
+++ b/dev-java/xpp3/Manifest
@@ -0,0 +1,4 @@
+DIST xpp3-1.1.4c.jar 128334 BLAKE2B a0c1d871216e44f7196ae8edd4c0ca2503a16821b6f592e4af0fcc1da346135fd5023fa5210abe1ce772d0001274c0f6a3d2383b7ebad1a65ffa967ac31c1d5e SHA512 743d2a0b20d16e97b640d9ad3e20e56a7446cdaf4ca0ebba072bdbe3eed0ef90289c2829376b4a209b35e0960adee5e01f11e8f361798333d8b4eaf4f1038445
+EBUILD xpp3-1.1.4c-r3.ebuild 680 BLAKE2B 4fdc0c6ec0bfbf04c6f67d2df5a2497bff293d7eb1643ad1806d58bb1bd2c96b04a2666fad2e33291f70de00c77f2d14227732d262ce63d7a9eaf035684505be SHA512 b0d9e9746ecaad9b78b0ea10745781c9c5e9f653fb7f4132a63abc1cffcc58bbd719d6e1b956374ef3bfc6d2f5ccf7db4d7e85a928fc585d4bebf5cbbb3a96e0
+EBUILD xpp3-1.1.4c-r4.ebuild 638 BLAKE2B 99302a1b8637af115bce4fa8c3facd472060bc2a2d1b1f21d5df79ace49030d7614d3c347eb79b7f2acc16a20d7cd7ba56c28df4ac4e91d88e274aa491524212 SHA512 0c37fc533f9914f0bd0bb2d1c09c315df412990a3d7859782ad97cdbcc88cbb9565586f238784cf10c84f38ba62ff606d478af71922d41773fc99e1274886858
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xpp3/metadata.xml b/dev-java/xpp3/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/xpp3/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
new file mode 100644
index 000000000000..22e70b689bd2
--- /dev/null
+++ b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An implementation of XMLPULL V1 API"
+HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/xpp3-1.1.4c-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
new file mode 100644
index 000000000000..7628ee79b00f
--- /dev/null
+++ b/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
@@ -0,0 +1,20 @@
+# 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="An implementation of XMLPULL V1 API"
+HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/xsdlib-20090415 b/dev-java/xsdlib-20090415
deleted file mode 100644
index 98fdedd66634..000000000000
--- a/dev-java/xsdlib-20090415
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Sun XML Datatypes Library
-EAPI=4
-HOMEPAGE=http://msv.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD Apache-1.1
-RDEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://java.net/downloads/msv/releases/xsdlib.20090415.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2d7bf9bd061668bbcb6409cf3009cc60
diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest
new file mode 100644
index 000000000000..da44165b0773
--- /dev/null
+++ b/dev-java/xsdlib/Manifest
@@ -0,0 +1,3 @@
+DIST xsdlib.20090415.zip 914126 BLAKE2B 7f8dc45c590606ece1775d08634f87bb7cd392c69c66204073d4867f925cf7159fe14b43cde6d59a72da90ab284d9a3adc0c4d6aa117ea5143eff8efc5bf6534 SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2
+EBUILD xsdlib-20090415.ebuild 1133 BLAKE2B 628d939f225846c81858e6919241a5bc31e18768713c183089613395e7ebe14e239b463b5ccd668f7e3594f17e41595a158f9ab62f6b67003d1d6022362beb87 SHA512 77387cf5d2ceef4fb0a8fd81861dcf3fcc08a006cacfaa9d994ca48e9e6d3288a201f82d3e7ac7f05697207c907793bde4b173cfd8ccdf05ee4647f4392b4794
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xsdlib/metadata.xml b/dev-java/xsdlib/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/xsdlib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415.ebuild
new file mode 100644
index 000000000000..0ca67cf144de
--- /dev/null
+++ b/dev-java/xsdlib/xsdlib-20090415.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Sun XML Datatypes Library"
+HOMEPAGE="http://msv.java.net/"
+SRC_URI="http://java.net/downloads/msv/releases/${PN}.${PV}.zip"
+
+LICENSE="BSD Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/xerces:2
+	dev-java/relaxng-datatype:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+}
+
+JAVA_SRC_DIR="src src-apache"
+JAVA_GENTOO_CLASSPATH="relaxng-datatype,xerces-2"
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	local dir; for dir in ${JAVA_SRC_DIR}; do
+		pushd ${dir} > /dev/null || die
+			jar -uf "${S}"/${PN}.jar $(find -name '*.properties') || die
+		popd > /dev/null
+	done
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	dodoc README.txt
+	dohtml HowToUse.html
+}
diff --git a/dev-java/xsom-20140925 b/dev-java/xsom-20140925
deleted file mode 100644
index 6c61d270916e..000000000000
--- a/dev-java/xsom-20140925
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/relaxng-datatype:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=XSOM is a Java library allows to easily parse and inspect XML schema docs
-EAPI=5
-HOMEPAGE=https://xsom.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/com/sun/xsom/xsom/20140925/xsom-20140925-sources.jar -> xsom-20140925.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c8b375aca71de935fa93798b11ff9b4f
diff --git a/dev-java/xsom/Manifest b/dev-java/xsom/Manifest
new file mode 100644
index 000000000000..c887b5ef4397
--- /dev/null
+++ b/dev-java/xsom/Manifest
@@ -0,0 +1,3 @@
+DIST xsom-20140925.jar 371238 BLAKE2B 0757b585ba46d1b694ba077f8b35d9bd5c9991e388f233932d1214700eb89c454d93cea63806be988418499f5087d00d6258c8d907ceb53936fe05b39ebfbbcb SHA512 a1e2a9879deb3c92ed94fa0a9ac4f59debd8914cefe94149d74cde844c1f0519e35e00e87bf523b761fab50c8a69585b72d23fe28f30bdbf1f074de903438ee7
+EBUILD xsom-20140925.ebuild 622 BLAKE2B 87ff95e3e6b9609b5bd05c0730ba01b08530f05332ac6958c64017aee6c36e504f97cf85df86c0644a738684f07ae9ceb901f5eb4b876e72575b9d51fa35cb18 SHA512 ac1220eb3a76b6f6f8ddd205ffe6540dd3c504d6263ce0e1aaef7f9a8572848a0314a2afab5efcbc80daeaa15fdc82f349e46b47d7374f5ffccd8028ea6ef87a
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/xsom/metadata.xml b/dev-java/xsom/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/xsom/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/xsom/xsom-20140925.ebuild b/dev-java/xsom/xsom-20140925.ebuild
new file mode 100644
index 000000000000..5f906491315f
--- /dev/null
+++ b/dev-java/xsom/xsom-20140925.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XSOM is a Java library allows to easily parse and inspect XML schema docs"
+HOMEPAGE="https://xsom.dev.java.net/"
+SRC_URI="https://repo1.maven.org/maven2/com/sun/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+KEYWORDS="amd64 x86"
+SLOT="0"
+LICENSE="CDDL"
+IUSE=""
+
+CDEPEND="dev-java/relaxng-datatype:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="relaxng-datatype"
diff --git a/dev-java/xstream-1.4.8-r2 b/dev-java/xstream-1.4.8-r2
deleted file mode 100644
index e02a657450ae..000000000000
--- a/dev-java/xstream-1.4.8-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/xom:0 dev-java/xpp3:0 dev-java/jdom:0 dev-java/jdom:2 dev-java/kxml:2 dev-java/cglib:3 dev-java/dom4j:1 dev-java/joda-time:0 dev-java/jettison:0 >=virtual/jdk-1.8 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A text-processing Java API that serialize objects to XML and back again
-EAPI=5
-HOMEPAGE=http://x-stream.github.io
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-java/xom:0 dev-java/xpp3:0 dev-java/jdom:0 dev-java/jdom:2 dev-java/kxml:2 dev-java/cglib:3 dev-java/dom4j:1 dev-java/joda-time:0 dev-java/jettison:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/com/thoughtworks/xstream/xstream/1.4.8/xstream-1.4.8-sources.jar -> xstream-1.4.8.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=842ee09f8c4d8300e3aa74fc622d9638
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
new file mode 100644
index 000000000000..c2af957899b2
--- /dev/null
+++ b/dev-java/xstream/Manifest
@@ -0,0 +1,3 @@
+DIST xstream-1.4.8.jar 395464 BLAKE2B 0173f5165e32838853cf45da8244d4cc4892691644995c31e19fd24d73f9ec54a71bf899b3d2321e3294459bbac38db7f6ad284b5c6f2cac14da64739fca304a SHA512 9fb9ebc6facdc07aecbcee3fbf40ef560bdd42cd8f7c7a3a8e2401be5c4e05ed3370beec653ef06d2fd3aa1acabf8f4ada8dddea27f239d180d66aec0bd905e6
+EBUILD xstream-1.4.8-r2.ebuild 1253 BLAKE2B 6ccff68306aa37455061c824e68887c17fae7558d51bcf67011c7affde84b31aebb9cda11b3875e85e06ef8774d4b24dfc6e9ed76ebacec0ef5498c72998ab3e SHA512 155ff713dee0dfd2e2e035e5a75976d34f548356337b81a81d4a9747b93ae29cf7cb6e62e78d00acfcd212a798df1951aa2b672a01af61febe3bc5e532f79954
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xstream/metadata.xml b/dev-java/xstream/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/xstream/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xstream/xstream-1.4.8-r2.ebuild b/dev-java/xstream/xstream-1.4.8-r2.ebuild
new file mode 100644
index 000000000000..c842bc2d914a
--- /dev/null
+++ b/dev-java/xstream/xstream-1.4.8-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A text-processing Java API that serialize objects to XML and back again"
+HOMEPAGE="http://x-stream.github.io"
+SRC_URI="http://central.maven.org/maven2/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+CDEPEND="
+	dev-java/xom:0
+	dev-java/xpp3:0
+	dev-java/jdom:0
+	dev-java/jdom:2
+	dev-java/kxml:2
+	dev-java/cglib:3
+	dev-java/dom4j:1
+	dev-java/joda-time:0
+	dev-java/jettison:0"
+
+# This package does need Java 8. See bug 564616.
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="
+	xom
+	xpp3
+	jdom
+	kxml-2
+	jdom-2
+	dom4j-1
+	cglib-3
+	jettison
+	joda-time"
+
+# Two drivers for two very old implementations of StAX.
+# StAX has been last-rited from Gentoo as it is now part of the Java 6 JDK.
+# See bug 561504. These drivers rely on ancient APIs that aren't maintained
+# upstream and may contain security holes.
+JAVA_RM_FILES=(
+	com/thoughtworks/xstream/io/xml/WstxDriver.java
+	com/thoughtworks/xstream/io/xml/BEAStaxDriver.java
+)
diff --git a/dev-java/xz-java-1.5 b/dev-java/xz-java-1.5
deleted file mode 100644
index 9f6eeea5ff64..000000000000
--- a/dev-java/xz-java-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Implementation of xz data compression in pure java
-EAPI=5
-HOMEPAGE=https://tukaani.org/xz/java.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://tukaani.org/xz/xz-java-1.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=69eff74aa5a4d6d5e64b0cf8fe64dd48
diff --git a/dev-java/xz-java-1.6 b/dev-java/xz-java-1.6
deleted file mode 100644
index c6c14957204c..000000000000
--- a/dev-java/xz-java-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Implementation of xz data compression in pure java
-EAPI=6
-HOMEPAGE=https://tukaani.org/xz/java.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://tukaani.org/xz/xz-java-1.6.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1c775960deeea3e3bd01263e06c9f8a3
diff --git a/dev-java/xz-java-1.6-r1 b/dev-java/xz-java-1.6-r1
deleted file mode 100644
index 4aa436ea68d0..000000000000
--- a/dev-java/xz-java-1.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Implementation of xz data compression in pure java
-EAPI=6
-HOMEPAGE=https://tukaani.org/xz/java.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://tukaani.org/xz/xz-java-1.6.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ce899557a2d5ac7efbb2fc37b53ec5e5
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
new file mode 100644
index 000000000000..63dfc1cfb14f
--- /dev/null
+++ b/dev-java/xz-java/Manifest
@@ -0,0 +1,7 @@
+AUX xz-java-stop-fetching-external-files.patch 693 BLAKE2B 8b6e55a71921a3b6f16aab712b298684577639cb57cb8a3b2216811effd3e107c385ca26cb4edb5bfb83a035ed46fe4a1dc7493e92f48b66b4ca5b425a6aff12 SHA512 048a21f8a99091f5e940f775b187eccbeda10c4b6c41e194dd5295f9be618676195ad0e256752ac1929989e90eafb272d10d93bfea5d85027dfc88d296c90125
+DIST xz-java-1.5.zip 131544 BLAKE2B 3984cf1e20bbf1d5f2508766e3ef4aff87f0bef774cb6f7a3f6e6b4bf7b744e74f1640330a4278b70006b7ec05e9d758bb55d63f247cc7afb1c2f4a4e64591aa SHA512 8f425b86b216927490c1ab7303ae9db7faf2c275777765ec7d10c4acd4717d2ecf76068afe9a81d099ea0941c05c517cd5e7fe1b4e8bfec804fd3355dd064f41
+DIST xz-java-1.6.zip 138434 BLAKE2B 015074e64f8b354b617cd2519f83cf4a7aa491a7229e54fecb012eabe80d3ff65394a433b88eb58b5c2eadf1855aeefa0eb4c0e904f34ab36d0c430c04a7ba90 SHA512 a1a6a2da05d51695e58b8e91503106bae6030cb83853df32bc7b8a23db4189c4afef01544c21de91ee3df9ad11e065059c758f121c52e6b6a319b93b2136f666
+EBUILD xz-java-1.5.ebuild 764 BLAKE2B 4748847ca4d7c6281423767b7b6e749c4d19b0157bbf2b9e994883aff286cba9153760d7770bf4151dd3573446e76da7957b0d3b0064ba5524796c4bcfd8ce6d SHA512 8184e39d04253dffff50d9899230176fed63ea957817f75d6568c2d7a33a2aa7d5dfcda32c32a9cef8507e07f42b48844d0b1026fc11ec3a6fd0d011178f3a96
+EBUILD xz-java-1.6-r1.ebuild 651 BLAKE2B c810d938d1e27719d5098d6d256c5a5f5383e49ccdebb309c5c53ba1f302f67ab95c017dd35d92aae7dcebb85e4dca2f874cf13fb45347257c6221b42d73de09 SHA512 0266edcbf8678ca58bba9bf01d10dd7eaa3d96fd405803aa8c60ea25b903bc0e44f11f043a5c238d9405215bf252c24a0c7a7aa9acb508916d3af6141725aa43
+EBUILD xz-java-1.6.ebuild 808 BLAKE2B a3222e8abac79531bc0c3a87211054ca499f11639076772820de127cdb448e2d978b643e083b7449a3679d0dec24cef78670ee15bf44e47218162721ba669aa3 SHA512 cbcfaa0cc5bfef2ad065b4493cb58fae2e45bcd219745e68a5c775073747d7141f23583927ccbbac042997353b9bbeb3dc5aa0292f921a194b5d67c08af84307
+MISC metadata.xml 352 BLAKE2B 8390000455654697f473905c14903172230b9667fd16c4db74dd32643b096cb7c8efa21f8614b30d676fb32e052a76c613298e2a28c362d6135f61a4fe27c242 SHA512 a3c6ce3cd97b39644238700277dd416e1ee79df975184de3429810ca4d77f7160112adef6a9b56f77243a003187f6642798b278cf8501d55da766ccfbaa861cf
diff --git a/dev-java/xz-java/files/xz-java-stop-fetching-external-files.patch b/dev-java/xz-java/files/xz-java-stop-fetching-external-files.patch
new file mode 100644
index 000000000000..c5630a9c5052
--- /dev/null
+++ b/dev-java/xz-java/files/xz-java-stop-fetching-external-files.patch
@@ -0,0 +1,16 @@
+--- a/build.xml
++++ b/build.xml
+@@ -35,12 +35,9 @@
+             description="Generates HTML documentation with javadoc">
+         <mkdir dir="${doc_dir}"/>
+         <mkdir dir="${extdoc_dir}"/>
+-        <get src="${extdoc_url}/package-list"
+-             dest="${extdoc_dir}/package-list" skipexisting="true"/>
+         <javadoc sourcepath="${src_dir}" destdir="${doc_dir}"
+                  source="${sourcever}" packagenames="org.tukaani.xz"
+-                 windowtitle="XZ data compression"
+-                 linkoffline="${extdoc_url} ${extdoc_dir}"/>
++                 windowtitle="XZ data compression"/>
+     </target>
+ 
+     <target name="compile" description="Compiles the classes">
diff --git a/dev-java/xz-java/metadata.xml b/dev-java/xz-java/metadata.xml
new file mode 100644
index 000000000000..bc74090b9d62
--- /dev/null
+++ b/dev-java/xz-java/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xz-java/xz-java-1.5.ebuild b/dev-java/xz-java/xz-java-1.5.ebuild
new file mode 100644
index 000000000000..7ac75ef44151
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Implementation of xz data compression in pure java"
+HOMEPAGE="https://tukaani.org/xz/java.html"
+SRC_URI="https://tukaani.org/xz/${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+EANT_DOC_TARGET="doc"
+
+S=${WORKDIR}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PN}-stop-fetching-external-files.patch
+}
+
+src_install() {
+	java-pkg_dojar build/jar/xz.jar
+	use doc && java-pkg_dojavadoc build/doc
+	use examples && java-pkg_doexamples src/*Demo.java
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/xz-java/xz-java-1.6-r1.ebuild b/dev-java/xz-java/xz-java-1.6-r1.ebuild
new file mode 100644
index 000000000000..0be4079e7b1d
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.6-r1.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 examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of xz data compression in pure java"
+HOMEPAGE="https://tukaani.org/xz/java.html"
+SRC_URI="https://tukaani.org/xz/${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="src/org"
+
+DOCS=( README NEWS COPYING THANKS )
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples src/*Demo.java
+	einstalldocs
+}
diff --git a/dev-java/xz-java/xz-java-1.6.ebuild b/dev-java/xz-java/xz-java-1.6.ebuild
new file mode 100644
index 000000000000..3d3e3bd071d3
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Implementation of xz data compression in pure java"
+HOMEPAGE="https://tukaani.org/xz/java.html"
+SRC_URI="https://tukaani.org/xz/${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+EANT_DOC_TARGET="doc"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-stop-fetching-external-files.patch"
+)
+
+src_prepare() {
+	default
+	java-utils-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar build/jar/xz.jar
+	use doc && java-pkg_dojavadoc build/doc
+	use examples && java-pkg_doexamples src/*Demo.java
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/yanfs-1.0 b/dev-java/yanfs-1.0
deleted file mode 100644
index 203434bb403d..000000000000
--- a/dev-java/yanfs-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Yet Another NFS - a Java NFS library
-EAPI=5
-HOMEPAGE=https://java.net/projects/yanfs
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/yanfs/yanfs-1.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9fd0563473ecfd3f49457df6e16ee7ac
diff --git a/dev-java/yanfs/Manifest b/dev-java/yanfs/Manifest
new file mode 100644
index 000000000000..7597f3664500
--- /dev/null
+++ b/dev-java/yanfs/Manifest
@@ -0,0 +1,4 @@
+AUX 1.0-make.patch 2620 BLAKE2B 5514ed5b8b247499d4b94bbdf340fbcbdb66a5d72cff48b1264ab8d1a59fd7917991f9c374cc673e50e928839b69bcafdbaf999fef77b272504729c2d470e2db SHA512 85ad4c443800a33ffb16fee52bd1a2fd89dc8d3de8f6adbc184ca72ad3ee8c877d4658b4c2c82ebdb54b333c16dd54534f47d193e9b808a16f92a97bfd5b427a
+DIST yanfs-1.0.tar.bz2 107232 BLAKE2B 4c344f03e52c4a5eb3cee87e05e4a5b33cdec78ef49427de5ac6a1a44b87444744b0e619963c67ca494092831474587e29dc506bc7261fa98dec05b6cd8c9ebd SHA512 e7031ba630360240de136f588c337a3a4b551320f5e121c1910fc58ba08c7b7c6fe95fb87b57263c19e00a3e44fe81c36d9e8e8971d4fdf910bb3797c0a1eeeb
+EBUILD yanfs-1.0.ebuild 1030 BLAKE2B d4fa33c1b5367f33481ab5a79d8222bbc37b0163f291ffbfb78d0cea96c81d845557d79222fe59de93f2af0afb3cfd6499eeb03677a189b0b29d8aa7724fc423 SHA512 28fcb33d53374eb1c94cbbe50f42b576ad09eb30f4b3c4fcac042c2da096a8d8b0d7e7b308a8413d38d3215d9e03eff482e22b4e16bb3ede6fe89f3b00eeeaa3
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/yanfs/files/1.0-make.patch b/dev-java/yanfs/files/1.0-make.patch
new file mode 100644
index 000000000000..3cd23cc042be
--- /dev/null
+++ b/dev-java/yanfs/files/1.0-make.patch
@@ -0,0 +1,82 @@
+diff --git a/src/com/sun/Makefile.common b/src/com/sun/Makefile.common
+index a5e49e8..ceea3ca 100644
+--- a/src/com/sun/Makefile.common
++++ b/src/com/sun/Makefile.common
+@@ -35,7 +35,14 @@
+ # nuclear facility.
+ #
+ 
+-include $(CODEMGR_WS)/src/com/sun/Makefile.defs
++CDIR=		$(CODEMGR_WS)/classes
++JAVADIR=	/usr/java
++CLASSPATH=	$(CDIR):$(JAVADIR)/lib/classes.zip
++JCFLAGS=	-classpath $(CLASSPATH)
++JC=		$(JAVADIR)/bin/javac
++TFILE=		$(CDIR)/$(PKGDIR)/.tfile
++M4=		/usr/bin/m4
++
+ 
+ # XXX
+ #SWINGDIR, BEANCLASSPATH, JCBFLAGS need to be removed once JDK1.2 is FCS.
+diff --git a/src/com/sun/Makefile.defs b/src/com/sun/Makefile.defs
+index 2fa61c9..b4692cc 100644
+--- a/src/com/sun/Makefile.defs
++++ b/src/com/sun/Makefile.defs
+@@ -36,9 +36,9 @@
+ #
+ 
+ CDIR=		$(CODEMGR_WS)/classes
+-JAVADIR=	/usr/java
++JAVADIR=	/usr
+ CLASSPATH=	$(CDIR):$(JAVADIR)/lib/classes.zip
+ JCFLAGS=	-classpath $(CLASSPATH)
+ JC=		$(JAVADIR)/bin/javac
+ TFILE=		$(CDIR)/$(PKGDIR)/.tfile
+-M4=		/usr/ccs/bin/m4
++M4=		/usr/bin/m4
+diff --git a/src/com/sun/gssapi/Makefile b/src/com/sun/gssapi/Makefile
+index 49d5933..fc16dfe 100644
+--- a/src/com/sun/gssapi/Makefile
++++ b/src/com/sun/gssapi/Makefile
+@@ -81,7 +81,7 @@ classes:	$(CDIR)/$(PKGDIR) \
+ 		$(SUBDIRS)
+ 
+ $(PFILES):
+-	$(RM) $@; install -s -m 644 -f $(@D) $(PROP_FILES)
++	$(RM) $@; install -m 644 $(PROP_FILES) $(@D)
+ 
+ clean:
+ 	$(RM) $(CDIR)/$(PKGDIR)/*.class $(TFILE) $(PFILES)
+diff --git a/src/com/sun/gssapi/mechs/dummy/Makefile b/src/com/sun/gssapi/mechs/dummy/Makefile
+index 88fc12d..cd3e0a7 100644
+--- a/src/com/sun/gssapi/mechs/dummy/Makefile
++++ b/src/com/sun/gssapi/mechs/dummy/Makefile
+@@ -59,7 +59,7 @@ M4DEF_PROP += -D CONTEXT=_K1000A49
+ M4DEF_PROP += -D CRED=_K2102CC5
+ 
+ Dummy.java: Dummy.m4
+-	/usr/ccs/bin/m4 $(M4DEF_PROP) Dummy.m4 > Dummy.java 
++	$(M4) $(M4DEF_PROP) Dummy.m4 > Dummy.java 
+ 
+ # Service Provider Interface Context Class and its methods/interface
+ M4DEF_CTXTSPI = -D GSSCtxtSpi=C018FE95
+@@ -86,5 +86,5 @@ M4DEF_CTXTSPI += -D _importSecCtxt=_S0AC8F9E
+ M4DEF_CTXTSPI += -D _dispose=_S020B957
+ 
+ DummyCtxt.java: DummyCtxt.m4
+-	/usr/ccs/bin/m4 $(M4DEF_CTXTSPI) DummyCtxt.m4 > DummyCtxt.java
++	$(M4) $(M4DEF_CTXTSPI) DummyCtxt.m4 > DummyCtxt.java
+ 
+diff --git a/src/com/sun/nfs/XFileAccessor.java b/src/com/sun/nfs/XFileAccessor.java
+index 50281d1..348ee3a 100644
+--- a/src/com/sun/nfs/XFileAccessor.java
++++ b/src/com/sun/nfs/XFileAccessor.java
+@@ -71,7 +71,7 @@ class XFileAccessor implements com.sun.xfile.XFileAccessor {
+             return true;
+         } catch (IOException e) {
+             return false;
+-        };
++        }
+     }
+ 
+     public XFile getXFile() {
diff --git a/dev-java/yanfs/metadata.xml b/dev-java/yanfs/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/yanfs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/yanfs/yanfs-1.0.ebuild b/dev-java/yanfs/yanfs-1.0.ebuild
new file mode 100644
index 000000000000..9c248cd2c3ad
--- /dev/null
+++ b/dev-java/yanfs/yanfs-1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Yet Another NFS - a Java NFS library"
+HOMEPAGE="https://java.net/projects/yanfs"
+SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/dev-java/yanfs/yanfs-1.0.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+java_prepare() {
+	epatch "${FILESDIR}/${PV}-make.patch"
+	rm -r "${S}"/src/com/sun/gssapi/mechs/dummy || die
+
+	mkdir examples && \
+		mv "${S}"/src/com/sun/rpc/samples/ examples/rpc && \
+		mv "${S}"/src/com/sun/gssapi/samples/ examples/gssapi || die
+}
+
+src_compile() {
+	CODEMGR_WS="${S}" emake -C "${S}/src/com/sun/gssapi/"
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_dojar "${S}/${PN}.jar"
+
+	use source && java-pkg_dosrc "${S}"/src/*
+	use doc && java-pkg_dojavadoc "${S}"/api/
+	use examples && java-pkg_doexamples examples/*
+}
diff --git a/dev-java/zemberek-2.1.1 b/dev-java/zemberek-2.1.1
deleted file mode 100644
index b8c21208e7ed..000000000000
--- a/dev-java/zemberek-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/junit:4 dev-java/ant-junit4 dev-java/hamcrest-core ) app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Zemberek NLP library
-EAPI=2
-HOMEPAGE=https://github.com/ahmetaa/zemberek-nlp
-IUSE=l10n_tk +l10n_tr elibc_FreeBSD source doc test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://zemberek.googlecode.com/files/zemberek-2.1.1-nolibs-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7234b9c38acfc6f5a307114b81f236c2
diff --git a/dev-java/zemberek/Manifest b/dev-java/zemberek/Manifest
new file mode 100644
index 000000000000..fa19f3872a2e
--- /dev/null
+++ b/dev-java/zemberek/Manifest
@@ -0,0 +1,4 @@
+AUX zemberek-2.1.1-classpathfix.patch 514 BLAKE2B 9fd8277e7ef3e81ff504d9f785385da358030a1a9109d6989aefa39efb38941688075967d7fc5f17c972766a24c5f5ae48401e94bd53110862b831b167dda285 SHA512 71ed0b82ff218fd8bc041fcf7d1fc669ad3fd3df890aaeedf2ea3f6ece5f6e484c1d4db709ecc5704d32aff934ae160285b64ef280be83849dc1fe8587c52178
+DIST zemberek-2.1.1-nolibs-src.zip 1196289 BLAKE2B c8ddc242e8f6bb63ecaff586b2a1f051ca928ab31033881dc2d76e1c9a0c2e0ac1648bbd77fa6eae6d84054b64d78495446369acd72ed97ce67cb87f4d7e305b SHA512 e97342271294504a0e9df7bbc60f68beed137311254f5cc6d7558befa106737b75b0dcb7a86033f506eda3783d98ba2788cf5da69497f18861dd8cd79bb27955
+EBUILD zemberek-2.1.1.ebuild 1798 BLAKE2B 0b2765ff106474eafdde7be43d32b76dcd8d515536c9ec8d5f9a356669f011b91f88a73d3a860a0857b3d0b08c7fe2a00a43e776c05a68557a639f698a7e7959 SHA512 1a92b2a8239d750451c94e1b9ba2529dcc4177504d7a7a63e82422bfe58ad401b016e306547d4faec0963d329f45555d79dbb87620610ada6b16718596cfbc7b
+MISC metadata.xml 354 BLAKE2B 17e4ad083f477637706216dce4fca7c4e8c07866a6e28220cce3b8729837d61b13c4800366f7847d12cf4cc0eb72a9f81263514be5bcf620dee50c08d1b9bfa1 SHA512 546242cb1f76ce63ff5fd1b6a67ad35f6f16aed97f01e886b980a868d3f6bec8c8af4c003389530c6ebe3b7dd35a72b2297c6de2167c47c81bb5be627a4a8709
diff --git a/dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch b/dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch
new file mode 100644
index 000000000000..fa6c572c1cbf
--- /dev/null
+++ b/dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch
@@ -0,0 +1,12 @@
+diff -Nur zemberek-2.1.1-nolibs-src/build.xml zemberek-2.1.1-nolibs-src_patched/build.xml
+--- zemberek-2.1.1-nolibs-src/build.xml	2008-09-01 23:07:28.000000000 +0300
++++ zemberek-2.1.1-nolibs-src_patched/build.xml	2009-04-23 23:03:01.000000000 +0300
+@@ -42,7 +42,7 @@
+ 	<path id="classpath.build">

+ 		<fileset dir="lib/dagitim"/>

+ 		<fileset dir="lib/gelistirme"/>

+-		<fileset dir="${build.cekirdek}"/>

++		<pathelement path="${build.cekirdek}"/>

+ 	</path>

+ 

+ 	<!--   dagitim kutuphaneleri (eger varsa) -->

diff --git a/dev-java/zemberek/metadata.xml b/dev-java/zemberek/metadata.xml
new file mode 100644
index 000000000000..804d6e9e3ad2
--- /dev/null
+++ b/dev-java/zemberek/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">zemberek</remote-id>
+		<remote-id type="github">ahmetaa/zemberek-nlp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/zemberek/zemberek-2.1.1.ebuild b/dev-java/zemberek/zemberek-2.1.1.ebuild
new file mode 100644
index 000000000000..50f66f788140
--- /dev/null
+++ b/dev-java/zemberek/zemberek-2.1.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+JAVA_PKG_IUSE="source doc test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Zemberek NLP library"
+HOMEPAGE="https://github.com/ahmetaa/zemberek-nlp"
+SRC_URI="https://${PN}.googlecode.com/files/${P}-nolibs-src.zip"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+LANGS="tr tk"
+
+S=${WORKDIR}/${P}-nolibs-src
+
+IUSE="l10n_tk +l10n_tr"
+
+RDEPEND=">=virtual/jre-1.5"
+
+DEPEND=">=virtual/jdk-1.5
+	test?
+	(
+		dev-java/junit:4
+		dev-java/ant-junit4
+		dev-java/hamcrest-core
+	)
+	app-arch/unzip"
+
+java_prepare() {
+	use test && java-pkg_jarfrom --build-only --into lib/gelistirme junit-4 junit.jar
+	# Added hamcrest-core as a workaround
+	# Issue spotted by Markus Meier <maekke@gentoo.org>
+	# See https://bugs.gentoo.org/show_bug.cgi?id=253753#c3
+	use test && java-pkg_jarfrom --build-only --into lib/gelistirme hamcrest-core
+	epatch "${FILESDIR}"/${P}-classpathfix.patch
+}
+
+src_compile() {
+	local anttargs langs="" jar
+	for jar in ${LANGS}; do
+		use l10n_${jar} && langs+=" ${jar}"
+	done
+	for jar in cekirdek demo ${langs}; do
+		anttargs="${anttargs} jar-${jar}"
+	done
+	eant ${anttargs} $(use_doc javadocs)
+}
+
+src_install() {
+	local sourcetrees="" langs="" jar
+	for jar in ${LANGS}; do
+		use l10n_${jar} && langs+=" ${jar}"
+	done
+	for jar in cekirdek demo ${langs}; do
+		java-pkg_newjar dagitim/jar/zemberek-${jar}-${PV}.jar zemberek2-${jar}.jar
+		sourcetrees="${sourcetrees} src/${jar}/net"
+	done
+	use source && java-pkg_dosrc ${sourcetrees}
+	use doc && java-pkg_dojavadoc build/java-docs/api
+	java-pkg_dolauncher zemberek-demo --main net.zemberek.demo.DemoMain
+	dodoc dokuman/lisanslar/* || die
+	dodoc surumler.txt || die
+}
+
+src_test() {
+	ANT_TASKS="ant-junit4" eant unit-test
+}
diff --git a/dev-java/zeus-jscl-1.64-r1 b/dev-java/zeus-jscl-1.64-r1
deleted file mode 100644
index a10ba3776c8d..000000000000
--- a/dev-java/zeus-jscl-1.64-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Zeus Java Swing Components Library
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/zeus-jscl/
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/zeus-jscl/zeus-jscl_v1_64.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=35332c903b99f92424ba601a79124b72
diff --git a/dev-java/zeus-jscl/Manifest b/dev-java/zeus-jscl/Manifest
new file mode 100644
index 000000000000..b1a13a74c35c
--- /dev/null
+++ b/dev-java/zeus-jscl/Manifest
@@ -0,0 +1,3 @@
+DIST zeus-jscl_v1_64.zip 585558 BLAKE2B 10b106d34953a9306b10ef4d73b2c8d34eadb0849a5facb0ac3682a1f6cd3e39c7ef789da0b32ce2e720698694c466385d32c33a57785c7603e67af18375e8da SHA512 e756df28da39322121575041a949965f47eecea6106e7dd619a4f0764a239131e1ab8a9dcf7c6d461fc4861ea86acaceb19a5a51c8002c990999193050e03b10
+EBUILD zeus-jscl-1.64-r1.ebuild 650 BLAKE2B ead619229f5e02198c35238ca1c24a4728b305cfb6ea63ce8e103e3b7871ef9d98ac3c01f741869f1033e6ce5c1092db27478ae63a1e54d828fca56d88c25647 SHA512 585f0b2039d52c27e2eb24725061431cbe52d177133dd52d956cc2a79ee56fe9297bda3a762981bc9ee390e88a2e2aa3530099eb5f38d90b12a4dc3b0b99cbeb
+MISC metadata.xml 315 BLAKE2B e8b708785f1dbf82874f5d77edad7b916d085116cf0f7a9967e23cdb7983a946d7cfaae994bd8f39eb945f83a63404e30b56774658422d119d689cb3a04a8078 SHA512 411cfa7471ea811aca7e961c1896af9ec7efc9b3fc042e7ef897039601e769d8ff3f7a7ae3290656cba4792394d9ff1af8fd9b598613fe6a36ee71de635010e0
diff --git a/dev-java/zeus-jscl/metadata.xml b/dev-java/zeus-jscl/metadata.xml
new file mode 100644
index 000000000000..9894d377af36
--- /dev/null
+++ b/dev-java/zeus-jscl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">zeus-jscl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild b/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
new file mode 100644
index 000000000000..0b481c266c9d
--- /dev/null
+++ b/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}_v${PV//./_}"
+
+DESCRIPTION="Zeus Java Swing Components Library"
+HOMEPAGE="https://sourceforge.net/projects/zeus-jscl/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+}
+
+src_install() {
+	java-pkg_newjar lib/${P}.jar ${PN}.jar
+	use source && java-pkg_dosrc src
+	use doc && java-pkg_dojavadoc doc/api
+}