2406 files changed, 93581 insertions, 0 deletions

diff --git a/dev-java/absolutelayout/Manifest b/dev-java/absolutelayout/Manifest
new file mode 100644
index 000000000000..19c2d28406a2
--- /dev/null
+++ b/dev-java/absolutelayout/Manifest
@@ -0,0 +1,5 @@
+DIST absolutelayout-6.7_beta.tar.bz2 3359 SHA256 2abee4256899275124026c128a78a61045e1aa8a8eb16338cc439b1f7b8ac777 SHA512 2e14300fca85d2d81533147de4dbfa13660749a46134d9a80facd992948ed18147e02fcf2ca3590154823342201bd99f6e84eb251176ae1906c09477718a36e3 WHIRLPOOL 56930c4d46c7f3abe90548cdcd66bb92e931a088dbe594016d201a4b6aa3648ec24414d6f537546ed21e3459fb5a3515ba5d9e7a72f16bc402cd5e7b519ab957
+EBUILD absolutelayout-6.7_beta-r1.ebuild 454 SHA256 00ef2886c903041a7a4b9dcaca7acc3fa69c6d35e18161230573e384d0fe1ee4 SHA512 a3b35f56a5c3fadf3cfe971535a710e6ae9827b011ad00f36098654e2e910f8dec1aaec2725bb3f9f9e9e00a8ea7d35e52d28b771e9e5cbfe8a47d8e74f246b3 WHIRLPOOL 3d2c6f5dcaf2d15c874de95878ee51998aded54a90b3cf49dc6b85878e01305e7b49e2cfdb2ee09fb638bdeea1afc745a1dfa405a203918ef122913a8049235b
+MISC ChangeLog 2853 SHA256 d6ff7dec4e87ad49433433be3fa9eab1a6870df38a0cc7e3aaec69e57d8af9eb SHA512 57aa7c73218c7c93c4917ef3983c40b4218474d86412b52803548e44a8953e261072725c3b44c15d60186291bdd9c7aa004e7df262e1f73b09e06ac476d5d124 WHIRLPOOL 1841d6d864faf31be9c8947ac13492faa6ca21908634a80ba78386c9458d9e1a3d5c68f0a1157897d5cac575f90b7ad122c762c35f7e4e61c003858f4f73f6d8
+MISC ChangeLog-2015 1226 SHA256 2cd10c8482ff11a67c8239ccbb4697a3847500b8ffa67735cc32b6f28d858d72 SHA512 110f98663365ab040dc332e318e041b4544e74bac14ecaf037feb9d1493b38e8ea81ff51d8483ae529515af901c585b60bbb3db539d8c307ea55b9bf6a0c13f8 WHIRLPOOL 877f0ae5788be5c99849a39b721763f572ea23e73fc0e719260a4e129bb976786683cf3a2b5086fed57ce3f8d86927b7816ea40e3b468811041e4f6be929c0e4
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/airline/Manifest
new file mode 100644
index 000000000000..0d18e6e233b9
--- /dev/null
+++ b/dev-java/airline/Manifest
@@ -0,0 +1,4 @@
+DIST dev-java-airline-0.7.tar.gz 40489 SHA256 ec4b4fde23c91707aaa4487f0a091accdc1181e0795042d44e379f8b553bc063 SHA512 5c9bd29de0e48c94552daf4206a9a894abe5f67ea955217c487095167ed25db2e38b1d0d297322ed2901cb1615d0067e526e10c0d7a0842bbf540d2ab4cbafea WHIRLPOOL 4e87067fed0f702e594b2b10519949566032ca7299ce5a0d6454ade6458a84c02af27aedb286c11943efb3bd360df0a4be582ac490758c921bc75ffdd56d56e4
+EBUILD airline-0.7-r1.ebuild 788 SHA256 96ff108afa36376c56e207dd052b3a42c67ec791e13c22e4acf313cd7bae2077 SHA512 f610d1a54bc7491e5c8ca51396e0d691cd6a32991a96632de967891e42092b1b0ddc23f7caa50c1bf662a64b5151a440c2bd9c0bc9c79fecf444f8109a7f28a6 WHIRLPOOL 53fe7bdec84e1d7e12aa83b2c1006a650a7b51f885e30a081a53d6934778c761b5e4f6b0b870810160610bb44ae2686623ddcab5a8fce70a3dbc75d3098b66ff
+MISC ChangeLog 526 SHA256 c1189e22e953e48b86148eda3f59b09410da250972cd9994f3dd4b2deecdf29d SHA512 7a169ed5118dae61051adf3934f44d321807e833a019acb8e2fba1c350658b870d2960f799711c73ee1fbc0fef22801bdac366ff330177f833ec21c0f3bd91a7 WHIRLPOOL 9241435f0be2c3bdf270edae388863c1c719397b2ce76b6390783ea0849bbcf7edba1dd287ebaf4d41119aa5ec6e3529a8339db2017ee793a69701c69d0a42fc
+MISC metadata.xml 316 SHA256 383ee20c9ec2c558eb4991563dd2bf2f3e507b6322ceea3f5be47de400dea0c6 SHA512 0ef49a1230dde6d7fe80b873eace3a8b7fdfc390cd4dbc4818c707f0ee87f159e661a1ae61ad31e1e24f8859c9e44cf43a41f39bfb2beb139266dfc0d93fc961 WHIRLPOOL 48461fd9cdc314d0cc7e5db4a9448c2afbfcd27c2ceba88fdd0f9fc78c5552cdb0b9f2d5a6282fdba0b61e9731de1da364a9897cbb7df6e2938a9818b62de657
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/Manifest b/dev-java/android-util/Manifest
new file mode 100644
index 000000000000..46c381051d46
--- /dev/null
+++ b/dev-java/android-util/Manifest
@@ -0,0 +1,4 @@
+DIST android-4.1.1.4-sources.jar 12140689 SHA256 eb97415c84d456012f1be6c5d1b1a35d054b7f054c5b544ee5bd12c9fce4866f SHA512 39bbe77447adce554d323a55c6324c4af51cdf130ad9d8f4578e27ac99564d56513705bc2de6969deb6c35f70f2edf2f3724571d57c931ff768b437912ff637d WHIRLPOOL 304823f76df2bcbfaf9210d4f62b41dee5b90e3d1dab11e42ec5189d51b7d39c536cd94869b87af9fb5685a36a8b52af01e39fdc55bfde4142fb336b72074f3d
+EBUILD android-util-4.1.1.4.ebuild 662 SHA256 9b10b0ae23a4179b98ee907e3dcce27e659accc228d8da9b6e69bc58c8ad3f6a SHA512 fa30bb3211542826e5a6a0f34ad257fa4940eee6f583715983a4c7b4dbe5c1a2c24635f1bc00c2abc87169da0611f37c60b5dc171970bbc6d57c4783621be82f WHIRLPOOL d8f5e2fb3129f34f337dd3c2ea638e5f3183535afb6f558f4591f0e980ea512e10a19b5a9d42f0436e8993eecce137cfc5fa7c13e3f45f068ad46c389f3462bb
+MISC ChangeLog 331 SHA256 42a322148be3a552928e346f55d244b6f0bac1f52533dc4abca7cb55a30be56b SHA512 9aeb26ed40824c66c639ba7483256fca92ff5445a733771cfb9a8389b7125f807ba66358c231972854b811f2f3c436693c8a47fca108487ca6a2f04f895e8007 WHIRLPOOL 6e2fec4c0af5928e9b296081574b9c21622a766452a5bc6b6db3da8fedbc0ea05605cc49c7ae6783ef9aefa05a321b4adeac65a5e1fba03b07dce73d9f013e85
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..eac7470ca94c
--- /dev/null
+++ b/dev-java/android-util/android-util-4.1.1.4.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 java-pkg-simple
+
+MY_PN="${PN/-util}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Library providing APIs for applications written for Google Android"
+HOMEPAGE="http://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/Manifest b/dev-java/animal-sniffer-annotations/Manifest
new file mode 100644
index 000000000000..6ae1802f9a47
--- /dev/null
+++ b/dev-java/animal-sniffer-annotations/Manifest
@@ -0,0 +1,4 @@
+DIST animal-sniffer-parent-1.15.tar.gz 77766 SHA256 d5a07409b74a961f044a7bdaaec57c6f960865790de8c8db972ef80100f5a08c SHA512 8d0f6baa86fcb79fc54b826eff0f7c390d236d3cfc285914d3645e3bd9c72612c039eb0f1c3c2a9fbaca43040d967a2a69e10a9e5713682d1e441e44f3b55eb1 WHIRLPOOL eb55142d950d40ec91ab3e752391c15022a85527f1ccb7e36604d8eef6b70ea72fb6b5d312dbf068a4040aebdb97e09046666b3e55bd921f8f3d9516d85a5c1f
+EBUILD animal-sniffer-annotations-1.15.ebuild 643 SHA256 555caa5fffe943171dba0876434d41cd4515bbab22617d7f31198b8965d2c39d SHA512 9143c756eb1f273ce2668db1949b715e6a8c74787a71223d303507cfc4010c07736a4029295bf812972b248b5f0e9b48cf2d0fcc3f03183e44c1c9c13358babb WHIRLPOOL ef9b7e537746b25b5055dc7c8c7a15d6cdbba30b3f9c6941e59264f02ba252816ee9a981167cb4c909dd22214b3745943827f0d528ac19fd058e942bc287513f
+MISC ChangeLog 428 SHA256 802e2f2e66c19b75f6fcd13f32dd5586e600846c57f333a3b63a51064ada291d SHA512 6d526605fb64464e47b4f7b6f33b435b5ebef3b26cbdf392e84b49b29c5332b2f2eddf2b93faadba3d1b65964cfad8a9f30f819f7e0e2df6901ab968c4aa2342 WHIRLPOOL 5cb63ec0691ce8582c75a11642f98061a75383813a103a1bd49bfcf3c3d3e3de92e7478b8701664f913cb6b48fe2a933ca53b897f25fa137479b264333ce78f2
+MISC metadata.xml 324 SHA256 baa971069be951f41e563c188406bf1135b0173a27b11fa49a0f15008151694e SHA512 e56ef2e924143c68bec47d876972176b2eb5650fd1bdb5528dcafcb7c607523a6c29662cd320d8cecd6c0f85404e9e7cf059ae1d03bb77bacb34f0376e939a8a WHIRLPOOL 142ed16fc61a9da0a7b25f60c49b95e5f029421a9b590071f040b52e5730d7b304607b9eef260b52ae952915df3aa75420d2f5f33ffead94d602e8f8db1d9e83
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/Manifest b/dev-java/annogen/Manifest
new file mode 100644
index 000000000000..be29898edf63
--- /dev/null
+++ b/dev-java/annogen/Manifest
@@ -0,0 +1,5 @@
+DIST annogen-0.1.0.zip 1008931 SHA256 60cf2bed2bc90d366b2c8ad9f83cc4f4a8b205298bdf55c85fadcc4cd4e05246 SHA512 f5c4eeb92ef8c87874df6619ef701b99dace01bd3ebc87f201ee3ab523fe612b6d143da2646c280d4831bc8e3051887514aa06b8bad6928b68ddd6cd6357fa16 WHIRLPOOL 02c7bae1a7f06d6348bcf060c1e81896cc6e2861c2066323dd4a0716f8413321d8a4248040ab2b9924ca383022f06d66af79c408596ef19c002becbd9992e802
+EBUILD annogen-0.1.0-r3.ebuild 1092 SHA256 b6331c691d742eb17ba37e421ebe23869391b120f7e9e46bda7afc241ad56eb7 SHA512 f53507ecf3e2327e598e373e31405ca98786a27a98e3d4d46f7e64586b72871362b10d4a0d834f3ea0127ffcb3666427a64b1ecab78c7b9abbc0dda9c3290652 WHIRLPOOL 169175f0e7a48b4bcac61837d2fe72b3c056b5b247a349d472bdf40cb90be58c5d45d10d9bf1675688c20ceb1aa6d3a7ffc9348e3c87a7d0265e9b825df24d72
+MISC ChangeLog 4285 SHA256 325ba2f9425021e85a38edba4fe58a4c7dc3c723db72a8987d85e24c984709ad SHA512 5fdcd272d7253252d3826502efcadee1be4e24f43312d7e7b9cc95c675af176b2206cd695a33637013cbb3d7a650f9de30106c006c34ca2eaa62a739961b2e61 WHIRLPOOL d0086b7749112cc375935dfa86a7d38a2eb639a70516f6bdc71cebea34ad2d2179311486f840a0bf2b34b142fea35ee80feb562f457fa24cb5ecdae42bed1b76
+MISC ChangeLog-2015 999 SHA256 183140c3bafa46ab91d5776262d35d24a683c0b60168375a14d62fda85656b4c SHA512 9e11382e464a01c1f2fa9413b7ff822d56fd16d6c22b17adb6860149b532bf49e3116f16116239dbd6109c6cfb6594eaeeb377dafa59b3bb5605afeb3f604ba4 WHIRLPOOL 6aa503b0db6de0b69756e9cbbacf51e765231732d81d8b3c45f9e8397c27784874180cc6c23b0ffe5ecc007ce90c3462a402094fc926d4f092da6866aac4d273
+MISC metadata.xml 317 SHA256 b9754b890355946ca08d9c35af21ad7cca1f021e3c663a79242a837f89157f3a SHA512 a6d16a6969b19140df262a9f967f2d8896ebfa66909d9304cb65e961a6685817744c4a3c41fa10c4f3bc6100ce31fa91afcc13d98f2e4a98a171a304012ec4fd WHIRLPOOL a4fc0911d4e2acd1624c88d58df7e427b33f2ba6788bbbd4223dfb445044cce28d3d8678adfc67c1ca2ed04a4120a5213eb07b51b4fde0a7f57f0b153ae88323
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-antlr/Manifest b/dev-java/ant-antlr/Manifest
new file mode 100644
index 000000000000..dc457e132172
--- /dev/null
+++ b/dev-java/ant-antlr/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-antlr-1.9.2-r1.ebuild 484 SHA256 cfb8d4ac74c8f34d18997ddc7b03e2cc2562b11c62945fa4d334fff816a07c95 SHA512 64315256407eb17757872e5c4fcf41adf8f5e812e61bf9df3948dd595fce8d0c753eba44e1f096ddd4bdb9ff04bc648fdfa84d5f52b7b3edca169cb9a1bb035e WHIRLPOOL 9201fc525188342e8e1562d91ba9fc0989a9586b5ff23e6b833cccf336ed08c9601d5d9054445bf398dad7691a6af644e7b70f7eef3cd29f1367a22e85348063
+MISC ChangeLog 3040 SHA256 639e3860f7e2f3c8b81fab188c3a467254bf4098c8c03068eefea47ad03abff3 SHA512 32b7dc093ea3c38866132d84135c54747436ed3d48ede6229004af711fc272ba238435b0a06a880d8e69a0e136a4e8343f8bad6af1e429952e54a99ff0b97a76 WHIRLPOOL 1f82c8b6fe816a3a11549fa976ee773cb040ec58244ad0d4dada433b3de73320b41bdac6f0c36c2b85909af68eb90fe1bed7c59fddec343f209f3fb06528cb0c
+MISC ChangeLog-2015 6540 SHA256 ffc6a9dec04d9a0bbd511c34dfa2138807c48bc2b6e8235f6bf789ff182c9a38 SHA512 1ba1190b9de58e9dfc978efbdd0aab4d82457c470fe68097067a9ff1cd96bfdb1b18f438f54f66e0507293fbbcabeea068c9edb060b4cfbb2e43f933b82c1158 WHIRLPOOL db2973692f5b09b7c0ee7d978cef562b862fd7c777126154212731812b5a0ec5a87d4d8404a1bdf92e31552b70cd4300fb0b4e2ba324713e0022200b1f6f0156
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..6c8721c75252
--- /dev/null
+++ b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-apache-bcel/Manifest
new file mode 100644
index 000000000000..1d14e5b4e1df
--- /dev/null
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-apache-bcel-1.9.2.ebuild 369 SHA256 92820496a46fa469cdef16c17a21619caa8904e46fa8d490dc86f14534965cb8 SHA512 cc777ae32e5ad277f6c682dc6eb89312415cd049f241bea5face0ff74ae41c76a4f3e4639f2e2800959e7348d146b71adaef6cd8dff89aba2a4039a1becebb43 WHIRLPOOL 106d4a8a98af6ef7b6e2f082f88b0839819ddb6118a3e0ef90dd751e9fbbbbdecd742bcaeb736eaed96d99a55ab2e071c32c779b2ebdd879bca25783b6759459
+MISC ChangeLog 2599 SHA256 511398c97f63c5a6051bca51e4ade2c496bab8cdbb0610ae2510d20f8755f3b8 SHA512 861c54f2f0e556e257b43707f432159400051b1c6f38fcc130254e6d385ed423a8c0a8ea61001129aea9b82e2d551e496f2b423f7e0815328f3b27b361c0a36f WHIRLPOOL 03a157e86d5a7d17573f0e9f51e3f0cf3f547d60e44cfe78ac5f97e958e64b4d210bf83665fd4ad7210f80958e580f88f57244de24ce7da398e27d8eae74db48
+MISC ChangeLog-2015 5469 SHA256 936b5b7444ce96dfaf47837138ec88f459bb0ec68398d3b2510ff4ad3e93ffb5 SHA512 f2604a9446cd5eed57549af0b338f1435d99c4496542e8c32e651682d835d0652800658256e514f70ff09a050cedfc3b20f11324bcbb580bf58f1d3687785dcc WHIRLPOOL 21e61ca4b830751ab6dce430930263c4024fbe6cb0d08ed16c27a91f1cb2e640ba96778eefdcf45cc741fc8a9a3d9406942ae84d5e888951f6e8b04a69ec8db0
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..b39e39879154
--- /dev/null
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-apache-bsf/Manifest
new file mode 100644
index 000000000000..12773caa635a
--- /dev/null
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-apache-bsf-1.9.2.ebuild 648 SHA256 2c4401c3c4da613c1c764c51f309f3d9ed63c567cee826edf82609b6d1ee4d5e SHA512 0f473a26a076c9d007ebfbbb3c0a6ad9e3e1bc074616ed912a99a8ed5d3341511aaa7fab511a7036dc398782787640a6a4abc5c2fd40327c2e614d550a814e6e WHIRLPOOL 1af4b545cb43671675ad2f453aba3f1ff7ea33c40f533ec7710bf9e69b0cd9d5f1ba2004f04015cfc4c8bd38a145698a2976366132e3887eb84a2d9ed80da689
+MISC ChangeLog 2593 SHA256 019aaf4d41359b68c7cd366831f7729a5d0b27e206542317377c5e2d97732323 SHA512 d13343689e154c9ecda79dd676eb3b74d5e426e27aa0a5c1283bec07295171c4d3c927f178bf07a185c1280fceee4142402cbe476b42e2da5173e2ea0e79258d WHIRLPOOL 075eb87fb2c1002ffa5994b8fee9cdbef835a36e70f743dbef12f5c34b8f1fcc421b2f4256239370eb7e225782341fdb39dba70c36443e36b98cd966bd217938
+MISC ChangeLog-2015 7100 SHA256 6785f116b45ef4562b06cd56401ffd89ea9cd5860c0a9d566dbc218302814e8b SHA512 22144f36ac89b17a53f18ac4a3c44b7bef837521275431b968c09b558790b7cfcc5f1874fa19d71f10b1f9bc1dbfb9bb7a9454fae7fd797b220ae7381ca5a645 WHIRLPOOL 495c4ba062ebaaf1af161adaf54bf07cef064fba403677c3d51c6db303f55c016036df86b3308e5917fc20e756f2c51fa72cfcda3e66e321d75223e3b48e599b
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..ddf3c4154b14
--- /dev/null
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-apache-log4j/Manifest
new file mode 100644
index 000000000000..42aa4043cc73
--- /dev/null
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-apache-log4j-1.9.2.ebuild 374 SHA256 decf7f3fbe0e73fd708e06bcc71cd7a6d3701327bb0746c3e4e2d8c289a0b83b SHA512 d521be4a9867dfc2637b91a9c557434b54f3530e2b7f2987f2c9cb95fd632a503ca2db5bdae568fe22a0fa33d5341db4d0252e836ba89095c906f6c24f5280cb WHIRLPOOL 0d2a0914c567e7d9711de1b6e12b41582154dcd9728c56afa6eb94758a7f11108ccafd35f08792556758c6416c47741a1efb0f516bb60f42fd2e17a1879433d5
+MISC ChangeLog 2603 SHA256 e791447a65ec5144cd0f29fd0e5060e3e12e91a4d292dd5a65f5f95df07354ac SHA512 5005f33b5a04a835afdf0e5529d05fe5d4f81dbb94e56d2e3103da2be1ae94e543cff8560c2eb95f74c96dcfbba1d7b4642a3e1bf3e73b69e51df6a7fb8cb4ad WHIRLPOOL ab4a331253aac5cfac12e2bb0d62c49b718907aa64058c25ae44829b98a4ef968358d68b4ebcc5edaa2069861b5a1ad164bc0903a03b42ee0ae3a0137192b9c0
+MISC ChangeLog-2015 5532 SHA256 7ce30ee4c7a8d9296c09a9ad82afeb5d86052373326340c3130326642e2e636f SHA512 9274f7df5522dda55e316f6f98d42f8367be9b3f82d7cfdd2d2691333989660e7e845804b918ef2f3c0ba64513aff7bfb5cd31c97f688c779f39ade2b0531553 WHIRLPOOL b7c95237c327ad3cdf9a317c55e6d222784baacbe5fee9ead0babe953aacc9a8775071b3855cd71e54d1bcf639034541280d474baf8b31a2986cd0503fee0e1c
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..cf479cda65cb
--- /dev/null
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-apache-oro/Manifest
new file mode 100644
index 000000000000..b906e61cc853
--- /dev/null
+++ b/dev-java/ant-apache-oro/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-apache-oro-1.9.2.ebuild 391 SHA256 01ea08469a63d18d99c04500dd13ee369ec212af5270db211014b35c17e07f52 SHA512 eac1a9053adcc4d1ab2f980c6d16cdfe25416aec1329d0352e7e466ad5da0b0db909e03fbeefabe45a62230e20ba779b5aa3d0467394b8bad529a73f2fcac1cf WHIRLPOOL 78e8ab583df18b0fa59b5e0e3e329ec3407b2fcedab9c5304af018a62eb2624a4de09ab4ae7eb184ec483b93079024d54b23e24cefc7cbde11b2284ada3b530d
+MISC ChangeLog 2593 SHA256 45b846b5d29456b6aca8f01b472408f831881e0ca0c1708ed8eaf1c4dbb02a71 SHA512 12880cde1d291dd43ea58fdc54bad5bbe50dd2bab9865a7b440c3744429930c17b23552b48e77b68b2ac10f32cb54d55e289edf12c26268558eb9c84f2e7903d WHIRLPOOL b0eee0986568d12c61ea22ee7d13267bb21c7ab171be932a0a603ec0b852a5e0245d8ccaf35338ff36ac957d6584da7c23ea15deca07273d78dd1d6371f5a6cd
+MISC ChangeLog-2015 5398 SHA256 c32e79439bc7bea413d0b5e44a7d0a416b25a2bb310cd134daa86ea7240a481e SHA512 9e2ddca7407c3bd06d164906fabd03cab08a939f0603be45206b4d238444476fce49cc50cb09168425cd205806545c3d88502c5ef02f71555f4a49b90ded8138 WHIRLPOOL 78d36656114506c666fed1726e5606954a3520f45b01394832f632d5ef075e40dc587c476f2ff995a0b9d9b7105aa98b3373cdc966a8496ab03e4e6e68ca8f23
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..593cd1953176
--- /dev/null
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-apache-regexp/Manifest
new file mode 100644
index 000000000000..12b102f2e0c9
--- /dev/null
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-apache-regexp-1.9.2.ebuild 395 SHA256 bbdfa387e7fd86ede20bc6035e30fc6649eebaf09dc82236a78d9405cdf8f11c SHA512 fc124c90e89a08f721734177b80491f631fa9a58b8bc4e4dedb89f732d25103b5c25b4d63db052522b54292fdb1ffd6f880c99056d1d65a706576154ab044994 WHIRLPOOL 1d8d10b94cb8809e2599f9fe05deaf756c0b857709622783605064b2aa6314ad26640aa6b39b1a53daed73d1579b99a758a1ed5188d36da89711ebaa05c579fd
+MISC ChangeLog 2607 SHA256 f18c8c72e00bd4ba1d17be496199e7e0e52b1ba8df261e2abcad1fc1a6f4492f SHA512 6a43e82240538de276fd12771384f6855cdd2636c967d74e4d3533d9e4f22b9cad525e1593331722d70360b707af93fddd005c857924b304e85abaae6f560c8c WHIRLPOOL 390c7f0f606b2d7a0938620f65dae0e6acff410bf9ed272ad22cd72d776fe7b515b72ad26a085329cadcd3dac85895e2c4e2556f3222272d8da9fed8c21172f9
+MISC ChangeLog-2015 5599 SHA256 a4f16c0d8949c1acdb30b3bafe944de26672bddc98053650831e4486f2ddfbb3 SHA512 422b66d2ee4299666adf1a4190c69a93de3d225a9567327869b98abb3fadd6728a3e406e6bd3051dd428d85d4f70862dd1972294c2d9033898c00f1bf4d9b07e WHIRLPOOL 88affe2d56ef024f11511924c56e8ebcbeb65de835a6e1e23b5b56f710ba09abbd3db8277cff2e30620eee5bdadf39ac8b5c93c12638247504d325ac81dbaf42
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..4465d09e18d1
--- /dev/null
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-apache-resolver/Manifest
new file mode 100644
index 000000000000..ad11fa37192c
--- /dev/null
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-apache-resolver-1.9.2.ebuild 398 SHA256 84bfec83205d71e37a6d3dbfd1b438e02082d4ab2c05ff346366f188fefc6fd6 SHA512 68c92547682edb35eeb4f7dde15adf47f28197b6600783c52b8aa73c4bb8c14f26c556475ab84f4cf3ce80716f8c0b4a5d268e2ec40bafd7730f3c6c719439a7 WHIRLPOOL cd81d326b820e2131e3e7964f351fca04b1a736451dbcc1b05fd0a67a924addffe9b483b10eb8c6c26b264e5ecac0d2bb642853f8f91722d1895932f79c0439f
+MISC ChangeLog 2615 SHA256 7626e95ffaf4d1873c6511b21ea6d2de9e5f9b48d4b3c3cd172cacafd8d98ae4 SHA512 09c6598191131fa52f20338aabe1f80a77c47fe935def85f8558eb0a56a2e7819fc237c50c5f8f20991cd57cab2c348ad0f4cd12850f7db1c31d24a734cc5c8b WHIRLPOOL fab825d58d61463ebf7bfd7e9bd9581e805058e0758b9ba97abe35deacee5d5fd11c6724f0b619713b15452d90fde8f707042cbf80ad5a8631da9e4b62074982
+MISC ChangeLog-2015 5735 SHA256 f447a70b9a44dee1efb7e8163e9bc9e65c5761187b8a940aea3b844e5d28eafe SHA512 33d4858dba3c519b02803f560ee6f6f2d2b96d6bf04580c41d7ef6ca9fc8a44f1d26fb0a027917ce0accf7b0d7742857516a25adf466a6029d375ea77610e1f6 WHIRLPOOL f38af7653d8204b9d601eee1d62090996494c0f2088d2b19bf93e0a3b6a28c6dcfb6b61bf25aa670e37ec4a57ff43657b66029f20e5513fb83a1392256d909b4
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..8c6678ff70e1
--- /dev/null
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-apache-xalan2/Manifest
new file mode 100644
index 000000000000..89c981514824
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-apache-xalan2-1.9.2-r1.ebuild 472 SHA256 fa6f5043f004fdbfd870f3dd454449e13224e9fbc626279d3d03e100b3ece72c SHA512 112a3228ee75bac52ecc12d805f7f5d5da2ac5add8f566e3fe2807f00dccb4bb903aafd902136554db3ec013c690aff41200086f06ad1fa9af17322e1cf7cee5 WHIRLPOOL f9484c58cb36df35fdff25ed6d3f2e53f483884e247cc7a959194f033bf49e290b9037ff5fc72156ff3f07e06822961684542892d89eededdef11c64413e5107
+MISC ChangeLog 3010 SHA256 8453b21fb1acee4336910576a8f43dda981ddcb020272a17af717f822e23075b SHA512 34816c00eaae4ffeedcf9c2932b19de968b873c14777c2d3cdcfb57068054392f4233cf53b5171e83238a896e8ddc93ffa89cce99abdf0e4bbebeb1bdcaca4da WHIRLPOOL 1637c2ef24279694c27cf89e9076c8356f462d816ce4734d36ad1af3f1700c0fd2a188c5e80eb3969ff64e67831914c6fce3584ba2fa06c62532e3b68f0ce92e
+MISC ChangeLog-2015 4088 SHA256 fd8ff683b98ff5a9fb364a6d965911c7a6c9d9a7584ba3a1f42d212986e0b331 SHA512 4c48696c6d384999add305575117d8311e5a8f860c964679ba427cf8cd7ad8d70dff148e8c2e0878c3d6aa984a94b43168af4924d239ee558d09e5278effc7d8 WHIRLPOOL 6574da88141dd22fd9fa04d099de414e3ba03c87d3846d824b739b8851d7a66a8b067aee957e602378c721d132eebdf9d5b7b18161f6d6902a6fefabe8b918fb
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..db78e8f433a2
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-commons-logging/Manifest
new file mode 100644
index 000000000000..a18d74fe0efc
--- /dev/null
+++ b/dev-java/ant-commons-logging/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-commons-logging-1.9.2.ebuild 357 SHA256 c98faa571b25c49abc8922ea4fdae3fe42ea5e360d34c900e1e01ce6ac0eb948 SHA512 5edc9bf9f72ee21872dde485a614bac577dc26a90a9e3b5b4e0094c615a18ca32830aa0cafe4ff435efb5fe5b7077522acf12b0d0100183a45bf8205dc37a9b0 WHIRLPOOL c0daa63988f75ea162dd2ef6235634ce48b2ad0ca61f9fa10e3c6f45513ed4e9c61dd661417320b1f8aed7a2f17c308dfefd0c43ad7a866d62e94b1d3192bf35
+MISC ChangeLog 2615 SHA256 7e7b4fbe58366dad717ea4b44788e24ec775e1fa30a6164a8932ccc6d8df7728 SHA512 3e63eff4ea88dee1637cb9293c2154099eea236e4d35dd298aa8c1eb8e19643a788a7570923a164f6e76e93b36687e2d1c2050274afc2099f60b7144b52efa2e WHIRLPOOL 69e9abcb684efc0a395385614215ea81c71e9aeeab355bb0658ddf104d9e7965460c64eec1922a576c806c093bb0f1d093ede520ddb19beb33c7b30dc499fd2e
+MISC ChangeLog-2015 5735 SHA256 3452303966c5a95a8e6b97c8b16a83a0d229fedabf2cfcfa6a2e79b3fa7204d1 SHA512 80afd108c27ea29d0a0350d614c62c1b863061eae937b486d4d2bcdd3d03ef4a0ea0e51f4c97c70c3e34612322ea110d49ea484f3d7eeea8eb1782cece5ab106 WHIRLPOOL 327ce58c373f9e16ed43329ead3716e2d3a3c244b4acc6b0830617ca914ab3cbe12af291ac95c24661d49cd0702e15bf3b65df7a103401f40f610f8977ad1d84
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..2ca3455abc4a
--- /dev/null
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~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/Manifest b/dev-java/ant-commons-net/Manifest
new file mode 100644
index 000000000000..bbb0b15b9132
--- /dev/null
+++ b/dev-java/ant-commons-net/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-commons-net-1.9.2.ebuild 353 SHA256 d33de33a92ddd26dc162bc1bea3c9f2ac7535efeb2b286140918adf5199e4fb8 SHA512 67f4442f92c8c673c4bced36eacd90136846ba122bdc1e9dab9cc623a5263651093deb2c2ce878da9f905ca1491669b203d1c9a7b6792bb192c08a4c886ce36b WHIRLPOOL dd1c672e79f6f30f19923e86030a3a67b4a35ba4ae3ad2a418dcc09875129fc801e08f98669cc2e2a1c806b5d6b2e487e375e29b15e2227f05f3299bdaa8c85a
+MISC ChangeLog 2599 SHA256 e547a9095d6f04c3f25e1d82e443b32905ab5f922b04e2acebc54c51a924c304 SHA512 e42a5f2c3494750316a43b3c6001be1755d3913d762b8926511a3370350518341ee4bb8fce5900a36780bddb52294e642762ac78dd562b1f76f57ae3898b4747 WHIRLPOOL 85c1c6eec8ad3c6043c6327d71c4de3b13e8da561096ec3f89b874e5f429ff5e132923d23f7430d7fd72b872da50473c51b839455fe781bf8af3e27120d7ccaf
+MISC ChangeLog-2015 5407 SHA256 2357dd4ffc85dc08739742440d8dd9e035f1ec1faabbb6f572336a5ef34bb06f SHA512 674036e032f43f8cd35a7287a46c4df363c667214819bb19925ba3fd6a4a49584eccc95dc01ced0612c57f5e8cc97eba1d5d57309a917e634a129789c4698f42 WHIRLPOOL 257370b39b6ee5211a150aae88dddd3a355de7000a5d44d248aa56db840dffa490966cb09daf590da088244c770b7fba17a02013f66f0f00ac3610c8cfa14f3a
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..b9e768e4fc32
--- /dev/null
+++ b/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~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/Manifest b/dev-java/ant-contrib/Manifest
new file mode 100644
index 000000000000..62cde46e6b8f
--- /dev/null
+++ b/dev-java/ant-contrib/Manifest
@@ -0,0 +1,8 @@
+AUX tests-visibility.patch 755 SHA256 c08c7bfc90e90b594b1e58164b3f9f37a3a37171e88ffe9d2e974d7687fb1bb4 SHA512 a848c5573ffc9e02b77dd63c74d4314be5c35e47da7646d048d7e28a098290bc50d30287928ef3e06d8dcbba758b7ec1e87118ebac29bf72b04021f20e8c371d WHIRLPOOL 7113253213b7ece5e407e2028b9a3b4e7082d10ef8094c96d3310b060edb791b52f1f5cd78719bc8d26faf88c3ed11736fdb1146cbfd0a86e47811958486f2d9
+DIST ant-contrib-1.0b2-src.tar.bz2 118216 SHA256 29bdd00ee0df1d7b24e55b08bfff5641edf3f805e45a278641d42c0bf0ce9269 SHA512 5245ed1458c9c4892ab8196a8acdf8678aab0d45fc58fcd8ca446e3589f378a9a02de8e608abb75d24fa190cdcbe209454a703eec8d4e563b7690d6d58ea9af8 WHIRLPOOL 3247772090ab6b1cab556c0b4442ad4ecc4a9f15b7ffb6117f8c8f95ac4267215a741f3ecb45ed335657f1e881a933b1f3cf607a34602834fe7bdb37b30ccf65
+DIST ant-contrib-1.0b3-src.tar.bz2 3298187 SHA256 5c180feaca2704d914054a1e6b453673cc9b65cfb3da307aff17439a9aa09d6b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8 WHIRLPOOL e87fe9d07a97a1a8ccf4f4d0984f02ab967c5b8f6a11d6171f235fa3b9fa243dc7243953d9b14e72cbfece91d41ac264babee0241429090b1868e948a855fd3e
+EBUILD ant-contrib-1.0_beta2-r2.ebuild 1457 SHA256 e53e7711d79471458eb18f0280e47eabef0680d54334184c6ea0c2d3e313052e SHA512 b01aa5faf840f0c9befffaa2dd5caf3c2bf73ebb9e2286fbf222352b9c72f15d2d7b1e6f8066fa36b2610e8a2e9ca541b22bcb2eb25abb77a0e5fed1b8ef8b84 WHIRLPOOL 576ab01e1ba67f003c3f589514550c71689631843aba21b43878a12a99d16f2d976eae7b98b70010e6a5893f35792f4282619470b5e221bd68f6ccd73fc74d3e
+EBUILD ant-contrib-1.0_beta3-r2.ebuild 1841 SHA256 359630e823675fc7dc917699e3c688fa5191a34c9238d2aab8efeaaaf34cfd50 SHA512 b1ba13d26296bf3751cbd14c800a3df64a12a54db3af2fa3eade7c0fd77a8ebffde18024ef80d2c252929187f2d15ac5d6b4309037157eea596def084971cde8 WHIRLPOOL 1c56f4d9f478702d15d6d0f2781a737569a0d40ba83f5ae9027af2eff7b48e12f57778f869a08437a6b97bb2522c4870b1d553882f21a54f42ded8da3c60069f
+MISC ChangeLog 2744 SHA256 b53846bc3999bfc20ccda129a3d6099f374185c4e0bd5f5a7a6a3f2957bf08ca SHA512 c25c45efac8305e5c56882acfcb3d9031c01f5cbc55ebd47c161f7b55f156d9b8755eb7a8db9e024a0944ee2533fea9f542050887870752cd412ad20297ef549 WHIRLPOOL 19dffc295ca55085c560f6efb0a0ecbbda1899df822d72e820a4297ff881cb6b1f989d7500149e8ebcdf494cf72d6fc0e2cb0f7110b4968b011c5247e5673095
+MISC ChangeLog-2015 5494 SHA256 186f3b7952df38e8c4b825bba5577d4f1b198568f3697f2b89b16e4f8fd46a2f SHA512 b9b581c7315522c1d4692d0365c8e634740819255fc0429bf12cbb58d9ba35b4cf690fc694a0b5cbbabe62a53e2447d06181fc6ac9531c6a01a8a1e202448579 WHIRLPOOL 4689adf03c1d662fab62c78fee9848f5febabdebf6de77d97f701342189fd22f6e9d6748fde3e599333201ba2a8e2d1cbb1fab0d81c0d7fb4fa0842d43ad9cf0
+MISC metadata.xml 317 SHA256 daf2316137c1bd32defadb3b7067607cf3ea34b0d0905a1c43221fe80f437498 SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8 WHIRLPOOL 94235522f301fa39825186b8671d2be481aa8de6b0e75b6f21e0dbb56bb26bc5da1ff8bea1e22335e4d9d3ec6a28ed0553897ae8c0918dc34626b32616b50461
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..347d5d2bab3f
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd"
+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..973516ec43cb
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-core/Manifest
new file mode 100644
index 000000000000..e0106d93fd3d
--- /dev/null
+++ b/dev-java/ant-core/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-core-1.9.2.ebuild 3222 SHA256 be5258b304071469e442afb4844e3c55a35b4e03f9294c261b24b98955426165 SHA512 28718f896d5ea688a8f073ef4c42fa76de5def3f3bc94cc4f34d0bf66fec3469d8050832e501f53aac4c57c4020453b8cb010b9bb2b9db7052841b0804f568d7 WHIRLPOOL c39ab1cd897d20cd8c40d0baea176e2ee80450127e0a2c86f9a8b9cf39f2a194f403034010cd51b561ef97994cff50e31cce6146a46e2d67ccf39e83c702e106
+MISC ChangeLog 2594 SHA256 64c5a0d6f42eae256ad402be3c51f851e1b1cd3707b29af1ac37894808bdd2d0 SHA512 21347a0482b73e2fcd13d0276218a302b8c66be37c9ff5b7a503903edea0b357d2938203efd705055fb642df494ab762e742363f526ffd5a67b70769cf967975 WHIRLPOOL 6eea7b4bc08a2a806f919dc0415b844edddd2dd15184b804bd6ef9a8f5e585bd4dfc49489c8a702836474ef17b77369c109dddc33801fef1597afc29f7ec1953
+MISC ChangeLog-2015 34039 SHA256 9417fd682934159bd5077a5d1dfe273b29f3180280851228f1864c6357947f31 SHA512 6fa99aea4826377d047fc9c116deb7e5587b4ce41c75d11f55f32574b3c713724ef8c7134f5d070fe671c97055c57c1a80516b4b0c5322650f362a04bb15e270 WHIRLPOOL 5d7f9b38e9b665dc619242d4bacad86b6ab7f2c09af1113d9455b058855508e0b798ed4de415f41d692da5a9dcfe0bd57706bea26f57eda0ecb09e37822fc413
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..571c56636156
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 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="mirror://apache/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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/ant-eclipse-ecj/Manifest
new file mode 100644
index 000000000000..e99e08a3bf57
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -0,0 +1,12 @@
+AUX ecj-4.2 290 SHA256 0c39a0bce7857c919666a6b52a51367ae7a15a343f018993417e1a9b7d0ec3f2 SHA512 9fee5e853c9ffde67103b35cb8b28d06dde9be305aba872703a14a95be3e51f5087a5c897e6685f0381794415a524513a4e988ca088b7d30a574518943f97713 WHIRLPOOL 272520596f7d533529b94943d54007bcde062f2a828058733b1538fc3f6a8abfb7788f5562d9adc060f775b9c2d43a929bc1ac130c0f1b4a8a8dc92d50479896
+AUX ecj-4.4 314 SHA256 f5eba0b180a56baf024b118fc5a82e49c8cb48f784d86626f9941e95529e55f7 SHA512 a0023e61ed3b1174e7ab7ebc9eb2bc42e9df6a23e5010ede6c2456eca60c4f4a9e11633fcc6438824fe1db4c881499b5f384715c19381411460e78e78ddca678 WHIRLPOOL b0399878efc4c96631f40ba09baad246c7e555906ab25a35499dae00d1f7ab11d9cbb0117bd3091c94171910396ea56b0c228a5c24888f33f8a3b914eefe1d66
+AUX ecj-4.5 322 SHA256 08edc75cfe69fd298bae4862854d9f95c9387f56f83c71e4146a6e44b631db5a SHA512 d46976eb709a65e1d01af6b48d095325daf10a1ee4ff5da22de12593a253ba21e9550538ff13d1b7844fdb2604462d28133011301ba6a69cab83b2de7c7324f2 WHIRLPOOL 979816f0d05d183967c43f19f08c682a998353061ce4402e487dfd1ca272f7a6e65863bd9661670714abfd7a7d39283b5335c7f466a9d467ccb900f13413a040
+DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
+DIST ecjsrc-4.4.2.jar 1764959 SHA256 ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 WHIRLPOOL 5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
+DIST ecjsrc-4.5.1.jar 1809543 SHA256 101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553 WHIRLPOOL 739746de8dfb3c9b9ad40925e99ed58de1f594d6d4e20fd71ce07394a99f2f3f51984daf27c32a76ae5c4a25abf99c6dfb012b62858806d91a5f584d3a4da9f7
+EBUILD ant-eclipse-ecj-4.2.1.ebuild 1373 SHA256 d1ec3ea8e80159e18ec5fb90bfd74c8bbb83a90b3bdf16512cb849d0698f360c SHA512 6c52e3176ca5fadd62fe8e203906eb91a169404488a1ac8f4d5fe1a76c9f103c6c1a1b9f8f31067a9b2a377772d0c7d08423a7cb5357e056f424d97051a2c69d WHIRLPOOL 98d7ae055b648b11e4fdee068234b57d45d013a0612f78174c879e6092b6bdcff9b0eae3b039f8fb515309ca5f5d00b32967cd94b8c06625c83fcccad1a529ad
+EBUILD ant-eclipse-ecj-4.4.2.ebuild 1258 SHA256 a3bba943bc65bd2b6f5a3440096c04e5f893b9a0efd345e64d982cc92ff3d452 SHA512 69ad42f42673352226ec24566248ab45b131833c1778ad14be1ec2d93f2005d2189be57a32c8da2c00bdc99c99d88850439971ec9287b3997aa5eef36f16fbf4 WHIRLPOOL bf71db2b06d47a6d53de20734cecd2daa8ceb7c92365bb5488748a39d9ec6d3f6ff38f0cee19c7a41f29123e82a9774755b3a6bc4c193df2a51fd9d1a2edb886
+EBUILD ant-eclipse-ecj-4.5.1.ebuild 1259 SHA256 ad1c567dbc1bfedb9d9f66eefdc0409c9b881aabb6b268a346d235ea45b31352 SHA512 30c416ef45d8414ea89fdeb929694f7d902b20b6036e040640c22a518cb179b4e8c5a173e77e14098ec85edb3a6b17160d2814f6df0c2a035513594eb2e96675 WHIRLPOOL cfa17cf17e585b3e3042f930dcae3b726a94d4bbeaeeea4612f5aaab9c8935be2844af0a0a42a074e53071198695b3ff3cf0d39a512c7346c47fbf5a596d7b88
+MISC ChangeLog 4110 SHA256 1d31f25c37030ef21eb0478206f6a7a826e495af940daf5e708174bfe1ff590a SHA512 2889b86bdfecaa024ec84da9fe15756a3fcf6754ca78b7b3c790dc6fe7d4b217d80cd1357d27583b081f80cec697e12b6cb329761165c28bdef417c7ab95039b WHIRLPOOL 8034dc5b50211afefd6d9cfc26d8168e7d5011e3d8bf58c2d83dde6c62f78b41039c8b9c46a2505322575e7d631b388e44a3fac0acd88348aa6eb373655bca4a
+MISC ChangeLog-2015 7704 SHA256 99d5fc5b16a6592324ac8a68844c1378ba373b5ce83986580437f6f17589b483 SHA512 43d303e2943494fd382c50e98bd2229cb60fec307e19968737cb06b614dc8a0699547b5a3a8d5c404002ebffb3b2bd21ee367c964e7697090bd6b030f0c42c5d WHIRLPOOL 109e83382a37654423d81635bc4eb99b6ba1f3994c5054b2eb4c80c6fe4dff8fd6fec1daf245cb70d2af033286943bd2d06b20019241bca6f0a7a87d15e314e1
+MISC metadata.xml 546 SHA256 d43b927c7beafd33134261bac749ea757a6e54d2be990af08f7d8fd3a041a3b2 SHA512 999312c6cfed7b52584e3e80ac1a9f5b372a05b1f6523f859b367080e7989c988e2773fd2b0f5ec5fb11da42386e37dffedf761324a41b43c309b3ab5a57fd36 WHIRLPOOL 2597a10c2151824dffdf3ae85cb3a2d23323fa54c078cbc5c9debb2e482e294eff857f17ab346f17c321277b10cb34e7478f3f1256c82457b8ebcf13fcef4292
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..1f176373088e
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 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 ~x86-fbsd ~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..a18201abd582
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.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 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 ~x86-fbsd ~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..82815eb9ed9f
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.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 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-ivy/Manifest
new file mode 100644
index 000000000000..fe3dfbf3a925
--- /dev/null
+++ b/dev-java/ant-ivy/Manifest
@@ -0,0 +1,14 @@
+AUX 1.4.1-javadoc.patch 500 SHA256 93596668c1661527074753b73120650bb2767f9da40601a26ff7effae8bc4869 SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f WHIRLPOOL 433180f5eee515fdc371afc47524e1570eeaf829aee01181dd0173ec195d9698a7d6abcc73770da396adad8f08ff5df7b11406f3a37530c7590661340cd12463
+AUX ivy-1.3.1-noresolve.patch 371 SHA256 6b5e0bca2d2c777f4a8a3b78976be9ca737ebcb9e1a40099113acc9a1e568a01 SHA512 fa520c8bf17813c3aa9c6b41b50bf844c86b959b2046b64241bddc16675a7a2583151813b6ad3dd7369ab1ee453909fe84a34d8e4c81ee5729e9c929d9690b02 WHIRLPOOL 3e41243aa637271f28afd77f8901b2ea4c93e899e1e12a1967eefd9d244a8d5e05e6030ea6c004928b460157521b3c2629299780af4da52ab2857c07aff19b37
+AUX ivy-1.3.1-tasks.patch 593 SHA256 835bd1b695bb5e19d9481251aaafd529b54032b98e1bdf847a84884902c4a4cb SHA512 399f5fd76af888d4aacac83ce0a1311e26e49f3101dc1577615b576057197518348917a7670d916e502ac4caa2620d9824470e72acd9708a35463d044e733278 WHIRLPOOL af752ac9c7bdf01f78b024c3d5a4ebb395da6df4573186fcb3cfacc2e3701a6bec4608d5892b876bc883e5577a6a523a245bb23617808a00b16ac43202e582fe
+DIST apache-ivy-2.0.0-src.tar.gz 2248438 SHA256 99b550f826f0d5611e48503cf83f27840c4eae3c0605b15dc058f2fb8e73ad1d SHA512 eb932069c42b42c421afc5b49a94204d5359b8f6f23708d3cbd04fee260c2348eea540bddbee7950cd71c8a5290383f7f2d4044e03fc8b53013fb381e410f1f6 WHIRLPOOL bbf9abcab217711af018c166717d9484df7c46a0a5a4f460b7f4440425c6b3137accb06d888bbf2d80920758a1b66b9f4a3eb3be04fea354fca8d915f450fed6
+DIST apache-ivy-2.3.0-src.tar.gz 2790722 SHA256 20f9ba64b6f24328497394d8b3e24b8e15e12ad230958be9c76d6f8cccf081de SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f WHIRLPOOL 5be77a1316d089c9ce1b7dd2387c0b4a99bfb2f0bb5747ac49d2ea45973425376f9b775d297d57c3c503921ca7bcfeb65074f8ee96add47e11fcf76994bd9b72
+DIST ivy-1.3.1-src.zip 1302693 SHA256 2a4653de892b739f8dfbf21403bfbf49c7febe9fb5a3d855cd9ad4bb29964fa0 SHA512 35c425ea8adc714496dbc2bc0d5a6037fe295967bea9014a16850e54ab3925192e42579ca1e23d68d776326e81e1e195ce85f1a7791a6b0b20ed179c09a22f82 WHIRLPOOL 5e8d07ee947c53b7e36dd7da8ba5566d962e922e2d3119e402e6bb441e55e6335c4ee848620ab2f9ad76ec2586f8500b7899a3f3780d1c104fb3413865f7fde6
+DIST ivy-1.4.1-src.zip 751792 SHA256 7e8b88dcca3481f5efd0a86436abaae6dd77f659b779cdd84c4e55386db16236 SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d WHIRLPOOL 9f058618d51f90979889d9bdf5df616da7276aba4ae4ae6b2cd447fa331edae5e8f03e585e1f4e9a2bf975078500c8d8d3a2ba856fcea7f78416ce50e2b3f693
+EBUILD ant-ivy-1.3.1-r1.ebuild 1493 SHA256 0888e8f7fa7e350338a83487ad10c7a4bb14960976d8d02a0ef016d317a6eff5 SHA512 09c988206b8822d450ad5219d5aeaf132ace56528d3e2065569e228628381ee61fc6d308b70f2a0a557682aeaf32c8b2e0a04529922892c07c813606faa570b8 WHIRLPOOL 6cfc688cdeceb6cae3b5a9300b7138c475f966ce5d7894d3410f2680b888c93e4b8b835233436f181677e6bd0d7cb3d5c27309d0aa8a9b147fa05c872cc16ba9
+EBUILD ant-ivy-1.4.1-r1.ebuild 1767 SHA256 79e5bb866dacf6c4656d817c2b68ca9ac8a2a94cea728d83d2a2373c68ee8bf3 SHA512 b3bd82273c970bb54860ae10863583cd7e750beb43998adbf6bf30a630397594e4cbcf95a6819f0f0c7fd86ef41340ff163e4f17d8294d2373a593218533c1be WHIRLPOOL 0ac1bd6ccf9e9b0d7f925beef230a9ccd6e6322c45d6d74374fe390a90c4169c6c6c8384c2eed36721f3b078a8a06e14e7aa3c24a7d6a383b5eca4dc41e10d62
+EBUILD ant-ivy-2.0.0.ebuild 2000 SHA256 073a69009bc7e6aa19d2ef9e03560296ad4c83b4fd7ebae2f7ea6e8c13cccf5f SHA512 24e2f9ce7b08aad3fcafc35a783b2d8e05c1a8dfeb320a1911211ae4e0b1a6a110ba6c7bc3ab2b2c961a5b689f0c1c0cf1284dad2290222ec824b60ce5399092 WHIRLPOOL d49aced1970a8a90d07e344b072f9c4a9d7b3ff0351262f17bee3831395de209ec0ce879d5a305071c65a84010c785939798e84b2c64c3eecc4fa51b79454b6e
+EBUILD ant-ivy-2.3.0-r2.ebuild 2224 SHA256 deda9402b548faae14e90818c4a2489ed15407f0c282b5774dc66f76d3efa084 SHA512 a0a2a60ec9e604e03a5323bf603700b7b3d184f9e5ed320323ec56a2cd1340b3dd1bbf9d719bf117e053a738ce94920c2a4471ae5da5f9f7f8dd26d0b55bc2bd WHIRLPOOL bdce7b9bd3060a2f8c71ac9643c25eda46b6eb7ca66762fd4d01fe10ebc76c60d037fa322e5a8961d290b03920371f7381cdb3e33c08cf7e4643ec09564e8cc7
+MISC ChangeLog 4208 SHA256 08ca18a5000e09a7a394dae4ca4b421281f35c9b586cee73e1f6480cc2b8c585 SHA512 a0fa3434f07735165c2bfe2b48fa3f40d3c88eaf41f446299c0d347ad8bc00f906bea9147283a56f98bc315c69708b88ca16a2c64294b658140001de34b8e866 WHIRLPOOL 8ca185e7e3564d14e495de269992a96263690347b4545c1d4d2e1e6b28528cd38f5476c91a1628609b76f8e68e4da4ba1f28fcbaff3c03fee480ecaa0b01cf36
+MISC ChangeLog-2015 2826 SHA256 2c87a2d51aa480be0f6e3a69df785e4eed633fda029ec9acd31d4cbaf05563ca SHA512 0400e7c75d2d6c9b7e276de04cca92e064e426847953c1fa76a715c6add6ffef482131166fbe9d6d1247b65c917494ed3d469c05359b8a9d7c35a9dc7bf06dce WHIRLPOOL 9ddefb7f98a834ae1dc43c730ff8481002e32605c356359168728ec72d7ebcd64068b41772a8a1bbbaad64b868e4ea580b0b1c8dcbbddd04bd5c1e7092524775
+MISC metadata.xml 655 SHA256 538c5ffc40fd0b29b54d34c785c5c14a04b7506be4473abdbf776b7e13fb44b7 SHA512 81eb7f4ce41f17a43b32ac6e4ade9677397696cab06ae94964d1756d6745aadc9d61df9ef3b0749eb547b62fdc5bb19a98484268fbce9d56773be09a03671c0d WHIRLPOOL 285851fa4bc8f7820545381ac7b5b3e892eba5ca49891f8fd9971237ef3039c2d8c418d1e129cf6119c3a7e3b922666c02b7ebf1860a4e59f3e7343e14cd607b
diff --git a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..02604ee8fdd5
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+JAVA_PKG_IUSE="doc source"
+
+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="http://jayasoft.org/ivy"
+SRC_URI="http://jayasoft.org/downloads/ivy/1.3.1/${MY_P}-src.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/ant-core
+	=dev-java/commons-cli-1*
+	=dev-java/commons-httpclient-3*
+	dev-java/commons-logging
+	=dev-java/jakarta-oro-2.0*"
+DEPEND="
+	>=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_P}
+
+# Rewrites examples... bad
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${MY_P}-noresolve.patch"
+	epatch "${FILESDIR}/${MY_P}-tasks.patch"
+
+	mkdir "${S}/lib"
+	java-pkg_jar-from --into lib commons-cli-1,commons-httpclient-3,commons-logging,ant-core,jakarta-oro-2.0
+
+	java-ant_bsfix_one build.xml
+}
+
+src_install() {
+	java-pkg_dojar build/artifact/${MY_PN}.jar
+	dodir /usr/share/ant-core/lib
+	dosym /usr/share/${PN}/lib/${MY_PN}.jar /usr/share/ant-core/lib/${PN}.jar
+	use doc && java-pkg_dojavadoc doc/build/api
+	use source && java-pkg_dosrc src/java/*
+}
+
+RESTRICT="test" # fail because of a missing file
+
+src_test() {
+	java-pkg_jar-from --into lib junit
+	ANT_TASKS="ant-junit" eant test || die "Junit tests failed"
+}
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..e480764befa7
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
@@ -0,0 +1,78 @@
+# 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"
+
+# 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="http://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 ~x86-fbsd ~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.0.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
new file mode 100644
index 000000000000..aa8ea1ea251c
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc examples source test"
+# registers as split-ant task
+WANT_SPLIT_ANT="true"
+# rewrites examples otherwise... bad
+JAVA_PKG_BSFIX_ALL="no"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="apache-ivy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="http://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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+RESTRICT="test" # We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet
+
+# There may be additional optional dependencies (commons-logging, commons-lang...)
+
+COMMON_DEP="
+	dev-java/ant-core:0
+	dev-java/jakarta-oro:2.0
+	dev-java/jsch:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-vfs:0"
+
+DEPEND="
+	>=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )
+	${COMMON_DEP}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -rf test/repositories
+	rm -rf test/triggers
+	rm -rf src/example/chained-resolvers/settings/repository/test-1.0.jar
+	rm -rf test/java/org/apache/ivy/core/settings/custom-resolver.jar
+
+	# Removing obsolete documentation
+
+	rm -rf doc/reports
+	rm -rf doc/configuration
+
+	java-ant_rewrite-classpath
+	mkdir lib
+}
+
+EANT_GENTOO_CLASSPATH="ant-core,commons-vfs,jakarta-oro-2.0,jsch
+	commons-httpclient-3"
+
+EANT_BUILD_TARGET="/offline jar"
+
+EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
+
+src_test() {
+	java-pkg_jar-from --into lib junit
+	ANT_TASKS="ant-junit" eant "/offline test"
+}
+
+src_install() {
+	java-pkg_dojar "build/artifact/jars/ivy.jar"
+
+	use doc && java-pkg_dojavadoc "build/doc/reports/api"
+	use doc && dohtml -r "doc"
+	use examples && java-pkg_doexamples "src/example"
+	use source && java-pkg_dosrc src/java/*
+
+	java-pkg_register-ant-task
+}
diff --git a/dev-java/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..02b41428352b
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
@@ -0,0 +1,104 @@
+# 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"
+
+# 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="http://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 ~x86-fbsd ~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/files/ivy-1.3.1-noresolve.patch b/dev-java/ant-ivy/files/ivy-1.3.1-noresolve.patch
new file mode 100644
index 000000000000..206141f4c260
--- /dev/null
+++ b/dev-java/ant-ivy/files/ivy-1.3.1-noresolve.patch
@@ -0,0 +1,12 @@
+diff -Nru ivy-1.3.1.vanilla/build.xml ivy-1.3.1/build.xml
+--- ivy-1.3.1.vanilla/build.xml	2006-08-21 16:11:08.000000000 +0200
++++ ivy-1.3.1/build.xml	2006-08-21 16:11:21.000000000 +0200
+@@ -9,7 +9,7 @@
+ 	</target>

+ 

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

+-		<ivy:retrieve/>

++		<!-- <ivy:retrieve/> -->

+ 	</target>

+ 

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

diff --git a/dev-java/ant-ivy/files/ivy-1.3.1-tasks.patch b/dev-java/ant-ivy/files/ivy-1.3.1-tasks.patch
new file mode 100644
index 000000000000..4e392f079352
--- /dev/null
+++ b/dev-java/ant-ivy/files/ivy-1.3.1-tasks.patch
@@ -0,0 +1,20 @@
+diff -Nru ivy-1.3.1-vanilla/build.xml ivy-1.3.1/build.xml
+--- ivy-1.3.1-vanilla/build.xml	2006-08-21 19:34:19.000000000 +0200
++++ ivy-1.3.1/build.xml	2006-08-21 19:35:18.000000000 +0200
+@@ -33,6 +33,16 @@
+   		<jar 	destfile="${artifacts.build.dir}/ivy.jar"

+ 				basedir="${classes.build.dir}"/>

+ 	</target>

++

++	<target name="javadoc">

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

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

++		</javadoc>

++	</target>

++

++	<target name="clean">

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

++	</target>

+ 	

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

+ 		<path id="run.classpath">

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/Manifest b/dev-java/ant-jai/Manifest
new file mode 100644
index 000000000000..86cefc04f7fc
--- /dev/null
+++ b/dev-java/ant-jai/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-jai-1.9.2.ebuild 340 SHA256 c130f53c9fd37d6634f9cc1e20e83c5574f09c6390e9d1af63f7ab149209cefd SHA512 a8bc99512c1587fab1aa02e4f2fb187cd25b5204413ac0c394e2d10967289245f6dfad6728ea77abf0e62e3a4cee48b2c6923f7286607c4514ed58e6fc33213d WHIRLPOOL a3d1da90e91b10c1eb665fa3114156c7cb8210f048cd47a551b30996f2430c9338698e059da2f702fb208817ad5e06245401936179f9c0e99931a597551640c3
+MISC ChangeLog 2565 SHA256 43d0e496dd7688323172859654589322df8ac8e33b50c5bc64ea8ad0fe841339 SHA512 6733101161cf13ae09e24ec5e7747f6f04d41b03cb234a4cec99a40338d219dd6a897404a16bfdb4e7f7bd6a7b4ecde918482a9b9bda3067267abb7abfff3b10 WHIRLPOOL 2d4180760e88ab96831ab1541329d41d4882372ffa1980b07f360533ce94a3f3fe87f5020951eac47c8a9663f9a1519c3592fca31949d7fe94f4dd5c1b2790cb
+MISC ChangeLog-2015 4497 SHA256 d60c784a474205aa9840dbbefbaf5e193771e73150f82ef9ae4d9b03859a1550 SHA512 73d9a6322f75f4f539a0b138d1fd15b37142f13fe0b2ef62dfcba847d7734fd8646059a111fa06211ab100d92630b7e679fb6be2cad7bb09aef49dbf557b2c31 WHIRLPOOL daa3b4800353af54a3ac5094af5e558af56b71f6b4edc978f10709e4ba79c1ca7c953a73bba04f8e908256b191fe32cfa1fad31c4223ab4a5e2eda2bce2e7d87
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..f0535e9d7c1d
--- /dev/null
+++ b/dev-java/ant-jai/ant-jai-1.9.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 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 ~x86-fbsd"
+
+# 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/Manifest b/dev-java/ant-javamail/Manifest
new file mode 100644
index 000000000000..a3aa07b62fed
--- /dev/null
+++ b/dev-java/ant-javamail/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-javamail-1.9.2-r2.ebuild 382 SHA256 ce2e193a349c6a5222d6bf796b45ab5065905ff0fdc8d6a76e046d4ad9d9ffd0 SHA512 f4d6f0df610de7541cf9cb3ea043a8f81fe2a2ee4519516c1b9417a815423dbccc4de22d3ef233051e50526190c91c60667b66b26d5aed31c7349a9ae56dc26d WHIRLPOOL d0d8c4c569e464f11ee98ebbce7644d86de883c44fd2854681bdee592dbb8f4868c1f574258b3520fe52587defa9f72544719eb2140be2334ad3792c1b056da8
+MISC ChangeLog 2923 SHA256 a8d83b25b500f8a9b2f914d14d4e3f65110eed2a940a1d8cf49d0e66bb8ab5e0 SHA512 b6460191f4019892384e01163e13a2e429caaef064a98ba909cee067061c62ee09532f78194df2dab1dc7884019f2e1a3ae94ca359cb071f497cdeb18bd06146 WHIRLPOOL c2afa3b0e333428b8f3d82c96c43e6e592a2cdc0aa3edf3a19446b832a60decfa0dbec50d41b11812beadaf9e5d09f40e0b5c35b41b2f9068a3b2b0ab5a4b41a
+MISC ChangeLog-2015 5830 SHA256 ec757634001d909d2a1b112e3ef42107ceff8b6afbd77cac5c477e4a8e8d67cf SHA512 f91a67d25ba13a1f485e219dd0ce8aa2adc017cece401c90259d2203724a9dbdd3c16037a3e6269159d66730b04cd8fdb38213d996fbe814b7a86f070b90c5f1 WHIRLPOOL 752ea233de135f420d7282e9794e4f743fdce2b1949750bfeea8d0a403e8fd04ad76891debeb26d6c9d9ae1c4aa0a2394696ed8e824931721dce9c593e29ca08
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..4bfc033218bd
--- /dev/null
+++ b/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-jdepend/Manifest
new file mode 100644
index 000000000000..d7e6739389cd
--- /dev/null
+++ b/dev-java/ant-jdepend/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-jdepend-1.9.2.ebuild 347 SHA256 40365f74967fce17623827c0a6600dce0bc0f49e40fa4d0055d55422c1ea5c80 SHA512 2496c86c4dde5df6ec98450fc6d4a82da97a9380de7f47999c28ae60bcdc62537a54aafef38b0b79f5cc7c4a7a1d206c96bad6d3427fdba585c8c73fccc82156 WHIRLPOOL e5aefa2d813115fb5fbc1fa3518f840f0767ae9f424b46d9f98e271946dd2176bbefa8195f5a984e04016de655b7541498692001f467cddef7361a120ea9a54f
+MISC ChangeLog 2581 SHA256 60df97b814ab3601527b6b8e12e64eb88347c7e0d5799e8de5cdfafb03e8d7ea SHA512 a563d77edc729c3c786cf7a61ed2266a01b70d25fa2c063066fad70d79756624067f52ee8b6fc425114ccd268468584fc10621f0421617fcf72d4b90816cbddc WHIRLPOOL 0e5e2ef4f48c15d79c287c85d43493325bd4ce586a4ea6a8f0655f02cf05f14bbf6a2706d3dc116a690df327a9f334955dc7778563e5567ca81683132ba55da9
+MISC ChangeLog-2015 5207 SHA256 2213e4ffcf6b5bab96c0809c28f3bbd6f63b4715f78fd35ace07ed9a84f12c20 SHA512 b1efb37b5ae034dd76c81f9d7782ccdb2970c12c2913935e846f246d93b6ff4bd6753e7b83507d18f79b904be5e8b35f1e44ab4355c9a8be717f780855cd99a6 WHIRLPOOL 4bc88c167706f7eaaca76a7cc032b533641d300a05d28a9275148eda0e277d90ca57a8f7dec9f17409ec7a37fc6d793e9229ebdaf4b82ebf11b2cbb9430ae394
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..f808cbe1d6d8
--- /dev/null
+++ b/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~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/Manifest b/dev-java/ant-jmf/Manifest
new file mode 100644
index 000000000000..28718b594b22
--- /dev/null
+++ b/dev-java/ant-jmf/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-jmf-1.9.2.ebuild 452 SHA256 92e6949912c9d7dadc8e86288d1a2647f2656a6d845f968bbdbbf389a1ed13ef SHA512 4c8c3e93d4bd0fe60b5b18e4e4536b8b2b9ef63a59e050db9b2424466cd6a81a5237c64ba22e28231a8fbcd9761cc3700336703a3b1313f6ac24b839c2ec827c WHIRLPOOL cec0d761cb17497550b830b51781bbe81a26192bcc1a76b7bd4d97e8d21a3006809d8ba0c5b836d7e195c62cc8da07b1bcdb2d7c21a8dda7a5ca4dedbb4c7925
+MISC ChangeLog 2565 SHA256 b544d1c0f2faf0b37d55469b9a75360a56975f689271d072900f5c30ca9a5d8f SHA512 52a36292dbe735d7290a5ffc0c1b0e21d549fb6c4c4c9b805afc8133c45ce78658907054523d0c1b59f1c6cd176499b556ca4d66d144ebe1feb31d1f92f1d992 WHIRLPOOL b0f2be217c81fa54b6bd0c68fc563257f389d525688104d4ff682f97a96e577b9141c8be23398e9b08ffaa57a58492e5dafece7aa2f9defd7c2d6fbc5844c5c8
+MISC ChangeLog-2015 5205 SHA256 e6e55a9e8becb9079c60037581a32c7c560e6fc3f5968741fae9533830ca401c SHA512 bf13d08d6781ee9c3052f3bec3860101ada1d280cfa5d1ded924da28dc0e682fd57217ed432298355b0b50ba34bb18808967be886083c64948f4b5aedba91677 WHIRLPOOL 1ee0e5cf3e811f5479eb91c08bdc1915303a269e781c69404ab5b41c9af54ceb81b19da3d7b5a8930da19a3fb3d9eb6eeacd1176754b09f9914710789a2e92ba
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..ab8386e7cffa
--- /dev/null
+++ b/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-jsch/Manifest
new file mode 100644
index 000000000000..ebd03b3c37e2
--- /dev/null
+++ b/dev-java/ant-jsch/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-jsch-1.9.2.ebuild 344 SHA256 081ee4444ae5988b39f524438dbec73ab361cc9ea008e6feb6551e8c7bc295b7 SHA512 72cd533c5a834c0e0465bb61c43aad4eabff9d807b3c6ed1e6eceb474228179b82693d0ad45e19f5bd85de7f4729f74cbc45743a70e914e9dc96e2da2de15d36 WHIRLPOOL c0ed7d3108a5e5e691afa3b7e4887279e06a914bd5f9e4293fdb744532456e2657fa52cf7e6ef62e7892c35203968743bc7f139d02b77c6ee27fcc0ce2af8bb6
+MISC ChangeLog 2569 SHA256 f468c9638525fc8b8118d0aad3483cb51092bbafece9030c4cf029d5f6da70a1 SHA512 010ff16a1999a6671c476dfd2bb468b4d28150ddd9d3eb338dc9a43d963978b34d1364645fe1284cb168e2ddc06866898ff0168cf77be950bf584f475f2726ee WHIRLPOOL d1a034b726e2222fd49c37ee2f6b37b7ea9e133fde01a705564a3e3ef91f15a80e146534509c3cde45241d8e368af21e39ec1fe2d73ec07b3247a00ac5265076
+MISC ChangeLog-2015 5509 SHA256 d9b95ec59fae077097839c2668b36c3564fb9aca3df0b60400b96f1f48f456fc SHA512 fc83f83c4ff613f9e7fba015d257e217cf25b179966b6fe9ef01d71077deb1df59db0e15edf76c44d27a5f800ac8b2169aa951caa95fb32da6b42e22ff534926 WHIRLPOOL 4a8a4b490bea3642a30c903229ce46dbf0da8f9e4002369a29c53919183d7b24b8be17a354d38a554de48b45702f3784fa00e65e16c6de14c929aeefadb0c197
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..2c3a6d228113
--- /dev/null
+++ b/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~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/Manifest b/dev-java/ant-junit/Manifest
new file mode 100644
index 000000000000..9f8a4a5571bc
--- /dev/null
+++ b/dev-java/ant-junit/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-junit-1.9.2.ebuild 462 SHA256 3be128c07066675d55afc99fea7f46996ba87dc738bfdb82ebc1fb64870e7430 SHA512 0730e8fb193fccec8f16804d67f8603334175380dc1d216eb0163806fda1e39df0d4bb1ed5d03a5090ce52c40fe83ad7261c926b05eb2fb6aa0d1c012ce4c6d1 WHIRLPOOL 9454f9643e82f4ba9e1db22b34d53939d4e3df679210cb3d6a022e3d757aa3cfc2674973678c7ecce7bf1726d314f4aad7c26a4f0ed3c7ec97485cd075460ab6
+MISC ChangeLog 2573 SHA256 2e6de923735822d946ea8cda0ebb4d1570ace10920de74ea034680597e3140af SHA512 3e49d955c3bec79a7738fa0e5aa3b5e8badb5dbdc1ed38b688b42e4198188f6e4da65ed45260551e4347ccee018212a2add0a8e00cc3969c9a1d58358eee3ec6 WHIRLPOOL 1eb691129859443f48dff94070f485c60f16476d446c978ed07080705039c76882a54df5ac828e18dc69215cdfb0521668f3040e401676e346c887ffbf5facc7
+MISC ChangeLog-2015 5485 SHA256 8cc5a1f0b1317a61c9522dc208ba6498998a58a974d20f0ba7438b178721db06 SHA512 b693bdc9b4e0ea3d1f8e115c12c20b930e8e6cd48115e773a44b6ba307f6691834ec3616163e21e7adb00ad628700432c3ace1cb2783217c50f735d564b6cec0 WHIRLPOOL c0ae8e3facf822273165e397a780d31c60ca3fbdd75bae4cc53ffb3b3c274d3e06473dfd1af56698ad7e9c4e46a8a615cd50a9fcb7464fa6f5785ac2c15f0403
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..5d38d7307664
--- /dev/null
+++ b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/ant-junit4/Manifest
new file mode 100644
index 000000000000..c13c6a253ca5
--- /dev/null
+++ b/dev-java/ant-junit4/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-junit4-1.9.2.ebuild 902 SHA256 8deadd0f7253fa965e71e401c9907ecc4c4f651f3d9e05f3366e257e1488de4a SHA512 d5b0ac15ce7e0700518f12515fddef3758a6f6a2d9c8ac3eda4db6fe9a7b1871e2845b0845009ccea47428eac9426a5a877d04d4dff4c5911104ea582f4e3a9f WHIRLPOOL 813aec742f6000113fe691cd708cc8e96961eaa6b0ead96786a370163e94fe5762e78d131f3f891a563b68314ee55e498205349470fc7be583453d90343a1c87
+MISC ChangeLog 2577 SHA256 3348d4dbef0e346f8191c9553d74096431f0fab747909f1fff2d7473002590ff SHA512 4f55d6445ed888e433a3a0dd458985d1628d2cc97e6c3382383e49467bd5939e4ac4009e5a2bdd68a8c705b649ae7eb1b8052751fc82e77f787f5cb3909a92bf WHIRLPOOL 3e7a65fc152f144cd5ac8f0156071c7f481032852aed48e52c891ffb0905f2afb86787991aa251c5241d83b4a733f7fcfeb0d47efec8ed80e5a95a9a3adc5bd6
+MISC ChangeLog-2015 4353 SHA256 3e1eae91f65855a79dfeb054778f9ff54f4169b44dd3188672a8aac0bf5d591e SHA512 a246afa0ee61488a595337d2788583a7659da54438e43596d370c6623332bf1e522f5ea6f9f67fd316b7fbed20f6aafbc040ca34f001d3db37d3096e43769092 WHIRLPOOL 9126022c1ec8d844ff74445ecd027af83b12a5b455ab6a846294b1fab841ac2f9516aa7a7e7cb33a32bdbb4a6ee256c76f56cf1c526acb7bcfc48bdcc950b987
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..b58b83bf4437
--- /dev/null
+++ b/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 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 ~x86-fbsd"
+
+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/Manifest b/dev-java/ant-nodeps/Manifest
new file mode 100644
index 000000000000..0194b13f7694
--- /dev/null
+++ b/dev-java/ant-nodeps/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-nodeps-1.9.2.ebuild 932 SHA256 a37e9021145584334ed1e6122d2dda03cd7aaf625c1982f81181aa8cc486a514 SHA512 469024e1ef97f587af650b8b5be03442b0ec92512edb1ba1bd9299f714f268192d423b493f1c7106cba877f4209fd02b1d7fe2efc4e0416f94a0c361d24ccd6a WHIRLPOOL a78de1cc8a6b1c89a73aa93a62ef2dc6607a1960631ee1d1240c2f1f62793831b333fd3341bc3009e1a2ef9cccd79cc666d2a4de8ceaf79db7a2f310697c281e
+MISC ChangeLog 2577 SHA256 553fe90d6b6559b0dfcf568bb5b0fb1b7037b6b4701dea7408d99d7f0a9e6ca9 SHA512 f38921fbc989d385473e7a56cd36063c4a6689d115ec4b5b6482ae05b649728afe008a66d1144fd6b271163158bf8eeed4e1efbded605d0e45ef93fdfa0be1a2 WHIRLPOOL 3a16737160ee78162252dc119ecc35c2ad91d15c3969c082e6d0ed94f29eebdd94245f9e0615c7480aed8bacadeef6810a122fea3b34d05185f4a4679bf2fa6f
+MISC ChangeLog-2015 5867 SHA256 b35d74d22884a91416987a10bf2da11d02c69bb214ac9d5848420315b93faf0d SHA512 b59ec71b09dfb0b4c7b168fbdba8950a95c23c7f1f51d79335a87667d30d556bbc87350435c50dcf2535a9e6c2f0f30b511936e5290c330dd012fbf97bc09353 WHIRLPOOL 89ab542d6e06dd8944abd62f2a259d4b8f98a38dd859e945be16caba77e81fff38ba03b13af8ce3a718612b1df3ae0921f31b725bc4baecd753c298f9d013d44
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..4e74b362cd6e
--- /dev/null
+++ b/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/ant-owanttask/Manifest
new file mode 100644
index 000000000000..c3db0be22e9b
--- /dev/null
+++ b/dev-java/ant-owanttask/Manifest
@@ -0,0 +1,5 @@
+DIST ow_util_ant_tasks_1.3.2.zip 1170518 SHA256 9269ed0a08fda3407c2ad726a883eddb4f7e6882f162b4ab32d030b39ddcbcfc SHA512 c2ca84d34864b075c39e9699ac1a41c2980615ea6d813d007ee503fe19cfd5c869cdd0f6be27cbfdafc33aa49c32022b99ced2387381fdb6816925957207a603 WHIRLPOOL 558d860692b1fe105484b31a339bb1f8cc80742b50568d1005a5ce90f16c87a5e24832d35a211b98a92a71a9635c792cf310f19773dba3e64434ba98c0bbfe1d
+EBUILD ant-owanttask-1.3.2.ebuild 894 SHA256 50f4ff45c5024e2c26f6de3fbe943258ec1bab75a7fd57424b00a9cc266ddcf3 SHA512 30ff00a5ecfe8df095e22452ecb1bb76f135f2830f221dba8f3b3a9480ca452e57e98dec2c761b33e32d045022dd0e65d4e703cb2ba9b77142b5f5bf7059f952 WHIRLPOOL 1a303941fa35efe6e0de14c3da4fe4830c587522e83ff68eb6153fd5c91d8fb18696e52c6f1a9eab2f4646d2f2b1f879796c055ff655e70e438d37cd01dbcd38
+MISC ChangeLog 2835 SHA256 80da02f505882e78d1b3c104749f74eccf76160536813659c71281b669f461a1 SHA512 32d685d4c9500a0980af65c701d456b1402c7e00f24208b43ae1f6683f2f8db1986bdaaef606e4adae3d3500f67709426d4a14668c9d55554e18dd337889d55d WHIRLPOOL c39a0ec200c00d265903345e0bdc5dc61ba516bec083fa09bcf04882c50c674b3e0ef3a1375c3048b0d577346c70c7538bdcbddc0fd8c6e6373e5309a4b028ee
+MISC ChangeLog-2015 5209 SHA256 eede3665bc196fc03d0f7caeb0df646754689af4cf2ca53d392f6a2743549152 SHA512 a47244d21e49ce3e44fc44f559f617585550d43615d044b1927278e611557f6e310efc62e2165f7ef50a11d8324ad7ccfc62f14b29a8f0c79cf9dd961420568c WHIRLPOOL 72253443564ee1e9691429c2dd2b8363e113e9821cae739164d70d93de537350f4911f7fb73b6441647f90fbb1506b01e67541563ef9821cbff7ca520210beaa
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..160cf111ab41
--- /dev/null
+++ b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
@@ -0,0 +1,36 @@
+# 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="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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/ant-swing/Manifest
new file mode 100644
index 000000000000..f917196b788a
--- /dev/null
+++ b/dev-java/ant-swing/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-swing-1.9.2.ebuild 388 SHA256 20871affcecd1dfc27fd34ff36afd0a3da6d6cae5995b5e2be192c00a55b62d5 SHA512 0bfffa2ab4b814e95cdb9bd0917506463b4eff4145c8fae2e721584ecdafd09fdde177c0aae5f3d85a54ae7d3451663fd5db35acc9acc1b130b1287b6c5c1bf5 WHIRLPOOL 07e05323d92a3b8f1640d64fe06242b13f9c6f9317a614c410f6935a677fa36cd25be62ecae83dd7885f8b293bd24c81d601b4ee7192557bc70af0636a6c096b
+MISC ChangeLog 2573 SHA256 2cb6c3531ab3d728ea37af40cea0a88bd44e3b6b8b45874d35139d2fe322be21 SHA512 94604c56fde9bed8b3bee650d2869f82ca09dfb8f4ce4f589bac16df99d0d63b025b7bfa1479cce8f167b592bf77b76f5ae3e593f9216da7bb18607fabfdea3a WHIRLPOOL acf86be81f1abb5f0680f6a8faa33f3936ffb4c501d255cfb4f829f1a1243024f59e3b44f8d0fe57a762726fec8846bc38f86932673da7220f714d2305d7a683
+MISC ChangeLog-2015 5435 SHA256 1360668b2e7b69b0281aafff9ff2e1f6276bb7f0138bb6c2fe114ef1a8d497c0 SHA512 308cf386021a3816143bb35f28b7c0a744d4edaeb40e4bf9ce54e9d85c67145b2f4607e55860f9b80a236ceb6e021d17c8a3f65eace4ae95938f802478ff8425 WHIRLPOOL 7d69c5f5b7efee8fa284d454d98b10b9dbaaa1035c2dcc4e75fc2964d7ad8a53ffbbc9faf4a256240032b8f8b847e46725d9a55241bf7c66b56e00433969c723
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..4885f92ae62c
--- /dev/null
+++ b/dev-java/ant-swing/ant-swing-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-testutil/Manifest
new file mode 100644
index 000000000000..fbc78acb3b09
--- /dev/null
+++ b/dev-java/ant-testutil/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-testutil-1.9.2.ebuild 889 SHA256 0be9d42c07c6a065abb72117788965f36b4ecb83e30c24c8f2fd84cc493247f6 SHA512 20530af423ccdf6f3ac96cc1cbd5910ff790d18e4bc4ca672f0c48847b66edfaeb12121af3a20aa36fec85dcb86bb3683f6e17a6ca3504a4863d0a94b07ea18d WHIRLPOOL dc032e9037e415b60116a5cf78ffa2db13f770f6a94ce65a64d7ba34b0a0c54f2d61bf91987b31f92bf67ec31bcfe4e206a857880b06000341fc405154952b58
+MISC ChangeLog 2585 SHA256 6cb08cd10d942c927d5b8c36b71b078fc9467ff07498dde4ea8f0c4de371cf04 SHA512 de4e1bb144c843f60c256f23c4c1baf4b8a74936a8b876f15fb775c3dfb11d3c9aff35157e1556d4b84ce19701bb0b48340e95654e6be39449481c21567e74c5 WHIRLPOOL 000304b4ee6519dc8005cc3358dc73eda761b193dd3aa093662faf61719ae20c15cc42933fffe34b672c4dac640283bca47f3204cb413f9fe9a9215b8af630d7
+MISC ChangeLog-2015 3568 SHA256 2473739db3d8a1fc1ab6c286acda57dab12bc4dadb864d2046c4bfa9447e2497 SHA512 496165318229e3fb2f15d0da9bf130f621b296e4617e153213c4be2abb63995e7810a294867824c66039292057ce5d3b5f3615bb79491c6636dceba7c46f0dc6 WHIRLPOOL 8dcb78f309c9f4d273bdf33c318a17e4e5a7b4500517342e1b24f034b180ebc38fec724b3d4684015f1e371a40fbc49f5a1e926e7b761806844145fea16041c6
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..b3690e3f151e
--- /dev/null
+++ b/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/ant-trax/Manifest
new file mode 100644
index 000000000000..9009499ab39c
--- /dev/null
+++ b/dev-java/ant-trax/Manifest
@@ -0,0 +1,6 @@
+DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-trax-1.9.2.ebuild 920 SHA256 ba1bc3f3af519a16f221188f273a4f71e8d0157949f982069894edde19a6a934 SHA512 b38466c2f955dd5169193ec180966cf85f31a99cded54dfce1f9f71acbe01b63dc650faa4994e6bb10e07b52d2ae6f27e18eae67665d8c265e497ec977703598 WHIRLPOOL d94976d6a9bb456411a55bc8669e719435d0efbb8dd676d7abf6e57e9b958acba57eb6cf0b05d74f3940786745f793806e62d6b83131b936c6ebd405dbe8cdfb
+MISC ChangeLog 2569 SHA256 ffa4fa0340890e4b5a829f174f0a0322395c679c44d114897c7d8974fbe3e9a4 SHA512 326ceb47a1c9e6c5522b83e3010175e17d7de790c6c274ccd8008280b9b2a33f967195e91c8cadd5c881ca32914971392d646a7b2022f053c4cc7e645843fe4f WHIRLPOOL 8a8b5f39b9e3d18a5d565f55e823e79ee26d5d6a01510a8544949e61bb5e766156192850e9ce998607e1af061edc168e188692b90e5331f8228e0700558c61fd
+MISC ChangeLog-2015 5501 SHA256 cfd02da36aae0f84fcaac5725c8a00bbeee5bc442dfba8ca77003981dba3c529 SHA512 4136059daef3d9f43a335ae139dd3b0d88dd57c03bdaf3f76b6c62fc95ae6ce5265aa4ef5fa11397b00d315b5abaee7a1a1a6e9c967cd9c0b35fa4d2899c0b5a WHIRLPOOL 84135f5e15fbabb237ea666098d6f48d1082dcbe4310a77271c3e80ff107c3199756c5c0bd157cf7af91f00d048cfc716c4d48c61614eaf9a17ddc953a4c0fe3
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..ea41617835ec
--- /dev/null
+++ b/dev-java/ant-trax/ant-trax-1.9.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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..69fee5cde797
--- /dev/null
+++ b/dev-java/ant/Manifest
@@ -0,0 +1,4 @@
+EBUILD ant-1.9.2.ebuild 2112 SHA256 ccd145c4e52a3b39ff45e18dc42431165998db70c512bf30a88f0b94d5e567a8 SHA512 9c1b76d4536b4638b82a868d8913a2b53466e442eecd5eef6e511e276af0dbeda8206709ce912c91b47699d79cae10bedcd26ff6c32fcf94d263eb86dc58d2c2 WHIRLPOOL c7849b50e2c84254b1d27c348c20d09532187fcede314766d469d5b6d40ae6087ec1f03f6fb532b48bb90fecf70a106f4e99a5fe02aa94b8915e5ef495f868b8
+MISC ChangeLog 2549 SHA256 af26b3234b1eb2c650c75888b13727955fe94138c6a9f07ec550175fb14e3d4e SHA512 04a5e2041c2f29241534e256386d666ae1e3ed8d073142d11335dd2e90d50dfdd0f9bf9886e55bbc94ab0a29b72d8a0947f4633bc68cfe154cbea5ca70e587ea WHIRLPOOL 5fe8bd6d0e102e8e7b5fbaf163d25296a5566fa74ed50c3ee23de79247d6a2e8a3f8b0721fff51715cdec35b60f737d21368f13936a1760edfd651e7b69e7640
+MISC ChangeLog-2015 7661 SHA256 3d1e56501f82bd2f2598fffbe92eebba952b5a07cd61883ad4abf26f50394c15 SHA512 96b1e7630c0e268fe0f71228e0c4aa08a9490cf2aa0fbc21670b1a50bbe97fc0bff8d513d9aa5edbbb7b5ec7abffc255088df4e98149074d5dc9a077640d719d WHIRLPOOL 442425c7c36f468fd100c95a535ac3d3e4f7d126a658725b15a21ff9130c6d475cd103753e2cd9cb03777843d1b00d0a4a6d52b69ef88f26598952aacede4573
+MISC metadata.xml 1159 SHA256 745f7e2d149e5054443082aa2a67f4624ca1466caad4974d88be44bd4e20a258 SHA512 daa64360ccca2ae691a7d47b980cc35eb0c4577fd99493b235c4931861edc60a0bce1c7da5d360fd58c3c426421a7bbf41a8d9b463783e212dbae91f32a06a49 WHIRLPOOL 28a8adc41ef2879b570d60f196f568db76b9182a4733b1d0fef3187cd217163baf199ee8189b345d832f8be3a2c0a7e675f158d5bf083bcf66ea01380b4ccfbc
diff --git a/dev-java/ant/ant-1.9.2.ebuild b/dev-java/ant/ant-1.9.2.ebuild
new file mode 100644
index 000000000000..ab04f04399ef
--- /dev/null
+++ b/dev-java/ant/ant-1.9.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit versionator
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="http://ant.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="~dev-java/ant-core-${PV}"
+RDEPEND="${DEPEND}"
+
+IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+	+jsch +log4j +oro +regexp +resolver testutil"
+
+RDEPEND="~dev-java/ant-core-${PV}
+	~dev-java/ant-nodeps-${PV}
+	~dev-java/ant-junit-${PV}
+	!dev-java/ant-optional
+	!dev-java/ant-tasks
+	~dev-java/ant-trax-${PV}
+	~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} )"
+
+DEPEND=""
+
+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/Manifest b/dev-java/antlr/Manifest
new file mode 100644
index 000000000000..0cdfe9cbccc9
--- /dev/null
+++ b/dev-java/antlr/Manifest
@@ -0,0 +1,21 @@
+AUX 3.2-java-8.patch 1318 SHA256 c27c2356958175684bd175798608361ee3ba9f904b66bb4682b357a6b9f0cc00 SHA512 70c9dc23ec64ba75bfcfc0597544b13c2c35c523c6f2c9d82dbc54a44c30a5432a56b6193db74ca9c3d92235bdadc5427857c364abc4df79ffdc1d2b55221d32 WHIRLPOOL 4ea6ecc381ca01ae3514cbf2aa8da4ddb4ab5540e74589b82187bbaf92dc46e3565807c45b174e48d462aa1657ff7ac0e27423763d7564d2b971324294dd0396
+AUX 3.2-test-fixes.patch 10278 SHA256 749ffe6e13a0a3f2d649eac1f93e114205f3bddbf7e7e1a59ffc4dd6a4d91344 SHA512 b593da8fb05d8ac51b0fd72172b740aeae060bd18c58413c67ff0c5242609b419d4a1b0a4f5ae66d5a3b2103007d4511ece41da6b09dab5f12ffd5f905d45d31 WHIRLPOOL 11b7d93cd8aba51503a57b985113326e5216847fceeb190731300e71472a08297ab2c5527f7f470e7455bebdba79388fb79953d4ede931d4177802a4b9c82cd6
+AUX 3.5.2-test-fixes.patch 2093 SHA256 87ae32a7f74c62479bff31f7a6f00cd99d19ceb5d3657878ad72e5934d5bc2cb SHA512 dcdde9daabfb3379f85d831a594259b21e1cc0283f7f0972d42801cb144d6932fe5cccff576cc885614db3f9e07b98782c4932a03687658df35f698455588533 WHIRLPOOL 3252b6b7dabd2a13340b4302ee7666c901c7fd22bd05aab60cb23301a5c3e97f06bb5d901d0008695294e12840e58437cbc3e85fc35b5a9d5c9a5b603ba0c7cb
+DIST antlr-2.7.7.tar.gz 1816180 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9 SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d WHIRLPOOL def5ac0ddfe5a65f9f7d5489d039048c5d630b46cd5626593bd12e9b393d5ec26884f90b013bcdf58511e26abbf06e0d7b3789a11298b017f7e70af2ec8dde4a
+DIST antlr-3.2.jar 1928009 SHA256 4c8737014e7ca0d2c85171edf37f5a26b2d8d8237c283357b81a3269b6848d38 SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6 WHIRLPOOL 19d99c9f50339ee9ef31e9458ac3a44ce52aa89ed84f96be905d626e3a53d5e2bbdb2e8eb4c5ca16413e7493499b141f940dd200658f8e60e9ecbd777f83a84b
+DIST antlr-3.2.tar.gz 837320 SHA256 01548fa03ef1f0ed05a93f0749b65db8a35a191ad7ad34e1e6a6a2529ca2ef45 SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c WHIRLPOOL 40080efc13c88312aaa318cde097f240e711b477e264739ea71b6c246ede29ac48f42eccd55365af531eb428f1ca1d89386d7e5753b6bc35cad9bf937b70e6de
+DIST antlr-3.5.2-complete.jar 2456317 SHA256 26ca659f47d77384f518cf2b6463892fcd4f0b0d4d8c0de2addf697e63e7326b SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1 WHIRLPOOL bdbbb081bf0aab83fa26a4a75f7f42487da688a5e3c765ea4cbd7b8c1bcb80b66e8b98bf95ee8bcd2acd60b4eacb6745f879cb899b672ea7fc4489d651a6f2e0
+DIST antlr-3.5.2.tar.gz 6927126 SHA256 529baf7d11f06b773543e25271c1a6e1735d2f8061f4866d1ea5c99a5d71ee1f SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99 WHIRLPOOL a3a2bf81cc91a332725a4ce15dcccf10df5395b27a521656b1f3e80fed10197edc132fa2a8b9a259b2ee603320492b4b1f664692a967fdfdbb574d919b9aa20e
+DIST antlr-4.5.1-complete.jar 1478820 SHA256 9cff6c76bc5aafcbf51cac7f0974ae01e4f6119402e75436abbb97f8ab15c211 SHA512 1109087c44706694d75a7f88f6ce96e8653467d5721505db747e7e70a4f40a24469b1fb3ffcb327819bba1548b0025412e46a11a41e329b0ecf847cb1094238c WHIRLPOOL 54d8a59bbd935b84a76370645d57eb07ee9160297ad457106b7b773682f915c9632446fc818a9fb23ab37074c923b918c168a7eca98555513cfb4dfa2eb106e5
+DIST antlr-4.5.1.tar.gz 6158475 SHA256 faaaea662e7b4792fc2264bbefaf0e196e74f45ebe29ec638f978b008e6bb5ff SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9 WHIRLPOOL 00aeb41f8864d65d7693cf3ca4d36a10f094967fe96fefd67e4d64eb22d1502658ff2355125ab5e36f88a276d143247c0a2814cfcd990e08ec3fe6f6212ea42e
+DIST antlr-4.5.3-complete.jar 1485121 SHA256 a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4 WHIRLPOOL 9547b9e18bbef393036feeff9608b14bb57916e27bb4a4e15f1842ed428a6ccbd6c3fc819cf322532876ec4500bca3e4d73194e3ed85662768240750f8db235e
+DIST antlr-4.5.3.tar.gz 6760401 SHA256 5eaf01d4994383029a7d5d9c4604d7c7dc3122b787b69c541821d0f4dc0e9f05 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7 WHIRLPOOL a58ccbe6b1bed2cbb77f689cc3b8a731abd480f689a2e2129eecbd68e843906ec8931f958e174c2bf463651018cd6facf97eb5eb4b7aba69ea337f26040fcdf3
+EBUILD antlr-2.7.7-r7.ebuild 1110 SHA256 1bcf1b402e126c934a67ba849ae41e51fa772d765b93011e0ae694c78f19656b SHA512 3222c36c63ca49e4eec7418192eb25b7466b2d39a9c2531ff29db22c93d9c89075fdd59c1571adcf7c3ba98ad2170e920fc30ce4eff39a25c3e02fa7ba9ac3fc WHIRLPOOL cd7eb5e70d649f88c45d1ac99fa64b09cd34498179438c7084a6aff0c970e1dabf3f48d8c79acd8bd0b2d3280194be9b64af3b5c4c9c2ab58753ed86e18dc7db
+EBUILD antlr-2.7.7-r8.ebuild 1121 SHA256 e50c8d3e950c2426ee65145ae4288324f8e50daf360cfce750e8ac8a873c5aa4 SHA512 4d2387a3ab329f37496ca8ca108708f2e53de4799bd473deeb1f1f296335370ddfae4527e05f81b3d551593285ef202fc1d57a9ed27c885ae8c6d1f819b71bf2 WHIRLPOOL c9e6f6bcf1271b1a3a369983b0155d73c1e50aade4f6f147925faa08b20d6b20483147049aac3084422e03578f82291aeed610da0d255ba2db301284da7f9e83
+EBUILD antlr-3.2.ebuild 3242 SHA256 1d19eed2f40dd803cd3ffe694d59e2e0b8d8cf57b6fb06dd1ed9e72e67c3f4e2 SHA512 38d68d796dc5ea1bf214779642e9ea40840295c6caf69017bfa92ca623289f9ac532e5262a64d48bd8ef1c709b45a1a9590da8e0636c37377649a6c335bddb5f WHIRLPOOL 1c4c5b15f1b7c2c66f0a80f992a6b7d1ea766768092ae3a7589a7b99f557073474f8d761e1fca69a93073e41724599ba3e907aec1900c21ed36f3ce1412bc991
+EBUILD antlr-3.5.2.ebuild 2995 SHA256 18970d16efe494668ce0203c73c064e8fb8e870fbfe8303e494602e18b591104 SHA512 abe140c64f10c39f82c5771acdb2a848ca0ecbfe718a0cb9514805c2109c2f4128b97ae8e5abb81f63417507dcbf5b23b42850d48f1eb826c7e0d390e64cc0e9 WHIRLPOOL 2aa8ba3f611b2f1291b82bbb0b3d7049361390342e7e4c7170ddb410adc577e99d5c6c188d1a60ae510aec850ab62bf7dde13a5ef13a4cbacd726e24ba9c252a
+EBUILD antlr-4.5.1.ebuild 2452 SHA256 63dcb0c9b77874c7b7fb16ccb562772cb4729cd06bfcd0b1311a28d85adb2f0c SHA512 ccb84e30811f01bb4d28d38117c75c79b8e0048a86d06194bdfe1aeb7de5b33b9d08e907a850a8a3714e637dcee4a7a396cd314ffc6c8472671e236220bbdee2 WHIRLPOOL fc4a22f3be9dc52c073f2091d637a51b1f2e774e1cc4dc6885c8a2d2f49fe563e233f8c42457d8c67651450f8a2916f8ece9cfd4bc86ecdebf3e41eed3444af8
+EBUILD antlr-4.5.3.ebuild 2455 SHA256 6f93a445688c94b0f235bd9d78c483c1f6283e5192121ead1631a2784b05d3ba SHA512 03e9c3c64e3c04f14ef82b3fcd5d3018778f39e8c5386da05071634c14791d6335ed3212387cd0ecd7bf4774c5a3d2a49569e566dfb61ea6a66fa71ba4857841 WHIRLPOOL 7537dd283f648fbabeb49f51a5304523754195f4073dfab139a024c060a7d5c99a91f1b5dcbed39603497d933ad1ca94934d82598eb876aa8cf2b99b5596a88a
+MISC ChangeLog 6291 SHA256 18d9aded36b61c3df7ba2e56bdc663af5306b0af4e8662ecdf2a3e02fe62311f SHA512 a30c43069262bafd75a1fdb2652f470779c351bd52411303d615caaef9a7967325bf92fdb84a6e736b044352f2906ee38cd786eb1d0c6f695ab8b8d015a4e71c WHIRLPOOL 6e3a85948dce0280cd35e784d8e6be8225cb8d6bc4f036efcc17603c81fe2d2bce2cca5fc819788fe93553303c67f304579e57b058536b9f676006ad3c69cefd
+MISC ChangeLog-2015 16936 SHA256 5dbbce05d4b62d117a5cf5672ab4ddb30c31ff3a961db968477271d8342eb7c0 SHA512 9b807d940667545f211673047baf5fca4452643575f2512fc8976d9560e718f5abe893fc65e3a03432a74fb81ba0312bb462f56834e547b04280108e2b567f65 WHIRLPOOL 0e912f06b0329ff076e0f92876d7f105bd9f43a63ef5929d21aac05e67bc9f920941674edb671f3f407fd5093368e3f0f373e7d45225832801e81270a13b9424
+MISC metadata.xml 313 SHA256 7220aba897554ea2e6acbd77a56c97512713cdb8cf7a57c414086a15d1e05954 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57 WHIRLPOOL 2e6b243896ceb86db3f25760af12f386135e9545ef1ebff735f59541ea4b3b2870615b8ea857ee0b0322c616b4d4598ec4488e09de0a3205ba7e3383e656e3b2
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..3eae09ac430b
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -0,0 +1,44 @@
+# 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-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-fbsd ~x86-fbsd ~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..7b6c1b00af0e
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r8.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="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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/aopalliance/Manifest
new file mode 100644
index 000000000000..bb6d0adfd662
--- /dev/null
+++ b/dev-java/aopalliance/Manifest
@@ -0,0 +1,5 @@
+DIST aopalliance-1.0-gentoo.tar.bz2 4203 SHA256 30c954c195d3dbb189f68c28be51aecb41e5100e2ec9b58aeb5cb9ef43f72ebe SHA512 6761933b9c127af9773f518df89a905fd67696964837b8cb841664f16564bc879dcfbd5f47dcf85e999d4dd64561a3b46edac1c639471d3ee9be3237d9064187 WHIRLPOOL ee180ce23232a666aff6a69b8cf6880744be78e3d206cd92da3e43e93e9b9ca3c509f8c5e8c8598d7389e4355be4920e615be3f8332d7463f3179a40895c16a4
+EBUILD aopalliance-1.0-r2.ebuild 874 SHA256 739fe918662fbfb6c543f6df56ee2145dfdb787167312ee910839f55c824162c SHA512 0ab3b52d3eec301ce67e30407a2ed23723d4405a693697d4bfcbd4b498689ce8aea21e5b1b5a7a64899af8fb635f993353564c976ed679a7cf380d85ec7eaca6 WHIRLPOOL 15f679630a7df63eee9e22e9d06a012e88d88e69a8133ed98ba096d115c552bef3cb0be54f4a800daa82357bd38df19da9c24cf510546b5a46b167e62a77ad48
+MISC ChangeLog 3130 SHA256 70f7cc5013437f32c7d7b76988f0a206266db21f039ffe2bf40f10fe97cb469a SHA512 68ada89ab2bc9a6829754ad246708e6792f5ec17707a022630fd6cbb18d9957d46498b5c1590b31893b934e2a53159d0b7cb03200c64a96794396acbb6ee07bb WHIRLPOOL daf09abd2f8ed4a1ababf20b7e94aa1a1dcec1faadf25e4e397391599eb3e8f051efb06943dd3249295b38cbb4bc6a3e3c8a424c9cea80fc59dab8d70493fd16
+MISC ChangeLog-2015 2343 SHA256 1e64ffb1bf2cf74cac57fba771054d75e44c3934177e898f2c738165e5eb6b84 SHA512 ef015bad4ff18fe2021688033b613990949679e613207e33cb64a79ad2976f5c14516c2bdffb75b9f246c8d362c884078241ce4661255217d60d5e4d966b5522 WHIRLPOOL a224e5d9c468b2ff37c57bcca21b02a21fd2c83cb40796d26b6528eaf3d8fe85a90930fbd7dd10be15ad515ca96695ae17a38eee1075f8d3fbd2171147f3f3f2
+MISC metadata.xml 317 SHA256 570b8f6584431c45202eeb142a3cf49e5998fd33e6903a64b335c6dc7d35812a SHA512 566df2a1062c0a0b5be648ee6d5163645ccb7ca885b8883a28cf1c851a9528d4da7eeacded56ed0270f4b3c8eafa61a808de5b27f9790487d107535b39ff4360 WHIRLPOOL 83a57163243f66d41f4210e97569b2a4e0403d696eb537007da1cfcd0f491bc7b94529f9d10b9c5db9a6aa22cb4bfb45e4b187a74d0996348e9f642f4c2efc28
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..be64f368d971
--- /dev/null
+++ b/dev-java/aopalliance/aopalliance-1.0-r2.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="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"
+
+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/Manifest b/dev-java/appframework/Manifest
new file mode 100644
index 000000000000..314b391e8a4e
--- /dev/null
+++ b/dev-java/appframework/Manifest
@@ -0,0 +1,6 @@
+AUX appframework-1.03-fix-imports.patch 859 SHA256 c3e5579541217ee7260f6111ee2fba9c3617722eb44247d98f878162d483dc8d SHA512 9fcf414f952d19b78d26eceee80ea8367491e29c26ef195593c54eaeeba296f9874adedca0a119197cde56a7be48955c8b6a4e78a6440c7100120354b15b1541 WHIRLPOOL 924512c60ed0024e399a5577e30b8c83e87df84832e001b3f03e87804006032817388be0431c7e18c881b2b00640aacb97c944fa2c1d22f6088428ca48cb4af3
+DIST appframework-1.03.zip 413438 SHA256 9fad98a0b70e6c67cc38dfe9d01b00fe7b7fedf51fa50ac68e7a86d7d1c38fcd SHA512 7d24329361f0d5f2225a7248ba30b1f0db364efd93e0581e1f10d0f8e2b6354f9d578d585ff1a08b27846dfae0b805b0f609711234be616b3f0a065dc1801309 WHIRLPOOL ef3e4ea022bc3f902334255e26703bc12910f939aa87c12dd6191326c33b2ea9da3abfbf5f29d6d5fa8ad6e65af329520c7cc7c90e36407a1b7b6f384f13c8ea
+EBUILD appframework-1.03-r5.ebuild 916 SHA256 6ed27cb98e02a6f80705d3d7246b7a8b8f7eb5f16841dface8050b066531b587 SHA512 86d9b9e9e20f3001c65389444312c748a89b9fd0d9d9c43e76cfa3ed957a9bd8570a853638e089b0332f2f16b1be899e0e1bd7b64186e911f026492c2ce55703 WHIRLPOOL d043bd202654464a80582834942cefb86b4a5113bee607f2cc488d7515e25f02436912e1f692ebe8a8101cd8cf99dc85589b28182b05f09537e0183cc6568ccc
+MISC ChangeLog 3490 SHA256 d0fc1498435a05696eee76ba3d7b1cbde1afc5324fd620dad592f11cc4a58717 SHA512 348b6b55f0940059124ea95a79ec493403a177580d3bb07e71c354ddb52911fb9b4e471c1cdebb1a0e59b9648c69b625051a478ef0e56ade7f62828e09070bd4 WHIRLPOOL f7d8cb92db46c0633cf92eddc829109393ffae7f9e68a970581440c4076ea9a61da0e5c911d9be029ab054479ec07cd66744c5b5a87efb0ba397451574b77db9
+MISC ChangeLog-2015 2206 SHA256 3ddeec6d3a5a45b9b6e80ca41db769e0cc36972ca04c9017d57d4a20a81e81f5 SHA512 43c492bbc4ebbd0e8b057ebbca2565d8a52a8bc89ac0e2eeee52340a917ccc2354a6d6332b6f1dd3314c487bc738ee27032505de065cd0b987e4d8c7845f2a51 WHIRLPOOL 1ab5f8f1cdc9c7065affe4e11d963f5112d5c7c6f3ed8ec3693b184ebabcc4ffc58f3e6c20f02fff5de169fe2eb823f83af73888216fd4658750ceb50319a9a1
+MISC metadata.xml 989 SHA256 4586aa61282c1e91a9d07aaffb1f3e8db3b4263e84fbd7372e3fc0cb4e27effb SHA512 2a4de695dba3016de5df684f7ebd3a5fe25a7de02eb732a3db3673fdce90c358c1663aba0e11da2f2c1ec4c58be1542aa54994a38cd40cd4fdede2ea7669592b WHIRLPOOL d5f26607ddc3417502f00662b22c2f84e8176819ab9648b8847bf824fb595c256f7df12f56a7b687218886319212d56623972ec2823cf1aac7d1f8be434d612d
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..6d7f24baa1b5
--- /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/Manifest b/dev-java/apple-java-extensions-bin/Manifest
new file mode 100644
index 000000000000..12a710be5001
--- /dev/null
+++ b/dev-java/apple-java-extensions-bin/Manifest
@@ -0,0 +1,5 @@
+DIST apple-java-extensions-bin-1.5.zip 18036 SHA256 82a2de820045c484f7850d0a02a36a03890eea8c7f0d3907ba64da43ee9f13bd SHA512 9f3e9a8eab3980feda8584ca75d58da8b31ec0ed77fb2a4a1488d0b2ca0efd845ff705fc372ba3958753690f839b0ccb2e9310d6896564317b625ff9ba9cc456 WHIRLPOOL bad2c6232daafd0a5c755855a8e94f3c095a41db8f3ccdc9688382e87f7b45a815a57f692e3f53189b8f01b6efb33ff3e033bb0e946caf88406d3c72f023f99d
+EBUILD apple-java-extensions-bin-1.5-r1.ebuild 588 SHA256 d56e5b88f3e04ad737e5dde56161dbf712d7c54f4a942cccf48506dd2f915281 SHA512 d861e1f02e16c5be7abcfab2caa65320eebc68e27ecec68efb0a319c00b78e56a5ef43abd8a6695673c1afaf80120cf6abbeaf24a125a44c14aaf008156ccedc WHIRLPOOL 1d23f0c8326b6924f472488899c1acda25496fbca61d137500c7c9d39e60f7a3f6eb0475c136b828024033987dfb82afe3468d054cad633c6e36ec472e71e9bd
+MISC ChangeLog 3192 SHA256 fd8c3d52bfe237f39f7e93a8392258f9b4f5995db60ea254b4f6eea7d50531f1 SHA512 1bb67bea03b0dabc9a3de21074abfa0c777a3b14ddb23838dfecc5643e692e5e8512cad39e5af1929325b045b8e5a929cbf4071bca5924b9ee9968706b12ff0e WHIRLPOOL b98770b1a5fc01903b8761c43fb48534f4cef369c9d68d002c44603f7c5210ca10d5badcbefaeeda6eb8076e51ed3bb7b35db293774f26ad1754d59a8faa9326
+MISC ChangeLog-2015 3017 SHA256 d320b82cbd7d4a8e11fe9ba3b88e7f7d7ef3e1ea556b37dd52b10ae7a9cc2b77 SHA512 936381b60602a972d33689a446e9e6684f1518e99de19968c79c610d3a966bf9f006d9c3d80610f38917091ff29ff99c13dc3a555471887088485a547796eb81 WHIRLPOOL 87d3919e71f0d3c7b0b2b945a2e703a85669db48d67fd1afc189185863de85f49b96236d2b25a1c57fdda7e025805a6e582f60269f1699607220a6c7794bfde8
+MISC metadata.xml 501 SHA256 0646a36881882fe552043146611b10e63a3d070b4d44642a2d0f365e11ec8cd0 SHA512 3020f46051a0c24205d991413131b00510ca137564c3c50b329f42ef564ef02a1701a3607fd1720a8169428fb98b5795653b1b40cb520be72c45a23fffcaf440 WHIRLPOOL d794f5a921de9b5ff42f1e0a80db38f1107869578b104613dcab73feca55018626913d80694c90cbe8853ba5f28d5d8cbb50152aa4529d2381cf03a4c5694416
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/Manifest b/dev-java/apt-mirror/Manifest
new file mode 100644
index 000000000000..c4e72f4987bd
--- /dev/null
+++ b/dev-java/apt-mirror/Manifest
@@ -0,0 +1,5 @@
+DIST apt-mirror-1.0.tar.bz2 21396 SHA256 62daf3cf424d1d55f7c93ca12c6996e4a7ec11acbeba6d4903d7839471cbae62 SHA512 fdb58498bc5ff1f77858716b67dd952a3f3bea55d06d7190b1a1d283d11843ebf03c7403ba58f23478c1c553402d21c2089c2dca52f216d693ab713a43f5c1ff WHIRLPOOL a948b7b2521c150e00a53e0ac7c5b56c1792199110c328d22234ba332f2e6aded30e8bb850818d4bc4bc8948aca662bb955eb8c5d9dd7f6d2a79b1eef21b4f76
+EBUILD apt-mirror-1.0-r1.ebuild 470 SHA256 9badc8bfb2b9af0adcddbdef422eeabd427154f9538480ea0e2519ae0733f4e9 SHA512 da54c738c49411f69485b732f833a59ca97e7b2285ef3f5a1f405b4b14cf1e1214dbd46fa5897c08395c67b8a9abff06f2a0639936dba41e04693f15e1c76795 WHIRLPOOL 40db700c00f3f1736227c3387a8cc06f8f1c93574bce6ad4d8ad15f217e1232f43fe5c027c6b784b759f8c9efb52e93ea474ab23db4b9b67ae754b7c35464e2f
+MISC ChangeLog 2602 SHA256 73aaf8b074f2df34ff3eeaf94b7dd219dae61270453cc8808ae1278d5b6eada1 SHA512 4cf848fc8033f9ff76a262aebbe639e00ba347fe7a157d26a255b0e8872fe8d5a9bcd1a9a9189edc20ea8582b9c2cfb59cf234267724d428c63b4c04ab4bdc21 WHIRLPOOL 0bac53c8d3e2f346d3e230354a0b1a846662d5eeba89b36a84e53382cb6d585d5e2491300724231cc692ec8684fadb0721235fe8d33fe9789f0b29b207d8634c
+MISC ChangeLog-2015 1441 SHA256 dbddb7382d1e118ed64bd6b00d949debe980d30d565a1c8935b70b29d7b077ad SHA512 3f85b64485e0053ebd79e476217c8e537860259a8277c3b34ddffda2941bf5b25700b5a78b428b12579c778ef6c5d1e66b97ccf827d501cada98d62ca949f558 WHIRLPOOL c68e3a2a84574f6a18caef38b17be56218956c73719f49fad66f00d15d6cb9c5db969c9bbe5c151fbdc1b62203e0314868a6cb062081dbe2885c61ebc37ecabe
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/args4j/Manifest
new file mode 100644
index 000000000000..966459903595
--- /dev/null
+++ b/dev-java/args4j/Manifest
@@ -0,0 +1,5 @@
+DIST args4j-2.32-sources.jar 65381 SHA256 feaa3544def7e4c772d2155a16d0542698d997fa2db2a4ae7993e075aba5bfa2 SHA512 97b48a133f6e3348e17a653aa15d92e0bc240e689615c22321573f7f82f01f22cffe43ef7b24f72a9a52cfb91ab6601463567b18f634fcc64362ea366456a12f WHIRLPOOL b6e3b5de9c03198b2c3eb4622a2ba4a263d745cfd2d8f5df6aa8f99762ea528795d0d24420caea948603e5588f0558c791a8214aebd7f596db1b6ed1cd5d2f1d
+EBUILD args4j-2.32.ebuild 452 SHA256 a504d34fcc51089ebcb560cf21e33950656924398adbba6b9bbb204b5dde25bc SHA512 2241a68052a565ec463092711a4857847a2d42be39676b3f187122d3a7249f9997834d7ede149d6d0d2a134149b1cbca19204e1352b87217c308214b7f9312f9 WHIRLPOOL 375ebd13e54e9a9f66cb78184247298850fec07a1387ee012be4904b0348ff3cf38a64936afc0b452dc5bdad5733a402e891e814174727990e14eefd6f8c6175
+MISC ChangeLog 2637 SHA256 089aa7861cf6249cfef0537414856e1970e0180e5e6d0fe9908a87ab5c810287 SHA512 91fa983756878aa4a99cdb3515f764089166acc60cc84e58cdd86f6735a5162652b77f76ee505ff90f4f74f5a137e759d177f94fac3e78c3244f10955dde9352 WHIRLPOOL c0a85a8b1eb9616bdc5c797b18a8f4a20a46bc5f66795f8183f774781bc9ae388758b643d9816d456573e7359bde55dc59e9f419d77cc347b2781e21e53f2178
+MISC ChangeLog-2015 643 SHA256 3b1dbf8511f5d97287ab81fc5f0bfa2f809dd7e14aa5f099da2f703d0b6e8f80 SHA512 69801829f5be6942ef575ac60a4ce59a7542859a584ca97fe20379522995b1be40c0a79aa87457e5332c96736c177b69318843fccb277b586ae5345ad440d6a6 WHIRLPOOL 090a648973398734096829797679be096402a7a014a3e6689e4e040a0b40292de2cac17311123c495d85c8af6a500ae66b3abcbe98a6aaed9e3e9209e44eb84a
+MISC metadata.xml 312 SHA256 b80a3cbc46b07214e062184ebba808eb2a4979bbb951bbfaf05456de1ba62219 SHA512 5d44a664c67e8c67ef42692b7e953f4566b3c260cc986b7e43cf4b67652bbcae01e3336b6b3404d50564b2efc0684a3e2bd0acd860dee828158045922a04f883 WHIRLPOOL 143b2f947c433239ad46969a17cc2b965edb2e33df2ee5c779b9cbf026f68f5cc4ca2d88ac1b4e64efaf53a290c3b586555ebb53826f76c97681b0322134d47b
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/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/Manifest b/dev-java/asm/Manifest
new file mode 100644
index 000000000000..a645604b7563
--- /dev/null
+++ b/dev-java/asm/Manifest
@@ -0,0 +1,10 @@
+DIST asm-3.3.1.tar.gz 854626 SHA256 69a523d41c82d7979c9b47271e31187e23c064e1d2a93b52950463bcb80197f5 SHA512 b0dffde873dcdfd8328736cfaeb8a3fca2e0788fa642d3af0c995d55c6ca4b1847e35c24100277a453b518305c5fe234d1935fa8de9b25bddd5dee5f1d4a4d44 WHIRLPOOL 90158f7fd87eae641e20aaca736debbd34b70e22feae1021c5f47255b8b9e8305460444e1f070288292b64a6aef3c083c81b520343f97b570ec1799d56d13874
+DIST asm-4.0.tar.gz 752187 SHA256 feb2b078f10d420b6ab04cca136db1b57935170d53d12c64d381e118185c7b0e SHA512 642bc32fc0310b8e4291386866e53ba62802f2ae888163cd6e879232bbe3c3728c3a135aa667f91aec5bbb743621c2ee2d2a1a1d1ccb36c5249874a5ba9b08db WHIRLPOOL 8ac20fd836a97572c0b449637491e31a01d29f65eac71cf5412ae0948d1264ed098fd9fbe6ee51af386b78c25bef38c6878693144875e3f29692ad6daf320bd0
+DIST asm-5.0.3.tar.gz 781742 SHA256 36e8b760d40898cce83e913e78cf6e631a6a3dc3b448895bb35c02d298c21c4b SHA512 fb2fbddbd01ec6d355d5f218db801512a160b505e91c4ad81cc1a0f1265c358cf8df6140c216e2d5acc109dc2286c29de6bf5b60b29a094e70c96070a54b20af WHIRLPOOL e93cbf659b224d50b8a0971ceaacbcb72acfbf23347baf4a9875e647c5f43b70587a5e24ea01f3ecb57eee31e0550144b59d55e97daafba9d76158427518f667
+DIST asm-5.1.tar.gz 791417 SHA256 661b4824191ac40c6c670dcf43f6a9975d9d127af49c448d55e32ed7a5896e66 SHA512 de702516f9e16686c027c9a200a1750e6dcaee96bb1ed8bc0591673404d015b8817e37f210be645681dff7a2c31f7ddce8b406ccc8c6e11f1424e19c04c38f1e WHIRLPOOL 35913e6bb7e6d555444958baeee9d4276d8a2c9aaadad9920fc955cfdf0227ac82deadacc3586361d23435bd8956f7e248728b33cda5843976133a65f34b2a51
+EBUILD asm-3.3.1-r1.ebuild 892 SHA256 9a7ef981353c887f1b6854912a526725d2f4a6a871ffd1eeb758732ec0097f14 SHA512 4fcc3252ca4526fae84a7661a166bdeb991a67ece5d6879ee668ae89c8872b5169e607552a3cbdb4ef795a78b207cc51697537bd5bf38ab8d7145751bea6c5f4 WHIRLPOOL d9d3c43d4d1022b38654183b55fc230d936473f5e26392106ddcd1570522fb86e640ea2e7abdbea42b66dad4c2f264865502cbf1f7ce39b1555c09db6335e43b
+EBUILD asm-5.0.3.ebuild 1221 SHA256 2a50e990c826fc9d3d19ddedb98b8f2abdb29d593ef57735f9b909c856f4f4c4 SHA512 559011f6e853b362131a88d849c5f2e590b34d7f5ddae5e215045df2682a49dbb4a41a9b89559ca4d9aa283226e885261728cc5d3bc3c6da63db44ae7de2aab8 WHIRLPOOL 3f621ebab007338ec5425aa4646d8b3e40262721059efaae04f517ac54de590e05ea81b41f612b10edcea8b86ed684bd5469ef3728eb447d2718eab8f7d12620
+EBUILD asm-5.1.ebuild 1217 SHA256 75dd644ed45ad142a2121352ac3b3d8d764067d1494ece732d4a4e67ec9b62e1 SHA512 4901ecf4564e32c51a6715e59e55ada8d22007c4de3ff23fa3cb372c10291c0cf6d82c474efab3f378bbe51edbafb1065b7dc32cd1fb2cd3b43bd7199ff31274 WHIRLPOOL 4c1046287e6a771fe6752c4c614138d3cc735ba56dc82967a39ff8c21e5f01c9c7b811bdd0c076207379c4c434707e3130a7d4d10582d7187dc14cdf54723d0d
+MISC ChangeLog 7288 SHA256 6e98456bd9592135cfb349583b50393eb9f35fdd177c15a862c4cb330444b61a SHA512 2b434a53c2191ef8493327d6c36a813a3c838a1c94160376d6620b94f4a35eb2d7cc61e75b507dedd829bd301f5fa0bb29d671fdb64dfafd8e54a3dbbb75375f WHIRLPOOL f4947985f93a12489b52b0850d300704f3b7a331001fbd0f0d972c5cf1535544f93d3fdbc22e70a15b704e4064d23e53f635a388a5bb4146a96330028ec0c7ea
+MISC ChangeLog-2015 12270 SHA256 6f74c1e5795628ce67aad7f4a80e1dc8e3098587267b19408e82db4695ff5d0d SHA512 e4d4b47518b1c4acf841ec1c8647d811257cf271d58d7b5b9e8fa00a256bfab46b01cb087f7cc8ad4c75830963afa25af37a1e26cd0fb99e2abd5d2b6de4d673 WHIRLPOOL 2eb306f741ae324f7cc536496cde676916d981f4513744d19593f88782ad805156d7ad94290191d5ce749e280b48e3968ef1effb0fff768c0ef02966280afcb5
+MISC metadata.xml 978 SHA256 b22a7fdd8ac35bd1fa63b1e4ef87bf1f82a580ab7ac3982aee300cf125294179 SHA512 79bd031562a3e6208ca10683f6ca33edb8d542461d96058f36e8c218b667b9815fedd006f02a94572118444023c169c466dc9bd5eade325654bd274be23e5a61 WHIRLPOOL b59a5ce12864f3df48e18b06e83fec90a55ffefb079e174ba31bc5d7410d3004e30cafd3f5cd58c7010ee571865691c2c7eea092cc6ae68325a7b724c0c3ce60
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..06754913be5a
--- /dev/null
+++ b/dev-java/asm/asm-3.3.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 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 ~amd64-fbsd ~x86-fbsd ~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..52f63bc8cbaa
--- /dev/null
+++ b/dev-java/asm/asm-5.0.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 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 ~amd64-fbsd ~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..43675d631d19
--- /dev/null
+++ b/dev-java/asm/asm-5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 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 ~amd64-fbsd ~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/Manifest b/dev-java/aspectj/Manifest
new file mode 100644
index 000000000000..e31fad137db6
--- /dev/null
+++ b/dev-java/aspectj/Manifest
@@ -0,0 +1,7 @@
+DIST aspectj-1.7.3.jar 7565941 SHA256 02a3ddde559417483bddb40dc59442f441fa5ef0aafa54b26b862727c930d6cb SHA512 2297a11638c6519b50e1938341914c68c2841c7b7894081f3157ef3463fb29519d833d274e24b8da1203a7866b2e1296d67e0872dbaa2dd835b5520f5c0a7a71 WHIRLPOOL 39242d437a55da1bfb27703b7bf920c0836893b39aa4fe412c4fe96945835a5315f89cf26a478cf33dc8a99bedbe8dff5f59e03deb5fe3e337ec932d8c54ee3f
+DIST aspectj-1.7.4-src.jar 7570114 SHA256 75270a8f5f87e14c42a251441d62e31d05f85df2ed155e0036f36f10b6ae286d SHA512 643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf WHIRLPOOL 60688f65026eec16098ec077a84f0d7884287e0c7e465ad50796cf42c3724b5d6ee2d9d58e68baac66bb86b81a08581e0143bd60f5d74e04d40e04bb140bf219
+EBUILD aspectj-1.7.3-r1.ebuild 1271 SHA256 3fecf04728e59314be324ad984527515ff18b741c0cd1c36bff5bb8ac27b0b0b SHA512 3f47fc35c451191c1b8ce57583d1b5d6126b0078e350616ff8dddcf83dbc5b659de3abd400ef08db7afc37efb133667a34f58418aa77079153639a9e5fd3696d WHIRLPOOL 7acfc826cb0158b6ed21998cf1dd29cda3984803159ec6d38cdb3ab91fd4cad1bc3dcb85930f508c70c4b99ecb0642f8ee9777ff33d5ea8bcfe34858f67318bf
+EBUILD aspectj-1.7.4.ebuild 1259 SHA256 5b68d52e4c069c6d033876f4eb0660020f72ddc0350e37f413a89387ee5cc615 SHA512 885778f6e1ab1c66118ba3756a5369e705c464869898866e73b032014c143310bdd790a7d9bba003fb50d574ec92330afc6d99f7ea66f0213e8abf6e627bef3c WHIRLPOOL c6f7c9d71809835588ad4cf92ebea7c02ddd382cea1d18d7cc2a0e450444ae101e0505b0903ca452b0fb0c8d33e32e53b24e34c073ad1344798ce4e9d18faff5
+MISC ChangeLog 2878 SHA256 e42caf2041b4c6a8f8659ac890121582155326162f5d02f1d52d6a0f0b7bf0c5 SHA512 6736f49b1862ce9a760c7d17986c495caf38cc308c470bb3dbad442b2feda1670986b0894ce9eec0aa8aec99276fba4765a52dac3c32078e7e967458cc4262a7 WHIRLPOOL 35473f201d81e7c161558abb93e0668f7bc8a7209e66c2833ca0ced439356c661e6641e0bc24df4c0c02ce5361e86ed07f23f88e9134140faec5866943af4443
+MISC ChangeLog-2015 1240 SHA256 1cb296b1ff66227b155efedc3171ec636e8ad8f55dd38425b27cba7ce5ec4311 SHA512 45b16c8ba48a97653d11c21b020327cf3f3410a7d383150526d28c06330982bcac06d61dcb6f17e081d45bc8ab6a9891ea7383157c2697193e09d7cbca9bb5eb WHIRLPOOL 039d9966151b3fc38da4336bbb7bc900365c6fcc2d8a4ecaee6db1b0e74dbaf584042251b0a470ed7178cd09600dc06220680261e1d7946b793350a5a682692e
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/assertj-core/Manifest
new file mode 100644
index 000000000000..a684e66bcec1
--- /dev/null
+++ b/dev-java/assertj-core/Manifest
@@ -0,0 +1,4 @@
+DIST assertj-core-2.3.0.tar.gz 611609 SHA256 6bb86e5bb7d65599c09a87df276fe049333e9d0cca25de902be83971940dc8dc SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3 WHIRLPOOL 9fa7c74e2f4f4c4f2a03dd2b22a6525e753c092b1ba2185e4a7d12c460dc43d08b9910e8fce3ce62092b8916f5c6939648c5df230d3be8c363f24cc6eafc9063
+EBUILD assertj-core-2.3.0.ebuild 745 SHA256 4f22805ad64537a405151df14567cbb8e360d0577345c5a6599fa09a7b8e6c55 SHA512 6c6c8f520d2d64839eb615d5f4d8c5fb477657527885c1085e01a7b14cfeff7309ceb341722146becd80d24c12879bc6c854e3563c0aa718924aa6392bf7ddc3 WHIRLPOOL 6c70b60efa5eb3fa30b902abcd11bbd473c6740a3c67b13e7c24e1aa27b7f79e85af761f63ddac8230e090d070047e62b75f6c743b232c01d3017cedef19ccd8
+MISC ChangeLog 1099 SHA256 3cff6a09411a10c3db8de01a6a312f886cb029da92628ab62392555e6bc28d0d SHA512 11e510ba17e24f213920daa74939520d817695f66fd1703576816253d6b2f2b270ed5d2f3a0881d4c75fc6260ed3175e7b314edfa924474e3ee5bedda5846669 WHIRLPOOL b5f6f201fc09bbc76adfa39f3db564833d902a69c4d9044abb5b983e9a49b8375b317f208e02c37961e8f557a4ba986985fca0f2de8ac45923a0615d10f80f9a
+MISC metadata.xml 639 SHA256 6892c3b706679cf6417cc70d1b599ffbe59595a57034119365677917bd767443 SHA512 784148def8994941ba884e79622d7d9ac8c6f2c5eb0a15acc003aa2b345c63a4574d4a9b3f521943f841598d61b1ce1a512bfe0328e51d10d9cfe4c7124a0cb7 WHIRLPOOL 952d98db2f3ee8b88221066fac6cfa94da0edc7715a13a28c34b1a637474865ce03dd5232c08c038e5f667a60b087cb0afb664ba754fd0e00e89b035cf637874
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/Manifest b/dev-java/avalon-framework/Manifest
new file mode 100644
index 000000000000..8d2b599302a4
--- /dev/null
+++ b/dev-java/avalon-framework/Manifest
@@ -0,0 +1,10 @@
+AUX build.xml 1838 SHA256 336dbf8253d921987528416da50b557c786313b2c0fd2454b2b25afb6d5a020d SHA512 a6dafeac52a7e7421c6e97972407b7b5424a8e35bae66153c52b92419c038d0cf31a049619b843ece7f26bcb1fbd675ea36475857609820ab6c66d03d4f8da2b WHIRLPOOL c5a72a7d780a3b2e8a7ee499f11515569142fb4337b3f5c0b940186c8712227c8288693414752b13fe1d8776e671f96a24cc0f7d4a40940e9945c421e4ec095d
+DIST avalon-framework-4.1.5.src.tar.gz 99475 SHA256 29ec054ff5da5dede98e90156fb2f3037c617a04f9fa2753ab034718031e058d SHA512 7a15dc2f7c691d7daaa5cbb589eb21e23ef8d6232b5bd1b6b3bb1d6962f4a4dd2dff0c0a1793309d7e8f3aaf4e75de65a9705431e1103c2e33c575770131471b WHIRLPOOL 6c08d0c3596a4169fa0afdc65cac0b2e551a51a2e79d32809ab1fa7eaa2598446cf51179ab4d8794518e1f5821464aace4bbb3d1b8d8f8f6e93880416173ecbd
+DIST avalon-framework-4.2.0-src.tar.gz 68887 SHA256 16374c0a1f67e21c5d44030ba2a01df614775a9c3ec3a387632c3c6e592d8e7d SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671 WHIRLPOOL 8591e594a44366b48040d5fa600362c3ceaa418c0ce4d92fb6874fc4e5fd93dac992eade72525f177dc7b219ce022d0bad8439dcc11d16c28eeb4100530a2319
+EBUILD avalon-framework-4.1.5-r1.ebuild 940 SHA256 bcd90eecd84b89daad58ebb3da700bc1161f62949fb18201d39ed4ca4b8ee834 SHA512 2e07a19eada2a13044f16cbb9eff6f9f9a136992baf6cf886fd1aada114490f8302f32dff42678ce34d2b2f028526419a76ccf5c4253dda7fb954f9b81dabf66 WHIRLPOOL f36de8144e8860612d302634d9c576ee3ccee64e0aac44f3c703f5253c105af3869d76aacb3eed7587b165146cfe5a471e7472941646069f3a1de8be84db2e97
+EBUILD avalon-framework-4.1.5-r2.ebuild 914 SHA256 0f5b90c00613083f13a523af84bf7c5baf6fd92eb41fe9e17f8b87c144ec0fb4 SHA512 432d06e568c69edf0252c83fbdf5c687037e2ff80d7b1e8a947c88d0facd7d22881739f111d0441baf7dd53d83ad5b81b1a018156fdd140e1fec1447b6e51f51 WHIRLPOOL 0b738c4975fd7f89faa430589239e48dba9a75c730f5d2a5a3f8953973eff2f750489e7f10d4fd2e5de3aeb590278f851a3545ae3a30c5d368caa4770d4d294a
+EBUILD avalon-framework-4.2.0-r1.ebuild 1030 SHA256 c622d635c6c1df4ef7e9f067e62ce00ecfc9313dddb0308330ad75172b0967c4 SHA512 ea657648b3339066ceecb5424b6909ebe2c21b960e0fbb14410c5f6cab251829940a7498f1a534dd9c78db542c8e81adf9efe4396071d7702ebcf22639b13cdb WHIRLPOOL f52100a4634bae3d01b79f2f2b8019bd72ba0605ba6cf362951d3491d57f6c2d4fb29fe92c4a9d0e25ecf0f513a9387092e5069040769edad622cd2c21ec8dfd
+EBUILD avalon-framework-4.2.0-r2.ebuild 1013 SHA256 b6911ed2a4ed617554b2ecf3ab85dd88ce2da3a1a30b8b37b56573cbffe35d20 SHA512 51309ad1e2d7de8907708259a6ade96c6be48bd26ae81bc60124b2ea8858a67e1bb53c00fdb537b6e77443ab0ee24ede5c00aa3dee72aac5c18829d0c5f7140a WHIRLPOOL eb053b56b4af9e395a921ef9536bfc91135f243b99abf75821a13ef1b45777d60df5f6a04f9a1477fd9e02a0b1018a4e9dd175331873ad6563012928b88bda72
+MISC ChangeLog 2966 SHA256 8155c43e3f8375f9c40219b19a16d5e133ed8f5d8b3b5cf47efade6595f5d2ea SHA512 1dba1ff68627ddb6ab7eefe3f749f448095a19c44a4c1554c3bf60a9d8a608cde992ae862add4a0332da4c30b8875022846b7c90ed98b2664b2ee97165043bc5 WHIRLPOOL 2e6569da593cde0b2d0e8b9b27e6ea4f733dd9f09e85997c28711c33e67099c6cf899ffecd7eac8635f6740f8cdb787cfaa30dd27a8f3711eb46dd78c0332921
+MISC ChangeLog-2015 4703 SHA256 ebffc03f9d1d7a441f2dee191f97f9a4b7998eb4965b34fb9d17ef1d715a2d0a SHA512 38a51dd1b7fe01b8b0d673f3ad46673814b4f7d24ab1742a0e1ec97bb2de2c1733a47c1083fab53c644d156479c88796603ec5f97276cfacc671cf2f64f230ad WHIRLPOOL 7dc19c05653df676decdb6558a67bff78878057fd20b60e56a52cbfc8f2f14098fe254b6cbbaf0b1a08bc78f1758804bcbbfcec4ffbd321f9385c38fdb13bcfa
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..91a7684c2add
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd"
+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..bbd4ad97dcc0
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.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="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 ~x86-fbsd"
+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..5363933b783d
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd ~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..7ea20e824c78
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.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"
+
+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 ~x86-fbsd ~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/Manifest b/dev-java/avalon-logkit/Manifest
new file mode 100644
index 000000000000..0a6c1427da01
--- /dev/null
+++ b/dev-java/avalon-logkit/Manifest
@@ -0,0 +1,7 @@
+AUX avalon-logkit-1.2.2-java7.patch 1155 SHA256 eaca6fe80dc80a40f18ad242ed4a68d37a181fcbfe7f94ab60bde3e2c4f82a8e SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7 WHIRLPOOL 01e7995a8df7b47c61028699810a1762506e8dd981657eb9f2aa2d8ad0dfc5150e35d588dcbb3003af9fec178778caf935664d2e090666e4e861b26846857ade
+AUX avalon-logkit-2.1-java7.patch 1155 SHA256 eaca6fe80dc80a40f18ad242ed4a68d37a181fcbfe7f94ab60bde3e2c4f82a8e SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7 WHIRLPOOL 01e7995a8df7b47c61028699810a1762506e8dd981657eb9f2aa2d8ad0dfc5150e35d588dcbb3003af9fec178778caf935664d2e090666e4e861b26846857ade
+DIST avalon-logkit-2.1-src.tar.gz 60218 SHA256 a5f158a52db9acd58648ffe75a023f43c5cbb94d027bb2beccf4983614d4e155 SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a WHIRLPOOL 8fdd0206c2b65c2a8626331ea07b8e5668ef9b2c841ce20ae85459bc8e128c4096c2091f05ad7e92b7c9c769ba0ad485738f7078ce5f205fa38e21d9a1ca1b47
+EBUILD avalon-logkit-2.1-r8.ebuild 1413 SHA256 be60102cb74c771fd653a049116ebbdad44f94cce5ec4fc90160a897761b7ad5 SHA512 aecf4b592f090b545e71e50158e96b7d3a1450814d46a28976482337b075bb13315d2dbdd76360f29306ac4aefd8d07fb8b38f72b803ef42f4bcba0abe33eb7b WHIRLPOOL 005ec0e8f4fd90eaa5abc12268d917a91041938ba63f160ce57124ad071026ebd8b5782e2313fd323e0ca3952076cd9eed96d2b0686f293b72f7da65419621f6
+MISC ChangeLog 3872 SHA256 d8fa28d0d6bb17dad7f4b2a0cb92c8cbe05b82ebd4a1274cf066fc488959be50 SHA512 9b9874edf56aa686fc30444824d04e5968642090f4cba8000e024bcb1c21b93d491a01112593ca03f2380304cf9b5dfec514c60b4b2b572337b88fcc84365ab4 WHIRLPOOL fe1f3bce0aca0509c6e47f7c340c9290e6c078573410f35bcfe15489c1c7629269a01f0b9f2744a276043ae92f21c63f8f883ddfb85192bb4a5239d3041b325d
+MISC ChangeLog-2015 13989 SHA256 f40b991ce17ff042484bab5cae5e26a8e6a3d021b3a90579fbe52d6bad03f593 SHA512 f6b049a3947a2ff67fee4e8da127e04d762a7beaee15b683561f53cddeeed61a3a4047260ea3c09a05472d0b85b06b823277e846a2a1e11683a78e9b18163af3 WHIRLPOOL a4da9ab19bf91e58f88abeb14a6eb371e63e0d00834c1c19561865d3fe3ac9fd0e5fb32894f4c0596d37d00cf6726022368ee20ead8386bd6bbaeb0438035f5f
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..ae9c353e3e14
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
@@ -0,0 +1,62 @@
+# 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
+
+# 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 ~x86-fbsd ~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-1.2.2-java7.patch b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch
new file mode 100644
index 000000000000..cb2611bf0de4
--- /dev/null
+++ b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-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/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/Manifest b/dev-java/backport-util-concurrent/Manifest
new file mode 100644
index 000000000000..1e5782c62e2d
--- /dev/null
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -0,0 +1,8 @@
+AUX backport-util-concurrent-3.0-notest.patch 491 SHA256 112918b1488255337fc42c1f5b8d71faefdc10c62a3061452f6d1b427cf0778f SHA512 f2f53a87283c1a6b13e360ba0140a93b0580a023cefbcb5dcd8658ddc7e80c401878229a323416213368f493226b445b5896bb0ff51f1a2bd95ef460f4ddd080 WHIRLPOOL 55fc40f1d32dfc41c0cd23bd3819b5cb6114435e4e0a2738ad51da331dda6d553f17fd42e1b3249e08a89e62e9cfb3bee482150c5f1ea9f9dff32a775c997085
+AUX backport-util-concurrent-3.0-test.patch 380 SHA256 dbd133bc068689d8b7dff508a48716e48fbb381f4089c07848003577c53933f6 SHA512 01ad87f71b07c25193faf1d67de159233b2b298ef4ea31013f3af8d326a09b83f73bdbcfa5629f5531ffc0a0c02b20843c11377f1260448a9758be05c64420fe WHIRLPOOL 9c8c91b173ff21b9f8b7285baa3c74b6d32b633e61a548fcb1f88f81f91fd2b71e1f976e97574aed3dc2eaa126c1164012e20fda0d86e9ca1deb41e3c0ac64a6
+DIST backport-util-concurrent-Java60-3.1-src.tar.bz2 622882 SHA256 1abecd12d48174dbf6fb0f39623ac954c7f0309870f18cca25afc870aeae2512 SHA512 caef9eef43d0de5ee3d05a84b44d3d2f6bb9498bdc82105626bd2631494fcd0347387da9beb6000fe9c80efacbbf2c2c3603a97b53e4c74037eaf629d790cd54 WHIRLPOOL fe8fdaa4942cf444f12867213bf6cc3897b2b79aebd818d41af677b8a9e69fa55466b93c74a50831345ddbe0c3413af2ede132c730dd0bbbcd9b2493e9697d79
+EBUILD backport-util-concurrent-3.1-r1.ebuild 1175 SHA256 192af1fc8a1dfb65110bd907ab530a74cd6b796287b284bbf190bb876154185b SHA512 9c1d19331c742c290c45f67c677d7c34986fe536f97cb366a7ab5b84557da9950c97c275d379899998893bf51320a27027439258115ddfdd5534e09d05c3738b WHIRLPOOL 1adebe6d8d4928984d1f5b13de483d5ee428a066319bff05991716e7a84cd07125096575c9fa04c9d07c14221cc585f6c99e1c0a4fdc55e03ca90aa1b5e679c1
+EBUILD backport-util-concurrent-3.1.ebuild 1166 SHA256 2b28a318b34a65a1d65b14c1a06a3b257fe59421a623662c288bd90f752c57db SHA512 20e2cce05bffd312d0c1741beb55d664cd2eaea61edd603928c17bd7e4e9156c108bdd96bbfe940958f9e02bc82cf8a9e6a16661f9b256601aa13a5271590ebd WHIRLPOOL d69c6e2c2dff86aa8c73fd4e05eca19341e7f5b5a136e521507af250d512b98e9e6db6758639fd0cebf36047cb12307887268c294bfbf35702d1639b6a56152e
+MISC ChangeLog 2861 SHA256 c7c5f4bb92475dbf68991718c0a8e66e4d0649da3a70fe2f650e71a26331f950 SHA512 1736f37817eed08c852ee1bfe928e085f8b91d6f432b92e77decfb2d90201c76eb7fa4de20450d24236887f4fffb95f1fa2859bb212a4037c565729df9ebadf7 WHIRLPOOL 4ac5750f768f7d4c0abd8f0922c57ba3dcac750fb69b4c8340b26a731fee6398a5d58e7c4a9620a80941d5cb9454dba8468257f0a141a4591f5010c0f9c1be47
+MISC ChangeLog-2015 5586 SHA256 07655c2384a4a61fd80bdb852fd8fd1cc96f6d0b903ea6c20fafdd300815fa62 SHA512 24f383e54e6b908586faf6938000861b6a734a44e1126bf248a7e2498c21fff4e47d57867e7a5460643b4b802823c39906528a015b4e7e973a0a357ca5b10727 WHIRLPOOL c1ab6c5f1dc58c1cc983f8364b372b5579d1fa87a5b5fd38a2c3d18492998968f78645de9b9d62ba6a5b1634224601dee1db1379c86b442dee39cd97920ad2ff
+MISC metadata.xml 490 SHA256 16044bb5a66c56418708baa9884bf3f2b94b76718a3d4bbbb356b93dbdbe3ba6 SHA512 81d2a6f504093869e765c56667feb53583a85c7cfe98bf12f571b2d4e202e5ab247e24b8a92ad5141654069d3a66179fbb28790781464dd43821ab55dee62eb9 WHIRLPOOL 219ccccad776ea9cdb0b249ed6133d8761807a5150eb747ed9357930192ac2be21361e719c7bafcd2b3f9ae14084e5e87dd7bf1e58f99f75b4d4eeb92b007d19
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..2b1c7be0144c
--- /dev/null
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.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
+
+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 ~x86-fbsd ~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/backport-util-concurrent-3.1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
new file mode 100644
index 000000000000..3e86ce6f6466
--- /dev/null
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+	test? ( =dev-java/junit-3* )
+	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"
+	rm -v *.jar || die
+
+	use test && java-pkg_jar-from --build-only junit
+}
+
+EANT_BUILD_TARGET="javacompile archive"
+
+src_test() {
+	eant 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/Manifest b/dev-java/balloontip/Manifest
new file mode 100644
index 000000000000..0bc295bbd426
--- /dev/null
+++ b/dev-java/balloontip/Manifest
@@ -0,0 +1,6 @@
+AUX balloontip-1.2.1-build.xml 8493 SHA256 e66b824bbe2e705fcc04b40db9d6194a2062b8a9cebc60d856196bf7bfc3681e SHA512 8fac922c637b09f54b72235ba50f78cfddedb6c75fc912a4575fa6064165b4723848b81ebf960254f82a0a56e07f3fcd43895d60b90237759fc10df10460e53f WHIRLPOOL ea6ac6585f3bcc9aa4dd0cc90af5f441bdc41c987cb43563cd25d220c40ee9571e1111ab4befe092fc268b7f656fc258d2ecdedf6242d33476f0b7aa10e63db9
+DIST balloontip_1.2.1.zip 822609 SHA256 d2905d5ec8ce7058a10ccd8881f0444e7703239e252bfc14f427084f64e8f208 SHA512 566e38767627b73324415b329d4f3e06e37572431bb34a022cbc81daf6057f9ab20da673702b2084a0026b70e7135aa8ae83f074ecea0c5a785e5006136ac91b WHIRLPOOL d896c8b9342b5087ee787d2caed0f2071948d23a5c434369042dfd20328957e906b363056b6fcb3e5aad59e1ba4bd5ad2df7830bfb14cc70881aa2f992c105a0
+EBUILD balloontip-1.2.1.ebuild 886 SHA256 40d35cef7f7233acda6d18418518f08e8d48c41e3f44150a28046849f973783d SHA512 47c2185039a48c005c455615fb6df33ea64c0106678191c710d1cd98e2879457d4d93114dcd4beb61ba59e3bc28d1fe05f02fd763e3a1e6a90b4e3519073252a WHIRLPOOL 26f871ba1e34d57efb37b75e86841c8897391c78965fb6e28750f80ba10294b1c25cba2a2cef87463189164d00dd894ae8dd68b45be3297fb3638e5a4de033a1
+MISC ChangeLog 2686 SHA256 f0ab799f2f33a29c19a5ce1bed1ffc3e4f1f514462734ab5c381d4858f2379c1 SHA512 4aa87bd075d593645bd1f5ecc72c902d063805faf7a4295d106a259772d9608ead8f716c567ae2560c9d18381bc4334214a3ca2f84fa630b89873cbc7d78b4b5 WHIRLPOOL ad0089fa81fb145c56621b6d5309dfea41b7935f9204ca06a41ef02c537a5c71bac7cc81a7ebddfa85fa23715fc5f558619e11674dfdb30b6d50c6d2ad65a2e4
+MISC ChangeLog-2015 778 SHA256 8379ed7c9f71b0acb2f633a6570ca7f9e5e5190cb10481b1593a208cd3c55b7d SHA512 32930d1f396d51d59098dc036e01adaa26219d07071d3347c3e2175fb8b2de53170f1a83238f56ce94c0a225545c17e08d95dd668a10b8dbe5b442e6adacc88f WHIRLPOOL 1272b154c07781188b10a9685dd2a7cd36fe6c4380210bef3790eb1577058ab4311a6c0644171c4cdb3e2a32a09550758750158951cc11bf46da6b61508db5cf
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/batik/Manifest
new file mode 100644
index 000000000000..4dfd4e2d313b
--- /dev/null
+++ b/dev-java/batik/Manifest
@@ -0,0 +1,7 @@
+DIST batik-src-1.8.tar.gz 14970684 SHA256 0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b WHIRLPOOL fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46
+DIST batik-src-1.9.tar.gz 16748072 SHA256 bef436c0b4ac9a499274a8df9a2769f42ddc6553451dac9a9514b4f55d06c6a3 SHA512 96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952 WHIRLPOOL b389ec0d38e16d4619f0a1e933c357a018e0ae2a0c04900caf53f398180c5a2ca031bd8909ef50aeb2db5c12dd6981cb5d1ec466e4c5fbc0379d0c325f039b25
+EBUILD batik-1.8-r3.ebuild 3221 SHA256 8bcbd2978bed6caddcda654d446fa1d948f3bea289eb405be6a1ed9db08ceaa4 SHA512 b2525a0cf675fc161642c759dcf149dba654a683af50f6b931845cc6021495485b2a405bbc78238720c5fe140a35aa4e88902d907e2a5b0444989b3e2e6ec612 WHIRLPOOL d270887b84758d88e1622d3899e700ad0f8e4ba8dc4d55294e45032cf7f2af6d256711775b56924d33b63d1bf609d68703c4029ac2b2bcd45d6c56dd12914b91
+EBUILD batik-1.9.ebuild 2481 SHA256 79728ec12084bcb504a551214092df4243dfe5f340d6754e02c7f7954525d4d5 SHA512 838618876d2b74a71e2ee13473d156eb636d4b4e7ca20c5d7dbdecb6b49d83f073b0cecbdc0f7ff2815bdd0d5a7466220056664c0055c367a6e124b2ead58ab5 WHIRLPOOL 7aeef998737ffc9b310d024acb1e6486ad4d89baf7915d43d568d0f70f5be166789cff49d9e0cdab8dcb0eca0ef01a402d04698181142f15b0d8d67a156e0870
+MISC ChangeLog 3620 SHA256 0b43cc1247da402248b67498fb9df4f36a0f605af8038570928295badbd45cde SHA512 c146c21cda7a3aeb594c8faa07700e4f00abe9fc09cf93684387f636b1a5a8f0f853c38b963d31ba0807887c4d8c8f0b48ad521304d46c3d91542f3357e3533f WHIRLPOOL cf2e350c01e7509de30d04a445201bbd05532924f6bc29e213e36f3508f1c24d2aab07a8f757915dfda78f5f27a0b07fbc9313627b3001cfeaa13f5ac9e30f3e
+MISC ChangeLog-2015 11934 SHA256 b4e2e276895ae399799cbd0b38c7f0e6cdf25d36f2edb18a18f7204d116544d0 SHA512 6360dd5b278ba7904c01f65b5d9a9d972d319619eb4b072f8d240300465818ef7970781481689eea1b68f2a074022f615017db63ccf35fad4eeeee3fedbb7112 WHIRLPOOL 4415633e4890b6ae8586143d4b35fc264ce4f47d3ea7fcd8d36c7fb6e0027ce096ab17da6bdb3982cfdffc16aa898db2489f5270513d8f5d4880209d0ee12e93
+MISC metadata.xml 449 SHA256 959a37e00aaddd59eefd32174bb0673c788c6584b1db2efafda815e1b8122217 SHA512 e437217b578831129aa80be572fd1044db0ee1c0afb0af0538dbed3e7d2ba739062eca68053426c79433ec03128ea0116a4a92be4d1946e20968be3fe89a4e02 WHIRLPOOL e09cb97ce753b75a0d7e8533ceb8e09a84faa460b18cf59ae64558815424f9221388e6c223b0ede50efc4d8c5b5d5870e345c1ebd0c069446a5b5a17a5812d00
diff --git a/dev-java/batik/batik-1.8-r3.ebuild b/dev-java/batik/batik-1.8-r3.ebuild
new file mode 100644
index 000000000000..68d9e0c96d64
--- /dev/null
+++ b/dev-java/batik/batik-1.8-r3.ebuild
@@ -0,0 +1,124 @@
+# 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 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.8"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc python tcl"
+
+CDEPEND="
+	dev-java/xalan:0
+	dev-java/rhino:1.6
+	dev-java/xml-commons-external:1.3
+	dev-java/xmlgraphics-commons:2
+	python? (
+		dev-java/jython:2.7
+	)
+	tcl? (
+		dev-java/jacl:0
+	)
+	dev-java/ant-core:0"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	${CDEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	xml-commons-external-1.3
+	xmlgraphics-commons-2
+	xalan
+	rhino-1.6
+"
+
+java_prepare() {
+	# bug #318323
+	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
+
+	# Add some missing imports to avoid a compiling issue.
+	# https://bugs.gentoo.org/show_bug.cgi?id=551952
+	# https://issues.apache.org/jira/browse/BATIK-1123
+	local imports=()
+	imports+=(sources/org/apache/batik/script/jpython/JPythonInterpreterFactory.java)
+	imports+=(sources/org/apache/batik/script/jacl/JaclInterpreterFactory.java)
+	for import in ${imports[@]}; do
+		einfo "Fixing missing import in ${import}"
+		sed -i '23i import org.apache.batik.script.ImportInfo;' ${import} || die
+		eend $?
+	done
+
+	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
+	if use amd64 ; then
+		export ANT_OPTS="-Xmx1g"
+	else
+		export ANT_OPTS="-Xmx256m"
+	fi
+
+	eant jars all-jar $(use_doc)
+	cd contrib/rasterizertask || die
+	eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc)
+
+	# batik-all-1.8.jar is a all-in-one jar that contains all other jars.
+	# We don't want to package it.
+	# No actually we do. See bug 556062.
+	# cd "${S}"/"${P}/lib" || die
+	# rm -v ${PN}-all-${PV}.jar || die
+}
+
+src_install() {
+	batik_unversion_jars() {
+		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
+
+	# pwd fixes 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
+	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/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
new file mode 100644
index 000000000000..19ae6d955c94
--- /dev/null
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -0,0 +1,101 @@
+# 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="
+	>=virtual/jdk-1.6
+	${CDEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+	xml-commons-external-1.3
+	xmlgraphics-commons-2
+	xalan
+	rhino-1.6
+"
+
+java_prepare() {
+	# bug #318323
+	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
+
+	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() {
+		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"
+
+	# pwd fixes 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
+	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/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/Manifest b/dev-java/bcel/Manifest
new file mode 100644
index 000000000000..cea08c8c3a1c
--- /dev/null
+++ b/dev-java/bcel/Manifest
@@ -0,0 +1,5 @@
+DIST BCEL_6_0_RC3.tar.gz 929878 SHA256 74a4a75cc7aea8dab4c17c6ff6c00c2c19411942974b4bd6871e6984235101a0 SHA512 05ccf95ebf6b374fb112296509b4011d741acf2315b331aa971f8c3bc6be2f73b39592721a8c769b6b9d631e78e348c124c56f567adc2338ed5508d5ec3bed77 WHIRLPOOL 6bd53b49a7b8b6cfd422b3249461c1ec685855e0e5dd33c7b3d1eac04f8d61f1cd14b357d1d560002fadec1ab21c1a2b0abaae553340e0b055c6446cc4d5a3ce
+EBUILD bcel-6.0_rc3.ebuild 1217 SHA256 bec993c3b889dae96e1c489d58fd533aa129abc15e0f1f2df44e53e3216b63e6 SHA512 fa29b909d100207932aa7eca51da0638cf4c85422a5e76df5da73a4069e8adf156ded2ef74b26926d035e1cfdaec5b9bf5584a93dabfcd48c309a64ea3bd4d12 WHIRLPOOL aa0fcbe50108df9e6c9afaa41a9d0415eea95bc7c343fd3934c5b8f65761dd96b00d3c01c1c15f9cb0b816e1a4d1c2dcddf6cb879ca5177d1f12b8f21c882b8e
+MISC ChangeLog 3281 SHA256 aecddb23503da7ebe2f5f1ecff9df6eee78c6bf7d85c67131473e53a08b3df9e SHA512 52830da36bc31645d109130351e0460a4ee2146b6de0991310dff05b077d55d9377961f9570ce68e4afb3b93dd5a8f045604a9b6ef36cc627b1429216a0c41a1 WHIRLPOOL b770575bcd81084d4961857d9c426ff9a13a0e4b09d122aee469262b61faf96f15938855c1e2132607946f4b86c8451b827bb3db702cf667519490e78de727da
+MISC ChangeLog-2015 8051 SHA256 fe088a776df985f773adbd9b0b5b60e7155f83a0928050a30b0e167f67bcbf7d SHA512 86b07d693eabf8f5e2755b107d3d59c268c544699c9cee4f632828d835b6157a67e974b87d932503f7d88cbe6a5056a96dca11fe19740cdf573f5ab8ed40232c WHIRLPOOL f4e82829d2bbfcf6661aabe88fa03fa112dd85c8b48587c3f0d49cacdf6b53a6fb2a8281ddf62d15f4389ab6f20f1b9b7263d5715dc59492f8e39c0f67a9bf6d
+MISC metadata.xml 819 SHA256 80cc1b113e200826353b66346f1e8a5d6ef60e01a1952f27a428db7354aa6744 SHA512 2dd8f3339c680fe11255c65ea92b2ad808ec4cb59d49b47ea533092119fef14424859368feee8ce94e7621a607ef71c4499ab78e518ce07886388def593e7281 WHIRLPOOL 256bea413466c92677bfc57bd1718cca132d1f9376df549426f046b3680fa20d3bd13503da7d1b9d28a6ecc21b5f84336ca18516658fecc6a28501fa9f1d0070
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..c50b44a0223c
--- /dev/null
+++ b/dev-java/bcel/bcel-6.0_rc3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/bcmail/Manifest
new file mode 100644
index 000000000000..efd0baf61413
--- /dev/null
+++ b/dev-java/bcmail/Manifest
@@ -0,0 +1,11 @@
+DIST bcmail-jdk14-138.tar.gz 386478 SHA256 629bbe7f00c96b201db4b76f777014763110d9de5021593505f906a31fa7bb7c SHA512 1d79aebee02a8d0017dc0b05f68e49fc031a797043eec173aa68ef0148e06b6ebe4d001a1494d6ed95114b1534ece7c47982e119ad8aec2485323babe34f3a13 WHIRLPOOL 272b1c73ffb4a46737a5a4bd5c2105a7411d6cddfcb1dd511688662fc6d55c20027cf1adb30da9a4ce24db34800cff3d71771a60d57e157b1081c1bc7f16eef7
+DIST bcmail-jdk15-145.tar.gz 483519 SHA256 e74e2a48135e9396ed3622d9dae64eb66e6e88e4b0d17a3522c8d55ee5e95d62 SHA512 2d3232d5eb1cd75ad56a7316beb32880f3f935fcd3ed0a6cb2cc3e1861dc9f0bece0cbae53471760246505adb5c28328691eb82e11fedb0b160c1248d21c48bb WHIRLPOOL abb41f525717886b21551808dfc375a691ceed1a192eb46603fb91398c132768093229389b0247a49121b098d0338f37980bd8980c0c1a85fb91754f586d411f
+DIST bcmail-jdk15on-150.tar.gz 221760 SHA256 1005a21cc5bf705801d217fb5eb90d97106bc11bf1f7079573a64b12f3e080c9 SHA512 91727ddc4bf932cfaedd3cb90a807b5fec3120e56fde3e5fc73bb5bf2e97db50a35a63e0b5e342fe29e4b974579c5cdd5d427d01c9dd8e7abd521ccd3d1959f1 WHIRLPOOL 96893e526007a9635f847010c0c37d17974b999cd71baba416cd287a31407e815ddbb6ae0069c46d362479dc369b726926a026d3267e34bfcc23aea9b523eb6f
+DIST bcmail-jdk15on-152.tar.gz 240800 SHA256 de826cc84f89b053317a4ba548a5739ed626a925d5c3d82b4192682b4abb99f4 SHA512 e7301991071709b5788e5a813ea765a5e59bb089104a031ca91a509036e7823b851f854e5f96de6a2d2ef817aad4435f78742dea3a9b1dbeb95a6cddf250619e WHIRLPOOL a332507341015a2ebee6ab7ca38af10d48d3eda339191831a126680200b9dc0de468971e5b96df2133f483cb7c044108bfe2f544fb9e09d896fd802d22aac8d3
+EBUILD bcmail-1.38-r6.ebuild 930 SHA256 95bb7fd7760febd00874894047b0a868a1315ed8032c9a45c3e47d21b53182f8 SHA512 9e53ed25f488ca4037249a5bf1cd5c4fac18d3ff16fc134abaa3962d3e7dfc6c9d6e328b67c48306d0f2864a3926eedda2b99131fe22c49675926e31bcf7edce WHIRLPOOL 732eef4527ab0f5a2e2d3dba56aa2dc3a9e5b669a35aa9e996cf3d8fb318cc57193375f62cae9ddd1c123bab426dc5aaf6cd47a647a0d29ce57b533a2adbaec6
+EBUILD bcmail-1.45-r5.ebuild 948 SHA256 8822e5755683a2a1ccab5fee5a2ed1aa9923ec7729806201fdea8f64e58d9e1e SHA512 95f9661df2701b0e8afd155269572b767f50654b8cfcda615d600ece833a9a7ce66647aeb7529e06dc5279901915d1496a3f2a52da36d112a6cdaf21f96bfce5 WHIRLPOOL fb9c22c618d4ee57446e4b1cb8491d9efab4b5b7c86b8074f15b829848695d2bd9c86f3c400be13082e94d6bada226cb3984a7b99abe8976b81e225ca57b07e1
+EBUILD bcmail-1.50-r3.ebuild 1212 SHA256 80b7a45ad2e26dc50be2f6119eaf813bddea085edcc655506945e4be1b73648c SHA512 b015ed6e4f7d98575795b45f982c49ff117623f7d820d892543661b799c04522037530c61bc79ea44b247b0412126f6c0aab1df5f4c54517b2814e797f09f97f WHIRLPOOL e1d28a99586e5858e6f726f4488ef7db9f902d79813ef46c6dc695c1b31f012471187b484eed915df2f0c47d3b68eb8996b57f2704d5c5eaaebba76fa5063b50
+EBUILD bcmail-1.52-r3.ebuild 1212 SHA256 e0647b908af169a3fc41d9dd368c0c4b0847d11a7213eb6e9cef1f6efb8a9e01 SHA512 3e69d5e7bcc3435de5491286e454ee00fb4b55e5d6f7f3a2a10d37e6fdcf9f03236dee63277e8b5e7427ef7d280b9a548523a5d6d24b02564342f1b8a1fa4e13 WHIRLPOOL 0febc7e468394a55b8e4f078ec8297a09c411e9bc44fe76fb4dcbc545551a29cb08b41778e086e8740018b186132474ff75a7b3b9ad0b5fc2c7cba4e35b213fc
+MISC ChangeLog 5298 SHA256 a888fb2df56ffd5748c672a3a186d8f10b506bc53ab696ca0915524dbdfca232 SHA512 5b2ddb9e9127d223cf070506f51ffdbc889efc383dcdaa794a4b7c0c2e739b8d80ee11db54d785fedf06757b713c4bab4c0eaef5aaa1e9b990c9e3a0ee4f7d03 WHIRLPOOL 2bb42b713157594a5fe1884c9ccca0111436a1f376973a24a9e4ee4cf6406ad7d1975c26b4556471ad384d8750d033dd2ec7fccefd0c2d3c1a38c378e0877532
+MISC ChangeLog-2015 6838 SHA256 26457e7a3841f6af1491b57638aca6eac3c11651f28981749ffaf648ea8fcb9a SHA512 a8ae2bf99ee1bc045e7f26e3cacde53a40b6a4d74e722c213a05ce40cd0726c3319cdcd0b201de607f77458e96ee337b3c62ca1753293a5ff997269f56c81a4d WHIRLPOOL 96df9bc6717900e57963a77eb600c4a2ac818afdc31879cf0327a39c933057d1a676fa73f7d57533d12aa3650e7ae506a9675de1ce046a2b66ccaa606c491c1d
+MISC metadata.xml 369 SHA256 b1312e83bde8a41cb31be7def79c8236d693ac5f1e04e862d35901c29426863a SHA512 d97ce68b00b528488ba871164a2fc5aee28d7128e756e381c2f1d1d0abd31c67204bbbfb2e61b0d3484a9545d279493f197e0254833353378aa88aacf3fba018 WHIRLPOOL ff740f2c197f7f42db81d8d9eaded7c5fbe985dcb49022f6cd03787fc5691500717b31c98dc59bbf2b6b75ddf0899c82827ad156be450c28dae91f0cd121efd2
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..bb3e46cc7b9d
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.38-r6.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-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-fbsd ~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..b7ccc9eedd46
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.45-r5.ebuild
@@ -0,0 +1,53 @@
+# 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="${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-fbsd ~x86-fbsd ~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..9ced27690d87
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.50-r3.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 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-fbsd ~x86-fbsd ~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..c53fe54fdc6f
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.52-r3.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 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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/bcpg/Manifest
new file mode 100644
index 000000000000..a18125f827fa
--- /dev/null
+++ b/dev-java/bcpg/Manifest
@@ -0,0 +1,7 @@
+DIST bcpg-jdk15on-150.tar.gz 691012 SHA256 7a5097f02db626c2dd2b8c05fdb90c09b1c14a9aaec341fa7c94b0d956790b0c SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6 WHIRLPOOL b14e374c3750f2a717dbfee3644bb1b69fa626bf04ccb00ef1762cdac81043422d92c4759c63d0dbb0e2d467701214885e064fc3e79a8d72d9111f7323284ba4
+DIST bcpg-jdk15on-152.tar.gz 748424 SHA256 1b46377c860ee519642f2bb2df285cb5ce5f1d2cb83f2a44d5887b693b6a5405 SHA512 1619a8cd4024129876266415406882ac5df3dd84fd3e01d7593304874ad641fe72ae95150d0e4414b294e2e5ca8eb39e41a25658f9502b4cd9622fbf0f3d45a0 WHIRLPOOL f203c55a62ee7274a39fcfb94e756f43bbf0cee0da14fc4981af6fab8c7615c7337eb1fda12d159dc464dff6af982fe9464dbebd7b091399a2ce5e956e501f7a
+EBUILD bcpg-1.50-r1.ebuild 1537 SHA256 0f71f7eeda6fd828efecd22d6c6ee8ee654186ec6650407ff6870c17bbd4a4cf SHA512 cd517a2b295436ab520a1c9e67c880e9bd5bfb73328f98bb0a25bf7a8caf3eb7d21cda75700b7fe633123f815eaad7238e147f0c2196f3c74ae7d4f0d916aa56 WHIRLPOOL df530739df05fb2a2bedaa4fd40888e5a110fe5816c7c43b61b41cbb63add5852afe7b54b5739ddeb8512b9272185548bd266060802911eb71d942d27e4d413a
+EBUILD bcpg-1.52-r1.ebuild 1537 SHA256 39d98059448520a3e78234a54fd21b35fc5ff859d30212109550ca55ce12a38d SHA512 a658c4093e5622b2d70ace863b1a30823d553a383c2422503db60c8e0d22177c06b6fc72b547263ca9b4f3219b5ffef1b113d01eae48cd42c64ac42991ae09c2 WHIRLPOOL f21c265d97797fe4c0e6cd6cf1c6c1ca08fc1e034f51a2b54339f0b44c28785fadd00f72bb7a0de1171cd5b13f9e553a260033cea28b4f0182d396ff36a0f6fa
+MISC ChangeLog 4108 SHA256 7b23ede7c9071b8fafdde358d65c3be3ac239408a7cf9b87b179583fc0888449 SHA512 ec11cae9cf6b3c43119ef7e91faf691413cf85c73637b746b3e4a97b0618181fd3a00739f199769d1c54fa4c0667f3981aa4610645e3dca7aa4146e4b3109a73 WHIRLPOOL 0808d6eea2408451e2b79086d7a3f30c5a2e84776a774401d1b4e83053a218e1a23ed76621b3d1462005b4bc0f9455159729efebaee977585a16f0f88e42426c
+MISC ChangeLog-2015 796 SHA256 2ec7b85f5cbac526a71ea90c8742d45c888a999689a86d087d48c02f754258df SHA512 edf23b7b917a04078a484d047973a38e827caa8f984fb8982967449c4fe91d65e08371c44cedbf0927893ebcf1bf34b588c68ea6bc439a864dd46a605e691ade WHIRLPOOL 72ed915dc640d64f1057dbc97a92f0aff346b4b9924f0f353a3d3fbebee3231d124acef32f69a68333556206e0c7c6270ee1e1ff26728d7b02718f64fe833b29
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..07ea7c547e7b
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.50-r1.ebuild
@@ -0,0 +1,70 @@
+# 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
+
+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-fbsd ~x86-fbsd ~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-r1.ebuild b/dev-java/bcpg/bcpg-1.52-r1.ebuild
new file mode 100644
index 000000000000..b6d307d74531
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.52-r1.ebuild
@@ -0,0 +1,70 @@
+# 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
+
+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-fbsd ~x86-fbsd ~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/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/Manifest b/dev-java/bcpkix/Manifest
new file mode 100644
index 000000000000..ff6519f9c0cd
--- /dev/null
+++ b/dev-java/bcpkix/Manifest
@@ -0,0 +1,7 @@
+DIST bcpkix-jdk15on-1.50-sources.jar 401716 SHA256 6ec7b485da90c07a45d71905a4ef9c3c5a50aa94904a66209d928efebce83105 SHA512 6dc6d63db649a94f54c7739144b4120db4255e0a0a713389d54fcd427b95a3ff5ec326ae066cb5aa8a6cf19ccb959cbb22f9f898d39bfe5bf8e20c4d9de6931c WHIRLPOOL 8523b5ba41ba9fba1988a9e8707921f46cea448acfb9fa277b85a454ed3072527b9fc992769b8d802b9cb821b63f4c7cbcdd8e18838d49a02b7305a0b4583e14
+DIST bcpkix-jdk15on-1.52-sources.jar 422301 SHA256 46dee0a923aac4e60432974685d585edc64274ae303818177e4778685e5adf4b SHA512 55f33846e16f7367a25df0933c904b435933e96d0e881bb949c3e3812618fc0d0b5a2901efa779e02a6f48157231da197e2bf5d8037b22169330fa374b07a988 WHIRLPOOL 95746d31ca1daac2ef0348a6f60d2d1122aeb5d945338d4f2398bee6e51e58040175063444cdb294e8c25c697115ddbb39b7508e563e09afe65b7813abddb221
+EBUILD bcpkix-1.50-r2.ebuild 737 SHA256 744eac3646e6f4bb5f47ede4fa22352fd7b18c7c15be4bc496b74702e7f1bf63 SHA512 aeea3a125f1111440d35c19c4d1570b82bca0f6f6fea30f55af7736c737dc09920b23b5cbaeec335a399509ad05edab1a387a4b90c676040ee83a0ff3999f5bb WHIRLPOOL 1476097210be9f1a4505d9686ecff892242d4cdbac383c313d992dd6e9feb10d4c00714edf406143e0856f965bcf0c001a362c957b1cf84ce5fefdfd88b542e8
+EBUILD bcpkix-1.52-r1.ebuild 737 SHA256 76f50c2deb867d526699fdeb0caa353b83c2f6b2562f3c6885a7e49156581d33 SHA512 9a1cf24f1b10a782388b3c92a0f86c43f8d317819640e3a9b8098e1dec821864bfa8f425c4193f6b44b28a46e47b107e02169eb00654cca4870f4ba3042bd30b WHIRLPOOL 11174acbcf70e770cd74dff0b22917e54bee9533e61edf91ede7ad5f3d641412f401603834beeeab930624cfd33d87b4a8f50f17b10479462220c3aaeaa5d8ee
+MISC ChangeLog 4546 SHA256 54d4d635ce84dea1614c0592c40d8d24cbf16ffbca313b7e2cce2b2432138818 SHA512 72736d08e4d621a7ab13e5b44221e12f593b22ab32b9be4d7eb2744df08a38dcc084f44f4cde159d201c373201cdd2a3049c2257bfbc4e2ce88ad21e0e7adccd WHIRLPOOL 80b3a0fbb2f1da6a17a7ec69d4c9bc5fbbbe81090f8fba44f0e6bd1c3459cafec728ddd13503f9a53a32e5ac6fd4397bd95710718932ff572b62326dbdc7dac3
+MISC ChangeLog-2015 1883 SHA256 0ebcb6e4aa4dfe160cb9d56af83626bfafdd002a9b9c7c7c332259b3faa38df9 SHA512 c646cff6625dd759487338b3badbc77a344c18d9ecee77f4faa18d458fbc71bdf75910bee9384ff87e1a6f55e320222b792ea0486ac5f2a7710760c2f9955ee2 WHIRLPOOL 8aeb26eba12dc20ce4f588726c6738c20ff04f405195cbd80583f4b8cb115990d6708b69dac9b45f79397571e3c230c108decf814fa0243edb6dda31dc8c8aa5
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..3f226f1ff42e
--- /dev/null
+++ b/dev-java/bcpkix/bcpkix-1.50-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
+
+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-fbsd ~x86-fbsd ~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..d5c1e6bffc5e
--- /dev/null
+++ b/dev-java/bcpkix/bcpkix-1.52-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 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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/bcprov/Manifest
new file mode 100644
index 000000000000..d36aaaf2e062
--- /dev/null
+++ b/dev-java/bcprov/Manifest
@@ -0,0 +1,23 @@
+DIST bcprov-jdk15on-148.tar.gz 4070349 SHA256 e3fc3dab563e52939c7fa22f93a051a819729a03dbeabfb6e1998ed41943b56b SHA512 5216f6511c2ab280dc5a06a94017c2045befaa23c4ba71e67f20375f498ac2e1706b772440b5f5615cc18a52ce79fd61f7f95d2663202b50f29196dff33cde46 WHIRLPOOL 9020e24c3f7a63a555760f07ee93ffd0f58350558bf2bf02a5229468867d747e29521b48784ca9f8aeaa832059fe62f02f622ab141c8608d71692ca8c68d9b89
+DIST bcprov-jdk15on-149.tar.gz 4329897 SHA256 a22ca93539a34bdbce793a0093dd3f7f8c313e318368772806fa5db3f0603ac6 SHA512 123b2c7063b8a1fe068571d8227269fd77b6d07163aec35dca2219b5a2e0ad970995a74027cc515ecaa6112ccb395fcc4db6fa323f9eadab2c4d6e62991c9143 WHIRLPOOL 9c4057cbf11254a7d99d492840b7921dbe296bc5675a5527b917a1b4496c027fbf5db60a555e4abe05f03d528836c6512d4241d4a1a7425750957c3a43680103
+DIST bcprov-jdk15on-150.tar.gz 4629743 SHA256 468259c9166fbcf87ad284ae46fae45408cb7cfc9c406862ea75d5b8696f4f2a SHA512 95400c338a65cbb7d1e80c776de41d3d372b4237aee91526a06774c3d4beb735dcfb4c1ed182a12f2ccac8204b9c546863d79eb99723394d48c415fa32b6ee0e WHIRLPOOL 4f0db66b6e7cc4faf7fbd09a9c4ba7618123657d86e4552157d998e5ae8bb21843fe5ebfa8a9e622b1d9697a0e6e9637a55501fefda238c91a0bbd5be7010c38
+DIST bcprov-jdk15on-152.tar.gz 6334971 SHA256 b798e67553ff77aaaf42bfdf06a2560cd1b550aa6270a7cd3155f6f13534c2b6 SHA512 df769d2647c1c0b535b1f6922df3f02ed7e13c941f8d954256fddb2ff31d5682924fedf2f2908bc09ebd20058413f40a4c2d62190b63542aa7840b860aeab07c WHIRLPOOL 29475be8ff0ee5bdf8212526510600eec9d1c1613a629ebcadd90a9ec8de27973336a55c3e2cd5b880d6adac5eab4521f3ad1cc3ca3672c840720be8603af2e6
+DIST bcprov-jdk15on-154.tar.gz 6903567 SHA256 6b8fb02c1bca77472459e81382152da87d96ba468f8dcb876211938910ad7146 SHA512 3d3bf2a1d174a40941a99d1ac6ac6696e9866964bde0cb23e987e3fbd51e3dca220e16f609c29ef9e761faac670164fa9cccf90e1e0f795c33a3ce80e2783151 WHIRLPOOL d1544690ef586803c53dde940c4a83e64709a5843fc7e53fa62d512dd0e872045e58530a5374c6db1d1deef86373ddeef20d21989a0ade5bfde3d96a142d0c04
+DIST bcprov-jdk16-1.38-sources.jar 1197644 SHA256 f2faec59d32f01b76f1c675d286f96721f76a7325e492c11aae03c6ed288fe3a SHA512 e8ab0b6f47b9737f19ee548dfc6cf09087d1b9339bc48b599fac05d0eb3b00d355f203787a84ee3a504eff2dffd707237a0cc5e26c64a672a362b9161077326f WHIRLPOOL ce3f685669fd31689284d7ad0cc0dbafb496808b6c56d1b6f0a9abb8741585000ad54b18577d608ff4f917dfdd4a25c5332f493d60e90e8b4c27cf1f464fb292
+DIST bcprov-jdk16-1.40-sources.jar 1221202 SHA256 583d7e045e7022107453d218240afc3db17461ccbd34ace0ec7f54df1ce153c2 SHA512 ed94e54cd7a53b5219d0eebb1651f93201c177faf26724613a520e045987e74c462e7adde491bda5bd092fd651b9a7abef93bfac2fd6f0765fb7651525c199ce WHIRLPOOL f387cfe7181d189df08ab2c8c932b777c03cfeb57dac7a95995a1c8a915dc113dd79b8291b3ce3f20f590f9b79a853c7b6113d3eff7bd2c16ec1c5c5d1ffbe0e
+DIST bcprov-jdk16-1.45-sources.jar 1286663 SHA256 fe4f8a7b78515e69f48145f172f698f5d6f8433ac8388cf97e3791aae021eb87 SHA512 541b390efafba17c21a25bdf84725fd0f9808555eec9c4db51b0642c348d552417d9ba8d584d54690146f3e72fe3b348ab49f92ca263ea8a7a8f7b27bb7b8e5d WHIRLPOOL 65243c247fd68000368d16446c6bd9079af101faae6d011c4c455c9b1b833ebc7e5484eb899a7b195764e3d00058a33bedb05a8584a217084a583f8f16ef0cc7
+EBUILD bcprov-1.38-r4.ebuild 1358 SHA256 ca420e06cee96df86ca1b1ebb0ab0462adb89fcd331734dedb3c496cdeb16cc3 SHA512 76183e337d833143880e5cfcb798c76ea0e68a785906a24f0775cfe215df10188da2080e0cdc310a5f497b2384e7fcc13232bf6d751f4ff36b02bf4a98283429 WHIRLPOOL caf1549296ef6dba5746420e6b6aeac419c4e14b1e4c66ed279b642dee97eb87a0b231d02186353616d122bea9010723a5a934585938eaa51b28e02523f36c80
+EBUILD bcprov-1.40-r2.ebuild 1358 SHA256 6b2b5ed8ad29c2dea7fbae62e07e366bcdc69cc4798ca7831b5768a513da36e8 SHA512 6aa905b528082cf89019165cda650cade46cbda100219bbe1252db84402d1dc9760c11a08276142884847349897250d4dc09063de3214c894394564ca51cb6a8 WHIRLPOOL bacd829279595daea95b68e115488abd1d352c5d5bf13775f4d4ff315ab8a05e1e545a4a899178a7de5730c961a4b036f49ed30d9920fbaaf8254d217790af05
+EBUILD bcprov-1.45-r2.ebuild 1365 SHA256 ff10479dbaeeea4750fc6db625f46b3ea23dac810c34e214de81552c7fda9399 SHA512 8e834b4c37dcc6375b8a4556f41c7b3d0abc2045d1b8b711cbd56d5b4c5125aa7e2d1d356a6e300222acc2ed5434d7f6d871e530696789fe42194d008292c439 WHIRLPOOL bea2cf10b489e18daa44c890c3d66175855f830a92b4bd50e2aa94e1ddc3117d20b85536398d4691b6bc91d9c9cb5bc42c2e24e74e32b27a9ce66b0bfff0d862
+EBUILD bcprov-1.48-r2.ebuild 1376 SHA256 f76acf6c4fa7e0f94564a3ca2ecabc8463542eff4591eac8d41630d1731ad9b5 SHA512 b31cca1f16f497f27211674843d278675ab3a6a695886da6547fe0fd0c63a7dbac2f40e14ed4b8d5f044f399c608b0486eff4abb43399c7bae9535735db21d17 WHIRLPOOL c9d8487bc813a7b65760f4c5c773ad07d50af180cdc589d0242c7b50ed3d19505ac2d01c8a7d5dd2f0841caea47598a00f43fdf611be776b568a807e109394d7
+EBUILD bcprov-1.49-r4.ebuild 1376 SHA256 6c9f026ac969c89d2ffbd271e203c51ea7b3a3697ff276c6da901cf54a58760b SHA512 f485ab13f87f2d2c4ee975cc263eb043049788b1ea52e7a965351e374a6ab77d407b6f2168dfc5302567819778f188c9c7db4867e1053fdf98f8a0e3580e3aed WHIRLPOOL f8b6ee75da7f889f0b32e7a113d6fb38af9f8b6f0526e96506065d5f2cabdfde3ef37c104f840e1cad7b62da924b8b6e9adc4e7ac279d6dd951aa07e165af723
+EBUILD bcprov-1.50-r2.ebuild 1369 SHA256 818c8901e331b198d2d2f94a17f7d94f3020fde7874a0ca224ede03235c00c46 SHA512 85506401327286ac8328e2da29e5cacc796231733bd5c3562fdf0fc64ec7e715edcd2bb4532849382f0061ac57e60da24f81ff6450ced024875f29a1b23d35b7 WHIRLPOOL 64a08b4fe05e6cde5c9b6dadb5bcc4f3c731c75cc5b3f86d690bf64fa98507ff55b89f576f984e8c7812b9c37f7f89bfcf53a805dd9c5f8fc8dc582a07e7bb23
+EBUILD bcprov-1.50-r3.ebuild 1373 SHA256 9d36255ef6208a108ccc413372bd6b11f507da770a58ecd5ac10a9bc7eae8ce3 SHA512 b7f33bb1a7af3f76200744c7e5ae4b2bf2c954943769efd1c3435e4788a42c4910d461e5456382b83a99ec73d2fb2dae4533ecace3eec7ade04b0679e8e69226 WHIRLPOOL 5d516c68fbd3ab56b3bb501e99c5ace4138dd3061fbea198c6665ef5c7e1c82e1c01830e38aba9494bd995fdef87d1b5eb88cf799e932700c4453a99da67920d
+EBUILD bcprov-1.50-r4.ebuild 1343 SHA256 e3ba2eef3df2a17476e3f543fd1bd154b1d04cffd3057753a612f252b7cb50c7 SHA512 a39c2ea407372538797e7d4af340aaafb0c03af44d9ed2796d220db7a7d578bd5de654d1035dd615bb7c77b9fa34a12cb9c76a8e0328bb1d0f1e8d8c1f582e19 WHIRLPOOL 1f299e0622eefb33aa489e18e8b3a75874d14f26219bb6d31546479aee7b74dc337d08a94c6cbdc473a9340576e827d3007217d817f222110d170dfb5917bba3
+EBUILD bcprov-1.52-r1.ebuild 1369 SHA256 44ac8481aee6701b5ae38ed2063dfbaaaf9e5387d90e2c9bfaafa47bb12cc4f6 SHA512 fc27741628da218b68c8d7d55a9a21e6e490c9a6937db331dfe453edc5781ff265198766e4443417308ca390b1beb56b395516caf9c203496a838c13617f3b06 WHIRLPOOL f9fbf0fe1bbc0833a4419258600a9381c79266ac22655aa40f5907c13d439f710ad6d13fc5678593147ecb9255dd36dc66ea6e6e873eb177158fed7543e16de9
+EBUILD bcprov-1.52-r2.ebuild 1373 SHA256 3578aa355304d97402e93ea37370ec83a7306eff37b564e56e48f017547c974f SHA512 29374a8da39e7a7430e45fa95460007f08561132001e7972b5c3fd83b592a77c5e8ca160366a6268abf6c9c8c5cd453a9ed2e3b22972e97cedb467b57a03061b WHIRLPOOL 2d1bbecfaf3d2076874a4069c01cf852d9e9e8dcaa1b2a24f8d105d334ab9cbb42eaabe254f33c91a85e6a01cde0c469c3cb86a12a8952f7f45a8267ed14e3be
+EBUILD bcprov-1.52-r3.ebuild 1343 SHA256 ec769209174d01e051387b225bfc690a2c171e36a5b922706a6e102a43cf16fe SHA512 363c1edd6382849e1585240a92e34f17bb2597b54ce11c4407e23c7dcd6cd3f1cc6c60f8dd990f53aedbed204914b0ba0a9ca6a6cabd23fa8beebc97495ecb09 WHIRLPOOL 3a12bf8b8452a5c97699fd7799ff96837b5558ad81eb2dd9fe698238d18d1bb3bb1f05d23104ff28bf2c5e6120218787b5e6de3b125ace3adece2b9973e07116
+EBUILD bcprov-1.54.ebuild 1350 SHA256 13605dfc2de2ec7db2645f4e153bdda05f268f842dc2edf5e69fde0c68541997 SHA512 e04c5bdf3896c522e4005f199ce6e71a761d92498f36265234f845d7407737db188798d95fcb9296525248a7aa00db2393107036496e14bddb5a232ef511f459 WHIRLPOOL 507965e9ea1e47d61274f2763a2f73d6c68a63099f1b2b411ec341623b8a820e7b38294de9d9509bce8ed53ca040e09ad2d69abbbdcac129719bea4320eba0cf
+MISC ChangeLog 8369 SHA256 9a46a143872febda9b3a177676d87a69e05609de20cf8a9525cf724626af1432 SHA512 3e32375c4aa367ba6e1a9ee3d41cec210ff5f04637ced37d86e8114bb1aaaf66fa756aa6bc92c87ebfb0fef9c6469ae71a018b8c3913b6f6c10cfe3c800170c3 WHIRLPOOL a2f9630f27ee0a533b2fee0dd75db6c6a340b937e0ba4a24a1c41002545f7ef7f323b7ebab9ebd2f10b08c663230a8947dc02549d5feae936f9a18a2b915b70e
+MISC ChangeLog-2015 9397 SHA256 08f4c8bebc7d9859f462ea28961e45fe87f5140077915e3220650f1f2f92c178 SHA512 93bf2b6d78e2bb1450891e7d967a7d27fd12d1e7400ba99ba18712e1859c5de31ca6500fd0fd0e36110ff1f25b94d7dca817476a4cea4464395cb37c0c5fa183 WHIRLPOOL 27b418f2ee5ff1f825b0bb3f4b871871dca2ab40e099b28ce0224a8c86a183425726faf1250026462d424d3035f73424bfd31d8001a1e375a31e939fac76fe97
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..91ee42e0e7f9
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.38-r4.ebuild
@@ -0,0 +1,58 @@
+# 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
+
+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-fbsd ~x86-fbsd ~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..530e6fb9daf1
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.40-r2.ebuild
@@ -0,0 +1,58 @@
+# 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
+
+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-fbsd ~x86-fbsd ~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..1b4ff67b4d8e
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.45-r2.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 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-fbsd ~x86-fbsd ~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..f8982a92a2ed
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.48-r2.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 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-fbsd ~x86-fbsd ~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..1524fdfa90a3
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.49-r4.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 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-fbsd ~x86-fbsd ~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..2b5749707691
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.50-r2.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 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-fbsd ~x86-fbsd ~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..ccabfc96056f
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.50-r3.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 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-fbsd ~x86-fbsd ~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..19461145ea01
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.50-r4.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-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-fbsd ~x86-fbsd ~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..46de42c22e14
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.52-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 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-fbsd ~x86-fbsd ~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..1569b79f728f
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.52-r2.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 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-fbsd ~x86-fbsd ~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..41830e429220
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.52-r3.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-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-fbsd ~x86-fbsd ~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..81485c298715
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.54.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-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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/bctsp/Manifest
new file mode 100644
index 000000000000..62d580ebcfc2
--- /dev/null
+++ b/dev-java/bctsp/Manifest
@@ -0,0 +1,5 @@
+DIST bctsp-jdk15-145.tar.gz 100494 SHA256 1bd01deef63cb95affed9e0653bef8a3392aaf5857f4e03f00481b2e82e3d4c4 SHA512 8e06598b6286502a6cf908f60b9bcae134dca070869c58e408746470e1f4f80ad8bca8c6f2fe5265fed051b5ddbeb710154ae7bf3a50fff2980c6b562ba6a606 WHIRLPOOL 5b453c1403a8251ec7a2eafd43f4c96c14e241396f248ca17bf533a9fd8142812845b168bb07c36aaf1b038da40c8e2c93646c24d6d717bb4e9e38de8600e677
+EBUILD bctsp-1.45-r1.ebuild 766 SHA256 0555575601458a15f2bc59280d1508cc10aff17df626b04afb35ff946b494dfd SHA512 a8279b41cc6c4ca1a0b883c70c00803ab76f20ff7277303d8f193d15f2ccc7ddb59eadf7b4c7b51937687204a1e8d0908864e24f296180c319f33eeeb0b1fcd9 WHIRLPOOL eb4f5654f7bcb52f82f74d6b712be6e1268fcf6f517a135b1fa88449adb58c95e59aa36f794275f5434f370e248c7c0fe303f5ffa6185a0bfebd206cb32f55ea
+MISC ChangeLog 3010 SHA256 fb20c258d21feb81e757b7cfd68d11739a2e0ebad97bde45753d353ac4464367 SHA512 9dbb4d9ebbd667181d5e1338ad7a8641d0c93e08def20571adc643b4f8be94ae06fcc5784c5f44af7a3801f6e0fd0e185b7dd70f9be3398c980b616469007c1f WHIRLPOOL 82be980bab4ca256cdba9af5915d1698891cc6b6629f285bff9f82e7cf6a8b40059e211928a172099607776952a547e25e97dfa129b1723ecfae2697b9a1cb09
+MISC ChangeLog-2015 661 SHA256 b5db1c94620541429b343b98ff53efa4d41dcea8573eda5c1c33772f7c1218f6 SHA512 6f0b1563aa0f73b16bd05d2fea8e739f4938aae0f82d0eee10cfc1066d59b00eb3835581329ab7e21740299865a2ba4bd0900ac14b24a620986c74d49678fa26 WHIRLPOOL b2cb1b2b87662f6d46b2e442c6748c1df8f47b6223e605e8d5020e2eef5ba134706cbfd7947d0e9860448d045c9a5708ef22219bc25765920e2d145993ba48d8
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/beansbinding/Manifest
new file mode 100644
index 000000000000..4fe65c0c9494
--- /dev/null
+++ b/dev-java/beansbinding/Manifest
@@ -0,0 +1,5 @@
+DIST beansbinding-1.2.1.zip 236905 SHA256 ed77bd6e0351bb00832dd4248cb4a6a69f5ccd08cf41f2f3806ae3732b7f0aa4 SHA512 f617f0b5068c416bcaaa46fe141e9b8b1fec128403738093b205451f9bcd624d2588b9b77e0c67f6de97490f44a4cf7c5e58b1728d5d7d921bd861e3dfffb415 WHIRLPOOL 5545a5a3ee19c3b0170d4e57ebb8f39c58ec7599995db9e516caa9f5fd952dc89e5f8091f7ee2073689986e2d240d283bdb53b48ab8cdf6abe4bb72761062d62
+EBUILD beansbinding-1.2.1-r3.ebuild 514 SHA256 f6ca34f4b59f148942e15a218cf02de09b7b723f5732d4ca673108ba946373c9 SHA512 4220480274ea8bfdb88f075936b3b67a9cb4e9a3a4985f04fed9ed0bbfe99f32e4e0c29d425970082fe4e1043c2a93e278cca1b81436902f075346d1b3905027 WHIRLPOOL 8b97041766b1a8aacba9defeda33a2bd9b4dbd2cf0d37a2c6771e499068dc9f057520fb51bf5b03079df3c073c2b3df6da47f5cad9128e49433e72ba8eb4c15d
+MISC ChangeLog 3783 SHA256 fd218a76386cb3ff66ad1b0904ea019a359eeae79d18b3111aa7c35877c48630 SHA512 2dbd25838d721eda5612d24e9c638a37a9795efb5f0cee4d696f4be919025030b3bd284809759705ec0c70a32de39b3f6d02870aa8dc6ffe499dab89df6ebc75 WHIRLPOOL 7279c6249f1f86944de0b8d8570feff7519a6532e034bbc9e49e07ab85e9ca56077903d3d3d01fc18395c23191d176149a86b5a212ffc222df9535e6a204db6a
+MISC ChangeLog-2015 1051 SHA256 2be86b9babe1e292588f4183612d490cdcfadd6dccc69ec2368554afe30542a4 SHA512 eb9591ce49c359224647dc172279a42fa0250412589f9dcae0788d9fc228a6b6d0ef1702294320eb8e3f9ae8d8862a7c6cf5f7846b3d8ef269764f54054a7775 WHIRLPOOL fd42155c9ab490c9f70fd8eb7f6d412e23774a4c1a57f149266479883325f2fead3c355808a276a63ca28ecfa484025ef7af874d96ae9c93495387816164e6ce
+MISC metadata.xml 547 SHA256 9fb9c2964c5486df8fda3afa8254f7ee4ecad0a4a59ac666bafadbfee6f11d23 SHA512 609eeba195b71e3c6a941a8e0f52b1c55a39b1b3ee145afa61965edc30bd7e036f32f670b68ddbc712a19a684891aa70cb7a8aeba1c0cf6d5bda95785aa1c668 WHIRLPOOL ee792ce46550032015d498bce21eaac99281b118184d1ce075ac6d8d5d53c03c20cbb68c932b14663fe991d0b8c50c1db0daeaf00fc10bb250aba17d5cab6eed
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/Manifest b/dev-java/blowfishj/Manifest
new file mode 100644
index 000000000000..616ce7ccee23
--- /dev/null
+++ b/dev-java/blowfishj/Manifest
@@ -0,0 +1,5 @@
+DIST blowfishj-2.14-src.tar.gz 33726 SHA256 d49ff16dbf320f8988886507c0065312b4660d4dfdbffb894db7ff7d6f5bfaa9 SHA512 3f508be61b494eddf6f276e21c7979d1f6a46dac19e8256f7451f3a434cd1d7df34c268aa2c13b7370129c84f289f331f47456c400ac31a9f0996fefeae12aec WHIRLPOOL 04cc5516fab856f45269bbbd7b0cce31331f9e6586023f14442228aa7f9bd5b39c731dd73c34460eaf60d995312cf7b118fb38c10d7ae2f7c4a27574fabd1260
+EBUILD blowfishj-2.14-r3.ebuild 867 SHA256 e700c29002b363fdee4d44f0199ef2c952e8c8f7f2792af5c137d4ef85c81e10 SHA512 33caf27e02d61355778da994834f8709a550a885023b0427a529cddd92caaca4a0338b69bc95efe03f30a20faacb1545dab618b1da1d49bafbf1264f06b2a823 WHIRLPOOL 91eae9bd48dc6562cb3c3a2ea42825e17c5cf9c9c06c443198293ab5fb5dd710a7c6694fea4b9f5951d3eedb5db56d1dc39295fadc4c58a0043ae3dbc7ddb7c8
+MISC ChangeLog 3263 SHA256 71f5a0132c64a151f11d4436da017d4948e6574e9ebadf9b51214726638336a1 SHA512 24da832acf30ae1aa98eb68fced8d550c5b4ebf2ef4c2d92c9c73abe4e5cbecf483d29487054d27f26f4f252519c1f2ccac106224f54723129be000776070fb1 WHIRLPOOL 95190ae2fe97979fc7795e3b24995925ff97b5159edc1206874515f20231588b8d5a6fdbd34c436a9782f7b60511f23d5e0d444cc92701bc92d56a2882a7f7a4
+MISC ChangeLog-2015 2745 SHA256 b60413345ceb42442af22db5efb6f52f86359dd7d8957619ba072136fb8eebe8 SHA512 13e0e6940805050ba5cefcc4683fbe5afad71db1314b526837585dc8303159b73ad8769233e33c9ecd75dfd8b857a030ca39415b776f80e162a8c2e7588fc4bf WHIRLPOOL 5a4fd74f03ab28dc9609e71f854a1e481925a0f74dbb187f4abfcdcb548088e1883742e2b0901d63abeab1ebbb4a043ff633958ec8a898ef70ec7ae9d3d9fa8f
+MISC metadata.xml 685 SHA256 5b7e1a99ae548640c38ab280c146e08f967959d4a26cd513d8cc97a056724385 SHA512 48bc52bb7d9e6b99b75d621ecedf4c3f194c5d5aeaadd7e20cb65ca4a7ee12c2009f8c984bf480611ddaa92dda2406e40a109327868373b380bc387414ff195b WHIRLPOOL 2e3c09fc3a64ce9487f60d76c988b400d083f3cbc18cf930abd65c5574b27d0aa7351fe538861b3b64857016b61a1877ce7eaaf8729703dc955ab45f26930348
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/Manifest b/dev-java/bnd-junit/Manifest
new file mode 100644
index 000000000000..878a3883dbb9
--- /dev/null
+++ b/dev-java/bnd-junit/Manifest
@@ -0,0 +1,5 @@
+DIST bndlib-2.1.0.tar.gz 123217291 SHA256 5e4c3c5d786acc1044103f57f4769acf54ea7d247f58f3c6a7b7769fb37df30f SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e WHIRLPOOL 3df261dec93655d2f4e483952b58d531fdf1936c505552f013f9447ac7fc8100e51f2412fd66224fe7871fa68fe1a6ec86c9c2787ffbfc65c8dc9863bac31fe5
+EBUILD bnd-junit-2.1.0.ebuild 1108 SHA256 e3ad586c7180e6a4dca66c45491bca270a5a249e251e75899edef27703ba3adc SHA512 4ca41cd6424423e74da9251835c15ff946d9d9a157cf1760f30daf6e5ffe61b420c01fec4fc78bac46d946010925bced7534d88e2b9f6ea0c80f74a0ce02ae2f WHIRLPOOL 69f0abe22fbf8e388b00297a0cc5ffeab0d9f0dfdd56f26c6e8fb2f9c4ca79171995348b0ebcecfa135172d1b5e3d7b55547b3df9025657cd47f6d2174fafccf
+MISC ChangeLog 2433 SHA256 8455bc0227a6921ddb6f472de953da153339cd543618ea53af0439e621553453 SHA512 850df7b98c645a1ed21629bafe322743ce5924710ab61c91dfa890fd15c6f78659646389273167e576226b258e3258fd5b659f7358ef7790b9ff4572a5c8a2c8 WHIRLPOOL 7de5dff3a8ea5416f6580147219a5abe246b425a6b495364e97e27711beb01879474dba418e5242229efd8ccc4795c7b8fadd28d9c0d2e0234c8150835e3a9a4
+MISC ChangeLog-2015 862 SHA256 fa39d1a7fe4309d5a8aaf28615ed3cfffffdf25aeda2d7ac6f74d6bbd1c9707d SHA512 29df1d97bb4576ac99d2f460c54d67d45f324244351f8e70189b2b039c7018ee10df8a64b1250a83a43cc3e2681b3431db95b627e2d6beed245225abfd728cd8 WHIRLPOOL 2bbf182148a6c0a69a01f40d0bce992b23fa0663ebc520d4bd53a3f251f9d4e090fc96361dbfa402cdb1b3ff75be259bb4d637c6037a723dd290e731a38ba0d7
+MISC metadata.xml 323 SHA256 5d4405e7ba4bfce2e3cd8fc106142b56daac9f29abf53107d4fd5df8499f25b5 SHA512 b9affc0513759478d6db10968d574cc820ac19476a539d27e279884314805f663f0807abd01ce8107154fae445ad3e4fd37f485004130f04aa890c0607f85fcf WHIRLPOOL 70184d5185c58b4b2af3ee3f257ed3488d06ed1ced00cc41393465ba3911762cd7b0287ea4dd5c15c6fefbb41bc11339caef3d266b93507ea23c18b1e66e5850
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/Manifest b/dev-java/bndlib/Manifest
new file mode 100644
index 000000000000..dc1897a54f30
--- /dev/null
+++ b/dev-java/bndlib/Manifest
@@ -0,0 +1,5 @@
+DIST bndlib-2.1.0.tar.gz 123217291 SHA256 5e4c3c5d786acc1044103f57f4769acf54ea7d247f58f3c6a7b7769fb37df30f SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e WHIRLPOOL 3df261dec93655d2f4e483952b58d531fdf1936c505552f013f9447ac7fc8100e51f2412fd66224fe7871fa68fe1a6ec86c9c2787ffbfc65c8dc9863bac31fe5
+EBUILD bndlib-2.1.0.ebuild 1629 SHA256 13b006908b1a3ed8e61dced5a7b861ac5a1feba5b162179cd18a401b7c15ce36 SHA512 acd9ea13ccb4636c537d392fdbb49ad1c0b9aebb0ad7adcf9d5ac277aae840cf5e221b62a96e940790ba6d10613325dcde311c61a9cae37ba05e726874479ba4 WHIRLPOOL 387830fa52bd8e7810da521ada581d153e036b3b2141fe075df03643d66fe2b0571162872d4f8a0ddedd2c52eea8a4cdbc7b9699ccaa99b28212f5e682dc154f
+MISC ChangeLog 2424 SHA256 718fa75734a670be617f73a38f28ca3f66f1085d4b32ba7e3fb1218ce4a3d2c8 SHA512 9ebe7fca76a9e12247f97e3068a6ae9cd564222e67f00ca0bdbe26b0216973845bc985f17d51f56e55fbd44abb1310a009142f03864352e501518227027ee4fc WHIRLPOOL 7c2ed7a69f63636f4ed488f11a4b9fc257e48d107b59509f4f4f4188b54f7f7e884856c2a144979ace017a498bd6592779cd2d3faa64b2b1208e4d9089d6d471
+MISC ChangeLog-2015 867 SHA256 576c5d9ac41b78fd93e30837e82fbb73f763781c1aa07bcd01d3e54ec0fc64a7 SHA512 9a4747d1f98090f7544fb93268917ee99e6c90aa66f6e0e0f40cf306f531f0fa4bf68cf5846b8dd332f99b62932042d8bb5d07bee3a045795ec0b6fdf31a0234 WHIRLPOOL de65a716cb086d9b4610606d385fd015915b91515b871922762fd4135804f4423838ea63cfc1eabca1c414d6387576daf79dee33786ea366f6ad0787f2c486da
+MISC metadata.xml 323 SHA256 5d4405e7ba4bfce2e3cd8fc106142b56daac9f29abf53107d4fd5df8499f25b5 SHA512 b9affc0513759478d6db10968d574cc820ac19476a539d27e279884314805f663f0807abd01ce8107154fae445ad3e4fd37f485004130f04aa890c0607f85fcf WHIRLPOOL 70184d5185c58b4b2af3ee3f257ed3488d06ed1ced00cc41393465ba3911762cd7b0287ea4dd5c15c6fefbb41bc11339caef3d266b93507ea23c18b1e66e5850
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/Manifest b/dev-java/boilerpipe/Manifest
new file mode 100644
index 000000000000..2ea550cf0380
--- /dev/null
+++ b/dev-java/boilerpipe/Manifest
@@ -0,0 +1,5 @@
+DIST boilerpipe-1.2.0-src.tar.gz 46279 SHA256 b87ce6e374081a417bf54016fda504b174445c6c9a275c73735c00b85f7080b4 SHA512 db9349213debab932d2470e46f1e80366d6a6ca99e016b6f9ed4887881eecd4132e9aef29b8e4fe8282d1375d60b88a99d9aa43e249d6b673739ec017d2472a6 WHIRLPOOL 422427bb061895a2b5d34f0fd0a18bce524bb97acb5500127df4323a5cf36a1e4ad0a1d802988e22371039a44ee142ebdd8995277d6109dee71dbb0459e4550d
+EBUILD boilerpipe-1.2.0.ebuild 800 SHA256 ec342575a301335e242578855c23b5563f4066b0705bd4ed5d5b9e1d43f4b83d SHA512 13826a7c84190fabb2ffeed05e9fee0e3dcfaa63ea1f0f6e9cb70db9433ed803f0da87f5731853bb73ff744b9e9b6c2f3c65cc4422c47842120c192be4167e19 WHIRLPOOL 7de986ae24aadc6def307aee65ca7c22f853a270ac6c2536e7372b5cc31b9c9f06b3a6c9f05f64054cdd77c23c43c55f3333a0044a5cd1e5b9d7b4e7e4495fda
+MISC ChangeLog 2716 SHA256 fc250089a8489cad84d5c0d629c45cbf51586ccfaeb44d400f86b60356f66e46 SHA512 33baa28d1ef97d7f199b8c615c0e70b18f8904839656517b95c4e3eab1302e38bebe0adcaaca833920f2e48b5eb0170f250ec80a10a9783b6c2cbdd37df1f3cb WHIRLPOOL b5ce00a5754113e9d8ac62432ca1c501f9d638f4559eed36b4e993bb55864dbc714c898045576f61f334e833f98002c8853b3684d446e5daf0d5d979be936353
+MISC ChangeLog-2015 388 SHA256 7fac35274f29357c1949f1798fa71e8988d1528f3f62a2f75f8c532298f2e17a SHA512 45e8c9fb53517233a19504ddfc0100b6be7ea07a5319c717a6b1783489a62979abe572434a244885f958b507d2b384f6aa5f2e3dc9fb6067c6b5f60ab0e3138e WHIRLPOOL d254e52ca4383102132759cc325c399ebc3db40f17cf0c21a7b6daa05b4d21bf1478c933a9d7876f13f00ecb0d0888aa81bc1e5be6c78b3e27c5c66955955e00
+MISC metadata.xml 342 SHA256 131c579e9bd0deb6607d49f36a6d7a0ef299d700d63f6999a03db54a837bf4a2 SHA512 0fa0852735c9d0230bbaf00cf2dd09c1d65a0d31e0a763ca0687387f1f8bbba3356d7aac6b70f63b55c80d2700f4158c0d504e1ac04abcef70b12398f43165bd WHIRLPOOL 903ef15c21cd1ab995f61fd3e50657260179107fb00d09bd825a01c0154942926766f6889d53fce564192a934928612d793512fc10c8fabddc1e08a7148805a8
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..010ffb802f85
--- /dev/null
+++ b/dev-java/boilerpipe/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>ercpe@gentoo.org</email>
+		<name>Johann Schmitz (ercpe)</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kohlschutter/boilerpipe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/boot-bin/Manifest b/dev-java/boot-bin/Manifest
new file mode 100644
index 000000000000..5d252d6535c4
--- /dev/null
+++ b/dev-java/boot-bin/Manifest
@@ -0,0 +1,13 @@
+AUX boot 247 SHA256 30a134739009b822d395134eae3b528b5a06f06891e6e91e1f63e425016bbd4c SHA512 06ad5b0517a2ecddfa62e03b15d7af2bf76f029e2cd9dd096b27024a9dd1f6c8bc0ffe278b510249f624c6dc2178d41561e06c41dcef5cca8699f34722d215c0 WHIRLPOOL 1365cdb44a0faa7d26cc07aa34e7ebcbc7258e3670f3905c1647065a48e5d0856f0012b0cdd18091ef0202e7eaf939f66d2591413c469cdec795686981ea7a29
+DIST boot-2.6.0.jar 8289462 SHA256 6ad8b10ff63b5ed884fefef9b784fd05675d94486526d059ebcc2c3b8a8a7701 SHA512 715aa320c0e44a2376020aa84c0640ae8e6fb15a4842b4267ff58e1d09682aae17f74dc568e50fa611993947bcd7b1430157a0f0b6b8bcddff1eaa3149ddc9ad WHIRLPOOL e39fa91d481ecf74747da7b81477d27110c61ad51ad5b662da9ef60c0a8727c035abacbc0cf1201d6dce2e31d76115ce2fecc2193228ae23dfe251e11858d93f
+DIST boot-2.7.0-CHANGES.md 19877 SHA256 645fd7930d2a6fad9256715e069a41619a3475f2eeebbb41207971f15ccb1881 SHA512 f97148da762a1e5ea5ab747dcff59e69a53690cd655a6b8968dd894b7e4184f49eacc2d1189d81df80eba78b74091dd47d137dc4963da5b9caead0db16259303 WHIRLPOOL 0132ebafbb7e159dc9225a7a95106b2471762ca17760ed283c9917b82e0477bc97e78642610ed90008fd81b1083ad427f3f3c64b17997aef65a9f50ed945f839
+DIST boot-2.7.0-README.md 16071 SHA256 d387c458c909734469ac4deb0a08dfbf39c6b0189ba859bd946513e07759bb63 SHA512 395b6fec79bd1299f4d84fda4ba3d0db0b54c9c591c7ffd2c3c0f239f5f1bade31bf6eb1b924d6e58775fb6d412417d251d77356698d54c93c3ee31b64c9652a WHIRLPOOL c09971b19d4c0bdd5521608b8aad6712ccf2d11d38e55c7e1ef463d6c5416894e84693ceff0580402e44e317e77ba1080240320f282a3f15e3ba35493002b1fe
+DIST boot-2.7.0.jar 16723852 SHA256 e70aa20090faec527f20a623cc02c77f33f0061ec98bcb05595f3ad15014f3df SHA512 5a95b2d8e521d57e5773347df52982f0ab9cd325622606ea394f826610b9b27a1cbeed0749665d62f605cf9249b9f65d378b1b77e40c83e3cfe703d4d2fc2530 WHIRLPOOL ef2c5374a72e6422387c617ae437f0cb9bb9aa44e36dcabcb0afb236ea1c458b5f3adf8a900e00f1a3cdaa2554a160cb7c13a0e275392e61eeae5d296e2536a7
+DIST boot-2.7.1-CHANGES.md 20380 SHA256 1f13ee0f676635bef5139f278a3d57f8768d34348f59ebf54a8046f5e7a60c36 SHA512 5f8b9866dcb5e784caee89c7a0569d6a2392cda19aa498d15eaa8d4ea054900bdc0dff950ca60f6c62f0cd262373a3cd0760c755b805d952bc96838de135aeb8 WHIRLPOOL aa35d4dbd9649c48baa989ff2260ad65727f9ad499b8eafcd640e4359d09e9dacd76c85f8810085e419ce5755470909128458313c39354eb2206032d8718e6e7
+DIST boot-2.7.1-README.md 16071 SHA256 d387c458c909734469ac4deb0a08dfbf39c6b0189ba859bd946513e07759bb63 SHA512 395b6fec79bd1299f4d84fda4ba3d0db0b54c9c591c7ffd2c3c0f239f5f1bade31bf6eb1b924d6e58775fb6d412417d251d77356698d54c93c3ee31b64c9652a WHIRLPOOL c09971b19d4c0bdd5521608b8aad6712ccf2d11d38e55c7e1ef463d6c5416894e84693ceff0580402e44e317e77ba1080240320f282a3f15e3ba35493002b1fe
+DIST boot-2.7.1.jar 8388320 SHA256 464d62a45699b7add2126a2c12613b1b09bd2ffc895f29baaf45fae085a705f0 SHA512 d8101ba2c3a2bdec655f0fcea95a3cb33aee90c9471f6cd31f465c3716cb3f6d9027b7ec0c1c7cd277f8b43cbc0fd69d2e164fa33b112bba94d4d3245caafb3c WHIRLPOOL fb6f53a3c44ac6595b17aa8d391847044609056e550790e54adddd0290a8cb2834db4dd8c59e332a8be44c678a9f652bd33e00b9e9b8c7d3f49967e4ae69f805
+EBUILD boot-bin-2.6.0.ebuild 1524 SHA256 f38f4394564ae9224d1c8ee99e1b215e17b7dd9620d6111b0f76ff1dede0822a SHA512 d4f3886207b4e0057fab46c8f0a65ce4830c6d6c948f1cb37c8d3a5bbb4ff8a880bcfa920fa2c2e037d243e7f16926fa3f2105e69c0fec5564cd563b46ccb3e8 WHIRLPOOL 72a64b3d6aac961a50a1fd579e37f00507252c94dae1aab257c678bc3b230e8d6c4c3b6ec3223f59c2b3b17eaffe2a396ed0f056c1f8c40f3c2d164dbaf976ce
+EBUILD boot-bin-2.7.0.ebuild 1998 SHA256 a8c2a1409616b28166d9df485fab7176f64bb2c1e7c6b1f9fab6f45b3e4ea4c8 SHA512 e4050452a886c3ecc9c8f9c42a8befed7f9aefd8f4123d8f49741f13c30f8bf59a73c067cbf0d4eb259ce64d353e7dd79c5de3cdb906d8348ef7f85bd3af4321 WHIRLPOOL 700fa482b87cbfdbddb6c15b601091b82cb2f7efa7833e64e970f1775c3aa3322cae50a9084e262e43f8fce81618094f1c7db1f449c4b75d4c085f6bcf3cbe7d
+EBUILD boot-bin-2.7.1.ebuild 1998 SHA256 a8c2a1409616b28166d9df485fab7176f64bb2c1e7c6b1f9fab6f45b3e4ea4c8 SHA512 e4050452a886c3ecc9c8f9c42a8befed7f9aefd8f4123d8f49741f13c30f8bf59a73c067cbf0d4eb259ce64d353e7dd79c5de3cdb906d8348ef7f85bd3af4321 WHIRLPOOL 700fa482b87cbfdbddb6c15b601091b82cb2f7efa7833e64e970f1775c3aa3322cae50a9084e262e43f8fce81618094f1c7db1f449c4b75d4c085f6bcf3cbe7d
+MISC ChangeLog 1068 SHA256 1feabc97a88a347b3f9ac2accfdc9610edbef492351b106cefbf67924caca92a SHA512 b00abf9c497ba46937eb0ec87ebf6d713de46a76333d1c7ef26cfd0e5b30423bdb31a2cef9a18ff80b71353e16c0a1adcc94300ce22a67523ed35e91f5a7101b WHIRLPOOL 0909f8fd6222a470e97e5eceb03de6544f5d1e76bcc623d10dd1bdcda84f00b8441b42537a9bab0dc516b4d7c0923453581db6ceb25e0efa5c104a0357d4ddb4
+MISC metadata.xml 400 SHA256 9988c3e42669da857fc37142a5496f328e4a645e42756cebddc50379ad3d8b21 SHA512 1293c586f0885348baaeaf2c98c031a5c673aaa3604bd81c73159341d55f83a85686efd4866709709dcfec289087422af258e4df8c4f43445e7ad87a2dc43096 WHIRLPOOL fd992e54bdf848553a5f5d7c5c1eef28713bae5a17b45ea5ff340496b6536638dc175eafb226ce08faa8113bc9c4fdafb5cd95fc4f9f8a0d9166328c98fedcca
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/Manifest b/dev-java/browserlauncher2/Manifest
new file mode 100644
index 000000000000..49267f76f83f
--- /dev/null
+++ b/dev-java/browserlauncher2/Manifest
@@ -0,0 +1,5 @@
+DIST BrowserLauncher2-all-1_3.jar 186442 SHA256 45445b2eeaddf70a0f79f4b3c45cffe097bbc16ac76ec59ab9224562ccda2bbd SHA512 529195a94b757578afb3863c6b53cf16584097c659c576167fcbf86897cc484d80092c8d6e409ba1fdec69cb4f4a42b65c89c881663ae64bbc0a0a496309da5f WHIRLPOOL df45cef7d159c38101d66ec86b8a965cb1bb28f0d0e3c8a289059c3be01d83573e2a352d950b730eaced3210df19e2a9d1904e9ea444ae8250f91010a2626777
+EBUILD browserlauncher2-1.3-r1.ebuild 1111 SHA256 46e9fc5ffa9f5d2a6ee59329ff9f7d03ad9aff9fae44498606db9564a45fca22 SHA512 4cd6731a72bea53839c13cf46c472d609d5738e154898e0ff305fdf111292a5d188593750b18d87ed750cc1c57191d83d85ca8037bbc99015b4097d0904d51c0 WHIRLPOOL df8902a1d41e8ab2c97c8521c62247fdce00d8d5a61a0e245dc3e48fcd4567029ed428602169bf303a4b2fe84870f8798de98f1992dac52466e642bcf1687094
+MISC ChangeLog 2832 SHA256 d411da5d5bd98e4f6edb3bf686a4468153369d7f0227656da12fdfbda5997e83 SHA512 f71d53755589b2c00ec8125213476e45df0f94fe6989d08ee1aee76067e6660dc23ad540a5cda6261e8b4170052c4005d8028176a6d9ebf5b44a524c65ef7c21 WHIRLPOOL 370577057e10f072592d90001aa4b78e1e9d25cc4ca93a99ef8e25b7453e844231f6a969adc5539212cf8bf513af5d2349ef2e762d1f653d39f48cd9ab2c62e4
+MISC ChangeLog-2015 2197 SHA256 f5ea03362852ae09287587761700a431680f0f200041b0ab4ac95bef115a0e99 SHA512 6db4e86ccde3a18ed52caf51443c559a7b23db5c9714ded527cd31a1d04f60cfa41189eb2a7235b013706eda2b4b514202f0cd345d93101ecd36b45dfecefefb WHIRLPOOL f629ce7f026069b452e6641354d7dcebcd7ab137687fb63736ce33a958142476d73ea269ab2333b8d83a66f8cf7058ac0d6f0030704d81546606d5ff1f12ae17
+MISC metadata.xml 628 SHA256 97567e0e2b33a78bcf58d6e9eace5cc93e7cbf9ec0f320f6216d18d8a190b4f9 SHA512 0a45a31198ed3fa2b1e78a43342b9b079cf0ac421668ec360443e803272f25da44dac62f458568a030c67efc720a80eda629532dd2687c8324aebb506436a3d4 WHIRLPOOL a71f3e52e404dd4f72e14e6d6729a803caa57c72e792c5ba7ebfa7fbcc9187537f49e22d671a17977f8f4ae2ec4982b89e8ddd67cfc47c9d0b4ab6ca73b5b0d9
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/Manifest b/dev-java/bsf/Manifest
new file mode 100644
index 000000000000..fabcc6685d19
--- /dev/null
+++ b/dev-java/bsf/Manifest
@@ -0,0 +1,7 @@
+AUX bsf-2.4.0-PyJavaInstance.patch 1650 SHA256 0996789ba490c7d5b4b3b318c4cd99a32b2da39c6c1da88171ee28e6de3b5c00 SHA512 7946622658473ef4cf6b5921f58d224f7378cb00c345a748653306d2648a89b5ab3ed68786d09bbb170b95dc657f7f55501013c854536d6dfd6b38e6a1f3963e WHIRLPOOL 7a0c0c1e07e5fc1a92647dcd0d51a54f31a05f8c3bdb96c53180f649598ab0db7d1f14cd9eaecf2ecca544edda04f10c261d44ff75a705803dc49d1ffc960183
+AUX bsf-2.4.0-build-properties.xml 1984 SHA256 517b97081b13f4ac597a56c1d09d4a4961edca316429becf5fe3d440b3770c12 SHA512 d262daec432d7a22c217e24089f22e4c349be0487fd00a2e6992e77770a3699e7e2b5977e2108455d7f73c31b372d6a73febdff2856e256f93b25f3781e11679 WHIRLPOOL e61433d19cac575366316bf387c26cc5b645ddb63b1d60724ad082ea2cfef0b302af56420c270f50eed69228feb374e655545058871f2f6671fb3f342f6bfdbc
+DIST bsf-src-2.4.0.tar.gz 299749 SHA256 5ab58cf5738c144f4d85a4a442c2f33be2c4c502dca6e29e0c570c2a51ae6ae9 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43 WHIRLPOOL 95ef77a21ad3ac013d354222655b3d4ff42ef7cd154f8529d8798c6b226385adc231edc5daa1bf2575111765fe2ae376d9071c496da050ab9ce73a569330ee84
+EBUILD bsf-2.4.0-r2.ebuild 2723 SHA256 10a2496b48cb7796f173e2c61e5bd13fbf7187af6804872d26ebbc15eae6bae5 SHA512 6b53ba359ac3700336d89886d1bc4dcc30632cd40ff4d618741a9fd030ec9d9f3f4d76acfb7ceae6603cce23e1c6e242e69ef24737d8da4be22a48a8bba0165a WHIRLPOOL d94a4b91cf18b9b9a9a112daa75dea59b9d05f01115e60e5a9f964891e184ab670a9eb48252ca8892254d074aad90b09dd3bfa537a81b7ad1115e1f4e89bea44
+MISC ChangeLog 4107 SHA256 0fd452378e77db81798d12e42acfb21ee761984ec0767b8077351124616dac47 SHA512 7846e60bb2dd5dde5d64190e564d68982c843c0dfe68fe029aaf0c11962a294349f252387368bc7cfabe3ead7910ee52a21cab2b09a1bf809e2137e7894f1a7a WHIRLPOOL fea781e1af02c29a9da2280c5aa018f12ce80ca6aabf020874c0fb0a567bcce3f211b2b2e0f0ff9c0d52a71424cc1b3319dab059f8eb185a54703d8ae424e5a4
+MISC ChangeLog-2015 8146 SHA256 238ce997abc89158f11d199a6029f0ae9b8fd2d9490e41870464f7eda1aeef28 SHA512 c42f5448e935c89e8d18ac50f831ef05365d17a6d39d90fc67a4603df5dc32f5a59b21fa38a8431507d80b61398873298b57205605b83b4c455d0acf5bcda051 WHIRLPOOL 460e0856ca63675297d4ac72751b0789182e21332319f0913dd59d32716e4f4170929f35c011339bd8cb9aec5819fd1bdea6edcc756d8b5ea00dc4fa7b403bde
+MISC metadata.xml 903 SHA256 1b4cc0ddf93a7457ec455f51b61318303a586fa3558be6644d1182ebaa8c6df5 SHA512 f55f803d1d0fc7a1ce20ea5d46ee89afe46b738362a2b78adfd5f6a4e9d09360f3522de148c56a9b2fae9370df1ed003611d7b68b8ba8e2e4cd7ff5683696abf WHIRLPOOL 0188fc3885f3aac94b29f8266ac26d5954305facf43932e7f6621c2f5219fa27028c7057632761cebe765240debb148918609bc23b4556b9b925c68f0b212825
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..d079cbe696f2
--- /dev/null
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -0,0 +1,107 @@
+# 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 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 ~x86-fbsd ~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/Manifest b/dev-java/bsh/Manifest
new file mode 100644
index 000000000000..80b951e26620
--- /dev/null
+++ b/dev-java/bsh/Manifest
@@ -0,0 +1,5 @@
+DIST bsh-2.0b6.zip 1994608 SHA256 25e4ca61c198c3268a52d318736ecab9e2d8868c15ba121547df0c39f452bafd SHA512 ce461cc74bc48580c636c2f2e55e4e734a2b2075547cc5663722866e5c978a680051131c13240afb586a777ab93165119d1f96f9623bd9747f8e7d8293dd3bcf WHIRLPOOL 35251126719af7ab6e3aae3a0dc3680221578198ed4b38ee9717a83bd9ef06b11b99d033a47a65feeb00ab1bdeebfe97832e4ec35026f644470114506d6ef177
+EBUILD bsh-2.0_beta6.ebuild 1323 SHA256 6f2d2401e0c9d4c1b82cd35b537c1f3abd4ab4c4ed4be0aaa958c2b71d20a8d3 SHA512 fb991116582686e7d6c07d4135c481831bfeee0a4f3d2fcd69c6d33f3989fd26a506085b4eab9b54e261abd9e9bf0819d260d00304378e6300acb519463923ac WHIRLPOOL f6125559aed95bb0ca0480a9ac560b39c8bea593f8360e17c26c48e198feb512df5b3089398b9012eb43792d4a5de6bdcac26a353b8fafa38014e49de869f2c8
+MISC ChangeLog 3821 SHA256 c3536d44aeafb3d7a473e90954fe0a36d879ac1c351e3b92877f9df0ae32ed36 SHA512 78dff5a7feaaeeead3b841a87b0eb28fa659a9f01de4da2fa824b24a09a522553f8cd7c43d61e8f78762e1d1faae4f3f2803d5a8bb83cdfdc9c293a232fafdd5 WHIRLPOOL b22e184bf16b01cac566032ef3b056e004777c243d3095aa7771a3e80c22a46f56d6627fa553e2b4c84f91e9bf0716349dde029d66c2b76151310d606cd27f23
+MISC ChangeLog-2015 7831 SHA256 ef6cbf60b876e339cd35706cf2f595fdcd003aadaf11787d110da5e402bd8a0d SHA512 a5afea7349c59d9da2fce1c6df053eec1be7fc28d990352af40a573e243aa78dd7bc24a6ffeac4038d775b2851195d466cc261f51216d60839bc171d89c634c0 WHIRLPOOL 4a160349fb713f176cc5a9947721e848241543937d7692b9a2f6bbd5f31bb0875b4879d620760e8ea3385893c767891f332e69aa49a4071be7c03a6c262cf68b
+MISC metadata.xml 330 SHA256 128ae93c27b612d50ebd0da4a5629690979c081c05da0a9c46d9924da69a4079 SHA512 5c495c72dfc5d55c63b0af0740b0b82306e047817965a8c095dc6ae89324af842d5f8ccaa218107ff715544051e9c984fd1997ca11786a9c0fd070d72441b7be WHIRLPOOL 8968613e02555355b3581d5a9cfe59dc628d78b2b3ef9cd0e02475c9d9179290c7e6646eac71daee0dd936a5a051fbd66698d65dbbdb0c24d80fe2e8658df9e7
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..e0de82482628
--- /dev/null
+++ b/dev-java/bsh/bsh-2.0_beta6.ebuild
@@ -0,0 +1,67 @@
+# 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="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 ~x86-fbsd ~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/Manifest b/dev-java/btf/Manifest
new file mode 100644
index 000000000000..16d224ce8f5a
--- /dev/null
+++ b/dev-java/btf/Manifest
@@ -0,0 +1,4 @@
+DIST btf-1.2.tar.gz 66887 SHA256 d7b1b8798edb73f5781dc54952d47a9e9df7a1257cb269cbaff8752b6261c104 SHA512 ba70eea4370f090bf0295c9ac9907869a6bff62dc6ff86a443a887413f0c0fbb5c12924df6166b8ecd2348ee6bad409d954a16fe5a4a4695492f47a486e35acd WHIRLPOOL 3c37a16f3708e8856ae60f04b832213571fc47460ff01a7bfd3dddbeef63fb491e68ab406bb14a405c18b701297594c684a59194eb6c81e3b821a7fb6bce53af
+EBUILD btf-1.2.ebuild 729 SHA256 87697297eeb39bf45b0228984675be588ed73eeccaed8855be9c106d9513566e SHA512 38792a5a6bd9d5852c421d4135000586d14456b475fcaafcdeeae5066f2a96d1057d2845cb234c55ab7edcfce2f577e2ad33e7b701d37d9494776e4b3dee8b09 WHIRLPOOL 945250bae6263d450ca13e699e66596df82afe4ccb53fa97b026d0ce7c2820a0c925a14f3eeaa48db477596727d48dddd8c419ff54acc7d18330d6ae3794ab33
+MISC ChangeLog 297 SHA256 47a2a60761c3c02482c5168eff21298e5dd3e5cc209bfe3b9253169d80ad0341 SHA512 b11a0f88b353ad73cacbf6968dfc0407aa1d3f1d585658df6822ac7207729a6756baaf69c1bdd98000789d706a9f541b0b3f95b7f62139deb6e904643189ca3e WHIRLPOOL 319920d3f4de1dc98c7aeb858ed9a7f827c2f057581cd8acb60990b94a029892da4472d65b81a5fea21f138d988e3268352c77b776434563b4e838d8460e5cae
+MISC metadata.xml 441 SHA256 014fd70140a8378ef242275641f7a19a6af3a225f038c6fd46eefae3afab5fbc SHA512 14b2043c940657c57ca40933f9b71b14cd3856a453dfd6fbb7a0683b007107efcb1a544cc303bc758e75eba1ee733eac3fd6b88370e47baa3a5f91ac56383cf9 WHIRLPOOL 582559161d62433eeef4af99e88949eb998e0da26ec6c00f6d1c6588c41da58f92998a29a1bdb089aac2a0d878a1d01be290037f6d5f87a9db39c029a7e692d3
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/Manifest b/dev-java/byaccj/Manifest
new file mode 100644
index 000000000000..cc15d5a33f89
--- /dev/null
+++ b/dev-java/byaccj/Manifest
@@ -0,0 +1,6 @@
+AUX Makefile 2003 SHA256 85d625ae63d5939f5654ca85b4228d2422ee997c46ad8c617b58c93e4294fc50 SHA512 d48f81fcf89ca5f6524572b75dcde4866cea5f434059233c234a664f56e80c0daadc8f314711cb9c55430a947cc9dbf48f4a0bead0433da5b333f5fd73fcbc68 WHIRLPOOL a6c0f56e66308e12aa05afe9412fed95cacf47cddb1dac509a952bd623f2a9c1638c89047de85b5362523e6cbbed7d18ba09c3c9c1f57c7e7ffc28efcc996eba
+DIST byaccj1.15_src.tar.gz 53646 SHA256 4d6ba21fa5bc4ec4b1be9eb6e6efbb367eb6df2577fd0eaff60be9c6614f6609 SHA512 6423ecca70d21dd0c1dd8366361f6c4420536e099090b18738013fbb6e8e0710ee739e51dfd7f603a64f8761f48cdd1d8dc7844d1b5ec6b792535254d290addc WHIRLPOOL 81846717ba6f7b19ddb3a8368f9ef26bc77b17b1862797b2b725e1ef504119a5904cefed314610f20c6161789583aca524c8439f813b95e514c6edda579cb6f9
+EBUILD byaccj-1.15-r1.ebuild 713 SHA256 854132417652e28323967edff3b262535cc5ac61c2b3443ce24c5f26b4a602ee SHA512 10336b2858825506e4693d5d1381a674dc3f43a131be9153f99fe296c5f675d3a0fba7de73036994ea43f1b7ce3aebaccac33b046ee7fd567d0092752210da3b WHIRLPOOL c65e2fb25720ed8e04e879d74938ca35cb006c20cdeecb512427004cc6048167cdc3ad38e58f082298671fb17d9798314c1e496ea4ef5b7e1814a2c644240442
+MISC ChangeLog 2714 SHA256 18a55a387551c31c5e7460b50512c36777ba11357948ac8fe15b563adaee391c SHA512 0c1181d3f31dad1449d8dd881835d7513de7eeb8a1ce7055285eece37f7e4cf2f339183262f011c34fd8e7b2db97c772781d13d7a1141099074d6d54e520831a WHIRLPOOL 557bd3f87c2b38515912b07e477978a556f5da7ff705d5166e47f5493088dd0947ea00b3a0380e5379e70514815b178e398330bc3e0a0312952ade64b59c295b
+MISC ChangeLog-2015 2365 SHA256 9caf1991d5d1f9f5a3aa7fe06aee15f58c4c7d0030c120fe26979c11f1a97b8a SHA512 ff850c07b69d297dbe7d086e3606f4eb57e8859de575e73a2bc1de7d5324056478ebe3727a22008982696d33c8583aaeedc638b813c69144550b8bfc1ed674f7 WHIRLPOOL 2cd27e4712de272a6c4454c15ce9368b60eb9bce3a63b381da2923a3d2ed05328c9ee6cd82e0b556064a55b33360921de54479798568ef4fdbaae28cadc3dbd5
+MISC metadata.xml 312 SHA256 35cba438f6e87216bf8783a984253aec3250b5e7657e92316ce760264a5ad6b6 SHA512 3ce25507ed5012c2f4c4961a9a9b739b04762e0a34bef6db4202240a65e6c1212a459ab35fa1c680dea52928c88f88301e36abc780228fb4b3591a37b3cff749 WHIRLPOOL f98f15cc084ede3c6d976e83687cfa2e5063392f98c550d797c9c6b9fb4bedda8f826615010fbf8ef133a8f2de658a7030e2d25b1c92b5ff5b7c2fc4c6c6fd79
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..03bf293aa05f
--- /dev/null
+++ b/dev-java/byaccj/byaccj-1.15-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 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 ~amd64-fbsd ~x86-fbsd ~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/Manifest b/dev-java/bytelist/Manifest
new file mode 100644
index 000000000000..1a6d081a1ca6
--- /dev/null
+++ b/dev-java/bytelist/Manifest
@@ -0,0 +1,6 @@
+AUX maven-build.xml 8736 SHA256 8e42d031de2f2a808a300b1a298e6c6b9cba97d6a219cceea230d46a7a3fee41 SHA512 1238cb1b7c53c4138f05feaa4bde6bb275d3553039940122d29df7b696945c7b021fe856b28e41c6c0fe4072b0e71280af1ba9b7f07ee8ac9941a049a44a3e86 WHIRLPOOL b348af4cd6ce5aaa97767bed20fa860291719bb4105acc28fc00ad861f175538a93710f337240f9efdd3efa3c54ce336e8854fd15630cf90c8f3e0511863ba44
+DIST bytelist-1.0.10.tar.gz 15619 SHA256 b4e9b598d178c0d54e2d89cc36eb0f663fbd35aa3583dbb1b60f65768ba23cb8 SHA512 fb522a43d5cac8a4804f64caa38fb9ab793a0f0688a69987f3be6f2245a4a2c9739a0d807f88be947c0bd7f908c069a2f8092cc4d5314c3fddb6541d9db70f7c WHIRLPOOL c66c4bd63fd538a02aca3f226a2ce24e87515af995d34ead687f4978bd9423c74d8e9e8a1d0cb77584bb6c9c759bc53ee67f1348875cde7f6185018541575844
+EBUILD bytelist-1.0.10.ebuild 988 SHA256 223d277f23dfd45a9c920cd5573ed5d143d65aaf4f3cd6f97b7cac6475141b6e SHA512 a3c74bbc0603a0fac3c821ae07ca5b75233914e5da67f3a0a4013e2d5a49bd6501e79b03e5325dd2e4214f82e737171668a35cd9525c5ea0811c7c79de9ba59e WHIRLPOOL 293686717ff3bcbc60a7347b8356e71df0ebf2e32ef5f7b7e87956328f586499c2483a5cf148e1b51a46d3cfcba8803573547db368e8f1c1e7e06f095229d942
+MISC ChangeLog 2596 SHA256 01f0bc24cdd211b04723e847a5a786f75984b6ab9a7ba9bf36f969f981312798 SHA512 e33cee09c7fcf25f27c64f3bcde31d4c3f12c890a360e6b54c668fa78eff05b93187d84bd2a4cdf193cb2dade302a81ecdf5dcf1bf247df5f65289b6aeb9aa7e WHIRLPOOL beb0b048cc8fb40033d25e4a784286c1990a206d35e3873f1ac98d977a7cee35d03db33a133f689d848553bdc8f2cd0778426cf24fabe47d1e1c66fef0903095
+MISC ChangeLog-2015 2915 SHA256 63339dddcfb6213e605f0414e7549065f532bfaa6195efa271c4c4bc3d443115 SHA512 dfd9fe3bd7fbbfcaef30af08c4276923855c9ad29622f269942cc2b789107fbf2dc4ab972910eda3cf336c8dc9a63ffa6902ff30e5166c52ec12d29ec0472341 WHIRLPOOL e4dcda91cc69d18a62cd7f7b463dca0999bc93645195b747e39995b13e9beb13a9c5b14b1d0d0dfff623eda2afcfd15f2f3f7318ea96ffccc7c9b1a6775bf4e5
+MISC metadata.xml 303 SHA256 c9f26617089b10a555252ead9c97087063690663cd16c854730131dae88824fb SHA512 94ee8b7bd5d0b719b1f2afd8b3f61812bb73cd764b482bcaa73a3d60ee8080b44486697fd58dc601f23502893a0995e1a46dfb262e7c9793531765eceeb1051f WHIRLPOOL 6c8fd5255bf124703a4676a943296046a01d75c1ce424801d215eae3e6f765aab76bc708d45da136d87240b5591672870dc5033fadeec9df8cb62f90227b6eb6
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/Manifest b/dev-java/c3p0/Manifest
new file mode 100644
index 000000000000..7cafa06c2250
--- /dev/null
+++ b/dev-java/c3p0/Manifest
@@ -0,0 +1,5 @@
+DIST c3p0-0.9.5.1.src.tgz 839657 SHA256 35383e69cad101168575453c5ae5297a7e0fb2ab2cc885373f8d5b7c46254afd SHA512 1843696d48e68f6120a68c42f0eb60c342ed8d1ddcc1d78c500d85c3d7e5e48358d100ecb1e0efa192aba34c5d9221437d53c2a968a42b797ff84bc12db4a724 WHIRLPOOL 04621c0583c918099da5e59a8e2bbbc31ec4e07e73cb9b4377d1ae128606ca3f281cf38e89efa753d2c4367bb8b48d2669b2f405df9680df9616657edcc2219f
+EBUILD c3p0-0.9.5.1.ebuild 1152 SHA256 f1101e4f8d470f849c12f54a3abf8346a905e3fe6676960867aeee262bf599e8 SHA512 749db00f3a6a3bf365f9a8d09ef453a6b972dc18dbe2b7710b313c4bc6c9d56fac95268f6bca40799efcee01693946a691f2d9165bc2d7df07ac7b133877d896 WHIRLPOOL b3d787c1738b73787422dd678880d89297dce09246c4772ceaaeeef12b20249c309a8b53231d5ea854ccf732e770996433da533faac2a029d71f2afa86c6d7fb
+MISC ChangeLog 3417 SHA256 e41b318cfc67725858d58d17900a6bf64306d92db78c79fceb126097a7c4b1e8 SHA512 7a3032761e1f9c1f57b458b990892380b40a88eff766951b695fbd04cd36f8f626fd30edfc8f4417ba89bc43f0dc56e5d900561f297fb3e1afeed40816af0b3b WHIRLPOOL 467d6a5ee4090bdb94f1afff503ca5f699559690306f73aadcd1c8635942711b071f03f83fd7ce46b922cd4e475788b4d496029630135e244ca2da0f28c26cc4
+MISC ChangeLog-2015 3784 SHA256 876c5266ac5250e29e9b20ff0fa41b6061f454dc594dbe0d46935b134d5ad9e1 SHA512 235e223f93e1bba6d4bec376d378cb23e9ce6f02bc3927e62c549cae9258391f5785b1eb0c935127d37ab28cb9741aa34b31b92cee595d91ab8060eed652ea37 WHIRLPOOL d8f40d48dec3efed79ff28b8fc87f851286687fc0acb9462517f4e075ea31c09538072b5e5d568e6fc2fe632efda5674b4042875791217bd7f06eac100f71fb4
+MISC metadata.xml 310 SHA256 a1d2ce8f654a0d8a1891d262954fd9bb31972fd95b6dc4b634a2698251b0e26e SHA512 5b2e9c58158f6f2c1d912ff5f9dc6b25906b32aad32608927d03f61fd90b935d7988bf54fe32d5c86dd5410ada1f5de8abd9ac0d15e277aa7345149edc83283b WHIRLPOOL 61ddb9294452e771ff840c5b7322cdc3eadff116ceb8b1a6318c43e541e339a5d10ea25ecb429324199e200f7d4aca03e85e16083086c78640bd0c3c145a76fb
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/Manifest b/dev-java/cal10n/Manifest
new file mode 100644
index 000000000000..0f055de95067
--- /dev/null
+++ b/dev-java/cal10n/Manifest
@@ -0,0 +1,5 @@
+DIST cal10n-api-0.8.1-sources.jar 35685 SHA256 d0343194580289dc879d4cae27dad115a5bb120ad2b8128136727ac7b6804682 SHA512 b6bb8ee7744fb878da1968a6524fa2b95d55c55e0f5e7413e7afd854eae226050cd4209e7489ce4f1fae6f2adb501781048f75ddcb2ad8c6b69595ff053422a7 WHIRLPOOL 68976a4a5c85560cd604a8b1888d8dca4c34a1ab5ddd632b91fda577c65d5bec53a0e292c6a5c2db4d043b17fc29116b218baf9a7a7348019b117bcf0b20044f
+EBUILD cal10n-0.8.1.ebuild 629 SHA256 4253c760e26d4fd12cab38497e23dc6d438546f4b1a55c39b7f9d8bd3e688c89 SHA512 4f3d130b0e5d45d7556508219f32f285a1b0f18b1f2f2faa638f37ba9f16b86786caa57a330863de164fa86c4932b75b0c9d903837e8160ff88ef8a4660427a8 WHIRLPOOL 56d9e951e5585bbf528334d06e36921a3b16c7f816e1e805f05fe379e9c53ac8bf3f3b99dd34ba83afa31f982f9c4cac87dae558f3465678223653db82c7b70b
+MISC ChangeLog 3507 SHA256 c2943447eb9ee0b2cd71abe2170cf7d417abcf4ceb1d08784f267b20b05ed540 SHA512 429d488279537aad2774251d941b00db819c9857b65d8e1b42853ddda06de10b8ca9e1df19e9139aacfc06e93b83dd06407e3a1fd5aab9efbce5e9a0c4e1a4b7 WHIRLPOOL 38b578dd24d80c36a7ece9075433545b995b613c479d641d1a4ba5bc60f5f16144a9f74eec5fb275750db1eac40858f274999b6dea48277396742f4cda293c43
+MISC ChangeLog-2015 603 SHA256 4600950300d7a4c01408022b28320cb2da3f7301b5cee513255235d072d79446 SHA512 b332df8b8f508e71f532408dda6353093096d12b117e5b3490008f5973f80226503ec5ae542ade2c323b00ee0ddb58ebc670e10bea7dce47202a4ae356b85afa WHIRLPOOL 64e7c6a315871664499c664e55c43956e0a58b48f8b215f73226c42c412003918ff1c8529a472caa272ee209286edc9ab1d945a0ca60c9cc5109c55d38d17d5e
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/cdegroot-db/Manifest
new file mode 100644
index 000000000000..51807ee4b4aa
--- /dev/null
+++ b/dev-java/cdegroot-db/Manifest
@@ -0,0 +1,8 @@
+AUX build.xml 1612 SHA256 23981c23a887e5032cc882131155725721dd3522b786cc0553ea6a4ffc2d284c SHA512 b7d08ecfbecd1615d9a73ba1ab95b10d07ebddda0d4d273dadba770b662957006d84f8057d86f59dd1506cab0fa9f0fc79df7577b7ba1620fbf0d2d6d446de32 WHIRLPOOL b5296dd21b2b6d82ab229ef2d286b551d3955ca13bae52f1f3d3a199b6f7b259aee2b287029bc8d9248dc591ebce7ecebe9d8c31eee71acdcc6599a6714e0db2
+AUX cdegroot-db-0.08-gentoo.patch 7914 SHA256 0ff3a0dabf0939735961dd53a3105513dcd5d6ff85a302a343e0f8b86d8c6d9d SHA512 f24f13acb265f75408e6cae2a432cbcebbcad912f77ce2883159dc93743ad85c636e5656f21478914712fe393c84a6fe11600c9394b81ce128403c8f59e521cf WHIRLPOOL a8d4cf8982b191c5c57b08a97f01f65b969e75da5e0c950681a434a76537e4d21b169babd1dd90888c528685311d09931d5cc55d6501e22badc7de9c66923178
+DIST com.cdegroot.db-0.08.tar.gz 154705 SHA256 9866cbd5b6bd67e12fbdf5b6dd3a911b657e211f776e3dd4b65e5c1343f63110 SHA512 c8a6a6a46add440499dce42f27876cadfb9d247f4e7f8852e94cc20ca9afacb400f91f884760bf3659bad46979ddd5a65f6dda4bd5416da14d89a93ff5b447d1 WHIRLPOOL a25a29f891d4bc9f4bdc8c1aabf6856396c67cf7373d07b4e25c4a801e62f460db30490be5cb8f6c0deec85c4216432afdf95f44baf9fc6d997da567ec7d27ad
+EBUILD cdegroot-db-0.08-r1.ebuild 864 SHA256 d4873431f3aee675df4ea8e6b276691ca21f239a3eedc782d93e0ef17a6d889f SHA512 685922ae9b839edc402286835e2e0c2fe91662106f532435986667040db3fa1a42e687c2da9620f19bf375f10c3893b59ba48a4d05a043aba4de6108a0256949 WHIRLPOOL 2dadf641da73b8e6e090fa45d7d8ed82bcbbe7ddf3b1ba629507dcdbda87622557f3c30af814bb797a5b8938679c77747cb227861112eebb9f9c98ce94d4026a
+EBUILD cdegroot-db-0.08-r2.ebuild 856 SHA256 9148af9542e8f2d6a8a329bd0b97cb7321cd82e391bb758c0bc76fe9cb9fb505 SHA512 fb052a28fc963e9bb2ed18aefa0ece7076054dce7923e0fb780becb314a3317649e066fb20360777ac05ffb2504e6b39c4aa2ffe408591ec7ea7bfe4ea9377e1 WHIRLPOOL 41fb7f738fe7ad43f46153ef5ba6bbe58940e1b8f22e7ce5e6984b1fd026523386b47b84b93ac3bcf7aa202b8f1dc96cc5114603002ad0b003528a5caa38e72a
+MISC ChangeLog 2645 SHA256 a3d0bb7f04aba693ac5386c9b5c70ff242dee69f50c53450a012c19244e359d2 SHA512 7adc82d3b3e04c2c9c8517513ea18abe6d8a3094a0c97ce0d607f596872f965e28c7d8e471d235f490752101dd5be44b081b54a1d34fd1cc7aee7c3b87ff55d4 WHIRLPOOL cf45f9cee1f4421eb10341d138e4da8cf896dc15b86390b1f7e4d678845cbebf5515afda0038be30fff75ad6e6a24d3eb755ca0526b8594d36ae4edef4c27d96
+MISC ChangeLog-2015 1658 SHA256 01be41a34ca4b142cc3f3af7b396c9905a4cdb1741b77aaad8d6f5ad22c407ed SHA512 14198df883e1724bae0f26400cc5e4a792ee09a80522f0f1619d4c1863ba18fa2ce53c360e0a75a5e7516e8e195a868118b3c1f11b04a229de4d7a8b46ea4fe3 WHIRLPOOL 23719fcd1ee1bc89a39f97717666751472bdf804c78706e9e0ee9ac095b548b9acc26c0cd5ae5534d6ba01bf3f0906f631ba16de507891b84e56881e1769a511
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
diff --git a/dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild b/dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild
new file mode 100644
index 000000000000..6be999d8cd5f
--- /dev/null
+++ b/dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/-/.}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -rv src/db/test || die
+	rm -v lib/*.jar || die
+
+	cp "${FILESDIR}/build.xml" "${S}/build.xml"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+EANT_DOC_TARGET="docs"
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	dodoc TODO VERSION CHANGES BUGS README || die
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/*
+}
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..4df2e8c05870
--- /dev/null
+++ b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
@@ -0,0 +1,38 @@
+# 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
+
+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/Manifest b/dev-java/cdi-api/Manifest
new file mode 100644
index 000000000000..beb7c2fd3dca
--- /dev/null
+++ b/dev-java/cdi-api/Manifest
@@ -0,0 +1,7 @@
+DIST cdi-api-1.2-sources.jar 139331 SHA256 110dd88693b1745812a3f1c05f78d91aae1efa3cece5a08a5befd9dada51ed8c SHA512 b24a16cc208cd865f561ecdc7590ddcdb08c2e83f8fea75eefa0e52598461cc98c804dfeeacb360278ddfbf5508e72f381b1379e19efe91f3c89b0e255b3cb9a WHIRLPOOL abbf8754528ad7ffe505ae6f25d4920843c2d9bd4c03f7f4424aef35863d8780e6acd7c38e0dc65bad633b8e3f2ec289ba22e417381c1cef90a578a72dd07ef9
+DIST cdi-api-1.2.jar 139331 SHA256 110dd88693b1745812a3f1c05f78d91aae1efa3cece5a08a5befd9dada51ed8c SHA512 b24a16cc208cd865f561ecdc7590ddcdb08c2e83f8fea75eefa0e52598461cc98c804dfeeacb360278ddfbf5508e72f381b1379e19efe91f3c89b0e255b3cb9a WHIRLPOOL abbf8754528ad7ffe505ae6f25d4920843c2d9bd4c03f7f4424aef35863d8780e6acd7c38e0dc65bad633b8e3f2ec289ba22e417381c1cef90a578a72dd07ef9
+EBUILD cdi-api-1.2-r1.ebuild 862 SHA256 63af3fe8ce2bfe811942e4f30503806bd5ce77a867676f70cbd174b706e71cb0 SHA512 a4223293c3954f729c185e0cae6ef14509ed238581be7d03427180b9d8704a4994f6d8791dbcc80deb5682e8aeacd377c960a6c3ddaa531ce5e44d0fc3f42a97 WHIRLPOOL 7ec4a8d13dfa2520b033646b2d7fc383879d4be2b28233f42a149c2783f34198281a526fb46737d9c2b93d2f54f4b7aa1c308b6e40fdb10ce568583260262199
+EBUILD cdi-api-1.2.ebuild 802 SHA256 b1e79045af48adb14e9423b516b0d599dd00bdd9d5a25f2a92f992d5cd1995b7 SHA512 ea815946719e272503410f07ae71621785e95982eabce700d4ee0812122ef57b7983fdf1537cad851a8c6050360ff39c352253c4203438642f3235600c3f092a WHIRLPOOL 73c75006653d7d7735c9c37ae246a116e5f44f05cf86f1ed6fa5cb6780d189d34e8fb74476778cf99aaef0086161d9de0db098b22f9563955d8bad2375a1f1fe
+MISC ChangeLog 2986 SHA256 d8d3b6e907e24b5a24d0ff98d751efe9658748ee11718c86827367c04153fd2e SHA512 eba54d3df9581391f38b123b803d7115d3e8953d58afe97e3535b151de31bde4166b3eda73b66a08e01c1b22a8c0eafc0eef1dbbff233c7c19968c06aa8e942d WHIRLPOOL 5d88cc05d8169437d3fbdb9fe403654fd9b8740b7fc0fb031fea75b2f23d3ff4d4fcc649666597feab5b4676c9e432d2013ec836f96131889e7cee4bb4563a56
+MISC ChangeLog-2015 643 SHA256 301a022080c50abf136ee2ec16f59f7360ecb19c6814f7050b2dc9937d1efa5e SHA512 8f3785e97f2c5294651e5b4073971d2abf3c4ed108238e212df59c88ae85ee396692989a543e78270a09dbdc0391103c054f0b9309c332c134c9282b94648ccb WHIRLPOOL 16a6b19a4a6663caf1a336590773c0da9a6e637488ccb1494ba359f7f028d4e4e21ffecc62f8e383535c3002d6f19837b12e213e7b913b4c7adae636246a1b33
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/cglib/Manifest
new file mode 100644
index 000000000000..96e271818a0e
--- /dev/null
+++ b/dev-java/cglib/Manifest
@@ -0,0 +1,6 @@
+AUX cglib-3.1-build.xml.patch 1864 SHA256 32038e3fc9250631ba5cab909a442470b847ea3f9e4c096434066e95ce33e147 SHA512 609cf02dd64fe57307ad9571f8b7d4bc3c7f9b452ce755fa968870fc252df08c985b5dc12647f8c543e39d57a01b532a4188d5ffc07359ddfc7967d32dfd978b WHIRLPOOL bc5118e74512cc104e11fe06f52a356cc6f1660c75f9e51a91b301dad2a935d30df20da54b4f2aff65767716d6a26e9ac0c2d687c392cd4de2801899cbd7aee6
+DIST cglib-src-3.1.jar 1541525 SHA256 386f9a55ae8fed3cf8014f2c20344ce9ce05cd2e4fa467e5e4d8027abb3d62eb SHA512 3b246b37f1c90acaefd4ba64f1f1db0b4d1fa64025f0e4e216ae7955e05701671bf8dc01d19c754286966cc5f8c06d78d02cb4f4500542f4448656768109c13f WHIRLPOOL e3a865296790e1de31889e7624797418392466f7756567382fa9c0b1108d386ee848be2e6b4e96db206101cde8d0320293e58d0b83e0a5a7633afc46b3a37e22
+EBUILD cglib-3.1.ebuild 1127 SHA256 f40303d0aa38aeb981952d33bf98c42cf57fa2f5cc63988fef666aaa2d1f93ef SHA512 59d439cc175332afe47931b43cf10c65e5fa46ccf81a6fad57059bb0dbad6e9f22f2ab4d51f8bf068449c0be7f180a1dbffb84aba69bf4a84f4e76cbdb2b1cfd WHIRLPOOL 6d2c952119e775c5c9606f041d1c80e534a27ddb2b73e799b4aa5f4cee0a17c3e7b7722bfa2837ffa83f7bb65d8ca2d1dc49ec97fc5bd5ccc5670fd263869de7
+MISC ChangeLog 3500 SHA256 3865daea339273ef6afe8a32e8bb8877eb1a7782ee47e47c2a165c6978f43131 SHA512 905e2154abf5e468e33b0337754e98c745caf2777527f23aa9af3acec4176124a6804e0b950bda7b081ce1cc0a571e6d9d0c8d5f96453a6f4cd7a1ff1afcb241 WHIRLPOOL de33b7b22e55f7892788042298e767f96cbbb7342583ca8a67316a42453877dc53f6f699d83e56d0353d1a1dc83c70607e1b95c9f9353480d6ff0eade0d8f533
+MISC ChangeLog-2015 9389 SHA256 c967df33b8edfcd1535890aba7b7e8c3396d9c94791758af2010f6f37dbaf547 SHA512 618576d597bfc16a45d1b6b12beabb28e468551e679aa2fe6fff888b10436e789f3f34bddc7cf1bff8b33f198aae6e9a092bf1ec40de8e284f675cefc2b17e58 WHIRLPOOL 0d020bef7b87e18153e4f1df919cf788d9f0ed8fb29c6fca3529e7d89ab3d83235a7783c1725a0e6efebf1a5e29ec518681f694d4f74e06af9f0afbda8dc444f
+MISC metadata.xml 554 SHA256 d9c9dbc3e33e617931729ef2605c1433285750a6c97c06078f296578813a9d63 SHA512 480a6d306dd997a40cc695c42a4d51d12cd1ba131b5b3d80b4ca18ec751ba3dcf2394cb139c4c1a06ad98da30127c65c65eab036aaca167f46a6b63336f2c7ec WHIRLPOOL 406df8b2368cafcc674dcd91c8ba9aa5340a7afab8ca5d43de00dd98aa4cacdf672b6fe4c417f889817d254885f27529b9cff84b2b6b14e69f06172bdef0def8
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/Manifest b/dev-java/classmate/Manifest
new file mode 100644
index 000000000000..147ac97469a3
--- /dev/null
+++ b/dev-java/classmate/Manifest
@@ -0,0 +1,7 @@
+DIST classmate-0.9.0.tar.gz 57752 SHA256 6667a959b282b037aaed328fca3131a89c7649a347a72e1d2d4dd40bc8b393f2 SHA512 7fb331c462458c8aab143f23c0d128a0e4e976f9d12bd181eb5658961b217bd1fe0871d056fc38bff794522c8b3118a2a017eab265afffc1d60b5580df1237a2 WHIRLPOOL ecfa56a57d07c1486f92c1a635d5b294b9664994504649a5234daff34935c0f42dc590f55ee1fa3a780399a923728a30e083a809871777e68e78deaf3f6dd45c
+DIST classmate-1.0.0.tar.gz 57807 SHA256 eae6fe3a0736d7773856363f2cd176c44cf9bb679974f8fe3add214c16c2f1d3 SHA512 cf721c813674e295fa6c1fe897493d14926d025cab51896ea0cec69ae285a540123060c39e3515daeffa48d6975d060861bf3ca5340bb9273980fee6d92d73b5 WHIRLPOOL ed590fff997700c80c1f4735b809a01599f58112de25248fc626be295e097ac9e1930ce26c140226d3e867733cec58fa7cc7d826e9a57eea351c7dde126902f9
+EBUILD classmate-0.9.0-r1.ebuild 1153 SHA256 724297024e4e658b736a3ee81004340d8abf378f543d82d23637119ae47f404e SHA512 3f65f469845ed7e6d86e6f5e0473cac8d0a6c606270a0c256a01f78a5896267c975bf4b9dfbb4f36e25092c20e2baa1fc808ceb1ac18227aba3bee18ba24cfe4 WHIRLPOOL f721ec75de09e259744f960d764fa340be6dcd3b12904206deac1164da33375bc396e3e59615a07528257df89e58cdc3b014cd969d81ce5c367959194f207360
+EBUILD classmate-1.0.0.ebuild 1161 SHA256 2c52c4979464837dd912355ad933f91aa31f16e22de4163732b1769bb7a12fa2 SHA512 d38fc03c084a8b941c8d6b6b2a8a5d07b2f092b416afc93b392c73c85eae14dd48485b223d61a14ac359c3526daf71bfe512d1080624b3d32f0562160a6a1ae3 WHIRLPOOL 4a668b53cbd133e9adbd6b9ee0545f5c77a955b66298077e181238fd4779e11b0ac8b79ae770def58c8ae7adc47fe001481d1c5e3611cd7d556d024a97a612c4
+MISC ChangeLog 3607 SHA256 e467625d8673314a876f781f65190cea77ef5a9096d00d4882a7b72377aef2d3 SHA512 b6483385257db6c6ec419f07d45b55ba29581ecf14c279128ba7593b5f822254ffde8c07541425a3c059fa1baeef34ddfa75a9254c6a549f5275c151e24f11cb WHIRLPOOL 21569a97d59fcc771c06687e16e3f5ca6febde6441c63feebe40539f3930ddfb858a8738b8afa96652508303949e2ff3bab70afb85746ecd66267cc332dc0ffa
+MISC ChangeLog-2015 389 SHA256 0aefc8bcfbec00d16b5da703d15f8cf4fe6931e6bf63030ad0b7f7fcefcfecb7 SHA512 d5054fb75a5cb0d06ee943cb22445c685b1569e95d3969104ddd499ffdf09013e943e0d55384c7d68bd5dc6c95890625c1401379219011bb7dfab1eec97602de WHIRLPOOL 39a1063e8f17dede8116d6565698d36f630bef5ffa810988096bb553e6b30feb3b488d4227cc8e76fd5f938f925e9a8e4cb3883b24aaba3aa1d653089a3f93d8
+MISC metadata.xml 328 SHA256 d49962f50d454867829b3b28c824b0ad6b6dcb2a84b054a534523a1c9c5abae1 SHA512 ed87fc70d548ed88634183da0afb2548e74bbf5f7435edfa25e71392438df87cc1e18aa90264519009f445810ccd750626460dccb66e0f68ac844c44ba8d9430 WHIRLPOOL c6d41c6cb6cf19edaa577b019e573636058b6fd43e4b238e0d12176d3b673dbab13e00af825cd0b3ed3a1a129bf3026f829a78e96d2903a3476dbda491e0ad02
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/Manifest b/dev-java/cldc-api/Manifest
new file mode 100644
index 000000000000..d199f7a30793
--- /dev/null
+++ b/dev-java/cldc-api/Manifest
@@ -0,0 +1,5 @@
+DIST cldc-api-1.1.tar.bz2 142368 SHA256 5e764d515d1f2b25cd14dd6928e60a54b1693f74c11b23650a586110ff63f51b SHA512 b2baae07c037692b2e9ef418728817b60c39fcef7bbb2ccdfacb5551aef2022d342458434042154cc4b4f82895a427fab2f277b6269fa651ec3bcdb23a771e7e WHIRLPOOL c351a5611f2b58328e73896f47c25e4870ff9864112cbd2af7d11a06188651d9358b84367a65aa85dd261b75b74172e8222747cc63f125c627e6d9d9b0204dd1
+EBUILD cldc-api-1.1-r1.ebuild 883 SHA256 28b2122a53b5de08d2ec1575ced70b9f496e7bdddcef146ecb13c28e232b56e0 SHA512 530df8267ba39c9c6a6fdeac2333dbf5239fe6a55caee592e732c257e5c3988160c2637219dd35c1ceecf375217ed7fde5567cdc38f6cebb9f0529a552baa5a2 WHIRLPOOL 17637412235d896492111fbbf9226956b20a9be133bedcd91eb11928bd2c4bd9006dc623133dbfdc16cdb71a8f8ceb612d25907bcb9751f48b84ba2202e05f35
+MISC ChangeLog 2572 SHA256 91fa3de6acaf5e64bd42d11b909c30f1339c7f4e11cdbbb3d61a597e84f9d431 SHA512 6e17c66ad7363f9fd28a25ca2cf90d4afc48eb68124a2c8d5ced472ae67776b731a2147d08eaa44026454a9595afec2dd7e1549b4a384a17fc797dded9b89b8f WHIRLPOOL 8ddaa7771ae25e74e5eef82ffb24c6281768746a97a6303422719669fd5b9ba3fff69984eb8266111b987ae95be5e71e8a5b3526eee0b4f15914f4bf9b71dbca
+MISC ChangeLog-2015 1606 SHA256 81f2d045ed6f7ebd205c3cb959518e7bbd0cfd882fbea0b009de169d212632ad SHA512 5d670ee05f5833695f8e1d39d6eb195c688447d569f8593b0d751b5b28f6b59a9c88328fe42c332beb54ca70e31d7cb41cb6a3633231466b44a2c3c8b293105f WHIRLPOOL 00c969d7fe0d367edd4d455766d6e48e4dfac1997748f6d9ad2ea2ec8f07ba5f2fcd81f255511851c8b3dfd9ecad6fbe8f989282fb220de213a5272ab3350f4a
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/codemodel/Manifest
new file mode 100644
index 000000000000..aa6b817a3768
--- /dev/null
+++ b/dev-java/codemodel/Manifest
@@ -0,0 +1,5 @@
+DIST codemodel-2.6-sources.jar 178745 SHA256 c6ce048e40c8581e193957347d8b56aa1fd4a4e8537e240beed26fd31cad6c4b SHA512 f314fcd242d61bf0236b0520e8316df12cc5c068029d3a3a889db5d67ad1f0da37f3a1c09cc73d4709b7735b70f0ce8737365cb01441b3dedc6614f733e932c7 WHIRLPOOL 7d0ba479b245ca353adfa32fb145a642c77836841a823e836dc620a14205ff04c0f188c6f0bcc650fe6b8da9e578ab51824f6b18d68617e4af149649c71ea986
+EBUILD codemodel-2.6.ebuild 484 SHA256 745c4b71eec1a2e5dce6457a36d8ee0430e504785e1e2055543542c0ba335393 SHA512 afcc3d639288841ec6ea28d2a76082a89b6a34c361bf305f49e2c334238ad807482ae88e62526119cfa22ac2f44817f9291ffcab2686de0f7f2940ea7445d75e WHIRLPOOL 7a6913505e08fc28da720acaaa1254a1c5bb647573b1af532bd0da7c6e421860d223b7435201edd01207c4890033944c4563bbbae51e8b9d500012213951ac20
+MISC ChangeLog 2567 SHA256 d57427d7757640143aa0048f7d22ece88727c5e49cecdaf309b9afb5e3454a76 SHA512 7a1de3bc1388460efdb4d7b68dd03054b0268c6cadca4870308ea3be453963532fea44e4557f8f08df36ee550f5910d8973c3131b5241009236f03a39fad1917 WHIRLPOOL 54fcd87f6e0733d395d7d1def38af0b60b281f24ebcf9ba7743731e7fea82edcc00b141527c8017081dde8bce3f3b1253c774f1ded701f693fbe1d4e7e08bff1
+MISC ChangeLog-2015 1659 SHA256 04fa8054c25d36349b8390f6e66521115e18f3ea191f74d76fcb119e9a10ce55 SHA512 426462f0597ff38f91e0e433e4e976f795d66616064848cd12bba231ca92f5214b729976ccba51eafcb013dd0f904db274ed5da51e71920db7884a21944d889e WHIRLPOOL 7f21045ea8b09e3f370cebaba132faa013aa2e34781309a38ef429b12892f18fbe08c5e489c81b7bdaeaaf911daf08f826a47b7ed2f92c43b515e255d65a2902
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
diff --git a/dev-java/codemodel/codemodel-2.6.ebuild b/dev-java/codemodel/codemodel-2.6.ebuild
new file mode 100644
index 000000000000..87e008a138f6
--- /dev/null
+++ b/dev-java/codemodel/codemodel-2.6.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="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 ~x86-fbsd"
+
+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/Manifest b/dev-java/cofoja/Manifest
new file mode 100644
index 000000000000..c17620307e12
--- /dev/null
+++ b/dev-java/cofoja/Manifest
@@ -0,0 +1,5 @@
+DIST cofoja-1.2.zip 229127 SHA256 57732add36b60b6cc194b80bb878fd7616ed5cf2a3c9f1aab814f687b3564f33 SHA512 d6d73d32adaceaeb4c34600c0761f272d4917d276eb654a3e43ad368bc77eae26e9d5b90cb93f7ae073b6dad81eece129337e3c2d52daf7bb3dbc0577dcc2e7e WHIRLPOOL a3781e7e07e22b56c78ebc54754f9beae85cc0fa4d6e3396e48b716ca457c36cf7f2f51347dd661cf14cfb10880dd9aced248413e4d2b90d1e8822e985d6dbe7
+EBUILD cofoja-1.2.ebuild 807 SHA256 065d0daa7529b42ebcd6993b77ec659ccdc0800f8fd074878761cd6a1ea2572f SHA512 62642aa7711c2a6745b2f31343a57d888d2c36245b0d27488d2a641982744c87c5009f38777d65d75d75687ca46656685ae47508d1e080b7008bd900164f6a1b WHIRLPOOL 23dc01aa578e4fa36617ed1aebaf0ec38186e6074dba04d3b5618bbcf353810c6a70b7998408c4006546166a22cb2496cbc6f65b755aa1068400e556e501c2dd
+MISC ChangeLog 4034 SHA256 ec330f3b0903f11d0c1c9e14de143c0b3011f9f8fdb0f35213c2f63a8036568f SHA512 ab241ea3ca8b49303dbcb2e5ecfd1c3ed4fa9626efeec8aac7b24e46ede433a36566e80167c48d00d36c19915dcfea1f7234ef77d12ae51271470366d2f79a21 WHIRLPOOL 94c0c5727038641eccef5e8ccc29a4506971e4e977e97992cdcac501c9a8781c1f2ed223c60e34ace23a31f57a2cb94276f0cf31146bcbee2c9dabc8f28305b1
+MISC ChangeLog-2015 425 SHA256 a60c0f6421376924887ac2608edf1839be1d0f0da5b7c899bb4e7d714fb9c527 SHA512 a4fdd6f21fc3cd7d20d10d282cc9c89e7788ea83ac28fd225d9531a67f7c4bcb32648e12836858181e661787c0e0142b4015449e02be51cbe864f21b6981c30a WHIRLPOOL c99d2505afda95cc4a58f53e98ed4f05143ac44eba73ec9b222daff00b08b7ef07e6a7954ffdab5b3f1f29e4f7ea100d68f82beb84a9bdeb98a884d48fa42999
+MISC metadata.xml 480 SHA256 636d7bf88ccf624374b56a26510e66d60700f8aeee08a3725ffdfa927c4f1a7a SHA512 c7b6400370e8342c585663d9778ed6b5d491b2c764a963081a611142f8bb5a0a20bd497f5d19ab213d7583637efc04808f41c8be3ec62cca58466018cf588890 WHIRLPOOL 99ff61e984fc132760d94522a704343a198d94c2aec33554c38e09797aa7f1198c1f973356cd812c6f60b716f9b207618033aa67f86f44c4096e5c5f46a271bd
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/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/Manifest b/dev-java/colt/Manifest
new file mode 100644
index 000000000000..4f234ceb8a90
--- /dev/null
+++ b/dev-java/colt/Manifest
@@ -0,0 +1,7 @@
+AUX colt-1.2.0-benchmark-no-deprecation.patch 1180 SHA256 822fafff87add40e1d8f29636505713994f23fb30ec20962c3f70ca87b487254 SHA512 523a887bc104062a22ecb4e4350c1c8a4a0be642490b98770943b20e6e8e747d95657d10d042198516b2fd830feb0987ff3473b8ab83278ad3db57d29e9239c7 WHIRLPOOL 4f89d19479c67d85449d052b6cb67edeb6a63f4568ade4685cb1ae3a38810c1c34c4bc08e56f9a346ebeff92576db449061daf16801476aa3d965fb4c87d6e12
+AUX colt-1.2.0-remove-concurrent-util-imports.patch 6924 SHA256 1fb42935dfcbde3383ee73076f86d70a9e639de7e01dca5bf0f83afe8323b23e SHA512 86b568d66b342ede74dc3207268675c8f91b6b3dcc622486d649ba6a0a283de8b20a46f4ac16da8d90d89b4af603b1c8378b990866123e8e4b8b4e3733be4a36 WHIRLPOOL 14c39f22d2199835889c0c4607f9a089b10db01870f7c93c44551c62045eeb08ba6b51f3d59f97867e69ceea642fbc781b3f05e298f6003dc04d8d08ceab7dae
+DIST colt-1.2.0.tar.gz 2545695 SHA256 da26942314a4ab7ab6dc449460970b4ada464b6594f69cba1b88268effbdddbb SHA512 a5e88e0cf671faeb336241d120daeb1ad90f1e2061827d06c0c2dc507cd3ae2ab45f2b80451aaedca0f5a8b3de66c13533178e3b6352ed8b2df886d25a924ce0 WHIRLPOOL 666b49fe22cd40ca3967523a85d1e6b43a7bbbec9f76b197f633e258e2d148b0743308e09f65fc8aad113020477002512f4224d7b412447f0685f2c44f410aad
+EBUILD colt-1.2.0-r3.ebuild 1065 SHA256 896602c12bdc08685b0a2efd397d99008d63d0163120cdd16b0967e3e601ef1e SHA512 aaf5bf0dbb8193ba0b435218d2d23d8cedecfe5812ae65a374525730a2ec36436cd9511bab80e2d77920768231f68bad19cf0159efafb6d72601989c78af016c WHIRLPOOL 67837aafbf7ce9f86109c5e525fbda233468f00e3067adf93f46106c2ddb1d87bb8d3fd606cf32bda0b56c1530168d38d63d78e211dcc1c502103d151e340b00
+MISC ChangeLog 4620 SHA256 7d7ade8cf1e74740490097deb560f9a42780acf535ae6b6b77d6de1fe4a67994 SHA512 5eb045b284e27b786a287b4b782d7aa9c2bc7db1b3653702498928e62cafda0486554f4d62affd38ce5dbc2818bf62a69e1e8a628483d78dae917dd25115c939 WHIRLPOOL 82fde6d64adff29c0ef4adfc358c230d1a59f8b05879d6c95cdcdc78fe8b256be59adf6be9381b12b8b025869e2ef43300a394b74d9a3e1dedb4c87323746cb7
+MISC ChangeLog-2015 3178 SHA256 ebc1b2b5833d46f7202cf01fe3f095b431fd1a9c47334ab74cefbea1d787e079 SHA512 00cb6a54426a5f3b914d1ceb5293fee056066ab32f519a5cd9848c1944336d8d18492c582b7564ad3803fdf5e735a2b3220ef5d887fc80f8fb1533188dd83359 WHIRLPOOL 9f251852f087faf315820c550c01c1a8605ccf7a1d610a5e085ef8e22b1b386812590b6c8081b8e777488f07bdee28e621607cb59203091a06e59c72c151bbe5
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/commons-beanutils/Manifest
new file mode 100644
index 000000000000..5161e252dc87
--- /dev/null
+++ b/dev-java/commons-beanutils/Manifest
@@ -0,0 +1,5 @@
+DIST commons-beanutils-1.9.2-src.tar.gz 396910 SHA256 91fccad3b65f278bad98df1aa8467f2d3df6095f41b2db39d2c12863fb2c0049 SHA512 cf43aace33eb91368f86445874b16d977e827451f1355bb00e9b33bf0707855b5d757b0d58ad617f3a7f86f9065e7c900907dd604ba4de5ae61473d40cb758a9 WHIRLPOOL e8d1628e09386a008415e493553438715092c76cd0237b6067659b80e4137959a0b585409d3273ceaeb6a5b72c1367b6a78a1b55f0856395388a615a0d1ac152
+EBUILD commons-beanutils-1.9.2.ebuild 1907 SHA256 781146b08d4f697a26fe7106406937b16372e79c1ea55ec093a9e33cad9c24a0 SHA512 b48876af2189f7271b900305a388a9f833bd78c77ec63dff39b6cefd34efd969ce123c964042edaf3baae0364ad7a42c6369dec229c357eb5a2fc998d6aaa785 WHIRLPOOL fa1603e144da6cf86aa77d0370f916c96b0b8dfc5dcc09c8b1a82e9ddf70db46745aa41c191a74983792f5b6b41b1180f57b482f1a4af4dccf6c439b3977b252
+MISC ChangeLog 4095 SHA256 c23646ebc3e71bddec9921b398a7b277d1a72f7ce419334267ea1d6a0edda064 SHA512 9a041953145e78d615f1fdb48a94d7cc8fb6920f315d6ea627098dea84277183e1552c3ac2e35bee946329028fb9713b079844281214109f0a02a21d780c52c3 WHIRLPOOL 9caeb0299d308db08d9933cab92bf59e329a20ab6c986b1eb73e5695c5e8b1068b6ac63cb67ebd8c04a9cc48609f8e05292cb877619de39934a6e063d9b0db30
+MISC ChangeLog-2015 8930 SHA256 66490a94e7c744913af00f91e6dbde5b597ebadd0e20e7856e6854a2cc395fc1 SHA512 fa87dffaf445530da3cf4c7d8390b4ddf818318f017318bb238d58a25c6f5f5f7542d2005a94da0f29feb33229a2015a6f99a89cd85b615657ad6e0929661c42 WHIRLPOOL 10ef40d5ce47b659acaee38d63c8c1fcb2e5ae537a56b041afb8d02cb91a7c300044c34bcc178be303a467af6b965a7b4f91c8570fc123a44f4806bb913a0ba7
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..25e6206fbe83
--- /dev/null
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.2.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="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 ~x86-fbsd ~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-betwixt/Manifest b/dev-java/commons-betwixt/Manifest
new file mode 100644
index 000000000000..f0cbb29dd5ba
--- /dev/null
+++ b/dev-java/commons-betwixt/Manifest
@@ -0,0 +1,6 @@
+AUX commons-betwixt-0.8-test-dtd.patch 549 SHA256 3a417a51dc2ee0822a4a579b1daec2b7876ee5ba334e005b890ca0c645b941e3 SHA512 06c2fecec6eb2efea02d29b88c5e38e8f43ebc5efa36fee009122c09ee8e40c08b3ecc28aeacd82b7c464bdf4eccc834b5233d0ef81228c96b4053610e1a92a6 WHIRLPOOL 306b842461372ff4f969283a67d7673eefcc76b3f65c2cbfda0fa3db0efbc421f0f2fea1be03ca427c1aac094eedef0c987ea77d8fbc0a6138a82aa120ec3424
+DIST commons-betwixt-0.8-src.tar.gz 359821 SHA256 86db2d772c5ffe134a96a6d79410896ec7ec75ed6d8824b39a5be6d2df384af2 SHA512 9d82807b13b7c0dfedf2def35c80bd7467cafbec1a3a5a4e188d56ed4940c43238c12fd7f334ce0a3ff990c60af4cf94ba42adbcb7bbb21a2775ed7762fb0668 WHIRLPOOL 9641342f7f2317520465fa0b7e8f65d26023f3054d458b755d31855690f6e776895de5dba2e7bf450e89bba4956718bd5ce7de9b5efe138abd877d1ff68ee6e0
+EBUILD commons-betwixt-0.8.ebuild 1211 SHA256 74acc97fc054a610a2ee40ca781b711a1077aa66751aea887d3221b7b3846448 SHA512 56e3ee65a8ea528ad833febea8739cff1f2d8de42a45c48543f552b68dbba2c208d42b29fc367decffc01e9567cd70503f2c06753df85507e6290c8165e1b971 WHIRLPOOL cc5e740b8b4eb2af7d9faf3a619c275c21b68a7bb202afa911c2d778ea40b493a26e0caed83d56a732021e1275bb5bdf9b6712742607f4cfe5ce08bce2d2ede0
+MISC ChangeLog 2909 SHA256 73397eae1ad8a9be689235a76c33972d3ac698b7979a50e56a52e1b3651d7e45 SHA512 47a20ac22ba7ff7ba3a3ce30c8e42defea0840a8576c892e15c5215006f2b84f0ac6e769b2963350b51481e4b08f70114a5ccd375c87627798ae04e2b360b970 WHIRLPOOL e3ddf2c7e1a5ff0b3c5b6fa7f2639b0628a87c69c634e129aa8d9d81fd4fd5af2427bd02aae382ecb2386c84b7e4f167e19ce04776a6dcea88b4885b6a6e7de6
+MISC ChangeLog-2015 4116 SHA256 b25baac796659b965c7d6b507c2f17c2f2c4e6243cc303fc28c6e6b2f8a4189e SHA512 dc7dbcabececbadc8c84da4102660745f26794f4bf990c7b73c58d6dcc319bfbb535de7a4d7b0e80123b7a8ef368d43a2ad51b73ce99a037fd89a1b824b69364 WHIRLPOOL 9319e9bc100db4fb23e896800d9856dca4b6fe626e45c5c7718faaeeb34ec0d3cc5400939f6350f32337d941764880adc259bd428841f664f46d0edaf43749eb
+MISC metadata.xml 812 SHA256 7f27b0d0c40c24b710cf91bb1a8206edef7ec9430b2e62f784ceee8495ddc440 SHA512 fbb60c63fae3f556a56dae1e4499028c2feae633808e332a5c1ef7344d34bff3aa70a1717009c80e9a05ee24e7f1d3de1791035d117110fdb268e14c3c2a2af6 WHIRLPOOL d0d92516e14a8005388013fc9443547bc7a0c43dc63883c7238b9a62549b59ad1f1381d2c8658718ec463dd3c31dfec9681d97f7d3c2b33bd3fc7c136f4bb9c7
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
new file mode 100644
index 000000000000..e854dc31be19
--- /dev/null
+++ b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+JAVA_PKG_IUSE="doc test source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Introspective Bean to XML mapper"
+
+LICENSE="Apache-2.0"
+SLOT="0.7"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/commons-collections:0
+	>=dev-java/commons-logging-1.0.2:0
+	dev-java/commons-beanutils:1.7
+	>=dev-java/commons-digester-1.6:0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/xerces-2.7:2
+	)"
+
+S="${WORKDIR}/${P}-src/"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-digester,commons-logging"
+EANT_BUILD_TARGET="init jar"
+
+java_prepare() {
+	epatch "${FILESDIR}/${PN}-0.8-test-dtd.patch"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},xerces-2"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${PN}*.jar ${PN}.jar
+
+	dodoc RELEASE-NOTES.txt README.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-betwixt/files/commons-betwixt-0.8-test-dtd.patch b/dev-java/commons-betwixt/files/commons-betwixt-0.8-test-dtd.patch
new file mode 100644
index 000000000000..221874bd4995
--- /dev/null
+++ b/dev-java/commons-betwixt/files/commons-betwixt-0.8-test-dtd.patch
@@ -0,0 +1,16 @@
+--- commons-betwixt-0.8-src/src/test/org/apache/commons/betwixt/rss-example.xml 2006-12-21 23:14:19.000000000 +0100
++++ commons-betwixt-0.8-src/src/test/org/apache/commons/betwixt/rss-example.xml.new     2010-01-11 21:48:59.000000000 +0100
+@@ -15,10 +15,12 @@
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
++
++<!--
+ <!DOCTYPE rss PUBLIC
+  "-//Netscape Communications//DTD RSS 0.91//EN"
+  "http://my.netscape.com/publish/formats/rss-0.91.dtd">
+-
++-->
+ <rss version="0.91">
+
+   <channel>
diff --git a/dev-java/commons-betwixt/metadata.xml b/dev-java/commons-betwixt/metadata.xml
new file mode 100644
index 000000000000..cc177a3f7e6a
--- /dev/null
+++ b/dev-java/commons-betwixt/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>
+	The Betwixt library provides an XML introspection mechanism for mapping
+	beans to XML in a flexible way. It is implemented using an XMLIntrospector
+	and XMLBeanInfo classes which are similar to the standard Introspector and
+	BeanInfo from the Java Beans specification.
+
+	Betwixt provides a way of turning beans into XML as well as automatically
+	generating digester rules in a way that can be customized on a per type
+	manner in the same way that the BeanInfo mechanism can be used to customize
+	the default introspection on a java object.
+</longdescription>
+
+</pkgmetadata>
diff --git a/dev-java/commons-chain/Manifest b/dev-java/commons-chain/Manifest
new file mode 100644
index 000000000000..c95c80107912
--- /dev/null
+++ b/dev-java/commons-chain/Manifest
@@ -0,0 +1,6 @@
+AUX commons-chain-1.2-build.xml 8492 SHA256 4d9e538088c2f574b26d9c42e65230c0718300d227bf860e1ffe020b57e752cb SHA512 7e9ec638693b5875cd2f0c0fe45cc3d5bd7029fb599f277565f195538dde981e1e1dc7f615f1a296a264a353d0b55dab2ca489a4f735c4500e50c25f45488b64 WHIRLPOOL 367f6ca4abd0ea052e1dcd58d2a6d74d67632e5786ad33d754415c0a0a77e76c74cd08cc69189ca59c3d852cc29f8980818c4bdad33ad01e83043baa413dc585
+DIST commons-chain-1.2-src.zip 316195 SHA256 6c13dd2c5fddffc6e955a702eb8767d9ebb8e3aa1f8d696bf2933a77a8c13ad3 SHA512 454cc3c00deb78f0c07e01ea5e2be9ea1210b7a0162e2490e5aba0df0788e1661aed88e4c4ac83e9f2046f62bdf063ecb7af7d3d49b7e87056aded1d5c1dad4b WHIRLPOOL aa2b6e2253493289f0e4599af71c1bf1361aa4cf17720f1498d6b991fee1bad963db6d307ab052b2b99f9d2e073d967e06ee54b45debf045b558a20ae24593d7
+EBUILD commons-chain-1.2.ebuild 1347 SHA256 6b04580da862fb42d17fca3dc03b6db8c38981fb4af2e7a779fec4589efef574 SHA512 0ba9e18f69c771078b3ef032eb17a63910af2d463da48070e48ffd8fc9f22b6e1399215b9ab25e501592b4ae220408fe8f38d1967c52cbf276e846e723ed1363 WHIRLPOOL 96ea6a735871123f9b0a87a69c71dd8b19a115fc94697c3fbde0f80105fe6bc5eb2b0f228a8b521c8a25590786e9a2b746da797ec3e112569e0b66ac3ee54fd3
+MISC ChangeLog 2909 SHA256 f6556b889a3e2fb51771ac2014d4f7ee4c918a4b17ca4354bc2d55e1ca720198 SHA512 84786a99c195a53aef14600e4c5bcf5477e33f7c79eed5ccbba12acd8160841d6833d0619f08d7bf8bd7882abb8c26d01a1bbaa535c7c186989ba91577c3af27 WHIRLPOOL 37ad2faab9850c3d35ca274d535f100fbc04a323e17bf797e687ab7d92bd82baea1ea7bec3db1a0cd076705e680e4d8a1bc377a4b69470f7a86db954be63df64
+MISC ChangeLog-2015 443 SHA256 b0f7068707b9d7fa0b1b8e20c6debcf642c433b58d0b5c54385e9e99bc68bf53 SHA512 9ae71fcafb89520edbf8ccbb707d6d07cf4c3711a33a4e80ce4fbb50ca972a3caebecfea97f783b30484f9f1f57b0b5b2075626c1696042edec1958cae6b8441 WHIRLPOOL 149687d4b79dd0ac0a5e4891db6486337e63ab473892d63b3be7fa725d811a5ecc77a53a2b803a0e0480bc214d1d1e22e12f305addb48200497c837ec317e5c5
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/commons-cli/Manifest
new file mode 100644
index 000000000000..b719aa8d420e
--- /dev/null
+++ b/dev-java/commons-cli/Manifest
@@ -0,0 +1,7 @@
+DIST commons-cli-1.3.1-src.tar.gz 145886 SHA256 d4f7eedf6def7cd574ff9b0050a5a7203a702ed13c88d9fbb85b84284ab172ba SHA512 b5c569bea3c213a1959ae698894f2234477a7a5ed246f8e81142041173f668802959be018011bce6aa2a5631081378e67d69eeba9136fa19c96193dbdf2a7d15 WHIRLPOOL 2e589f5644c5d7cead5bb88364cd982a717b7eab33c50c9ff0dc14d562d5eb92e6f76f7e80c2b356d08cf1e80b6943d81d7f98f554b4de54fc394916c9e4c56e
+DIST commons-cli-1.4-src.tar.gz 148530 SHA256 a1def8d94e4fe6be4ffde100a74a647fe3df5ba02f85e3c9191fbb00be880f16 SHA512 a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f WHIRLPOOL 55ea385ee8f861e248022175a66a93efb65608b26b5beb51fd3c5cc68767c10d87bea4bf63b2f0fc3d79172ddcc8cb3c72033d826834ce24081534520bbafb10
+EBUILD commons-cli-1.3.1.ebuild 1031 SHA256 3e5797d501b616879b2fa60a033d5af0955440006bd2b253ed1c19de1895040c SHA512 2ecdaf8fa0920a522ace2b205d3a0cf7acda765ef618b9beb62c9800060e1f7e976221d1bd6af3eda2a10f9d8a2f8772429aa2d26b9588e6c94b424afa8765d0 WHIRLPOOL 7fb6f0b958f32975941409768646a135257c365a15c674e0bfb06273744cb7104670853eb6fe6510b6ef137cbf86366c05179a40a374c88726e1845db2303746
+EBUILD commons-cli-1.4.ebuild 1034 SHA256 22e974bb7ba043dcbc6c0f103aa4f9e49fd0fa02ba3206a72625ce4eb13ad487 SHA512 117197da7bfc28a8b62428e88e67133020bd891c2947e808506e52aabdd8883a12bf90fa40dab37656bb69d1354910e72cda137f83607da75f0391a2beca14ac WHIRLPOOL f8a35659b050b7a9c74d028eeefb134d98a6f7108b3831f12130b2b8c89baed42a30a20d04dce3a2e0578da137b5ad1e7f3872b3f4341fb5099c084ae1613010
+MISC ChangeLog 2775 SHA256 702386e927848b613c6fdc78226aeb43d0f9a49ca61dc18a0d080f67de91f832 SHA512 e70d2c590f14892e03f309906a188bd83e4edaaa4429410a6dd35751d5b927371b29479818a1d946a9f5ce3ba69c35d393d0abaed5273253f43527b2b388f16d WHIRLPOOL e2224da85f15b7a391b959596011abe6a6378d90d39e7fe735cb035379715c6fcc6eab2152798314c0776c23e30a5ebaf92c6a152362fdf98dc80caa874b8814
+MISC ChangeLog-2015 6861 SHA256 91262f5eb8c1300fbba8ecb31266805d32d521630b742337f37afcf416d2a504 SHA512 fca378a50d2f35a1e441191322482f9f6f277ac02d115c5d13817b983322debab1661eed379916cf9d5cd5b1e0dfd68f40cd892e3946a1989e6f723947ae1f33 WHIRLPOOL 581231a8038a9562e608e1fdfc107946685e641a90a4b52c0d1da7203ae9c3a07d8cecde1e5591fe603abfd7c658431dfca26194ac064453dd09f02643cfcbd2
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..5fb219354aac
--- /dev/null
+++ b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
@@ -0,0 +1,41 @@
+# 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 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 ~x86-fbsd ~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..e047a4e68228
--- /dev/null
+++ b/dev-java/commons-cli/commons-cli-1.4.ebuild
@@ -0,0 +1,41 @@
+# 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 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 ~x86-fbsd ~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/Manifest b/dev-java/commons-codec/Manifest
new file mode 100644
index 000000000000..50f0419bd3fd
--- /dev/null
+++ b/dev-java/commons-codec/Manifest
@@ -0,0 +1,5 @@
+DIST commons-codec-1.7-src.tar.gz 291251 SHA256 816b5a9ae9ee67b918cb1864d0a24fbbc24ab1875992b6fc46ada6d62435e38a SHA512 31358283ac2827cb05486b8ff1512242153f61deb086f7fe145ee3ca38d96e43fba080a1e89a3b8cd44d09761015ff4dbe5226d29b7f9fcd59e68ca7701b28d6 WHIRLPOOL edc4caaf6ef56fd9c1a7437dacf873be53802eccbcb1f6035163946c07e3f4373e0698f069f00a8ad2bb5562a2c6a1ab909eccfccd6a527ce51dcedd2bd2bbfc
+EBUILD commons-codec-1.7.ebuild 905 SHA256 cb0ca3de4dfb7003121f48e135838a3260d0d18ee2e14b4b3f197cbeb6d56fe5 SHA512 2f62c9745717fcf1bd7761531933bd0eb4aa0c65251ae6a33f4b353ac8594e390c69c915ba4805ff132874c3f53fe38075478c51d62c778103730ab1168b5cd7 WHIRLPOOL 2c347997f06540fd7eea013efeabe517c381da1d7b07a65139b0fecd088f4233c62cdfdceb1ef2a8e1350601594975e040a73eeaec9545854f6be200110d2707
+MISC ChangeLog 2976 SHA256 b4c249f256b5e72e9b3fbf72456669e583405e439af1463ba885b69d1a77a95d SHA512 695a82f6e81b9658ee8a595fc1c70a3445a2d8644d9898fb836121a43c9e93b13ccf5c7b8c6f83875870928a0d5fdf68909e00064a6beb72f1f55cb6fbcff2cf WHIRLPOOL 4257c99a9c9641af82d9e2feb99f2cb7c6fd3c94fe350c9f957bec36d7242dd0a6bc7860b25bdb8063a006e4b4882c5e7c51b92ea96ff4e0ab33975eebf3e16d
+MISC ChangeLog-2015 6197 SHA256 940459964f70a38a85799fec209318b8dec9c538e78c13fe1052f34e6ba80baf SHA512 0497ba44de9dc325c723d9c2d4accf77fb41dd73c3d72e31c10ba056b6eb7b38d35aefc4e47979f14e1d8243d52233a419603996a00aa68d38e55f5d7526b1a1 WHIRLPOOL c085b9be280e8b703680ab6e340385d84a0f1b6c5b8254be2c6fd057d852a214b291d064117b1fe6a5c402b68f6f3828dff25358f5af0ad952e5fc23481c9cc6
+MISC metadata.xml 1360 SHA256 9b35ea4a5fda681cfaccb6375f1f2af6777e8e88acf327840e6c6c97fda75cf5 SHA512 d16f70860d4880e50d25e6297823fb71955c147eedd115ca7eda0a0bf6c4cbc6121bf8b12062241192facd4583f10df56a838c84940b5914f75d13f10c96e9ae WHIRLPOOL 8272cd691f3e19557198d900ada6bc9717cfd0018a0284a617f32617150810b25df0b38c8d1cc1e0ac1a689a50e831bcfe2c31a757ef17cae0d73c5a50920757
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..a4da5c3a9be3
--- /dev/null
+++ b/dev-java/commons-codec/commons-codec-1.7.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"
+
+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 ~x86-fbsd ~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/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/Manifest b/dev-java/commons-collections/Manifest
new file mode 100644
index 000000000000..7e6822dbbfec
--- /dev/null
+++ b/dev-java/commons-collections/Manifest
@@ -0,0 +1,8 @@
+AUX commons-collections-3.2.1-Java-8.patch 7059 SHA256 8173d805f8abcb0a712355ab420ab0fac9c37445c1491bf49f508ae525df5b46 SHA512 1007c9c46944c4b0104b0b13c4c2acdfc9791274019b20bd38b95769095843e4be1ee29d81ff61517d9a7d9b2ad5bd77c92a2f25ebe3bab68f9a04d3a986a44d WHIRLPOOL eeaeaf74e238827cce6e2eb75a16a9c15df937da6b4eaa6eac950f71ed28dca10485d2d7f483e415b5946aa26e62c04d35f72d903fa644af28d8ca13443e51e7
+DIST commons-collections-3.2.1-src.tar.gz 609930 SHA256 9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0 WHIRLPOOL ec31406560a1156e8e8780e3cc1d5be2b614b26e8dc3c04a80ee758d4d42c353c2eaf6f5f41057d3f9735063cb81143005bd63d7b552b73f1e2acc5fa644766d
+DIST commons-collections4-4.1-src.tar.gz 704671 SHA256 94839a0620a0fb1999aa94d490cd8d6919f79dc206be33b722f856ffde862ecf SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b WHIRLPOOL 154bddba08d881303d888a6c195eceda7582677ac3cd0089d189b04b1d1673d9b7fa92e94c22298bc2ce3c12502ea731f51144ac22b7ff5ef9767c7bb2d816a0
+EBUILD commons-collections-3.2.1-r1.ebuild 1737 SHA256 e3415f85728a932d480756fa4e33b4f04c776be7b7a6214742c7a8160e7c5d20 SHA512 ff7744a20772372499ffa441da4da7484def6f715578c5376dfe2dc7b0e7e5e25899e653a4af57409aa8101a392520cae8159afbdf660bc41bfd7f192e123e26 WHIRLPOOL f79562ffb28d37a2fceb46e206617b50027a4569a8776a7feca5535133c171ff06c78cd136648fb4857e8f5da47a5c997da11a4ee8626ce448a076ad693e0a4a
+EBUILD commons-collections-4.1.ebuild 1179 SHA256 c38bac8b1db1a031f6f306028c8f4fa969f6c4263bf8c6102244a751e0568485 SHA512 559c778ec39cbcad397664094bf4ba3e7f52e6331cb8a069ee3205c24f75d2a270f822e83edf07591083d14845b68ce59fd4e9fa0c9ad56ca7a49bc1b494f77a WHIRLPOOL 83b47c64a42125dc849262e7c6d9aa91a1f45d36b960346e486e74e9c8b916161afc0b7720e4a1b3f901fed56b0af3df56e4be66cda92a3c48354aed124f1368
+MISC ChangeLog 3980 SHA256 c3419b51e6c96047e1e2504f6204117e82ff5ff5ca36c9063c7e6377e49b9770 SHA512 6cba2399b1ddf6f3e854402b8910ee23ad3cd4652070db166364a769db9dde5197c71812dae4ccffed87e3f92cd32ed5e0190162baa8bec82571c367b43386d5 WHIRLPOOL be09df8fd94ecceb922ed96c5ffdc99d0c1764130400555aa5003f417f92cd50bb60056b1e2ecc3678ab0407c888db9fac842b5f4e6a748d8ea2a2b08a1c4fb3
+MISC ChangeLog-2015 8616 SHA256 ab01af3677b2632b4e8e8e13bcef4f0a57613679369ef4e5b9c31ebbaf36c375 SHA512 ca71fe5b5bfb936b76f7d76bdc4015f1224ddaf4f3cabff55576e2a5076fce7cbd611c7a9bab7f977f74b2a4f4ce4c2b8989f9d9491aade7608762801a8341e8 WHIRLPOOL 57e61aaf93c50ebc8651f4c3144a68dff63360fe970c6dfeada01f0394240b5762710d06b123c82b280db998cec4549bd91724c3051a3c9f4894818cc7928a16
+MISC metadata.xml 325 SHA256 fcde2fc011e89fddee53020f3c4975b61181814404c26988a0daaa8c0057e90e SHA512 23d211dbb0efeb5909d6d43ddf7a58ab34d33d25fc80216e0e6d7722424c06df89912947105070e63a64d44b6ad37e3053e19bcddc4c808d9cfc234f4d923645 WHIRLPOOL 64e07c0e5b50ccaa0398381c80cd6fa93aae951977a68c3b982942f6b9f9411085e950d1bc856499e6f5afe879aa589a569ed28301d118b6161d3895def8d481
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..626699b69f79
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -0,0 +1,71 @@
+# 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 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 ~x86-fbsd ~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-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
new file mode 100644
index 000000000000..3f442ecfe0e9
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -0,0 +1,48 @@
+# 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
+
+SLOT="4"
+MY_P="${PN}${SLOT}-${PV}"
+
+DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
+HOMEPAGE="http://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"
+
+RDEPEND=">=virtual/jre-1.7"
+
+DEPEND=">=virtual/jdk-1.7
+	test? (
+		dev-java/easymock:3.2
+		dev-java/junit:4
+	)"
+
+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/Manifest b/dev-java/commons-compress/Manifest
new file mode 100644
index 000000000000..874024f53287
--- /dev/null
+++ b/dev-java/commons-compress/Manifest
@@ -0,0 +1,7 @@
+AUX MANIFEST.MF 1222 SHA256 ba7f4de845c9c5d1df55ce434be9b89f79081f15e1d77643f52d98330bb40d9d SHA512 048b09aa2ae2e20c8b5b0e116eb49fd680634e9b654d5026004e32a39bec4e5b669afcadea8338764a157f70cc0c3fdb5d2ce98513bfeae267be7ae02935381d WHIRLPOOL 7faa17713d3745d07310974a4a4f3faf7a999579754d75553886d692279412381d1f0a8cc7da30e0b45429222b13f128aad9141f887a568bc775b80a9cf78714
+AUX build.xml 11340 SHA256 d22d5efb3d31b41e9283cfbf4f8cca12f97051dc7f681be03100addf4dc68d2d SHA512 09abd59212021ac20fae760ce127546bde53e40e2ed0db26a0a93417c681e46b038d1940964e55fd46a8f7db44b5ea2666459d75358ee1dd5882895c803e0c89 WHIRLPOOL 1e003d0969e4900866f2dd6df0011efe3df1ba4a2f7a4c03afef8fb1803fcc47068b26cb31ba3cdfc842fb6d24b4f69ee3ae2b0ec9ebefc093abbf5133acc25b
+DIST commons-compress-1.10-src.tar.gz 8528642 SHA256 049814de8a1e1548d9673e2a6e3b9b6e387910feefba8a877a13bfdad2046419 SHA512 1eee157134d861f49b735df02f028781ef86370d7d246cb8fbfc1f445427d5cdd753a9df7a78e760d53667c43ab5c37df315a1e36e845e5d308961ebe138d910 WHIRLPOOL 04bae895867aeb9d787c21ee7fdfa8e72aa1d40c3917f39476576a4858dacb190c091b007394cb11d58604815d54d373ea4fb7be05e83095684ef2e4802b6860
+EBUILD commons-compress-1.10.ebuild 1498 SHA256 e1248b6082ddb784417fff9cfa1812a941c59cbc538273f61c29522c2de71d6e SHA512 0a172dfe3c1026925fd92418085c1324e9fae506f85917e84fee68d9ee4fb38d38c8019c7730157deb2e3fea7ab241296ff74787be3e5a23c996f81267695537 WHIRLPOOL 28a648324639cc9efcae56dabcec3197ab369fe6fa02772e6e805b5edc6477dd3d63319cb504217980c034d5bb7fcddf4801da87b71991554d020b0d8fbdb53a
+MISC ChangeLog 3613 SHA256 0310b79b38b629eea7f0ba298b6d7dd0e745995b2e251d88904e2bd594b62192 SHA512 8a96da9df7979e30cf3f1c5f1ad20b936444c5f31459be56f7220b737baaaf0c0f9907cd0d2cda2db3acdc4d0bc120e0ce19cabb7f817cf32628e905c8fb9dfb WHIRLPOOL 9a87b68b315b2ed60c5fe7adebf4c2b49904861a9ab3b1cf3f7353cd184b05ccb472a1b6a3341c7ff9c28836450181963e864156e5f7bf7dfc2b42cd6d6562d9
+MISC ChangeLog-2015 2340 SHA256 b5c54010b77ad512beccc2b93b2688d9d085176e47fa3558b9d367a98edf2181 SHA512 402f7434ae7403323ea42655bc167397410b38ce4a1b3d41c98212818d19702a9495c66f662b98d1a52e5547bacf08e90944c8b8c6b48fef1853d0de7d67b227 WHIRLPOOL 7f6300e01e2cd5b8526f032a7091e7151440ef23fe92438a2450f940008cc5d16794bd2f42752c570bb32db31a4635625db78a54c82e911ed32ec43803ffd0ad
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/commons-configuration/Manifest
new file mode 100644
index 000000000000..8166734fcd1f
--- /dev/null
+++ b/dev-java/commons-configuration/Manifest
@@ -0,0 +1,6 @@
+AUX commons-configuration-1.6-gentoo.patch 979 SHA256 b412760dd9ab98266f3ae3776bad7b2a1975f2abea79ad5767fcb64b704dccd7 SHA512 6e0e3e69a77b31a39ad2f160a80ff08b9cdac2b0788b58b06e09f9a07a90a36bc1a4171e6bd739495b8e4c6271cc49ffbfe221dda73756f3407cf268dafec5a7 WHIRLPOOL d8a94c45a47755a960bf4a5f0b4dfeeb3a42494cc46ed118c092ad6aafceb2b8ccd5d0c1b4a2b6546656a76021c5721e62964094eefecc5676929a384668ba6c
+DIST commons-configuration-1.6-src.tar.gz 559621 SHA256 3874f0c7227874474e538c41f28e2d11584eff3c14323985a1f92da97841cf5b SHA512 5d82b844cf39162976820d030d05afeeec1151aa33bf4353f9ca844e552c55ea26daa1b74158baa31d0677e311e9dd83a1d9721c8d5f4e23d21068c4ca2eeb01 WHIRLPOOL 5ae3d17fbd32d3445e04a8f8eb3ad91e59ae3220cee0f17bb27176a18d2c1ff79e2099b90d828268b8bc3ddeeaacb4fed57df722ad7b0cca97dbe4d5a45d30f6
+EBUILD commons-configuration-1.6-r2.ebuild 1686 SHA256 6a7f76e164e898a2ad537e860b99f9f570d85e71e81a39ec2c09f237f6d9e0b3 SHA512 73bd9b24c738b0942547cb2df6c78dbab264faa7333955b2aa55a665660bc57bb3398fa64c4ced2b05f44ca50d7828d8882c0988f2420c716031b764ce500ca4 WHIRLPOOL d3ff3ab150e13f2c4c46cc5dc72217a57f10d6dcca0fcdb7cb0e93dd9e9fbb5e05641611ddf79fe1198b283ed2ff80cf07012b069248ee2ee1e9fb9696203158
+MISC ChangeLog 3368 SHA256 aaab1b28d3252197c55c7f9e9d6b43fee55717eda1ab1d642d3c5b15af6b189a SHA512 fc303f1b941c7499ddf9c37347b74f4724b00adac573e1967f38bbc417ca5825d08ec94688d636c8203efc57e6dbd71d3dad59e3e49a3a871a000d3c101f36d8 WHIRLPOOL 666545829e54c1fc2bf20cb8dc28da9db1536e318cb51a1a363411dd0dfb2271746a6e0e4c7f7b636a91710c1613ca87806df0b7f1559460f9835b9f8d862aab
+MISC ChangeLog-2015 2383 SHA256 8b4e49e45f887b89ec685c52c143e0f83fccab3e72322c22ed3f3dd31c08e834 SHA512 16edad8da4903099744a28289203530894a4219073c03cee0fd7b5c42bccd754a1c41ec7f4a8c7b7f7ddc72d28d79437f11216ca9ec1cc421cdc5c85a4c2c73b WHIRLPOOL 1fa4f29815315f9c40f6e7daac9a3414fef6cf1130fc562b9e3b5b0fcc100b9d48956d00458bfa8e8bcda0d5cbf6fee6fefa35c11c09c73caf91d60159929915
+MISC metadata.xml 429 SHA256 d41ba006fd9c5982b97fc3d34acbf1a452b171c71c08a7bf9e8445b1f60b311a SHA512 eda224d5bad6200ce652d798d7ddd2f5f7de3652419728d05068c2bde19caa2486b1060b8d98d9dc5adca2d00014e868b93dac646ee129d57c7239a6917a260e WHIRLPOOL d0a2d5556cb675be84e42204bf344b7c65da2225a385b98b01fa478664f08ea0d4ad470a20213377b88513ba7ed21e8db0d6ea7cc3da51872330536ba10c8dcd
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/Manifest b/dev-java/commons-daemon/Manifest
new file mode 100644
index 000000000000..c6d4e9fc6466
--- /dev/null
+++ b/dev-java/commons-daemon/Manifest
@@ -0,0 +1,5 @@
+DIST commons-daemon-1.0.15-src.tar.gz 291128 SHA256 11ee57d2c6b281589c1497b2f88180553f06d5ac1560ce1841e05f89f0342432 SHA512 f20cc8796978fb09b6ecc8d99bb3c8b271b097d74c1f99b286cde213631e7f50a4104f5db2c354f9624ba8b037502d81e327c581b38253b9b216aa2172016e40 WHIRLPOOL 6b3b5f5d12fc9fd15345e71a7bf41f88605b00f9bc0ab5ab5fca3752f4bae1adf6ae6b2c3781a68b00d0609c51cb5cb2f4e399effa40f08be0c5dacc2e230d65
+EBUILD commons-daemon-1.0.15.ebuild 1284 SHA256 03e1d34b0d05eec17fc130901385b4a9e844a9c4aa531fbedbe7fe303e1e139d SHA512 88784abfec38ba6b126922c3dffc473f41d9a37b063bd562292f3f73c45ead144793afa84938aa8f2db5f900090ba49324f3776c6ea824885d95a27f0bd39456 WHIRLPOOL 2b8f8df1e09a1cf02a9c7d67ec18d6e23fe5562a4b6290242b8d3edd2c99e4022ff81b0f7e857bca0600261de5385e1fd1dd2ea5917d6628214b6ad3201a114e
+MISC ChangeLog 3181 SHA256 6fa3eb5155815d3eb4956c9da875491f0801cc46f44fd1a3a2c573855d3df63a SHA512 6f2c9cf0e07d705bd8330cecde8d01bd365eb67dd7a27ae3e388de2cfc655d45bbf1d168983d4d63a66fd08cfc24a610e4d237dcbaeadfda05466b07fffa06db WHIRLPOOL c20c272ff3bcd3434973ff3d724591f4a68543a20d59d5b68cd0ed5e4d18b238be8e83ac6679ba13d0acc3c6df5db7337f9605150f25ae43adfc58ad740f50d7
+MISC ChangeLog-2015 8094 SHA256 aeca43d34d356d7cd964264e5e97cbff5613b5aa4e5e91404c04f67eae2a4ab8 SHA512 a89dd268db114b1af3d4839373cfea40ec2d7d03dcb9d21c58490e34f846af648f28d99b74254eb143b4564c16aaa023aa028f607d9f26b96a2e877f17135863 WHIRLPOOL b89c3ef6c9f564dd3cf495b219031845cb2227b4eecb0faa527c3f09597549a5eb3bafe32e18447fe13720f5add58dc6532fb0e064f252bd62229983d00e4aaf
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..8061d6a33f17
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WANT_AUTOCONF=2.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 ~x86-fbsd ~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/Manifest b/dev-java/commons-dbcp/Manifest
new file mode 100644
index 000000000000..89e85ca46d54
--- /dev/null
+++ b/dev-java/commons-dbcp/Manifest
@@ -0,0 +1,5 @@
+DIST commons-dbcp2-2.1-src.tar.gz 580017 SHA256 e1a75021dc3a5314cfa0a0c65bf0bf3d8f95a289b833cf5e391149cf29367708 SHA512 830fb550cee5f9c79fad830d8b3e56417aa9dfed26093fd366693260f5b4d821baa592e60c7f5997766276049a90eacd5854b8422803825154fedee56d46409d WHIRLPOOL d4efd240eae5d891c98ad3a2fa76756fabdfa93bc17ec9d4e0b046f6dcb8e61579acfb899f338131472960aaddf25457d3a82ca00486242097319e9f7617462a
+EBUILD commons-dbcp-2.1.ebuild 2232 SHA256 ed14014b880806bf345ac7ae28a50016c9f0f1469ad5f5ea9c49a3dd3970e695 SHA512 2d3b5426edf5d0b37e27161c4cb3a219dd2e556b2acadd6ec91a0c9717a11aec3f931dc2f1ce0ffe4e73dc8720a1f1222443150f3ec9dbc017ac43b67e521cfd WHIRLPOOL 6babfa25fec892bcb1166d9367d0bb2ef68d929c352b64aea39a10dca7340da9896a0e51ded3a317146a1a42dcd23020ccaa18cc4b9cb56d9100d5a0e06fa989
+MISC ChangeLog 2812 SHA256 e84f73d0931db5b7716ae749151a2386a3a586e0c52da6ab08aea8d2eb3a5123 SHA512 c58b700cc3059d1f6277952e7bdf020fb54ccd26b157536e5f0d4b4e4551582f7c180c28f54004b7c01bd33d9adab03472402fa1f08be284b7550d1c076f4374 WHIRLPOOL 821cc14f209a7bc203d3b0fa2606d3b40b0eca52aceac0c3b52d9c2788786fcfe204f8634b8fefac3112f7e6847578b81f3dccc8ac1100a32f0147fa0d3c9328
+MISC ChangeLog-2015 9756 SHA256 bfbab35d77875b406ca06775ee5a9741bd703fe265a12e3c4b97dd4c2a899f0b SHA512 53879d5ca408d4414d1a71f15b73bb5962d13dc64af8dc15ee7d20b4d8cfcf09453deeeaeed6bedd65442b4aabefce43a98de29a8c96c1e612627ba306bf395c WHIRLPOOL e037b833dd53155fe7bcd9d5c3e7c963ca538cab47ddd8ec7eb98c1e14924767f9607bf48d16f4850b9ed4ed5439a1eff56bd5427e4f68c7cc614af340d373bc
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..ea6fe6814c80
--- /dev/null
+++ b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
@@ -0,0 +1,82 @@
+# 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="${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 ~x86-fbsd ~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/Manifest b/dev-java/commons-dbutils/Manifest
new file mode 100644
index 000000000000..beaa32af9277
--- /dev/null
+++ b/dev-java/commons-dbutils/Manifest
@@ -0,0 +1,6 @@
+AUX commons-dbutils-1.6-build.xml 11340 SHA256 01b77165682e5b716fe42d110335fd3b89b6fc2046b85c65263deebbea1dfa3a SHA512 6f16181ab7224e60bc34257668f31c3a2e9939f6d400e7af6e5663586fe160c1eb337c0db36e9f4773be873ab85379b069470e4d5591d48cae1d237fafade6b8 WHIRLPOOL 73c3c09c8c317b56c9a2b4b984751905f894ade241c8a323c6c0c05d4ec839873ce79d21c66686c3a7d1afceca4c18970a7a0be61440d191e05a3f96fb4ccb55
+DIST commons-dbutils-1.6-src.tar.gz 90708 SHA256 c7cb1bd7e0f9a6d509c98bb60f9941503473d6fe0fbe144736fb1819096c4524 SHA512 05aa5fb448d949ac4d5d34f1219539e57cfb550fa423af0691cb35002984036b0de62b8f618199bd2f562a441867c5b7138e9204afc36bd6d0fa2c4c5e9cd2c6 WHIRLPOOL 012a8cace08c96c136b9e9a05ec34d173d544aecad465908ad823a47ec535cfa91c609e5280e9e05967b3d863b13e999ad2c9a826a100e3faa3333869c26dd97
+EBUILD commons-dbutils-1.6.ebuild 1100 SHA256 498e302c569f0d0c08ca18ac16a9a54f953665d99d765e873f6434e7bb4013cf SHA512 3a3e973da68035e5a290a396428edbd3d6213ae918fc0090d1d65dc8379fc3bc13d92e91f3452cae5846b01b67d59601f033e040da85f43ef958a1ba3a691af8 WHIRLPOOL 5d47dc37350c57e740945c64f928fa7a9d6c74be723e7a3ccdf8009090d2e0dcf4e76369383128bc5384206c171114d02dc8e0a9818a60b7ebf7af74355ce83e
+MISC ChangeLog 2955 SHA256 16d3cbb7ff42dc67f99c71d619952f0104393f8fca4c2a9506b42484cc715b1b SHA512 455594f8308ed5c6fbfd3c4535ad0a09aea9dedac226f4eded195c8aeff0bd78e020055569dc49c5f9a34a3f54396a955f6dc4c73100a116102f3bda316a2354 WHIRLPOOL d4bf11e9669185a27aaf2b785038b00a2b3ce94d44ecc4393e869390b02bd627facce3530b23f5080223788a58275bb4fdb13b86398cf6be929052ada85da406
+MISC ChangeLog-2015 1037 SHA256 3194c624386e608c304767c776908d4de034dfd184c029f204703543465c0300 SHA512 8a56ceb0326b94ce09cc7ec423939b3b00d002209904d7a14a755ce7bc554232dd9aa6369d435d568fddc04129c82524b1823f077deafd5f7c2516bb217fb2ed WHIRLPOOL e6ce3c0727be6f28f05a50f43589593e0b9f06aed3d58c05f1af8dd7bebf5dd03c079bc3f508fa99e8338c3343e0f62db7b6b4ddb35743b71d4a7486784e17be
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..f58f08c36763
--- /dev/null
+++ b/dev-java/commons-dbutils/commons-dbutils-1.6.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-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/Manifest b/dev-java/commons-digester/Manifest
new file mode 100644
index 000000000000..812ab72995dc
--- /dev/null
+++ b/dev-java/commons-digester/Manifest
@@ -0,0 +1,11 @@
+AUX 1.8.1-build.xml-jar-target.patch 1099 SHA256 9f9fbbbd23f17bc89becc5e5ebc19c9d3a3dbe5c412f83b10ceb7c4f6f329bc0 SHA512 f28fd46608ca3817739ac4cdb07bf57ec28e0ebb22c3d086ef36567b44bb595b040dc27bb57a89f55568b8e4966b627f18829171908c14b4cced99787fc623c5 WHIRLPOOL 5ce762d8f9bd991e14275e7367d93673acf9037d9ea3245227f723dc2643e2ea62655ca33d4be1d621d7ad5aef1b059d1752392eb86b35be8416a737e7a7849f
+AUX commons-digester-2.1-build.xml 12816 SHA256 63d7ca3b32639728240a4801b28582585ff0114e5b9c510fd8d3aee441fb5a9d SHA512 f42f80e68e8b6d31b07add393e1adc1714278e9e8e6ccab08dfb6a131bdafeab1ae5c5859e81dabc5acff88d2151093d82a3e089293f653bcab307451839c0ef WHIRLPOOL 94eb44b56fbb67920e20f0c263bdb9e700bbc4cfb83f810b6b31c72a0a4222d6e3b925a09d0f26a80aae1f072322381ef8d885304e0a8aae3e76499c4ec5a6f3
+DIST commons-digester-1.8.1-src.tar.gz 303266 SHA256 9ecb98ffeb2f910d5554571875a8ed36b4d09f5cdc7ccece8e275d85ba4bf6f1 SHA512 0a39069662b4792d4856b79b5cedc2b44cb70303a19045d21c233d45ae4dde9e80662bd242a381e759d7cdb5adaf0b9fa6206bb8397b53348fa9eac12e9a4e96 WHIRLPOOL dffd4523256b84b5d05daf446fb4d9304220da57068c69e3d1fe67bcda41f4f41404d01eb46f82695696d251ff0fe7981e11c93cbc637e33a5e664645823e8b0
+DIST commons-digester-2.1-src.tar.gz 304060 SHA256 2713f07a6adec7e253d91f1fca70e658b93e1a63f1b6a36f4907a2b83088543f SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88 WHIRLPOOL c08a428a41a405f01a49a26921ab7eb053f88a8f54c76ec331f92ccb009e3fe9b1d0689b45ee6d608e6e46a490d0c40692251bbc8c48db723a4f4d4017bf3871
+DIST commons-digester3-3.2-src.tar.gz 324555 SHA256 73fa7a8d3f0e39fbffae46cbd47cbf788c0a573e510a601928aa16ea1a0a6c0e SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad WHIRLPOOL e4064f26a4cd88188436939ca6b2de582e84d4da1aca6d1931587643076f5a3b40701b3fef62fd5dff677e66f956f07314bf8eb7f3fece5780674ea63331ac48
+EBUILD commons-digester-1.8.1-r2.ebuild 1344 SHA256 0821f00120c31100e4030bed8b784e486b5ef0b9127bd1f13c5d4ecacd7ee7ea SHA512 ffb81b347ce8cf68a4f99cbab48044345273f4abd49c8e48482219869f1eb5a522e5e549833f9cf0c31435229b500d4447c9928a30aadd03958fa0776ceb76e1 WHIRLPOOL 02efd011997d7b1c79874f10a61127d3f4f378fa871c90ce11200a37012ecb50ab0a703197faa97d62a29f7722ef3e1420eb2b61933eaa6349d38b2bfc291728
+EBUILD commons-digester-2.1-r1.ebuild 1281 SHA256 f4b479b19c8cb842aa58e986ace197c94d3af9a29ae18d1cd38f9b8f1e26ded8 SHA512 084f7e7ea4029dbca1b6687f0457091f11d7f00af4c6d81e4d20c43a6912f06b20dd9b25acb1b63aca1d0d5d446f1dbfeee50b06b5259cc1af9ff029666cb302 WHIRLPOOL 28d8e366aac4dd6fca9e0fd2563376b6e3ab9f4ee4b98d3439a5c1608404b88fb6e005e2991cee40fa069c5912031fe3d795cc829424047e4f16cd856088bda3
+EBUILD commons-digester-3.2-r2.ebuild 1346 SHA256 00fab97320c8cb158d075a7319f57cba1a8d25ff26c6f3c537c83fb5565becc5 SHA512 380541befcf378f7446af7af0931fb3d95b682400b4fae1beb369a48d1ec807ecfb816a6a120085147924358ed17037027f03f9d9d049659342c3dc7a3882c0e WHIRLPOOL 7d3a65db73d229915a04088541122e803f8ce2fb846a0839e52db606e5739e24df90af8a39fa3a7b106f9565070c3c97cc43dadd1804f5eda7bff797f23fa8a0
+MISC ChangeLog 3089 SHA256 eac621f8c2955d6c23dfb3d7054799f59c076da3f795df24e4b665785c8dcfda SHA512 b4c69a5ad32b96f707f27c3b637d6b67f6d62692405396597e6674e35ed95bbff224b4dff29ab5e7a7edc8957713d650aa45f77a4b97703fff1e8a523ae19631 WHIRLPOOL 50e41cadbb0f50fe459dece59339d9719226c3d954ca1e549c2e9206808f1c7498a26d894ba6f671abdc35d244ea91afe66a2248dc9d91af1dbb5e55a5006cd5
+MISC ChangeLog-2015 11276 SHA256 4b4cec1f71e727b58357f1ef72d85e01da7f88c21bc1b02b7ecab4f1af9e5c6a SHA512 71d051a08cdcb8c5b3d0d182d23cfeee598b2e5a783be373af1a3acfc0dc825da8a363867e072b1efb7661569a836ab6e20a95394720cea70a897262d91e0b9b WHIRLPOOL e266f00bc8d02383e70af3852258995b4c1cd582e6a53a98f6c96e99fb7f1358cda19d269b25800b245b25f7fae2d62d8724881c7eb49f16fd3ad7d9674c1e30
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..cba93118e2c7
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
@@ -0,0 +1,57 @@
+# 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="${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 ~x86-fbsd"
+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..e4adb2d2ba0d
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
@@ -0,0 +1,57 @@
+# 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="${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 ~x86-fbsd"
+
+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/Manifest b/dev-java/commons-discovery/Manifest
new file mode 100644
index 000000000000..947436a98016
--- /dev/null
+++ b/dev-java/commons-discovery/Manifest
@@ -0,0 +1,5 @@
+DIST commons-discovery-0.5.jar 81725 SHA256 c7ff18e5004b7e2bd12f5d1987481849a54188f911ec465c47c32e08580b6d7a SHA512 348e42df5e4e34fdaa49d638018e654119a9d4e2aad967ed2a6f2706e89ffb2ea5daa9ac86747fa1f6d7b245759fac1a80090c571a057be1cdf8cea3514936f3 WHIRLPOOL 6ecf2367a6e71c14acd11a421dccf16239e3c54769fcdf00fed5f8ea5ea922e289acb663549aa5d845833e9b4ddfb29353cee092b1a9dad992e6b92bf957e0d1
+EBUILD commons-discovery-0.5.ebuild 626 SHA256 b5ac447697b74d0498f4fb8cb813e12462b5cbd43872a0c15f4758619056d01b SHA512 b68384cb73ee589d38fb773e8141229a62e0b22dc571731f8d3b01cde791a8a55e54e0a4fc1e7f54504f90a34c468779f24858e17be67e5a055c4574271b13f8 WHIRLPOOL c7f9c99e7b5916112c174bae436869209aa78d883f4faaaf3ec9e80dd3b769809f7aa90c27bb67f7e4a37a2c0401eab821019c2f9601ebdfc4866092bfdaaf4f
+MISC ChangeLog 3286 SHA256 905395e5e553a2a25396e9c8964058aa3c1349999775037f89485d640c3e228d SHA512 51497984ffb1624e73f2287c9b34922825c8892ad90592cd00232845122872667824305ad3e21e0e595151d4e73cbd36bd330813e7e4d75c17f319e8f9da3843 WHIRLPOOL 89f704c08620c0781bce15ea9561a64154d922f3daf1e87188d0183e24fb2219535671d20f6fa52963ffe1e2adbe894323aa7552237d1d4a81d58dcf9445c8fa
+MISC ChangeLog-2015 3616 SHA256 6c8605a4ca2f542e6a11e5b7a8b4a6d44ecc5c8b0ae155795889001cbf1e628c SHA512 8f61db3826c35784dbf08346682fbb435c8ee3efd18d68ce738ba254201d242c41d4ae583b270c7674514e2ce03bf5fa313ca4d28b1794798e8c9267af29c929 WHIRLPOOL c8eefd666e67a8cc30b21c4c9b6f5a454ce2dd7dd850ec217be0576a979e9ecebb0cc2f29b94ef040329e5b0abc3f72fb7270b0d9e3ffe48bf9b7c28fd6169ec
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..207d11d62daf
--- /dev/null
+++ b/dev-java/commons-discovery/commons-discovery-0.5.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="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/Manifest b/dev-java/commons-el/Manifest
new file mode 100644
index 000000000000..9989cd0cee70
--- /dev/null
+++ b/dev-java/commons-el/Manifest
@@ -0,0 +1,7 @@
+AUX commons-el-1.0-java-1.7-compiler.patch 738 SHA256 1c6e91bdb41da37c2cafcd9b052371a1a3a4ec2054071b87e103fe4eb0819326 SHA512 b189a50f4de4f3362eec45a7dba4e5d4227aae30723180ddbebaae86949687ebb217d4bf28879723fdbcb1393a54dcbf9e14e543373faaeab3975c02e01e2807 WHIRLPOOL 88d780b5749fb9dfa1bc581eb119b017ac8af1d8b097ac8cc0e94fc318f6b62b7d5a6196bc0d37215701b30c010b71f8ce7a1530f32714f89e9004207205b276
+AUX commons-el-1.0-manifest 557 SHA256 b2ce487366d61c8ce0ff49c59c20aac7efb358ecb2174d775dc306b4987824f1 SHA512 6f2eba221225f9842eef312519b8c92532be4e87732202d72ecb8c1182264d5219c70fe5c3517b2df8d43bd4f828e556ae57e7e145a4be811acf914ad6b3314e WHIRLPOOL c742a839ea456460b7f57d7618a1962140163548522d9a0d02986d48853642d79338061c92f77b8c22165cc55db3640188b5bfccb02cb4a393a2ca1d34801c50
+DIST commons-el-1.0-src.tar.gz 64009 SHA256 3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6 SHA512 51bee4a33816b2c7416f55bd2efe1e663350ca0b30b2b5a8f89154c51596df8481c736fa13576a9dad69b2da113728050c2c9b6f50125d38a36f45e4b82e2e83 WHIRLPOOL 5f019e0dac1211f713a8b3dd8818277c6241af133d3dc460e355332da40c58357e4d606e28301e770fe7dbf30f19885ba57f252e90cdd8923fbe258bec052ab6
+EBUILD commons-el-1.0-r3.ebuild 1214 SHA256 fec34ed8c1b8941278d6b6c56aaa6373703345ea0bf1f1138015bf98ea6b810c SHA512 d6b785a5663de56b0ed11a5b816d69b629c78deeb9a122540aa0961d7b1996ee4454e9789a58077b69417525052ab53e3e8502de0fbbdf04f31834c4f77be919 WHIRLPOOL 401058f1f562c69c0fb60d31de510d4e34be9365800459ac526fb4e4afdaa42f5c697fd2faa0ee7c32560ccb90ae05d27b82c20b3d0e3a425fe61934a8d64ed7
+MISC ChangeLog 2661 SHA256 d6580a4460a13b98d921bd779b399320a0126bf48e96a9c0b33da31527d69fcd SHA512 f94c84e86bb67581297719d90fd923fe5b3882f76e14e874788542c918e55a10d32db435ebd464efbedc9e37bfebee7a15f0b47c54fab20afb9c07b5d76f60da WHIRLPOOL 92684d2695adbd0729f699f2fe7a22c8347a05cd733173493432eb0963e7f5f01ee58eec6368658115e99e3cbb483eb48380739e0ebc79ead050862c9d41f5c5
+MISC ChangeLog-2015 4270 SHA256 eee8de5ef5f8a96f7a072fb73f5ba2914563bcd3428a774736abb640be01c043 SHA512 87611ff86fd89f619a268e5f93b0ce69bf56e95373dea4af59f1deb0b28923a780714a5fb4c58387fd0d536b630d72f7ff85a339f5e3a0c01ad1770f0dce7d43 WHIRLPOOL 7d649795db4ee0fb28d12d570266da180da45bc989f08428ecf4f088b90a98c5ab4359550cc06db7cc5181078576c26aab560ac2ccb4485486d50c91357d8f3c
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..f71ae892d58e
--- /dev/null
+++ b/dev-java/commons-el/commons-el-1.0-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 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 ~x86-fbsd"
+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/Manifest b/dev-java/commons-email/Manifest
new file mode 100644
index 000000000000..d223f6209941
--- /dev/null
+++ b/dev-java/commons-email/Manifest
@@ -0,0 +1,5 @@
+AUX commons-email-1.4-build.xml 10956 SHA256 17a612ef2fffb3de5e3f2c540b993d144640615cf14f76881b52cda322277823 SHA512 2555322efb15f1f4d26d78bea3638ae20b002c431891ec5ab8a45ef88df23b67f0ac0caf3fbba17e8f32fc2474eb09ae481bed05eb2b612386f31df5b0007cdb WHIRLPOOL ed221ce5e9a78b6e709d606cf5f78f8a1cf917b55cf15611865305d4dcb8f55e89cc66c83ada465aa902c2cfb507590c22b337ee4daf23214d6e1e7582d9a01b
+DIST commons-email-1.4-src.tar.gz 288876 SHA256 bf86115adc3e724c3e713102874d4ca686e7e6e34f9856438655be5a4c008cb0 SHA512 2a62256e284b9f4f428cf8544e46e81aa521476c41243df1c4f8a9e1bd4bcea3c768346aaab862b8c2a8b271c6012a38164c6d62867d2849a3ee0c2820fe422c WHIRLPOOL aaca35bd39e09020653af31b8147d1c323b80a7805199cb060327b0558c4ebbd86381a851edc06c63ed8bbc328a770d90e032c2edc302a6aca58b3624b6beab6
+EBUILD commons-email-1.4.ebuild 1089 SHA256 a4a65d818c08cb0779f4f2a4e3c4638d68e48e85e48113ebd4f592a34cf72f76 SHA512 a85d7e3ec14da9425519bf15ba4f4e576fcf9ed0dc5c3482ed9ecde53168ea067b16bf0aef6b06668ff0b6a0a224a20b1943c3a834b73764b870b52676cddb83 WHIRLPOOL edafbc21013a9aa20a3bc6b8ed784aa360e56f91d156855c7251029c00e9aa18858f6d5748e2f2e14fdaaabce1a1f1230e93351db0a41ffdf1a8d52f28688277
+MISC ChangeLog 1360 SHA256 14d06eabc74c623ffcde7d0a3af1df7226340175f48a1913f70ae347e4baf6b4 SHA512 38fe80d6e9821a0695d22bf15e3dc1c97b69559f076850866579bb2e15abcd1587dc7a9cb2fc0004bbb30a95200cf58a29048f41fcae67c28daeacec8d64042b WHIRLPOOL 25e8cec915a38a2cd977ce67b0b07cfdc3b20e2a1fa79644a7465435b3539f23c007d6d1e96228663750704a1ee61fd4c7da90f3eff4e7467d8a455b491d3fa8
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/commons-fileupload/Manifest
new file mode 100644
index 000000000000..620ad1a79c22
--- /dev/null
+++ b/dev-java/commons-fileupload/Manifest
@@ -0,0 +1,7 @@
+AUX 0001-Remove-bogous-manifest-entry.patch 744 SHA256 fe4db687d9104c1f0c9c1a5da4ea7394bc87853a0f896dc2c2b22546888b0189 SHA512 a952ea640ca36fd4e4f2fdf13053d4487a88bb5bc95a70909f8202d46dba1cca0d2aacab6d6fbcf3cf8dbc6cd9b3e7b7085963d4ab9b7bb31267a63a5c037db0 WHIRLPOOL 9aeacadc54fa4da49376f5326409ef01b208dc8e45033617530f3d19060446dcdf43278ce0921b6d24acaa7ab7878f0974e7bddb86d8216594315ae5c2717621
+AUX 0002-Fix-running-tests.patch 736 SHA256 a46fdaa94c18fe6fbc7a03342b54bfdec4cb85a5e067bb1c997880f4b20d50b4 SHA512 c29c2c7d67214b940700cc50905fe879791c451686343a3a52fd840c95d8210663bf667548207d61d53b9967187ca468fa2dc439b56edc6bc137ce0c955fe289 WHIRLPOOL 7bb8bf4a47178de4d7b2c6415c3032cf93d49dca0f8835e2e57454a34a0a4539859fa3d55a8afe67abb1623040736dbf6a782fc9fa91680922c212eb5a5f0c57
+DIST commons-fileupload-1.3-src.tar.gz 137105 SHA256 4bf3bfbaf7c25bbe6d0e2dc6a47479e16d42ec1b0365037ed508eeac276e8dc5 SHA512 dbaaef89eb8b4be3555f0736919234b42217e8b6a021dcd99c11d18462b39b10ba92e25bafda51d1b1fcc306c9becf3fb124d03debb66922ab5442197f6360d2 WHIRLPOOL 37803f31084977e4d58d4ea67a7e50de7a0c9988f6787e7e296e95678d94b05b502e36196d5e6af420e3fde0e3a11d94d9b5e2e2781c06d0f04130f9418ca6b1
+EBUILD commons-fileupload-1.3.ebuild 1324 SHA256 3eaeabe0803342e15a46878ff5922485653ae336e62c25ced5c5c48788772f73 SHA512 5a549b74a31dbdd80c1bf9dd3cd8fe756e09118643dd72ee83469be8304208031395659bcfe495657aea50b38d5c7e505bac07734f3ab61bdbf11b3668c59e40 WHIRLPOOL 1312fb0fb251c9030f8bdd287af611e336af3a676a1a88558e921beda0637cd31a61a3a900cd51a121bb5f79e645f09b206eab85aeb2ea399cadb39ff380b1ed
+MISC ChangeLog 3050 SHA256 4ca3c2f4db6ab1ac44ad6a9d801cfc44f879cd13353978ef92c122c137fa7c8a SHA512 3c90c1645a349f265e6038f551d5e07659d3a18313e6ed913b89b98094b905816690277a74aeba8311d3fa4bf664813037d6e18df4e119f38401bded0f1b5521 WHIRLPOOL 3dd8973b5f968825251c626e15a02a0a04bb3d037b2ca8ffd6336cdb48d7f88a1ce92f5550f64bc78d65c770286f1266a16d40c1b700e5569ba89346ba6c4294
+MISC ChangeLog-2015 10312 SHA256 27b5ec0656c9ce896681499ab013f6a9bb270695b915206972cf00f26fbed13e SHA512 e7d955cf809d43322674449e7fd0420684d90654b242b2bed55f937c513717e22b44ac40d58642a09a0256fb46139788d2c62d8fdc461431d8f0cccd8e18095d WHIRLPOOL d243430adf4cbb3f057380a0606c23541e7d3b46d7c226a90ac59ae2765fa2547eb1b54be8b7b2872817779699a215247f865e8a29940ec7847759932f06c73e
+MISC metadata.xml 749 SHA256 42d1bf545f5151bc8af429069e3f761d579540c621edcf54398a1f18d2ad35d7 SHA512 e18d72be4bcc733ced0cec17570803ff311fb9b31f28367ea2094779e0da40b379c20134fe2b4e81e9f21acd0372115671d41b7224c2f4a302123dc58d12a8ba WHIRLPOOL 58104c5c36b0d8dedf585b7dd8cddaf0e23d8e70564a3edeb931155ca975b853c85a456a2ddf3fdbcd41a170969447acdc7daa4fe9bd5e3887ed3ec3c7f7e11e
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..ee615f821310
--- /dev/null
+++ b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
@@ -0,0 +1,57 @@
+# 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
+
+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 ~x86-fbsd"
+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/Manifest b/dev-java/commons-graph/Manifest
new file mode 100644
index 000000000000..40e8c84b30e0
--- /dev/null
+++ b/dev-java/commons-graph/Manifest
@@ -0,0 +1,6 @@
+AUX commons-graph-0.1-build.xml 11134 SHA256 d1d9a17692858aabe1a75c0f1a9d8de7d6cf7062d26b37e313d90dcf08d4df92 SHA512 a2ab4d7cccdf79b94ee5af661039cb520d7c16f8a868f00d6e2329286690edad94fd162eafa650daa411912b8f888e81e809184b94124f1c9436d0bdd009b160 WHIRLPOOL 1a14d08cca71fe103406b960da0d6507ee40e1ff77a85cbc76e5ea99686608ac57830a3ef6fc41b8fb99c9b6d72d2aaefdb8e108315049229f30f5e05dcba2b5
+DIST commons-graph-0.1.tar.gz 96009 SHA256 b68f5c7132e9eea4872dfc0d5fd74c138d2489355540dff752a91311cbac040d SHA512 7214fd60eb348a7feee9c194f562e5a7cf1f211ba589d2a85eaae52ed3ced7089842405dfbd99413b1f06f87ea1a19d244989daa1e0f6fb857fa752647d52b16 WHIRLPOOL 90c014761b2a1f8572eba4339f2ea81ec34666a83c21ea27326b366f0089cc5f20a5d6bc53aefa1d09019114b34f424496af95a604c1b55b5bdfec879ab51a0b
+EBUILD commons-graph-0.1.ebuild 1104 SHA256 f122b130e1feee7c9b49de43ded4335dbf305371cb50afa1ced29b7bde782c99 SHA512 b15984281bd5662631daef2524984c2a9727f5851170ad17bef8f50fb2234f911584a302bd2ca19933428a4f4e851dafb3ecaa27903430355538ce6a59b24c0c WHIRLPOOL 7cfef90f3c735d1bda34a3b17e2bd663538c27b717e054122a2b2f8cbf4eb4665b65bdf06639ecc1c0fa898d8bfaa4638e4d54dde0426f90f8bd7ed2058803ac
+MISC ChangeLog 3443 SHA256 ab640e262a371c9ae4e6f5ee22c9df80e0cc981e5ffbb1baf58359f7e651cbf2 SHA512 b5b376770aa4ac7353188fe169541eb9f1546a54620e0a814a0aa3dc10af5a3d01349ffbea66bc5f5875f988424f67598092fd5400a696b02a9e2c1f57a5b7a4 WHIRLPOOL 44bfdd7c068a4bebcb3896c2f418395c366c371c8c82a15b1db0f1ebad962731ff93e496f72c123f711525772d9a00c0254ab07c835662cc1b10b4933d8d6aa3
+MISC ChangeLog-2015 1444 SHA256 8b38392628bd2e1fa583a87836e493cf76f94e9394e1f11225d9c57ed942dfe7 SHA512 d84a8fe839f242151239c881b6fd4ff4a08562f1d68e8388116955ae546646e575551532df58cc8b40f06f52e90b7917ba278a9e72ad8fce1882480f54b0a947 WHIRLPOOL 5630b8c174764d43dc59d0cfc4fa81524b1af21fd6d9f051ef4a84bccc8652f20f71b412cc978f6a08548741f3ccb5eb96e8c594d85156db44c02d01d2af6a04
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/commons-httpclient/Manifest
new file mode 100644
index 000000000000..f330db5f22e4
--- /dev/null
+++ b/dev-java/commons-httpclient/Manifest
@@ -0,0 +1,6 @@
+AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12400 SHA256 ea7bb36773c12720b3dedbdec6b37bf5d20c07afaad5c8eb599e462808661e0a SHA512 3f20161688bcd40497747fc2e5802d12881d10a071c04a151d56b3603f81b4c14f56962b83ee72cc38d1e7a4e7e43e51426f00d06ec983feb23d8771df237c2a WHIRLPOOL 0bc3353d50be8721244933115fa7a7333e3fa2a6da8d62afd56dd93d723a575ebe0dc715c1434314cccee8e3086b08ca0909fea301d6452d42088b90f914b22f
+DIST commons-httpclient-3.1-src.tar.gz 1882664 SHA256 f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490 WHIRLPOOL ea95a7fd7d6dbe0dd2326b12274629eba611014e0d2461dbd75500d3f18188d30962bf132c2a7fea98e51a81aaf44cbe097f27d8b3894a5626680ea893ea51e1
+EBUILD commons-httpclient-3.1-r1.ebuild 1642 SHA256 12ffab46b8099bc8dc40ff82fa25fcee5179582a45fef077bc9eea41536e8f81 SHA512 971b5e1b591d18630f2746ae0110d96438e0f60724863728034c24247de78a4afa93fca2d9e806065c30204250d37ba76f59af9d6297e1b949c178b7e3a3aa01 WHIRLPOOL 35fe461d76198a9866f2683e8d7b54fee720b56d9b06102bb47df965a5829386041445db7ffdb9094ba7d704401abc5fff9634fd40293810b4811041527786bc
+MISC ChangeLog 2685 SHA256 502e53d239f4a03d102d6c7fbcd17a77622530198f37005216c98418bbae4d0d SHA512 5afa0211f0e8e08a4ee169498855a98ab99b89618221ad6cb8675b25a764cc92fcfd21dceeb9212d43467a23f37343e605a5a45b59717faa397d5c7c4dd0717a WHIRLPOOL 1d81289b7c5b2a7c4acb6b1e0b010570ca3beeff744705d4604f8b4bbecf5ae28627e7109c172f5109cf47268775b00d0f24ca2a87590f38a3688a50583ae726
+MISC ChangeLog-2015 10832 SHA256 d2089d268976575b4eef72cb9c70c70439e55162b1eed07afc27e3de159471a0 SHA512 511fe7d0eb815c63fd6a14ebb39817fbab788a5a8c7074fd09663c264d86672966990d9e173c003df31d41b5c91720713010300933290005c0a51b06d5cad942 WHIRLPOOL b180d70dc395c04fd17ac4a2ad26e2d6e32f9fe6211f270e0e0223ed0523362618d11e8584682afd7e053fa61d4d070f4f9ce50a0260b855d99fa917caecec88
+MISC metadata.xml 456 SHA256 8be116c0ede52f26ccb58be0ee5bf7ed3d29416b42674e85e8980331d0919cd1 SHA512 27c629a07a007dd4336cd50f4ea32156ec301b02f398b008c057532b36bc0698132282e32007ee31f0dd21f3f5664b3d7c9607fe43a4dfbbffb67d3000c3a661 WHIRLPOOL efb78597d1a783d602aabd42a94270945f71cc89fbd255dcb73b921ee441cf0a4d2b052ca45ffd2a1503649038c51ea64602ba56968966a6b88f21154bd4163f
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..d72a6b096347
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.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 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 ~x86-fbsd ~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/Manifest b/dev-java/commons-imaging/Manifest
new file mode 100644
index 000000000000..a21f703e9426
--- /dev/null
+++ b/dev-java/commons-imaging/Manifest
@@ -0,0 +1,4 @@
+DIST apache-sanselan-incubating-0.97-src.tar.gz 33317875 SHA256 1ffb2f0d4ee109f1070d5687da1d6bc88374cf363bea5c95bc838af05091343b SHA512 b7e8af01f4b4ca812313bbf573758d9c0e1355266bfb83898336b14c4b492a8979f2a593f00d53c076e83cf807a049df624491a26623cfbceb00560b748f05f2 WHIRLPOOL 4c5716fb1a034a44f347163beabfdadef4dfcdea183bfba1ab6dac510ac6e056d40243634c43ad8e8c6dee636139407e89081026893068fbf380627a5ef4c83a
+EBUILD commons-imaging-0.97.ebuild 1310 SHA256 5433de2d0edddc9106ed29b0cc53c3399bdf7c97e8be0e257c34870e7de2dcc1 SHA512 c17518c2a4edc116b0311b5a9b97b56b8f6a098448ccea06b15c2b3832f339ff136d897d0c3d120f6deb0fde7947cdce7f40e01ae1c31ddaeb35fa8a87aa35e1 WHIRLPOOL eb01b906e1792d33ccc9ee2575b508cc39d40b1425c7a59f91f31f10e70652439fc1a43e585c8bd835b5c31993c927c600787f9cd0e99e37c60aa2f8a25bc98f
+MISC ChangeLog 462 SHA256 6c9c1455fa3efbb6a1cca444a1255b694e5c778d30f38074d23e9bc964df0535 SHA512 00cb14fb8228e64a8aba7bf139a086a9b1ac43fe51dfff7424a75121beac76fa6a1f5da23e8f287f1cd3d3d2e4727d05b2d536e7ccb48ad99afb476c372cb923 WHIRLPOOL 962755542c229c883c8240d534e90e73ab8a0ea617393b9802d3fc22d28f51537e10ff5c32dcdb0adadb199d85609ddbe76ec03ae1d5238e8118865bd3b1a6d5
+MISC metadata.xml 1077 SHA256 70ba11fb2f58ccb8e08b93bb1f1325f6a4491c67c43f8a17003c31b236ad8f96 SHA512 11d7112aa2a3d88305c1c8be811875f75095d60b877f754a6ec85ed763638a110385b18e8f9f9f44dbade41c064e3c5ef163e98de647074cae873a44e65b3705 WHIRLPOOL 21694fa1239fc55591e09e35f8561fd356e3c1d8ad4b8cb0c3cc48e41dec484dd7140dcd171bbed20f771e3483ef027d40ad1888c907647c73c31c7024664e5e
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/Manifest b/dev-java/commons-io/Manifest
new file mode 100644
index 000000000000..8d0c2cc615ad
--- /dev/null
+++ b/dev-java/commons-io/Manifest
@@ -0,0 +1,5 @@
+DIST commons-io-2.4-src.tar.gz 330961 SHA256 961c8b41a891933c2d662d8e490667243ac82422668d1ccdd7bfedfdb944bb58 SHA512 69ac5f7b8de952d8b519ad89d4e9a33a9d269af0e68b735c0180ee8853a30e2a09147ceac362626a2fb3a041bd46eca094be2661ff280c1bab54a0548cae0aee WHIRLPOOL 4db6be6dbba4e3c9f67c471eff709ade22594ef1cea759da5651fa5788b1bcfeca689621eb3ff7ca52dca0229b096d597e9f5cb969ebcc7a06ff18f28ccc3551
+EBUILD commons-io-2.4.ebuild 1568 SHA256 a2b6881c1aa18699e6e82a875eea071b1f2771d6cf57de6084038d766a6ba488 SHA512 c647961b7f5267f97aecf5009b1963d28262968c914a61ac18b6d990d8fc4f28fdfe571f3b978fe6ba4725ece019c3d0be4d3ed8a00da1413f6371453c3d7d48 WHIRLPOOL 1c97a3309248466587787ad352c7ac2ec2d9cddabdb48ffcb75249b880f0a1c3bea6d356d4188c7019ac87e1ce44b9d76757dcd8a5eeabbf23e3eadffce9183c
+MISC ChangeLog 2981 SHA256 44c4ed21c8bc335b21203b564efa08139ff2f20807715337241a6ebbee83741e SHA512 45e8e6b8e4b6eff06fa5211ce2dfe805b42243c7798a2165e5872359d0a4694ada3aa15c94792a4a8aa32d42290a1e787e74fc9ec2e4b9b524792b2be015602c WHIRLPOOL f0ed23ef290fadcb2b31df6dafbab6c06a586f6144dd98e6cb0cfeebf7b810147ebc14ba10607329b48696ae91eff35e79218219211d6b76674fc3d9b8494610
+MISC ChangeLog-2015 8105 SHA256 693e00a76609ae7452eecbff2d3b60d505a234060d120f08f8d40ad1f9e89c8f SHA512 2b71c274b460e22c56193636bc91ed972bbf566ce9a8cea3b7b4d2a2a99585f811f3e8456e385497677267e59c3291ee1ba07e2de953caaf6dadb1c97b7f1512 WHIRLPOOL 93c942ad6338484e2f977b1e4b26f7ce5111c945c0c3182a0684dc3a3912c8498a883e323fc270b74c9b225753d3779d58f6f9cfd33db9ccdd396e9fc3f98f5f
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..a300a552a885
--- /dev/null
+++ b/dev-java/commons-io/commons-io-2.4.ebuild
@@ -0,0 +1,57 @@
+# 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 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 ~x86-fbsd ~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/Manifest b/dev-java/commons-jelly/Manifest
new file mode 100644
index 000000000000..4c1443faeb33
--- /dev/null
+++ b/dev-java/commons-jelly/Manifest
@@ -0,0 +1,6 @@
+AUX commons-jelly-1.0-gentoo.patch 2224 SHA256 0e064c87ae4a2a91f7c98c546e0f3bf9f9ff4caf877e0c2f28a6b3443e6f3533 SHA512 726b64273320f1a089ce9d9b8121359cc377e070ce4b49155de52ce31559d0601b137fb6e208b8c5ab696c64224047592c26957ad3d7a49dc390b523c821f7b5 WHIRLPOOL 6b09b85d489eac94ed99d92a999f513033f03f20f7472b4aaf7c76745a8b2a3f9087c0bcabe379610cb591fcf7f99c7d0111fe4e288d5863d75767a6b61a400d
+DIST commons-jelly-1.0-src.tar.gz 174769 SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1 SHA512 a72ae2dc8eea3fc19838f386dca38807a16326a3a93f483219212844f8ec033088b7721c78a4370f78a06cbee0c685144a2b16f171d54134822d06f653bcef35 WHIRLPOOL 3e92b517ce621cda2477354a1342c59d7cf7756edbc3c7746c262f5cdca5d015976979e35056dc2f588de37f4b882f21929e8c7a095251b1eba5857115659d2c
+EBUILD commons-jelly-1.0-r8.ebuild 1539 SHA256 84ef6626be5686e32a8971c390d68aff5c49994bcdec830b46fb25cc6d52344a SHA512 b6cffabfdb0087b8a42492d19e413093e65d3146f0843ab8246791509376d1870996acabc9dd9e9eb9807993957f962f663b7c03ab779d4fbbfa6663c7a8a504 WHIRLPOOL 4e54da74d344ad2f320bf724ad428d3869ce405a3f3ba4129a536ed0651271726c8dc8ef08d4712854f83afedcb043cd7362ae87efaa8401b3506cfcb343e444
+MISC ChangeLog 3292 SHA256 044f120a499d5622b51c7079628db421157225180ffbcf058c057d423556998f SHA512 6cab4f03512321cef435082492b831828d3ec05d8c33eba5c3e57119262e30ccc316ae826eeac3dea02116b7d6696dd5ffd56bd7e22a1d2b482bc4cbb1fe0590 WHIRLPOOL 444cd51e1d07e7a0296cda875b2542a0cec241913f097de4c789e5dc231eaa6fc51e30c59b0406d862fe73777f942961e81b21987954ec34bfc0d1388c260dfc
+MISC ChangeLog-2015 3388 SHA256 fe6433c796c3b25ced627a938241f1a2da94e5cd14e0cdf8b831b03da65e88ba SHA512 a323722fb871fba72c869e51b316a0261c3d917042293040a6fc15e7834e3ba465ebba2190bf10bfb35165ec9dbf14d627971b73ad4cdea7deecf996baef95b7 WHIRLPOOL 83d8bafcb1332804dbe88466b425a1f1ccb25fa8edb54a8c3726f4420f3c923d4042cfe24290eb1cbf4e8f1576192e2841d27f6293d667a965a75df0ad843fc4
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/commons-jexl/Manifest
new file mode 100644
index 000000000000..79db393218c2
--- /dev/null
+++ b/dev-java/commons-jexl/Manifest
@@ -0,0 +1,9 @@
+AUX 1.1-test-target.patch 607 SHA256 1483e77c6ae7a0ca1f12ac95074392b925543b2009693dbaa02d6dbd7571868a SHA512 cd01b044ca4e4671b6419ea17cd6a316ab7ff709a08d2999d8b34881b814a48470fe495b2d6c468a5738f1284dbe9e1aabc8d5effbc0a86f210f9757893a3668 WHIRLPOOL 992aeee2335a62bb45e088a4968efdbc43bd3d10d960fd349a988cf85ec4168dddd55bab8b5b6d601ae9a87eabcbc68cad5e5b00ca0ad787594988a2e985bfef
+AUX 2.1.1-build.xml 5742 SHA256 34c5c0c629941e89d6daecbc54e7a0916b69e2eea3a76d9a8253555f2cb8f038 SHA512 f19df3e608bdb85681e90e3e331b1920e9c9be2fa43da38cb9eecc9c569d0254ed5a75dd10962442477e076495bf63e902204f49545140a86c5392a4c6bd78ad WHIRLPOOL 220ff865be03038fa5b8ac918ef33f5cf8e947aa384dd164b138e29b22be383b58ce70553ed7549594584b7696e3b34fa4271bfeaee47cc379b3411f7e8cae11
+DIST commons-jexl-1.1-src.tar.gz 128030 SHA256 62026d0cb3edecaadfdee1cf3dfe70a27b7f7ae70a219d7cb7c0f37db57877d5 SHA512 d403e945060385c4546cf173af9ec4a795c074a9b56aacdf16f301b875c9f78b47a91fdfb84059805a082466d8a4a371bcb6ef6336e6ba806272ad8e2cce9e13 WHIRLPOOL e2ed6bac38718a0daab839d5bfd22ed33bf4c701fcdf3632fee294b6ff479b661b5d179d5119944035485213e035962e06149767f0426c3ac99db8869d5fa325
+DIST commons-jexl-2.1.1-src.tar.gz 208559 SHA256 5f06cfec88f0ce1bc51958e9ec1410af7029f2a5eb2e0b167d5d71bec43027aa SHA512 259c0956bb10f102cb3d860b1c99d3d2b2bc5d705e4160f743fa774640ed8c1ee6f3aad518a8a69e8f94a164b21cb2ae26e47cd3e81e92a086a3c3f753befacb WHIRLPOOL d4a7a56cd7b5aeb0d568b3c23b763268a651da9b2fcb76c6188469dd617993a5939f4ab0ea91efd6df2f3ad9daafdddcff046693a4ecfe5585ce95abe68ed6e4
+EBUILD commons-jexl-1.1-r1.ebuild 1085 SHA256 7a8442afb4a15a95470051d16939cc9053dab328025ebeba088b03a7a9819631 SHA512 96f6a5e42eabac7408059b0fd9fe229135857afc377a9d5b8626cc06bc1ef81c13cc0a7d18377231f3534705a3167538a7e72b480478faaa01a20dffe7f0f240 WHIRLPOOL 69066ae24a5d3898b592a431eb6fd7ff3050000796dcee472b868ac207810b15e658d8eb69756edbb296d4acd4f6077a4856cffdaccafdf0caddda04555575e8
+EBUILD commons-jexl-2.1.1.ebuild 1563 SHA256 9f6ea130bde590f9169a22b65c8ba26005c3ef112af0d9bd1d1762e3273187bc SHA512 f0a13af541986aa9bb54148d88716f2e8fdb4ed2ce17eca0d163c71e8cc1cca7cab1412ddc768ddc505417e03703bb9a1a5ea177aeefa3c58f54586614c7c266 WHIRLPOOL f8117de462e11689a4682af4183b709bd4211b4f7a8166e509cb07c5bc2628f448fe148a1a2bcd7877c82afbbd301946530f0b88cda95876daf2b35bad8ce5e7
+MISC ChangeLog 3624 SHA256 972d8f48453f72865f723210dd997601e6a99b24a3d01095f017e02d00719ba0 SHA512 bb02d4eebc92d0e76c52f46946531315a39a1914b41f1d4c7ded2a03f59196072877577eb9fb30a17eb8d3fdff7aa1d49a5ec4c70b074e338868a020404e2bee WHIRLPOOL c6c9e148838d4db0c182041fe526d9fde370fe73d0b790237f4055288f3094b83b006c954af9a114fad1fee11aee885c297ae0df92879989db3a67e9dbdbf67b
+MISC ChangeLog-2015 2036 SHA256 88ede1c34b3b5074ded3105baedb74d923a3cd49804d31b134f65b149d1a94f7 SHA512 ade4062c4c3e09e3787ff1a075d597e44a17ea533966a8eddea93b0902933954ef6ae11e01b36fbd8317f5b5f117841dce25bc77ae7c1154de0b8179949fbe73 WHIRLPOOL 4116794fba1bde2098649ae668271081855843289572247bf3b140bd479495615db3c7b7f4f997f166b1a05b06dc62a084906e1a732d932f064d22d99cc60641
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/commons-jxpath/Manifest
new file mode 100644
index 000000000000..ba528fa4f8dc
--- /dev/null
+++ b/dev-java/commons-jxpath/Manifest
@@ -0,0 +1,5 @@
+DIST commons-jxpath-1.3.tar.gz 285339 SHA256 da314198d75c6da660e2603bd1543a8f5d0b640c5144b748e62e59afc278efe6 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152 WHIRLPOOL de683fa0e2d985cb57b434af224d2cca73d215d9429b97dc940933fb4a042638227b8fb342d81a1407faf740d1a42c3d5869fc2f78307e558fffb6dd97f36e97
+EBUILD commons-jxpath-1.3-r3.ebuild 1428 SHA256 1136a696c1712b90562439a644108b302de9c18c9a85671605867bdc72bf8288 SHA512 9df36ed8a4341e9ddc38794e01597f0db6455df4d1b071fa35c10ef34053dd44610d0e3ccfc73a7b7f064a0aceeb8e61b0275fd552fd9de0a9410de6781cd404 WHIRLPOOL 64c719ace925a00f76a9e93233bb3f68a773c3b9ea0a8702c3e1f1791bc3c26c80f71ff38be65acddc59fcc985367c610f1ec8629f02abb53c3517b0056d7b07
+MISC ChangeLog 3878 SHA256 dce122097dc94e0a7f27c4bc2c7136fd795d8ea317e2175eaa0b74fb8eefad02 SHA512 9be26ca374102e90acf19ba6d5420c0e0bc082415b393367907d7c13dc3064e056c4458cd797279b849bf1a33a08735c699d174e33f4ad90d3bdcba8e72ad252 WHIRLPOOL 28138e57ccde64d74c6bf79bdc436ab5b388a1282548a6b931624b08aaf1da76e8aeb4651e51b2f90b99fecac8b998503276facb289a0d283b7e71e3f1ae3d30
+MISC ChangeLog-2015 4851 SHA256 fd654376195533bfa4fc69abae01f0478640e254ce01b537f9790ce60c21bebd SHA512 bbdc5dbf62966a252742ec52c5024fcf32fed0ace3987445af8467b3b9906bd7c62d68eb3622f608d16a616f9ba77859c4d0c3f3fa52ec580d01ded3fd270a11 WHIRLPOOL b8718800ad94176867c28da2ad764a350a9a81185f72e81b2a052303169e15fadfc5d1ea129bec77edb1d6615a81cccb247bfde20340223627a921b52977bda5
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..04c796d859de
--- /dev/null
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r3.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="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 ~x86-fbsd"
+
+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/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/Manifest b/dev-java/commons-lang/Manifest
new file mode 100644
index 000000000000..f99ed0ba17bb
--- /dev/null
+++ b/dev-java/commons-lang/Manifest
@@ -0,0 +1,16 @@
+DIST commons-lang-2.0-src.tar.gz 440989 SHA256 40e159aa08b4561472056d369c1b4e347f251fd088a3045999e57f4ab50f34f2 SHA512 aecbbdd8eb2712981dcd8615bac2ec69e3ea7ae137407287d2a9b3eeaddb48e5367bc9c5cb8d232429ac6091548dac8af67e0593366365c04fcfe39984c3e549 WHIRLPOOL f0aa3e533fd3a276d4e0ac84a423f6a4cac9d2fa6819913dfd9f6300871e468104580b11e56d5c530df237b2312b71eca7886d8e7696f1858491e8687d2f42a9
+DIST commons-lang-2.6-src.tar.gz 564032 SHA256 05479771851be0af057032fa26ad90aa0c91c10e1fc4439558a1ffa6f053bcd7 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87 WHIRLPOOL 4f8ee67677d83d5b0c55a6200e1dd06169863b424fccd879f3d0f64a0051d69e72a72b4fe6bcb67f1ea27eb9b55115e6ba05fbb2d51fcd500cf1a4c71fc62b66
+DIST commons-lang-3.6.tar.gz 852347 SHA256 50fce3c35af4ef6c4790bbd7e2b8c1c488357311eb4be3ab7c53fbcc05374420 SHA512 fb627605154c1b3d4561c27ad931bfcac43303ce98ffca8fca538ce6368506cdd2b80de7f22a93ca628e86804923940dd9909bb884c77ca196b654521febc60a WHIRLPOOL f63c606cdc0cbdbc466b298aa6aa402c0c5eda73d4eb3920d8213047c3c4e31dc7e52c692d9bc75a19cfa3f85cd878d46e5fe6eb15196038e3d0b698d47122da
+DIST commons-lang3-3.1-src.tar.gz 638619 SHA256 52ff56b0350c38f0aea678f0b054c09ba8207bde6fa2a55331fef1793b991ffa SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560 WHIRLPOOL 81a4c55177c802f6122bd491b160c1c7f6636043c3afc2e6f7c98c3445ccefae032cd2fbeb68e223f3456e18a46ba4103d286fae72e47804d9148098d295465c
+DIST commons-lang3-3.3.2-src.tar.gz 740462 SHA256 513ec853dd94d88539583aa9963451d860837761f64ffdec52d5b17f2f6f6ea0 SHA512 be889e0e9d7aaa7d6635e41c17d19dd1e5f9e03fd78eac61fd5f5483321170b9a72007ad0bfa7023e6ff55ae418b40eaa01dae350641c4e88138ac59d4001667 WHIRLPOOL ba45bd054c36b5636b2da372cbb605f6e517acf96cc55527bb290b1e5ff7ff1fe46d377b176f8b38c7db9ab2875ad4f68c4454782c6761546190ac9a3eec0cee
+DIST commons-lang3-3.4-src.tar.gz 771275 SHA256 6f9a16e264aec59e4c7148763223480171f756f020d7a30aa617caabd382fa76 SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5 WHIRLPOOL 936868b77e801236fee14fe692fa21b695cdb398d2761fa358babf99a8b63385d80b66ed0b3bd8bc9c7ff04af5e6b55eb50c95eb1280c6180d600a5f777422df
+EBUILD commons-lang-2.0-r2.ebuild 874 SHA256 cc135e98f5b893b0dc36a180c934328107cb3270e02035070be20fb3342b6789 SHA512 ee09f697161ca674c55aafe4ec19cbcf2c925410836077f7707da6aaac2e93fbb1491957967b0081da7b459807570f67499911f6f3740313e08669619e86c965 WHIRLPOOL 35d372e90be1f119338f5b8e07a1f0fc208c36567c288494d39d0b55855cf574a17798afade16d3392aec02f71b853751a93ad27a6195cdf5c635577ed1069d7
+EBUILD commons-lang-2.0-r3.ebuild 873 SHA256 3a996af10cbcec402469b1e85ed941bae41245fc3f4f2e31df225daa2ca76f7d SHA512 195d39a6646005cff173522dc4bf9e984b953bdd4de4459d11ec6bddc1f724cfbca31dabb6a871b55006a303ad61cbdb51a89b0055d9849f663818e55942a13f WHIRLPOOL 3b140286647f4f1ae95b87b4b36065f3a8e0b8cd620a4cb9e23affde19e5ea824599481618977eb36ed1085a04294a093a59deef7b38a0a49baae183826f8862
+EBUILD commons-lang-2.6-r1.ebuild 865 SHA256 e088dee2ffa1010061a0eef3035afea160d0799a50ab1fc869e66eb89dc0f112 SHA512 893587c23721ffc0b9c1254b32c1c202634d0c714c3021e0106cbee4331a04adc2780f2f288f673e95399b489d23bc96a426c474c7f4362a3860364a7652936d WHIRLPOOL f6a53ec3fb7aa8c1a1fb2dfcf169cc0ece20583de7ecfbd0c209097eac344a780647abb6f9d5cb0f2b5241a5ac59ede8b2dcf4b9afe57b13a4ef0c9e3e0c8e1a
+EBUILD commons-lang-3.1.ebuild 851 SHA256 1f070ee762bdb4b3fe0f46a17adc54dc178de07a3ef37ecad035095976cf9b2d SHA512 cc331db00934d271e25edc53475600f4bbc4c7d4322322bb72953eb9576f977faa8565e23019a383e9bf964b72ef6cb5b7cec592d25183b50a5f9f18edec2a26 WHIRLPOOL 31d8a56297bae5d06f8f6945e462bcf9fa98e7259c8b1fdc96f291aa0ff7d6eb25228d7a2853119cb4da12cf30e95f62a00277adb52dd204ebe2179c7bb64b75
+EBUILD commons-lang-3.3.2.ebuild 1122 SHA256 b67d71e22390c35946c0d09270fc647a1a251cd2469e7ee321757529d3aa7361 SHA512 4ef5e8655b0d0e398d9f936e07a2562ec74013cc1bacbda351a30934d102f1d75e59f8f6b7cd9e8240716e5d3bd26c4e8935ae3587b7d65fcc60601d29e9aa2a WHIRLPOOL bce38d0132cf21fd4603e251ef13984f8243ed35847283e860dae235e54029f85ff679bc6e945860b8558fea584872f5c86b74475bfeb33d5a3fa08723275e30
+EBUILD commons-lang-3.4.ebuild 1120 SHA256 55382dce53a4985bbb4be77d3810e1f65c769aac21bd352c82a2ca56afb6a1cf SHA512 001daa92626cdd7b55c3020a40289886f8ece710cc9fb2353ab19f543973dd6ea5fa88b8faca07c13ea476c6ac73e02d677f53b28c82dea9959b45b66c2c5e41 WHIRLPOOL e190fb4bc57b4a926fa9953cbe88b632b32ac5c682398f2a1fa6b4530ee6df19527361d4c62b652211dc923d216a96f9d2cb62089930c7f81d344c780d6a91b6
+EBUILD commons-lang-3.6.ebuild 971 SHA256 438f49d4e3a086e57ade676b37080888ac69155430b5e073bd4fda7323bf0603 SHA512 bf57956305e5c7146f84b514c6cbe5c2b9d4488f34cf07bcf28495eb4ab3a98cc187026999b5c7c332151918fcefd48ef58c79c77a38d7fe2b2347cf1891922e WHIRLPOOL e3fe926119bed90f66107ad5c30781b78f8026de2cd27fc762a3e2c70b30543a4c1f375a948b4a9e923e2558450413655c32f3f8e4ff80cd2d422afdeaa58692
+MISC ChangeLog 4000 SHA256 c0b55c7487874987d7c6ba5e0a58466c33be59772a01dc146081ef887a8341fc SHA512 ba04621dcb16440d17355ecec9951951b2191b5b33511bcc5213bd537236b8324bc226041f4e251baa9fcc734cf289890cd8f3a3f398d1478fba421a58ae545b WHIRLPOOL 43f6c199e9fb678fdae0ba826b73b6d294d4a951d557c169dde7f7a38568e302aa9a8e3d0009b87e2964d1e27420a169a18d3f6d3477823e5b63934dc639f0f7
+MISC ChangeLog-2015 9106 SHA256 9bc0fb9590c9f1799900c451c281aeab0065d61f249df25b36be15d47c3987ef SHA512 44d2946463905ed8edae9dda803ff32977111374b4649bb1edcfa498f196a81cac4f1988ad1c9e71de5c9d3ba45ded0be67267384494c8334ebb324aa23b9aed WHIRLPOOL 28d071ab05538707763670db16e8a9a0926170e9b6ada9122bca7fa85cd9bbfec9efb5f8518118b76428189a5d70e80a3c7230dee7a8572b20b9e5ed23c211f4
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
diff --git a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
new file mode 100644
index 000000000000..56f3b88e3f97
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	rm -v *.jar || die
+}
+
+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.0-r3.ebuild b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
new file mode 100644
index 000000000000..10a1b6a7e15d
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
@@ -0,0 +1,33 @@
+# 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="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 ~x86-fbsd ~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..7845550b508d
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.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 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 ~x86-fbsd ~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..265797d8aade
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.1.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 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 ~x86-fbsd ~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..1a5ef8b518fe
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
@@ -0,0 +1,50 @@
+# 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_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 ~x86-fbsd ~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..ccf3f9c9f688
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.4.ebuild
@@ -0,0 +1,50 @@
+# 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_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 ~x86-fbsd ~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..788f7a0b4eee
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.6.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 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 ~x86-fbsd ~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/Manifest b/dev-java/commons-launcher/Manifest
new file mode 100644
index 000000000000..81037978ae36
--- /dev/null
+++ b/dev-java/commons-launcher/Manifest
@@ -0,0 +1,5 @@
+DIST commons-launcher-1.1-src.tar.gz 76558 SHA256 cc52afb97ea4a224d7d9c82e96c30725a290bd6cd44586e8a10c3d145bd3b83a SHA512 87f275ea1dbd08394c173da21023cb761175ff222fbe0ed6553fa6ca34eef775b57561227279216082556a8dd37593c9699a3e0c059bf3da98dbd2f1d3f58ddd WHIRLPOOL 0da4e77cb9166c806a4285b2efbbc5dadb79c26fd6254c4e2d6b818a19c5e675c52854538d0d73d30711ec6862cfa3cabfbc9b2bebdab2d650835cafece28fc0
+EBUILD commons-launcher-1.1-r2.ebuild 778 SHA256 c8a239be0aaf5272eaacc4d58eb018f7c21ff96d11f82596fcc91634e63ff876 SHA512 377e0572023a10161049fe16b5120adc3da11e091e3eeb91b21a3c133133e048ad2a2947a4c6281d010d98cb14231ab2c801e2db4123df1b4566724fcd429f84 WHIRLPOOL a7d9ece5a23dd56ea31ae7fd523d47e88f18524cb23ad0e498d4c49b28b64febd0a02badbb9a2b237822c5552df06cb28c0c44922a05ca38dad637f2e1930764
+MISC ChangeLog 3231 SHA256 20f6d416aef035ee03d7e7febb68864c945278a9059284806c1bd1512d934604 SHA512 528707f2a79eeb54bd3d1768f6c58e87a791c4e06a662f319cfe3306a43a8de4f49bbd85e3ea5ff4f172f8251ca58f9c224aee7e119f1b0caf07aba3e8febd5b WHIRLPOOL 6ce0ae22753722aeb73f13f1677e0d6fe0005c11456f223645f3b7e2b2613fa463eb679189493858a947b993a76f3c38247af707ef19609fa061a0c8dfd268b7
+MISC ChangeLog-2015 4187 SHA256 adbd0ba00e0cdb41a57d73f614ba4795b61aebe875e0394b2cfc4d51c2b696d1 SHA512 97b04d7d9f0385b7b71ff0dca48117d2ef4da82da686f6dced56415e183f9d8ddd84d50794071d9727d44e61e15566c75d7a70da279db2f0c08b4d5280f97eff WHIRLPOOL f52916821db4bf97c1f6a1e39b407e5e39d599e980ee822b3a55d74abe6f3c523390f058e22ba95b6228527163bc4207357fac888ed6894c8defa7680e5b86bb
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..3d86cdb82e40
--- /dev/null
+++ b/dev-java/commons-launcher/commons-launcher-1.1-r2.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="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 ~x86-fbsd"
+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/Manifest b/dev-java/commons-logging/Manifest
new file mode 100644
index 000000000000..44bcf2673c97
--- /dev/null
+++ b/dev-java/commons-logging/Manifest
@@ -0,0 +1,7 @@
+AUX commons-logging-1.2-gentoo.patch 897 SHA256 21228c67f8ca6b36dd196eac3953e711fc011e6ecf181f52fbddf307a3ff72f8 SHA512 b486f96b1d7ae8e8decb3210fb33a31dbfa147cd30ae8311c60eab4f0d48b71518825bba06f146490aeea746dc3dc996a7191a974d57cf990ca253793b9294a1 WHIRLPOOL a7c4db64662f0a1129094df892124f8046158f0ddf331af3995e011dbb7d227d270a31707b6d70de1ef2ac28b088f487e3834b3e9487fd57fd6921b1fba8732b
+AUX commons-logging-1.2-servletapi.patch 1855 SHA256 286f6565a36ef5539e33f61bd36027e3a330d34d5abdcc0ccd884af2c48bbb55 SHA512 3e608ec37279664249d89eb90eaee7e2f5536ab37efcb6e94a8d586b5284a4641aaa5c58f6ef4730955e51fd22491e82f1a6b5b50303f9c4d7cfd066f751799c WHIRLPOOL cfda499740a07b41de4265012686df0680e9b090ef3b97e8ae71163422c51567c5329676e9bbcc367637b5cb614facdb2b538021a1049290b913898c29ff7c94
+DIST commons-logging-1.2-src.tar.gz 188536 SHA256 49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 WHIRLPOOL fe31832404d9071d73fba940021ab664998ffa9867a88c2078918547cc6a23a06339f33f5d74f8b6ea5aaeeb86cd94c0aef6c6195e454a651b8fc492a1a6b5f8
+EBUILD commons-logging-1.2-r1.ebuild 2216 SHA256 37ff3444af2046ee3ee893ce5e005efa6586072b0b4b854f125d3a9109d79f5b SHA512 9ba1fb6158df59d239036d09ad071b244f0f1aec726355689db92bb0f0d7dda453d23c520388df9afe70cbeba01282b3b67acd0599280bd9c5a1d708e822fcb8 WHIRLPOOL 402af71f39e078fe983dc794c8e1f13c1c796698f4539a02308a200d48d4e405f8a6f2a9ef505b95b3381463de8053976f2d00c1f47dc162b6e246ff02c5f7fc
+MISC ChangeLog 4559 SHA256 8c32b4a183a1bb44c6239e6d26ad2b1e0e8445a6297ae2d13a4f6410d6955aeb SHA512 be129be5eaf8f52b8f64b2943f7ffd07468f489c25f07cab4497f6d7669e719d9ef2895cce234141efe8dd5c6079026575883d77fad94ba24c09a084ac4a6cfb WHIRLPOOL d83a8d569fa1ea39fa61a3869ed4aab6118bdd7ec716949f550b6bcb606511b6bbaa42843cd77d9f8d5b5928c286bff08c1d4b3de597b454c16fb108e5f9170b
+MISC ChangeLog-2015 10700 SHA256 7bc33b5d942e46fbd931159b57bc4636686964e543b508218c7235b7cac30689 SHA512 4ba4d42764fb2cca19f30ebc2d4a0d48840ef8ae5e4b2df7e72e08108c9da2661fc09d145d53838953904814b8de44bfcc34fe8a73965194639fc89d0f0e3630 WHIRLPOOL b0a5772db6dddb946e6641a7b613000bab9682c5c2e4aab8da0c9d871e9f3ad634873e2729a48971de7fa5fbd1aed38dab15ccb2d6fdd7056aad5afb6f3133d9
+MISC metadata.xml 551 SHA256 625874ef1f44ed178bd13744f12ae6e8600b7e5263d0a8c0a594a880f1cb8533 SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd WHIRLPOOL 95253c79d29cb02b309b34730d8336716e4f6f37776d8d7d779db99724e15b42504f7467114947143c847a0e104598b8546a49810ef346e07540f998b09ca155
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..e39e1e328940
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.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"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
+HOMEPAGE="http://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 ~x86-fbsd ~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/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..f359e8e224bf
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
@@ -0,0 +1,26 @@
+--- a/build.xml	2013-05-16 22:04:22.000000000 +0200
++++ b/build.xml	2013-12-25 23:58:47.447266535 +0100
+@@ -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..96299c131f1b
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
@@ -0,0 +1,42 @@
+--- a/build.xml	2013-12-26 00:00:51.019721667 +0100
++++ b/build.xml	2013-12-26 00:22:27.616511976 +0100
+@@ -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/Manifest b/dev-java/commons-math/Manifest
new file mode 100644
index 000000000000..a4a3f18b1159
--- /dev/null
+++ b/dev-java/commons-math/Manifest
@@ -0,0 +1,9 @@
+AUX commons-math-2.1-r1-buildfixes.patch 770 SHA256 5e1c6f770f1e123f45a59c7387ad0607a92721249be74601662c90202a5f82d1 SHA512 75a0174c839425a7f1387ef582a08899b7433dcc2090d773642ea120dc220c69d741fef5b44508ad9fdb3e2f24d8fe2b9dfc92146985f88416dae8178a5d7798 WHIRLPOOL bf6cbb70fde2aff6378f77533c256f9c245e494e26814b13810df986743d8b4a1118092c678e254d5c4c474561c7cdfdc5f7bb6030aa489739709cc53e4e95fe
+AUX commons-math-3.2-build.xml 12448 SHA256 32857e3dcc312dd99aeb0e30aa151bdab46c32f0b8be5a9d93becca142506aa0 SHA512 7f7d4a469843b218e90e3482360101058f027cf7d2319f1f7a5a4af7c09b6e4b05237c594eb217d5ffc3f07793fcabaa733be52686148af94a12727e4fda89ed WHIRLPOOL f1003cff821cd380f7febc91d3aa1d8f023aa3b6d7238e8190665114a23c2b47e2356515fdbbfd309b79e98e106efd975c6f675af53798736c1f52edc901b389
+DIST commons-math-2.1-src.tar.gz 1099423 SHA256 f31e098afa916a7f17bd8d8a15163d761ddb54c28d8d64f7f57ce86167f2c48b SHA512 53ed8c0400402c588d824c15365ebe60bef41697ff9728270a9fdc3ac30eb60c4c397caf939ccda839eb701453d98af4eac9eae2090575fcfdee4df2d6f6045b WHIRLPOOL c36a4f6936f6f20a0aa5ad1885e563e980c6f3c02412c4b8cc26de03a6e0a122e6fa0d918992d80ef7912d74e8b9c9ee5006a29972450adbc82249453c2b3e1e
+DIST commons-math3-3.2-src.tar.gz 2602474 SHA256 07992f0630aea0e973c41a34330fe8109b867fc30507b566142a62ec2e483310 SHA512 132c4725be582e25f67a955c7b3b8c7ef155606d8f4da07770464c422ded6b5e6efd1a13a6e98cff222f4fcac73606d512ee1ab9e3b1c4befcc1ba16ab68787b WHIRLPOOL 801fa951b3a0972f14bfc18482e8cd194faa276581406b15314411fb9e6d1c6c256299e2144fbffe76b4c550937dea64dc6df7f92772bf7dab0f4b70b96e309d
+EBUILD commons-math-2.1-r1.ebuild 923 SHA256 ad5d14941a15f38c6ff704c5c062d3c4b80ffc7d8f782a00b11a716d210d007b SHA512 27e322ceeae09a6b38fe639f4eada113e73ce14d86995585a2640324339b5cb9cfee77b8ad63b8b9cb806dbdc6902f5b8d126ca88e0f089d18e55cb823c702cc WHIRLPOOL eda15e08f3728eaa7595b20ade049505d956f89777e68678b5fd623fafe6556945386d681f869aa70ea101e25553c9327d54a73d6536e23d228f926d9cc49d84
+EBUILD commons-math-3.2.ebuild 1314 SHA256 937e00d757ca2d145d4c9a1b0b3ec52b5764072579819745149fb98fdd6b19f0 SHA512 5acf238a479ebafa4d15b6fb8606b1dda8d1d6a1b2fb8e9a4c3d26fd12557b0b7ff6840b594b1e4f5fabbd5e055d81dc41e43a46dda451e093ddf7e90eca244f WHIRLPOOL f5839fcaa43c2229757dab538b48d9f52c7834c22d3c8df277846413b77586b09fec669f4ac9f4cb69ea15fc39cc5452a61e16e02d71d9ae093bc8a0b606608e
+MISC ChangeLog 2586 SHA256 75e5f5246108dad33f9aa89f98d78d05a81816cdc20a637680f6a44e7143b32b SHA512 cdee11d27ec5dd77f54c05f1ff66e0e7996b3b23b19347cc277cf2dbf07649adc83f817b3d6e9021bc4cf622bdd2e552fb8c15df01849a57638564f6055a220d WHIRLPOOL 38d729fb41e115710c389b4ed2532c8a91f4c46e8e9617b5231148a503209a9d657eafb7ab886e25304530e0c0783e4ab4a527eb754584f0bcf2e0c966236bc8
+MISC ChangeLog-2015 2341 SHA256 8ef41c8e746bc8a8d20e5955c0a173fdd31ebe0b4830859ffe59322fa9090d42 SHA512 888c38e9c91842ea58f75b5b751b7eb8fa248ae6e7adac75af00fd8f4e9eebe32794a56eb6a5b53f3763a562215640d461fa699d4e9f522de31129b644921c62 WHIRLPOOL f9205f13e97ca903200f44da871b736e0e8ef2cd47eb898f56e2710d0bab02a7614c711ea03342294caa38d67d0c4596bb1379f48feba59df362d100d9fae5ec
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
diff --git a/dev-java/commons-math/commons-math-2.1-r1.ebuild b/dev-java/commons-math/commons-math-2.1-r1.ebuild
new file mode 100644
index 000000000000..09d67fb2b5dd
--- /dev/null
+++ b/dev-java/commons-math/commons-math-2.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+JAVA_PKG_IUSE="doc test source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
+HOMEPAGE="http://commons.apache.org/math/"
+SRC_URI="mirror://apache/commons/math/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit4
+		dev-java/hamcrest-core:0
+	)"
+
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	epatch "${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..746cb389e319
--- /dev/null
+++ b/dev-java/commons-math/commons-math-3.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 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="http://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-r1-buildfixes.patch b/dev-java/commons-math/files/commons-math-2.1-r1-buildfixes.patch
new file mode 100644
index 000000000000..6d768969e79c
--- /dev/null
+++ b/dev-java/commons-math/files/commons-math-2.1-r1-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/Manifest b/dev-java/commons-net/Manifest
new file mode 100644
index 000000000000..2e51f90a90dd
--- /dev/null
+++ b/dev-java/commons-net/Manifest
@@ -0,0 +1,6 @@
+AUX commons-net-3.2-build.xml 12390 SHA256 e4633c2bda2bfbe65780e261644eef8410cdc1edd2a7373cb78344a21796acda SHA512 e4784b083ce86b5a22d5bfba0b0d71d811abf55f8375b9982f5ac1b11bb93f4be15ec0ff4bcb8cac58681a68a03cd6b598c998251097e9bf634674712887bdbe WHIRLPOOL 77c848804f0cb1ab1b76358fb82fcc5dd3e3595e64c7773798015aeb814e2487b0260cc02dfdd9efc877050f443c66d498600d99d11fbe98a98751898ebf3302
+DIST commons-net-3.2-src.tar.gz 378351 SHA256 f9fd207a28dc357a6a515c69fb83009836b7426d6c25095d70148a6cea7d1df1 SHA512 2152b0c524320702c336b21308bb8166e00487938430b83e08d65b836ab775c372c9251957c674e0bccff6815fc3ed3bdb7113a0d2a140c53f64c2f557eef2ba WHIRLPOOL 45b80205a519795652dc6708c85b1ebe52172e9c8ffe7e01a581cd6e9ebfb4a57cdb43bba30a6b25720c72c4bbce6eda8892fe272baad6b120d6231a05c41bf2
+EBUILD commons-net-3.2.ebuild 1270 SHA256 bb881e6cfc33d9134cda04c5e22777f98f2079bdac93a3790966378264cde474 SHA512 86cb4cbc2c57a8280af40b66a3037206d31100cb48f5c9cf4b1889dfa6de2d624007f2a4581e3a266cbab878e7cf83ca0585a338267690e3206279c732fa75a6 WHIRLPOOL a5a5b84bf9af091a488699a00d91aa26517701c4ff093f8e337529a368dea77a88d4a7345d35d000c05a96493167d463f5fd379a17abd7b79dda3b770043796b
+MISC ChangeLog 3085 SHA256 9339114cc47e295abb289a5bada182291dec4a7ce5c8f6c64f5c9468fbbe4122 SHA512 58f4507113b3a25acc0240e5478687e49c767140dde1f9786f495a92be5ec79aca17a1e0daa86a18f545ffe16ffdb18f1316c3547aaf9974333c06961f57478b WHIRLPOOL e91895b0660554ee454726f60cd99b6c368225393d19f4ef8d24446db20bce076a48fc4785f2c92c32f406edf20a07889efdf2cfc8803c22817033011807ff24
+MISC ChangeLog-2015 7083 SHA256 458630c9d89f63a83c2619275528608e2f42f0038712ea31d8584b78c251e526 SHA512 c2ac2c0c4e313645c69f90b319374dae40c33cf829d5c650fb3dae42b4f140669873fd3c1681dd334e733b23f2e22ceaddd4a4dd97faa1e93d8e6c8548995ebc WHIRLPOOL 3b27acfe7db1847a1ccce25593b812a212df7b6535e8d133da970f29a2e5fbf009d617871a9f972a5916a8ab93f982f70a2692745a70adc490ef535db02aeab8
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..31c7dfd4180f
--- /dev/null
+++ b/dev-java/commons-net/commons-net-3.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/commons-pool/Manifest
new file mode 100644
index 000000000000..114d4136e095
--- /dev/null
+++ b/dev-java/commons-pool/Manifest
@@ -0,0 +1,7 @@
+DIST commons-pool-1.6-src.tar.gz 321409 SHA256 31d182e5dc857666dba640caf9529158c679075f4f137deceff128e268d9195a SHA512 357dd4b1cab8fccb4116add2bee74036c19cf6102946a1e304dcd3049d3d93f1e405f85349e511a4cc71d0d91382696f97997c9e4014303822b386ac7fbfec93 WHIRLPOOL 4402ac50c030268b145f707caf134a069aa56fa332207de1013bfc6d896733c5715911c5ee8ceffdbc603ad355e37199d78ecade7f485b8048e1762cba80a686
+DIST commons-pool2-2.2-src.tar.gz 163682 SHA256 22bd9d751786a9b191ab74cedf5de9ea5ee7ae55046dbe7e8c5369e6578802eb SHA512 a9c1a30f497f4a6c28b8b4b82d3b2f801b464fc329d1da4f5087dcd6b923c45bde9ac6f3dc9939025453462f9dfea9fff637db9b4334ed513770a546b4807256 WHIRLPOOL 87749f73071c591ef1d08c45fced9cf7042890f69f9478880fcf808da0d4eb2b04c1661c74c7f2361da14d30e12c44f990e720bcae4d22446fe5a861cf6c645c
+EBUILD commons-pool-1.6.ebuild 894 SHA256 0257ed40b56b2b89dce5ef05aec7c344fdde34821d7aecbf7e206f5d8d6a88f6 SHA512 e3c01bb5ed31999c1747d45a4e3cdca4fdbdc0567bce8da24519b17149146997b243a14310e9881dc768274030d9b7fcdfd6aa87dff23ba95fe9fe2de4143678 WHIRLPOOL d362f7fbc38839b81a3e2a54913fc20d81389134018f46ffafa1fd315cda69c788a17f8b7ffda3a8577fa373d355958f8831e93a53bc8bc2805851e35936e946
+EBUILD commons-pool-2.2.ebuild 1078 SHA256 53e02a8fa3ee36748c3b8d1d4f48fc60a3637090cedd6a4afa870d7cd727e27e SHA512 3abb6a3aadc14883a683454eade278c3b04cdc0270b52b0e7c798ffb08098792cb771d8d9b072478e0350f837e2fe2178f58779b9fd8808e6ab597341f8bb1b5 WHIRLPOOL 82aa50a718ed95836a0be6e657927477e774175c7555db5b7e8f1a140ce8b6c0f7cd13e6352563e22057dc7a4b592a6fc7a9531b7b1db0bbd650eeb4d5bfb1ef
+MISC ChangeLog 2637 SHA256 2f447de99f5c9e0a762692c902343ce0077ae7c31ebf3c24e31308a57d813ad2 SHA512 90c3e3680c799fecc08c9ad4945309af58bdce6306ee1031dcc2e210afaf7f30dc120f3d8c0b413d4359b3e505bd4c831f7df0c81bf0a31cf7be1bd9dd3696d2 WHIRLPOOL ff1759461f730d1b4ca0d02fa5e8195431cf58da9427ab5344dc250b0e6e3cc6a33563db967fcc1576b847847389c303ef9a29fff0a1a9bb866fbc4345b44369
+MISC ChangeLog-2015 9717 SHA256 3df645687c57b36f026d9a5039b744a5ff70e144dc4d6e2859dd57f0650ab3b4 SHA512 4ad7857ec99adcac206509b86f833ba35b76cad3956a033a5ea9ecfd7e24f1065c1abe774b7eefc75efedfee2e1601f3ead9619286f84eba52cc541db5995de3 WHIRLPOOL 5baf4148d7c6e1b154e7144ecbac6a1d64bf575cff865aa103ae8734b58c246527dfb115c59acb821c2c60b28232006c7bea4552c5f307b76760840bfeda0096
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..fe1f0cc2b5c2
--- /dev/null
+++ b/dev-java/commons-pool/commons-pool-1.6.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 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 ~x86-fbsd ~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/Manifest b/dev-java/commons-primitives/Manifest
new file mode 100644
index 000000000000..8f3aa9351165
--- /dev/null
+++ b/dev-java/commons-primitives/Manifest
@@ -0,0 +1,5 @@
+DIST commons-primitives-1.0.tar.gz 172369 SHA256 96927b484b8cac7e33612469099e7bbd7139cbc79666d5612a32c997fa671ac4 SHA512 239752a615f3a88049d6c85326a67462362869eda421ab76975c0906d811c970c871042769d851a4341c8a06b501d6b12fd1feba74d83007b2dd73370c5b3195 WHIRLPOOL 725644e8ef915e77313dabf6f397a54b857265bcf9d284b4444457d3872e6982cad3670101f1e1576158b1ceebf809348bb2dec2cecec87796a22595ace03129
+EBUILD commons-primitives-1.0-r3.ebuild 621 SHA256 ebc7a6afb5d5965120af125635c103505b200c497107319e4b575e7ae3eb43bd SHA512 93bf0f7ca0deb92a7f15c719713b437ae83361c799a3f24bab33e37991775d04f4f36e4301ba00c6e8723aab52b8b21491877da7abcc0838817d623d01b11d56 WHIRLPOOL 325e9e64b37821936080d20d9cfb3de027ff3e96a19461cccc24ff4eb5d612ef4df7064ef71a4956ab4a24f7b9e6dcca17ab3120e5977e3b5a612351d3aef6d8
+MISC ChangeLog 3561 SHA256 cc796786963111ebc2ee662bc429ca16d7aaf4c3637f4a1268c4b6cb8d7c64cf SHA512 61fa6e707ecc5e3541e35be02bd02d0b6d28bbfbc710a82cabb6b76556e1b121f968b6ab72d4c7cabd201188bacbf96da97f0193c50aacf18d2fb864e5e0c8ec WHIRLPOOL 64057766535869a8996ac1d70e8a2410f6009aadb96dd0f582fb777c11c98a2e7684eab3efaa53bebe2c3c38c96e2d1f63c60bc55d0609ab0272b7efb8061c6a
+MISC ChangeLog-2015 2575 SHA256 000f1378e6230b0a479eab898085350e5a23836d7869871bf0e0c3c83895b7c0 SHA512 4958781281955ef863f8b28839f9dccee2699312f60e3dc130c3f66f298b4fc7574a78ddce32eea2f170e9749b208bdf3f688ebf11a876bd08f870d963c48249 WHIRLPOOL e9338c1b55eacded12453b58ed9ecc8af1da265254f872097c0c1c8e314266ee29b8494ec3cccccbcafcae5490e0c0e7f46f1cb57590b23e196d65102f39a348
+MISC metadata.xml 584 SHA256 0b8e6c164280cb2ecc08271977d50ceccca794561f8e18397321964941e8623f SHA512 f8f968b71c12c0e475c7611ce5d994b320621c92bb04a061c5ce9bc8b77581f16f269cb8f8f2a66e79bcc335a1aa15e3caeb35f6f80742c6e751aef51ef78d6c WHIRLPOOL 053bd95fb4aa52e00a45d21b54b9c1a7380b2e0f2a53c190e55ea607815a1d3b26dac28bd140e7b1f47823604698c01d1df574468f0a388ec57684f639342aed
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..35cda4986a67
--- /dev/null
+++ b/dev-java/commons-primitives/commons-primitives-1.0-r3.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="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 ~x86-fbsd"
+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..b8e7fb848f74
--- /dev/null
+++ b/dev-java/commons-primitives/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 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/Manifest b/dev-java/commons-validator/Manifest
new file mode 100644
index 000000000000..604114e3987a
--- /dev/null
+++ b/dev-java/commons-validator/Manifest
@@ -0,0 +1,8 @@
+AUX validator-1.4.build.xml.patch 676 SHA256 7ca403b843fdbb27cb391b02ecc1a6b4dd6d7b0a271ef82b0097c04a3b22b5fa SHA512 3b426b65d32799398de59d063f67c840d261593278a48afd81024479171e68483add4c69aeed1e65127812850500ba6ffe24cf31ecda6ad16d3a2df64fb2c218 WHIRLPOOL 1ebe87430ac45c05088fd9213ef152d30dab04256c8f917c95508a7cb97b28725816e3c19e39987d6b73904c9f1e829cf36edaba432c9d895a67e9e08a553e4e
+DIST commons-validator-1.4.0-src.tar.gz 222421 SHA256 e75554dbbe1681ccf3e556917a2311c509ff5c7fb9a473be03bdeb8215df5436 SHA512 35005d5ada8a1070cdd02f78464886e16157a05f895e3abfe2dcd51fa4b443d9ee359bb54a40e13ed463b757a77a64669c89cd9b914051a4ab1c745be3526d98 WHIRLPOOL 2932f8df70d9a89a51c218baac93fa5c199d0a2316147032416cba8f2100d29a508bc61603fc777eed7408b5bb265d40f4a7449354ec0227a8adf11471c4d8fd
+DIST commons-validator-1.4.1-src.tar.gz 244155 SHA256 c3be9f4c717c78611b9e1590fc3a9932637190ccdcae642a0c54f84f5782388d SHA512 e64d16de2481c388c81a488dbe894c4d16a1abad12f841f6f77e2606013edbce75ec7a1371976b7e642adfc7cbc5038ff7271cb4d184fbeb32a635acf6bccb38 WHIRLPOOL bf2e214967a0dc94fb16fb2e90ccd6459807185e64fa2865196cbec5efae86d7cb7a04399158be4054a0a180dec96884ad56164abf49d74f49571ff904e9cfe4
+EBUILD commons-validator-1.4.0.ebuild 2665 SHA256 0858ad529e1d2c744b853424551124fce26793022b812529df2f2115f5de976b SHA512 3d611f49b880b7499c9d2c787570bc8dd715db3b8d6696b0d9edc88b595e93f0171f2bcb89caee80ffbb1ce7f4359f1ef45c175f26439073f5ad2688f4e599c8 WHIRLPOOL 3ae730a9a4ebdbce40df3224069f48e26e49fdaac33f50f8c1f1cde81b6274d6be70e78f49e3b8b6258e8265cb011ac2ce98df3a28d52d2cfa650e9cf21fba07
+EBUILD commons-validator-1.4.1.ebuild 2671 SHA256 bcfda9c8c01f95ed622fbd7d53adb3fb9aa34a1b2a77eaa36a52403b4d23fb30 SHA512 f4250d605f1cca1fce461efa3dd3049abb3faf4f788543bd1f8806c0c21f0f68c6fb20f9e8cdfb5cdd98de34f38386cd91e3cacf77bf0601ecb489b349cdf51d WHIRLPOOL d28fa5486bdee3fda0649a2b7f3c28e04ba081ab8c832ea4a93396087635e44e8286ed048744db2720358997d72d36dbb586086c7159d7899648373eb217c3d6
+MISC ChangeLog 3095 SHA256 690a205b01ca742b36a789f3e0b466d750f952636635b071df4a2ef81665739b SHA512 b96c7bdca1d297149fa79d7703d0864fab1f1a180db26c86072e26828904b136991bdb1a0bdb9561fe6cc6f68a90b8038057b5097aea157322c25cd693ee50e2 WHIRLPOOL 6b359bb5b0b5083f9567fe832ce3bb3e199ae53c3f476674cb4024e9c1b80e60289f3fcd1485aa7df41ff0987f8aa3f6a1334749895fe9d7de0bff57c8a7c646
+MISC ChangeLog-2015 8609 SHA256 5125e03efcc0b613ec85377e2b129b86bda8f01d4548a60f4d5f74d7974f1355 SHA512 3b94d64402fe9328a83c20fd4ac08c52ca0b30352536d92b5bc796f27aa045575451dac6e45360db0999f567e95b86061ddc02a1337736ab3a96087c2c89ca5d WHIRLPOOL e21feae339b409a9f01f782a98244df4f698e77e0d9afc22b38273b2e2da95fac12c38ec5c89acf295c5bb965b2092bfdfe4235e604e3216b29c6c2529b6b862
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..524cbdb63396
--- /dev/null
+++ b/dev-java/commons-validator/commons-validator-1.4.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 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 ~x86-fbsd"
+
+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..2158383df9e2
--- /dev/null
+++ b/dev-java/commons-validator/commons-validator-1.4.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 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 ~x86-fbsd"
+
+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/Manifest b/dev-java/commons-vfs/Manifest
new file mode 100644
index 000000000000..65d3aeb07563
--- /dev/null
+++ b/dev-java/commons-vfs/Manifest
@@ -0,0 +1,9 @@
+AUX commons-vfs-2.0-build.xml 14505 SHA256 3e3f82448229f6b1e9bac90c5f180f443c81874878a21b97e551793006de0718 SHA512 a8ec511906b80562ac3f8a8c791703ce06f6fd0861ea5a29684e60716a2dff67ec5f497e11959a3f989fcc538f6c3f6dfebfa0fdaeb316965a2c30ee50001eab WHIRLPOOL 662a5db0e6910a440894f325fd660c8841079c9ee79c0f813a47558c83cb310fbb5c356293c08007bb5a327293ba86a369564a396d1279153b922f87f649140b
+AUX commons-vfs-2.0-incompatibility.patch 2699 SHA256 096704eb1e59e4d88d512892b45904bfc3d1250c03ded29a75388f30e46c60f7 SHA512 ca554a098d4aaa6b8848927bfb4f70707dcaa0ba61d174ac517ac9864aa9b3f3e899e3890eab920582098aeea379cdf9ff1279ee7f8ddd37906fd24260954095 WHIRLPOOL cbc268af57f04f3a9be0710c3e11626fb87ca9ba4aa14dd0fd5dbe6e687f81fab29812691318dbb1c88b70a4fa9af05b893f8cfb723faf947f1525c05c588000
+DIST commons-vfs-1.0-src.tar.gz 278588 SHA256 796af4b966b06f9147b062efa4f590689177c80534edf9702009812548ebe957 SHA512 5826ccd3faf574d7573b22fbab5f7f3ddc83b22504eb0822efbcc4570059db410d1a32811bf411414d275bdeb16ce39fd7cca2150d8537841cd888b1aef2b5a1 WHIRLPOOL 98d0083377daad95675e7204818de2617cf7a9c9821b6701bb1907c2e6c33907c6003fb3b97446f54205c87e3b32744c3c390e30b597825b45f5c084930e54c7
+DIST commons-vfs-2.0-src.tar.gz 335255 SHA256 a90d4d1e9ff17bb856d0d9eb56dd8587db9e7ed33a10e0a680534e125e7a6ebe SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346 WHIRLPOOL 43427c215f3eaaf5cba46682a99d31b1767f24dc9eb85f8b0a31e9b1a2ada421c11f8c60211c37b0922d48a35696663109dcfbfe0474175f7d8da7a12ac8266f
+EBUILD commons-vfs-1.0-r1.ebuild 936 SHA256 988ec0dec4edfe91bf112c42479e02f01e6beaa2f2e6ef025d8e5dcf938c412e SHA512 462d048230ccc7417ecea946d48c2b7cf7377ae8e77efe6eb958ff4a2614bee49fd710aaef9621f59edcfa5f00a96be53a3c6a66f929f30b1b6f5d02db8e6e26 WHIRLPOOL 1e1a4447b5bc38487c9255e49b2b47863f8c6eb7eb674548b52e0948bd81f810154fba2a4b308c8f927b1f761bdd0f27bcfe87cf55fa14d560df068a1cb3753d
+EBUILD commons-vfs-2.0-r1.ebuild 1561 SHA256 06c8a32f6be4cef006edc9c7bbd7939cbd770771dbb8231edaef1f156f21b8d9 SHA512 b415b7487c982b1513bb782ed98fb860939ddd4fac5952cab9eba1c4f32d4741ba1e308b0aa66d7ca3e46d1ee3ef014dc452d68c8bc33914099d264d95d4c103 WHIRLPOOL e79686a241ccdb3c8bdd156e04ceb70497eb15c90ef1aac6c7be7f0bb00bfb26fb3a5f5e74630740aca1282ded77b405f58e23c2d558a6cb8f173c044e28d746
+MISC ChangeLog 3194 SHA256 abd0fdd6a7f52c145130a19987b08ed0dfef28aab26fdc8793d60dc695bc2463 SHA512 46634a8643e7dd4a6c320ad64ca944dd42230828cb1d242a3cf1cccc0aac05ec1e378dc588fc892ba5a2b07b058966bb1487114a6a6a57ec38fcd0b0bf70c551 WHIRLPOOL 3e75eac5fa01fd519a0e0f98db4060bda48e3f2d3ec10db50d752e0407c4a81ca3a6feb0860a0396fdcd2d2ae2f85228f77149d800475be05b21634925825598
+MISC ChangeLog-2015 2303 SHA256 6a2e7a75120637cfe543176a314645538ac131abca6d1d657d7f45ebd79f992e SHA512 7aa387314b03d0bd1e139f0ee9ca58c76e549f5e6101eea1db54a2b8f2611968f8e50352e75712a7c75e74234c7136f0a6d8f49264069599a4e21e98cb2b54c9 WHIRLPOOL ea248b2d3ca36a5a856785cc1964b45251d93912083c7d7b1fffaa7b22479cdc0f004992d04c61aed31f5263ba13c3374af987cbd7c5a39de1b307ac4fb0d34c
+MISC metadata.xml 522 SHA256 bfc8457cfffaa3c50ff51bd594cdd7cb5991e161c29d84ba5b454821d5fe535d SHA512 1c1c96edc32537d782e66dcf44b14081f2cdd249e5bb398dcc711b4dabac745db15af7fee7ceaaf0d758738b99f3fee8be7b9e1561887426c3ae8988bc1900a1 WHIRLPOOL 33bef0abd4897d04c813bec07cf590a84b001e9359a647034caa04d612a5d5a29b2aebf2112b592b3bc30ce5a0d0743763f529f9543ad6c317006e23d2c2ec09
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..cd41c2e7792a
--- /dev/null
+++ b/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
@@ -0,0 +1,39 @@
+# 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="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 ~x86-fbsd ~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..c0b4d9f74835
--- /dev/null
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
@@ -0,0 +1,69 @@
+# 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="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 ~x86-fbsd ~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/Manifest b/dev-java/constantine/Manifest
new file mode 100644
index 000000000000..92b9c8831cd1
--- /dev/null
+++ b/dev-java/constantine/Manifest
@@ -0,0 +1,5 @@
+DIST constantine-0.7.tar.gz 65563 SHA256 5600c264d3f32a48342e4b00643a8a8a543f15c6107a1c1be024e328a74e59b1 SHA512 2694caae29bae1a3e1d765ac02c4014bc6fd3dac8370feb5d12f43119c057fc2a2e75b0aa37eec0164bf8a82a1bafb0f41565f397b956ae53a52f7cb803508c7 WHIRLPOOL 6a7c3ae5b0423690005656c69897d82244d05ea27056c4dbe4229390b648bce23775b699e8d719f347ea602e76313af5e19d47e932637fd919fb2fa2b64142d6
+EBUILD constantine-0.7-r1.ebuild 856 SHA256 56f50fdabeb41405dda98bfacc471de67a1beee304acd361ada294c498f33d64 SHA512 29ce3574c7c6ec10b42121899f1295ef0884e1cab70bdca8da98c3baede8178e596ce28f5b9b8b09bd8d7e6076763c1c47deec10c7ce37257df2f43bac9d9cf4 WHIRLPOOL c1bc5c664cf001f24562a80c9097045eaba30e973789ecc45242f80a326e85deb5936e8ac777c5b7d5c188f91b2e89399086eea14b79c70b3de908439239838b
+MISC ChangeLog 3415 SHA256 6d0fbb709208b63246118efaaa8c8ac52ec456ba5f7125b329258a1a5dab1df6 SHA512 ad109a1056c6c0dbeee6bd70d422d4eabe2f7c737d11b359f2af43da1437d69ec7b571ffa57a8a239d98b303eb01b3a1f4b3adf9d404d2d2150803555036f223 WHIRLPOOL 67fb6966bb9053487593fbdc34662c56ec4022d6128c83ef939f102ba3c14d5865a15943bb6fc9da8067221f7383f75bb956cdf394846090f97b53ef618971e6
+MISC ChangeLog-2015 1526 SHA256 b47c4787c8104dda3ced842ae1c9a1546b7796fe959e4b5340808ee12695dd67 SHA512 07c7dc5e51150f39466955af58224ab0ebfc7c5e09ac917e0718a15a7eb3136f540baa8eae7ed51fccc2963cf8df6d80d298a5df9ec26510a47d68868ad71309 WHIRLPOOL 25456d62f0a8226aacf3beb7c30cfe6e8990ba59f8f33002ead5582297b0e2a5c0eba3fb17d2b5f5ddcff68b31d2d5bee0597a29ddf64168469485bc1219e2a1
+MISC metadata.xml 334 SHA256 1be6c4405ff0569ea612395f924d3d110ee125efd418ad0f21ba4d93e69ebd85 SHA512 a4669719091792c9243f012194a0c0c56eebe367deebf09a952f2b98d5545a7996db08b655bcb5e8ec6d962eff67c8a159a0cd7427efc5c7e05e97d67b8a21b9 WHIRLPOOL 0161fd542f8af459f274a1d15e3073b1bce21349c7a3b94db091cbbb9a35ccdf0924efae6862b948bc8b28b7490b77a842e03b32b36142f262db239a5e84f7ff
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/Manifest b/dev-java/cortado/Manifest
new file mode 100644
index 000000000000..ecda1d477dd2
--- /dev/null
+++ b/dev-java/cortado/Manifest
@@ -0,0 +1,5 @@
+DIST cortado-0.6.0.tar.gz 233854 SHA256 37a708bfceba5b7b0b544456bb3857f708c83734dfb3f3f1ababcc602b923e85 SHA512 56113259da05a73f4d4e7aca92d031fa934987ad3607a69b31666c9e452330a95728e7780c45d825ddeb9c0815ace479d7a55df0e68a50e63a76ddf5602c76da WHIRLPOOL 56f92611743f03c7349b9f40360c3f4bd915cb4fc79cf7ef2597c91113b15f0084c24e83fbc0f8967f3560971b1b04cc70751ff42852c4e10322b3f944371a16
+EBUILD cortado-0.6.0-r1.ebuild 758 SHA256 53d5440f8536411f05d6fb9ea10a59e4b1b264927cf5c4bd35f1eedcc4e1583f SHA512 35b15f4ad8519396147dbf8903ff03ee026b3c917cc257d756a24b752ae3b98b66de89162206379a6c5d6d27c9df05cd0b71048276235d5d281bacbc9a386707 WHIRLPOOL 3f563b2718261de47793ddd45122c18e019bfa6f5419a6c47ae673c7263cb0d189e75e356d4c5ab2d6c3d8cd91228f9ced7f097d66b7b36a42f7e2c9fbdc33ab
+MISC ChangeLog 3276 SHA256 73aa34142c26a5517a9768507ee9e5412ea48621fc69e94d8db581b05a5038d6 SHA512 32000895ab7274e270f32c5235d5c1d268a1467e5e39bf900087be8b5355d08e75d184aec328b7763e13a25f615728fdb33030c031da0d02157ad133dc227317 WHIRLPOOL a36734a07e030a6d64a9bd5eaf10120a022b54973974ee6bca6e3e1b006c1593bfecf73403e3566fdd1ead852d69f3b116c3d0e5cfd8200ddf1555df61999f27
+MISC ChangeLog-2015 822 SHA256 10b3c5ad49124a1d903ec0e12dbb3898f04b83d593388d136bced10fb7cd970c SHA512 21462c805bd4157eba08cb36c29ab5942ea4f2809ef794944d7b8207206189163864cc63800401dc07e35eef4fbd0ead35f10f7504a77702a3533fad6beb7ed5 WHIRLPOOL a2e66080d508f46639e306f4d1830b5d99a9d39ba2a74c4e535b5d273c12bb0f990eee38255668fc28f9cd3e4dad7765d148d6964952652f645d036fe0cb82ac
+MISC metadata.xml 1146 SHA256 4d93b02f71f2d05df39f629cbf32ece3fe6bf1895aba3e20e44353b28a805c47 SHA512 3671a67e4e69eb69ab47f587e75ccc5d18cced1f8d018f90e4e0aa7ebe68819cc7b9170d1780339c55b7fe6852805d6c1ad1f0bd6fbdac3bb374eabc6426a2bd WHIRLPOOL b2e0cc0dce544d028cddd4fd407291a05a918aa6ecbc0abecc345034aec8961b4ad482ed7f7c7a8c1b691ad677a289bdf9b3927142aff838cafa017fe55501b5
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..9ef3634a4411
--- /dev/null
+++ b/dev-java/cortado/cortado-0.6.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 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="http://www.theora.org/cortado/"
+SRC_URI="http://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/Manifest b/dev-java/cpptasks/Manifest
new file mode 100644
index 000000000000..2816bce7bd82
--- /dev/null
+++ b/dev-java/cpptasks/Manifest
@@ -0,0 +1,5 @@
+DIST cpptasks-1.0b5.tar.gz 902930 SHA256 d181cee0c4e28bed202f8bf582dc42bbc824c7712ea29c7b17f036fc7cdfc209 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c WHIRLPOOL 1eb3a0726d43a40453a7a70c89b2fdf8880979a52f8dac6cab9a01800184c72d084d603a647804dd6a55a162a20fd2102818fb415336e21beeb010bd3b7eb196
+EBUILD cpptasks-1.0_beta5.ebuild 1086 SHA256 1268d41b50a6d4f04cc2d6e540fa56e64430e163ce258bc7bd080fa417f853da SHA512 ebd302f4af84c292eb974ab6f1968e702934ef7504458507c54931116af6fdbb640ab143ee061f471bea1b8ac16f23af337087b94a562663c2dd0b4545e4c07a WHIRLPOOL 3d5beb999b984f19ea687ec628f2ced7e6d370b35761aa7ad46071e25b8a630b45c898df1b1bbaeb2043e03e6b03fb7a2a2a0658e6be8643eb8f9902e62822b5
+MISC ChangeLog 3281 SHA256 bb05b28b3d1d0cf365947140f4fb4cf07d2ab1f1db329f015061d717f8b7f0b3 SHA512 1198820ae080dd9b539d081415d938b16ccaf8bca45f05dc06b5aa3ac1bdc8a1ae9d55d690970475df085ee696788d90d6b934f3231fc59b84037b17f90f540d WHIRLPOOL b4174d2f5d6a161e105fa8ae258e1e690d645b81485e27586b0d9826c686136428132b2e147a93e57786c79fddc661b2226ff425f08e796541f8e7eb8a78fec4
+MISC ChangeLog-2015 2568 SHA256 101cfa05fcdc4c1e72e559a419f789ca32b6ab716373e2944b59d9c132d74e11 SHA512 a16866fb03a053c93b4dc81bfe1d3a9d20d0890f53aa6b937b59c5b132d6f7dcebb5dae5ce0deecc6245d3e57cd5dc7a093b8a5a7e8498082513df8f7e314096 WHIRLPOOL b2d5de71e6543e67164750e114b5fc6154b9a7e8532f67fad30e3838da5b14e250f412ba017a909659f91cb3bbbba3303549e5b2da9bdc8d70611da0b5e946f2
+MISC metadata.xml 317 SHA256 daf2316137c1bd32defadb3b7067607cf3ea34b0d0905a1c43221fe80f437498 SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8 WHIRLPOOL 94235522f301fa39825186b8671d2be481aa8de6b0e75b6f21e0dbb56bb26bc5da1ff8bea1e22335e4d9d3ec6a28ed0553897ae8c0918dc34626b32616b50461
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/Manifest b/dev-java/cssparser/Manifest
new file mode 100644
index 000000000000..7ebb72d52823
--- /dev/null
+++ b/dev-java/cssparser/Manifest
@@ -0,0 +1,7 @@
+DIST cssparser-0.9.22.jar 245363 SHA256 8c926b9c336fc338ae4bf944bc9187251b8a2fd261d65a617669bc0482551590 SHA512 33dd8906d967bdafeefb6cea9d03fc746cf350102e8e53360284638cdc3d55f254c616d2d3ab5d1849fd92e6924c9751ebff72942f0855b6fdd4ab309a509485 WHIRLPOOL 003255e004c5fc52ee071c63d27ca1f3a4f7235c440c5da712e42cb8ba18ec97b529fcdc21069b46a9447d07996b380151585523eb3011a02c45a7e49106419b
+DIST cssparser-0.9.23.jar 245655 SHA256 e7609c4607da7d7b67d11feaf471bfa64734d48da9e26684d5e3fb1c9e3f630a SHA512 a6799156eaa6cbd41b2969ea64fb4bc5105a866a2cdade73bef5e4a3f5b585f7f9cf0cf7f34329ef17f1b258d2d35e675f107bb81b793fdb2edf0c7c9d49da1d WHIRLPOOL a22fa04abf714accc5a83fe3f262e75f29de0aadfe3cbbcc800cff4f906316c9092d21b3938d9784c3e3a1a7ea005169c2b0840f6332428563b5c16010d6d29f
+EBUILD cssparser-0.9.22.ebuild 523 SHA256 ffdbee7722ba2613ace13bcc14d7fc8ac72c76fef9753975972bd8d1bc8bd540 SHA512 49af733807e955c85bf69ed8d1cf95d8a7ab036a7a4043433f544206d28678561a249a7b444724f06cd9e39b1e17d6ffc2d79491873e1c9447c68d8cef1aa5d1 WHIRLPOOL ce20a9c809ed6126f9a7a63cea34fee770ed3e12573c564ddbde1f54feeabf4a264cb31418b7832df38522d997c791938c3accff6b78323cd838db2fbea6582f
+EBUILD cssparser-0.9.23.ebuild 526 SHA256 b178ee5e6b31ffe67c2549bf20728c7b060dc0e38bb29571f7e76a87773b5c40 SHA512 0b8c83103cdc4ff926fff22b48eb8425dc4dc65aa7093a05b53e23ceea2792a50869aa607481b64f29b17a6031d5fe6cb788e71031726091d5005dbe3cb176d4 WHIRLPOOL 2be9d333bfb195905d83d040e9e00620ca12245c05678ce21c7ef4850ad530ccb24275ec048e363e90a89c02d2c245c1c9cb7ff8f529908da8b5d16bf4b63b26
+MISC ChangeLog 4384 SHA256 695778ec804ae9292f405cff195ebc93858843e30b1837ce19d46ed8eb6bc99e SHA512 e48c3ed2e6905db686ea4082b1211438cdef15a830fe89294cf3cd66e448428f6efdbfe1e9671d9f1c77cf80c55d08da58e2b021605b5d2761bd972395a80566 WHIRLPOOL 3835543cfbd72c6bbfe0f932a8985c230b4e9f810735e2d562fc566c068eb1d9bb39feef70943f239581bbc875e76065a353f9959c30047cfd3207ba2d56897c
+MISC ChangeLog-2015 1395 SHA256 c91dd5851e0cf9e174cd084a3be01d8519f7e445005f853d3c6cd9ddd5a648e8 SHA512 82feb374afcb077f707e9b1c6f04df5b97c74a64fe7fb4a2a972c2e7fce4e8d5c35b1ddf59a481e8472dbf7dcd2687b32ed69d4dff314edcaae3ba39c7b22af8 WHIRLPOOL 8bc44ddd1b865ef4ad1839cc1571c55e8f7bd25eab2dab13469f7a870b7b294e30bfa2d9734d0437fa8c04f67da962c4fc6502c600ba3359fddcd34582ece26e
+MISC metadata.xml 396 SHA256 678bced5c11a9262136fad2c5f3612fefb997532c7d0dfb32143db3051c73919 SHA512 d95036978f0c8b18cc4722df3e9f1be9fbc80df058255c4903746f00217c8e284ba7a87dbd0498b38e3f8185a95dace21a908e02304a2aaa49c32c53e02b0700 WHIRLPOOL 5732b082fefc178f154130e09dbe28bc079e8bfab8a6117ac26ae2195be124a559977ead5fd9e7f2090c9b8132b4d64201af491a6d29098d25ae3797c6126f0f
diff --git a/dev-java/cssparser/cssparser-0.9.22.ebuild b/dev-java/cssparser/cssparser-0.9.22.ebuild
new file mode 100644
index 000000000000..5909c45357d2
--- /dev/null
+++ b/dev-java/cssparser/cssparser-0.9.22.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="API for parsing CSS 2 in Java"
+HOMEPAGE="http://cssparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar -> ${P}.jar"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/sac:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/cssparser/cssparser-0.9.23.ebuild b/dev-java/cssparser/cssparser-0.9.23.ebuild
new file mode 100644
index 000000000000..4e2aa29ee99f
--- /dev/null
+++ b/dev-java/cssparser/cssparser-0.9.23.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="API for parsing CSS 2 in Java"
+HOMEPAGE="http://cssparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar -> ${P}.jar"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/sac:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/cssparser/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/db4o-jdk11/Manifest b/dev-java/db4o-jdk11/Manifest
new file mode 100644
index 000000000000..4ad751e91d4a
--- /dev/null
+++ b/dev-java/db4o-jdk11/Manifest
@@ -0,0 +1,6 @@
+DIST db4o-jdk11-7.4.tar.bz2 319812 SHA256 dab30480bf79e6cfad7f2026d980f4bddc9dcb47a62f5a63c4f2bda863f7d584 SHA512 6624fcbd54f8607c253b69686ef5b600b12a59548e102755fd660264c3e7daec6b114272434d11060801907a9edcbfc38ca1cc6948464afe0ab35206d8fc8532 WHIRLPOOL 80ba115830ed273e92bda5bb12c183adc73680e45ac5fe4ba66f2774ffb707a57bc53bed065ab3dcd26e1af11c2989f15e5422dd3d8f1ba0426372ccf0d28e74
+EBUILD db4o-jdk11-7.4-r1.ebuild 455 SHA256 78a0010af502af11a2347368681155d534edcee2ed8104333f5d4bbdc3ae62ce SHA512 6ad8b5597caa49c278ff2043a5bc66573cc39b1935f041efc6864e7229fcdff147f09962aa625a491c7a622fe8050dbc1d346cb476977890603c80cdf04640d2 WHIRLPOOL 01749c97bd7f688af7203a8eb47bafbc6248e2cf79b2483d566df83995ae4f10e578ef490e8d125b6bddde2be2dbbbd5c93b5fc6bb77734d7bf4c7dbe16a68f9
+EBUILD db4o-jdk11-7.4.ebuild 539 SHA256 88a27cab319fdb30cf55397763d07f6270a6f6b2c0613f8d1aa27f708f58c048 SHA512 5a24c58ed13e87fdbe77a6a3beef5e20bd9ff218c510fadbf7a3041b5774ad9f6e78cbca31e0d80346f10ca142a463c24dc97502add35e3859cde0e56b1e437f WHIRLPOOL 232fa7bbb3cbffa348ff026315f254201d0e706079be0c104b1996f2ec8e17cc7cc81ee79aa3004fbbcc5ef0d665fc5c72362345b347075046ede29fd7e23adc
+MISC ChangeLog 2825 SHA256 837495d79fa7f04ce8ff79f3800dbcea0b64e40430304fa50339040b4b53576a SHA512 006e7354ffe8689b400231a070f66758c9744a9157dadd48694c5c046953ec0b0e335e4dd1a5200c46fca3b60dad627fff3eceb0e76719f43857736b332d780f WHIRLPOOL fd70b2c21d907767653754ffa1db0a58e8da5c4d11eb9cfffe036f28df8f2167fa2c9b1e8b338b0e3528d72f120eca78b30346a32ddfab5e9ee93f7f01863b66
+MISC ChangeLog-2015 578 SHA256 c3d93826247287daf95095e1f74cf6167650b18c8b5212a5eba5b00175bb0600 SHA512 22ab3f7e62263aa5cf31e8acc869bd0175124fd4d4ec40a195e351bc8268e6c7fe90a0cc46f59b8a3280ea1256fcbdee31e7974c4be590d1c0f501c6184c5e28 WHIRLPOOL 4a68dca58b593d436b13053424623cd9bf089e379ce217143983abc9b4e38402d3dfe97d889d5bcf2d7ab12b826c50a89d412842899566e1c02bbe56f22cdbad
+MISC metadata.xml 354 SHA256 d10fba499bb01a933f07135a8c2101b15955d7c8ae79b53f9916f697c4e3eecc SHA512 75420fb1c8b1ebafdc3e237f34d2c70503166f248eeba6356d9bc703ca4c89a6dc2e28dd67b29fffe359f3b35bbc09539ade4f3c4b968fa1b76fb6481fd849dc WHIRLPOOL b7f3617e79d02acb08bca826c839864ce5e77a0ae939ab67592da43b439919ed26b54fd40836b4c29d1720923d2a523ae9a41711d05d93ab266144de91f6b8be
diff --git a/dev-java/db4o-jdk11/db4o-jdk11-7.4-r1.ebuild b/dev-java/db4o-jdk11/db4o-jdk11-7.4-r1.ebuild
new file mode 100644
index 000000000000..4aefb7fa3193
--- /dev/null
+++ b/dev-java/db4o-jdk11/db4o-jdk11-7.4-r1.ebuild
@@ -0,0 +1,21 @@
+# 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="Core files for the object database for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
diff --git a/dev-java/db4o-jdk11/db4o-jdk11-7.4.ebuild b/dev-java/db4o-jdk11/db4o-jdk11-7.4.ebuild
new file mode 100644
index 000000000000..e73a191ddb72
--- /dev/null
+++ b/dev-java/db4o-jdk11/db4o-jdk11-7.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Core files for the object database for java"
+HOMEPAGE="http://www.db4o.com"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc {core,tools}/src/com
+}
diff --git a/dev-java/db4o-jdk11/metadata.xml b/dev-java/db4o-jdk11/metadata.xml
new file mode 100644
index 000000000000..380bcf5d302a
--- /dev/null
+++ b/dev-java/db4o-jdk11/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/db4o-jdk12/Manifest b/dev-java/db4o-jdk12/Manifest
new file mode 100644
index 000000000000..c2100db110e3
--- /dev/null
+++ b/dev-java/db4o-jdk12/Manifest
@@ -0,0 +1,6 @@
+DIST db4o-jdk12-7.4.tar.bz2 91496 SHA256 a2ddd61aa7314e8d086b538d94ffac546f4f46c65cf2538d8c2988330d3fd24e SHA512 25873dc599e465e605842a114e376c884f0a7f7fb8ff6784d6f7742056d002fb9bc246508f1c7fc4597e952818f3c2588181617484542b1177b9b60b3af9c43d WHIRLPOOL 56b6447fcd3c52ff2d7d635509bfa5054bbfcfec78bcfade8dc995c147a06fda6a65c1ba6d6fdd145f4a537808726e7aa9331453f7ca5b66c5f8dd5fc3980077
+EBUILD db4o-jdk12-7.4-r1.ebuild 608 SHA256 eb5a54785874a7eaa498bb836b1f0cd52aee7105b9dd102d00cacf14bfe69a69 SHA512 783fd442e11d987b7c43460029bc498532b58a49035ba2bb1a067024b39baae20e36f1b8184eacce4bfcccee740ee0d050bd4a5cc13a7d9fadea6490411c6709 WHIRLPOOL 6cd0c6b4e673f48c0fdd39d13228b196191b3219ba83730c8fc49c78fab4d9fb80f7769d979d0c8e534b31822c6da78ee895fc7a6789409a4790f50b197e2d27
+EBUILD db4o-jdk12-7.4.ebuild 639 SHA256 217c94b2b6eb4c73e435c1973949cf7846f9b1ca01d2a8580413ebd4c5c893f1 SHA512 49582f957d2aa504b1987540170cd4ed432e902e113f9ab1553ac6708ac345931a2fdc9c61edc81aeadce40538ee880e9baae293e9e8f8a842e434b54767dcf5 WHIRLPOOL 81290ac1391fcfca76aa8fdf7160b66238b10c25df0c3cba4506de645611d2d4762cb153bad9f60aca14fd816b55e4a00ee848e2bb368bc13df5d9d7eee78aa4
+MISC ChangeLog 2825 SHA256 520a5598e707cb7987df8282253938d5dd45cec26151015a65920c55d47ebe0a SHA512 32ab6f6c16044f590d7bb3f9828ec5cce7fd874da157ab3d602c1a6bff85cca218def97f0bb5a14c49ad8e4f78db0bd70855d5842adcb7fff9d4c03745d3a918 WHIRLPOOL 3a0ca49b7b44a6ca0892a00bb95820b142ac46076bf6a5a76e2735120071d0b35f51d8f6b1bfc0e0e2d8f2a01fd18de9b8e479c1c58d1e89b7520cb9a2ffecd4
+MISC ChangeLog-2015 578 SHA256 bfa22761a736244a0b6636fea7edc7ebec2e67f6df98cf65db5177631f4fad5f SHA512 4b76fc483d6970badb69e51ae5260ba1f10f505901fcf82e6b9568b0fb77b0a91265092f64f3b0a0e8856ae837d4a548de3e2720eec1b62d9f34afd2a017a6a2 WHIRLPOOL 0eb0e57f4b178fe1aa5b2a31b6c5657f0832fe322baf7cb7ac1ec986bf92727a636af196548389c51588b2139a1f734c1abb493c673519486c43be663ece51bb
+MISC metadata.xml 354 SHA256 d10fba499bb01a933f07135a8c2101b15955d7c8ae79b53f9916f697c4e3eecc SHA512 75420fb1c8b1ebafdc3e237f34d2c70503166f248eeba6356d9bc703ca4c89a6dc2e28dd67b29fffe359f3b35bbc09539ade4f3c4b968fa1b76fb6481fd849dc WHIRLPOOL b7f3617e79d02acb08bca826c839864ce5e77a0ae939ab67592da43b439919ed26b54fd40836b4c29d1720923d2a523ae9a41711d05d93ab266144de91f6b8be
diff --git a/dev-java/db4o-jdk12/db4o-jdk12-7.4-r1.ebuild b/dev-java/db4o-jdk12/db4o-jdk12-7.4-r1.ebuild
new file mode 100644
index 000000000000..063fbf5321bf
--- /dev/null
+++ b/dev-java/db4o-jdk12/db4o-jdk12-7.4-r1.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="Core files for the object database for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/db4o-jdk11:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="db4o-jdk11"
+
+src_prepare() {
+	default
+	rm -rv "${S}/test" || die
+}
diff --git a/dev-java/db4o-jdk12/db4o-jdk12-7.4.ebuild b/dev-java/db4o-jdk12/db4o-jdk12-7.4.ebuild
new file mode 100644
index 000000000000..81fbd569879c
--- /dev/null
+++ b/dev-java/db4o-jdk12/db4o-jdk12-7.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Core files for the object database for java"
+HOMEPAGE="http://www.db4o.com"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+COMMON_DEPEND="dev-java/db4o-jdk11"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}"
+
+EANT_GENTOO_CLASSPATH="db4o-jdk11"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc core/src/com
+}
diff --git a/dev-java/db4o-jdk12/metadata.xml b/dev-java/db4o-jdk12/metadata.xml
new file mode 100644
index 000000000000..380bcf5d302a
--- /dev/null
+++ b/dev-java/db4o-jdk12/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/db4o-jdk5/Manifest b/dev-java/db4o-jdk5/Manifest
new file mode 100644
index 000000000000..b86c158078f1
--- /dev/null
+++ b/dev-java/db4o-jdk5/Manifest
@@ -0,0 +1,6 @@
+DIST db4o-jdk5-7.4.tar.bz2 64939 SHA256 0f2c7d8e3a0ff374fbdbb942abac498d6a733ab6c0e23fb00e6ce571bbbc339c SHA512 10e70550731a512166a2deb492257eece74c6920a88c2cc56c633ab4a6306563de4121a734dd523fa6ab0dbb6110d3c4cfb06b28c490a625558fc6f5374d18c6 WHIRLPOOL d15b948920d239e11a19729e93daf77638996f44574a3dce887ad003304afad280d5f3315646c86f4ff4386db84618bedd63f0d7d1b915665be32a76c43d3edb
+EBUILD db4o-jdk5-7.4-r1.ebuild 644 SHA256 b0e77f93bb8b1748dec6812ea2a3695ffe90b9b30bbed4ea0f87e4e18edc5bc3 SHA512 2a4d9f68d40a4ad9ece279fa60de0452354a50b3865828a9199e9f4092b58c4a0f9bf8eae4442637ed2ef8cfb1d6ee1b1b742755afa1e906073bdb45ccf5a65b WHIRLPOOL 8c021a76356ac70590bb4ede27098825b43cb9bb1054cbc69f007780b634fd24c35a91867f7fb5e05c4e5d54295fde46d7f46e9e06f52b372209bed9c2476dcb
+EBUILD db4o-jdk5-7.4.ebuild 682 SHA256 fa4410c115db2f51c4702216089e5eab4600d49822a2080470d24726064f081a SHA512 738a6ec3e33ea97747e1e621d275c5ffd7ed93a1a91c77cbd283f1ac2390c8135f0bb29523b5ebd147b4a4fd62e387eb3ebca259a52edf26f9ce531da411771f WHIRLPOOL 314098f8a6aa2085f800100aed48d49e9d68cc3e8e2ff68a5a1fe2a1078c649dbb905bacf95e51329fce1a7645c156c0b98a76761bebe6a1715bc75ffd269587
+MISC ChangeLog 2822 SHA256 751c67c86cad883aa86435d1964fdaaab46b257a75c1aa8d21545e46841eed96 SHA512 aab195d4aeae6320aa33201f736b57218ea299d310e182a6a4af98cadf565830d22abdbb8b0b2d24fbfb9c7dd3c066074391238e41f52f71531e2a6492f385eb WHIRLPOOL aa1bb36d6e665890ee30747456439fc338af10150252b357b6a3cbd944084287bfba6a2a8aadaa588c35ac7924bb06a259a907c8ffae301c2815315efde86f6d
+MISC ChangeLog-2015 570 SHA256 a546e21efd893dc15bf013bee583476aa5dd71dbcc2bf297a8f5477001c4c05a SHA512 54ea0702c6bffccc93d47aa5b4866cb6e9a03eafa493145a715efa1e25a2a5048b665af37242d34bfa5a8b3e9086a2b2171a3c137ccf98949b4ceb6c81a2fdf1 WHIRLPOOL cedfb6dab465f7f2890b2da8e17c4558bb5eee2c160f54fc07769f4363e88f2fb2034f39732865f831c83a1e53faec1f9f1054b7056901d487a166a60e1dd79d
+MISC metadata.xml 354 SHA256 d10fba499bb01a933f07135a8c2101b15955d7c8ae79b53f9916f697c4e3eecc SHA512 75420fb1c8b1ebafdc3e237f34d2c70503166f248eeba6356d9bc703ca4c89a6dc2e28dd67b29fffe359f3b35bbc09539ade4f3c4b968fa1b76fb6481fd849dc WHIRLPOOL b7f3617e79d02acb08bca826c839864ce5e77a0ae939ab67592da43b439919ed26b54fd40836b4c29d1720923d2a523ae9a41711d05d93ab266144de91f6b8be
diff --git a/dev-java/db4o-jdk5/db4o-jdk5-7.4-r1.ebuild b/dev-java/db4o-jdk5/db4o-jdk5-7.4-r1.ebuild
new file mode 100644
index 000000000000..32f2db19b1a9
--- /dev/null
+++ b/dev-java/db4o-jdk5/db4o-jdk5-7.4-r1.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 source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core files for the object database for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${P}"
+
+CDEPEND="
+	dev-java/db4o-jdk11:0
+	dev-java/db4o-jdk12:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="db4o-jdk11 db4o-jdk12"
+
+src_prepare() {
+	default
+	rm -rv "${S}/test" || die
+}
diff --git a/dev-java/db4o-jdk5/db4o-jdk5-7.4.ebuild b/dev-java/db4o-jdk5/db4o-jdk5-7.4.ebuild
new file mode 100644
index 000000000000..348a0cab603d
--- /dev/null
+++ b/dev-java/db4o-jdk5/db4o-jdk5-7.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Core files for the object database for java"
+HOMEPAGE="http://www.db4o.com"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+COMMON_DEPEND="dev-java/db4o-jdk11
+		dev-java/db4o-jdk12"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}"
+
+EANT_GENTOO_CLASSPATH="db4o-jdk11 db4o-jdk12"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc {core,plugins}/src/com
+}
diff --git a/dev-java/db4o-jdk5/metadata.xml b/dev-java/db4o-jdk5/metadata.xml
new file mode 100644
index 000000000000..380bcf5d302a
--- /dev/null
+++ b/dev-java/db4o-jdk5/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/dbus-java/Manifest b/dev-java/dbus-java/Manifest
new file mode 100644
index 000000000000..598fc810b8ef
--- /dev/null
+++ b/dev-java/dbus-java/Manifest
@@ -0,0 +1,7 @@
+AUX dbus-java-2.5.1-jarfixes.patch 1761 SHA256 62ac2a80728468a4e32c07a67c244eba088b6bc434fa6e3ede4bd3cf508fb557 SHA512 7f16a3cf42296f4c8f0c083f07f7afc664c0c51b78548b05c53ad7537c70f8cfcbf178b4bdf554cd9559edf3ff401fbe73097866ca842030b1619b4c92212df0 WHIRLPOOL 0009f5d4338c8fcbc77446663e6e2b566753637730ad6b5cc905fe548750a550f856b1bc692fee2bc9b41256055708917c4a27e018c13eec3473ffd560970890
+AUX dbus-java-htlatex.patch 638 SHA256 2744afb097919c3ffdca8e2846c7d8644097b38da916dec402c55bb51da77919 SHA512 d9c86980f9263bac50ba357a9293d3630eadc35e0b67cf4c3547caf96d0b6d9a076dab548b54d43e466f8c77412eec2ed6527de98fe10cfdd7d26645285daede WHIRLPOOL 6a86c36150ea7ae954c2654d385f29cede9f1a170b4104ce9a3b9c323014f65067eff5c8f4fe1fc6b88419e820a574a329678b4cac57627b6553b8abc3d0fbed
+DIST dbus-java-2.7.tar.gz 145450 SHA256 be404ea36284d938646192d0ee42e146853064217d4e3aaf89b56bd351ebca33 SHA512 15b44b877ce123948b07aa67bdf73e1fbf6bf2de89d09647dd11d33fc6beb76509b61b73e8a8c5f6331300ac0d9760d7e715b4b9467307f13cfc94b5c856eaa3 WHIRLPOOL 5f2df9de628fbd1178baf5cca75b34f4845db6a8d998901123ec8f93e9cb8b7e0c274de4c75b5a1352c263092c790bb4f78d8cbde6db6d41fecf4b733c038666
+EBUILD dbus-java-2.7-r1.ebuild 2722 SHA256 831bab141b51a15598ee37f3fd8ec1751c6ee3174d600b06799d498b5ca14f50 SHA512 7291603929c3b7d4a8d884055420091a52fa50b4dca63b5980bbbcc503e31426f587efa88a75e666b9426a64fc3811ce9f09c2fd3d05641dff5ea3c3fee76506 WHIRLPOOL 1b169908104267a7380bbf12a6bc7261302e684d58b193c4e0aa7d6fa939d0c0f5b21a4139bc82951590736cc912bc4f2131d1881e67184f47c476a0b9cd9787
+MISC ChangeLog 3719 SHA256 3f2af74a1683f49e60a130632395a5f419d74cc1e50e042cbc0ccbe78154b2ec SHA512 5942c8722a2ede9cb6dbe2f9fcd17fbbfc8b6384cee97a774dc53a49fcf4e8c997789413f1b0a1db118b3dd82c913d693dbcccda326c6dac6cc85750e97827f7 WHIRLPOOL eb41f65ce391ba88aa6110467dc168726b4167a8fb5cde90cd95590d0893526d88bfdfacee8d247dc9baa545f0afacc320f7a108425c793329a47053318e5e4c
+MISC ChangeLog-2015 2765 SHA256 33497b670c81c63a15239c427e35f603d13fea1e3a7ce82f66bbdfe0cbe56b22 SHA512 c6e77db89a5a4421d5056225b0daace538f0e2e6332148e6e10d1b75b7110f86c8a03e130ecfed1c8c2e15f24db396e09971a36f3ac82dfa004d13b4b9bbe10e WHIRLPOOL 6caa29990411df1a19ed4f593d96aff52262b45ddcf94158021ffa581ba8899f5e6591d9bb078f44e169efabc5034729ee1a7bc8630fb67b1285c746b2ac8226
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/dict4j/Manifest
new file mode 100644
index 000000000000..ec493a5d8d8c
--- /dev/null
+++ b/dev-java/dict4j/Manifest
@@ -0,0 +1,4 @@
+DIST dict4j-1.1.jar 50269 SHA256 71e2e0cf6fcc887bf39ce444e37052f4caa7b100fd3f9abe78d169c977d7ef3c SHA512 35a6d77d13effa8d5e59ed2c03ff5700ccf2d91673b2bcf420a4f216176ca521dff741ff6660547823d16d06df1dcd2d44be1e90ce293a83ad9fa649b5caf7c6 WHIRLPOOL 369e77461ee2b80b4439adab7ad1c09f1ed194bda7c8617cac074a2faf7fff3c6aa4c1e36db05531aadcd2bbdb6190b2cd7b17f3921e6599f89ff292c62df305
+EBUILD dict4j-1.1.ebuild 509 SHA256 63ac1f74ee23095a1ef2f5514e332ee917838fa3f8500b06fa5edbdcbcbb7d0c SHA512 9b4eb2d394166ea08010b4343ae7cde4755cb8fbb28468c9013d114198e9c9ab4533dc69d3c5cd8274a5449635d335400a692d9c204c43949e7c252de3b35dbf WHIRLPOOL 06865321ca9482255515e960c014093435e4657831b5b5d655cdb712e1e93d7beaf092fce114d0dad14c564fecece0de4c0c814d97fd6a873d6c2211c091c153
+MISC ChangeLog 1500 SHA256 70adc44ca41a561ebaf33c4254c61f3b063ff2c9a0a9a134310c567c3e4518ae SHA512 319ad546c618831e6a974994b5a97e432bc3daa5c0ea01263478272b2cf35053ef37271c98b8553e26f8246cdda8dc805d9fb856e51a0581a84201d18adf2026 WHIRLPOOL 130a16402b8d54366bf5017b2ff860e4d5c7a3e1e22e234a48dd38712af699b0a0a12200d66baa966823322d6505b8f0499c752a7442321002b5585922c9315a
+MISC metadata.xml 393 SHA256 6880589228e0a55f195bd567beeb8593d673df3419a712edabc94863c82cf955 SHA512 ef2a5ab9888d298103211edc2a583bd17b0377fe639b23d1bc57f899af4690d59785183fb281286547714ed00240881a02beb6e210d08c1c4fd7ba618f96120b WHIRLPOOL b1b17e65304bc3af1d67259452deaf8951005dd092c140d0c60874d82f7164ab4d59bbe99bcb13278033eaed2540391d8d72f2070b51181c3d803524ddea28ff
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/Manifest b/dev-java/disruptor/Manifest
new file mode 100644
index 000000000000..eda083e6bcd7
--- /dev/null
+++ b/dev-java/disruptor/Manifest
@@ -0,0 +1,5 @@
+DIST disruptor-3.2.0-sources.jar 74768 SHA256 ad503e6379f6d319b55dc7e2d80aba20cd788b37283f23068056af77d510b764 SHA512 9ad2ba752860d68e3a08c46910cd96c2d43a24860cda1fe9f58f86e3de57a90c2abded43a8457a2751a9199fabe40370bbd9ccef0e982913ae8d2127a92e6b2e WHIRLPOOL 1e6ce2e4ed65980054ad9a4ae639c4e49e3ba4d630c3bea69b9c37099991e622e09544acc2fce091eb870d8f7f68f8b3611e90b0e96f6f4cb716fff8e946f60f
+EBUILD disruptor-3.2.0.ebuild 489 SHA256 6ef67a6929b1e303abf1cbc2adb9bac1769f3a532f9857a7a96f48cd68e53f0d SHA512 31bca6c9563c1d1c0b668255b34b12b33c19aedce560df0b0578281a1f94068a1b8a88c9d98fe3eda5e1473550fd152db09a7a4edd2e2d8fdbc711f940a308aa WHIRLPOOL c74463525b96855708258de3305bf566ac8c89d43d057e64b53e56da368f03c6ea8ac651cee397c585536c39e8a8d3b150314267178751ffe157bd652e27768d
+MISC ChangeLog 2655 SHA256 63a026fa5a722bdd16f98544498cdf48eb38cd215b19e4c12c6bddeac3439ce3 SHA512 087684ac9490b2dd46184f1a144a88576c7de9c0b7e74020f525e7aa6d7c81e8b3e78c51959cd009949dfcc6b6b4d9edf8739b173cd2f5952183e5a105e3162a WHIRLPOOL c598f7f3218011ef95ff79dceda6867e6fd188a3ddf1e1cf9b1b342e0885789993ae21367541d94d0f2e029505263253f29399673aedfe3d4e74215441f99299
+MISC ChangeLog-2015 434 SHA256 da10a7f9650616d454c170e7f0f44b0d076d1a49d60e0d14354d56132e520ef1 SHA512 9fdcd678427970ae4af87442b4727a5cb3082ad189795fe5f0d897776706938fe656a0b8ba900bc0d12ce4db59dbe665118ab861aba0bc8be71d3bce20bab00a WHIRLPOOL 2e46813b972b5979b03839c1293cb1c479b860ad22997dc7bb748af1d9679a56633542b31191cd24a026b8e21830d5cb6bfcbb90d5d71e778a8b1da622060fd1
+MISC metadata.xml 324 SHA256 a170786b0bf210ad0a1c7afec483af3924eee3666eeceacfb687db9243ca5658 SHA512 414a364271c57f6cef970bd8dd480f19f0a56e286311a7cb807517dc7b97724cfc387e3038c7e6df29b351f31ae5190605131f8d12b35cc555d5280cf5252c8d WHIRLPOOL 643a2d494e59727613e80a40ea46733722ba0179991a5d5128ec69e7b0a5c83a98cf6944de4be3e47b7f6698a9c9e25cb2223a68093850f93dcb6ef9b8a6dedb
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/Manifest b/dev-java/dnsjava/Manifest
new file mode 100644
index 000000000000..1f1c0c9dd579
--- /dev/null
+++ b/dev-java/dnsjava/Manifest
@@ -0,0 +1,8 @@
+AUX 2.1.6-no-network-tests.patch 1354 SHA256 809f11f083a48be78f3f74ba13b6ed67044c0d1f5754e723a9ba7ad3109570ad SHA512 3170ab2f64fdddff5fba26d32b0ce43f08fbef333e14ad1e1b7490e0227cd549febac4506ac5536d96f7f9316ea92d333fb5aee2f82131f90a922e52571ec1d0 WHIRLPOOL c6dd97efafd30380151e307e13f6a901a98cf28faefa3ba15afd7d81a3f2ae404a519b49f1b582a40b76b2dedde7882015809f90dbbecc40b7adbe8b9ac200cd
+DIST dnsjava-2.1.6.tar.gz 1087908 SHA256 2503f5fb343ebc5b87c4ea3d67070305ff61d8d8c26636f62abb33e507104e76 SHA512 0d30504190aabbb176cc914834eb26a2f5522741c4473dbbf32f16e1d62fe39cf244a3ddd543b88d3a1e595afa9c6509e42d1418205677aa6523c6d11c49f497 WHIRLPOOL 60915c62b36a907928696e0afb3529ed46332013f07feea155158075fcc32a3bcfb50ddd3977f876ec7ad3203572ef54ff30f761925b6d96cca6e51fa7939f19
+DIST dnsjava-2.1.7.tar.gz 1078980 SHA256 387e5ccb17fa1c49ff1afbb5c5d61e431fefe07cdf98577c4e9792c2b8435766 SHA512 07b11b94833f4a6f5d9bd8e0265444f15704eeba6420b2fa2c4efef46823c2768e8e691d6b101bb6d1ed9ebda1e55dbf518f447d62eb686fdd583c281313afdd WHIRLPOOL 66b4a37afe5b34bc87d46f3f3c162bdb2f484d8b6b3536f3913d420503067ba179f0467b869f181540050297a3e634a13b259e56a701cdb715c3d47672d42a67
+EBUILD dnsjava-2.1.6.ebuild 969 SHA256 24f1c10450b626217bee2179f792c2f65c4308334835e1ce73393897acdaf20f SHA512 e870857f8efd9d839c7ed23d3361b8b7106a309fddd1c25229249044f90e5d1258531788a9b64b33ea28c3405fc239d5273afed4c2cc636b5a91897f03edd43d WHIRLPOOL 65cece225f7f2f022294a43a52fcefbdf50ed4f010191d5a789b2d84f689df70e443e51c07096b33726155a36b0900fbea9b06751cf97dd9fb2a60268791f44b
+EBUILD dnsjava-2.1.7.ebuild 947 SHA256 3deedb52f632dbbf0b2e92f657b331e1a9e519d7e2e05baf03e5739b2fc57eec SHA512 c397ce0f0562fc2a9a6e7bded5976a1e670ebbb752e3f1f892a90bd5669d17732e1016b9ae1dde3c4e6430f1f283096c5951ab462494d65e1e8bf6c0de66267a WHIRLPOOL 06dc0eb9d40ad1ffad1295867fbb9fa50347a4d2ab282df1c08e4d82711fd99c6a0bc7ea1720e096a89b14e5e0b7401f7b8b8f0faa12c86368a386eca162a290
+MISC ChangeLog 3339 SHA256 7865e7dcda89eed9382a5c57a2e6c25ccc8d7b516982dbdfe18b845b19b08813 SHA512 e865ab8d63bb97c378d5df2bc6d3bf0e2296578e9869af023b00a471150ff958fc7663f23e4c0296783d893406798cb37ebcaff6f07581fda0d68da8099a79f4 WHIRLPOOL 7b210cd287e5004009be5be7db193aa1327687faa6b036d9d24284ce77355311f2f43ce4ac96642db62637fd5fb1617f89e53bd8ec0cad8ae0ad7fb1869dd966
+MISC ChangeLog-2015 518 SHA256 77e3c5b1d9f81832d686c3694ca5c3dd936b325ca6b57649d71fb60ede1110ec SHA512 924cc0282aa1065bb39c3ae7797379aa0286d7c31a3dfcace854887d3d4ff9d097fe7859792151717c4d3ac2099fd9beed6714e4bbb4d82b308d9a6963913dea WHIRLPOOL ed32b41610d48a5985f989c4a28c33fdce139bbc0d66669e2a1d89e444faeff8e50c56d2fcedf5c6d2a96671877f98a113b7665ade2a73b91b61834eaa909e62
+MISC metadata.xml 765 SHA256 f2837b262539a0cedf693ebbc4060eaa613e11c67dd8fae6b63d5f8a6a21cb66 SHA512 800c2681a0c1fcdfa661d1c1ad996367f88f725e32dac8994b24b3ebd51dad3544c70ddfb009561f7987780cb4237809de3fd58bb642fdd8e1bcd20e239cfdda WHIRLPOOL 148c7d9cf8354520953b309f77bf4594843d46e3065a9bcd51dd99f8100a87fb2195c9d114b43f4cd5a1063e26b04f7c7c56eeafd1554e846a52221394136fb7
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/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/Manifest b/dev-java/dom4j/Manifest
new file mode 100644
index 000000000000..e6680c079291
--- /dev/null
+++ b/dev-java/dom4j/Manifest
@@ -0,0 +1,6 @@
+DIST dom4j-1.6.1-java5.patch.bz2 2900 SHA256 5e7361eac5332c3380420bd88c2d3a2d4dde30984486c6d4f7e4621940abb42d SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96 WHIRLPOOL c3e56098f9a75340243e554f11e8cddbbf3e56cd13f0dc9650151ed5ec2b3914e33921174ad275f089188033f95d33386cd4642196bdc7cc6d9bce980c0251c8
+DIST dom4j-1.6.1.tar.gz 9687211 SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94 WHIRLPOOL 3edd7c8f629465add6fcbb944eadd75b1e8fd84120c1adf2fa24d43ae04856162d18652892697a2605c1006f1e7d3e5837e30a13e01ab7d1a101614b6dc4f8d0
+EBUILD dom4j-1.6.1-r7.ebuild 1893 SHA256 6881a96a404920b898185706d2765c1abcdffef362fe30a16d1f215e4de7a778 SHA512 ed4ac9bc68ac45cfc6af7fe342530cf756780937adc5cdf073c8b247ce7fe53ddb878f1e6cc5faf4a1097d1ec969ab605c5c389fa19a1fb6d03873245581968b WHIRLPOOL 14b7f5aa438de1adec78a317598cc9187958a67c6bdfa6d6b93a95f28cca420d5d07e74e283d5b58a1c1f1232def440fa02f0df7de8c1a7308ec77fb250fd2e3
+MISC ChangeLog 3708 SHA256 e0a5ee433e070e4e5265250e97344fab76c78aa03daf58eabb3fd933a99b6b2d SHA512 6684f7119adf1355a53d44b83c1d4afaeb6cc0da60439759ee50e113a891b51ab1c02902667dbedbef449cdcba2726d0bde7b95063dc2e96200b4119b0584006 WHIRLPOOL 3997611b526bbca82ccddca1595cf0c47c0e1badaafe729531beb75cf4bfecca8f382e2850bbe951f1fe7059c92cf67cf1e46390dda9555c09cac55361c5b91e
+MISC ChangeLog-2015 8859 SHA256 2766dc5db944cfc59cc3b6e696ee6f1d5eb3b39f257097214a8cfc622d511d23 SHA512 6afd9ee0475635225d8dcc6914318c76ed27d6772ae9e93ce440e5b5a50d0423b1e96f6c6536065ff969a8b70d24af0a7359a17eea403e1c8cb989949c3be6cf WHIRLPOOL 66c6d4d88739ba4491b8b4229608349a44ba4d1101f2e5b376d5f0bce7a8aea6ee9bd848857d618c8fb83d6b9d4223f0706ba1b188f057556ba8eb12ea436531
+MISC metadata.xml 529 SHA256 26920c31ecc34515ece2b245dbfa97427d3506fec4e2966c27c8d19346610ca2 SHA512 a9845c5229efbf48ac83b5b8fd0a769d90275de1f336b52147330cc2652a858df2689e17895e2fca5af067288413102de67316e49108c7d9eaf232e9dda31bbd WHIRLPOOL 5588bb6aaa331f79f1aa5e8d1601e123cf3140cdfc839893683b7e87327a9bb31628cc80b89e8c3f8c60e8839da9d0ffd39bc9d5549f41b9506194aeaccb7eae
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..9fd5cbffd462
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/dtdparser/Manifest
new file mode 100644
index 000000000000..01a728a6f305
--- /dev/null
+++ b/dev-java/dtdparser/Manifest
@@ -0,0 +1,5 @@
+DIST dtdparser-1.21.tgz 138335 SHA256 67fb4af8aa48733b027724c1244e614d9621724efa47e2c9ddb69edecc8dd034 SHA512 1b96991a2a2486fbbf0a9847fec3f1528153508f5380c3066ba34b410a9d42a480c4b821535ea2304d6c674526229cf74e6d28a32312df431aa852a9436c03aa WHIRLPOOL 94721ab2021efcdce97e21357f951a55dc7105a7d7a41cbf8735302babd20637a3c0195af3f266a16d25d73987441d043b8812c7da1009c8bb81e2ec87febf54
+EBUILD dtdparser-1.21-r2.ebuild 602 SHA256 b989d82df7f0658f35bf7c68a48797af7866784ead67a2e9a5e93b4c573fb360 SHA512 d8e863f843e4ecee96e219a3c6df29cee4c442defb71a3df0cc1e036f1e20eb64f5628aabdbf8c543ad068d73447565a6ef613679bb9ba7e6d55cc290cbf2212 WHIRLPOOL b6d89b32da4dffe7d1854ec0f0ed46a1ca37947b2b1c7af71d15f17f03c2058c9010928511fd867e86f9f320806a614bebec2bd77018691ab06a992c20a69d84
+MISC ChangeLog 2730 SHA256 2df4e8c53187ad96ebed3616c6556f4fdbb213801ad593864a5391f15915de3c SHA512 a43a054d028edbe05f4a9da7685d7f89781a261b529a57c5905cd91d5b1911758e42b2dd812972d1ddad62e667be691ff65dce51a2387e7ae25241c2e45932cb WHIRLPOOL dc7aaa1fc80a7ce6bae04155a959e9c23f6ca127bdba6ebf5b6641c8e02a4e047be1651d79fb53f4af6772857cefe13596216b0ac50adb01e6d97bcd2bd14960
+MISC ChangeLog-2015 1855 SHA256 7982a4d1ffd76e05ea098954e5c0147e77d19f7845f72e3dedfd0c49b8cddff2 SHA512 529605deafb94d685128e8f228343b9c45306fbfdee41bdf31e47afc7fb52fcc211813105cecae781299653a44285763a7efae5de17703f8f7d2952464dc41c6 WHIRLPOOL 6fb36be803556553dfcd089be0563cba00d88f179d1fc0a289f7bc17564beff1c5b2b95d3d1ce311342912ebac68e9556d218c0e957e915aba9666ec7601a6c2
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/dynalang/Manifest
new file mode 100644
index 000000000000..6f3a8d89c5b5
--- /dev/null
+++ b/dev-java/dynalang/Manifest
@@ -0,0 +1,6 @@
+AUX build.xml 6721 SHA256 58cd371b785eb31ff1ae4728d947c043df401227f22890530e676e0bb90d2888 SHA512 e18fcef8b62ef09a55063afed6beeb484fe98e2d3fee904bb68eb776d6d11e8d5055b5b2160ef57576247ee2fcc7e7db059ac3e7c69360b0e27790ad1ffba40e WHIRLPOOL 8d18afdf52a5e023ffe500deda9de579fc6886b710736fccfb6059e50381c1c26e2cec88b0b2f5513c3bd2a754fdf37ae6e3513c8841705835079c14bfdb7394
+DIST dynalang-mop-0.4.tgz 227338 SHA256 b241b763d8178f7ba74123ed6145df4f255f78df39757665f3569e3ccd11d5cb SHA512 b7501fbc44ae29e10cf3eb55002420d88d83226f790861f43f59aaddc0cd1bd5021fed207d831d5c3adb14ceab01dc17ff53cd31cb6a93c0fc00240b8e3e9797 WHIRLPOOL ad5f558a105a78625d7c7c55b1c7f7b185aae30fb7ab917e27aedfa083ee99191223fb76ea22f3f573da576655d8612ccf21bba807a6488ae5344ce9705c22d4
+EBUILD dynalang-0.4-r1.ebuild 1377 SHA256 b2782f1230b9018b686863f1c586bcc363a242b9f5de0c4e5c78bf2a281f8c41 SHA512 d65bce327e3e95e7a210fc5779836942eaea635746cc3aa8b4eb53e600663c8347195b2f9faa3ae9b3e9bd3a5673f03a48b98d0791f726324750c1fd042f56df WHIRLPOOL c73622b37106ba991c54ad8ffe98b88b7e81cf4a9aebb753d042a21054b012169ede761480666c4a633aa7cc62826b37be142920d40ee7a53ca43ef25026ced7
+MISC ChangeLog 3390 SHA256 8340b55ea3747cdaf623780af146fdb4989365912625cba66b720d5db94a4d40 SHA512 a04abaabc96a4457b497a4060377ea92f1fdabf3b9f24ca1075e53533e3798e860156f24c8c7672b7ce55d70babbf992a7271c09c74fe4d3bb2f534059ea07e6 WHIRLPOOL 529251290a09b6927d874d44d0d4760f97b463aa2b1c93564d0b48e9709a8388250262c3fffcfa8acf9140b51757452fbefd2deba478050cff3b407842e4f979
+MISC ChangeLog-2015 683 SHA256 e77bed6c6b90d5fb0bf0ec8d24b76fcce35461d4af516ab2ca44a1d7f2dfd78c SHA512 9211a259448d8804bc07e1b35f1e86c79e5bb5da65987cd822e08dc8cc68402279490ee9330e0920a16c2cb16382f7f98df0343447b521e7e5e88725a972929b WHIRLPOOL ada05d8590d5da694b16c01e2874b95522fde4c9bf78e5382c2514dd4191c8610686edb9f5eb05532622457816d0db3e609609250272f5178498fe48f3918a2e
+MISC metadata.xml 314 SHA256 b74b054534bdb88c7ce014c947f02ab3459e34066f1cc9af0dedbf3498800474 SHA512 6c6f4b185b8a3c8c677de4d759060151a07692c0629f7da13601dc082dd18e733e3b956fc34ad4f8d8092aeeecaa5cdefe8e51cbe0ab093e74ab9c11f7dcfa42 WHIRLPOOL e5c122a46d04249b93f14760e545fedd4b56292c723e0ecab0d62e105b5adb56dd9a2502edad415cea1ea43203a98bf6fef75a118ea08c2a597617c9974f788a
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-classextension/Manifest b/dev-java/easymock-classextension/Manifest
new file mode 100644
index 000000000000..24573e325094
--- /dev/null
+++ b/dev-java/easymock-classextension/Manifest
@@ -0,0 +1,5 @@
+DIST easymockclassextension-3.2.zip 155678 SHA256 4f16c1a4359d194364ef2a152e8b2547ffee03e72824bf351781bffdb9f272c3 SHA512 bb6fa5cf69e3b07bb2e7d7d27b7186176a2b34e2250ab2945633ec55e49230ffeabc0dffed64bda84bf7f7e30b5846408536f9902b915b751fa3e3405e4b72b0 WHIRLPOOL bd824f57cf2840c3c08b09aba0999978128259e681390caa14c8bdcf298e52ca3268214b60e07b0fdc5efe014c4dde4b90bd72b39f4be54ce70cab445262cc7a
+EBUILD easymock-classextension-3.2-r1.ebuild 992 SHA256 9c849ddac4ca97acafcf926ab1a5d14a67f11cdb4f0e1adce6360c598c7fe07a SHA512 30e6b1a87ce46c2ea0861501dd3b4fc399cbae2cec77e0d186074b4fe08c4d491a82ab9c3bdeb73397b29e0e03fb3b3416dc61eaa383d6b669a914ecf23c39b6 WHIRLPOOL 155ef223da00e9d7b04f4b1c0673f57c6700d51de52129f17c7f4f236d712b5db1eac30394f1ecfb2fe7503a9bc83ecf2bdfc3b67cbf9649903dae2e84296ac1
+MISC ChangeLog 2477 SHA256 85ce661b0741c997e6923fd005dddb004b825dd0036a1d38ed3abce1d975ea35 SHA512 88d6eda11bb1253549c60986c28b10b920b1271d8383ce116725b7dbfede537c2f1aa2e5de36ea2c96360489f397b6563739b954eb82130d94f65351c3159d9f WHIRLPOOL 16219cea6927ee0eb9317ef04bb328edde604efe8706f020664a964bb633725e4620fc9d7095d4d5ef76b810c131fb49c1d2eda4680eb21e02f9db75708a2096
+MISC ChangeLog-2015 1013 SHA256 e205e5cb71f6df9b0dc732a52ebf9ae0227a72b2c32a50a0c1faa9f9aea1ce15 SHA512 4fffc0072914d74e6222c2d0c59b860770d72eafa59b152b09fe8d10aa0c444eddb6b731d13fb3c3d53ab9a342001bffbd58c46e0f6e338bd61544bce83326f2 WHIRLPOOL 0625ad0e3104c3d2c9a82b820feb377d407f138c0da57ba50030068afe48227b1c065d15b3e3edcffcbbffac12708f9b1c1d786d7159d1f74a6df583815dcaed
+MISC metadata.xml 314 SHA256 7a42a3305e9616f5158b4359fa492af3cd5ed5cea46ae022e8be310a68755bbd SHA512 a9461432a42e98c60f9b88b92e9a2a170f7c7263178c884c67463f204dc315b689b6a02fc713c8313583536ef5554bcdbbac7eb32ba98b52ccded6ed1913581f WHIRLPOOL 5573cd87606a823e8a549de6839abcca1994b53ee849d073a065ec87860639e0006f16c377607a33095528e69ca89186341574777a24c2d9074bfae2f14dbb39
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..7e48510afecc
--- /dev/null
+++ b/dev-java/easymock/Manifest
@@ -0,0 +1,6 @@
+AUX 3.3.1-no-android.patch 685 SHA256 4b3653e6d39c007fb960cd5773638e60ee1b811b7d8126f1c2b404eb216765f1 SHA512 3ead2f05c122e3e8a3eb1d1748b59c15775fee79e28cf01dba193b8b21aae0039d9608300cbca6e9bdbe291ab15db9f56abe8c2503c6667495f61fccbf3d56ff WHIRLPOOL 203c833b98294753786caf4972762d3781eb5a0aa9073911adb9cd6a6566a5d695e54db417cf1824a4c069258fa54c8fb55f39a9749d4d94096c7dce93f25e29
+DIST easymock-3.3.1.zip 1015625 SHA256 06332d947698e615e00baa5441e54f03423912079d81733dc089e57cae138a36 SHA512 0898276df82a99df10e4c91b5b097b6d579914580995b35274ef9d4e0c874266d54c865f96d008becaa210a6307916f6488d0caa205a85caf62920e939becf46 WHIRLPOOL 61e68261374caa1c7a879c28c329e8f3f6a5f067b57bb3c3eb79405b978544e0f3924b5cbe63cdee35964284d3ea602bb039d68461c73869783cf5e555a2d245
+EBUILD easymock-3.3.1.ebuild 1135 SHA256 a67ee882bbde93a1ed31a7092e454fb11072d399a1ec80a334ad1eb8f532484e SHA512 70ee151dbdc102bf01a1f56191992b078e0ca7870509802f9b6bdb58f27dd6392e2ceaa5c812ccc0c2c77571c3fa596561d6e4d5c0eefc4697282874a0e15a00 WHIRLPOOL f72d4a2299217acdb82c14aca04143b8b43c1d754d171d7980939e470bf1e5e8ca942ace7c14ba93e74d62913762b84b839310c3220a238cf6d9cd4535338c55
+MISC ChangeLog 3447 SHA256 9afdf3ee9ef93cee66eec7ed59f0cb32284871f1450d760a41015f7e36ccc7fc SHA512 b7e701abea45ecd819a1b31d46a349fd7ae5ceece65a49f230dfaaef82592788646936c2e98df252be0ebde235b69972fc26c99f031424aae319dafd7bfa8c0b WHIRLPOOL 5985eb45db9269f09fa62b56e777d63f5813613235ac765cee227c8f2b157e2dca8ca8b1e18a3ffd934fd97949e2e249ee79a750231b5580fa540bf5e242d2e5
+MISC ChangeLog-2015 1415 SHA256 ae8d1d101522e90382e644802f2ad5f0e80fe26ab750794f6cc77094e4529b16 SHA512 2731a0abc447e4ffa58be269a3c167c9b3d8f131abe0c0785902324602a6921f8e4b428143adedc4e36b29f2b2cd71f5569ee84ebe381866399221400813a8ef WHIRLPOOL c674fe37cdc8e362399e6cf394f527ae023417b1656b646a964d5c6c59735d0e4e729f7d2c1d7276f738b7bf479aeceb4c7e23614c6523d1161a2daf7cc7b887
+MISC metadata.xml 314 SHA256 7a42a3305e9616f5158b4359fa492af3cd5ed5cea46ae022e8be310a68755bbd SHA512 a9461432a42e98c60f9b88b92e9a2a170f7c7263178c884c67463f204dc315b689b6a02fc713c8313583536ef5554bcdbbac7eb32ba98b52ccded6ed1913581f WHIRLPOOL 5573cd87606a823e8a549de6839abcca1994b53ee849d073a065ec87860639e0006f16c377607a33095528e69ca89186341574777a24c2d9074bfae2f14dbb39
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/Manifest b/dev-java/easyneurons/Manifest
new file mode 100644
index 000000000000..d76df7707b42
--- /dev/null
+++ b/dev-java/easyneurons/Manifest
@@ -0,0 +1,5 @@
+DIST neuroph_2.3_nb.zip 8257618 SHA256 b126485f212e16f8c0162b35dcbbb25eb66da1ae1523bc5bd420d8bd82cf0faa SHA512 f2d6c87862435fe5217259842b3d9829780fe82dc87a682bc3ce38ecb708968b2458bf2d8631daeba209ccb9ca8e7c74fd1e5dd3c6ca606cf8b9ce4ea23db485 WHIRLPOOL 60366565c900deb2034e0d2d6527b23339486ebbe81ec203622be3bcea50b6dfe3ab001f2c0c82733f599aaaff60c812231f4742883506729a62a15fdc5bcdd9
+EBUILD easyneurons-2.3.ebuild 1928 SHA256 892f3778ed5c0985122f99e27e41998d030bb7bf33572e7a73c192bf38794727 SHA512 7014174aaed8cd6ed227497cd9ec76acccc0606870831d13be162c00223cd595aa49e34aef8b6b6d2eecfa213a87eb7e85ad4d9bcb768c10f1845faea3db8030 WHIRLPOOL 39e17c44d270540418296f57443a4aa7d1a41e011ae25c4db46dcbfe9993843cf3faf8909cd16e60665ba2af94a4c3b23ddf25e481aa5b04ec37b44f8579f780
+MISC ChangeLog 2435 SHA256 227bf28aa0da52b4625384cef6a2144cb5fa275f72e2116ec1de063c3996f2e0 SHA512 87d0c12b3cdb716e05f50f57ed37f9c84225ae08fcbb98a25b1baec05cb0fc43d7805088308eebec804e59c2961a9b747f34d146282c24fe8310fd6b0c85554f WHIRLPOOL 734be47bf72bb81450c40f56a7c6fe15c391e7d82f81b7428ba3c8747db6212ecc5b8f9ef86c4945f2f1c126fb9ea668637f6615d5223a521c824d1048e0d789
+MISC ChangeLog-2015 1740 SHA256 8ea8913ec611907c387b5ae175554c7cf3747480997eca22034012003bcaa806 SHA512 90952ae28e989fa63fe3b984e1e4805e7f5366704138e5c3699ffc4327333f127f8e3f4dd69c2c67d3a2742b9b67871389fcca3754035c1b111b2a7e6cf530fc WHIRLPOOL be697ffb74fa8347d5bce4317fe306a3121aabf886681804f67a3c21a7c8046f580e61b1750dce07dacb776d9cd76dbcbdcab0c0e581e504b4f623a308f86098
+MISC metadata.xml 313 SHA256 93ea59445146147e901605abfb9805044b675bc9c6cb92b2f3a12bed386fa3cb SHA512 a59f20c8be206fd5d02ae1e83919ce976d4b7503167ff41864d294fb92e692beed71a1c55ca76732f30b988393ef7559c3529bf44c186ceee6cf5be76125e39f WHIRLPOOL 9bc2b24bdd281d4fa78fe5a5932f74513dcdde8e0d630c4b1fb67dd1a57366ebdac14422d658cb46e85e98d5541fdee7ce0b4cbdf1a98ef1ba1a0fd66fac988f
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/Manifest b/dev-java/echo2/Manifest
new file mode 100644
index 000000000000..be430ae23384
--- /dev/null
+++ b/dev-java/echo2/Manifest
@@ -0,0 +1,5 @@
+DIST NextApp_Echo2-2.1.1.tgz 5372814 SHA256 73c0325d019a7df92270c0f3eebef07c2a4fa42a58e588d3bb2cfbd7c1869ce2 SHA512 bad6d9a6411c6a6fe24edbd88960a5e1179f65e95a26e51610eb0b601e3941dcc82b052a385c6fd429291c524bb722a081f39bf3704b7b403ad98582c8273f26 WHIRLPOOL dac80215f7c2d33ab790b9a5a56b9f2b360e42942676faec58061f55cada7e9b530bc6bea24188b9cb6d15638898705e4dffd54c45e757d97d4e272c292530f6
+EBUILD echo2-2.1.1.ebuild 1162 SHA256 fccfb730a289a0aca5e1f58b5e7f59167a99b967299df442c308f956d3040080 SHA512 82c8371709333ad61e5294062cd2c0fc57caaf49c52d99da0e8ffd1ff13feb0dbfc776e7f46511931010e9d72227ecf65c2abbd31e33deea6d2c3f761ad9987c WHIRLPOOL 55fe4f6081cd26fe2a37003041c3f4cd4e55cb8412c5f36f6fafdd8843718e16e65bbd740ce546496e3149c30ec2d745eba1e9153648840f897af27dc881f896
+MISC ChangeLog 2421 SHA256 1cffb622027cafc76dae6e26f8a51f3a101043ffd89951c21c9e625ef6c754a7 SHA512 6416e3f6a6ef222301bbb6aeb26fa315b4cd775a19e429624d631f84ad0c97ea7a12b762c78447f284af7a51c21ef875bec0aefe874c03426f7b2b65b62f0701 WHIRLPOOL ab90e3c448f169858d7f2b46d33bb3496dee0dd7cc61cee443357baae47217dc5b8c4a9c2022817dce30d93ca3de8dbbee4030cc19d47ce2c57497a070d14d7e
+MISC ChangeLog-2015 1357 SHA256 2f1ff73571385486efb882904c498c3c80fe7c1760f0480aa2c7e7e70060bbbb SHA512 346bd45fc934a56bc80056f13daace19574ffabe28a7d025cc94807463f3b04772f3370b6e21665e4fa61c25c96b8b722d903db4258b315fdcae734f6e5a1e54 WHIRLPOOL 301aba712171e9b349af4275e74cd449dde9d01d0dfd62563a3ead8a1e453f29e31a8cae6555f761766ae14a2cd1dbe3b4934fddac4791ec0722c86522c962ce
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/ecj-gcj/Manifest
new file mode 100644
index 000000000000..64b2fabe4243
--- /dev/null
+++ b/dev-java/ecj-gcj/Manifest
@@ -0,0 +1,12 @@
+AUX ecj-gcj.in 840 SHA256 da96a9d9ddfd1d62e05c34df073c5e9ca96a7950e3ce3f8e3a3fd2e908de9c3d SHA512 7ed6620090643f31f33762a1fe8f0024518bb808bf8aa2e8bfc8f9c0475e41f699670939bfa945a48aa5f5fad61b557a9e315c2781103717c2a6a1bd67a048a1 WHIRLPOOL db068d94d11555a28fca40bc8d5600baf75791224011b4f87895b5a9780e39674cecd238ffc86364487aab7d63fa58060b5e5c220fa4ba9dc372d8f50627c8f3
+DIST ecjsrc-3.5.2.zip 1298691 SHA256 4ae91449962b1e2781b70713e299f9fa16fb1ce25a4d2bb335c13b55c08d6d74 SHA512 5fb3a38358511c92c12dfebbb4beb91581de25e2a3e3b4593d0388531dea5bae469f677e5154b69d634ede7395375992ae9f043be36f6b5a0fcfa873dbc98558 WHIRLPOOL 54860dd40254521cecd38d6dff645443ce61edd4b5eba036ebc002401560b313d3db26eca24b601f66ff78e288246e76b6db219379a65a88c5e16728a4f31c1d
+DIST ecjsrc-3.6.zip 1310484 SHA256 bc2d624c5ca135d593c71a677674509f5801998ffe98c386749d15a46ee69242 SHA512 23f5be36de85f8a95bf029e42df632aa417ffa58a84b50ab5f6c78dd1fa1882316c61165b4d0d7be2c2568226f1e1c352ea45e391759ca6c5c1fef97e8c5fada WHIRLPOOL d2ea8c0ad3eb34e0d0a09b06d87a5dc89b79b106d0d68bec9e19a627f7e1732348c559ff0b4dc1558eeebbb4822ad68b8f0b59b46db84b5c6a7162e7a12f06c3
+DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
+DIST ecjsrc-4.4.2.jar 1764959 SHA256 ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 WHIRLPOOL 5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
+EBUILD ecj-gcj-3.5.2-r3.ebuild 2782 SHA256 27e484f1e5db9480a5ed3f998a1f2a793968c276572ca944d6eba0c48ef5fa21 SHA512 1b566121acf1174645ca7ddffabd1d2ca522d6b94c0eb544949f6a6b3c5a5ba68eb53de6b23baf03c6852a1aaff910ab50f7dd215c24fc932183fedaacb09c51 WHIRLPOOL ba6fdc8f4633289d3787dfa6a9be681cd660e0cf6ed8e436ea20d9067919f6d74c340295be7b58cb6277cbcc52ddaa05ee29bf56e76704a752ea40ba74e2a905
+EBUILD ecj-gcj-3.6-r1.ebuild 2787 SHA256 9435e9668ea21fec53d267f90b6ba4825fa58c60eff89f8a414165ee7a3f017a SHA512 083d05750b4a323db9f1a0e0f8d28a7471fb323a344e5f6edf09471cf94d691ac6ae520c33ea25da7f119506312f347c536ebaeaf6d3cbd8688c822c1e23df9b WHIRLPOOL 2e2127630ff763250702bd471a6187348a3c6c97d1006a62a2feac727036adc958c686b742258d35c526c0053dfa49881bcbd79f6f675cb03201e2d951bc77b1
+EBUILD ecj-gcj-4.2.1-r2.ebuild 2860 SHA256 64cd3913a4f261f110912fae6f3ff0d48461b13d34871136e5b5b1050bdee030 SHA512 d5ec66f550fdfea1c79180eff6b16f5a4efe056896892862d10c8dde0324c6738c6bdcd5e34b82cd8cdd02f8bff42a1ccd303be366d48f675eb343c744dcbaa7 WHIRLPOOL 9b3542584b76f556bd61b11122431ce676b2ca4d70a36d1913b9b1e946224bc32cb21499df13fb5f7ffa594f3c1e35f30d62411ea7195277adcb3fa8e6925aac
+EBUILD ecj-gcj-4.4.2.ebuild 2433 SHA256 e242b2bdd5918a7b669d686ec39a57204dd3a3217bffd4ffb8c674602b611d67 SHA512 7e84f812d8549a2893acd7494cc5004100810244debf556591029cecfddb3e8c69a232b951e8d3bccebc4932c14ac6155ea2f37fbf758a12baf5db246776b6c7 WHIRLPOOL 6b0d96c6437544a5ea14ade014f666975191b87d00d8bf931df2ecc8572c99e684e32cd96a1ca4b01f23a5e84a4b3af8b6bbb2638ef92394b0b19b30f3aaa516
+MISC ChangeLog 2950 SHA256 094365578017a3c51a7475828bd9ed1ec1d9548cc9835dc3428c3e70f5487cc0 SHA512 cedeef1d21920adf491ed45eadd7c2a4519500aa52b582f546c7d04411c1925c68e346128fb7c4491c2115fd9c658ca85f26506dbd9b654714c597535bd55b1c WHIRLPOOL c8c167f41d545896f0dd58971c9cbc2d1c5c5fd495116cf1f8f03dc57f2e6bfb6057e9772953a68415fa05469ad13a0f9bb9085d72d05281b46ba1017e6e4d3b
+MISC ChangeLog-2015 3929 SHA256 71b5f8329c5cdd43496a92b6db42b2cc29ca6b081914165862205c5b58a04833 SHA512 3d2febbb68b6985a2752527613094f6742cb6251102e9a3775d0ada58ca03eb07514cbb43a0d77387b0166ac276c1590a7ce01f4743e1d2895d261577f36d866 WHIRLPOOL 8bb8aa0546e4c0222723980723325c90afd2b4d270e9144ddd1432eafc3e9275f4d64915638f342df4c02bb594cabd7bfd4f4e8ca2f1c6247e9149f27c845a78
+MISC metadata.xml 403 SHA256 67bce4916230db6b4155803d3f6357993eaa256d7b7901abdc556edea15a53f4 SHA512 9a887b9b4ae389bddf88e08c0a9ad145dc3fb69340822938fe7fd6fdb02c55c5b87c34742dc4349dae880ea48fd00161ac70d6c5289c23336c1301c561d0c90c WHIRLPOOL 55c025242c114653dc7299b8f43f4a0cb6dff4513c5e8f28b3072e909c1645db52f031c3b345a30d1543623c2aaa036add857da6a5d5577810eb358c7770d50f
diff --git a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
new file mode 100644
index 000000000000..c2dd06855a54
--- /dev/null
+++ b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
@@ -0,0 +1,109 @@
+# 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}-201002111343"
+
+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/drops/${DMF}/${MY_PN}src-${PV}.zip"
+
+LICENSE="EPL-1.0"
+SLOT="3.5"
+KEYWORDS="~amd64 ~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]"
+
+S="${WORKDIR}"
+
+# for compatibility with java eclass functions
+JAVA_PKG_WANT_SOURCE=1.4
+JAVA_PKG_WANT_TARGET=1.4
+
+MY_PS="${MY_PN}-${SLOT}"
+
+java_prepare() {
+	# We don't need the ant adapter here
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -fr org/eclipse/jdt/internal/antadapter || die
+
+	# upstream build.xml excludes this
+	rm -f META-INF/eclipse.inf || die
+
+	# these java6 specific classes cannot compile with ecj
+	rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
+}
+
+src_compile() {
+	local javac_opts javac java jar
+
+	local gccbin=$(gcc-config -B)
+	local gccver=$(gcc-fullversion)
+
+	local gcj="${gccbin}/gcj"
+	javac="${gcj} -C --encoding=ISO-8859-1"
+	jar="${gccbin}/gjar"
+	java="${gccbin}/gij"
+
+	mkdir -p bootstrap || die
+	cp -pPR org bootstrap || die
+	cd "${S}/bootstrap" || die
+
+	einfo "bootstrapping ${MY_PN} with ${javac} ..."
+	${javac} ${javac_opts} $(find org/ -name '*.java') || die
+	find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+		-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 org || die
+	find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+		-exec ${jar} 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
+		$(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \
+			"${EPREFIX}"/usr/share/${PN}-${SLOT}/lib/ecj.jar \
+			"${EPREFIX}"/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/ecj-gcj-3.6-r1.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
new file mode 100644
index 000000000000..828b293af310
--- /dev/null
+++ b/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
@@ -0,0 +1,109 @@
+# 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}-201006080911"
+
+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/drops/${DMF}/${MY_PN}src-${PV}.zip"
+
+LICENSE="EPL-1.0"
+SLOT="3.6"
+KEYWORDS="~amd64 ~arm ~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]"
+
+S="${WORKDIR}"
+
+# for compatibility with java eclass functions
+JAVA_PKG_WANT_SOURCE=1.4
+JAVA_PKG_WANT_TARGET=1.4
+
+MY_PS="${MY_PN}-${SLOT}"
+
+java_prepare() {
+	# We don't need the ant adapter here
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -fr org/eclipse/jdt/internal/antadapter || die
+
+	# upstream build.xml excludes this
+	rm -f META-INF/eclipse.inf || die
+
+	# these java6 specific classes cannot compile with ecj
+	rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
+}
+
+src_compile() {
+	local javac_opts javac java jar
+
+	local gccbin=$(gcc-config -B)
+	local gccver=$(gcc-fullversion)
+
+	local gcj="${gccbin}/gcj"
+	javac="${gcj} -C --encoding=ISO-8859-1"
+	jar="${gccbin}/gjar"
+	java="${gccbin}/gij"
+
+	mkdir -p bootstrap || die
+	cp -pPR org bootstrap || die
+	cd "${S}/bootstrap" || die
+
+	einfo "bootstrapping ${MY_PN} with ${javac} ..."
+	${javac} ${javac_opts} $(find org/ -name '*.java') || die
+	find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+		-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 org || die
+	find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+		-exec ${jar} 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
+		$(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \
+			"${EPREFIX}"/usr/share/${PN}-${SLOT}/lib/ecj.jar \
+			"${EPREFIX}"/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/ecj-gcj-4.2.1-r2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
new file mode 100644
index 000000000000..d29d172ca10f
--- /dev/null
+++ b/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
@@ -0,0 +1,109 @@
+# 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}-201209141800"
+
+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.2"
+KEYWORDS="~amd64 ~arm ~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]"
+
+S="${WORKDIR}"
+
+# for compatibility with java eclass functions
+JAVA_PKG_WANT_SOURCE=1.4
+JAVA_PKG_WANT_TARGET=1.4
+
+MY_PS="${MY_PN}-${SLOT}"
+
+java_prepare() {
+	# We don't need the ant adapter here
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -fr org/eclipse/jdt/internal/antadapter || die
+
+	# upstream build.xml excludes this
+	rm -f META-INF/eclipse.inf || die
+
+	# these java6 specific classes cannot compile with gcj
+	rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
+}
+
+src_compile() {
+	local javac_opts javac java jar
+
+	local gccbin=$(gcc-config -B)
+	local gccver=$(gcc-fullversion)
+
+	local gcj="${gccbin}/gcj"
+	javac="${gcj} -C --encoding=ISO-8859-1"
+	jar="${gccbin}/gjar"
+	java="${gccbin}/gij"
+
+	mkdir -p bootstrap || die
+	cp -pPR org bootstrap || die
+	cd "${S}/bootstrap" || die
+
+	einfo "bootstrapping ${MY_PN} with ${javac} ..."
+	${javac} ${javac_opts} $(find org/ -name '*.java') || die
+	find org/ \( -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 org || die
+	find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' -o -name '*.inf' -o -name '*.props' \) \
+		-exec ${jar} 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
+		$(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \
+			"${EPREFIX}"/usr/share/${PN}-${SLOT}/lib/ecj.jar \
+			"${EPREFIX}"/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/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/Manifest b/dev-java/eclipse-ecj/Manifest
new file mode 100644
index 000000000000..0733d0c68ac1
--- /dev/null
+++ b/dev-java/eclipse-ecj/Manifest
@@ -0,0 +1,9 @@
+DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
+DIST ecjsrc-4.4.2.jar 1764959 SHA256 ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 WHIRLPOOL 5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
+DIST ecjsrc-4.5.1.jar 1809543 SHA256 101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553 WHIRLPOOL 739746de8dfb3c9b9ad40925e99ed58de1f594d6d4e20fd71ce07394a99f2f3f51984daf27c32a76ae5c4a25abf99c6dfb012b62858806d91a5f584d3a4da9f7
+EBUILD eclipse-ecj-4.2.1.ebuild 2780 SHA256 5de8a1d97905f3504dd8b12110710825f8b8a988e3289a36be00e84191f3c95f SHA512 2d4a870985cd6ab5625fef499541e0a47d435f7bd2d936944c2ed75a1ae221101e6b97f4defac5be462a632488cec7994faa309bc663b4d224d5374ada2e6ea3 WHIRLPOOL 51f46481a5bfbf953b57bd5a3ca619de3b0ddc95fa4ac282001b9b1bd789f119aca2c48ecfd77d49e9c9e05860e19e5787d3bbcd114fbcebd5d545cb7e5d7ff9
+EBUILD eclipse-ecj-4.4.2-r1.ebuild 1371 SHA256 51ed259c680e7f2f24b999640534e0ba3b1a96db9b3bf80e1d87172641c45bfa SHA512 d8cb8193546b77b66ebe38052994fe1aa422db91f4223a05c37c6eacd2a7039474c2b2fdf016c7fd723669427d6632d6b36ad945229bcc2ed720742be0e695bd WHIRLPOOL f17b70bfbaa179223ab77d0b544855d5d49479e7a7aa4f462c11b8a7ade75d4f79b8a758c7bee3c1c946522284dbdb8ceda6b9759da6ab802e765d5c2d766339
+EBUILD eclipse-ecj-4.5.1.ebuild 1638 SHA256 259614d5bec12ae6e8047fca93db7409603dc86a9a7c15c4a1d2d5af48bd5e4d SHA512 3515d245863e5d42ea973dbe700c7699af11f4796dc225fb7985aa4a0f612b799e93a72eac7ca314d664114feb8bd43ed4e14cef4d6e7c17798fb2064644de47 WHIRLPOOL fc8b79a3638e34095be85a018ba8baa6dabf849d3fb7fce0a5eedd044c7252fc423593177edcc21e4e5144a9ec5d372232921ce8cd25b84c8f96aa9ec915ae8a
+MISC ChangeLog 4088 SHA256 53ddde498f86192f3cec066bbf6ca9beee350dac0a3fc9e01d88811623f9f5d0 SHA512 7c2c7267c89055776126ae2299880677019e29a0d9b5bd44a0bb82a3709ee0e291788815102159b39b59116edfd0cf95b7957e2beefda5e9f57905b142a68eb5 WHIRLPOOL 44b4515df6d5e382bb2a7aa0338f9b428f9904c84d9e0ec6502d958eb0043593cad96385b36726f05e313908bf2032a8557e36f9ebef05c8fd20d5db5b95437f
+MISC ChangeLog-2015 16700 SHA256 1d520178172520cf31f92c8b02a07462e547e2a935c47fec26bb91842739d037 SHA512 d869263fb22679835e7ebbbbb7e3d058a7b2ab22e36be9ed75fdf510e6e5de3e09f833f531d6a5e0e2bbd82ab6414832025fca4bc022203125fe703ef4fae3e8 WHIRLPOOL c169ceb7806613c7e3e5bf926673a6f4dd41a46dd02b6e34e61534e2882161114b2ce1d4ffdc27966023baa8017525e08d7f6e1a39d786118d7d540d0bb08579
+MISC metadata.xml 645 SHA256 e100eb5f1725577787fd69fe2fad1102a6432835edb896cc3326207a0cfebcb1 SHA512 0ba8d7ccd7280fc72bf485c5450a3e6bcd09713c432867439aaa7ebed6db5530ee15a0687c381a9191b533abebba4a6a06d9fbfa6ee3e01dae9dc2936de6836a WHIRLPOOL 5907b1ab507bc469599c8d316c906e013738f46c1f8a3c4fff8242749bd17eaf521fb1e1147313805677035d136b3cc3010e3e1dad012e0062d03de1d33a879c
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..9e9f541213dd
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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..67acbe1e99d8
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
@@ -0,0 +1,62 @@
+# 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="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 ~x86-fbsd ~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..1301f382b5e3
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
@@ -0,0 +1,68 @@
+# 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="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 ~x86-fbsd ~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/Manifest b/dev-java/eclipsito/Manifest
new file mode 100644
index 000000000000..17987a022909
--- /dev/null
+++ b/dev-java/eclipsito/Manifest
@@ -0,0 +1,6 @@
+AUX eclipsito-0_pre20130713-build.xml 1101 SHA256 7a1fba2798914ba6386d73da860f999747c318642c8a3ffb641f27faea866141 SHA512 015ec8415927e31d672a0daf8ca89ceb0c8202f2ac8556583fef44586eedf6de8abafd3e96b85ece41fd7de7b712c9a18c53fd6184c8cf753a63e9d1c02ad7cd WHIRLPOOL 881e7d0a065bf6e27fc9c2593ad5e0d077a5d3eaaadd4e2d62202f13bd1818cd86c790da9cf81a4258d82e7f5fb39fd5a55f97e1fe2af00a103f980e02ac1233
+DIST eclipsito-0_pre20130713.tar.xz 162972 SHA256 2ac637b26a30263777d2c92912e0607a26d379f14a9c1a4a3cd28a9960b15c10 SHA512 b238692950bc93059fb16df8e6301669583185976ae4f12519d1917a13fea2b53c5b3462f2da61d63025019eee10037a3a96b2ac742545d61b80f2ab7964d41b WHIRLPOOL b2dbecf2d0c80f851d0c4253c6aa8b9657e5f39802a30d5385231c985c406702ebeca92645969c8bbf6cf11fb3ebb2fa77b755a46a3e99fd26f45b40efedee48
+EBUILD eclipsito-0_pre20130713.ebuild 703 SHA256 e5be0486edf7a82a8d8e3fc18db5b08e80e3ad776f6af3a390c496410d92aa30 SHA512 50905b910ea794b51dcea6f3b9bd36bc65f8b1b9ce30752780b085c2677f596af7836f131b57c6420682fa4929e55485861a8d784bc0d3e7f3b4856bfbfe0cbf WHIRLPOOL 86496e560b5f9fc1845a28f975cfb985b8312134dbf99c93d6ca70e68604caef4c7011f167cc2a0968e55cb61af193839bf1601fa2add24fa4a513362c3055fa
+MISC ChangeLog 2527 SHA256 5da323b7aade25e3e622bec1c039e7a63c288991d7f3036f90216fc169e644e8 SHA512 20be751719e591bb943061e9572fc9d60b8b72c2d718a213e53e6795cac9b456a313b43654875ff0af56079bc1121ec7145b0615a48351f64316910e46912a8e WHIRLPOOL 7ccb7ba58c7cd480c53b53397c7bc12b4ba3576a46d7e0def934e010a8cad0cd7a71cfe220f62777de31624cd3b491b8cae49ce0d48bb6e621d4c01e16c333f6
+MISC ChangeLog-2015 779 SHA256 eb459b78fcb301737ced874d373185865086c80faea1c62728cd3047f1c6b371 SHA512 b2db7f11313bb10c21e6369a9e79bd762e1229942e35ba5c373041cbafe7d6cce767d6f3c121854f2906b03b5b91591f96d1b8d13905baccb55f1d050bda7d0a WHIRLPOOL ed18bf0795a9a47c04fa7bb37092e19a62d009317077eee823063ffa1452a5ed5e2c44717a33e115d6e952034df0055ff8c412e91093130799e91931eaa776dc
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/ecs/Manifest
new file mode 100644
index 000000000000..243f8d73e7d0
--- /dev/null
+++ b/dev-java/ecs/Manifest
@@ -0,0 +1,6 @@
+AUX ecs-1.4.2-java7-enum.patch 9655 SHA256 bb093c90012241c81644acbf2a310c08571cc67d7248037aae59610a1a354a2a SHA512 9be8efb4762dd88ab9b3a05466ec9085b22e6d4f2c10ba11a57a9411b73edb1c3b6a0f9ba940159a8857087b310b49978885469ce9a7e5f8d964770772c5f4f5 WHIRLPOOL 84caf10f718494974cd780bba10a59c598790db05e4a8a6e743aa4370e65a1bc3237645112bc1b6cd26a07cab2f658ffbcf6ba77cbde713920478ade9a0f5f3b
+DIST ecs-1.4.2-src.tar.gz 3435157 SHA256 8e98da4dd0ed5498bdfac1ec7a4bfa429348d1c8733ed189e67923d98adb2a31 SHA512 b7004f9364a24dd9ec8f963f69279471cc2e39fdc81d1c97dc4881cf65ee16f5f4342129b7bdda12994b69edff23944cb12f5d4b4ec140bf962e3a4f9f4e1bb4 WHIRLPOOL 202a8f9f4b81d0714f59b2817a317b85a95e5233efb4832fb787d988126b5d2b8fca46eeb7828f71fef9efea953de80d81c769e1dfa77dbd5b052dc78b750c38
+EBUILD ecs-1.4.2-r2.ebuild 805 SHA256 9556b9fedad32e26e7849f9d5128d7491f71dcec1c92e23d4bd23fb5a88e0637 SHA512 cd354f4f0b96bb37f6a22b074774bd63e1094484640774dc388dd5fe0fecba685075a4cdd42e9c4e5bfb51e60cc4ea370e63a8265688f1d3446d94d578dfd935 WHIRLPOOL 7cb009b1e85bae8cc352cb87128bfff85ef9645abf0b09afcc12c9fe587bb15c401b443a74adaa41b4126d9d897f2b4c5bda633fad2efecd98335cbb895b1c08
+MISC ChangeLog 2952 SHA256 a25f5f873dc9f3c7322fbdff988af4fd0c4bbb508b8f6fc53531a1907f211eb9 SHA512 2e2e60f1d16c7b38705687d8483935acd09edd69ab347e028fd9c2107b6b561eb4a93c909fe8fe5aa7842501b165ce2c8d3e94733fbfd8106704bbefbb5097e1 WHIRLPOOL 7cf372e1a50e64207bb9ecb1694a23ef775abcad4afdc800d8fcb7b1a765e0870f6c193a779716364ac68505813d5df816806b32ca91dc14ddb3b5173395c6f5
+MISC ChangeLog-2015 2887 SHA256 4db3f6d774c7e917a0d520aad7c9004d499333157617aca0ce11312a0565c014 SHA512 5f0febe478463512927408e8d347e8decc593ed5f7344dd5b6b66eb39a519f58db3e7095ab4fc696a002c37cd1410cff9b447dbe6e065b7d942e0926c60cb552 WHIRLPOOL 705388d57730b884fa7affe6dc1614f6fc1092c3323156526df6d8e00c031ca0eda4e40b399ace218be8a48cca5ab096f8b363b2ed5cdf2ae8b5b1757788c29b
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..baa18cc2e5cb
--- /dev/null
+++ b/dev-java/ecs/ecs-1.4.2-r2.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-pkg-simple
+
+DESCRIPTION="Java library to generate markup language text such as HTML and XML"
+HOMEPAGE="http://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/Manifest b/dev-java/edtftpj/Manifest
new file mode 100644
index 000000000000..b1931cb90022
--- /dev/null
+++ b/dev-java/edtftpj/Manifest
@@ -0,0 +1,5 @@
+DIST edtftpj-2.4.0.zip 1592179 SHA256 17c92da78b43e2471f7dc9e4125ed7c79b45bbf8143c6be08f8d75d995d3904a SHA512 bbcbb35805bd84e76fe15f9b07fb984782cd5838b94ee90af336991f0dfdb9b06028a35614a9accf16eb55151f09501cec5fac41030f847a32a679f9404808b0 WHIRLPOOL ed96745f77401df8aed90f9d01e750fd75cf7563d349dca15b432b7367e9a806f9c4612a413d8f3372d6a962d55c298e42e51b1ce74cd2f9c10bb3ecce56c35a
+EBUILD edtftpj-2.4.0.ebuild 1101 SHA256 ffb765de7d624a9e148856c5675ba4bd630b30b577b9c23432b6d140799cf7d0 SHA512 9dba0770bf4c0a274f091e6e7214e3faa55df0cae7785532060f4d8173b21ed448e5b19f5a15e90757e982f6ba776f9d4be4869a4101ca76bd6c9d16fe280050 WHIRLPOOL edcddd3c155e795c955c09f8df29d89f103f20793bd927e1fb202c6b7966541e68229569362bb1fffbfa7d900602444ff24cefb7658df267a14c9913bc2d8b02
+MISC ChangeLog 3021 SHA256 62110a81809cfacb1545a4ca29dcedc1a88ab6fbb656fcb3006f6795171128c9 SHA512 9fe9da6e2ea4501252b22369f07fa26cd02f4302a91311e292be77f6742558682b72016dd9cc345fdb66bb8514aa31abff3c246053af9041243d41f4d193580a WHIRLPOOL 0b8c740557a500c9d17742a1d45e49a6679cd27d7becc54786560c2d927bed3a3c08fa0c6d85588527c049edadcd21fcd499df6b205bee86b0525b9b5aa8c502
+MISC ChangeLog-2015 6866 SHA256 c3fa3160c2a972b2a34360977e185799da4f5507e80514698c4e55d2ea63fa60 SHA512 ddc7cd17f13ab9e4c203c2b5457d1960ec3a29a6a0aa74e29e23ee3def7730eb60e992af61836a15a1a8b03ff9ca9102fbb450c61211b416984be9aedba3beb8 WHIRLPOOL 15129cc715d0d23d94fd861082dd647aa169c88299c8da20da63a212c11d6e45e89f278541c1903a1f48b8e9de1d8220d6d0356c87a0ff49e2c9c877dbefca62
+MISC metadata.xml 808 SHA256 557a2bb448effc0c0d6867b8a5b723c196dfc6d535505e14c941dbad34a10bc8 SHA512 c256394780ef9ac1e7e2639f4ff4c6780e2059188a4ce1fa8250bcb2c7b12963f7e40c511ade1256955221d8f4ba9fb6122cfee279167ece17873dce394c9c91 WHIRLPOOL c3187489a11e92d32ceb83aec234c5eeeff39bf3923a59d12d2170f74fe4ae72ff8241fb7f5b3e9e6844963addeecfeac50b6a689fc09bfc15e9b1d09ecd3ce5
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..098918ea822c
--- /dev/null
+++ b/dev-java/edtftpj/edtftpj-2.4.0.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-ant-2
+
+DESCRIPTION="FTP client library written in Java"
+SRC_URI="http://www.enterprisedt.com/products/edtftpj/download/${P}.zip"
+HOMEPAGE="http://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/Manifest b/dev-java/ehcache/Manifest
new file mode 100644
index 000000000000..f1efb0e4d94b
--- /dev/null
+++ b/dev-java/ehcache/Manifest
@@ -0,0 +1,6 @@
+DIST ehcache-1.2.4.tgz 1330344 SHA256 47b5dad87d8c75773e66aef471b1b464118956f8ce3bf9ca0e0292f020a20a64 SHA512 a8d3e7c47eeeab568fbe2f4b923db96cf0f93d8ae0f727aa107b0ce5c5abd035a3967ea58617ff10e9c81109dcb8d904cbad86ec2c77d9be159e1a0a2c44d4ed WHIRLPOOL ed7913a200c45119f565912118b1b7c9e9e6ffc29fe8e227c7eca3d66f2333636d214af6e39ba9cf41c6eb0cf4568e26e1b511c06b66b3abdde8a6cba814178e
+EBUILD ehcache-1.2.4-r3.ebuild 943 SHA256 d4a69ef7b16e1771949bb4bff426d3cd4b37eb2001043de7f7845cc0ee6775a6 SHA512 6b157bf437c0802af43768a03c773a8d15142c40519dc70e0b0a9c80cfc78f84456cee1627072936ceeb44cea7d41c755d9725d617199bc35717d0ae56e26744 WHIRLPOOL cd73098170bc1dcb52245b42756fed2235de50365ee203c1ee465992c31c20410bd4182e55b12165177046e7dc33b60cf72614a58c86b78fabc6b7e765e7f63b
+EBUILD ehcache-1.2.4-r4.ebuild 834 SHA256 f3c9aa8321fde07022cd5874971cb2a8f8903ed12017b3bcac2d0af8b4f8c18a SHA512 ca5dd8196d312b67f2ba78f450d904152b0382f8b590c99a23266bf653124fec6139a2dfd6bd6f3121120da125ed1e111cd5273138a70a4fad61e98f65a94f8b WHIRLPOOL 4b568ec19871590e5c1d04f74d1719514cc3090e59db40ff8d3ba00ba7be2c0045304cc816b1899b8d5380e02180b1a545c38be0f295202ebb34b53928857c70
+MISC ChangeLog 3238 SHA256 8c6a359cdab0bf57abad54afb38cccaf50341d7b2bd726806d50ba27fa2a0a07 SHA512 97993067211930253e92178fa60f548270966f88f41a869c8a95a9aa3b877eb375e6b12abc27d347a67045163b055882bbf489b3a70f34358d41c2f5f3250d2a WHIRLPOOL 761da30cfc9b2d120a2e1eaadb530a053d6bcacaebb6f883ecd3376e1f0d32fed76e0a7541bef4f74b2385afb6620a35bc8413e59b43e9fa7600bad5e327ea0b
+MISC ChangeLog-2015 3768 SHA256 f5e85965e776983e9c47be68b4062d31ec619a0aba40dc6ee131cf8bb53857a3 SHA512 361e67e45fc2ae7a9dbc7eb74a2f1773a4c8b73eace068415bb3ce9288c284381842229dc6789b9bc32a63ccd2a3785dc09607171d0b8bbeef1d339d88fd882c WHIRLPOOL 5d29e4991aa4c88f2a2e34491b1c7c7ebbc03e249c8fb4b44ccc3ac8261e206078eead902ec9d44610b8429b2da54da6884fb2cdfd6c2a530794d7afeba4c78a
+MISC metadata.xml 313 SHA256 1ac3dd3518c80ff2ef0db70fb8fe42fcd78944bfc0618570bb1fd3f3a58a0983 SHA512 6bc82a76cb9ebccb0253e19e3d1f9aa09bd0a3f2aa16e86f61dbbd76449cc77cda7fbca3fe04e8523f5ada48a5d3bfd89b12ba907ae37290bac6b87af2383da6 WHIRLPOOL b9221fe8f7cd5336263e9c59646ce6939db55e808727e2cc4cf12487ad9bb6605a14f8f4c45ff5fef0fe91e673908ae2fc4bd1a2d9df8ff791bdc2fe9906a31e
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/Manifest b/dev-java/emma/Manifest
new file mode 100644
index 000000000000..f4e0b192203d
--- /dev/null
+++ b/dev-java/emma/Manifest
@@ -0,0 +1,6 @@
+AUX emma-2.0.5312-java15api.patch 841 SHA256 c8e0b61ebb49a7705afb81642a01964cb4adc590f543aef09f18393d60606c68 SHA512 cd485a0bd9bb157f9a0e420bd3bd8863ae5b1127401b8ff8944459c04fa2f5a7e6b008d9f86affe25cb24cf007d9dfe780f843745c6fcdfcfe1f734e9bb8fd23 WHIRLPOOL fc3cd0b1be6fe0806d7c4936e772979651a1591ad234fc580f11ad9958bb549d1454e823d96e777934508b98e4a7bca75c9b0be898c668f9843263811f1583c4
+DIST emma-2.0.5312-src.zip 421109 SHA256 2c6cd6177f2cf4b011ac23c3d301be3655ef1fb276b523d5a5155064917a9833 SHA512 d99b7ff1c4682a97f714f74cc6142bb766cde47bcb33932dc466f1e505e836883f01faa0a959dad77c0837fca3ae744754e0fcdc34d7a8d14720b0b7ce90ee4b WHIRLPOOL bc91a3e681c4926058600382387c775cdf615abd5ad0e50e245aab28a82855519ff4ee0a3b3e74cfce909dfce405e64ab1d8e90177526b6a6247eeaf27630c57
+EBUILD emma-2.0.5312-r3.ebuild 1053 SHA256 58b03580674e4cb2bd54d84a57d840acaa3ba600579a44695299254c497295df SHA512 d5d08c66d803fe24af625df6b793388f85f2ce9a5add53d96f5e6f3cc6de3670b91f1e4b50f6166c0d201270a53fe2534be39634aae497cc26d477025f32bda6 WHIRLPOOL 4890f2922a34f02880587bceea92ac87160b6da803bb236ad2494dc50cee63ca430be50677bb169e38e0fd9ba5731e6c39e7889bf1d6a206d3e1b806bc580a4f
+MISC ChangeLog 3238 SHA256 ecc5397c663730bdc20b6d08017ab12b1cda75bb91b23846b14d52f0f0bbe89d SHA512 604b074e434026962d89bb2c88a0bad0e29b93be5077baf56f84bdacfab57bfd34008f9263f56d06500661a2fef2f3cf0c82443296f24ae2d484752b157b2642 WHIRLPOOL 1c7eee5564a520a13aaedc493358829699f96d76710a924bd4018b1ad0f6d597ef8b29ddbc5580df1fe5a39fc67091099f18cc2d97d70834ae09bbfb6b4239b1
+MISC ChangeLog-2015 3180 SHA256 7f397a2f9b6972a4f2ade7e984ef8e429762bdd8fe89f8dd84c85af46e76557f SHA512 30ac6a6169e5cd4ec43bb656736141bf780305d8e5ec8fe3c389c0f1345d31bc85b4d65435892c148925f833963ad5ce434a4bbc788213bf9c5ab8705fe82ace WHIRLPOOL 4f1ab4ad896480201fa433bdf884065c00d1fa7e2ca3e7826a06adb35ace6fca35881afddb8dc5e5ab90db3d1d2cb6c02eb686c8e94b5de35615ea14e8561d26
+MISC metadata.xml 859 SHA256 de5944e4f3d458eb0414581ee19c6efd0420c5ad618517f9f62e0db541175733 SHA512 ac17b5b8a16adcc4eb751c272805edf5e3c25df27615efeffac2b188f689a8e40461d733921868c1a7e52bbf1e99c618cc99a70d921ed51661241c87b46a7a3b WHIRLPOOL 8661a0b59299504b0565dec4e3ce40f45e0bef975ea8ad4bef5d88e8a709020341195940ac364e6497a4aeb651dec1e871957e0951c3e44c859fd7ecf27fe598
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..ff56f2afb65f
--- /dev/null
+++ b/dev-java/emma/emma-2.0.5312-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="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 ~x86-fbsd"
+
+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/Manifest b/dev-java/error-prone-annotations/Manifest
new file mode 100644
index 000000000000..40c7ba2b2b42
--- /dev/null
+++ b/dev-java/error-prone-annotations/Manifest
@@ -0,0 +1,4 @@
+DIST error-prone-2.0.14.tar.gz 677991 SHA256 58f569742ab8b0c381001c60b2dc5b8adbad92f520f8c283927c814f8275cbce SHA512 0bf2c869638e03fea5395e2b84a690c42df320903e48a171537e68a60ae7a47a8a83de07fa0a8dfb03340c035878b4380fd6677ba3bf1d13eeffcfaee4e63658 WHIRLPOOL dbd607552194e71726a5c901262ea64cf7fad7f453449e41c928ddc634eacc1a884b0d0b5e05df54d5d199871409edd3b5d4e43c16ad603b7dd7917a86db4804
+EBUILD error-prone-annotations-2.0.14.ebuild 599 SHA256 8897a3df752f0e88e546efc4ec9f855f4084a2a7735f5d80b2aee069ea0508c3 SHA512 496b67dc1a6ecaf723ffb5264a1867da3d910cb6b0bf93bb9c1c88747edd4400171eddc58e20155e44271dfa977e9d51111c2af3bf7566028f7814131e5bddc9 WHIRLPOOL e0e12ec4970e968add5e39ca209faa4b27fdc703cf5b1ef0e695177e07edee0edaa6304d8b7c87e6ee7708e15d47f27e111e7c862a179994161f306ca3912555
+MISC ChangeLog 423 SHA256 6a4f34985240015cf9a1f546833edf502f9e7c95ec66bb5ec0eb10d7e8a65fd2 SHA512 ae8e90000014f9e8024141563f91ae1c24a9e08f239e6690fee09722b0f65c032d68f1b27be9497083c8f4487554883ad28893dab32fbd59718059bdfbe672e8 WHIRLPOOL aea90a820569a2967826073b9a3405b7a39259c43998a2ac8870fd769f14416937386835f3da80a111e0961bca977bf92880441c0588a4e58b72da202f1a921b
+MISC metadata.xml 319 SHA256 38960982087ae0c280254067070f9cbe35a353dcda5e36b5bf5ef3b3fe680ece SHA512 0ae8aaa5ccf52264fd07cc4086c8d60eddafca5fa65c1769e5f810a63f5477914ba1f4e27f88836207ebb21cc595f8fa94bcc3e5c955a53b20afea8555ee73f4 WHIRLPOOL 986071ad6215fa1c9a682d6d825abcc070c4bc279b22af6c6209680c1a1b0b7bb8672bb1255fa21640f1da63ff8fb0f1f18708eda653ff9758aaaad45df441ff
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/Manifest b/dev-java/ezmorph/Manifest
new file mode 100644
index 000000000000..73831adbe4d4
--- /dev/null
+++ b/dev-java/ezmorph/Manifest
@@ -0,0 +1,4 @@
+DIST ezmorph-1.0.6-sources.jar 68198 SHA256 81660eed757f05a9d907e4247ce3fca4da37a9661ff0feb3344b838e3aa03843 SHA512 a8f88ff38e2d2815ee64436af87c4dc5a9858edec729c8db3ebda6d64d2fe2644b5e56deafedcf242caffa523643ccb978cd775c85793df6e2e5487c6d878cea WHIRLPOOL 47e5c72a0c4dd9dda634830cfa7bf64ffc8bb64bb0199f3ce42d75e1addc6787173583520c1fea755ad721e758dd24743095ce61b023589ee8e55f5e7518f371
+EBUILD ezmorph-1.0.6.ebuild 960 SHA256 1aa5743b056eacb4582ca87050eff2b32aad373c42d78c3a6403848edc477c3f SHA512 50abfd78fbe1afa2d6dbceb2f2b0f89ff2a40c1c0462f11581afe964aa7cbeb40565c2a62f5753bcaed768a7b4e2f27a10bcf2ebae4435fbf2de0ab67188f033 WHIRLPOOL 989bff8274fb419fb2dcba4fc122fbdd63b09bbef796a5e6b38077dc3232a79c60f5bf3c7d2715dbfc6531197d95dd41872e001feac18d8b876c2d5d9a7ee1be
+MISC ChangeLog 309 SHA256 e7f851bedba575fee08cba89aa57d9ebbccfff68a3d45d75c1e10ce94d985fcc SHA512 d16091e4d286ae654d4cdedadb84db3fbd42657680bac0adf90c074a85dee5493ba582265bf4937a9cd5d087d7506fd7f08de0e1215c36b6a7403cbd0c8d65a2 WHIRLPOOL 9646b2e04d79d1bee4f5d531490d01b7a803ccc659a1e4f7241a5daeb0369c1d18f8e34845bf18ce41e173405ec32437a446d80c515c8fc5d5766855af178090
+MISC metadata.xml 742 SHA256 5679d4626d000a571a84af8fbbe17c0c2918c06c0bf5f82fb0901ca744a73837 SHA512 41b63dd21a20718678dde8fef5e36cd2b563a6212f928d1c5f516d80306d961064b07e85aeac5913afe81c27d57814054fb095b155db0899fdc4f28dd0e40ff3 WHIRLPOOL 23fe2aa3ddf3500fc076ff8baf61d0930ded574a4ca274c4fe52d05db0cc18893346ba9675e2b5d7b5dee7575028aaeeeccbe8fc7580e6a512000cb9b6b62e46
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..dc291df04bae
--- /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/Manifest b/dev-java/fastinfoset/Manifest
new file mode 100644
index 000000000000..81e9f84000c1
--- /dev/null
+++ b/dev-java/fastinfoset/Manifest
@@ -0,0 +1,5 @@
+DIST FastInfoset-1.2.11-sources.jar 255054 SHA256 5d5ffc5002d78edf3c838cc60567447f5dfd3b22fda623afe15a4bd44c92c4f4 SHA512 a1e850e4b235bf767a168dacdaf61f4e1261b6cb50387c3f3cda575f87bed5cf3974c9d04a273baf1aeb47bfa1851aab95432a3890b8bd99f3672c88f0205e3a WHIRLPOOL e20edda9a8d2314cb66c450442260683e701fc5c9fd40ca228c1adf4eacc1967e5ea36423021404df42d396f9b6b562d0a6a727859aa85a53a3976d0e5155ae7
+EBUILD fastinfoset-1.2.11.ebuild 586 SHA256 468c086cc1baabfc7001cefb4fb9cc48d1d7f61460d49f7cef3ad26d1fe31fe0 SHA512 0f3186983efbca765e35ad3afd1a18019b2f8e78f9aa77896d07503ed4b5246fa1e2bf8f79fbfebda1f4d69e84363c6dae2f567ec4372b6d017375ff5ac11641 WHIRLPOOL 68a75444504fca5ef34759325e34cdf9120967d2dcf4a484f62f8f7d0da9b559144e5a31de5522ef3ebebbc65e752f579ffa606b286d11b427a38af7598841d2
+MISC ChangeLog 3092 SHA256 dda6283a27bb13986acd2472643c333308e55e460499ba5defad68a5ae042ad2 SHA512 9636fbc343e1005463d02bdf14d2596d9c9e3120da3c0c8fcfcf9f4e1a0414930d536e9e9cca0c3b29ebe378703a8a6487cbe08b90956f5e34f98e51ffde4c34 WHIRLPOOL 73dfa02e3632b779efc823b1b9a791733b3b74ff4d788180244f3b72d5183eca11fa22032afcd322faaf651d42659241e05bd8b07406dab3c01fab17546fdc0e
+MISC ChangeLog-2015 2052 SHA256 10cd2ae85db33d86a9b6b925b4913138169ee2ce0ca2d690a5635f7e48bbc058 SHA512 a859ba3a53b4ed4a7de819cc69e6bcc96888b2c0e50039414bb759e27dc77b6e5d9cebaad3d3e32fb125bcfc75ac0daa601fe2d9c4e048acb627d3647bc9fff1 WHIRLPOOL f8eeeccacfed5097d3d782d9ef60292502d46baafd9d590f9e28c4a8fbe6df7875dbeb4b4823bf769b946c865904600a337c522598e2635d21fa0839720264b3
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..3bb647c3d87f
--- /dev/null
+++ b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
@@ -0,0 +1,25 @@
+# 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="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 ~x86-fbsd"
+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/Manifest b/dev-java/fastutil/Manifest
new file mode 100644
index 000000000000..55dbf68788a4
--- /dev/null
+++ b/dev-java/fastutil/Manifest
@@ -0,0 +1,5 @@
+DIST fastutil-7.0.10.zip 518168 SHA256 0176bc09948db672e312b077420868aed7ded693666f77cec2d62b9c3226c26d SHA512 9345f509243bf91123b4232b95915ae4d6071b5da17948cf62e993e77e9ed947637f02937ccd98edbfd874db7f98c1858357e21721feb338d97041a7bcc3e558 WHIRLPOOL 7d209e130dc6c5dcffd2f32a7f77b18d2bfbd679fe18c7e7017db3c0006a5775398a8e1563c0a1b69b4a7f8f8f5ac430804b8ce7903fe836d371817111c07bde
+EBUILD fastutil-7.0.10.ebuild 828 SHA256 0ebe4713dbd18afbebab0f057daee6e4bd97941e10a4eff1c56e0948689aadb5 SHA512 74b0b380bdc479f97b5da50d2dcf2ee114b6a11a168fbca1330827b93467e385a2ebf009d69bb4e924c25de2305ddb277a2859120867461272d605b6357f9a82 WHIRLPOOL 35cb04170575211525efe9d8010a7711c189d671ffc1f2b13833d999c8a881a1a42bc4b83885330ccba79aa0fe4bee0ca1dcf45ec831435025d40636503f7ef2
+MISC ChangeLog 3511 SHA256 f5cd11e27b2f31fda1da6e1d611f274eb5f2b0f26ad8a1481c250a86d173e18e SHA512 434f4d6eda95a72e50b66e74a64b335e029c1eb7910924b2ef4e7962de849851445ea4126e0b3cbe4bd565bd3321083875222cd35c64a29d2d55599758899610 WHIRLPOOL f23f8e7d27c9c42823e7f6fcce6ea336b3c197a90bbd37d2ea9860b57c936c4d61cdb9421d3b47e6d0c09cb0cc1d8f2334711de036fe46a103fd96b1fa2fafd3
+MISC ChangeLog-2015 6742 SHA256 bc0b4839b2cafa5eb2a61a56c84a076641d7e6d8aa02cd92ecfa1907145335be SHA512 8fc85ad22267a88be0fc86465f11d19c70361fe1904a74d8f9f0c6ebdeaaf282ab36c8e17d8f13972816324b128cebdcb02053d0b2c02d16b20389f534e0c23a WHIRLPOOL ccd0b1085e287d6902c91e90628709acfbc50c3bcc0f11d1cb3cee0103e6ca6603d597684bb6169641c84c28a12b202ad6b0a199eb42e0c2d3451a53cc4b66ff
+MISC metadata.xml 315 SHA256 826619d19ba960b405ed43aed2735ed7a0d397bf846a49a0e228087153e6daa0 SHA512 447055480b194584c2a20458664b53916d198417612b3a084f7d36dc18ea0d4678b93ba916295905059ec37d92a18bfdf2e04b536b5aca378325f38037730ad9 WHIRLPOOL a7986bade6ae81879e23652bf63b7acea4835ad0c01523721bdc9973587f2f9a2a82215e22267d8cd9ef981f9e4d303a02c706fe82045c53614eb3ad39afed99
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/Manifest b/dev-java/fec/Manifest
new file mode 100644
index 000000000000..2fc39810dc16
--- /dev/null
+++ b/dev-java/fec/Manifest
@@ -0,0 +1,9 @@
+AUX fec-1.0.4-build.patch 890 SHA256 685365e4d7cf4ad4f3868cd593ef4492bc0ccbe0894bd2b502316a983ec0c7ae SHA512 d92960acd70d4f494e6875f1f5472d4da889c12a7bf8a232d291a557b0d17160a048290ab9dd9e90746a7954bd71681d36433d9dc422add7b9ea9ab956d8c90e WHIRLPOOL 8dc570dea85a55ed3c7a7ad47970679f11613016b0a796d97d1ef1bc6fe18d6cdbcaf433ed00d87df0283ca82bfbdf145d6cc6a33ad4a44c30098eae759c3090
+AUX fec-1.0.4-libfec8path.patch 1087 SHA256 687f024751ab0d634bc45a6b93c3c264a4e8e092bd4a00b307c845e3dbf83532 SHA512 7f46eedf2eb21eff04f0cee30a0e454d4796f29a22df4c33100255133c43cce07ac95e8e7eae5957412a2ce0da626cdbfffc57c5398f9f2c56660000805a60a0 WHIRLPOOL 9973c5424b16dbc048f1815f997b140d3e9c4572483aeeb190612282c4447da48dde4e5b45dab93dd04ffb150b36efde24e0916877a60581cf628e1be27ad8ff
+AUX fec-1.0.4-remove-concurrent-util-imports.patch 3142 SHA256 99b99a95a8120a3d62ade87f23e8c13e76a92b589ed62853a17cbe3bd8c43a08 SHA512 195d2d5ec252d9e8c83762de318393b50d08fd50c900a13489e082e6d08bcc6f85b6425dd350fe1d24e2aab5ed8753ce25dc87f35aa8754721cdf5949ad49aa6 WHIRLPOOL 9d342d188282772bd40eae5b6ea5f568c5c45153b8e02f661d06180cf607751140b17faee70b1665daeb39dc7a19f812f548a67c4f505dfb5dcd9b18b901721a
+AUX fec-1.0.4-soname.patch 786 SHA256 b6da1e1015a72d952d6fde0e51916cef01e5ec7628760e789447e24d9f6bca20 SHA512 d75e6198f2f7193fbb65b686118f597c289576726d77ce3d65e122b4d6ca1f790fb8530e42e3e174c97a4b45083f95407478499f11b457d813d06e85b5d21c1d WHIRLPOOL 87c7762bcbae3a4b59af23e665c34f21d568098472c56e2f5f5b96857e2a8d20970357d74c6d62e17b96e8faf10c45b23c377b74d9782758563072a90366a16f
+DIST fec-1.0.4.tar.gz 449406 SHA256 b33f5558f53e1abd9a4e58b5898cd605607698f22679f577f5fdf6cb1a2dd48a SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343 WHIRLPOOL 3179b18a341b65b6cd295cf5f716887f8c90f03f81017444468dd57220afa4c4e58c5112fd4ef898d4f7fd7a307eb5846ffed6bead8d13fedfc30dc41fbb23d5
+EBUILD fec-1.0.4-r2.ebuild 1512 SHA256 e0de83f719b10ffcb231aab5d90dc6531134784033e16221ffed859e7f04a102 SHA512 ca83c503d157a694dfc338a7027dab4a3ef2415ca19f464e9a877c4ca5c938145d140bff18325f3cfc8a56935094120a802e1734545299f4eec05400423e1a01 WHIRLPOOL b76db37de665038172b900cb3488a1710596c5535400e62e1501c896261df1fd1cb76d6825b8f593ef7638e24584533a20aea97fbe007b0e2380d31dd0767f5a
+MISC ChangeLog 3903 SHA256 46cb3e07647cad6e73eb821de16e3c793a99b20c9f48164a6a7c817a34b7c8bb SHA512 4863cd8071f556031a8f0c7c0ce2c6616b640e3f069d301f01b62130235ed414dfcc13571e93fab092220db826832b3013221b607896718782c2d1be1e3616e7 WHIRLPOOL 6dbb8e0a58bd1f615e3e528258dd96e632e0e84b36a2b565b7418bb425525d7067858b86cad7f23def7a4ec97f687d2bc0e5d1eff82d3fb9367849be025e2993
+MISC ChangeLog-2015 2189 SHA256 7d3dd926673ea007b27b01f6452cd5a2340c642fb8387e4723127caa61aa4668 SHA512 ee2ab5ec77351b9b53eff9b15d0def8119253ad34d668a3bed5e0ff3b2d174c8a32c459176567f85c7a62b213c02c9881b3a445cc16d39302d69206108fe37c6 WHIRLPOOL 9fb001b276867d7e2c1f9c30e1147deecfede2c6eec223dc0a527c458f98ad052ea2520ebf035448d99c97c2e578570b6eede419c10e81eda7e70a22c95d7037
+MISC metadata.xml 434 SHA256 3b98a15704fd3944b62dcd4ae0183de525b37967923c6170bd6d75dab9b555a7 SHA512 bdbd0a880e9267ffee492085dd0d6a260e14b9981087cd24cfd2572079ac77b6a629556ca56e08155439f0a37a3bb97e16a2687ebe6ad3aa25340023f7c628f1 WHIRLPOOL 28549b06e96056484440bc502d16685db9d67b194ae2845003e30cd806a8a072effb9177b83341b9d5d434c73aaa9a567b6c0e58a6c5898e16d5290ca1ed918f
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/Manifest b/dev-java/felix-bundlerepository/Manifest
new file mode 100644
index 000000000000..0bbafa163d9e
--- /dev/null
+++ b/dev-java/felix-bundlerepository/Manifest
@@ -0,0 +1,6 @@
+AUX felix-bundlerepository-1.6.6-build.xml 9293 SHA256 53577eea39888ad4edc4256a842854a2310fd3a01b144d7de84d236fdc0ea526 SHA512 23b17058603ab1ceac2af7b88d83d112406036cde05350f9f2d750705040ba9d885c54904dab8c29ee8ffdc506e46cff7eab80d19145a80e437f96034b745414 WHIRLPOOL 93063592451a9baec83c7e68053400b228fd5634fb92a8f005d478f2804383c62329a2d5497a430c3389266b1d10d1e77fe603a7d46c943b3a35eb0f7c4a106f
+DIST org.apache.felix.bundlerepository-1.6.6-source-release.tar.gz 163337 SHA256 cdf1a16e2cd1779f403d58225666c6eee6e4018e9775d195f227b77ae9a88da4 SHA512 a457dacf0b15a54aad9290a3620b4dee503bb7d06eac1e2e9b151613caafdd53b104e8266b10321d04d0fb400df6f9f2131ed03f48bf166205903aa69f260b46 WHIRLPOOL 9d0fea404c7f34b3ed6b5f4edfaf610a01915a2d069b4324f78537233011fc1ef57251ffda5c80b0400cb3283f1c6f863df049bcb8643646158178b2ede337ec
+EBUILD felix-bundlerepository-1.6.6.ebuild 1140 SHA256 a6e7b3c13a4e8d744bcb720c9a790ef8e5be549b418d8c1e9514fd2a965044f2 SHA512 1a88cbcbc814194830fc54a9e2cce61feb1db710b7453c101dad520980ef60b42383a1c801d4acd6614e47acfc2ce1053c3a92dcb9ef348a7a87d65b5093b805 WHIRLPOOL 5849066afaba45577f53241ffe0a9912853cdbaf087030b9f8a549c30a06640e5e92921b44b1644eb6ef8c2f1bbcb1210b1d296b828a1fc66cef5d9abc7f3d28
+MISC ChangeLog 2726 SHA256 3cb99c56f41fbd33c1ed79082db8c1dc0d4c129dc36b74d2cd31771878cc0bed SHA512 875f28e34418b926a1bef021152894e228b944854ad94ffea6c08b8ecdc4a97eeb0549fd372d017f0c014ce670df8d5991edbfd2335aea8b4b722c288d89f33e WHIRLPOOL 42163cb9995547c884c1626894fb1616ef227f8451fe2d1a6e4d8ba8059a58ae7265c298a70d34c7bc1cf0ce6d51dce5b023334baab1e30f7b9d94d4c5a2fe96
+MISC ChangeLog-2015 718 SHA256 d1588375fec29d372613f8ac4f587377ac3b95e0b47e61a29858f2b20ef0532f SHA512 98d0d48f89cfcb34ae83a1f7313925ef8669ce362401b9909aeabd9e29132e55e43169b75e30a89be873acd7c94e6b425004c295366558f168a8fc678028c6ae WHIRLPOOL 3d0b50380596db307c41de2e1594d91ad2ced296a7582f8e0e68d9f890f1d6c7a949200c8999fe3821f0b1c6b5cfbe36de386af839214fa42b75489dccec15b7
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/felix-gogo-command/Manifest
new file mode 100644
index 000000000000..0c88284d31f4
--- /dev/null
+++ b/dev-java/felix-gogo-command/Manifest
@@ -0,0 +1,6 @@
+AUX felix-gogo-command-0.12.0-build.xml 14407 SHA256 5db5ba193e2e2bf87cd377a13aae9a26017608d76fe873a77fdaf88ab621217c SHA512 c99fd734167c6481b0228c3f58d14602f74bd0837fd12f4596314c0a4655b6ec75f15a889fff4872f825eeb447f63aa88ddf678ca1a6276d831f15f8e655204d WHIRLPOOL 2c5b969f539c2cdad6d5b5045a8ebd3541f4341beedbb1a828c4df3d32491c056dd0cc5656e32c20bcd70fb8e50349c4e169540ca60513c242a6a71eb44aa416
+DIST org.apache.felix.gogo.command-0.12.0-project.tar.gz 26454 SHA256 f74d036b7d289ab628d8ade36127cecd332d2383f9500f8fc905f9b80fd09a8c SHA512 8d7afa4b34be6460df9e1e91ecc42b34ecfc1888f5574add206a3c6fbc54647672e34d4f3a4e59eb39f8b2b9fd94b468647c0e95d5fc04649ab7a283e172a061 WHIRLPOOL 443415eba35fd07c3874d58803c628fc4e6f7f2670612a8b711a1cd765bb451d5bd0a55b917c54f054a538969342470b0afe60e89b549d1f6d707aa14eaed99d
+EBUILD felix-gogo-command-0.12.0.ebuild 994 SHA256 2ead998d41ceb230b2cdc2971a7bc72d23aca4b88496d58b92818e51aba3fa30 SHA512 a7c1453ba38dd8cabaa0b3a6da5a9aa46c5d969b6220046630abf5e9974904481566c86650f73610e2962fd9ed8c81e3413d3dfc3ccc78b56ddd819ffe8dc9a6 WHIRLPOOL 3d9bd151a6be3a807c456329d29a5c6803335eb42dbb3620f9bb3f33e45087b15b4004f855103e3892c0ca1dde96988887fc61fcc7ad43114701edfc996e6677
+MISC ChangeLog 2710 SHA256 97525f5cd62905d17d0d481f8cf00c6f0e036b33732a25434937ef25f4b3a0af SHA512 d6a2bcde9e4e8dd64c06fb2d6ed26861f886df6c12cb5882a16b3f5dce35d5aecfab3ced7a116958d411cde32b115a2780471f17bea940930d96300bd7396c9d WHIRLPOOL 91c573a564741f590d8170851ac4bc86350f1847f038279fe9a383b0b12f44fa03a4ca409a7075327bbc65de36cc4d95d620c47152f0c2ca46a00cb452804452
+MISC ChangeLog-2015 515 SHA256 88db046f557761860b5a194392c5222795e163e6b3eb87601a4d3a50c2fa9799 SHA512 2b05a1eb992a0c27ee351f3131c07162382e57193c78033d731d0eda2aa9bfdd7950448a11856355f84da8b1053f7cbfcecc645c188006afedbf7cb29d9b4169 WHIRLPOOL 330b04de0c6bc0e688b204f329129a0d105134335355e637489cd5d2d03b722c9fc616dd8492c70740418bd4b7473acdf9390ad6277ce2dbe53ab917e090adde
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/felix-gogo-runtime/Manifest
new file mode 100644
index 000000000000..d15f08642b3c
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/Manifest
@@ -0,0 +1,7 @@
+AUX felix-gogo-runtime-0.10.0-build.xml 13681 SHA256 ff72529ef0858b7091f507a436490cd13d1fe9cac361f33dd263dbc098656279 SHA512 8faf5c3474adfb26aeb4f1cf1edb67c68ac8e8dddad2740cb3e9fe92ab72f374b97a4f4b18f4eac8aaffbbf4cf0e626baec82e417a95135fca2a0df7f0ac8ecd WHIRLPOOL 20bd5d2850e1b6a49dc6a678a8fb107887406230d78dd8c0a11a7ab07b269343d7ae85006faa804b5128be8ef00c0371241497d4ed4bc55db2f21a0af61a2e94
+AUX felix-gogo-runtime-0.10.0-event-properties-to-map.patch 1072 SHA256 ff75b0c8302b4b5d0b3324640d299d16dec5b542db1b6e5cfe7788e3186aaeee SHA512 b34bdb55d733cde8ccef446632fae9b6cc7022b72e8ff79b023fe713f2bc31a60f839af223bfc517e0cf4d290ee7b239c70cd009a17b9ed8c48b866e56534a66 WHIRLPOOL 3ff5be0befc655ace5449381fa7838086a110d2e5e0d6f1bf2725b1f9b38948d4130f9ab7684fcfe21046c6277009c5f42ae864e7ebc6f8cbc7c51edd919eb0e
+DIST org.apache.felix.gogo.runtime-0.10.0-project.tar.gz 69837 SHA256 474e62ffbb5b5f6d0d3aa22086ee2ae76122ceb8c2eeb19a042e20046dfdb6d4 SHA512 a71100796e400103cf9d46fcdb7bf45b5d1d180328db27900915c1771650297c9135589dc91e4c2194634b4312ea7c064b71496a7e11e9a3393bdc6eeb70e03d WHIRLPOOL 9667ce09ee913339c8a76fbe3f0da157707a2fef43214ef99fe13bb86e1633c4ef573bf81c629655c6451a88288924569501d13671f5a8d2058d941be98838b0
+EBUILD felix-gogo-runtime-0.10.0.ebuild 1038 SHA256 0cda1b43ca5f0dc53bb039c542ae652db32f848c317b9acfa3a7221b7c90f02d SHA512 f505d46386cebc725779c63745db4f2be6d806e891dd063f72f7434fe83c7efca0209c98e188ea48571751518326fabaa149a4640f1ee9fd29d7404fa39642ab WHIRLPOOL c526c8c2a7dffb537a414a6d15431a3df856cab2359f1f20169174f960d0d44b732f5563ea1c3f335f6e915f252b6b2ba7991ce057737603a5b414bda5b75e20
+MISC ChangeLog 2778 SHA256 286feeb634f0f45561f9c7a8e3c7d9d046ba9784419f49936f873d50a35170b7 SHA512 2801c736205578394e8504313cfc712ebb7c82fa4c38622668ca08d3692012d1417c30c48a666fc6d6942dde63cf5ec6d7b4e36f993b25b4ce57b94951a71c7a WHIRLPOOL ed32c7934f56195575b20670c04c2391700a12e1c00a0a0dc5830bcc9edbdad301f5d6f3230681254bc041af4c9ab5708a73d94d235d4b42862b252b0d784e9b
+MISC ChangeLog-2015 588 SHA256 5fe5ed57736086e2a946044b743eaae620bf5191686269af93ed1fcbbe1955e5 SHA512 802271e6855d7583fcc98e81a86c0e4f007e0c23801838ab1cfcb160d9b7370b468d8ee524f0ddc613dc98311a0b17e512b92106b7effb74f0df9c44128fd667 WHIRLPOOL 60d0472877aab92c8c691352d6f3fe8ada1c00c7a5007932beaf3ec7f6972f6c10202beed09ce436ddf84ede0ee15878d49a37f1bb7de891472d6571da02f8f9
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/felix-shell/Manifest
new file mode 100644
index 000000000000..ff9479e10a34
--- /dev/null
+++ b/dev-java/felix-shell/Manifest
@@ -0,0 +1,6 @@
+AUX felix-shell-1.4.3-build.xml 13813 SHA256 484bb6cd4327b550708aa0e1589964ca651d380a611a054c7bd70cff4f894ccd SHA512 324f9a3d1de17756eeff2ed520e3e4639ed371785b3cf422387b75d4dd6790e893d6467308c44b5157a56577a6714c271c6168a9737d7326600f3944fcd4d6be WHIRLPOOL 247021b915ebcadceb8267194dfa10f6c7d40e0be2734c0f6a478fbcf6feec6716cd939ac465fda259b3f7510e7b67683e132e787e01b387ae7dc151328ddf41
+DIST org.apache.felix.shell-1.4.3-source-release.tar.gz 75190 SHA256 daea2ae1cd3e28dbbcf5da964ffa5b6cb37ccc102dc070b878203900e8bf292a SHA512 fe1b3927789a18626715e52a634fa069fdd1505f425a48d76ec6abbb181f511ff5a3af176c70f634241830b185d32cd7eb71a271d62a754366141cd959cb54a4 WHIRLPOOL 6836e3503a26b887997786f2214b32eca527b9b28b98fb9a54179be756fd15f1d41a531ae54bfada956a7a8e66444464b0cd6203b240fb7c283059ae2a90f422
+EBUILD felix-shell-1.4.3.ebuild 1178 SHA256 b173c86c98b0d6974e6ac3df5bea32f4e51d63f915910ad67f2d57d58e3b4b4e SHA512 df389381783d8702f67783b2a1e7c5f9e7a38f540c8377bcc9fecb97b829d78ff864b320b3239352a0472aae711563a468b3cd96779faaf18c8f869713d6e166 WHIRLPOOL 85e78780ff37ddfb43dcf8074af17c5d898c0faf29d6f22bba8acfa8fe083e8aaf36ae8fa531c6d0d7ee12b9e50e7f6653d27b02f1ec072080b43c898889941e
+MISC ChangeLog 2671 SHA256 902457ec8dbe0faefca67a29bcd87fd3b684e39431104667722cc0238aae033a SHA512 ddd2cc015ae0f1a81dc077764b8278a6181f18b83082c551773f93a85f59e385d1fce37c73f23eebd78a8b98d320b4f2f293b65fe545973a4c026650afc800a8 WHIRLPOOL fa9607f88caacfeaba0d0268dab55f5b630e19a36327e01c1054577afb63c71514b40c26d79cc9b477318f7ea93f0d8e5fc7872453a1ad6a5a03fe486c4f22d2
+MISC ChangeLog-2015 639 SHA256 c3eca594ac2381546aa392d4d6bde5c0a26e254bcff61d5978fd42a45611ad05 SHA512 d428c995fc464978693aa9fc02d9d8b788ffbf01e7de4d512e8432e125aa4bf61ee5bcc8f65e5b5f0b015ed1e2acae12991df3a2d3becce2be6aa4f80ea77019 WHIRLPOOL 3ce1d6b6f75180dbe717fecbab48e309e42026606a9d4e11a292d103857f8fb1c1fcf6e2b74ec80958017d5f4f02bdf8bd44dc25d514ca7877091d5727560bad
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/felix-utils/Manifest
new file mode 100644
index 000000000000..ec4ee26148ee
--- /dev/null
+++ b/dev-java/felix-utils/Manifest
@@ -0,0 +1,7 @@
+AUX felix-utils-1.2.0-build.xml 13825 SHA256 c359ad0d87415327aabb5e94ad303c14e77870905659f3c7f1f4c73478d91387 SHA512 0494ca015f38daf3b96758adaba1de71ec82b7ba811507e8b7acf33ff887484481251d6868d98c0b70535f1a5874941d457bf43fb3f8139d698ce3f5ce4ed1da WHIRLPOOL e046d967685fe844b199acbd4f5b08f901e1eac3634f721de3beec146e58ca7aae00aafe110974ff6b61eba10f1e4ffe4d939fca29b4b89558cf13d4a72cc92d
+AUX felix-utils-1.2.0-java-fixes.patch 1673 SHA256 f01604e2312db384cfcfe3efaef37589c2343da88287e78557a936f19ebb3ae2 SHA512 7256b8b9979536d1bc587726f3f4f71d56ec0ed3ba9cbc1229eea2c4d2c0883636bfa4498a59a076b9a06cd21b9fbb2f1ef293425454d3cb3dcb62d9d103cd33 WHIRLPOOL 027ffd91b7d1a85b5ff067611ebfe9080083ca5d5bad42d1413cf82b63aa24af7ea5eb56bda86f2d7d9c5b774ef500d372c6a90e7e3016f13e88fd9dc6cc4f04
+DIST org.apache.felix.utils-1.2.0-source-release.tar.gz 36109 SHA256 281872667d5968875f5f5b12878145c7f184ffb89d3ddf8ad757070e0722105c SHA512 4b3a16abc92963c16c363791423483c14eb02792cc65d58a884777c6be25b05a226492280cf2f77183ad5b86cb5710076a118a58af34f6c717273bfdf93bc171 WHIRLPOOL a9422c4fda79d1ba32cfff923d911a4e91fab463c8de0b870f43daf683222f86963690834df1d37a67f3cba4849a1f85433f7239abd100abfa1c6ef3a1d6b91c
+EBUILD felix-utils-1.2.0.ebuild 1139 SHA256 2aec062b6c2f1b23ed056412b460ccf5719d7bdf23929641c2891f7746be2d2d SHA512 506c46a344dd788740f5d70927c3c5e97bd76ae52a4df47265277c2f40c7df287dc9fb91cbbc48f72a282bb6cdaee9e9f597904f94c25dbfb7b3086cef95ea63 WHIRLPOOL 38f304b63eb2d07d1cf611eb3f429acdc96df63efdbff29aacb1366b18f64ab0e95c53aba34f8d6e494b4fdeac8d5d0a9eb2d2957d17acef2df9fafed6e7ad2c
+MISC ChangeLog 2714 SHA256 3748a40a305628fa0aae83f090c040e67ef6acfae5b5643f61a31022503cc641 SHA512 0455174079c8d89edd78effb03311b2c256ba2a5da544b5a91c495f40ef7bee27e5159fd6386009e58a1d14a94a3d7cd51514c3dc6daa4038ef07c65fc1b61bb WHIRLPOOL fe046e00e033a0f94bf68122de730b199b64f67182959047e09bba242ff2a61166e32ae3bbbdef32052d86eec51a3f60a5f6a56ec1dc52e480cf88ce372b4342
+MISC ChangeLog-2015 515 SHA256 9cf1d1857ef162c50c43fedf756d35e39721f1d2c1bd4a3063dbd976990cfd5f SHA512 6ee8455c92e76f2ec5d5582f4aa6f96037f5f263052e4ad70c78d508a1b336155843f5c0d412c7926048ffe2404223dbb9cc089ba20599c4d60d0116255b9f03 WHIRLPOOL 289bbee7dabf817fbdcd49b819685c65c270107ed89621c7dfbc80c90fd3d71335ef90c08a21aed54ce567aefa3606fb8f87da345f2d15352375a78330fb8bf6
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/flyingsaucer/Manifest
new file mode 100644
index 000000000000..e9f6e8007403
--- /dev/null
+++ b/dev-java/flyingsaucer/Manifest
@@ -0,0 +1,6 @@
+AUX 7-itext-2.0.8.patch 3109 SHA256 424465642ee38f6042457432f94529144cb5106403f670c8eba1c059d1898550 SHA512 8ee0d072224a24861d8e28caced9224c0390271589b1e07ae88cc4cf4a8fe97f799142140cecd28eab2c641feb0d4d84b18a89674d512069a746561e5ff0ac0f WHIRLPOOL 7ab17d6442ee58b22b9b0deb7840e63031b13940624637f3a000ff647b6061bb009cdc1ab3b3617b563235d5686ad39efa6ee1cff4c339ef09666dd036ca8331
+DIST flyingsaucer-R7final-src.zip 7058444 SHA256 d4539358ae08b5278334ec66beea78a821c9e6fba1db6159317e4c94fb2bf135 SHA512 14c26a10f3493f3b9fc1fe5d3d11591cf4c09d781d1d2cccf5de15d4b5a0108f8780e168c32968338b82c7929cb083cc47aab539c53d140860505ff0e05f9135 WHIRLPOOL 742e2e0bab959e77d8363fec4e9dd234746b25c56401fee4e0796476411ab0b071ee682366b82ca0350ee66e62b60a5116ed3aa81a33ff1ecaded98cd74a5de3
+EBUILD flyingsaucer-7-r2.ebuild 1658 SHA256 269e413e3e14d0585563d6362ac738c3b2a713aaa1384d3bf2c39a4f0f128a28 SHA512 7db361e7e3da813782c68359d2a16d97718da74202ac30226273e82940246e9608e40a5f5d73735efc2b326fe623633e2df93e1f1b52656bd35d13d864a108e6 WHIRLPOOL cbdacb67caf09c5f178a1e4e36c11a24c8002d978c8e5969cf058fbd988f280fc7efbdfb3f4b077c30837c2216f9fdc99e8397dca6899e9e1928e842e906083e
+MISC ChangeLog 2687 SHA256 65ab2a7b74fa7fc07d377c4a71fc20791a9fd45a9002995af730cf2b55a1bf7d SHA512 7fa2c7ed747bf2ff7c3948e5571f5f5b4c5056e0638cb9245517f063fe191ebf98b17bc3f67005416bab4902811a02faa4a596a8d5c847d9c4d4f0c4f698233e WHIRLPOOL 4c699e47a34ec77e53bb50b2e95ce29155eaa70014a1c2929fb150b04709485f18599a4c8f1ae55ffc40596844f430b44d2f787e0a92a79d4e370ac8d9ba1a31
+MISC ChangeLog-2015 950 SHA256 dfe1c1b10a62dbff7c00865a7780f84ccbbda501db10e9f8bdfe0edc6d7799a6 SHA512 979a4bf4e50479602440d173b1329513e5485daa9dc57555522e319320e29f4f51ab153a63fe7edd0a49a8a305f5fe687d151f837241cf5c80fb8c7e7795e58b WHIRLPOOL 8a5d3f9054e1d54dd5a5a03d09951b1663dcbd3a697f1d7a0e9d7081a946a31e330d17da610ea0b122e96dd98ba451cd067456f91284a7fef7ed468f18f8742f
+MISC metadata.xml 436 SHA256 1aa1e55d2a31415a816d86f09a9c0ee50fd15325f522401ee1c762a85e08c4b0 SHA512 32df0b15ff43741e3ba4c1af628c46084baed7cfe0d69dc2fb392b60d9e16cb871c2b366d97857dd5f3eb9cbeaa966f0610e6c9f73e3f5ffdc533d71f9c5e842 WHIRLPOOL 830af0cf353f9b6b695b4df588574b9a6c817eb3bdafbc7154ae25c6d0300a836aae73f10dc6032a5ab4e8b44ee4886de1a39de6c80bc7b7efc9adf1ad3228a9
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/Manifest b/dev-java/fontbox/Manifest
new file mode 100644
index 000000000000..4578dd97bf0b
--- /dev/null
+++ b/dev-java/fontbox/Manifest
@@ -0,0 +1,8 @@
+AUX fontbox-1.7.1_maven-build.xml 10618 SHA256 f00b70a1a7e4b1e83eb577a6e90248e42200d91c78176d3fb3be48af489194c4 SHA512 8f3173325808c096cca21f69bb70f9ed5a43c0e56b5d6487604de399625bb40fbeecc569c068bb6840a87fb5edcc3e22171d8c6fab28a2c00b36172196c1935c WHIRLPOOL af87a860a8aed0f55425adf9cab5479117c6ca46453167558cb0076c6d63774cac46d18e726d8607949f3330e6cb1f0eae4c56f8ec4009327c9cf7f23c167a18
+DIST pdfbox-1.7.1-src.zip 9167805 SHA256 805c6b893ff10216cc826aa44e7a2eaf35bb43ca8ed19896c43132d253d3145e SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0 WHIRLPOOL 438fcd6f2d0128b972dfd5be83b2bc455daf9f126ac5b7a6a5de8a41e29f482b462e8e48e07a21ac1e896de4daa5ffed2eee400ec96ac93fbbce25fef99b0ade
+DIST pdfbox-1.8.11-src.zip 11026359 SHA256 160a2d058325845234eaa6b5ae23535b9226aadb4e570a1a76f7106a00653b1b SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1 WHIRLPOOL 9f43dff9921283d074b332ef08a34b56d58fca3624b6c263029554998b0595bb8815ad91e31c7cdee17a95db0807cb88c579ec1b1f9ab724ded3f50382220880
+EBUILD fontbox-1.7.1.ebuild 968 SHA256 445121414ae5a97969bee5ec8f285d986461ad2a1e5a2884aa22d9914e9f4526 SHA512 d499f893e453acc65696b1a9acb2e6a29e1b0cf6495b84c95f57fb69bc512c078613b87ffb1f932b3c2ad13584fdb5020847df41e8622c6f14261f2ba506fa72 WHIRLPOOL 2e06dcee20e33ac0c3f93262d586968b726f2213d045832b9c0e86cba8b8206658c69d0b1a487217e4bc75c0ae757e72e5c7cbb9e1d352f90f9abdf72ee948ed
+EBUILD fontbox-1.8.11.ebuild 1145 SHA256 93ccfca6bec45e8cc944cd9fb49bcd1510ad865f70b6a7834a4f971c0f26fc1b SHA512 defb0a63b70461a9409a0ff4b9ee8fcf97a865016b4587c74ac1273fd4c221802eaecb44a148b341f6a7fbfe6cb102b069390d659f292a498057f97687b64445 WHIRLPOOL b1f1ecf5e019730afab6214cbe57a3f1bbeacbcecfdba0e09c18e4d81e6c4869daa413a2c2f3f06e190cdddab5762fcabe3e415096374c89d0835f89759535bc
+MISC ChangeLog 3768 SHA256 78e785c74ef78c763a941628fb21f441842ddde5cb8780838e41052982d3de49 SHA512 6ab86e9855bc6f44a66b1f1501feac332d20ab48e3f2d04e4ed3c706a76fa382dc56de832d75fb2e5da91805455b9b9afc272d0b9807e6b3bbc48061d8366428 WHIRLPOOL b643475d9d338137568f9e9431d2a07b46f2ba6ad550018ea8e70cbc42f879bec48bc2ecae4976babc904d9b949e27b04ee0816f590fa32a491ccea0ee4a3d49
+MISC ChangeLog-2015 2024 SHA256 5241cbdaea66e6e1887c1ca684a2793634f9ab87a13b3c82f26f142871449515 SHA512 10d813afe7a1189aaff10a6b879031f8b420f2f37da7adde25217d09ccf9ad979ae7c72b4bb73dc870d3641fac323dfe3af62bb23255598dded943f1aff037d5 WHIRLPOOL 28af8a02f2c4dce0ad83fbb65318a79953c8dbb0cce9b7d3558a4a5645c93daf2c9fd0c5c536b2b77126e3dcc72387e914af7ed2e8af632a1e891bfa501b6906
+MISC metadata.xml 586 SHA256 1e5203526f0e2e09d2e1844fe52be3ae37e50236ca04f98ace7c04e2562d6ab1 SHA512 d7f91851ceae4b6d8a9315e201f5e5ba09a92c29ae26f4abc8dd4faeec30b1de64b1528f89e09cb84372197de93576a468a6e5897ca55a62c8c39c53e4943809 WHIRLPOOL 4102b6ee87668b09c684302b892c99aae3a34fc427e1de08f51e617513cf147b99fda18167bc47465a13ef511cb83811a9125be42b9acde11bb07ab61ed0e48f
diff --git a/dev-java/fontbox/files/fontbox-1.7.1_maven-build.xml b/dev-java/fontbox/files/fontbox-1.7.1_maven-build.xml
new file mode 100644
index 000000000000..ccde1983d680
--- /dev/null
+++ b/dev-java/fontbox/files/fontbox-1.7.1_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 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.ebuild b/dev-java/fontbox/fontbox-1.7.1.ebuild
new file mode 100644
index 000000000000..243e6d8a8374
--- /dev/null
+++ b/dev-java/fontbox/fontbox-1.7.1.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+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 ~arm64 ppc64 x86 ~x86-fbsd ~x64-macos"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5
+	app-arch/unzip
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
+
+java_prepare() {
+	cp -v "${FILESDIR}"/${P}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+
+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..c1c426b234a6
--- /dev/null
+++ b/dev-java/fontbox/fontbox-1.8.11.ebuild
@@ -0,0 +1,50 @@
+# 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 parsing font files"
+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"
+
+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/Manifest b/dev-java/fop/Manifest
new file mode 100644
index 000000000000..ff8c03e2c6bd
--- /dev/null
+++ b/dev-java/fop/Manifest
@@ -0,0 +1,6 @@
+AUX headless-launcher.bash 67 SHA256 aaa990229cbb46d8b290d1629d5ae2c6e99a0cb9e73f7761fbf32faa927d1319 SHA512 d3a6635105ea62a62f1ff690a457bfbdebe3d15f8fd220f5508a4ec20b8a5c46e66bf9189562661d5053c6ac31a6998d1f4a117e0ac6087b336a0475635d7d3a WHIRLPOOL b8b42ad063f00b67c12500e6eb76e9cc81c66ea7105d3e1db9e26e9d45d1ece90b1c25e85ab66bdbb0504b247a4926fb5b4ff4487b3ee43c0914866d58bcc7e6
+DIST fop-2.0-src.zip 26381859 SHA256 70da9622ce25891d989b8ab25692738c5dd6eb2de6ee9b9300d5487f0378d2ec SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a WHIRLPOOL cfd0ec06fba6fe089fb0bea803668e8c89f80eddd198efda20573274ea0cfa750248f12b50827ab89571a4923f51b307d241ff0a4f236cf4a6e28ea49c8d1ac7
+EBUILD fop-2.0-r2.ebuild 3076 SHA256 6479f5d8103d4802f976ff9b0b73f4c63377ee242bbb13ba61bf12a42ad52f2e SHA512 0be6bbbec5683edfcba7fca5742f25a599ce52fa3f654ace7321d376220726de7ed21cb9ae36cb078c1e2fb275b06b9ca0663deb4a001cbd403bd3e0487edec2 WHIRLPOOL 111d4e50105462ce1296ff6976576acc4e868bd15f2cd7f6e81321e61c29f33e32db28c4d04f5fc8394a92f1aebaec03259a0abc571c28c2e3d231556f778ab2
+MISC ChangeLog 3308 SHA256 8430041148bf1688c89fa0cbf861503492ff9c9856e9277a24e52a82891eed86 SHA512 2235349e31d3b2f97fcba0109a1e51ab81dfde399b52407a63bebf9e6fdd847ebe521ecaaa1f8f6e164151164e23dac710f761bcdc3ede1ab4ccdcd86f69cda6 WHIRLPOOL 98618190307c6654134596eb9845ae978d324fe06f3fc0fe1b783a441ec21282a7e51e2ab05ddac5fd49932ceb004e8cb3bf8b28bfc3216550b0e83eca40011a
+MISC ChangeLog-2015 11496 SHA256 d8a6ae1439146b760f5086667b69ac8a5982fdaced5dee57fc7f37c5e48720fc SHA512 e3419f68bc302d6cc3fb77d9f39f99bbaba656b361aad14add3bbc92001087ffd3ab2789efb3e7bcd59b125df16e95911778c7c20b65b3d393cf84bd0cad6e9a WHIRLPOOL 27413d61ba3cd257e87ecd2a3e1c17ee3f857af23259ffac5f412b7c18145e737f94069cf9d345c7ee9d0f1021fe9865b9b13c385b4a2193091479a50266213e
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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-r2.ebuild b/dev-java/fop/fop-2.0-r2.ebuild
new file mode 100644
index 000000000000..b24807e14b2a
--- /dev/null
+++ b/dev-java/fop/fop-2.0-r2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2016 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="http://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"
+IUSE=""
+
+# Tests are broken even in 2.0
+RESTRICT="test"
+
+CDEPEND="dev-java/batik:1.8
+	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.8
+	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/Manifest b/dev-java/forehead/Manifest
new file mode 100644
index 000000000000..2ef0d0dec83d
--- /dev/null
+++ b/dev-java/forehead/Manifest
@@ -0,0 +1,5 @@
+DIST forehead-1.0_beta5.tbz2 15665 SHA256 2dd7e239a1a1f2913a3c815a54ceb1a1429540b24a1e42ead21c3b056d7d226a SHA512 1558b0d26a4df210dfd188839e4feb8a8b2369fb514c82f99fdd337cec3520e3555ce7999e2bb11459de4ea04db0820d729c9ebf762fd5bbd91ef56a30c6f0be WHIRLPOOL cdce92bbdcf7d4036d3e68ad7ed819849bf7d941bedaf1c1880c3f364fd2ea73d179cf594e63a56aa2bf5225778ff64d0d07d3d5b6d6f630b2b125d26ea17b70
+EBUILD forehead-1.0_beta5-r2.ebuild 545 SHA256 23d3cbaafe87a6ca6efb8b7c0b70531d7a4c863f50afd4ec9c64ad98f4ab16e6 SHA512 0e564c5dc65f1696bd22aaa344557e41208a2386f14e290b10768edc4418bad4134ad2770ac89a3ebf54a02f40dee0766ad95e6f2cc2e7381a52492032209b1c WHIRLPOOL 9e47405cb82027daf692dac52079c9a982b071277dd6a27ab61adfc161485854cef5e90d2c2fa8940775f66d2bab80d4f94bfe38b07e9cf4065bfaf178ec189d
+MISC ChangeLog 3303 SHA256 e836b0bd4ca07c972a8fa1119d23efc4ea71891c27adf7f3b4a4f6b7276fde58 SHA512 62594d2f6bc150be6bca49019f60303bddc8df4ea3626e2e622a6e8daae570f5fe7862de8145788b121019afa206c3015a89c815a1da9d7ddb68bddf93139bdf WHIRLPOOL 045ae7e6fa64b2b96a8a619deb3aa6e1c38e274d73ad69ede9fb04d0558db720a082847faaa6173c59e9b6dc34b1bef11300e20636456390dae2503f47dca561
+MISC ChangeLog-2015 1395 SHA256 c7e8066c31e2c16179ce9c556ae3adb1efd7a2513edea5ec9135694afea15211 SHA512 5197a580d39a7a02e4ec1ac0c8140acd146da0b19a1c8e336e131ef928e4af95308a0c4e69e42c6068cedf54dd9e7f31cdd10ca74611751bbbf5f5b9db00fc8a WHIRLPOOL 123c68d01f042a3fe30fe66ef16458cd836c5ff43362f11acce42e9a9fc9a37960636691931332104387bf6cbb1234252167b0db32a550034608283acfc21694
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..1aeac443e5f4
--- /dev/null
+++ b/dev-java/forehead/forehead-1.0_beta5-r2.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 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/Manifest b/dev-java/freehep-graphics2d/Manifest
new file mode 100644
index 000000000000..75b5c7e01160
--- /dev/null
+++ b/dev-java/freehep-graphics2d/Manifest
@@ -0,0 +1,6 @@
+DIST freehep-chartable-converter-plugin-2.2.1.tar.gz 18159 SHA256 076086b08f775ad52a1ce58389167f048f594864ad6b198c92d540a30f96ae35 SHA512 4caac8b83b9efdee59e2a801bb001fdf7bab144bb5734bdb89ef3e1163bc9ffd05b2c8c59d611665573c432045a854fba28eb4d24260baea5286b34ae298add1 WHIRLPOOL a97d2c8685c29ae7d1dccf653577dd15cf085cf5439744f5c0dd904ebb8d85d9a6e6e825059230bc2baf4e519b87bfda136db2fac22202d878ae84b0382503bc
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
+EBUILD freehep-graphics2d-2.4.ebuild 2117 SHA256 29a30e1461eeba11ecdae9c910d6992677b155d285e3c8421eb67e9872720dde SHA512 ffb2db76c69531324a98993d79581b925e3b635072d24aee77d35ccccdaba730d0dee1de6fe9c50cada3a74bd96c32625205b6da0d0591f9f4bd3e5cebc1b3c1 WHIRLPOOL 7f4cff28797ba44e85fde7afb458fdfec1baa0ced86668e86b9e694c46843ef9300bdab8ae1c4a4bbbf00c8cca3299384b6c25c02aaea16ae1653f427b39cfe1
+MISC ChangeLog 2716 SHA256 8567987acf052bfc8da1afb1d6dad912beb166fca3625d3cc50611d7aceeeb9c SHA512 7253228c21e1551bc067d5dc68217ffca9a99cc8f7d83d1469ddb8ae13ccf56c2c24b961fe61b6150a95181604d4d782cdab626ef8183ee65570ce369e94ce3a WHIRLPOOL 75f3e9b5a2249ac919fb7fc0f003738950cd297e13ba3c8e3db43879bcc51c458d4486212817b36e30182a95dbabb88ba2753c885d05deb8c022eada84a58dba
+MISC ChangeLog-2015 604 SHA256 102006a30d997c7fb0709e8e4534a4278b4f4e027ffd4a933ac8a7db94ab05dd SHA512 7b5ccc91256c7dddc6bbf6a516c71211020b407c034000207843aaef029193c036917b84829c91904d3e065e5739c8eb54b861ed04c799d7b48d5e02d2a2b1f4 WHIRLPOOL 6dabd2374ff04e3bc0a29b94b2bc7a8f49d2ba7435585f061df4ae2a01bf4f6ab31f69b4dd00db7d2a7f08d32ec6707678d20a25fead8ae3b69372101d9beae0
+MISC metadata.xml 331 SHA256 46edbbd64cdb8b94bfee03ae75cc28e0fd886959865b0fb970f3b718f2d91d79 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5 WHIRLPOOL 78678288aae234c47de4b7b3038b3009a07e3a9ad7f3e2d112a9bf226a1d8f56ab048a895db2cb18596e404c74bd7ba9e9ade58757a10ed9f564217ada744872
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/Manifest b/dev-java/freehep-graphicsbase/Manifest
new file mode 100644
index 000000000000..8a544ad604f8
--- /dev/null
+++ b/dev-java/freehep-graphicsbase/Manifest
@@ -0,0 +1,4 @@
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
+EBUILD freehep-graphicsbase-2.4.ebuild 1208 SHA256 497cb9c13cd89dec000a195d7e03bb4e94d1ed389bd1d62aef4e4e89a6872119 SHA512 30cad1df7b1ac2f00395c4fb3161992ae984c26ae7f2c2e596ffa152365169e08e169ee25bce0a03f91344b173f68bd63f9eaaa6423b1587ed127dfe113878b6 WHIRLPOOL b99e9ace396cbf02349e09e42f5613ebed5e3b6e8f86e5e59491e7be83a98911d22990a0196dc2600a2a46dbe9035a50e1f49dc14ba3ef403f894f4ab2ca9ffd
+MISC ChangeLog 372 SHA256 28ff86787b49be5e168244efd75f839df6d2b182cdebf3c5f4afa13cc8acd2cd SHA512 d1c2ad6d19fa72273d3449258e5190ba62d550fbc8818354752d33fa99bff5be0f3a9842758383da41b24e5e79adf52990a2f2f7c6f8844a8a6385a1a03cc9ce WHIRLPOOL 1568897d71fbbbb7b2ca765fc0e5d976e267462a3dd238d700780a71ebfb9dea9237b7110316c24f847097e1f2d1005c5bc90a5b968e6b98c1794398c8111400
+MISC metadata.xml 331 SHA256 46edbbd64cdb8b94bfee03ae75cc28e0fd886959865b0fb970f3b718f2d91d79 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5 WHIRLPOOL 78678288aae234c47de4b7b3038b3009a07e3a9ad7f3e2d112a9bf226a1d8f56ab048a895db2cb18596e404c74bd7ba9e9ade58757a10ed9f564217ada744872
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-emf/Manifest b/dev-java/freehep-graphicsio-emf/Manifest
new file mode 100644
index 000000000000..3bff375bb504
--- /dev/null
+++ b/dev-java/freehep-graphicsio-emf/Manifest
@@ -0,0 +1,6 @@
+AUX github-30.patch 1643 SHA256 ba7ef928571b8cfa250fa39d92e6179a83b0d3d3e7afa76feee844b9b47e33ab SHA512 63a89ce9bfe23a0c0110e69d34fc76faf2f18c2f2361044fbe426c36f10f596279c958734398efcadc84890a2ecd08dbaf23bdc3c16aa2208fa8b9aab37b4e43 WHIRLPOOL e53c2e917ebb4c70db99cde23a77d1225764899e6272c52e6babde71780910c12250e350fe4f3086fc2da71b96a167c8325602838a738d6f2b7a3a5d9c48e116
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
+EBUILD freehep-graphicsio-emf-2.4.ebuild 1615 SHA256 3fbe512af86a9cff485cc5eb2760872dca11a750c8d74d65958d54102d7be651 SHA512 dd0c9cd16357e1c244d1417f63c725a3fa5e3e120fa50c68e4106920a6c348a5c36217af3399c688fcce843e12c92582362d632f3ec644a9d5ea5b6c5d5aa915 WHIRLPOOL 08db07a72aa088954da3dcba3d58e46633100ed75044e5eb576533f2de91101f801ac47c23fb611fe6000307b0dc56a7089622cd4cc4ff78fb14dd05427cca80
+MISC ChangeLog 2832 SHA256 d9cad047f95af039a9d8300ad50245cb7f79681b83cd387c14f51dd25e639cf3 SHA512 efdd684debc5adb344d32b257f6ce0263d5fd523cf1f517f5c6d0ebdb86dffdf962acd42e81ff67f2b23914e5648e07428a2737489695df7638cfc1bafe10452 WHIRLPOOL ca2657c358b3aae90ea681e510b392473969ae9ad00117df2857d2d09c51cd8268ef461d782d64714e64072dbcd11cb74483ea0610b294155585635c0b0c7dd2
+MISC ChangeLog-2015 624 SHA256 935555372b5de87abe9a131a79cda265759e77770d613d8e5f74f657a76dff42 SHA512 d6f6f24f5b34f8b0dabf929297137fdf682d580c99837a9e22bea5bc24c314429ffd609e3804b1da9459fb4f862b0fad710454c33c4e243920751b0babc434b8 WHIRLPOOL 5662b687aa388903219ca750cf8eb29bbd9033371c6e6cf8946553d35660d80d135047561da45877e2c7d9bb255981214e6ab33b2593b6488c69725a2dbf6c02
+MISC metadata.xml 331 SHA256 46edbbd64cdb8b94bfee03ae75cc28e0fd886959865b0fb970f3b718f2d91d79 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5 WHIRLPOOL 78678288aae234c47de4b7b3038b3009a07e3a9ad7f3e2d112a9bf226a1d8f56ab048a895db2cb18596e404c74bd7ba9e9ade58757a10ed9f564217ada744872
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/Manifest b/dev-java/freehep-graphicsio-svg/Manifest
new file mode 100644
index 000000000000..aa195d2c5b8d
--- /dev/null
+++ b/dev-java/freehep-graphicsio-svg/Manifest
@@ -0,0 +1,5 @@
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
+EBUILD freehep-graphicsio-svg-2.4.ebuild 1369 SHA256 ac56c6541caa43ea9f5ab1a358433a64952406b8dc14465e1fb54e3985969cd6 SHA512 f5fb3c5e001380d1b4da636fd122d1f628f040f71fc3ecc514b7a6f69311b2619403232db351fd9a68cf5786476273a951ad77d72377abfc9f6565da966b096a WHIRLPOOL 45a91e1cd19e681ea9c29e3e217358cbb5310a7f6e8da66020a00948d3447068ce4d3c261e7153aafb0b73b5374e9a8686c5c317c8267076ab88c02cbd101644
+MISC ChangeLog 2736 SHA256 beba9bb153076065cee66b7a4090b5957717089d9c5f295359587cc33f85ac28 SHA512 794b357d1cb2a5f3096e73a4626898661533f0b940df275fcdc690c79ca840134e2e81177d6d85d3ab824842edebb785fcfcb46e198fbac705906e5cfcd1fe75 WHIRLPOOL 70e8f51636e661923d79f70b79b222ce4854a7eed38e6dce0995958f52fadc6fdadcfc4b85434f1375e08a3119cc92a35e2577aecceaddf59fa0c402d911cf48
+MISC ChangeLog-2015 624 SHA256 01c39ae291c76315c48f2a4e219cfe5a165bf0a992224f1681729b36c2a8de4c SHA512 83590b86c303cb0926434f11f559f684bfeb2cc527acd7b38a5b0425be77d661e0ae50db2ac37faaf67020ae672d82637f6d72a832a097bfa2f4363ae49ccd60 WHIRLPOOL 766dc36274dae2dc83aedbd25f8bcb896646c30e244b8e8d5f3ca4067934d2e5e39da7641e3c0916047881491f69da57dbab9ba8f80eb1d0a18946658ab97a98
+MISC metadata.xml 331 SHA256 46edbbd64cdb8b94bfee03ae75cc28e0fd886959865b0fb970f3b718f2d91d79 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5 WHIRLPOOL 78678288aae234c47de4b7b3038b3009a07e3a9ad7f3e2d112a9bf226a1d8f56ab048a895db2cb18596e404c74bd7ba9e9ade58757a10ed9f564217ada744872
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/Manifest b/dev-java/freehep-graphicsio-tests/Manifest
new file mode 100644
index 000000000000..b6502cc6937a
--- /dev/null
+++ b/dev-java/freehep-graphicsio-tests/Manifest
@@ -0,0 +1,5 @@
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
+EBUILD freehep-graphicsio-tests-2.4.ebuild 1189 SHA256 f63e9796e786ec8f3e200403e50c3f995e50559c777c1f4e55da3d76b1fe65e5 SHA512 5d9a5d27759c477e26f1ad4f08843393cdbd22b480e24df55151b77dbed37fd16b84831e119ab2a1f19a69e77892345667ec92168a0834a377da821017397225 WHIRLPOOL c97ae08e002e9bc326a43f2e0bf3c8cf76980920255380331c9cdf83b4ef7d97e9c509c2941772f48bb0eeb987e17d499493c91ad87df9413af7390d1351e65b
+MISC ChangeLog 2741 SHA256 fc9f0200a684eec5af2a4f85c2803e9a9e3d9561bc759703070b23e838053d0d SHA512 3021305cb9ae674a4e152cf883ef0c60f0c98dae0ebdb71caeaf170084c74914385baea50e86e9309ed72a5b8211d1ce9a1e6d9ee3a914184a84ca8465f5b37a WHIRLPOOL caca23f2b91f469fa3b3d57f9dee867b17f7629cfacda124a05e4d14dbe3737228930924e4552ca2e61c624f2e1c1ed7c2c62d72b26d8ca73b86756e88b275f9
+MISC ChangeLog-2015 634 SHA256 c00f505617d0da3269deebf1ecedb15696f402246886d6eda04145f17cdeac70 SHA512 6621873e9c2a130191173c722f4172c1452afe3b089a38f641684973d534120f277b00c1fda928f94322dd17807aae14ec30aa8f6727a9e4d5a4b09aed55e74e WHIRLPOOL 5c04af37e67acf95fc25109fe67792c42b0c4cddb98942352df56a649cb242df9fa92b3692d95d74cbb5c0cf532d3d1c083521cba60f64a1736a025d4b3e1e1e
+MISC metadata.xml 331 SHA256 46edbbd64cdb8b94bfee03ae75cc28e0fd886959865b0fb970f3b718f2d91d79 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5 WHIRLPOOL 78678288aae234c47de4b7b3038b3009a07e3a9ad7f3e2d112a9bf226a1d8f56ab048a895db2cb18596e404c74bd7ba9e9ade58757a10ed9f564217ada744872
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..8e9934cd4aa5
--- /dev/null
+++ b/dev-java/freehep-graphicsio/Manifest
@@ -0,0 +1,5 @@
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
+EBUILD freehep-graphicsio-2.4.ebuild 1316 SHA256 4de0e858101fff4081dcda4de8eab6739fa8893474ad5865b1ec043c28d36c2d SHA512 633ec6e6dfa0821b414bad3b9ecf2604302a725c3719c9ac1b78fbf40d078a607c9ce9b0cd23ca07b35020efe67a739a36632ed5c4d4a8af0e425e7b3cc18f18 WHIRLPOOL 47a97ca516d4556266f3595cdffd3d6735acd1cb9f1604edf68824e89d99ec310157e79dcc8e8f2b12d58a22b80de5e8d81a02a18fd7cc8883edb85bf9510d40
+MISC ChangeLog 2716 SHA256 b8d45ccad38654c86fdf466191014f1c7d48a766cb2e6f2f035866182323096c SHA512 0207a1a6d21e5304be6418495bfd2b53f53e1f7bfbf4f313e9003274c4fa05611d25b57238c78900e69e0a6ab7aeb9bd49733501ba95f24dd6c2bf1b6591251a WHIRLPOOL 9366bb01ec4af8d4766a01624b8ff27804d952752e737aa701a4fc114d852b6939218a2054fd449439bf6ab79dfba50bce7ac36f90cdc5058a1bc289d227c0f2
+MISC ChangeLog-2015 604 SHA256 1d3cf389490851ba490c41941ae182e91fc4531ffcd9c858c4f85862b34a92ae SHA512 cc938b9c4cf37965044917178474004c06f86bf33244032bbd18848b692020a91af84f8b70cfd3118c0a3a9d7a595b13c77cf1fe4026480836b08206ce98fc28 WHIRLPOOL daf83d3a28eba75a8f31f6169a0af243a03526201d7b8ec0d565bceef0326152b61d94cf9e36edffb89275d407bb84f639b6921548fa0ed30c145203ca385efd
+MISC metadata.xml 331 SHA256 46edbbd64cdb8b94bfee03ae75cc28e0fd886959865b0fb970f3b718f2d91d79 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5 WHIRLPOOL 78678288aae234c47de4b7b3038b3009a07e3a9ad7f3e2d112a9bf226a1d8f56ab048a895db2cb18596e404c74bd7ba9e9ade58757a10ed9f564217ada744872
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/Manifest b/dev-java/freehep-io/Manifest
new file mode 100644
index 000000000000..80925962d0c8
--- /dev/null
+++ b/dev-java/freehep-io/Manifest
@@ -0,0 +1,5 @@
+DIST freehep-io-2.2.2.tar.gz 76935 SHA256 dd66232e8c484d35a732f05e04834d520a04769f4bc86c6eeaee764bf96f511b SHA512 1cc7cab3d9648b119aa8c637c84cd985adc0f9dd2cdd153021500831325d719ef5fa41d8964ccbeed3af95b87e09c4886597c0ede1370a209f6807932636b0ee WHIRLPOOL db39f0e68e17416d2893462c554983c8eaa8831e505b6868ce29c03ed6c2d99f446d5e752f6d6ac5cb69d9daf9c16720a1941bdbdaf8e985dab6c838497fe518
+EBUILD freehep-io-2.2.2.ebuild 912 SHA256 68fa26e24de28e4fafb1f8edba30b884e88def691f63b87f7ccffd09022e14a9 SHA512 7ef173a74fadaec2be6d235a01be2da8a5d2f55419ab5f31db04d1cdf1af11a20abd575fb2daaaa6b919fac7e48c0ebf08b0bcea1c350f4243a6db281fac125d WHIRLPOOL d3bdbab3da14605a65cc6d9c566bac532a8f1f14c91a8adea69a3d7a9e9c6373601cc0696903c26cc88b667ee54e6977ad3fb6956175920a9bd26e5ecfc9bd27
+MISC ChangeLog 2672 SHA256 98895392a3bc0efd06b6381744f30fc8b3d68f1566cf378cb1e87c8cf6853755 SHA512 bc3a6112a471871e2b6a7b102793648d0bf083f39fb019294361c8c22b1d83deacf7a4a05dcf6f47d86a4a6860de795b784c4f5578bdf8c676c71b981b896c59 WHIRLPOOL 96878b55cacd247ccc8c866fa9db77c6df25e5fe2befac940ce49af762106b4d0a263883b20dd3b36d4adfdadb1337f141fad0cf1bd0561422d1e6c58eac79c3
+MISC ChangeLog-2015 562 SHA256 2042e19b14110b745b0a70b7df5d65b5b1babaf16feec165fb8c508b2bda36a6 SHA512 a9b1583a9735ae833e9d1379e7fd123c2cbfe312c3a412f2006d4d409902605d12532e211cc33c0da0062a60546d09900674d13144401a011a3b89ffadfa40d5 WHIRLPOOL e52e4e4296405ec11da20c6d4687a519f38e86afc404ac54b60d10ff40ec136b4bca3b9e21ff30c467399c0160195b0a7d7758de2816c68f07bd7ed1ae4fee9d
+MISC metadata.xml 319 SHA256 2447027394b5d8ce82d65c56dc4fb76234170e6a829e23c1aed31c34424e3df8 SHA512 4da3787100462ce6feff5ecf42ed8cf70a3c5b5c3ed45d9c9afb88b341c110d230d8b89d911a17eb9d632dcac8eeae44c93468cc518c2ad1b8c972e51ecea5a0 WHIRLPOOL e6a6afb860c783783a0e3b47a149df124781cf1fdcfdc95b4e00478fbac9e3e2f1a5510352579bb5b9e9c5512f6ef19ab23b022dda74392fa19f7cac80a6865e
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/Manifest b/dev-java/freemarker/Manifest
new file mode 100644
index 000000000000..e32b612fb60f
--- /dev/null
+++ b/dev-java/freemarker/Manifest
@@ -0,0 +1,10 @@
+AUX build.xml.patch 2160 SHA256 6c355c090cf4e3df02c3016f5770791a7b0f6432c62a3447f5cb845787150e60 SHA512 ae01462ed0a8fc61fc6e34b99b536bf7d36da73744a070ad63f555af07de5dec3a0926b97fc984ab481db7b7c8807db53998f83e17a5717e805c87a49047731a WHIRLPOOL cbb4fecb2257c729c73986c31074120085766682df893078499eec81feddf03d5b2ce4dee5013726ee766b4c9351538601dc2b272fe8c0c91d773f098afe6897
+AUX freemarker-2.3.13-PyJavaInstance.patch 1064 SHA256 71ef260480ce72caa0d2b54ab2ba2d9927b4997b5e0c5baa509c9f8719b7a1e2 SHA512 f53d2ab9818b9851200feaa2b346a877e893b90685926a451eadaaa6fef40de571a67b7b167e56facde077ff295db9ef9adafcd3409663216d27730a61e212df WHIRLPOOL b22fbd718fdc83ee99ee4e661ee9899d872511fcfc67385731e6d2d5b43412d1e1570ed9fbd969e8a3e2434638acdb5a95540d43ad3f39553b11400ebd75cfed
+AUX freemarker-2.3.13-gentoo.patch 5228 SHA256 6bb4a5f0aa7696bbd1fb3666ec21605a90c0946c0fb131480282aab0d6cc97ad SHA512 857762085428fc094522d03a39b57a2fc74c1f7d57afe260383d04caeceea9fc30a5ab45d3a1039a30d8b18597c6b0500a0b998bbacfe746bdfb0902e96c8fbd WHIRLPOOL 91d5c51b2ee1c7883763d97520d7027aa76c77cfe11b12d5ee56723a58bfbe7e17d5dfbb22936688997e5e49b2e57c0675db7a93de43c87184c295347ce7832b
+DIST freemarker-2.3.13.tar.gz 2136791 SHA256 00b43c28bc5b141e53ad9e56c472f40774b5638f96fc29f3d7cfa97048830eb5 SHA512 9216bc97e74779617ec91916842185472c3cfd4c5625168ddd2f4404237767df44c62d8308af8bed0ab10d72c8835c97daab7fbc1efa80c3e01c861dd334ec3b WHIRLPOOL f46ae311feb122e7ce52d2f4b518216c72135e5e6491d02cbef177fd76b798e7b7fa883a22067225e5a4de2163066696fb34f21708a5d821daf0d82c1460d9cc
+DIST freemarker-2.3.25.tar.gz 1873971 SHA256 4864ac056ea801e78c1f0d76080fc2d079a6979573208a0760f6dd60746278b0 SHA512 32a41a73a2f71a4e0ae8829da2c09e07204aa2b4a6899e2c7a3db0bde5d3e129ec7b44b7299a20165d7eb88f4f7d1bd9f0b7a1fd116dc11493134bec2306d1ac WHIRLPOOL f057bd1c50eb4e0aa359b1d429690fd5acef13b2f9534ec0b3060da72cadd3f4bfecbcc49d7eadbcc348748343b3e30a5b315ca75c03e19e9f9877d8156cbccc
+EBUILD freemarker-2.3.13-r2.ebuild 1894 SHA256 e8d20a1ac13f719e29be083ba8399b5de0d16f2986ff83b9dc6a1748e35e7204 SHA512 a50758e63ea0a2a6a4c2968b56c485cbcd02885176afd6871355579346cefa569a59821e65594dfdf756ff5a1db3e289cba3cb713760f128cc34db99f68c8530 WHIRLPOOL 6e70731bd672d169dca27b8a57c58f0c7e2ca146a2e6e41776a6f4ca65c48361e195145af467c94cefa231801e94b971b23801f3997240654d6642c40c6c4f28
+EBUILD freemarker-2.3.25.ebuild 1526 SHA256 bce42b3ac81931c8c3454c33e69b7d564e81ebe2b8419d9e89a7696c07a9104e SHA512 43e7d9debfcd4096823b6e2076997b55a3b9a644578e52c0a30c0581dd34f1eb7b333740663165cad5f25d2ae6912c0cf1f85bd0d46437956bc1394125bb619e WHIRLPOOL b29780ae8199a6d5dd6b2af465977ce5a84803adb2b632699d7ced1bd5abda7c803ec49d0e31a5e91f32b074f0731c8d736c0a8ac3a54e1f7a082dcce88bc739
+MISC ChangeLog 3434 SHA256 72ae5a7c85e7bc1b1c915457d7b609425555ac5ecc0ac7d9682ae27873459726 SHA512 0cfd73464c3b2bd0cfd4930627f678bd7207ff909c158116d98da8da910af6a9d8be4fbafa163bf2e1cccc42dd2ea9319769555aa9afd960a99dd0cbdff6209a WHIRLPOOL 03c77977fbb5364a560d785825df1b521cf3094f9f69de68d65ee4f23310d0ea73f97336f66289c17ed59cdd935b50b660f4e0f10544405d73332b652eea3a67
+MISC ChangeLog-2015 5556 SHA256 a6e9044efd8bb5928cc6ac863399a30c19e5726f4a32aac2d3b710aa6d657cd8 SHA512 c3072757e2c9e461deb65f683b7a0a442496484da1e02b01fb11394dc2b1934a3d19d7ba524b3a4177d7e46258d6a8a268e8841375eae9181d0b0ef078f12720 WHIRLPOOL 92b16cbbee076abf2f856b45935e391a1243d4e67ff901f70d56e9a7236d35e4a4c6fc68432297602a826cd8df58f9195adef56206cf38c19b774d73f002b782
+MISC metadata.xml 383 SHA256 ca5795e9360af5f1a99592e75a40cd4a37c1deaeebc1a2c89668520812458946 SHA512 2b6f5f22ae11f25aac3cbf3a2c3f3161ab391b932740d964b41bb84d24f54d12a8fa60f11502571b30d5100bd7fc578d82939de0ae7d1bef0d22df910edfed2c WHIRLPOOL 270d0ad7d537235b6b3faff6ca66a395b5997c8d06f9c91d5a77a96a44eb6fb29c122410edbec1052bf6d10141493910563a018e3c4e4e541a047a797761abb7
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/Manifest b/dev-java/fscript/Manifest
new file mode 100644
index 000000000000..6e936bb692a5
--- /dev/null
+++ b/dev-java/fscript/Manifest
@@ -0,0 +1,5 @@
+DIST fscript-1.17.tgz 117300 SHA256 196bf481f1a41fbb4026262aea3664ae9af64d2c75de6c4b79ff633e5a0f9f38 SHA512 9f4280ab1131f7ccdf2564fdb9bf1b6e91b593b5ef2934203a68aae87c3d89adfd73e82d0409d6cddd8685ee7bddb69dd67532c6f13a046381b12faf97d47e50 WHIRLPOOL 806a01b2120e0d9806426f9050513d453818cc343ed8c9723b1138df1217d9d8c6e60bdbe76f562e6218277e2f25f9627306a5863cf386faaf9f59bb33217ac9
+EBUILD fscript-1.17-r1.ebuild 821 SHA256 a898d51c59352d4da7d20833f5797b766af76d3a26b2db4709cde82a93bcc1c8 SHA512 7b585a2e7ded3b88cfc42c997160f9bee6e435a5b4c3248e5a7f8021523be5db202bea66a0451ccf8dbaf17a2649d5155a244d3d1ff39d32c167f0a044e68790 WHIRLPOOL c087752b8b551823393d0a24dcd2829f479d049c95891fb418fcc5bb90a47aae5b1a97b8f45881b11404f7828f1bc5d6ce0967ba5014cb7547d513fc76881983
+MISC ChangeLog 2431 SHA256 a3a358c29859e9d4d222e63f16db992b7a7cdaac29c2f2eaecf18d3c8a361078 SHA512 e4c62cc8013c80b262ae80abf8b75d5c65b29bf266789605adcef3a2059c36030db3c9c888bbe4cef950cbceaf5d94cdc7233e43441da91143cec556146ad1b6 WHIRLPOOL 131e78300565e291d2d128f099fbab68ee35684aa5bacf328dfce11f0d6437f053dbd412a0593d5573e9481e3251bcda5e6e8300e3a96ed986767adebfef7170
+MISC ChangeLog-2015 2698 SHA256 4e785b7f0e0e4ff5b8aff002a2da8478ccbad8e89ff73a2179a79853d74ac6a1 SHA512 3361c52209f39739dacf6ca485575ce83b29ea9513c6c5289839436ff70a6f740e3955a4b5efd55ee531ca1ec65b08bed11280e2cf6f6e613a804018dca06eaf WHIRLPOOL 9fb8db0ae47e0f1e233688f323ed4737cebca0624b4cd01d9cf0c654cd5f9038c6deab4bff97dcd69a02eea25c95af3f2e604f722ef8c664054ed39cd37f7ac5
+MISC metadata.xml 313 SHA256 8ca2dfebb581a32fd1c88bd487f16e1ae6a522c0bcb0b454df334d8f6f8f7a46 SHA512 3d5ab8833eb9f0fddbe88d26cec561da98211b3db51ad3566b15470b0cc1829db2193afdc8a89c358d4ac2ba2441ec0434c439cfe98b3686bf8dd5d3326004eb WHIRLPOOL 8c7a953123e0c2fcf888fa66dacb689b3943a16b806a559ea99435c403336dba2316b211b5be3cd05349770c1d72bc720fe320ef672fba38a6b120f9e96d9a15
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/Manifest b/dev-java/gcj-jdk/Manifest
new file mode 100644
index 000000000000..2b13aba4a931
--- /dev/null
+++ b/dev-java/gcj-jdk/Manifest
@@ -0,0 +1,6 @@
+AUX gcj-jdk.env.sh 571 SHA256 ebc87751e2f16e433d609bb7c6e2261a6523d5f37348c9dc0176ed60607193e2 SHA512 375f295da5eb6847345a4c3cc01bcd2b2d55f455b182f0cb235be8ed51a1520d6e50f7ca9d076da5ab27bc59878ce4c49a67b9e37c34a74c5b675439655ffb2b WHIRLPOOL cf212979950d4b2ed325addc04be83865af410df8247abe613009c94409c778b2733fea6cfcba7b3b37f6ea224508f27a6108cde17946824eccf4074e04023c2
+AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8
+EBUILD gcj-jdk-5.4.0-r1.ebuild 3712 SHA256 78c7e0f0d9b2660b4fedb12e5dc8ba79188da05060b6847eaf2c073a7022bc3e SHA512 1f26adc24f66091ed51890a6fb748f48340670b359be609bb34c55038add83aedf6c060503e232cb5e0749d60685e4b5ef71fba7d0863ef942f9cbab429660ee WHIRLPOOL c8b705b725a51c6cb3e474f8edd6d4e404b095d428f2323c930d985bc7789f16d2fb02604c6185186090202fd790f8983204f09a4bfee11432da5509ec02fa38
+MISC ChangeLog 4100 SHA256 7ebedd8e5cb9573ecc501d7511a14ba3e28c89476ac07cbffa7adc8575fcd997 SHA512 840738ec6e5b3a7556d7b6f9dd1cdb7ae5ad97fe756cfdcf20ae318339052cf571b699208242cd7309632063a4b1b1bc57403ffba20f3ad85f155ea17e919782 WHIRLPOOL 8b5e2b6baef74b824d95b8d34bed216da23d4d657bb73fedd8886181ba580c10c1f80f3207a28165cb0874f80c810f98c4fb366240c6d247549a57228b3adad0
+MISC ChangeLog-2015 5701 SHA256 76df37b27adf8ed9f0c803c16fa8f174a26dda5fd9916a58bbdb75f075a527e0 SHA512 4cb81aeea312050bdbb2538b495b886070136bee436050b7a7bc5b574a230afb53c5a6e3194f68aa0f1e6e728b0b5c52c038c24be9e7761405700bd9fd2374d2 WHIRLPOOL fd3ca14edbf2a8e77d5b5a469e1efd37d383934cd83b67fd68434f6d0dfb00eb73aded6514505a383ee6493e338d0a182a92ad484f0cebdbccb20d06bcb91609
+MISC metadata.xml 716 SHA256 f1e5a6f41f9e6855a708faac39035a6b8334f1631027c111d6cf8b28f2e38b43 SHA512 ccd737b1118329a85ecd3f5b19548bec4a2e425b20955b578287d4f82dce165c31aa016019407e8a5b138a48718b61089ca7f9678c549d29d0bb27cdd9c48e68 WHIRLPOOL 65b4550f5bce3f3a50dde219d7e467d3adf3902187af69591dda36f9bf63b7b5503e5a82499de6fdeb19866001cd0318a7cdbdcbfbb34cf2de5d55e9075695f9
diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env.sh b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
new file mode 100644
index 000000000000..ff967fa2c1c7
--- /dev/null
+++ b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="GCJ ${PV}"
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib"
+INFOPATH="\${JAVA_HOME}/info"
+MANPATH="\${JAVA_HOME}/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.5"
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/rt.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH INFOPATH MANPATH"
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/Manifest b/dev-java/geoip-java/Manifest
new file mode 100644
index 000000000000..eb4588ad380a
--- /dev/null
+++ b/dev-java/geoip-java/Manifest
@@ -0,0 +1,4 @@
+DIST geoip-java-1.3.0.zip 138673 SHA256 be987fd9ca10d1288660a09dac28a1402a89d1f8abb557ca54eeea4f552fd60e SHA512 3925a94072a97dac732f4a77f4f141e1484c630b2122b4322cb487c209adbbb30936b782579943c1c766b43ef4ad0db3e264c738ad777656706272ca53ccf85b WHIRLPOOL 614fd9c0de213bd970c7d1d10223a6767d218ae911bf534a35c350af03518adc5d0cf134fbc33e6a7fe280ff9cbc376961868451f82dbdb158d4185b7bfbb80e
+EBUILD geoip-java-1.3.0.ebuild 907 SHA256 bc8ddda1e6a8ad6cb7b40b79ae37c2ff89fb086b2c52540e16daffb592131ea7 SHA512 b5581ae1866abc9291f2d26513d41dc15e25481e10c940cf9c79c2a86350bad84dda8c1ede422151af013efe0e974b7e64ff135d5ca5dda5164a67ab90e64147 WHIRLPOOL 1fe618f9dde63fbfc00a6a24e9f9ae8f2795e53084c5e6d72afc83e8c6cdf941276717c073e6c18dc00e496327d68741c26b4e133f752dcdaf0b9e86f818fda7
+MISC ChangeLog 744 SHA256 38b71456af97278fac8539ab7b2a05a51f82152f58567b60095f35c7bc964584 SHA512 1d8c8b8956a04a9bde2f478ea2eefe622b6f0793b5f627414d9b20b5dbf2889ab0c61adcc513da27c639efb28cfafd49fed57a18a278239f8ab66140229377bd WHIRLPOOL 2d5c9a15094f76f37f5296c8520f34efa1f9f748348e374cd7579459862dff62c3f6734929839058c84b72579af33904c5cec5d628444e845ce3ac8a248d7b0a
+MISC metadata.xml 435 SHA256 cc7097a74417cf2fcdc5ba180f9c89b2429abfcdba32411ba348fd4e3e1d0cbc SHA512 2a178cea68a188ef9557208bd62b049865f060b1a99be03946859eeee07119aed5fcf421b7b192ce2174315dd70e3ef4326dffcf2bd2a6801f5fc7f9acf6ff6e WHIRLPOOL b4437fac98865a435c74af42d0a2c8561bb83dbe0ba840771a74ea282774953f4baadd8a8730c7b930fc0ce349f4b627ccf48dd4973a445ef76662b2c1df6c2a
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/Manifest b/dev-java/glassfish-connector-api/Manifest
new file mode 100644
index 000000000000..82594bc0bb81
--- /dev/null
+++ b/dev-java/glassfish-connector-api/Manifest
@@ -0,0 +1,5 @@
+DIST glassfish-v2ur2-b04-src.zip 39817113 SHA256 b554e618ed8edddd8f77de15a800b7d374edbfe1814196125c1e9ee7634ba388 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8 WHIRLPOOL c3796120a85b2e370cb9fced56c166a554cd40ee2278c819ee6fa4eadce325373f1d2369cad77746f6e5b871c075d16adfdc9dbfb1bd20194e0f19e6ef0f0719
+EBUILD glassfish-connector-api-1.1.2.2.04.ebuild 1078 SHA256 57308e08dfe10bfe04c95e7fd60bbe1a0067b77f6544e2e00f8de95fc9ca4ee6 SHA512 fd8c4916848f767854da011218ac456247c78d2566139c07ee121c4914601fac328d9f045fda79c4e8a1dc8b72b0e0c5ae4bdd675c583d9dc8ba19745c290a49 WHIRLPOOL 122edc47df4da7372c5401e45e8a31160ec4e9d61f93fa082530539532e3f5a44a2cfeb571e725ae25dddd38bba9fff0531d7320f740e79dc0c8a144c3df7fd7
+MISC ChangeLog 2646 SHA256 cd166011d2ead195ef034a160b0b98c8fa556a64309e0faf8ea3a73bb1826a8c SHA512 6609518002d07bf7e617959f36b52a3e4efbc84877f9a3789c73af81949b304648a0f5ba587c3bddadc44062f32622ff37d6c463bac378932acfa509f2578ae9 WHIRLPOOL c4882f28311fac2c6b388a2d5cce6f09764961b510e51dc82e49caf7f1c95b1add9a34e922d9b8e1ad67c2e56b48aecc865e69c260fc3e0cc3dcccd4fa2274db
+MISC ChangeLog-2015 884 SHA256 274d5992e879e34e1d75b1a9a80574d1a8003cd9def6c1a60fb73843fac53f13 SHA512 d48e53102802111955b50f9e9c8bf914b1b2987b9d224df1b68456e3ed20494575f1552653bd779ae34d339ae6e07338bc438d1eaf157a83cb1a686406381d61 WHIRLPOOL 229fca4bcd9855e172e50ea81c8ff4424e81e0748dbc947ea7af4a93aad6e1cab516386db85f993d41d5d65b0cfa28a7899b2870e1272e68eb82f5d14ee3fc50
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/glassfish-deployment-api/Manifest
new file mode 100644
index 000000000000..3c7e40dbdbc1
--- /dev/null
+++ b/dev-java/glassfish-deployment-api/Manifest
@@ -0,0 +1,5 @@
+DIST glassfish-deployment-api-3.1.1.jar 86511 SHA256 e45d07481c68a53b615ad064bdd4612ab08beba443b58147b4122799ca4c2bbf SHA512 9325d44da2258c84b879360fe92314b49c0b3ca7be2dd3b9016bf884e79ed66f9bf3fcec2b99a7b8baf3847e5d15376d10e3013bd4dd0f0cfaaf7859fa83a6ba WHIRLPOOL df7f1dfbcc7d9ecb86bc97f619bce4bffeb1c060d082b5caed8d22b5dd8bc3561c98be375a3e8e97a7f89b78a4ed90af6d49b8e902d508ab81898fe976a0fc40
+EBUILD glassfish-deployment-api-3.1.1.ebuild 559 SHA256 556d89da2ca2d805349e1b707712ca6254285005d0bb7cf565310ec25a6b33e4 SHA512 49082894425e7021d9cde717556cb8b73d03d232120ceca2a3a8e470606e1b23a9e473cb65026bc47ba570e5926364fa9f22d41f71025e405dba0b31b3714055 WHIRLPOOL fe6ae8c7a6bacd043f9295a3bf5c1ca19d4a3c986fd7cff07376d041cd550e40ef71638cd079fa4740dcc18924cd8ab45fa8b1d909bc6af62d4aa7860fddf373
+MISC ChangeLog 3667 SHA256 29565e4267cd586dc4f1ef58e36250a64a1d998e5842bcff0466232176a84ded SHA512 4674922195259767f475d1a0d99c5f433cf1b53474a24328b788478589aa0a04b6211357485653fe1ff4a8b8e5caa355349a6e87ddedc8e6cb1724939e50c20c WHIRLPOOL 86e7946856584943c26d65cab47edf71202851e3e9bcacf43d91b2fc6f489ea82024f751107a2f3d6466e1a0c457fcecfb32684e80ce30e2f0ab31862a271059
+MISC ChangeLog-2015 1169 SHA256 2a0a53e3c4b7a7ce370ba1b6f31fa04761a6d1e2a2ad8dda1142a0d8119a19f9 SHA512 627597b0ee8cf7fad57ad8bdc3ed6090e1a01a0465c6c1e44b4829074788531dea610816eaf0e599fb490af28a91e9e9027f50f7d0e685d77d84048d4ca0cdee WHIRLPOOL 6c2ad4ed1626ed87e70ccf5ef7a88d1021f7da425bb36b3e785d567b11b222e0c60438cfc3f1beb1abe49257eeabff6ef5adfa9519b00ac2f985f87f74e91d7f
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/glassfish-ejb-api/Manifest
new file mode 100644
index 000000000000..72ab8833eb65
--- /dev/null
+++ b/dev-java/glassfish-ejb-api/Manifest
@@ -0,0 +1,5 @@
+DIST glassfish-ejb-api-3.2.tar.xz 37052 SHA256 99ca1715de72ca845d371ea80734ce8de649ec45b8a5cc43d856c74cdd900cc8 SHA512 1692bbff05242b0af5141b35151ff65f029e19f45c5dac07ed9b706635e3f42d8d512819f38a49b564c9dee51be33c36fb871ea5267000536a0fb1e1b5d6a00a WHIRLPOOL eab989e055f6befcff812ab52f46a2855ddcd80bdbe90f2737bf4b9d5072cdf609dcb53a06a4330918afe7bb13bc970e04ba28e84d060ada65350bdcfa6787e3
+EBUILD glassfish-ejb-api-3.2.ebuild 851 SHA256 d073909eaaf542617bb98a8ac8b5f96b40003f46832e63b92ad3d9ebdb8e04f1 SHA512 f9558f5e3a1152d06360c99eb9e7c11772b19489528b0fda91001a7d871858b83e72214edd10431f626eb38fe6f94b06787fe40f95787b8f90888613c5cd37c3 WHIRLPOOL 5d38e091d2c2eb5cf2b87884c3c9a85f0be9c4e178ce024608d381f36363d45471f9744012ee7600c4f0cbea2e7b27e0ad5247c0d8c60ba1c528c67c379fc12f
+MISC ChangeLog 2865 SHA256 f8f43daf8ea675601120c568cb23583225816512a4a4d068450e229c0a1d54e9 SHA512 a87d2338a94a1856dc04212fdfc93a488a58cba4218ca95ac79f14d66f783df470c49489f8dfb55b4c3a86c75bcd16aeb2fbd698120e33e6fa2c65905034ebe9 WHIRLPOOL 1e335083dca6e2350583f5090140bd195dd796dd95ad9d26f28a8387984cf4f0621adedc8fe88475e5df611b401687054e5c8f16fa5d211c8ded741f80ed36a3
+MISC ChangeLog-2015 752 SHA256 fd3b4e4662e63ac3a8c1661c3c7cf40471c2498c412c2289a7308e8f0ee9feaa SHA512 147fc8a11e5399a0d959f91a4f8b77bc9be6f7196521c52372d837ec02487e24838b234ecb5bc47945b1b852d290633243573df63d3466e62ee48c0da75c1e5a WHIRLPOOL 9b61fe596006fa2613bdec2970eaa3ab8c63aeb9454b7eeeea445feaea9443d820f65b158342f3ee46ddc1457f0ca8bd957118c13f5d21f4cf58445f4c19afb8
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/glassfish-interceptor-api/Manifest
new file mode 100644
index 000000000000..6ef44491e6a6
--- /dev/null
+++ b/dev-java/glassfish-interceptor-api/Manifest
@@ -0,0 +1,6 @@
+AUX glassfish-interceptor-api-3.1-build.xml.patch 376 SHA256 48e45d5747b8f1427358d5973ddda30c2a522a33b608b7b6f4f6948d3b8b4681 SHA512 9c98831903c3f96df13a5ce0771a1064e9458f12f8e2a898758ccb63f0dbaab6047082dda5fa5a8e111c442536af28681eb712a6f4dc8844b388f721a0101c26 WHIRLPOOL 04828329df5039772a1dfb961602f21a47267bb07e0f937496f5cae7b7912690e8fe155cfbe950fdd73efa8afebf8c6e2ecbcc3e52627e2eb290a2e14d1ef5c3
+DIST glassfish-interceptor-api-3.1.tar.xz 14600 SHA256 b64285dbc80bc6418458927735c7dc7df74f6635d86cdb9a70b0c869f2f4a662 SHA512 674f53d53afb63799c579b0ec177a009178315fb62f027441da14ceb5d6fa07408840ad82aa8fa7be31b53d43b53ff28ffb1617d644c989bc4ac17ce5e626563 WHIRLPOOL f20b4abefab8f9d7c55f3a12e6a41fb60644a8ca580bc6c9ea1772d9c919a8d99bbc86b928af82d7ce279919019107164760bd1e144af8ff4c4b4119fd2fdbb7
+EBUILD glassfish-interceptor-api-3.1.ebuild 829 SHA256 3b0d320d37311f46df5123902e0087fe23cb1870a41f34e02360d2228f347a1d SHA512 03e96e8f0c8385388b6ac657d05cf3efed6dfd18d2d561921e1272868b8606bea50753180875c4cc2ee0f921a5bfc763f7046e51fa52d33385ff915c0c8698f7 WHIRLPOOL 4c1a215b519d17f6690e0cea7acfc6cff67274fd1ade014f61e4a1647c2b9a7262ee4dc0f506b779abdbd8d76466a6f6d51a5de50a083e0a2e5247e3eea47cd0
+MISC ChangeLog 2573 SHA256 711e9ec2511c03e0da941cb7566d348de8a3b168642ee36928123feddf51aa2d SHA512 9171477a7e1ab7c6eee7dabed09aa3a0f54c32ae6ecc2d5309a904c6f7dbbed533c7b6acaaaa23a64273ffd33bd6e33d2c43e39ee6644f1f98f2aca78cd0b37c WHIRLPOOL 70081810b78d9150a3a18d3a5b06b1360353cf93898e4cc181b37981bf495fe3d74fee94d877ce86acf9721b0282ccd5450d3cf19a41aabcbf635fd22e6acf78
+MISC ChangeLog-2015 975 SHA256 9e88de60a532bd62b9c71cb51a7e72335c6a79690519641baad2fcfa54f6fd35 SHA512 c00605c0b28bec394ad390b686a5e7b2a09d417ddef6f87bcec4e4fbea03aae01904719a178558accadee487194b720be00395c8291252c26a38e2b7c2d6d3fa WHIRLPOOL 175d5c7cc39998b043dbe30b364a652047320f2848e0b62d7bcb9e66e6fcf8866a4ac0ba938b2eae25769381245caa2027957047e6028cc52f884e18bb771ad8
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..eda5efcfbe4b
--- /dev/null
+++ b/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-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-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"
+
+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/Manifest b/dev-java/glassfish-jms-api/Manifest
new file mode 100644
index 000000000000..b9567bc0716e
--- /dev/null
+++ b/dev-java/glassfish-jms-api/Manifest
@@ -0,0 +1,5 @@
+DIST glassfish-v2ur2-b04-src.zip 39817113 SHA256 b554e618ed8edddd8f77de15a800b7d374edbfe1814196125c1e9ee7634ba388 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8 WHIRLPOOL c3796120a85b2e370cb9fced56c166a554cd40ee2278c819ee6fa4eadce325373f1d2369cad77746f6e5b871c075d16adfdc9dbfb1bd20194e0f19e6ef0f0719
+EBUILD glassfish-jms-api-1.1.2.2.04.ebuild 1247 SHA256 85a22a8fedbd13a3b075300549030fa4052c451b314048b0eb3385e174cd204d SHA512 fc34504fcc8e2b81dda7fafcc4a24e4d6b99b5e185c1be867bbad9ac02626c2abf278685daa6c934c7df2e390f76e0492cbb9a5edfb2c61645cbe4e986abadf1 WHIRLPOOL 14d277fcd754966388b2874aca4d7b1be7d2b98885c1db51fa55c7597133eccff78183ea950f7a26302a9f8309e2c64d658c4227e92e8a1ffd609a34cfa08480
+MISC ChangeLog 2467 SHA256 b2fc3a9de01fb60f1eddeb2b4552456f271ebf4c00fbe2d12ae550471712e373 SHA512 678c38409e1a19dbb65815cd3b1eb383f0781a335d63176078a84b2ee60d3097b17ef52773c03a5e381c6c2c26bbe6f68e63adc3950ad21b8523cc68499ae509 WHIRLPOOL 80f029332c4ee0216ef74c44ebae990b40be21417abcb07fe010e90c79dae6d8f5d77993c557eefff772d41b436cf603ccfe26bd815e4c4de2a6836d026549a2
+MISC ChangeLog-2015 914 SHA256 908ed682ffc5cca8582f020fbc802ca023472566048ce984af6ad1643194799b SHA512 6f5935a958a1c7d4d92f9bbdb6bbf9545cd10e948dba7e7b351dad1b3ee7dbd2da9af9c98e66e09cd46fe6495211f67a4c64e2d68c64481a54131cb8d0c684f9 WHIRLPOOL 96e378055218ae2f0bc33821d523025f007bcbf4d16e3be5cbc548a5d1b03450ea3f40d550159aab364fb576eae0a2192abc8332658414f362f194501e1dba04
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..c14e1050ac3e
--- /dev/null
+++ b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 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 ~amd64-fbsd"
+
+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/Manifest b/dev-java/glassfish-persistence/Manifest
new file mode 100644
index 000000000000..e04c7a2438a7
--- /dev/null
+++ b/dev-java/glassfish-persistence/Manifest
@@ -0,0 +1,6 @@
+AUX glassfish-persistence-1.0-python2.7-sax-parser.patch 286 SHA256 7bf6ba4e7d666a3897305c1391ff06c10bb395f743daaa994e3e51c8fbe4db2b SHA512 ba7c32d86991407d45a86d640d95007cc47dcd28c74f441e38840206093653dc31e4824d4986cd9cd60d44fba0c1f4365f9348a9362529531fa9410e9fd5cad1 WHIRLPOOL 08403e980d372edd717928001202d23a67860a1728b47a94d4d1fa35595654087bb444c6a785a69d80f4d0652059ddb79df73d826e4f4df4406a42763716f949
+DIST glassfish-9_0-b48-src.zip 35162972 SHA256 05e49f43ede3f272934fbe0d67f3ac2474bcf4695935a7af812517aab88e0c49 SHA512 512ccd1c89a1bbd88ca1e45b1e60693bd3c4a6c6ffa19376febb786eb73556f27bc0ce4f0e760d6d80b0711206f6701e7c7da70ef3a5e0084ad0482246506a48 WHIRLPOOL 3b4524497216aebbc1d9f6544d50ead27aa6af2ea9e5364e0323c60d24327db28057db778f294ee7483dfc98142c595ccec5a3e8d147eb8942cbe545ae6f98b9
+EBUILD glassfish-persistence-1.0-r1.ebuild 820 SHA256 cd5f1367640f131a97faf2ad66fd46504bb2d65822854e2df78c5b4d312b3696 SHA512 555c94ae5a06f17590abd0dc0917c5d58042362ee6d702d2f6ea9457f502ad06ab9a31617924e1739ffea08faa08ff82008585fcbd745ff56f6ec621b5bd3335 WHIRLPOOL cebb761a5b7606a0bd590cd3660b8fdc9f72a36cd47ee298e8348cc3bf14f44b7c7d3326fe691f26f1d0426e2a9410fc1098ab6f98818dcae683ef38e1837ac2
+MISC ChangeLog 2534 SHA256 17baf2a55b664cfb5e491f4f66dc127e6f6bb9608836cd423e35a16386af26e0 SHA512 c05cbe327efccf2a8100991c04b1b2a82a5c9dbbfcc9cfce66f729cfe2c8e64be643f4c1c066851efc8d61416722ce9514a52c5e918cc699d69acf8c222cee18 WHIRLPOOL 82bba1c4bb4905580785c0bec46114f125e28ee4c207c91e770597945f2ac420823177c88523f29b4a3ec2e6a4b7b9f8ff94577e33e57175b722e61746d9bac3
+MISC ChangeLog-2015 1708 SHA256 db4418afc19a545e7713e73ded21ab3793ebdcc0f25239e86d0bba8c81ccd9d5 SHA512 0c31eca44b9291354b7d9017d7c03eb9b6b24879547891fc4f5e5152bbee4616af1b514895ade2b7215b1c5dd335d908c33a37125dcf3b821886b3fcd5719967 WHIRLPOOL 1c0982b711fea2ac9c251827b49ce8d2ae047585f99fb64ee0df4e2173d9c6405938a1ae60931b96bf0fe1b39405e39c5deebcf3d23bf316abf57f2540604308
+MISC metadata.xml 214 SHA256 8e5c772f056babed2e7e25acc12ab79a32dc6a670548468aab55a9e1a8e5b848 SHA512 d2b6ecfbbd79440de1909d9f195e5d4a6f9886b685ac1e6d7a1db39b8925b29942fac2998cde06040c921f2cc9ef2cbfbf836b60e191d894b00f75628476b1f7 WHIRLPOOL a6545983d0a39cfcee27a2628897a5a59ee0daefe93ccb53968cbf386db1dda3b41851ed1ba61406ae5e5c17cf94b6f88a5b479a838064c99406a93f91ca7628
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..bf1de0a51a36
--- /dev/null
+++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 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 ~x86-fbsd"
+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/Manifest b/dev-java/glassfish-servlet-api/Manifest
new file mode 100644
index 000000000000..94486f0b6b5c
--- /dev/null
+++ b/dev-java/glassfish-servlet-api/Manifest
@@ -0,0 +1,5 @@
+DIST javax.servlet-3.1.1-sources.jar 211576 SHA256 c17212d132bf33dc9dcc44ed0e945e92a08cc8ec494ce7cd62de9f9514d63826 SHA512 7f152a389481e0381f041d97a6774a3e762a86b2a8a5413901c472fc2882b9cabd141dd85b46b8a7006cbe677c29c4caee09f3fc934afae857a6c1362efdc7bc WHIRLPOOL 9d794227cc6a119ef61122ec63515e18199bb4239382129b56f88ff74d5fb5b08a2b3259a1cfcde14a0761561beefd0152c853476d6d65039de76d791bd4090c
+EBUILD glassfish-servlet-api-3.1.1.ebuild 608 SHA256 ffe8956bff8174e601c786b3cd1d538dd98b6a7fd84042222db97f2062e8f493 SHA512 68b2bc37b97ee02a51967976f06f72a32b70f6ddce3cc16500287f4721ca48d24dc7be21007edac3afe0ae040865560e26f408bbaead24dccb94a0b9b1285d1e WHIRLPOOL eaa1c5be42956f659b2edef79352c2b6df330281346d61bb19d4aaf3131d714277e960942fcefd5889556b08d303148177215573b212d1788639383add2e2f52
+MISC ChangeLog 4034 SHA256 d7d003c6b3a34c21c639b825dd6ace5cdfe12bfc03bcbcca269f3fad76c5d293 SHA512 aa7b927a6b91388f3889c555abb8d80c279f5686f752cbc6dc2133c85040c8e395fdd6b30e58c9339d7346f47cc36a4267645a9abcfcb41aa2600a85550a09a9 WHIRLPOOL 2d1b1d58d1e4ccfd3225457953ecac0ca7a74cf4872b4ecbda47660bcd475d2e1727c26ed0a2c06151a176e5558bee23b058eb3577c81ccbab2ba410e72d8eb0
+MISC ChangeLog-2015 1730 SHA256 c4be8dcccc39d8d224beaba99a192b0f745bdfdfad4c5f24fddc36813733843d SHA512 9ef924423e50fe1e71b9701383ec51748a772caeb43d50f83dc5b8cbdadd975f5a06574083fb5457b9166debe908760cd1e2a456256fdf2c79aa2064b13768d9 WHIRLPOOL 94f84b02da62ad90da141f6c8e62523d4e7b868ed81dc6415d2cc8aa548f85b139df92c6b58d7c9f500d349642d037f7f09d5ca922d6e17bcfb612df34633391
+MISC metadata.xml 355 SHA256 f9ac4aa6d942c41c0bbac9bba3d8cf3a5aa8b5f16acc0d99d5077adc5601f8e7 SHA512 b9c26b8c7f6da20985e7efbb24f8bebc579f7df31a75cbdc2e86184c91e56b11dac48314c067d89b09ae40b706284ae798c9bfacaee6ff24cae2250b19e981a6 WHIRLPOOL 191af065cb78feb5f26ebd0c4f27e944e8a81500e81d69ddda711b3d77049f3e6fa101fee43c2345247d39f547d4f8b2c833dc21beed1a04b94ae7c88e551dd4
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/Manifest b/dev-java/glassfish-transaction-api/Manifest
new file mode 100644
index 000000000000..14fd1e1d66c5
--- /dev/null
+++ b/dev-java/glassfish-transaction-api/Manifest
@@ -0,0 +1,5 @@
+DIST glassfish-v2ur2-b04-src.zip 39817113 SHA256 b554e618ed8edddd8f77de15a800b7d374edbfe1814196125c1e9ee7634ba388 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8 WHIRLPOOL c3796120a85b2e370cb9fced56c166a554cd40ee2278c819ee6fa4eadce325373f1d2369cad77746f6e5b871c075d16adfdc9dbfb1bd20194e0f19e6ef0f0719
+EBUILD glassfish-transaction-api-1.1.2.2.04-r1.ebuild 913 SHA256 cefb115476bc963c88248bc62b19b1c1c0b32684321405d0f706cdc847231801 SHA512 48dc858ce8d256ab93fb8be6556ee04c49cb6a1c8e2dbdd02d76b528f8719a36ce36aed38df00195fed424f9dacbe7844f2e6ec7a7c07ea875a8bfc864d464fc WHIRLPOOL fb79ebaf0cf968a657d3af1a760e554135a8fe196ee2cb9a02aa61485ca019beed343a048a631c7c2fc0e1b4928cf7c939c3ed81e67cb3c21eace7686c882f49
+MISC ChangeLog 2654 SHA256 ba88302e1e4900b4e86d47beaa80c23fa1c6d3c09fe3a90cf2795a42a501d977 SHA512 8371c28b89cd82a78421ebed81e36acdc8badb42a3f51fc33a58bffc3f4a57c7acf06a84823962e2679437d69b49ed50529705ed98ec4169501d6b603d1e3450 WHIRLPOOL cae3d792f5b9bc79e6a18a9664c517303756d2108838984e017b2f9dd3f61a94eb90ed0393aafc5220776fad582e8bf0f56abf8323c3b8bb94c43f2295a312cf
+MISC ChangeLog-2015 1402 SHA256 7da25a1d06b73b6fd81f5b610f627c56e4f4b0f69aa8fc3b45e97214e1a9b189 SHA512 6a9a01f530cca74a4f372bced0aab647849dddf286370af37a6d602daabd1919cc606509ea992b6336b3d4c51ade393b0132ff3ba78ab0a4ac20ca1f910c7b9b WHIRLPOOL a76f0c281fdf0730dc3452e9c463b407a90462d861fc0f132e51fb97923a6d9b07db68c026ac9c37471c41439eb30449c5baa4df0dde0e9da4f0c058ada98d8f
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..9f87fc7ad5e6
--- /dev/null
+++ b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/glassfish-xmlrpc-api/Manifest
new file mode 100644
index 000000000000..ac8af836c865
--- /dev/null
+++ b/dev-java/glassfish-xmlrpc-api/Manifest
@@ -0,0 +1,5 @@
+DIST glassfish-xmlrpc-api-1.1.1.tar.xz 35180 SHA256 ca8531a5d39b80ba94e13e048fb2bf9e2441910ccc992af6c0d3dd738892fc89 SHA512 7de8d5959c0f9f09cca6a169d4e4293fca378aa497389e9a9a0af953b698322b9bbae6288b8cba2cd34abf58a0d0f4272294dcdf201a84ba5cc14d426843daa8 WHIRLPOOL 830df242d38e29a8a3eade55d5d80f683ac610d355db2725a8a6b7fd74e19d566ea868a90dcb6e824f758a5c163f36d7d053c6759c896b953279ba2c48628475
+EBUILD glassfish-xmlrpc-api-1.1.1.ebuild 802 SHA256 882e10ae1b7fdbe61728fd2f1d518c5ed7b2a6f0087be870aa8f1a7a289578ff SHA512 f60e1c459c13a4f9e5978d9915d0b966fb0b614ae65005fdc6b099604c87f8792010f6850440b3a2e483ed5c551cf052eab6addbd915a3f2e96b0e478dc42f4f WHIRLPOOL 58979df5633dae8e78e2990077acc69bd824e39501ff08acd4842c3b90a457c5f297722df7e778ae055eea0a3c6ccab1b41742c0aecdff27a95568545b843f1b
+MISC ChangeLog 2740 SHA256 90c3cfd8bc202c58717426540f60f6a96b4bde825d7d4619732fc4b7abd6304e SHA512 e998ed31c0f2b7b700c6db623e9d3f44521ec9ce82d2e800d6a097581295debeea2d3f9575be6a938684462f6ca2baae573a53cbdaa2787156883131fd355c16 WHIRLPOOL ba0ecd932e0802818c7be204b8a5da19f6e89b33f580552bdca0613cce9fc5624830ee8272e8a9711258b06d0a85ae62d481f26d5f84186c72cef155dda379f9
+MISC ChangeLog-2015 802 SHA256 2a49b6581aa41a7d0788c7a166476850bc01c95c5eb0d10c77b1cedcb89f0871 SHA512 85345a98711ac84e2066b0baa3fe036d7c3706ecabc7afeb5a7d17e60632a73eac2505bd4c0fbd5d1fa18538661a87a9338eca6408cca98c2e3c3e7ef7d3237f WHIRLPOOL 41183b7902fc2520fd1e35a3a9c1e157e79f2b463b1f75c6d07d030994c3433914a810915dc588c339bb07c7a731dc35ac52d1b19f86fdb10a68c5ab686765f0
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/glazedlists/Manifest
new file mode 100644
index 000000000000..5837c4c5a326
--- /dev/null
+++ b/dev-java/glazedlists/Manifest
@@ -0,0 +1,5 @@
+DIST glazedlists-1.8.0.zip 1169436 SHA256 1afbded7118d3026a666622c8a6aa46bc41ae09c9e832125fe3dc3a3dba5d42b SHA512 3fc3f339a248a8aad897409d752464d60b504474ae1e4d99fa7fbb41d767928137711d5d9979154b53d677e42746e2df2dfefdc71fa4a8017ec70ab23dc4b6a5 WHIRLPOOL b5d37cebde2be0a57032be29667763d97b54f3d1a5b48e40e09b5ce09e3ae654776c4d6817c09c018fad7fb0d9bdbdde6b6198e4405250fcc2451d008c90fb40
+EBUILD glazedlists-1.8.0-r1.ebuild 562 SHA256 956c7ca194c22e253670943fe38e22f92a131ea907c6f4ba7c2c79fa9750edc2 SHA512 1f213795706916bc791025ad93cf1a00265288c97909bffc728883d13b0e897f0e983bd43b099454f68a1ead8e39fab82b0b486d83b8126906c5fbd412acd16a WHIRLPOOL 381f35e91cf25b7b5f084e7722c716c02a524a6fc4f5bb45ff0ab68ae24bf8426eabf1f8015f470f4c400c26409fde6cb303d9f1998b2d90258143e725886965
+MISC ChangeLog 3540 SHA256 f436a3b1dc9e283023eddb2ca5929b8872dbddc637b336bc4eede68d498ccdc7 SHA512 ed6dd1678d1a616402859d00a316d120eb7d104d078311135aa52efb7c4edb9c1e3bed2d0616b1b5247f2cf40c806c53d50411068a9d6d0060bb792e643a839b WHIRLPOOL 606bc6bea4a98f6889c82f473343e9cd1b2ca18bdc60ffe4a442d9ab046758ee1afcef3336f75b24e61f2a7c3a045182bb53ac6f20136f3d177b4364519d224a
+MISC ChangeLog-2015 4107 SHA256 814e6408bbb2386d7f308b34b15a75c47d2f06302969a78e2f74487c53809691 SHA512 f255745830c313a42ebaed61d219fe33b6e8a7530b6480f452ed068dd4e071616d267f81740f20bf17d1271b679e194bd25666025067d84b6639f2c868ad211a WHIRLPOOL b54f07e07a5d56ec0cbd050e1f605f32cebbe8a392e31dd5898e656f6bb1b8e166fe9e1852c3905d701ce41a2b587b0cbc6bd1fa6191c1d4b29f19211c330e89
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/gnu-classpath/Manifest
new file mode 100644
index 000000000000..09cd0dc1ca9f
--- /dev/null
+++ b/dev-java/gnu-classpath/Manifest
@@ -0,0 +1,6 @@
+AUX gnu-classpath-0.98-freetype-2.5.3-support.patch 1192 SHA256 6c37e672e9994fdc1173da54ff76ab62799ae1f109783a4829a7393b58072baf SHA512 5832a27caf0a064a29fb00a186d116193af98c0f2a97ef868be7ca0cab1aa51bd32df90f32ee43f9ecdbda52ea3b264f6f3bbd48d8b8f7cb4d1e0a1444f716fb WHIRLPOOL 8af4adc984cb914853a91ca9ffe4c863fa29de6a72cff11c9c8e851453fa90263d4fe460e0ea857c36649fbeb04c7017d3ccad1a80f4443b0d2dd6b5fa5360b9
+DIST classpath-0.98.tar.gz 11021342 SHA256 501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f SHA512 0d98f87cd78c166d566ecd8d0372f2d6cdf422e8c4c806ca01d3a77dafbdd80ee936de78a2c5d4226174027efdc053fe92669514bdd8acb3290a7b3ec002d31f WHIRLPOOL 1248288af3821fedae226852da41b1a176e0c03f83f95b7e7a123655e3b588f4b1716274aebd1b728b11a63e35c820994bce0293b4bed6ea8837dabb0bf90c7e
+EBUILD gnu-classpath-0.98-r6.ebuild 2955 SHA256 f6267aa1cc3d19df2c1bd9f558bc5dcfb1b9aea0deaf80b5a5af63323bb1cb34 SHA512 01f28c3370f304f3a7dc0c9cb847b859fd61857fc40d2a0539d5e2ec62740ec2106953eb384e080be70b5406a82b109c8d20153cb709917552588d54ba30504a WHIRLPOOL 9a3931d50d57052b929bf1b37ed191349e898b9dae310a8d8828f9fcc551d05cbc0d4cc6f0a081316558f536f89a47aa0791305bbf19362d19af2b1ffb8d2dd8
+MISC ChangeLog 4969 SHA256 db89393a67e1d0788651df8103d80b1be2d12aa34a5c9e16a6fd55619c186b8e SHA512 379024537ba3281cb9ac902301d99141b668e6537744bc985ce4fab5c0b1ffb52b7f88494cf6638550416697b6987d485efae4f9db09ee9acebaab25313e13e9 WHIRLPOOL 901dddbaa6be2c1bb0b04a4ed788b51dbb2f7094471102017a8af9d53004af4f55f450c275816fc97fcd2bcdd849ccb0366d3a98685ebf77d2f774e9cff60073
+MISC ChangeLog-2015 18759 SHA256 15ebdbbd2d83f441ceeff1a63f2b41163944d6d70e8ae71acf47ea1bf90e9b09 SHA512 bb4ebe1fcdc5bfde5b6f83187b7e59fc43c4c02c7961772ec3316bd984c536e7a1693565fb5f7771fe2f3c811d8efbba76810f18f0c0163ba86ea34eee89d80d WHIRLPOOL d197248b63740e0427c06d2732aed4721b33c00b17a9a68c1d68d37e01b96c9147e54b8a319dc8b2aa4efc1773fd3ae42ee0ec1f45aabe0faef127130db45490
+MISC metadata.xml 703 SHA256 db06355f1fbf5c6e634dd2d69500552f3265ab989f22ac1413da1d461306a4f7 SHA512 e97e2eb0800c588b0b50a108559cc164df1ae33f626b089c5ed93476e69ce0dc9d47f043988beed9db9c79e6bc9479f0923f8dfbd61c4a6c619dacc8d7863865 WHIRLPOOL 56b946706659973de1384688491635bc98afb2258f64eb39501734b69fe48b46b2b12bb0cec0a0b59e5ec21056b17dd5ec4012306a28a6ad3ca9d205d727b48b
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..465018f8f624
--- /dev/null
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 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-libs/libXrender
+			>=x11-libs/libXtst-1.1.0
+			x11-proto/xproto
+		)
+		>=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/Manifest b/dev-java/gnu-crypto/Manifest
new file mode 100644
index 000000000000..6f796a7b04e5
--- /dev/null
+++ b/dev-java/gnu-crypto/Manifest
@@ -0,0 +1,7 @@
+AUX gnu-crypto-2.0.1-jdk15.patch 1551 SHA256 c28719ef7001e22fed5320a0d84cff5755c4f74413fae1a659cb23880aaa0966 SHA512 f30f33e29bf400eb8bdd465ffd649fd2aec03ab6d3a315c5da2a8b6375524f1cc20f6ec3f813a9940fbdecf4364c8985bed946ada633d73bda9508c0dc198923 WHIRLPOOL 492bdad73b2effc14daf1c2faba213c58deec836fbdbaed93d858f1101d2ec9268f60f0458fc081278df4978b38a0d2f9e71270ea60340345bd9281a19af4039
+DIST gnu-crypto-2.0.1.tar.bz2 3895714 SHA256 a7398758a5dd62f2a30bd083c3646092006d51a63b7a91ab608dc2c80d569d2c SHA512 c14aa73fb23663559195e8fc7f85a220b25078fa8ab4e7cf43b84febe96599d990ccf52fcf1f6f66f2b547d9b644bbc99b3d44dc4a777dcb72530e58c8509015 WHIRLPOOL 1ce73d64e763ef04157915938e661999bdc7861940f5d9bfbea35601b9345b05baf5ba60dbcce17d2892a1cae3d31fead53363c44306cbd4951dbce9bcefa3e2
+EBUILD gnu-crypto-2.0.1-r2.ebuild 1144 SHA256 698777509d2b4712da703ffd09fff75f725f4881e7dac05071d4c874820fe318 SHA512 ef533c44dc0b1538bebf170ec139f89792c0e2828b2a1009fbcf3dd94dcfda9d998e26888064f9104c1079f40ea0cfff5cadab811b504fb0edfcba573039ad81 WHIRLPOOL 0ebfc7336e8a035f5113997ad96767aca05724109fefd184b2d2b16b3dccc86635ae472effe9f2f52b940ce3aaee70929e7cf4bd210cfd2dfd0f27e87d065501
+EBUILD gnu-crypto-2.0.1-r3.ebuild 1248 SHA256 a064c28e11157938398a755bca04266da3d6f933385d4e90baec53810f619bc0 SHA512 867c1d58164c34c0461536974214fc72f76170f91583b8945f755f0b36cb2d86cf8780cd6ddb82558c4d106e9def839baba1a64ebfa687ea5ec003fa048c02d8 WHIRLPOOL 189453aa6d7e4bbf49917711a0c732bf33b54171e31b45d4f8ffec619e88e2363e259bfc1b01efa7fa8752a57790ccbd5c2369ab1c9a07aef6860948c5daa269
+MISC ChangeLog 3543 SHA256 cc50cb8f4a7fefc3ea273d3a764e93b5a11acb8d933590fafc7239918c681655 SHA512 306f47eaaa45a7fd9f38b409c6e7d2a8758f27e4d56ef2b7b939b7188f97226588c1feee5ce18c2d7f005fa37dce1465a1cd7381ea1b4f66e46fb5829491c557 WHIRLPOOL 935b70a42e3ffcfb1e47232bfd5c83bce9a40953186f1f625f46a2cf83cd8362d82149cbcbdb7573a2d082382b4fa1029e4160646457a1d6148e1347854a2823
+MISC ChangeLog-2015 4173 SHA256 9f9d306ecdd1d19dd8460602404b779fc1460fed53d36ca5b091ec411b9a6f88 SHA512 c4b25d917ab81d22805ff9697b04b83cfa69dbd7e63853d1feffa702a4e54e0eb9e29f76df4fcac63789b549db956721dd9e562f4f0fbbe12de67594c15ab9e7 WHIRLPOOL 3185ff1b3980c17d41a39e2aa1d8b8eb28d5f7f3d08a7d280c10b24e476be291721d165079b68955fe0a221769495ade65479453443b7e505eeaab9a9d0ae885
+MISC metadata.xml 535 SHA256 1da37c0d0b0fc0bd238ce802c7f96d074e204af9f1b397fcfdd218cae84eb481 SHA512 113c98ec48fed10332c9677b90df1803bbcaae3311e5f71be6c681f89bb449618f66b11736bc76bfea5d21828671d30879fe56c49278e9f75b137c62ccb5eb22 WHIRLPOOL 8d673e51052b068a9684f76248bbf6aeaa68d040f0d8dcd38783f5ae10ea1cf27b940e4791ad6052e0d2d174d7873912f189bf95cf78b303f27303c25c7e71b8
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..7c3c742aeda4
--- /dev/null
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
@@ -0,0 +1,51 @@
+# 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 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 ~x86-fbsd ~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..9d7cea0ce72e
--- /dev/null
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
@@ -0,0 +1,66 @@
+# 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="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 ~x86-fbsd ~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/Manifest b/dev-java/gnu-hylafax/Manifest
new file mode 100644
index 000000000000..8dfb434e87c6
--- /dev/null
+++ b/dev-java/gnu-hylafax/Manifest
@@ -0,0 +1,6 @@
+AUX gnu-hylafax-1.0.3-ClientPool.patch 1940 SHA256 898e5fb098f7d5931ee3bdcfdb30a209af94a5b79e701e7349e190f5e609ce0c SHA512 3c38ad5ea49b7db4870ed5e5e0742499e540481402d685d3d33f3650b33a6f900dc97a6d253fad5b22c1778c080e613b89671a2cf0a2257a9eaef921414e8597 WHIRLPOOL 36af3ec2685f6173636377158036d046108611544f9782624750d39a3cc651885c425ee1267ecb7bc2ee6f34ec51d963f28b958c09162f9dd56c4876ac5b09db
+DIST gnu-hylafax-1.0.3-bin.tar.gz 1742697 SHA256 1e35853af20d74e1c3acbc460ef7fb04f76fc52be11ff0b560abe14b3c4f0a61 SHA512 7af66dac5a1b98eddc3d60aa439809f4e683a39a795ca50d0f99f92d4fb17704ab5c7528218be1f4698bca0749efd46c5ec3510e8a10a68b1b77faf1997dc4a2 WHIRLPOOL 2081d2238ca8ec5709ce7520547370b6a8431e33e33fb318612eb43cced6edfb1fc02836cca4bfc1d7c3edc24a3ea63bc53ac34cd573da436f10031c7f7b1ccf
+EBUILD gnu-hylafax-1.0.3-r2.ebuild 1050 SHA256 412f1cac5501769e8e58efc27f9db2769ad1c777d8a08edde21dffe82bfa0fb4 SHA512 30f77fbb4e5b22fd18992143d01ce5c84239105bd82f5f0c0b0ce7ce9acc8db497a36188d39a6a17ee767daa4183592b145f54e6321baa2b54e62e015b414203 WHIRLPOOL 87de7e8e440baab09949221158201b2d04773147c136a5ee8423ceb08445847f13389d0fcf3ccf294eaacfbf44756fc532bf8fb95b36dc6002c74c059e60ccdc
+MISC ChangeLog 2490 SHA256 b3435155567b4b736d61f1edfa854a0f6e8c938b7afc89974b321adf32f406eb SHA512 d7a284f0f85d338d2eee5e97a9c9c80bd2e0521f8cdc976071dd0ef84e9301c6e4fefcd6a28e8828dba57213a7541b88435cbdf213dc8f122fc42e31110dac72 WHIRLPOOL b88659ff4b873f1f08da6a0cb27f708af6108b6c71bcfe8fb3d5f0bd20ef22eb7a033fe2fb4595f75fd8d70ab2ddea7308d75597e44bea4295dc2894d44674fb
+MISC ChangeLog-2015 1058 SHA256 57216acc1ef48f1aaf4f909394c3d42cfdf6bf9b9c2de137f11a3976b21823ab SHA512 f7ce1d66ae070370239e4c11a757dfc31cbcdbd2fe3162d6863e421bc3bf9ddaf1905919dd2a3f9427cce98bc3b6cd080a4032f7775b74797cbd8fe65d911ab1 WHIRLPOOL 8edfa519cc2f47ca3965013b13bc0b7772fecadbc95684a834fc23a28c540f627e2de3e1176b7ded83a7aebf5e5c8d7601e21e70d1c9f683547e9616d6390ef2
+MISC metadata.xml 317 SHA256 d665e6ecff9c3e9a4eb3c0714353ec426ca23e72638b356845668ab0bda92a08 SHA512 f5e653f1ec56bcd9824f63d24fe9af1cae1ed854a5650ac458912cca536c8f98a64dc40f6563bf0e328020281a65049a52a58bb6b411828e1e23745161c765c4 WHIRLPOOL 1b6ad7478aae020421e56f514976e2c7bda2483778128e961a0996e28bc0ee2c41840620ded385307153ce0216c8541f47f1ca436ed24f6d3179a2f4c7ad87d6
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/Manifest b/dev-java/gnu-jaf/Manifest
new file mode 100644
index 000000000000..60d6463bda14
--- /dev/null
+++ b/dev-java/gnu-jaf/Manifest
@@ -0,0 +1,5 @@
+DIST activation-1.1.1.tar.gz 157018 SHA256 b1b5ef560d30fcb11fbf537246857d14110ce4eb2b200d4c54690472305d87b7 SHA512 d323644df13a4572bf1c10e7175c1c4cfa3078483886bba7b308989c215a23e12939b054124dbaf0437a4c5fdcb551b4e2189c09afc078218963389e4b3c3b7d WHIRLPOOL 28e6390302476710fba3fac5c2df43790b05de72dcecd3640e82829ef8139621871ea70dcced279ffb8ccd6f7a11ae5f5fe64af9c5e5bc29da603e62474790f9
+EBUILD gnu-jaf-1.1.1.ebuild 733 SHA256 44c26797432584929ef578e104787bb25d7d2fec563e0a224f4808d10d6bed2f SHA512 738902424f31c47f08f732c41c6db4ef2cda1bf61f27536f9970e9b9ddcf7dcc65d2f648c0636884b5d77e1b15827963d9ca87c15820e5de40a5fe36d29c9a21 WHIRLPOOL 4cbbf13dc5ddc971c0b256fc0fb49d5d0339741687f0e24f0a3a9a1cfc58a12605f744244526d333198aa247cdc9fc42fa88e3e91d167ccf44276f9888311e82
+MISC ChangeLog 2719 SHA256 115d33ae18f3e97669fb2fccaedfb86e2a07860a2755cc2f44a87db44086bfb0 SHA512 9410a5e79a7a25e606894f9d3737ee5e466382f103a188e0a0e00ad083aef337d48ed626ad736c2b25abe00407172d47db29163b82c766adcd905fd4d5e05541 WHIRLPOOL 0a9094e6a51ea3133a6af35cfe2b225fc456861ec188d896d88b4de3d859ed112fe249b31ec75009873104a912f665ee2a653a785be128f128b29b70c7586020
+MISC ChangeLog-2015 3334 SHA256 4290e583e18f783f407e0813b500a830af47542f0294925b04644311e145603e SHA512 ec2a66174a055ed7f8eb8d5d49d7dce1ec7c7c5fb49c435a52660a5cab607d143216e3e060454b59791fd34e0a3ed1e476d83eb7ac68ecc6c0c719b292390d06 WHIRLPOOL 4cb2d62ef72eaaab2b90bbfec0ac1a1b119c40bd6abe4f5b128d84bb4223d218356c9e41807b44d1f192f6abae4569634299e74fc4d7aea840ec7f812ff271a3
+MISC metadata.xml 1072 SHA256 3f81089841eadcbe38376c7852ee8ad45b6982638a70a45745850938331e0ff0 SHA512 8116cd7f57a163402e1abef43f1abdef212914adda64de9a93585134bb232ad5ac0862f73a5422fa330d761d0c0429511a837ef8ae6b10a203b9de3302b830f3 WHIRLPOOL 44d40bfe06f335eeea1947e92fa4b3b03cc1397ce75863eb49e1ac9630224255bc7376f750ef5ae1f8b051bdb2a036661c1539a13a25c6ddad4b449a9b3c893e
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..95dacd78c581
--- /dev/null
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd"
+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/Manifest b/dev-java/gnu-regexp/Manifest
new file mode 100644
index 000000000000..5f9353b3dec7
--- /dev/null
+++ b/dev-java/gnu-regexp/Manifest
@@ -0,0 +1,5 @@
+DIST gnu-regexp-1.1.4.tar.gz 164741 SHA256 493d9cbcb2cc08580be255f21543f3fe638a1eb93f605180583c91e1c5622080 SHA512 4397ecd2a485f67213ee74e1c942a1bfd1af5f261f964546cb3c7bc32fe88702a557d717f07d2a4d7d1db2d684ddc4191c120b35b44d1a68a126f7b81d8b0331 WHIRLPOOL 38b14b8dff8d214280f35893ad0c16ec6e8ec74e7ecd6d1d5df44bb3b88ef557589cf0d7011730bfd3fa40cb1c2861dc6655b73910aee4fc976a87da8e0e8de6
+EBUILD gnu-regexp-1.1.4-r3.ebuild 905 SHA256 eea7d770ae6ac31e63f497aa87ff5ac26a3f865663af40bf2228658c95a6eef7 SHA512 93dde1881d75ff11a55c0538eca46cccd0dc12ee02efe475d620e3fcf46d1a6a637a241c8a12859f631bf6f2436b4f5f586bbffb590e82f10d7c4879748550d2 WHIRLPOOL 3cbec287d4101dbe0f5f375efd99e60134333127b9fe3258d0c8ffc25c5af394dccf3e6ec61c2e94e1ba945cf4d7eaaa359a4337ebeaeaebedf755c8665f1e7a
+MISC ChangeLog 3419 SHA256 cc8ee34647360d1e715eb1531b91f24cc8c504c8e50dd668eb92cb76ed86eeb3 SHA512 4b090152afad1ea861a1a86308c8fa3fff76b4c5151d14a882d49b82a7e10c41e402f93f25b64e5364be2369d157096c1cba4edd25646d252b828d076f6b58f7 WHIRLPOOL 02ae4e993a4520ce4ef49410175551b283e612be7bfc4ef5150272949c2f4b9b3ba8aff34cefb268ed6bcd95af349f3f577f74882ddefa33472e4ee309451814
+MISC ChangeLog-2015 3630 SHA256 f1b0252173ab5ef744c5238d31991781e117bd7f1869d0598347b9c516b38f47 SHA512 c2b193e039f49b5c13a18545d7d3b577ff63726b74b4d66ceda1fe954c447365522c32ee4054ca7596edf4bc51bf3ce0b7ec0800274300955af7f3a476fb4060 WHIRLPOOL c9a327338459f30af13addcd515067852468eecc7e74b18564808aaef7966c90949973fe5bebb888d699b6723cd3dd97369b874a6b33c75983f4e12835c9f855
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..cda896e1be02
--- /dev/null
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.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_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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/gradle-bin/Manifest
new file mode 100644
index 000000000000..71f9d5485324
--- /dev/null
+++ b/dev-java/gradle-bin/Manifest
@@ -0,0 +1,5 @@
+DIST gradle-3.3-all.zip 91388147 SHA256 71a787faed83c4ef21e8464cc8452b941b5fcd575043aa29d39d15d879be89f7 SHA512 4b852eaf4030c780516fe9214c289e49fc93fc62672da70b7fd6bbbcd128e6912dd196195ce32570984503ea53b48593a41fbf4ec69b0f18b5e32c2fe9e556b3 WHIRLPOOL d2058d046137b507aecae0ac8ebdc719dc1e1c253162be1975ff9daaca04178398b7621c142ed467a8608bf99d952c1046306aeb3b96626bf70899d7213ba91b
+DIST gradle-3.4.1-all.zip 91604607 SHA256 ed7e9c8bb41bd10d4c9339c95b2f8b122f5bf13188bd90504a26e0f00b123b0d SHA512 bdaabf747e60ae1cf2c9fedb0730a2e3deb914609db05ffc7e4cbd5402bc44e84d2c98154f14fdd7f944c2f49eb5dead0f44c119ac5a16bd7491c3369d784f5c WHIRLPOOL b2796d07b6d7f290bde18f46b36348fa6079d42647775e1d6c448c5ebfbb16fc38954da7083f1ce15d2beb7677308e783e4610d4c841e5dbfb49bff620126b24
+EBUILD gradle-bin-3.3.ebuild 1012 SHA256 0c4c1d0b5ea20b92254c3f6bb04e71f204c97598336eb555183092214168c4e4 SHA512 a0a9d78d5fa7104f7a720ff7f8125d3b7b81fcfbc481f65c0a6e31fb97e7fcb50ec3b14c40e0262179a9f8175ff2726c2b051284662a7f4251e6f3babb5400f8 WHIRLPOOL 945c90188feb1daefe26019a996d949f61860e7aa171b8529923f59c0ce32c779afd754b57f026c3ed1a3b5a485b792bf8d62be8316ecd32e96b9373e62136b1
+EBUILD gradle-bin-3.4.1.ebuild 1020 SHA256 8dbd414ab2805f5fb18176a8b05e63eed4cae5fb95fc871bd6b4b7c2d6d811f3 SHA512 0df5a41dd5f941a4b8058125fbfaed550b900ded90767a5252a236af7477ff5939ce7cc77cd1e171c311305c88b7664a4fcd9d615e43376750d298292a138d9c WHIRLPOOL f480931d84d061ec43c2dd69e930ed505fca6c228b967d465bf83ba93a6ff762e907506a0ee13820d661760b4ddefc5f6a47db2c40de22df9134bad32481bfe9
+MISC metadata.xml 493 SHA256 247411d7932f7343e60de0b23e346bdcfe09abb2786e7562ca2b45021e9a7061 SHA512 f00054b4729cca37b67106baa8a92be953cbe5ec281332997ac1e1359eca16873d156d96061555b36e48228902b1d373a7d3caadd51b901cd89faa1b9571b5ec WHIRLPOOL 3928f1dcdb2c2c4489ffa0593f99c2aa5550be2ea71504f263985ef4db9b3304ccc306523be11f8b18b96b941a54e4f7dec9d214feca3570a258816939932ee4
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..6ba59b53805c
--- /dev/null
+++ b/dev-java/gradle-bin/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="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>flo@geekplace.eu</email>
+    <description>Maintainer, CC him on bugs</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
new file mode 100644
index 000000000000..26b9f26fd5ab
--- /dev/null
+++ b/dev-java/groovy/Manifest
@@ -0,0 +1,6 @@
+AUX groovy-2.4.5-utils.gradle.patch 4345 SHA256 9633b74cc151665c97d395e179cbb6d05dd9b2c7eb849ec1e85c3912a87c4051 SHA512 81d39c1f7b537260721740cc807b9ffcf16b86b170fbc2bd9697f30ed3d77e995cb8beb35d67476137246882ba6f2962051878f032fe173f56c4db1e370aa6c1 WHIRLPOOL 655f7e2fddbddceff9916533ee9ead6e91324dbcee7ecbf811ef87093ef146241acfbb9ac0a278c76568ba524bef5c04f1c4c15bba4e2d733a0f2475bd3f511d
+DIST groovy-2.4.5.zip 10214173 SHA256 6fbbe2c1e16bd1c56b889cbcadff04d055a96568883f885ed904265e4e9d8780 SHA512 055b664d2bc9966f9dd5933ec89f22c28c18323b57db66eeec524c88bdc6ea1090f6f1dd866433d7232d837ca31ca83164d8894c0db1d69e72c7d41f20a8382d WHIRLPOOL c05dcb4afddc9ad217bb99d6cc9618e6a67e7f13f52b99ecc155a9b8e97079dcd8f83402cad61acdbcca4141018965320b8194a84dbf6036f2daf699a2111149
+EBUILD groovy-2.4.5.ebuild 3508 SHA256 e77eafb7e31b03b81711188111c11a0344e3611ddc451a0f89de7e334fdb6e20 SHA512 2150e3f9ca4653e60188fa6dcebabbcc7e6f36564490940279be66d00e536de815c040192df963409943200a5322b045a34575e2227e71897b66c51f769ae1bb WHIRLPOOL 8d9c1534cdddb2bfd52c4b7e06fbe3edfc78ee7599b4a899006a16f2985e6f1a17a7894c4646c9e51006e739e099da32b7ab8f2b224ccd1c8a045b0b58432528
+MISC ChangeLog 5199 SHA256 177d3c66b11eaa087c164a522a3b81546eb289d4e7dd5113567a5cce05cc48d1 SHA512 92ef5e9f4a39a2ae34f06aeb09647c225e729d840d9ad2af9178eea85e37d34dc569280e6e9d7f0283f5ace26a56b522e9de5056568ae24bcb45def1f6d96219 WHIRLPOOL 90e642bbd5be989e2c4c85964ce031e579747ddd350f49ce1204f0f7961bd9dda6a0601925db1950be2a4bebfb022de32d78f37d6e657210bb0b2137b9dea4f2
+MISC ChangeLog-2015 8790 SHA256 16f12a02bbf3d5682172315c1119f12b35ff0aa0298ddbaf7f962771de0a74d9 SHA512 2c58fd4ae677d74b323325628622bf9f84b4429bec39e1c6093b6b235846b9767ce12d66266c1a4777e3521e44ea0b4604d350401e71524c7afd3c64138d31a9 WHIRLPOOL dfe8cba4a3d1ab8fc7af0f5b25a10d80ca570b826fee031f2862a19363ee88ce56ca675e7575051312db7d0635ae28a3efa0cd84b46d2bc3c62551c95f55aa40
+MISC metadata.xml 419 SHA256 c1e60d7b54d0f0d5fdbd8b0ad6740b30c1337c4280b30eac373e7c04703b456b SHA512 c1f92fe6cd6b5d539f8fe67d0143971ae9c1a228b7b8985fac6b4723482d2770e0b3d89d71b836b487995edb2c0326cc2ca8401bd94d3462c1ea76025150f762 WHIRLPOOL 04ec34d41fcec0584684f850e44cc239d531d4a10846bb6c29713c40282cb3ebefaad5a19b5c25c73beb2455e432e2420770010e3c209967b8b28fbb19b93de9
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/Manifest b/dev-java/gson/Manifest
new file mode 100644
index 000000000000..0674c90f26b7
--- /dev/null
+++ b/dev-java/gson/Manifest
@@ -0,0 +1,9 @@
+DIST gson-2.3.1-sources.jar 139924 SHA256 2f2bfe44fad034b526caeb600f3cfca056a143c6c9fbd239f5cbcae4e862b8fa SHA512 a0423c03358a1d843806bc9367b1a328c147973247abfa47b956ab0409ae9542199f6402feb93155761fe538e5d0a79a095b8dad3ccd203c5be81e88713469ba WHIRLPOOL 2f5372c63c43b2ca60a329a33b456db64c4baa1a57186b0e01bcbd3454391b1d79cf26614df66eda40dbc1fa29a4da570d5b575ddab135ae17d47f5de96aa3ff
+DIST gson-parent-2.6.2.tar.gz 434949 SHA256 b33ca70ee634a17e9b95651ea76cf5b0d9c1b5fb6e227a5a1d763513dcfd6d6d SHA512 e4288b60ffaa3773e8025eb8b80ce08f44a197ebdc0ae767e20ed7b514fbc553abd2eea6eea7f949c01f780632273bb55f08fe1947475797b2135e2046cafaf5 WHIRLPOOL 5f11df1b3dcea2fd77b2d6343b980d9bece31c8b8ab65b059508c496fabb80f79f2dcfb1095d1674e387168ec595c7312a210f91915f85b4c7864a59a65bdea3
+DIST gson-parent-2.7.tar.gz 437390 SHA256 19fe8fe3b6b59c2ffd78b2086c23c982d1e5b908f3c5b6a4bf980adc53296e2c SHA512 663365566234bff0a94eac6ad4cd6e772b8fd542af2cccba2c2f75081935247eebf1a2502d5ce5dd0a0e75e140e17a689880a3aa04fa7c47a1e7bc834edd415e WHIRLPOOL 564fa7070d88515583dbcd24d038bcf99660cb9eed5d9abf0aa1015696c766cc5b5f1ffa2222fe3e0eccd0812e9ad80bf63459cd60be2de89604dbf6612f5492
+EBUILD gson-2.3.1.ebuild 536 SHA256 3500f98229c04e46bf7f14eaad948d3887432c036f472e659fc910a6a822f107 SHA512 466b1580f80012d80b714b82e8ccff880a617bced82410f40c180f073b8f3f085844f7e20157d55df2db9088fd923a68aa9c5bea52044b439c85b4c8c02e5766 WHIRLPOOL 48e003e6519f1f0130c1d4a62444dd75414922218d7c29eeeeb3ef50ae073e7d2a33f220c7962ef6ea2743ad70713d0ab8a7a2c795a51bd1fa80648ee6f45af3
+EBUILD gson-2.6.2.ebuild 563 SHA256 15b2385034d45ee4d6c88860f10b55d847a4e16fc4cbdb01a7e00080dcbf9b39 SHA512 558bc49650b494ece65a8a2ca5b9b7ad0e1b1c3df2ce7b34e8707dd5449d55682e0de1b75ee563790ad3504b9b1ed24cbce0febc8be6076a28a0f042100923a8 WHIRLPOOL 5c8a894dc060d21d01c3b82740918fa19aa7739d41ad8b1f482b237b0b517dc8f4a08180ae22fcb2d796f1223319a7cb0c94cbf83e3e77a73a62d5aa3cb0f32f
+EBUILD gson-2.7.ebuild 563 SHA256 b48baf98add75279b79a00bc8c281ed492a5370d60392915653b8d536c0a8677 SHA512 f51da2521726272f18ba30950a39261826a2aaeceaee8dadbc3fe0e0ddf146c87cb274909f1a8feb22e7abfa65348e4f3090739b559bc7162275db37aa009161 WHIRLPOOL d306107cd817ec9883b70309efc2330e6ad68796dff87d7e9c6df641d4f533cee0bbb0d8918864b3009600c81df38efa4d432f066ae4d42fc74e2063f2dd5498
+MISC ChangeLog 3366 SHA256 f1f139b7708ace8cb7827f9e64b410f476467a3eff1ef64cf3f5d9fa03bb1371 SHA512 10e4c691cd70e2de41818e5cfeca0f6cf4b55e0c490a3d540b506de1aae6715468a6903d5ad8456df0eaa1416e37dee832a9db33556a480b42d82fd26f2bdc0e WHIRLPOOL d33eb4685a525c9f853a904a15a4be692061cf54f82aa83f399c828a9f7cfdd280cc7bd8c76fad36514e040f1d252dc02da36fdf3aa700239ce4b37248103655
+MISC ChangeLog-2015 342 SHA256 185dbe7fff1e3b0323d106d0787b26733ecd811161555482c31d935ac9199211 SHA512 1b9434e49758daa1afb3ac287ab4a48b67cc24a9ac4ab87b15395b684c8562959e23349c3c02ef64a0829aaf42c7343edb2653c22255360b64261b02d926bb99 WHIRLPOOL ef20b0f04cba2414363ce9f6730dcc62adfdfbc5fc2a1e690093047b0a27ec4bfd7a08b32c02aa81220dc02ac162dfe19f160e4257d0f13ad3b42e7037721a4c
+MISC metadata.xml 629 SHA256 0aa8e27b0649cb23144064f5d7922a03f65b1e85b69896214f006ed849d880c2 SHA512 66089434169cfb86acf2e024d61e4cbe90022350223111589d72de9301a6dfc2f3a66596e2e9e4ec4e91ec70932b3aa9ac0fb130f6c1a7ed47efd2e6b81fef76 WHIRLPOOL 26ef387b5c42bf6dea612b140be4f02648abca4af915b7d5fce7741b642b6c9ea308deb39ca7680d6d0e37a91a6335a5389415ad8bb36c0d9ab62c72886bf70f
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/Manifest b/dev-java/guava/Manifest
new file mode 100644
index 000000000000..b06077bccd55
--- /dev/null
+++ b/dev-java/guava/Manifest
@@ -0,0 +1,12 @@
+DIST guava-13.0.1-sources.jar 1060992 SHA256 6968729f41bd225c00ce6c9212674fe5fa64346ca267072860253c87156507d3 SHA512 07b29cf199229e82a6ec42aad4a6f700c4230ae4b3d41d64f46786619884d572b71dace9f2b521b5f0a50359b460ae6f123dafc80bc982b04856a0dd3a9a0663 WHIRLPOOL dc1a1b978b57d8a36747d03ef88778cb9f4060313c7377c5188948cf4d58cae7e9cb0b304e7a449730955235f1f744a8d4b96b82f0844eb37857824f920faad7
+DIST guava-14.0.1-sources.jar 1170076 SHA256 a41f35daf37667524bf76c33f8d14ff2a2bb8bfb38e876327628f62f7592e53e SHA512 0a495da0fcc460308faa017b4754a3460eeff08cbfcbfa1cb976fccf3cf9a0fb191e1b88a6c7a753b816b878dd4368f5ba27d5644bbe4c3132dc44e940a8372c WHIRLPOOL 7f2c1d694e54378b81046c0162b1bcc68951d2e37601fbf44d517b6205a3fb42ac0b107f504d533230595d7f7c9c3228294a3f1ccf07b1da7d0d1b10616969ec
+DIST guava-18.0-sources.jar 1277909 SHA256 0f3381ce4caa3a01602cdf0d0f4437b9ad8f347ddabbd873ded4d498e19d9590 SHA512 bd44aa71e183d27f6f79183a2e340ed9e28f9fc750b6de5aa007b296133fb8055ea2669a7e75a31f3394cba4cfc0be1123fc8bd87d9aa8df4847f2199b14f768 WHIRLPOOL 9ae2581667b52d05bebe6d59895fdeb482ee520e4820d448d1fb867b413d9bd248d9d1329334a548d96eb91fa574f9ddf3fd11fa7800fe5ae525356d6061f757
+DIST guava-20.0.tar.gz 2522092 SHA256 1a39f757ad6bada8b0c7affa2b97cd924ec8fdfaaf0ce982a42b8e93e4565acd SHA512 e89eee8e66502f208878af286c660393712b12fb37647ec70719ca7c5184686c8dc5fc59d45c1813d792ecad9421e2c077dab075f76b1907c04f9f6e80567ac9 WHIRLPOOL a7782d25b7e1e91383ab7f018dc2f84ccfd36f072e04110a96ce7c8da3cbc2f5ea447547043ad9c3986f6d1e197000817f110920e4f89551301e44aa4719e372
+EBUILD guava-13.0.1-r3.ebuild 729 SHA256 ec4e701e6d1af645a00f545f8a431fdee8e787ba478b8c618b2aab269fcdc536 SHA512 170451ca4795fb99664d7be55f0fe7c4edd71fb31b033a879234b8f714c3a5b6ea4aaa58d6984f8fcad6d1973aadb9b88d17d1efaaa2ec5e7a0e1ddc58a01d9a WHIRLPOOL 94f416bab0840fa01473f0b982a03761106a931be242eb3dde4df5e8eb1300997e1857083c469e8dab43339a1228c025ac54da79b5ba1143e886656ebd56875d
+EBUILD guava-13.0.1.ebuild 779 SHA256 5439288fb1b4524c325f905e80014e8d43a5e52f904ff00b8eabb3048e7c7168 SHA512 f09f0a4e647318899d22de224963ba96a94e36e01fbeb9765f93f181a7e31d32de692fae620276da2d8ca8fdaef4a924844bd81755af8115f0fac112f647982b WHIRLPOOL 754314b6c47a3d3e67dfd6cf940e67f4e0d24afca87293b26f300a29d85ac2bf10b78adc44b9550c3aa41ceaa595e167aa24b18d29cf1f95ce133722a6cabe26
+EBUILD guava-14.0.1.ebuild 808 SHA256 fbc166fca5b44e2fd369aa774165e0125d8ffbb5f60815036ad4845026974dc8 SHA512 fe71cfcb3e4baa7b2a2cc69b99f0ac70c033a0f1b7a3dc1d9bcc3f3fcac76c6e2e2578ad20d8d9e0998cd06eeb02abcee4a655e93b14ce0734a80279f8030cc1 WHIRLPOOL 5dedafd801e18e8c387d92f181d449914af4c578f8697f2ad29b1908383f2548f3311308a67a1431a2a3a8cfb40857b63aea3b5b9ea779c8b0532585ca3aac00
+EBUILD guava-18.0.ebuild 840 SHA256 7304c621ede55717261f0bc763540806ae5b44886203757efb2b31e97e4de4f6 SHA512 31436275f4b441231e6007be61d920eb4e015e1d3502b398468978221d2ca9ae18a28d44d8cc90549244cc8d09d8194359cceea4a744a4488e91ebedbd53deb9 WHIRLPOOL eb0cae7ed43b7f6e8154d3aee55b377d1efa4f2433f2059281f486217ca8adac5c8f152b415abfa6aac588297a1d2169635a0fc4266273fe1ff584b705a44e95
+EBUILD guava-20.0.ebuild 799 SHA256 dac7505b774425927ff5acb57cdaebe60b786c340827b777d3a32238bf3752b4 SHA512 cfcc6951ed61d81ebbd234cd5a0dbdd977fa55fedada69d92d10af95c3b1897f04f7dcb59cf72505f1693256a641174da3b0f9d73cfc26cdac3eb066f8fd5079 WHIRLPOOL 31905d5a61aeb3aa3d8b6d5485978d9e24547a6d84442b6882b6f72a15c8b6c6f59f1aa9ceaca6984da63b867d9480df21d51147ae9f14af0b26341540d78624
+MISC ChangeLog 5450 SHA256 1ab446876c75eab12f750d5344272ed538e4f991d04aa32c504670b3c0013252 SHA512 47a054c158e3791d2099138e30be9355b4a225e87f21b3e16b908383adb7950483b35c416d9c2591f5bd9303972f31090c5f22a043808b239177064da27caf38 WHIRLPOOL df74143fa8eaf08099be4d72af2d085f3c659d8b5aa57a7bacce3195f82f70852cee395bf4a353cbf96b4979f53b954b6e45339fac5c04c1128a3ae50a9f14fd
+MISC ChangeLog-2015 2483 SHA256 e25b6c6507a839e5d44591de05f289430ba2de04e57dcbd78c245271104340eb SHA512 c43a13348b226db8f290e015a5b91f5cd851abd56ff3c107a741370ea63901a1a74690f530ed9054199a2f4453de4443fe9a7bdd3aef0ab38b2747c6144d4767 WHIRLPOOL ceba4f8bc78f0cacaa9d4c9c80d182a4fa980b06dbcfb343757eba440992ce44f40b7497496128575caa5684ffc58799ee8bee7eb2220d5357f37501c58301cc
+MISC metadata.xml 588 SHA256 3ef7d2f8ac2e94870e434e1144bb8dd8868b14dabe9da213ddda9a413bbcc2ca SHA512 8fc32c9a79d61e36376e681775094fbe99a378ac43cf7788fd132e2a9400b94b419480e509f55941857f92e99d68b9112889077823da24fa15c8cf0d2531a26d WHIRLPOOL e5d875647576aae32f9aa7ceeb012fae35c48b6fd330865f1301c1b448f3ac39ea3d41e1093900e5e31954c717d9db7f9ab79c2e7b5d2ef247ee8829e834c3bc
diff --git a/dev-java/guava/guava-13.0.1-r3.ebuild b/dev-java/guava/guava-13.0.1-r3.ebuild
new file mode 100644
index 000000000000..66e57d8d1273
--- /dev/null
+++ b/dev-java/guava/guava-13.0.1-r3.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="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://code.google.com/p/guava-libraries/"
+SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="13"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/jsr305:0
+	java-virtuals/jdk-with-com-sun:0"
+RDEPEND="${CDEPEND}
+	virtual/jre:1.7"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	virtual/jdk:1.7" # https://github.com/google/guava/issues/1738
+JAVA_GENTOO_CLASSPATH="jsr305"
diff --git a/dev-java/guava/guava-13.0.1.ebuild b/dev-java/guava/guava-13.0.1.ebuild
new file mode 100644
index 000000000000..d032b30d4330
--- /dev/null
+++ b/dev-java/guava/guava-13.0.1.ebuild
@@ -0,0 +1,26 @@
+# 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 collection of Google's core Java libraries"
+HOMEPAGE="https://code.google.com/p/guava-libraries/"
+SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="13"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+COMMON_DEP="
+	dev-java/jsr305:0
+	java-virtuals/jdk-with-com-sun:0"
+RDEPEND="${COMMON_DEP}
+	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
+DEPEND="${COMMON_DEP}
+	app-arch/unzip
+	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635
+
+JAVA_GENTOO_CLASSPATH="jsr305"
diff --git a/dev-java/guava/guava-14.0.1.ebuild b/dev-java/guava/guava-14.0.1.ebuild
new file mode 100644
index 000000000000..d7145907baa9
--- /dev/null
+++ b/dev-java/guava/guava-14.0.1.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-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://code.google.com/p/guava-libraries/"
+SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="14"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/javax-inject:0
+	dev-java/jsr305:0
+	java-virtuals/jdk-with-com-sun:0"
+RDEPEND="${CDEPEND}
+	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635
+
+JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"
diff --git a/dev-java/guava/guava-18.0.ebuild b/dev-java/guava/guava-18.0.ebuild
new file mode 100644
index 000000000000..7fe1f860d83d
--- /dev/null
+++ b/dev-java/guava/guava-18.0.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 collection of Google's core Java libraries"
+HOMEPAGE="https://code.google.com/p/guava-libraries/ https://github.com/google/guava"
+SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="18"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/javax-inject:0
+	dev-java/jsr305:0
+	java-virtuals/jdk-with-com-sun:0"
+RDEPEND="${CDEPEND}
+	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635
+
+JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"
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/Manifest b/dev-java/guice/Manifest
new file mode 100644
index 000000000000..35e17a5b6370
--- /dev/null
+++ b/dev-java/guice/Manifest
@@ -0,0 +1,5 @@
+DIST guice-4.1.tar.gz 23212767 SHA256 77650231a0b12c0f0551202ae4dcfc1a4364e090f461cc3d21616d45bfc49537 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00 WHIRLPOOL 9566d12d7cc001f7ddc0b3b972d06664f246a44d0dc0c2c02435f544417781c2f3cb7cce0fc21846297736f79ed59011aaaf2d2b65b08220c3d45acfdba8c76b
+EBUILD guice-4.1.ebuild 1126 SHA256 b51714ab54d76b2549d48ef942db5ec60bb3756ff0b3903ff6fa954e0e43b04e SHA512 141d82a11d83dcca1913e2d573b0de7f9ce0f59e400637e282ef2e5aba39254cb52d20434a959d635730be23735bbb3606c0649d446dd849e5583bd533608bc5 WHIRLPOOL 8eb1302d9c0db24c01da05c43f64b3a61dd120a439a54eb8a77152fc6804545967d142d161d94a0f1c2af60d8e7c21050e6eadb76d5e7c9ee4d09361da7a9d0e
+MISC ChangeLog 4225 SHA256 1ad1b0702a6f338b2abaa85da1902e6f2b9dccb6836359e2c4a36dcdbcf89e86 SHA512 c08fd4b3dd45b5be218ea788dd3815c3af35d4ba781cd0bad16b10b371c33902c81ba23a3e73c39b16f5c9f1601b0a8f124cfcaa58e3177ad43eba348220b943 WHIRLPOOL 85b39977babc6344224aaf0016b07fc9a3bfa247ce6f62b9ddd1c48c881477b9ce5d123c99257830a0be1e0b71ef00f31790ef1a3cffd74828265ab64fb415f1
+MISC ChangeLog-2015 1468 SHA256 faec21058d38136b1b400dc97aad91738a76bf4d9ff3148d6357f11b5fe955bf SHA512 aa3d920c4a5e0b38baa5b50332f9022976f7e55505fbfb2147412684aaed5f528b669c605fb0ef95154790fbf3da12bd988799b23a83b555bebe19096a935172 WHIRLPOOL 2d540f99db190942f3e45915350b61244c184af919479c08404607ccad0727ed30d8ccd4df2c8856e74742f482b98f603612c513a7ec0c4b36074f4e068aaf5a
+MISC metadata.xml 370 SHA256 f07a31d5bdbc143be148b16af9b75bccc0e293b10975f506da2a0c51b29e5b72 SHA512 609b5eac7886689f76a4ceb3dde48858b270bd66ba3c37129069194875a4f967134b46be02236a3103f159e1a2d591b18aac94351415b9611b25e4730cbb6332 WHIRLPOOL a9d26eec94e8926cfb4215e8fdaac147f19ba7ad3def53f8e6a2d0cad7c6fca51eb104489b089c42d16104454f21406476ca9831c0816155ff8bc69c2955234e
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/Manifest b/dev-java/hamcrest-core/Manifest
new file mode 100644
index 000000000000..fcb2fadcda30
--- /dev/null
+++ b/dev-java/hamcrest-core/Manifest
@@ -0,0 +1,9 @@
+AUX hamcrest-1.3-empty_generator.patch 1227 SHA256 ceda6816ac536c2c24402098a7308cede442d842e3b3bf1c2ef9ef1b33e7a24b SHA512 766f57a449d4535432ab192c40a37ff9a09fe760b06ce5beb6a68b2b804c77ce232e8003fb3f3ef7b71df1cd2ceae7ff13fd3de28d20ec0ced1274c912d414b5 WHIRLPOOL 866ec50119d39aec33eb028972654aea4d39ea4b892f89a9c391ce90c290261b094d890e78cb61b6d6771b73b5e8c521abae79d7e0faa9371c8d1697db34eead
+AUX hamcrest-core-1.3-fix_javadoc.patch 3036 SHA256 b1b8118d90ae9470067cbf9c248d69b390ad4d90952d1438444b31223a4cfba9 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3 WHIRLPOOL cf2290d474ca6382421cda70186fbc2fc34f27f11bef40242cf77096bccb6b4529367f33175e742ca4e5772d08c332c32ffb98a735c323c9196309e5f4ad0546
+DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
+DIST hamcrest-core-1.1.zip 1344232 SHA256 6263752f2f2174925711b486bb2f879af5a5b0495c15b554ba9fd46327e2b023 SHA512 af8d5d3a82df70a446f79f7247252595368820b0b54d8f612aa5b9bb3166c4664b97aaae338278f8f5d84add2d58d9c7a764e5e03a93588d3eba4472eaaa712b WHIRLPOOL d69463fd2b598dc9a0fcc9a29a9098c45eaae6164337f362c763fc5a588c08e17962101b9f2c6ea54a9f16f69b40d99d09c835d1f015e95d28cca48f14226f64
+EBUILD hamcrest-core-1.1-r1.ebuild 748 SHA256 78497178fa47396cde70e07ef431087e27dd78e8d2f098cf862ccef76de16a9f SHA512 24c4c82ceb15beec3c2838041683f0dc07ddf9426b13d04a7f4095b415d33923fd625174c6fc663d5cd63c4cd29d10e0beb993478d4e5c9d839620cf80c95149 WHIRLPOOL 680e66e358e2a75b3984cb420602cebd028f00e96a0fc8b6e6fe78bce878c1c1b2624be4059d88047b452267e5cc2627d55c1613235d878d50356f3a2754fed1
+EBUILD hamcrest-core-1.3.ebuild 1533 SHA256 2962197656c91020ba84723efd8fcd4f1c9f119b071e6f17a4ed20fc5290547b SHA512 e3d9ac4995d55578da658437fefe7cb73c5b78c2cf4185ebb61f4a7d5fca199d9dcf6aff8950026809ec96831f061647a36120439103f5e14dd102416916c7f8 WHIRLPOOL 7a8f3b38d9f7a5c48287371b025bf3095160fda45fe82c006bf93efe9c1adb2bcfa4939fe2717fa360e29c2115ecbcc71766601c98a6326dff6361a2131eca89
+MISC ChangeLog 4151 SHA256 8ffe9aa09691f7aa089b3ac3860ae2b188bf766ccd31bb1e0032726452e22d27 SHA512 99f3af07ea08e920bf2294f99029ecb8af2da4c09c8277b386d4be2a621333412675c81c949a5882b213d11df29e58eb7eb3f65a6ec8648b36224ac8d1e319ff WHIRLPOOL 5a6f105ba3f888a621b80699e6c0df7be569b386d93215f7c71a0110e1a845af73a889cce23e060cb9eb2d081bbf083d9d79b8aa0e0a785ed7a0705396409e67
+MISC ChangeLog-2015 3555 SHA256 dae96de408d6d208b20171285dcdec46453227abc7e28206e8ed251ece1b005c SHA512 4020c953f47518cf3374b18da7382b8dc793bf6c4a91ebb0f5a6da2c095979292e67ff779eea45846ba0f92aeb1e60e84b6b468dc17f78ce115e55ab9f549ccd WHIRLPOOL be26717e779878edd3e6b94722b254e20281b28f123d03340bc51e824d286baad90400e11884ddddb4d4018d33cbfcc8a12a27664afb78b3c96d97233c8ebb65
+MISC metadata.xml 363 SHA256 3e29835411839d59920ca674e4dc0b078cf746bc44274b2ab65061616d99a4e0 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8 WHIRLPOOL 91fcbaafe8ca341c210864386815b1c0efa9dd002d04f95b41698085415e9b6f3673d728806d2c6f19e411307cececd1662fa960e61c646e8f3980df12ca39b3
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..df930ee1e323
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r1.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
+
+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-fbsd ~x86-fbsd ~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..7d20822cae53
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3.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-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 ~amd64-fbsd ~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/Manifest b/dev-java/hamcrest-generator/Manifest
new file mode 100644
index 000000000000..24546b6cb4ab
--- /dev/null
+++ b/dev-java/hamcrest-generator/Manifest
@@ -0,0 +1,9 @@
+AUX 1.1-build.xml.patch 4213 SHA256 502dfc4ec61895dbe63b6d629880b7298f0f9d745ffb706710d019f70b63c873 SHA512 a4b9bcf15588f41ba39ca5f2d9ab70ee1a19eb295904b4da96f3bf66ad83ca14b38f0866de6689e8f1a2cca0530c90301e2ec7d7a172e880f51be34251a3b18a WHIRLPOOL f10871319cc957a95fc8759ecc89c22e8f721cea7c2cf366b7212cbc1c23c2110a81d73c01a76f92111ec251dd9316fc28ae4896908daf2331aed0183d61241d
+AUX hamcrest-generator-1.3-no_jarjar.patch 982 SHA256 051f59732a3fcf28c6fad3e6fec025446d29e28d890c7145963b072777281146 SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f WHIRLPOOL c0bd0ac82c66cb061e3be7490d6942d4336c6864f39b8fd8c2ae01d38166e272195e50faf56c7b30a9a6974839db8405c2e3638aacf6fd91700d3d2c99fe4d1c
+DIST hamcrest-1.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011
+DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
+EBUILD hamcrest-generator-1.1.ebuild 1286 SHA256 8842773b5d4624af5c9953db72da0180997e51cfa4bcd30b238c384fb6224820 SHA512 17c7380ca8472ec64ee48d91c8e2c19f8d5fd6041138810409a6f1e274eb95c26ef1f641a43c3c0a24d210d1b2545a04a5540bcd627f24bb476180cef9cbf668 WHIRLPOOL 9d8efb3cc0d665634297c12932ecf5c21799968dcf54d66a5d3c0c0c02001236062dcf5ad0a444e5e13b6e1b227b9b93e6464a2bc270edefc99879436815e054
+EBUILD hamcrest-generator-1.3-r1.ebuild 1351 SHA256 1fad81821b6d7d66db98689d132c469f887312a1a165eb34819f753515499443 SHA512 84fda25410bd08f2b8935255ddf2f634e5dba413861d2d2ccab73a0e1755f5ed0fb325ab691c3ad1d2e60e4676c297fe5954fc364349e02d8dd6211eed3fe3d6 WHIRLPOOL 37a0adf478ebf525552b6796df3fbadc321c6ed06a287035e38c4dc3ddc1390c47699a796d4c1c74283ada56224e85a6991843c555fd6a10b409fa17b7fd0f09
+MISC ChangeLog 3701 SHA256 7119b67855ef5c6d1d39e82ae64ebd20c3756b22feef507f5e1226f6741da26e SHA512 1e5d0f3856249ec68f232619532dcbe68b6c51f60b6ada129a4b05c4bfff29600bccf906b6a8c722bfbf957da168a5c46fad9b3457062f50b03cd76df7b38333 WHIRLPOOL fe61128d75b736dce4c57f843b2e102507f8eb8f7d6a0b18a51244c10142f7fce1d3c32059a8df8d856a70a2a7b7e58fd4f3532adb3d58b25ed3c24df012824e
+MISC ChangeLog-2015 2290 SHA256 728e3dbf1a89ec64c39d9fd54985b3d017ccfb853b673d641e465e0483d9c1d3 SHA512 b370dec3472e98eb19d757a8f8a8fb1be304c2743533a947219f506a95d6ff57355ff29355013cc88dec3f844e29fa14ddca36b32d4ab29a0942ae4b0eea86b4 WHIRLPOOL f3390652e7c8a14e70665cce0eb144624604170f5a8e14792b8351d37843ebdf76178f9d6f6ec48baaa84c6c228ab2bc1334947c4c04b2af58975f99484de41c
+MISC metadata.xml 363 SHA256 3e29835411839d59920ca674e4dc0b078cf746bc44274b2ab65061616d99a4e0 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8 WHIRLPOOL 91fcbaafe8ca341c210864386815b1c0efa9dd002d04f95b41698085415e9b6f3673d728806d2c6f19e411307cececd1662fa960e61c646e8f3980df12ca39b3
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..e84582193d26
--- /dev/null
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.1.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
+
+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 ~amd64-fbsd"
+
+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..73203f8e5619
--- /dev/null
+++ b/dev-java/hamcrest-generator/hamcrest-generator-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 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 ~amd64-fbsd ~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/Manifest b/dev-java/hamcrest-integration/Manifest
new file mode 100644
index 000000000000..61f811f3254a
--- /dev/null
+++ b/dev-java/hamcrest-integration/Manifest
@@ -0,0 +1,6 @@
+AUX 1.3-remove-targets.patch 3721 SHA256 b998aeaf914535d01802981fa7c7b0b94277c89dfeb5e22c83f677b156083ff9 SHA512 1af75ef60b6a6ac6a24d4725c548b34493968fd67d93c192867d9da6fa79c26a25ee68f1b2987008160100052d22aca5fde9440133566a55d630b241579f2463 WHIRLPOOL 30a4226f0edb0bdc5b184345c19db4cd37ce57aa25eb0b1b6e18e83d0f023ca64c62ecdd8887c08d9848efef99a1b5694bbecdd96a63981736b867d9ecb07ed9
+DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
+EBUILD hamcrest-integration-1.3.ebuild 1289 SHA256 eafb1f0307fef00a5815023d977983d8673d7f49c733e19b532f1d7cdc1898fd SHA512 6c145ecf5215028ec16eb7605182f6ea257427d09e4350f55f8a33b98b5ad65e6db5d5239c3d217df4d2536fe90cb8d34380ce2d8a551d8e971bcf8b8f95ef7a WHIRLPOOL 7da9b62cc979ecff365f61a803ee1ce3c79d6c9174cc566a2d83e1bec822e1e4b01b078ad52a9ee946cf13f7a2cc2c04b7738523074141f04ed29c112233a8b4
+MISC ChangeLog 3406 SHA256 7faf4c89ff1b2534ce667082a66ee5b99b5f8cd842ab36c5a347cb3095ced761 SHA512 4f05a6def9de1a8572e1d7494592bf7907d97ca1f87da65df92b5cc0cdbff31aebce5e9ba9017aeb9ac852a6c82c67f235ebdf46d10eb7c528eb141f5db8f744 WHIRLPOOL cdb125a20cea9a14cd94fe2d6281c1826c51f4d10ed251c744787109295ba80d9230baead30ef15accbd730d6cc34de06a51fd99201fcd9dcd314eaf0bdc884b
+MISC ChangeLog-2015 1030 SHA256 22014b71c80139ed9c37042069b52aee00f565dbd19719605c107cc2bd0442a2 SHA512 bd7b3a2f057d5b72dc7ab377fd239877389f7fa6a006ed000a4d0400de50cd2835dde47a63f45ee928c056a4ddddb7bea9aa08fbd51cae14df498d104fae16c8 WHIRLPOOL 699c7330e9d9e5e9106fbd54dad10eb9c7f228373dbd194b08681dbb5a12a9607a55dbb27c4893a8ec38831492b5236a1207cd9886d412653451262e1e3ccdca
+MISC metadata.xml 310 SHA256 40a5944596db062a145437ba8202992f4d1c495d11a25f6ca2381172092afca7 SHA512 04a1836dd5ab9e764bdde86a1944830b3e272ecba3a6ae7ee84e8128edeff96b5936bf3a7dcd133171b97ab1feac4a2ff639951168d0937e7b76a6958e566cef WHIRLPOOL 04a904b7ef2c714ab03b7c55e00a5457fc01bc6d91d64dc7d8ae17461d154a567dc408092fd65f0a5e1b7b261be03b58340da7a1bf81fb2b2612eff55ae04d53
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/Manifest b/dev-java/hamcrest-library/Manifest
new file mode 100644
index 000000000000..ae7b8d7122de
--- /dev/null
+++ b/dev-java/hamcrest-library/Manifest
@@ -0,0 +1,6 @@
+AUX 1.3-remove-targets.patch 2263 SHA256 724757809ec22f8aab0d28fd087824080ecdd413691821e245347d1b9159728b SHA512 e403068cba91964dc7895c111a292a135ad27790da480c8779961075de559163052fa8ca5a997d3cfc278455ab3b8051bd3d4eb069f850dad2780a7ca974e551 WHIRLPOOL 8fa20fa573d29499c3c026edf3d834a98ef31725d01128fffa46caf7c23f6a14f487fb05e2691766fbd3c54fc45b5f866cb6b81321ee8fecf8b3699b731f9de8
+DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
+EBUILD hamcrest-library-1.3-r1.ebuild 1347 SHA256 f6837a09115b1c35a0c95af51225b169bf867c74e4c1764a5722e9db21cd90a6 SHA512 11d211cdf75a7643d4ef7f856ea9200a6f7a14b3fddccd8704fe75e0b2629e0f7700d75a9f36023ad5d74c4596e4f2a09b60893354faa10db48a21e85b9c2a71 WHIRLPOOL 20adfcb5f1e97a27374877dc2fcd5c69e27c5aee9b1a2f78ca65a4114aae2bc2781e55963a60f4143df23c1ff7e3f350c6d408d89c4bd5890382602c2a1a4a59
+MISC ChangeLog 3575 SHA256 9a7a146b4601d5824725c7210d1a47bbdc0f2f76eff4395391cac01ffb5533c1 SHA512 d96ce626c6b5bf735b7df9356b3248f73fcf23e2baacaf76c3757a9c97f00e230df672df2e107e64a8525cd9b867657f8ec54570e8f0099fc8c3a99a4d62c102 WHIRLPOOL 9bd1e48293e9c6d1db38934a73b0daf50a678b68d174208146ab3dbcaf1627ffdcc40033ca06c4b4fee4edda383373f35880241b9b03235fdbccdf2d3166d7c0
+MISC ChangeLog-2015 1485 SHA256 fda3dd7f8a7501006169b97f354d413ad41aed03edf3835524f3143fb4f0c8a9 SHA512 7617591d2febc8d5495975412f3a20b234df6924436b8f3c758a3b04136b642d40d4ad43d582573124119ffc49a23b6da0dd1aeee4aa598054680c688eb6db23 WHIRLPOOL 5f9132a74240f90063bfb479c6457b73b00125a724e11b605beee2473ec12102e530145f291ec7de509ba64d7e63e7d05e5e24851c3147c905dd28bb71ff57b0
+MISC metadata.xml 363 SHA256 3e29835411839d59920ca674e4dc0b078cf746bc44274b2ab65061616d99a4e0 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8 WHIRLPOOL 91fcbaafe8ca341c210864386815b1c0efa9dd002d04f95b41698085415e9b6f3673d728806d2c6f19e411307cececd1662fa960e61c646e8f3980df12ca39b3
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/Manifest b/dev-java/hawtjni-runtime/Manifest
new file mode 100644
index 000000000000..3b605b47a664
--- /dev/null
+++ b/dev-java/hawtjni-runtime/Manifest
@@ -0,0 +1,5 @@
+DIST hawtjni-project-1.10.tar.gz 1602839 SHA256 364c271819b7907e404dee939fc2a3f0f5ea860f2e81810d631f59467f006115 SHA512 3bd94d20bf2d8953c60753aa404077c96c93704c2bd5bebfb5fe790fc29e15d97f6172706f06cea13c4806b652405ccfef824cccf76ff018dafb7262ff845490 WHIRLPOOL 9d6a0fa421d5609d74c13ba39afc2bfd94174474557a0189a530a5c8e5bb9ab0fdf30199a2b3fd4b99c8a068a713357dc1223250182ab0b16fed61c4ee289d1e
+EBUILD hawtjni-runtime-1.10.ebuild 698 SHA256 04699dc629bb417842a5129ef39bf4ec9b6a6602f9f3672565a28dd8ca2771ba SHA512 c4a8179ea9c77c836118cd1f9d7340b689e840baf497dd23238ba4eb6baa2aa31f0ace2a08bfd9c05f8add8c2803c1c5a7622e0a9b86fee04eeab386376d3141 WHIRLPOOL f1d5ef8558c69f7eb70c660340776bccd79886eeb779b925bae0c1600e9bb12bd1b61d9d7ec2d646776c96c7505a151c339565cc7e23711b1458dae737fda6f5
+MISC ChangeLog 2797 SHA256 a48f70b37e4b2e936126785c7de414b0e3ad8252715e5ced369d9d1cdd6d337b SHA512 ed039c88c6d680634305d6ac2a70ace6b49b7b6f6f292aef692fe260a611100a14b4316124f90c7a0707b738a499e96a4764bfae5f43c42d426d99ff43a746ac WHIRLPOOL 6162506df1a42a5588e8e8c7dd4d0624ecd336c22000f5633042dccee9edc7a8535108ad491f4557e0af6dad05d9a8e2e26abc2f62d5a13ca5bd13c416ea60c4
+MISC ChangeLog-2015 1148 SHA256 84c49bdbca9210f58a0de45612f673190f4025eaf3d14f09d9b09dc3943ae3e3 SHA512 c891da99e71d34542dc3f1975761a8dc592d2d287c8b39ff900de7ee94479222b5c7ae0c43aef41ab79f9ac7b8193ff1e9e0a2bdf29ef8d3f7a57cbc87c9eff9 WHIRLPOOL c211414ca180cf06cb6bef1f3948979f8c513e88ccfa5f668d6f69a1c66120b86c2faca08390412cbae3d200e8f5ad21ffba8a81ef76a00a7c3be014b8ccfd7e
+MISC metadata.xml 329 SHA256 6df93a443985c507c5dd5e9df8296650b87b91d9c05a6a69805bbbcebfaff79d SHA512 20b714d09dfdd7430599b1d57d3a3831e86a22bbc3fb3b004dea2d0d9c6a230dcb74cbeeeb7301cf48493f0eb55ad736ab10cd247d329da4e4d02fa149566927 WHIRLPOOL 0da36a7d823f47c45819dc45475c6f6689c49e39582675d100efa6f7448c445b22e251489b60d7ba33fd09924ae2ed1cc91f6a94882de17fc2d8cf9d788d4818
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/Manifest b/dev-java/headius-options/Manifest
new file mode 100644
index 000000000000..ef4f92aff54a
--- /dev/null
+++ b/dev-java/headius-options/Manifest
@@ -0,0 +1,6 @@
+AUX headius-options-1.1-build.xml 9534 SHA256 59efd02d3b63af66fd9e6af98ba2af0b9ce0818b6fa71d714aca43721614470b SHA512 d0ddbef8e5b3cf77d9687e0ed704bea167d8ebe4cc849daf87f0f95a0088548dce21e1104f5aa93fb9049d53cd89327fc8824115d199f2c52886e2b8f854874c WHIRLPOOL ee770a042177b50a05119a0de3053fa3ccb3d8be38a61ec76879769a1de8a93b0af0b93161168b7a894b39e8760d221497c9e605e7057124574b1ee92cd25f17
+DIST headius-options-1.1.tar.gz 6590 SHA256 ada43b0f2b73a83fb09f5e09c8f50590357b8e2ea39f9f1d8bc030b7353ced3d SHA512 561be8ecf02e132436a94bf60595d66839c8e86f49c6a121f8714403fea6d22369f46dbfb15b7834a8430ac6aeaddf4e6aca5b0998c51e3b7ad71c60ac6c1bf4 WHIRLPOOL e82a084850c0c9037af4344ac0477e34ae869be8924342071e2cf76aa8edce2fc3fd4960c78e572b8dbc7aefd5871d686918b81ba5672c5d2deaf79c1193f291
+EBUILD headius-options-1.1.ebuild 993 SHA256 2de7e8aeb12ee1e5dac75056cdea5c4984fee2d0247c1dbb9dd40fd8d699a367 SHA512 e78f30288f1a034c6c04555f2eb3e1250f61068583fbee939bd3df8aa67851148a879a77351c89bf54c45df642d4439cc9711ec1fe495ccb6352ca0938595032 WHIRLPOOL aa7f59fe29064d5b02b129122b36193d5c98609ce312bab60b34b85f8cc736c7f673d83610a4b8cccb8dc998c58bbe78904bd065c0564015b43dd09d393ca010
+MISC ChangeLog 2487 SHA256 efbc3a99e8ef6ee404917df2507fd7e3d0f329e3a9fec5dfc6323cc97ec68eeb SHA512 282fa9fbcd613428833690c9328ee4d813ecc7e610eb952b4ae84250d7bdccad70713bf420c0b6fb5c018f07ccd848b52c4cf059f703e2236bfcad4deacee41b WHIRLPOOL 7a00633dd6d105a21ce9844a5ddb0dea52d44aacf5aa1eda7e2751a34b69dda87f2bde19d18844b2bb9885b7e2d662d6b1fe0a1e90240a9ad831b54b4c8cb8a9
+MISC ChangeLog-2015 638 SHA256 c9a780da5647a29116793ddfa0a5132ab1d7b293308d09b02bc2fb5718d2da0e SHA512 0302a5d999991042362686d551f074483bbddbee055747afd0800b73ab72daddc6ca5404a3e9f1701fb36db9b74cd097f3d67f04c065e993c910f4b2393b1e12 WHIRLPOOL 5562b22c2b6c347eaaa8f4a64a452b411099ced2e323cdac089ed4b819a15eb8bf9c5ced1d074baef27db3388831d94b91cb73e8f356550c3577380d88250c14
+MISC metadata.xml 326 SHA256 44c447dc58c31a8d66ba10e310c3a7c24fa0b564a94a6ff585f3f9d5f6415e94 SHA512 fcdd1c355309839001898fb85882291e093e5cd66429abdd8117ad74478e53df81039f952d89508f0e827bf57b5b14ed40cb7cdff5e0fa54f349afc2b8c34535 WHIRLPOOL e28f1a99bf6d6eeae6776a3845800533601fa4f8d12fa34b4a44bcfd318774d4c81e1fe7c7d3cbbc4a5ef5c63cc4be5252668826d9c05e1b5c03591af9af37a2
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/Manifest b/dev-java/helpgui/Manifest
new file mode 100644
index 000000000000..93f7cc9b6174
--- /dev/null
+++ b/dev-java/helpgui/Manifest
@@ -0,0 +1,5 @@
+DIST helpgui-1.1-src.jar 168356 SHA256 bed678f1fcfb46cb65785a3fe6b819c312458fc6bca976142c52a0e0896a8112 SHA512 feb76605c841210cd9bfa140d22985a090e72712fad08e23963fee3f6e28cb6c198583bde8eae5999e80ed5e351ed8aa30dc5cd7318bd1817a4ba351a1c99a77 WHIRLPOOL d8d396bfc4842bb1dd5bb618b911e5f4f88f75ab1463a13da3612091bdae6e8c31ca044f11d61d32f4f8bf15db066d10394a77718d3f9ebfbebc4dc6307cab95
+EBUILD helpgui-1.1-r2.ebuild 701 SHA256 82350eaa458d70c22a532fb705e8d6a751c464d720d62c80820c4a399f8edef5 SHA512 9ab2f72a599679fc60fa36de77e1f8b67f0273a8cff5392c5ebac13ee0551575ab888d0aeb38fb1f94103729039ae4ae9c06b6b25ae0ff38e4def3e8acaa5848 WHIRLPOOL 550f7653f8815a73979ecb3833f25af50e0c2a86828d1f5d5225163cf86c8ce3521d621a254647a64c58c9823e900d66029577069ffd5f55d83bb62e32431309
+MISC ChangeLog 2429 SHA256 435d9f06a1546dd032ddba507187b91e217a467dac2f7b741ffe39cdba7be775 SHA512 74b503c6bb594f6e5bd8930442401f8fd83b3a67a90c15edaa6ccf57354f034418cd0804a248951a331f873fc2c72282b83d424808ea5d83a6343ffce483fb33 WHIRLPOOL cb9765d113ecca8e391166647e722e55e997464545db7975acdac29d384b106c4d8d13de55653b2fc17730846c8cff28672e35a26ce2f6a60862258b603ede1e
+MISC ChangeLog-2015 1713 SHA256 3967ce2392192a3ed6d111fe2ce94f929296d0cf28bd9beaedd46ad27ef9ee61 SHA512 189ba8a44f4f4dec07c9667c147cd7b94616953e9552c20b3e6eeceda1c898a5ced4368ea3ccdfcb17f91af7fe64b779c3f9e5b76d1052b1db151aef5341f1bc WHIRLPOOL 60aca16aa053111fa643a731bc9766477f34ee7a0997bef069ecdacbe06820c7ec7eb80ca7f6c725e79af0fd18bc1d8193e801a507e9880fb7f9fbf9c7cf2d59
+MISC metadata.xml 313 SHA256 1296ef6bd5783b8a917915ac47bd5520ae01271057f4b4fe3b923062d8bf436b SHA512 c359d2269a1a5b9d1b9987366bbbfb678dfd4d35930b235b3e7463edbb9c90377c06ea23c3702f9d3978128b15b2efc7aa7f3a621ba464ca38e4f1a2f88407cf WHIRLPOOL b760a86e9ef59e2a2fe74bd99ee28af425c4389834a70a418991f72f329aa6f2e0b15baf4d6cda41b7b9d11fa3f98091540a69d1dbb4c6b8fa3cd6b30c3d8c2f
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/Manifest b/dev-java/hessian/Manifest
new file mode 100644
index 000000000000..ed0f2d7a3793
--- /dev/null
+++ b/dev-java/hessian/Manifest
@@ -0,0 +1,5 @@
+DIST hessian-4.0.37-src.jar 388678 SHA256 b0365ffcf2a91e5c724878c47882a1649d15db6b495592df491d759ba3c1c760 SHA512 9d03293b596d7e352591a61ad9d464b29502ba6f2f2f9b275b80bfc609aa882a3b7304cdca99ea70c0b011da8acd51ec62e9480e2854a34c7691976e83074aaa WHIRLPOOL a1e5213276a293f4cc219d3bef87b12652a4f18a95b55e19190e3c3070b029ac76ed4d69434b392f6616bfb2540aa85e9858165e510a5274670b136b1978cce0
+EBUILD hessian-4.0.37.ebuild 613 SHA256 cf5f7f889b49b4a1e3f5abeef44d245d789cd7fc4332990312d13ad6ab1fbcf2 SHA512 fe61f654149eb30642d8161b3f3a8ea1eb802c72842a9af52337faecd120f9d904ece2716b276d849b49c712d2ef8315b3c273ffbee7cd399d7bc78df991c6b7 WHIRLPOOL 0a64ada29235d1e1a3e3f7e740fbcc5c9fe367d6dc176f512efdce9739605cb17b10b0de7f42babe4ae14814e10a896ae9679532e039deb1d98d09ed74f778f5
+MISC ChangeLog 3501 SHA256 25cda78b05f62260d2127edd02dd9c44dc7e983e36568f60b64522119d586e8d SHA512 eb8a08ec6dea7ef0601700cd1d7f45b1a5218110a034b3c4e53cb3e6635e3876e3cdd6e2e11ba853fdd3d3eba0e4160419419d68c58b3e4f8b2e2a2b98784749 WHIRLPOOL 692ca2bc17aacd14a1bf38ed49492408e5978e66d7a39aca024de8a7cd1ac4217fbb11d5eedfff4a79c52ec2e3ab61d0fce2a57d7958f77f7d4fdf57ad8e6742
+MISC ChangeLog-2015 4434 SHA256 bf9f99c1d13630034cf834717910fa4940ceafb6df0ae456ccd8ee509bc640a4 SHA512 75e3954c286e37fbfd77ac5b896f1616410e7d7a806ed31b9539e845c62f5d2e5fdab1b54d3cf00aa1d6906bad0f5659831a1d49591038310f0bfd573dac8341 WHIRLPOOL 2a195d688b142b1ab622cbbb82db007857bf4635d2914ca0db26277ed4dd42bca7838e6eff4488571291f30110c28e1d813dfe9a966031da8b260c23fe6a99a6
+MISC metadata.xml 565 SHA256 b0101cd8e3feb4a4a3555059013eca395917a45ee5123f4c5af101563d0bdd3b SHA512 272b1fb9ae815fa54ba11ee31b40199822487954ad3e3ed77f227cd736301f9cf5545d551898b963df52f6d3606ac195d077b052e6e314e918a1a9ac2abf7615 WHIRLPOOL 49f643a6274777caa958adbbd76598cae2a30cb7696246250e6cd3f050620c806c73c7b4ea46912a3a40b923776b3a828d87ba32b67a01c0b7c7dd8320326914
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/Manifest b/dev-java/higlayout/Manifest
new file mode 100644
index 000000000000..961da86ccc44
--- /dev/null
+++ b/dev-java/higlayout/Manifest
@@ -0,0 +1,7 @@
+DIST HIGLayout1.0.zip 78855 SHA256 87464c9c889c7f5c94170ccb76ec088b1452897f670dab090ff3db06c3fed5e7 SHA512 13707cee5ba341b8f47bf97525fcecc5ad7d375f5f816f2b2ed6ed38ae398679e39dcf12e4cf135037b46ac94e7ccc17d34ad9c2671b6d4181e3e9cbc50cd58e WHIRLPOOL 52a781e6d65ea43a2b8f290c2e66be65e808442eeee50ad9c2f920737dc76ad92ca4adf64305c2b298b266f4d02d0c301e2737a20663411178f8076f7e102518
+DIST higlayout-1.0.zip 78855 SHA256 87464c9c889c7f5c94170ccb76ec088b1452897f670dab090ff3db06c3fed5e7 SHA512 13707cee5ba341b8f47bf97525fcecc5ad7d375f5f816f2b2ed6ed38ae398679e39dcf12e4cf135037b46ac94e7ccc17d34ad9c2671b6d4181e3e9cbc50cd58e WHIRLPOOL 52a781e6d65ea43a2b8f290c2e66be65e808442eeee50ad9c2f920737dc76ad92ca4adf64305c2b298b266f4d02d0c301e2737a20663411178f8076f7e102518
+EBUILD higlayout-1.0-r2.ebuild 789 SHA256 387e993a1536fbd964c2672b4fc0c18b789364cda12b7bc1a2dc141badf1b097 SHA512 385e04279a658d2a059d4c8574086cb5268e96228073717b8089fa2d644534172ee0c25c1ea0155448c078ef92e834a53e2111d07647f31d310f47de199ba10c WHIRLPOOL beebc2ffe3bd0ba20b8506e7ea3523301a8679ba570e4a8346579b5ae17dd50fe920fb79339c6dacca30e63e57251b212ee3fe34d73944989c51b4e9779e2398
+EBUILD higlayout-1.0-r3.ebuild 751 SHA256 a8c063ce9aa63bcb8193e47fef56a487db36df9b948cd39afbbbf9edbbd9a5dd SHA512 375a1fa95aa2ac538f1c877fc030d805afeee2c5d42f42b6926680cf2dcf732a9560ce5f83aad3c98de28ecbb43f7836c95a00ef8c0eb07b02b3e4e5ffba50be WHIRLPOOL 3b0631075fbd72dd49f464e077abfa970454f5c1abcb3d1a82827c65b9127956656174ea5fcf0f9d64e819dc5f7d7433a629e56c4c907329fb56c1623644b750
+MISC ChangeLog 2576 SHA256 5f3635d90375bcfc4af126984f1707ff787c605975294b6688ce2683ef4d6bc5 SHA512 72e2601e42a7ccc7fcf1876e151cad21b095e04269037a94175c33d668bcc33cd690dc10507bade754e44d52f57685aa44489dbb587e5680b7ea551e6bb33f4c WHIRLPOOL 6d0d645426b93a7e8017049d484f8acb6330bb172cf2ebf6ba7ea63a2e9d881cd65fadc47bd0e37a989b55da8c949ce3b12eca0a68b714d09c86fc7a4f745946
+MISC ChangeLog-2015 1420 SHA256 b4b01b8f8b8f6203128a14a096908bd8b618d9b6543b620665f5b5f256446d38 SHA512 5e0aba782e9ceb2c6a7e7280f1a734a85f28894920b54afc45d66bf82775bb01f8f3dd25c869a68e1c8e03c2af1af5b08ef5468c4d0c1aac0a7f16b5f3d42a18 WHIRLPOOL 3aa7ce1aa3d95ab7bc75d55aef4a053a5a064f63a3a253a99f0f3fcb96433df62812551135401d9144cca9d731bd3fab70cbed0d5dcdc4fd3e272883b9743799
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/hoteqn/Manifest
new file mode 100644
index 000000000000..a41e048fa942
--- /dev/null
+++ b/dev-java/hoteqn/Manifest
@@ -0,0 +1,5 @@
+DIST hoteqn-4.0.0.tar.bz2 98714 SHA256 a38d29c2d774a8c4b508635dfef4b17f34c48ca972ef13185dd318ff7d5051d8 SHA512 a0277340bec5ca0c5535d79e091218b88eb7d3c809859fc234de59b65d3b8b6c00fac667e00f3a2f6d0b3613f8a079bdfe7ea7e40a1bf484797a09a59de0323d WHIRLPOOL 617c2e4ded198e10981fb366fca8b2b9ad97aeb1a971651f48a247db80c90190faaf9d4b55fa750525a2190891cd2fc7c1d91fae292bd11c0b3e994ff71ea01e
+EBUILD hoteqn-4.0.0-r1.ebuild 744 SHA256 67274955e7915f89d0d52d4db328dcd59851ef6ad68b94ad948853a1a956a772 SHA512 e40ba28a2e2401ae7ce6160371883381b57070f5d61b12f24b5db5c32e0b62a2eacbb7bfe1f2f4807d7c2c3c163fab12f9fd0bef940ea371cf037e6698651488 WHIRLPOOL 8bcdbea658008f5444d96b7ec008c1702e685e686fd6b1e4f4771757fd7b3b59be4d5cd6d11d0bfa4913d3fd8c976d686b15efaa5043a33ee63e3ce44a2b8c23
+MISC ChangeLog 3093 SHA256 d54bb18598144a40daf0debce17d504d055d460a6fcb2b864730fc675e12711a SHA512 d5f4e44bcd2062b7791b5151aac4a8fb4213fcd1f8c508badb8302939c0c7b93f766019d9aa74a390bb02686cf2fb9df0ef5af280ce8feed4331ad5e69f567fd WHIRLPOOL 1a51b636d0e9b156494aea28b4353326020ed1663dc29e821b1303a750174ea144b9ff2775bf9fcf7d2f552f33ad15d30aa6b2f7217a988c4ee6e8e72084ec61
+MISC ChangeLog-2015 973 SHA256 a8d058841cd0c1de143021709ce463cb72a3d10d0354851a682eaf6423746de1 SHA512 416d4fd86743944dd6ff58ea9d309b380d1fa0487fda183c17a2d8af1ec8b28197af825954c54ed6b58b5704a9f70e7bd82d555f7fecbebaa631a17c4f67ad77 WHIRLPOOL a9077c545e260f6a7ca99e84bcc671433685fac328ddc8469ecd44ce56cacbe50a2b6d6e04d08ab00f8f482326c288eceb0d7ee1852724786b3c1ece2824dc31
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/htmlcleaner/Manifest
new file mode 100644
index 000000000000..6a1d574ebc4d
--- /dev/null
+++ b/dev-java/htmlcleaner/Manifest
@@ -0,0 +1,4 @@
+DIST htmlcleaner-2.13-src.zip 346998 SHA256 e51daa50eb65b5a92467bf794a6f82b667fe7ca1d1d58ba046ae234e45d9c3a0 SHA512 bf9cc014688ebb20b0bafba82fc710f25c1db8c173dd3e9f742c31c64f127c3c89b29b151e64a3368b04d278733cce8828831f297834ca9b872a60951e0a2d47 WHIRLPOOL 2b2792607e2c4f5f3dc8d2b7d7035c3f762ac1355724811b8a743ad2a0cd0f6fecf5392be8c58632b697a8529b55f60721dc63128c647aad7faa0e191c9056ce
+EBUILD htmlcleaner-2.13.ebuild 1573 SHA256 991186c2eb0e8475a5eb955c6283f9c6e62ff6128a4922c7ad6fa063a1453f37 SHA512 c5b00de839e7f61bcf4529266882af9194ad703c54503d8f70361439841fa28ad59f6d9cbd1350d10c35434f4818f0c3c829ee1cadfdebd4e9e1ae1ec9ae8870 WHIRLPOOL 168f28c649026b9bc8f84cf4c90bbac84ffde320e910f0538b3161541686d01638eadd4f007f738ff3c05ea91b2803593d5228d7094363a75c022672dd7ee897
+MISC ChangeLog 1766 SHA256 04ac891ae41a1438ea4c5bf6cf08fddc245337de79aae5cc757006b677cba80a SHA512 23e26e3fd960e4a247ad231e4d78e73aba49db1b8b5269a2a327076197939c204bd6fc367cb1b3ee6f7cdf8bb388084775514a67ab72cdf2f950562d0259a3aa WHIRLPOOL 60fd03e271fbe9c13491baf3a4796c1d18fe9e2ec862029ed7f1195df2bc258ce139b53b8b79eb18d9bc074683a80ae7a5ba873b85c65bad774d5ebfa8ca9078
+MISC metadata.xml 956 SHA256 165f03845948c83a96a99769747625577a7538d35a8168c7b550693f1f0e6670 SHA512 def5b0f8710cfbd49e0c25f8a5623f0ef7a8e37fab31d4324540d9eeee257423767dd947475fab51f4b84100428c556aa0457c6a8b92076b9f267f35ee9475f0 WHIRLPOOL d18982828964b5997349ae227fe6ba60eaa4167b0374113484eaac3f1e4d2c09b089920030f517db89c1cc35d3298b28fcaba3845a1a8f81083835231274e98b
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-org/Manifest b/dev-java/htmlparser-org/Manifest
new file mode 100644
index 000000000000..fff70615e49d
--- /dev/null
+++ b/dev-java/htmlparser-org/Manifest
@@ -0,0 +1,5 @@
+DIST htmlparser1_6_20060610.zip 4346070 SHA256 e4f1ff4be7501572fec5a17740c817b711a7dbf68f0ee97ec7f4921625981915 SHA512 f23d08d9330dc45133a227b8e1a80a515d01298027ccb0ca0863d1b4fab829f52950e3a3ccad057718fd57b05f8c0176786583af8625c70a38a940d3e878cd5f WHIRLPOOL 17376507ce22c08634455d60f3cf822e98dcd55cd8372508a78395d88ed93e64f0dad60427d9c85a2cf8cba6ed752a87f15962314e545fb46481196cb108f148
+EBUILD htmlparser-org-1.6.ebuild 1221 SHA256 6f412457053b5d8a7bdd7e41c9eea7659b8140c9bb31f68896aad83ee344040a SHA512 83f4f4a7cbb11d7ad7e5c3a8741a9f62ec8216e2c082702b35f0822e29b305c862132cb6af7f4c4939045976db07dcb71bbd68d13e96d77e32f6caa94552c889 WHIRLPOOL 3aed2023b180380cb9c75392db1d01b9fa784b92a8c950cd76d2ec1918da88a4bd5b7bec6cd13374b71665fde5d0406ffc77e234fbb7201c8b0fb47561fb882d
+MISC ChangeLog 2444 SHA256 6070ab6ed2459e8080cc8d02bc4a949c6e4c1d5e94508abaf759803143b72a9b SHA512 cb8d462b47cf7e35884864df096376c512b3ad24e31af2f505b236cc782935ecbc974cd8e20aaba02ee8c921091ab766f4d72a150619b34c599c3148b7a9ffe4 WHIRLPOOL 7289aaa445e7d438cc621ab171ba3536a2e61a2a62fc24245ba3c8b710531cf4a354378cb662d11eb824b1d140e8f0d3bdf3a92dc181a3c46be7d46eb3ba6337
+MISC ChangeLog-2015 562 SHA256 8215283603fe94935062505c2fcca712a6bcef2b097988acfb1e32f89a01faed SHA512 c3356b189e88c477330d04c8fda0a1499a0f5428ea4465b213e5567720b3d736d22743daa3ab67c3f85cf977eb527da54b8325dd802d7af9d12dc3b9429ab96e WHIRLPOOL c634a6e01d01250e7a1e639eb1bc063996c74e54599ce0cb80b8ec4fcb53fae139dcd4d4ac2724bd582f8b0461984f7d6c9bd07d5e7d7258472e9c465a26bf93
+MISC metadata.xml 316 SHA256 6d57af2e0b24aace6a6d2c41806f5ffe636a76d9eb5e05c1492926bb8c074db5 SHA512 61c706eec499013146ae2ff65a20314fb596763cf501c0873132596e31e3005fbd7fb854cc78ce0995c994d099891f437ec6054187f1c97562df1f73ef27a736 WHIRLPOOL 76c73bebfd37f26de9b1671c5b44c5706bb5c3a98e1fb7b4b6b01d96e4d502df557e847841ebb1097c83351c589b64cca1dec76ccc014b3914d7eecacd3ed80d
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..d7881b35fc0f
--- /dev/null
+++ b/dev-java/htmlparser/Manifest
@@ -0,0 +1,6 @@
+AUX build.xml 559 SHA256 dc9ff4e15a7735237897d560d34ee7aa82d46c3cd51793a9743185b203ed366a SHA512 87abca9840918f40261f87f7c157d23fabedb8141c80a097efb874e986bc6da00b319412cfadd41ed781f1d0d4b13259152347eb6d084c73c4fc867e830af65a WHIRLPOOL 55ecec03371a44d84f7fde5928a47ab67bee2e82f3599ecde304383be0bc62620f17290195257656f85344011b09ec9aaa54cb2ed4eadea8d53c27e96679cd5f
+DIST htmlparser-1.4.zip 1425388 SHA256 4e696a17f25a6983c846bb72b8f4e1920659d6a1677d5620eff60417260b586c SHA512 eb0587c808b287bbb18acbba11e8efe5bd0dededd96f6bf34ef59b92144227cf8368bf76474a2c1d87a5d6b635a63057faa9d18e2a1a2d7dfeacbfaa64e57700 WHIRLPOOL ae5de0f11b294ce7c831c1e4e121e0f4d2fe354883de3f83ed33c930180bb73f4d224edfbf75754c0d560946b6cddc03d71551f7219472a71d8952a71cf7c8b9
+EBUILD htmlparser-1.4-r1.ebuild 884 SHA256 6dad0b52b62cdf233fa40ab6e13ee3f7a8d66cf20e0a9dab4df0917ec8a99738 SHA512 ce7ef671f3405d15d682c978461883df3877d03440b7d8cb9eb36429b71842e7381b0217f5975ef9ed97c949b09df263b5dbfc9fb768dd4dfdbeb7e3f074dc75 WHIRLPOOL c029c02869636b435f61b5e2d63ab470014a7b65f03cb9624981dc7e0c079f7394d4755723e545a436a782d3dfd57fa97a5f7900c1673c6ac710bfc04d8b17f3
+MISC ChangeLog 2893 SHA256 7f4ae4bb64af11678db8076259c250b89193987f5e2b4d25fa3c40987590dd17 SHA512 1c8aad6be3d747e7b1dc3975ebaf3af3570c8355e1ac96bfd186efa3f9e09764992526d07d411f9784abe194c123c531caa5b75f049becf2ab409a30841cc446 WHIRLPOOL 71f40d4d0ab499cd4154f839f38190a909861d5d46949d8ce43181876fd189e131473d65fcd3b646c9587ddef3243ab5f1318bdc11ad57e44f92f9a5ee9137d0
+MISC ChangeLog-2015 897 SHA256 7930056b9646f10586edfd4038f95131983521e172e6d41ecb193c5f072c8955 SHA512 dd4334d1edd8386cfca092c8cc7d9128d12744ff7eee4572eae7231b52240f3c755c21d5de1487240235fea9de04f5389595aa74d1692c5e0e1bac509abc98b9 WHIRLPOOL 3f10a3206a610907701a0e739a4c19fa834192aed73df6dd33ae2f7209fe2029f69bb5d505393ed1b5749affa187fd8728e9c6e1b634edee35b212aaae59d8c8
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..f1d565a5e400
--- /dev/null
+++ b/dev-java/htmlparser/htmlparser-1.4-r1.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-ant-2
+
+DESCRIPTION="Implementation of the HTML5 parsing algorithm in Java"
+HOMEPAGE="http://about.validator.nu/htmlparser/"
+SRC_URI="http://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/Manifest b/dev-java/httpcomponents-client/Manifest
new file mode 100644
index 000000000000..13e268c744b2
--- /dev/null
+++ b/dev-java/httpcomponents-client/Manifest
@@ -0,0 +1,10 @@
+AUX httpcomponents-client-fluent-hc-4.5-build.xml 11280 SHA256 d58b9b09c66a96a70c4b4987cd9b6a975b0662e2ffb89ceaefcecb8c51f0b037 SHA512 b38ba2d2820d0085a32519fcc904c1c12e513906c50ef18ba14e2872851d05d64848fe4368f4298f79ea0ad2e1871da6b1bb618018f79f8d88570213a06a7c08 WHIRLPOOL 547f888b7e6e92c86b28b85a0318f907fcd075bf855708bc3876d18188105779e0f84772df4db4e4ba63f0d9bb48255a1882894641d9b482b5573d3b517fa729
+AUX httpcomponents-client-httpclient-4.5-build.xml 11126 SHA256 d35d3a02da09b52d5c4354154ac6fd3c614d32fe311f47821ccb0209a5aec4ae SHA512 482be9717420eac69c5c8e82f5024aa478dac23f0c582c2d6000244375f315365009d24ef04f7ffdf53bcaaed97f555cf215090c863c38546155d79ced8193d6 WHIRLPOOL 65ecb67890430098ba9ed623adc5b376a7059c9ed365bcb8058797014034f3ca2003d70ced319ace81b1ee339dbe4b793aaade09a41a85259450dd711a527888
+AUX httpcomponents-client-httpclient-cache-4.5-build.xml 12511 SHA256 0f1b66b47e5689afdf8f500696fa5d097de2fb662eb96e69b13adc743613b1b9 SHA512 34bfd58cca0cdb5566e1c8c8f32da169713dfa13142c1e0febb16a2b16288408573fbe795c9a58122c982e932ad9be5cfb544795a820ced3f26bee87eec544a3 WHIRLPOOL 747d9b5a64cbb53dc74d311f6718ecd8cf391b553f3381075a85b060c63df824c3678156c30affd21610360a556f66ba45f912dcf90c509c05caaba007684d94
+AUX httpcomponents-client-httpclient-osgi-4.5-build.xml 12090 SHA256 9c0f365da6c0df1b4b14184cc927e51caef0441c85ab2cd2d452b47f6b37820c SHA512 812e5d1bb9c2a21f8f664abbe22c85a912bc16ba96560d8fd8a246918c4e421d2a2d5e5034d3d832342b5e840ffc0df974abf192039a97ace2aa90021a950721 WHIRLPOOL d0baf5561c5bb0f7ac74206b99ede94b880fa48dd52819e184f1f70682f8bab313b11a94a57ce4ad71ea2be6302c34af3c3d73ac91dc457b759e7fbc7f77af04
+AUX httpcomponents-client-httpmime-4.5-build.xml 11026 SHA256 dc1c09a6fa5363ec7e51eb9fd8bd74eac44875df3e22abc614b9cdc9f9506083 SHA512 85d63d766290fc8055d38779167e64b3ee4ceedb98032227bf36ba76b62437929b0925bddfc3754ae37f42f51bd5f2befd46c2c2c0fac094988793a88a07c073 WHIRLPOOL c6c852e0a193204f8d926d03c0cd3e10118aa603b60f67d8a97985a81c408dc9db0e5565de2b9412b0e879ef1a15003b9bb1f2ca4d8e711c73e0af22d61f6444
+DIST httpcomponents-client-4.5-src.tar.gz 782815 SHA256 1af3471f99f667eb4fb5d0eae08f1dbf0b14fdfe612c1527821d3b24fa437420 SHA512 a4c3da887a2933ddec0876a3c08903153e34d3dd555dad1be8d9d48ab5dc04f56b3f22eb6f96b407d1ac85c455e33561c7e8625c0a38705bd1e810fd9b6c8517 WHIRLPOOL 774d179ab6a8dceff787223502300836df5140dda6126f021b95f4ca341dd550f72b039b67033000c14efeb680731b3a2e4b964455712a7c8a9f0a37b78af90d
+EBUILD httpcomponents-client-4.5.ebuild 3479 SHA256 dc2e05922f2859b20224f1e4c9572872c31aa72ffd06dbe5b6a822aa7d74babc SHA512 5b0c334971cddf4fcd0ab05e6db7fd3f51dc3f748ddc4847048b462a7683d1ced3043cd5683e3600974c9fc5da347b1c42b5b1a54d6c60408bf151be17a7999c WHIRLPOOL d9daf4ea69980522fdbb47e46232e062274aaf217ad6c9b08187152f7cf786ae9d9920178712eff6e6844cf380a3dfafdc62965387f60f0d6dccc8b8689d6fbd
+MISC ChangeLog 2758 SHA256 0ca47e2152d5e1b1e5cc341d97b478d53d791fcce4b6d60accd88e08f3688dd4 SHA512 570d813053a4ca7928601d7275433a9b45e19d258df240ad3ddc1cf8185cb2bab59049d4d425c4da5715401252ba68be43ac7ac9b4670ded6b3509040f908644 WHIRLPOOL 65517dbf165f9ea8976b6d2e692c0c977da6f553419e019d3e1e025ff4fd3293362bbefb0670b8d3465a0944f37a550ba58a2bbb0c6aaa0f0f4f927cd839232d
+MISC ChangeLog-2015 1676 SHA256 91835ecdc65328601718a3318dda68d413b0af63f9c3f0ff61c73a318351f134 SHA512 0f2026c66d0ce51f0c18797dc589c40760ff82b4178af87216d454545e6fa77aaf2b320703759514bb44ab5db524525b5a7aceadd8980640afda8934daf9795d WHIRLPOOL 759ca5821dbbfbcf230a909341b61714e8a9ba8a55e75fc5c3a59f194229d3befce6f1c8df0a61ef9ba2acff5565201904e42c9a30d000764d0079596e6b2331
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/httpcomponents-core/Manifest
new file mode 100644
index 000000000000..f3fd5339d42e
--- /dev/null
+++ b/dev-java/httpcomponents-core/Manifest
@@ -0,0 +1,7 @@
+AUX httpcomponents-core-4.4.1-httpcore-build.xml 10109 SHA256 da32b55f37b68057c8a0b90fd69285ca8afa422afc4a387e78573cd2431362e4 SHA512 44cab78a7855d607277d049a906a9ca157cd3f5d491ba7e5c406fda6700d95c6e8aebf0082245fc125bbeb50eea6782a0b70fe69ce5255bad468cf7256245a07 WHIRLPOOL 95e5a036b7e1f0c6cf97882685c841eea55cc00856b47d822d7c00e072d7b86a4e82acafa0ca60780094b6afe08e94fb4effdaa83d83676e5a1ca412430357d7
+AUX httpcomponents-core-4.4.1-httpcore-nio-build.xml 10465 SHA256 ab5221f4233c20e594e13a12a2e85bcc07e91d3200fc1d3e7e5f3cae4567a95a SHA512 07cf4fe938b802dca43744410d94c6452ac75e9c75aef06f6685597d4f1ec644674c64df4b0cb1c6fd837627059190b1d448e6a3f2df6954f920709bde844377 WHIRLPOOL 772a2deda8434d6fbc76e3aa2563869e18f087e327395590ddebe087b1b3184fbdc2100eac6ce555641a85708833fc5dfe37435a285aac95402e44d2c47d5c59
+DIST httpcomponents-core-4.4.1-src.tar.gz 549481 SHA256 11a2b73fb412000fee89dec1301cb77277365bced7c9291a970995b5a8ab9ac4 SHA512 1ccf6233a8b254986712732418fb4e25bbdbcb99c93f55ec7955d956d33c692eff6378ed8d701542272793f05831151ee75f0102cdd3b14a6f7530fcf9639b99 WHIRLPOOL e814a6b71b85a5235567378ccad9177e75231e5e47359756c00cf0f27fc942d0d8efe1df070712c3722e4e215ef223f27fd261a28b162bad42336876dc6a1017
+EBUILD httpcomponents-core-4.4.1-r1.ebuild 2196 SHA256 b7cd93b050c806677dc0267e59d8905b946a84ab18bc09231866a3c3626a9e48 SHA512 bd6653819b8606d9e5cc99e954fb2f64f5661cdb28593e3220cac5b8eea69573b4e3478da54a91a95202fcb72be7f863332612807baac49ee1fc8210ce6da22f WHIRLPOOL e30bee8e710dd7847d242357093cd3f4c33f7fa7db6f20c80fbfafbcaecc1efdb0a16ff59b6786d1fb62a2b4681361b24efe97835a0a4d6dce550d2fd2a70e5a
+MISC ChangeLog 3224 SHA256 0c64dcb28866cdafa01436a3e77fdd64b2b9717971fc70faaa98989ea4521123 SHA512 d4cbbb51fa0dc9f6e9fac68aaa0a0a5e98472e3dbfa7890a6dfd23ddc72ef70c74e51efb2a3c838201fd83a461721d84c42a01449202c2dec7e0f782f359cb27 WHIRLPOOL 5ec9ae30f0bc322f74acdf956123a8bf7ba41c439c764438ee9d9aa17aee79eefea6c618633451c4632fd938c19237f5b2bc4b60d424183b6751ba18c4285029
+MISC ChangeLog-2015 2253 SHA256 e9488a70c567f2df4f36932c5c1970abdd659a07131f74de94f636d3ad829143 SHA512 5f49c100cbba74ebd16be60bbad7bdf1943822d8b8546f91e24fdc983191c7e5e393dbd9d966cb7f0ad047a0c4366667415914540749c4814533cb8ea403ed1d WHIRLPOOL 377846a8165ceaa02cb223d76024015d6f165de2357fa02f0db4c10eb2029fe8f88a7fc912bd1389df176b23dbde595d9fc3923fb83ddee501ebd33ba9717836
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/ical4j/Manifest
new file mode 100644
index 000000000000..48fc0b459aa1
--- /dev/null
+++ b/dev-java/ical4j/Manifest
@@ -0,0 +1,6 @@
+AUX 1.0.5-build.xml.patch 3196 SHA256 460bef8c939ec8f3e357129efa7855768ce6d8ff78f2b5bf308a34e4009d7992 SHA512 888a57e0c2ca9bec191c14dde8b33235b024e5ee764c0fc44e61cd51040f30a8ba4698c5457c1b4acf4180092b152c635ac14521b7bee958c533ce4ad3854e34 WHIRLPOOL 9e32dca603201f9646cadb93b1e92c9ae29b991be79289efe4c74fd44515092d8c9e56b928e50f47292e75ed7b05e9c5bd2261de92821d5c0364aad04e3fbc5d
+DIST ical4j-1.0.5-src.tar.bz2 9307268 SHA256 7fe8bd596489f3f015b904794fb9d9a346823e1750619ec71d6929ba870293f7 SHA512 1c2c1eb6207094fd12036d4eb93afaef820c19c7bce99611ddb9115cd62ece76972b7280364b49643147e4456ef4afca4df23ce4413e0288804183f33c2cc286 WHIRLPOOL 80b71c87bddbe5001f58203b2648a467d766f5dc8b16211d8f45f6770ec7037bab260165c1c526218bf73352884dd24be62b1d58c6d6278b06254fd651831b48
+EBUILD ical4j-1.0.5.ebuild 1460 SHA256 e6eaf733e5c22a7acc33c3f4db8babb19c1b8f0cabd991cc0341eae181c0d426 SHA512 25a69d45544748858f15c291b4032ec2dfc27cfdf07372915e2607680baa0d201c3540ee1401ac2fb67da68a1862c7f58b1a312eb0a8e55d952ebc8707d0a9bb WHIRLPOOL f61014172c5007ee1e74d7d68a55afe90972c59758ef8d5581bd7bada30a9ac8221cea36d9bd57d0653cd87b709557b0c1e6c7341eb89d7eaef4b4708229c607
+MISC ChangeLog 2591 SHA256 739a60dc7bb7b2b7d4ce6b6778d6e676430bb55510c031300d489f4384dca703 SHA512 1eeadc7561491ccb71e6f4ffb86ce50e9f9c212b023443ffeaa9c7c1a8b111a0c74fabb32af2a177d09d53d58fdcaae30f786826ede53014505cef95de178f8f WHIRLPOOL ec1838d53b6849beadc7e6a4247ff0e414d6f3ebf8c842f684ef033a11d27cbe31cf14b87c84f529fc9be055a6b76cad52b8d592e1f154629b128115bd56bd93
+MISC ChangeLog-2015 2313 SHA256 005f6ed33bb1eaeb9ce3827db967fc0366f6f3d23380b8d5f7f6eecc1aa30bff SHA512 323f2587a97f9cb5eb8d0fcb857d2073f5ab21e6547f4a369e94b30f39d41078e3c3b9c195d349e21c737bdabcd3200742dbe392f522de81c8f0b40252db4742 WHIRLPOOL 0d91c48e8278ebd6c03e09e1d0f770968a91e82bfab07e026317cc97b0b18f9590293b288baa143a9c3687578426ad1bec0c068784f0f24d4323e80d284a95af
+MISC metadata.xml 984 SHA256 9760d1e32640b0704e5f597823e6093096f7d0df4207d4d63ba798b443b5ea38 SHA512 23aa711de73797e43a847aa485a1d652b4b02cc6f37ea0b79ced99e101c332c4dfb3ebd90d65a1057f8dbf0f9090f6a7d5e582c9d6f7cef5c61afb8289cc804a WHIRLPOOL 4be326faf65d4937d2557093ffbd576fe1773de354d2fb8fd3f1e810f9f52e08426440cc8c9d145ad65dc5d16f7a440df989393ae83081a0f1595a359db35ed1
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..395a5bdddfa7
--- /dev/null
+++ b/dev-java/ical4j/ical4j-1.0.5.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"
+
+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 ~x86-fbsd"
+
+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-bin/Manifest b/dev-java/icedtea-bin/Manifest
new file mode 100644
index 000000000000..7f894b24f209
--- /dev/null
+++ b/dev-java/icedtea-bin/Manifest
@@ -0,0 +1,26 @@
+AUX icedtea-bin.env.sh 1140 SHA256 ed0aefde7c5349f296880b76ab11cb083f076fc7d51f73a0ef17db3374419685 SHA512 b29d3f0f7729708bfe1e66097b21ddc7780529d62f4b3162d7bbb6952e4f964b31c378ff207308324faedd59783d74470145947181834914de4a8d4b6aaeacba WHIRLPOOL a353067b2bb11fe46818050ec8cab1b89b3688c8302ff65604529d5315c63287194928d3cf1de92db18cc5532b51c8ee0a8c32084116ed8c9805cffbfcef47d7
+DIST icedtea-bin-core-3.5.1-amd64.tar.xz 61880160 SHA256 159cfafc2b48d1042cc8b2ea9fec596f4ef59d7774d83c1606c8c213355d9b3d SHA512 1b7d8bfc8509ce0cc12406d14d70450b239838763b990d71b102a01400d6fee4359401c198669236a07794e410462a575b7b0fa2083b49e0c0f6fe637690db08 WHIRLPOOL 1bf461a833d8824136b629be7a88f8f96d18f11537b75735b0de07e073f3b9e018c0d5b0d9de6095159092dafef18af8f98ec11e7b08646e4b6d7685049dbfe9
+DIST icedtea-bin-core-3.5.1-arm.tar.xz 57957952 SHA256 b9b95ac5b6281f0ddbd5bbea24f1a84d2a1c517087f9775d33aedaa58fa888c8 SHA512 824782e010c037390e64c7a60e101c94f216a05fa94f854978cdcfa7351583554557d0b22a3fb46ee1033a9be2476cf58509ab5150d58f460e770f7399bb6b3d WHIRLPOOL 4063feef1b53261264f0793f514e79c4b394bf5ab8fd66cff8baa1a3ee9014885eae17b27d58809e9b82525ac4ff67bcb458f274a8136a7d263cc19bebede169
+DIST icedtea-bin-core-3.5.1-arm64.tar.xz 58951988 SHA256 f88a4f6c18956e6b1aba0e7d10936105ab39eef44d1a1b83ecdad7e187b4738f SHA512 023eb7743d055db28d67b234947860f1ecd362cfd38234e839092f9f182762673c50b7130e4db4c12a1dfc91d319e9546b8cdbd8486630800327e82c9940090f WHIRLPOOL 6a695ddbe3a105b4ff1cd370c1d5594276fa188666ad0e01cfce4192059a4eb297779e993328133879ff3cea3799ac70d27d8c4e2f8dd97e9db1bedd03e4a2af
+DIST icedtea-bin-core-3.5.1-ppc64.tar.xz 54197760 SHA256 999b47f42a4f952eeb8c4a603ea614463c380d66150f93e17d7974684f32fa8b SHA512 58116c0bd67dc8f6ba65c5150513c2f62319cf3cef48f0624926e8d874787f6cf222e0ec8012822a6d9151b4f18691f8a1b5b65bce3e3b5bee54a85f503928e3 WHIRLPOOL 3ea91a281fe74ec75415acaa0b5275578e2b016a1d9c743c0cb9f85bad546e09fc0f660bd5d24f55cc8f2f386413cc2f9a2b58f906308dc1aa338238c40cf8a1
+DIST icedtea-bin-core-3.5.1-ppc64le.tar.xz 54240304 SHA256 0bac113ea9e165fcf2cf59c4c2476965c807d00d1c16e638f1803adb2ea5b05b SHA512 c781daf655362b571acdc78f4f3f8b86b1c132fb853ffe5cf4ac05968ae4d733bb90ee43d0d71f25418de399b1b25429dabdb9831dfbbbd98b937f4416c05487 WHIRLPOOL 320c92c8581064dcb5d715d7f457ce1926bd9e864d39569ced07e9d116fa2bd55f40441ec74a3b297ce0418aebc8bdd8b425d587fadc5bc4a53b351e457875d2
+DIST icedtea-bin-core-3.5.1-x86.tar.xz 61349068 SHA256 85bea3a4291b8140a1ed5d7e5585fb3fdd67c0f05dbfde41df7882e7f3f4f171 SHA512 89bbcc3f5340894c6500179e3be8f75d9eead0480758db76133ca18ce6d216a6ede2f4ab820f56b220fd66060433d1c135fe7993339384d70cbfed0aa072ed20 WHIRLPOOL 6c3660bac05571c1a25e53ad20bb06d622e9286c6cd0c080c99e15b14ddba72567e8912ead3078745e2874ce0e9441bf879afd5d2fc8e10dc55fa1890ccb93e0
+DIST icedtea-bin-core-7.2.6.11-amd64.tar.xz 53452816 SHA256 19db272211ea35da58ecc1ad8ac6f8daf0e2834501c3cab3ca765d6d28451967 SHA512 2801c07230c8fe041ff7b945afc67da582dc820c02ab4c948919ada7e728613a20afb86cf0f552102047c2e10738f0e16d388eebc5b3a44cb245e1eb2829ec4a WHIRLPOOL 1887e66db8312c56ac92b27eda55f19f6621fbb795eb94c888be6766c10b50ca257de961eb72f93702fcee4a37188242cb474c974f23421b958be94c479bb97d
+DIST icedtea-bin-core-7.2.6.11-x86.tar.xz 55369568 SHA256 90143af039d56edebf073c38f199dd9c2f7a0f8f22ee28cdd25d5ce5f77c094e SHA512 90b2bd9b79bf287a6a76850e7d60f26de309b07180b8ca42709784c9ecef04e150a35760398b47967a87fb6391aea430ec22d6e7d1e7b8068e8069b27d26646c WHIRLPOOL bad37af054535d964e696d43ae99acde61228d84110350c852fff5ff97cd6fc6a70d053c4962aeb52b99c24a4b7c87625696e3c4fcb7f01c6363ae0ff5c86963
+DIST icedtea-bin-doc-3.5.1.tar.xz 11682876 SHA256 09df364aac70225f2dc19e43c157e1283e6e76a6f813de61a1ce35be7ac87d08 SHA512 df43658202c08e10ada2f5179c9f6eae15ffed3981b95495cc7ee7a9b4bf3b5f7957dce156451ef589edb0f0b9f50eb4faff1942263dfec665a83e75fad55caf WHIRLPOOL 1563a7d4bfc21acaf576ff291a110ab9bf4280cf9c5f9e582665faa32fd87969213b98540c0ec4cdabaf64c0a94ddedc9cbe3e1d134ca59a3796d1a58b7f8015
+DIST icedtea-bin-doc-7.2.6.11.tar.xz 10611016 SHA256 b1d785364491a62420f8fded47a936c292e962e5b208b852c7235e1a80f69667 SHA512 6a1d43f469b98288b138b0a0e520185d89e487c61afaadfa82afffd7b0c5c5377c2fb03ce6abfb12da22ce54eb989371d82dca5b49d561e63bd2230961c2fa17 WHIRLPOOL b7482657675223cbe924e75cb428191e7dd23ab203a56ccd466c522fa0d52299aca2b12f811d27b44a4a8e2b038216184c311344d44a0499530d0c7214f518d4
+DIST icedtea-bin-examples-3.5.1-amd64.tar.xz 1856316 SHA256 990c86ce2a2c6e15db35d62a4ec49bb192476345d2d1f73b1faaa1f099c74884 SHA512 f32b55e03308c2e3cc7d8e823b53c8a6009e710c7120a665bafea1ae209664c24e2c0a3f408315461066dab67faa343199778ad0c255e3861b0c90f9bda72dbf WHIRLPOOL 5829a269bddf786786736dced0dbaa6db285e2184fc7cd3fe948415f2f0ad5a52ab8df6e16f5c1fe3cdc999072c5c474667e1507c2ac5d98fb5e78c3af903655
+DIST icedtea-bin-examples-3.5.1-arm.tar.xz 1840324 SHA256 6d81c9781c69ddf98fe06d9942d7e1e695a2eb28e1b42b1b1b6a7b0d41922ec4 SHA512 f40461e5267f43e8990d88784bff02ab4b85b5d41bf9d4bd519dd6c9a215779ce37c19a8572dabe72cbfd84db27eac9d71d12b15f9f6c1549cfc1a607fd957b8 WHIRLPOOL 21df1a426b3a5f97389bf9704eac79ab7e6d17275b2b8c32e932e0ba13a1d3f513fa37ddb1408dc95cfc302b744b1106fde22b2e8fbc6e3557209036a0384419
+DIST icedtea-bin-examples-3.5.1-arm64.tar.xz 1835880 SHA256 c147717e0b97ba78c0a9e5348acc58e15d31bfe193dba478f1e375130df60d90 SHA512 502f4e2220a8616c154fc9e7de742407bb48f92cc41e50eb5a334579cc12c5597adde5c673250fc5028ce88488f6289217047ad6709e3e146d99557c94c36c20 WHIRLPOOL d42b82fd73533fecde0bc6c1a64bf07593727e8c396f8578c7aa9354f07bbc2721945462954c576180c52397cba3132e97c48430dd21aa8def190c2212bf7ec5
+DIST icedtea-bin-examples-3.5.1-ppc64.tar.xz 1848368 SHA256 9453818b7160a5968f4fa9e2303982a093e77091dd82f7352344f5c4429a6976 SHA512 7d4ad879a00ebdf0c2bd6b33aa3e057ffe73a11e67f2bf80f781e7399943d9783ee1e88e0213d04de94e59284627a325168ac3913183bb04d8966b84f0d81dab WHIRLPOOL d04092cf4840c65ec402146738c36da10012d66aa3388a287150b3ebcd151f8ba88e891eece63ea7dcfea5aec8ecb04ef4e72d9492bff73dc74fdee0d8d0bf2e
+DIST icedtea-bin-examples-3.5.1-ppc64le.tar.xz 1845336 SHA256 1332ae34d932fcb70c9f0684c292bebacad9837f446915e0d93b2e8213117b0e SHA512 7436d572ee16c9fc01fc1ab98f5dcdae7233e9c03f799637751b906e0f1e3c790673c0ea94312de997203aba11132167976e1008808ad90b7c4410a00f7752bf WHIRLPOOL b16392a13f80e232a0ff87084434c74484820b353b6a782e522fe767b70c85d92055242ca2de012eb73bd374c72d9ed58a411f8b0c49b7dca77d0c16333e0362
+DIST icedtea-bin-examples-3.5.1-x86.tar.xz 1862744 SHA256 bfe2ca3d365c83eb56f74e5f1c92ae72b82ba1b350d0a72145723aa7c2227522 SHA512 a803c9c91401f1a85a81d49b261445121b9ee9b5858df6ee711900684421027b4543b6f789395dff30a38afc726d5cc2e5b8307ad18996cc88ef235e6f9546a5 WHIRLPOOL 4faf5df1382c6b4021e6bb2086c35c6192240658ca5f75fb5279431ad9bb49585f5eab0142ada0c0bce42684f145c3d01374e323d6a58d3928aa3ded0cbe06f9
+DIST icedtea-bin-examples-7.2.6.11-amd64.tar.xz 1796180 SHA256 18757fb3b88ff425340a389109487931906c9237158ce75597be8d3e125e111b SHA512 c2f714674956cac81b24d1a929638a38fa972dd9aed1e05ae17397b58ea334053d2e5fd2800c8242c25c1f9ccddc814f4e42aa49cb82b00dca7e18b31a6f3670 WHIRLPOOL 72874ed26a3e0b363edc29187e94e6c9b2121c2946323639556c02050e3539ce92c10593ec797593c85224b3b9692313676741e030c068c4438b7897dad8508c
+DIST icedtea-bin-examples-7.2.6.11-x86.tar.xz 1797116 SHA256 f2dd2bef16173d55c0865f471637475ff1a39d027cf7044f2c4dd5c251745abe SHA512 2b91c01e2495914d0c70a6c9885246ebf7b48a9edfdb8fc0f9904db65eb3aa65ce97cec50062e39e91fc55217abccc408a4893137379e88689873907f74fd4dc WHIRLPOOL 018f9b102f06f2304b66f006b3f6a17fad00daf9815140ce5dd383ab69ef2055ebb9d92ad25c3d4a5043eea0f512f25c83bc0ad6163b621c8e421698664dcba6
+DIST icedtea-bin-src-3.5.1.tar.xz 45725832 SHA256 713c32f6d7b4a7ecd790a5749f6505ef11d4268643f254316f3d50ab38c0ff90 SHA512 f16d760c810c48dcd3f0d152a88e4adf14631cf6e4bbf3caa61cd0aa95a82fd7c6845708077b1ec0c61e91bd35bd9ef7e24d9b8266d9902cd32588c75f84ca17 WHIRLPOOL 9f43f63bbf884e4b78a305c737e9cf825cd0d4583cbd95c388aa65d0c136b8cd6a98c3896633d196fbf26bbc9575adf6c7edbca0eceeb4777b423fbe465dee56
+DIST icedtea-bin-src-7.2.6.11.tar.xz 40213908 SHA256 f5bcfa36dcf9e4320b27ea66bda2e44396600a6e2ee1b4ab57483e0603b48177 SHA512 2a1c699ea3e781d2ff81ebbb803cd06ecf1438195a6d40f04eeb8dfb03cbc4eb4934a9563f6328a7ae4ce67f6bc14aa5cd72c84948e45632d0ab92cc14f6ecc5 WHIRLPOOL 71d1f05099e6b1f2633624b33f34d38471a13ddca187437cdc10f08cd4abb861715903b9cc856ee1dbacdef3b54eb8bb83df36f3ca2e27cea9b0a88dee2e691e
+EBUILD icedtea-bin-3.5.1.ebuild 4356 SHA256 29ad37d6659edb6de2890105b4edbb4a3e3e332c14bf53a7ab8c28f780292606 SHA512 c63568a6f98b082ebdd5d2ee8f68e967f3c388f7049bdecdca3c8b5261f95279d3b9500c08aca3c748b31c62038745203fb8d112158675a8c1f2f369b3a12561 WHIRLPOOL 69ecd4f8eb5f827a99eb618cb1d4cef1d982d6f491be1dcaea440cadf820e7ded8c4ec1488846358d8f3bc165a6ca1cb558271ea370467cc03fae4aafac7a63c
+EBUILD icedtea-bin-7.2.6.11.ebuild 5767 SHA256 4c526957f7266ca06b27c6f46fbe4fc1604ac7621ea5591a5d94e43e965805b4 SHA512 a0ea5d4799081f2662c3546bd2b3a46dfe54ca66eade17917583955f34a38338b33b220765ad3727a629cea5daf6107d10b57d10ab5cf55c269eb166f66751d7 WHIRLPOOL e51eb4cfd90bb79323b9ea18932a0555bb533e830323887831d97a2c0e3637edc5a7839a727fbacd2e711dee1fc6a26ed849fbd3dfc3513c456d90efbf67802f
+MISC ChangeLog 19647 SHA256 0bfbf139a2fa2a395edd17b6a96cd782f99b632acf0281df46056fda071ef974 SHA512 01132e2e6579d00b7ef48f9f4465cdc0d901593370f6becb60182fe90df5faa8c564c7df6174312a031facac6a0de40827cd039c4ab916468a77bd5f606c20e3 WHIRLPOOL 128c07fde9cb4a397cc6297a895550895f30a3df80b8c39406d094624b8bf332b873b2f0e2f2ff8af8a98447d4b67bbf14b9fb4ad7a0853ab7f5abc1e53523f1
+MISC ChangeLog-2015 28796 SHA256 882ac3194a51fae857ced373d5a3654d50ee29a39a56cd47fab697245ad6d762 SHA512 b90acef6a8a072d008293f414d10de54192bcd3ffed4e0cdc21786c9b8f92123864b78b2f76582226008c599f0acb1793cee2b156fd5f5025eabbe0a40383c7b WHIRLPOOL b1ae4ddad6ef268604c3e9c63be5c1809f208b919b464770db2fd6e2b7c1594a4f884e4896aa4c57850a14557d8bf43acc2b24eab92db609feba3054d4026914
+MISC metadata.xml 511 SHA256 d1dc51011f4bb67868bad510a92e35c177c007facabdacc5adc4045bff36daa4 SHA512 9396c518f5d421b54a11b2e4d1b2d25a1d76fab7e7dd7b85e5dd09d0b226cc854ac9bb1c2cfd834af21612ffc9fd34ac96fcef34b5b81c296c25a3f9bd3fd686 WHIRLPOOL 4c1f330e920f8803210487fe03384b83c9b236cca78a7ad4b4d57348af0f865a384b8c638058472427aea6c6e4fcec4092257e294abdb9a7155e9a1bb7363454
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..f85be43183f3
--- /dev/null
+++ b/dev-java/icedtea-bin/files/icedtea-bin.env.sh
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 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/$([[ ${SLOT} = 7 ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/xawt/)"
+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.5.1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.5.1.ebuild
new file mode 100644
index 000000000000..b1ef2b0a0e2b
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.5.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2017 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-5.4.0[multilib?]
+	>=sys-libs/glibc-2.23[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-7.2.6.11.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild
new file mode 100644
index 000000000000..d7ab5d7d3961
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+KEYWORDS="-* amd64 x86"
+
+inherit java-vm-2 multilib-build prefix 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 ) ) )
+	$(abi_uri amd64)
+	$(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="7"
+
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt multilib nsplugin nss 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%
+	)
+	nss? (
+		>=dev-libs/nss-3.16.1-r1%
+		>=dev-libs/nspr-4.10%
+	)"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=sys-devel/gcc-5.4.0[multilib?]
+	>=sys-libs/glibc-2.23[multilib?]
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	selinux? ( sec-policy/selinux-java )
+	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+	!multilib? ( ${RDEPEND//%/} )"
+
+DEPEND="!arm? ( dev-util/patchelf )"
+
+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
+
+	if ! use alsa; then
+		rm -v */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -vr */jre/lib/*/{xawt,libsplashscreen.*} \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+
+	if ! use gtk; then
+		rm -v */jre/lib/*/libjavagtk.* || die
+	fi
+
+	local lib=${P}-${ABI}/jre/lib
+
+	# The nss flag in the icedtea package just (un)comments this line.
+	sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" \
+		${lib}/security/java.security || die
+
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system so the
+		# fontconfig needs to have prefixes inserted.
+		rm ${lib}/fontconfig.Gentoo.bfc || die
+		hprefixify ${lib}/fontconfig.Gentoo.properties.src
+		mv ${lib}/fontconfig.Gentoo.properties{.src,} || die
+	fi
+
+	# Fix the RPATHs, except on arm.
+	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
+	# https://github.com/NixOS/patchelf/issues/8
+	if use arm; then
+		ewarn "The RPATHs on these binaries are normally modified to avoid"
+		ewarn "conflicts with an icedtea installation built from source. This"
+		ewarn "is currently not possible on ARM so please refrain from"
+		ewarn "installing dev-java/icedtea on the same system."
+	else
+		local old="/usr/$(get_libdir)/icedtea${SLOT}"
+		local new="${EPREFIX}/opt/${P}"
+		local elf rpath
+
+		for elf in $(find -type f -executable ! -name "*.cgi" || die); do
+			rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
+
+			if [[ -n "${rpath}" ]]; then
+				patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
+			fi
+		done
+	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..33843e4df12b
--- /dev/null
+++ b/dev-java/icedtea-bin/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>
+<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="nss">Enable NSS security provider support</flag>
+  <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest
new file mode 100644
index 000000000000..361eee486269
--- /dev/null
+++ b/dev-java/icedtea-sound/Manifest
@@ -0,0 +1,5 @@
+DIST icedtea-sound-1.0.1.tar.xz 1515308 SHA256 6ff852b82ae7db7a95981271037eb3a3d52c59581e3b27a638a7c6bc8eecb4a3 SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a WHIRLPOOL aaf495c4be15ba6c656797118691128732166049a38a535804852ac5fe4c4c555017f1777a1b96cba463e8933f90a0656f1b077b88bc80291fb99007e071ad1f
+EBUILD icedtea-sound-1.0.1.ebuild 846 SHA256 803968f435325b0785518618476d6a82bbb37819b72e9ea9590c48f7beb0d509 SHA512 28e28f296a18c7679ee2f8c87523d083772b2b1f1fc9ccdc36ba615197793e42d4876374095f70cbbd4732fca64f98a2d2746d9bad78390c7cee4403d1d2407c WHIRLPOOL 826445bea97925ea6e78c042d9fca55c49b058d9384619458d60d95053f02002decb44925f3c8f89abe5125f4e4345b07901750a4f8a495cdb0ec085036504de
+MISC ChangeLog 2962 SHA256 6ca251e6cd4c9d9aeead22d1164a65855b27abc98eaef8cb6a0461c7eb34959b SHA512 4fd9c41062212f500cbb8cba99a00d0d6f36a0532a3a69c5a402a8ba52a7836b86659903d6ffe39525307a1f13ad59cb36495310d4a1279a8cabf47238c52ac8 WHIRLPOOL 2f1c0f1606a949864c71a28496c726f9222e433bfb6a1673d4f830372b5d4ced5554a90b89633d3c54f401c1b45b8680b410ba54be2a584b5e0d34b5baabcea0
+MISC ChangeLog-2015 1069 SHA256 9548fee633e12d57a26aa8d73487bf8542947a4ffb729c45961472aa77f89bc3 SHA512 37159a53931ebe38558b7446cea671382475b3200ca18ecbd7a420ba1cdf9b8f530a32c43644a0716c1e98161cf27bf5fb2d5b34b7b1121e9891088320223ad7 WHIRLPOOL b0ae1dcd0d6275174d59a34a446d797ebb1f9f9a4a296e6bdc11db5cd22b1d7b335b93d625132c18145d5a4eee64298e3c316b8af6890f1162e657160b950b50
+MISC metadata.xml 550 SHA256 44c1a907f63428aeb66f18225dcc531b755a699c8b32031a0271944489035707 SHA512 67958c201defdf3d83c97dc6735a8d5751cc8026a19d063f44f47e6c9eeb2264672f12b0f1e7493d8a58a6b12a47a63e0f9d623d20fd8f991ec4f3c9c4d25626 WHIRLPOOL adaef0ee277854439546bd445ffc74659109ca3d7f7548e93f45cd6e9add6b8ddfb986a787fefb9ca796cc099da4d5cf476de87e154c8b3870f012f00a839a51
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..8d57327bbb5f
--- /dev/null
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
@@ -0,0 +1,40 @@
+# 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..c9fa532b5f99
--- /dev/null
+++ b/dev-java/icedtea-sound/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="person">
+    <email>gnu_andrew@member.fsf.org</email>
+    <name>Andrew John Hughes</name>
+    <description>Proxy Maintainer</description>
+  </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/Manifest b/dev-java/icedtea-web/Manifest
new file mode 100644
index 000000000000..8555736d4d6e
--- /dev/null
+++ b/dev-java/icedtea-web/Manifest
@@ -0,0 +1,13 @@
+AUX README.gentoo-r1 2328 SHA256 7d3b2d55b616323fbcc08c41bd2926e4bd61d5a48a1399ef68bdd631763ad6e3 SHA512 bac787d49827e651fa9a87a2d8a8a64fb714282f569474ebf69712bd2a329c12f7d6fed2b015467c857b66cc0c9e10e7e60ab2186de00f8f3ac6e72353b76628 WHIRLPOOL 811a928b581dfc2d9c15bdf3166413738042516d369009084105be57f7930d8bd88d035c1711966bc99defe9601394aa74425cfc7ac8016aa7c845f0b5298fee
+AUX icedtea-web-1.6-javadoc.patch 463 SHA256 c01d6b700444677e98128d3f94061ea99b1a4778b5f6e49bfaaf95ff155c5668 SHA512 faa9b4cd96bd6658a9f55ebf7a5f3b75db65a6a813489739df2b8e903bc62cab2cf222a936a52230ff91943263e3ccc303ed7abe4fe8da7bf89a2eed95b3e66d WHIRLPOOL 801552767fc85b72c1ebcb823d82d9074d327aadbbb2ea0ee40aa0ca24b948ba8ed307f83a2c22bd3be1d655e3760ea6943883e6d19cc8a960d7e0f5aa2ecd23
+AUX icedtea-web-1.6-launchers.patch 3136 SHA256 c6a13ad2cfca80872c48986c428b5d4eb9cd88c0300bd802b715d7dd28b7b644 SHA512 585a8e12a438f884f6b3c24aacb04a7330bf65388c18a51697c17041f5dfa3df3a24474d5d6b2dc43886dafabf0a05e525ef40ac8247c726797750dcb25d5d92 WHIRLPOOL 1766439039f63bea068e432c08a094b50d808f1451b4693b41410e647ddc98dbcab17e1fe931b6bf66ac617fa815d6ffdd1954f59ebd835d76ab8b5f699e6bbd
+AUX icedtea-web-1.6-no-hg.patch 2254 SHA256 9e292a1d417212a97517ad6885b4214f3700c94eca8b0776ce6b53568a0af56b SHA512 22e30347bbb759b60b954acafb8a920e23f673915e89eb13ad9917b6669e8059d52aacb0b90874427376730840e8ed954b14e2de65e8b594a10616b999863523 WHIRLPOOL 0c59b4a6e99d0e6fa8784fd62c3654fd738dd71bc91cb75747822a593d533266350e02ed3eaa75b75c4d1812d0104d489d9ae7ff5b66150e6b9c8b0f57b19b86
+AUX icedtea-web-1.6-respect-ldflags.patch 667 SHA256 d73d5018e261b85af076f8851e20a6605c98747c63b9712af7180af3267e55e1 SHA512 23903931c48e47cd78d1d73cf2bd5e06249e26939bbef4f41f09d3c3d69d0418e65fe83be542807452ed41bebfd88d2081d731f03dfbd4950495fc16dc9edb1e WHIRLPOOL 0fec3d03119871fbc8c954863a596b5d8c042bbdc0686e8565e50e5a130cb7b8b543faf8615c77258a8a2941d5218c7713d974c30c7feab0eac766c8a2574115
+AUX icedtea-web-1.6-unused-libs.patch 697 SHA256 05e271f2a536da9d4cf7ca9bd17a6606fc39b0fbd90d499d8bc8759669a31572 SHA512 215242b418159a8ab3d1523f1ef0765d40212feb572441719a830251fc602620f29a254a5734ab08a6b7a902bc1f27060bbf638826e2291305966edfd3062b74 WHIRLPOOL d976f536f1eb9c2495de967fb804c5ce1a6d97a56fddf95e323f9f7b6cf0abc27f2dd4c76fa6f8206fa549429aaf028d46e6cdaa70bafd4530e067a6e35568c8
+DIST icedtea-web-1.6.1.tar.gz 1776222 SHA256 a9b46ab6c9dc303c89651143596bc5abea29242b9bdcabdd2dab7c606592c920 SHA512 dae39818f74a098289acd0736d27c2e68b10b603a3fb0a180cf4b6444345cbe71ab1ba77dfb198f053f9567bb18aa96de09049c3b595b3d292d142a7ae7d3ef9 WHIRLPOOL 96826d17daee16dfa99f6439678cc509c94556955839b7e8bc43c1993ee04740f35b0547d56649bb9f7a625b5b2515be9d173b642ccb15cb1dead83a03586a6e
+DIST icedtea-web-1.6.2.tar.gz 1824557 SHA256 ce67034096d6b960e2b6cfb5c41a7bd6b30eb2ec7f13bf3ecdb477ff6ce69300 SHA512 32c9618a575bf05d3fbe5fec3f8429d55036acde70bf7ccf40b59e14eba775d1f561640acbf673b1737a8c5c3a8eadb74e8f1bef525cfa6060e3f1968d45b3f7 WHIRLPOOL 623a8ea5d5f00aa5e323c4f2de4617a4809149a25f3fbcfbbed76b4a5ecd452c372420dcffd2ad303f815c89168d8820d2997d286e0cc3360054a2c28732b603
+EBUILD icedtea-web-1.6.1-r1.ebuild 2245 SHA256 d57674fdde4fd1621e639a6cf874517312c19d2b3001e2248deaed1e0f402469 SHA512 37c9aefae8a58b59e455ae6614d6e57367f5f461f3f71c0bb1cdb8d5988fc3b513ec2977a953af7b1f20e0e4a8322413d8f8dd8feecb576768ec1624d99b8255 WHIRLPOOL be65cedf7918ee3aba034b127584341ae069824dc490d397cb47266ac5abed0d843d22aea39a1b4d69017f48c3ac0b309683b55c5fe897468e91c1e2865e02fe
+EBUILD icedtea-web-1.6.2.ebuild 2117 SHA256 dd29f18eed1f708337fc2b8e462d05cfd6a672f51dd41e4a35b64becfff12960 SHA512 55f30c8352625da7ac0d2d96c627903e60a4953f0932ceaca93967a5eecc3c22e09903acf8fd722deaa2ef9a60ce356c2d1db750382cf7287080bef28908b567 WHIRLPOOL a53833534b6e4fda7e443a7871bf4f292f2acf33419f42e6800e8230a152e5e5796182168045c54eeb1f1ac5b3c30c3b3722527a676872553963d49e9e1af74c
+MISC ChangeLog 5842 SHA256 f99b1fd956e7a7ee66f7efdc93c236a75f08b179795b3d8620975ff4b41abd36 SHA512 ef717c37c1b60b44d0383fbe81078ef50eb57bd2a7a1f906c333f9eaf9cf4f9a5206e772a5e96bd07c4dd66186c79b53646b148035e3cb86cd62c976c500f1bb WHIRLPOOL f1adc6e5b3445c5c753e76bc80d0ebb17cbce0107b18c8e780e9ffff86622d821f40daa11fc73c8362b3cdece0569e6dfb3acec72106224707baedfacfbe0b34
+MISC ChangeLog-2015 11345 SHA256 01881d8e37fdd9ae9da297a600477bcf83129eefdfe7178f2d4eec7559c1f382 SHA512 c6773927afd52b9940487a219b56f9e9f8d1cc2d31d954fa81791bce95c8b5754f0e97e85991b2ed7e02faaeb74f77c9474d79d79c38fa047b84c93c6c6ce1f4 WHIRLPOOL 8a2b0ecac405693812f1c3aa89c1d227587b151a8c78b36ea79378523d5e5d0e2856824cd30246f381a432ce85703c2397d5db694a81354d9443320a9ceaf494
+MISC metadata.xml 668 SHA256 8626542e303fa1a84dc32000be912428a9e3995f3bba49092c2edcddafa67b99 SHA512 59b016e44c6a594bb597d7952e62346f108fc082e74fc17639580ef281c05513bbbfa50f362427f969e320f8f9dbf647c772a5760ae6045e6092f3e617740ed6 WHIRLPOOL 1120f58f1645e9acd808c0e828a63625e5841d4c9a2cea8624e09cbd6332c780229ddc2d00fa43ea003ea3a2562f0046ca34459a08ebbfeea3eb038e8b7ef44f
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..39097f756844
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 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..a073aa0c3e71
--- /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..b8b67670b533
--- /dev/null
+++ b/dev-java/icedtea/Manifest
@@ -0,0 +1,29 @@
+AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619
+AUX icedtea.env.sh 1032 SHA256 60583de47a0258c8ae8713eb5dc2ca157e6568b755e133cf0f4afe5d756a9f7e SHA512 d9ca9312d4f1974d65e201af02d0fa6d1a2af93dd64160ad59815255408cd48957681ae95ce0107842a5c36690f532f60ab2c5ae1be209f3641469e281129cbf WHIRLPOOL 4305c2ab25b377c29f5fd9510a6f02632a51e71665e0ae8691351221d19b9caf5ec24728525ff3d46b37339d7e8779ec2a4f221a06c9039cd7a0753d2dc924ff
+DIST icedtea-2.6-corba-803456f62297.tar.bz2 1073306 SHA256 ff818ceedd154fa4d55d38b50fccd6a19de242a592d9ffbed7368bc56c091b81 SHA512 87b374d6907dcd72043cb3a86eed08e836861c238282fdd8c9684b6653b5788f1d183038572282f92dd81381765ac41243c6faa52033173157bb8b48b928d071 WHIRLPOOL fd9c85f496fc129ca2f7f90afd6c5e824d1f2e44b2ac54147f20c45855eab6107479d6f9ab0d218e56323cbfd78f0f66701ebaa1ec5f7cb115d7eff0a854f9a6
+DIST icedtea-2.6-hotspot-809ae803d8ea.tar.bz2 8210978 SHA256 a6055f2eb2c6f159fdc20fc5268ffb27d6cb7959ed7af28ee8a0f862b5b6dbf8 SHA512 8d4bb7a97e2213d21a99261d9f9a32824830f1b178260cb170eeb45ac54414bd26042dc75b2dc719850638571cf8057d7d3fdb65c32fbed8797e6242ba257e7f WHIRLPOOL e398a14c87bd46ed8e44427aa1630e1d1304b5e5cdf2bde9b2a9f565a88ecc3463eee173c652e47082d8942a04717b39f0c325f87c42f6861bdcf843e5b5fb39
+DIST icedtea-2.6-jaxp-46f2d7395127.tar.bz2 2733486 SHA256 a2642f8792edf7e40169ddafcd7a3c297e75b41f7c65fac2a84787376a65977d SHA512 a08618aca24f80f67669f62743150eaf7a33a602f9b5d806f3c0213261144a15006c4348800e25d5746500735498bc0c8380ee9adc75b6fce17283d9f4971358 WHIRLPOOL 2e2cdea8dae12ba7aedc16197c32e0bac376cbca675334eab6c7cde62a2de38887366212cec9f5fd13fa945f5e11d370462edc6531584d6a78148d9c7807d9fb
+DIST icedtea-2.6-jaxws-e17af60ebbd6.tar.bz2 2022975 SHA256 a299f434b48e5ed1e57085be5515ea1dbfbad971d08d386f070d653d2ea878be SHA512 145ae63e81a1c2cce6e462c2b38b05d79d138a89f5f4176151e87a8dcfb27c0b8f47c826ea12d85acdd31733ea253aaf9fbb019e605a4cc24c4b66803ca01f61 WHIRLPOOL eb404fd684c1f156f0fc481da0137c31a1eabce2f9867e8a67a67a392b1e62b741b32d3b23ef9c3866026bac87925279159abbc6c6b84521e05ea2f099aafe0e
+DIST icedtea-2.6-jdk-082c6e8b8812.tar.bz2 32843611 SHA256 ce4eca8a320c7514a7ecaa513a2a9cbb82a74e0256c8ba277fa692debe952eb5 SHA512 7974d9d7d55c4a57b53ee5e29f36ef058d207eee1701eac0e8b32b8f13a9084b08ff9fcde00cb16f4c23fa6bf371361f183b07f418cd6d200b67a67f86fa6785 WHIRLPOOL 431b45c17a9834799cacc575c9d96b8e7a19460491edcbfe01101270602aca0fc522dcebedce6bcf33f61bab632d58f169e0af70636533bdc4c3f51337d8a48f
+DIST icedtea-2.6-langtools-cddb1f9f8b9c.tar.bz2 1711691 SHA256 650a2d3881ba02ea10cbb6ddeef3888103fccaa904cb23517e07b3acd26d4c7f SHA512 6301ca17725dcf085b4dea74d453bb2ec9e7620b6791bdba6cf70fd4fac3f53679c8281db17c343ae4639a3c5431d9af09d76619825e2a8f3072bf46e09a9ce1 WHIRLPOOL 75111e57719c8d7956046ffb573682074a9013e6b01636d5083018fae34a6986f58eef2c89281d7708b644cd9847f11c24a6f1f6d18b8ef03ac4f9b801f07628
+DIST icedtea-2.6-openjdk-499e7894cc44.tar.bz2 130600 SHA256 0d521feed6275102ba3b3ee394330fefe20463dd63caa7197c7fd93e132519fe SHA512 95a0168b109266dfe7af97355f34888559f1978201fc7fe9c1b7b15074793d850a68ce031603bb62c4ad6790e8575ebf7e73fca2fdd8f03c9ab0a4e24e3e07b8 WHIRLPOOL 264b87945b13cf6a0adde36b084bb6889a0567e80b035ab4296b8f8bbe433c058ccfa09e32ba1a14914b5b44ea1ecf2a56c8f894c18d31087b0aed504b04a39f
+DIST icedtea-2.6.11.tar.xz 2117880 SHA256 20063c314535e4ed4b8099e497b880e4f346c85e7315a2573d0f398b973777c5 SHA512 b77b5cf632d357f6ca87f2a9cfe179b95941a10e669997feb2506da56baa09fa5b94ea6025471ac6e4165bd9769799c84159d5fa39c19f1111bdb8770314d587 WHIRLPOOL 80af9323a6a8315f0a68a75db736ec35fbfa53a1b30f052cfa80256aa1dd04e9619ef9ccf9999333bc90826ca3b57750c4f62b64549ee39a71e73f7cc57d277b
+DIST icedtea-3.5-aarch32-b93c39bf2bcf.tar.xz 6743892 SHA256 38e24d556aa269a5168e251b1fa97e84467a722fff27fa2f81de315854f18a33 SHA512 11d25efc36eb776fab3dd411c585d7c3ca6793ac54e17952ed43d22a6928a72fdf4625e836edafb07be3c6ee8612e258c749f5f661d61fb4b90675ed93896e48 WHIRLPOOL a4f931e56b27fab5dfa9a8ff053899b51182407eaa7b6db8a00a83915535b48f241776d7d089b532e6bb89ed629273621c9a65faf71a9efbc095ff679bd7a612
+DIST icedtea-3.5-corba-b5485d6bc171.tar.xz 937092 SHA256 0b03af9726b6d47811166ab8343b553de33b4285f780c6c6df98a2e697613a0c SHA512 19d4e311edd3ed5f388373e3c819a9317dbaa561c4a22c924079cef284d16ce06d5468510b84fe3f1867570e8caed915ec4edc2479bd44686493bcf9fbf523de WHIRLPOOL dd4735a77cd8f82bae443a5330a2af97f9c925fa66e94b59cdeb6475dc521e5cd44fa0815ab5c703b1a966e8238789c150985ab354b032ab687575411a5166b7
+DIST icedtea-3.5-hotspot-ecaa25cbc662.tar.xz 6820580 SHA256 a6e974e8447a661e5ae5a17e44b703395d7fc551af540890de4dcda481ebee38 SHA512 c16b5db736b553acb74bce50f37213a181fc26a6fdc7ef9242aa40c46afea78e52ec08a167f5fe29023e0ecef1f92b45b51250208d63ef88f5686fe2b12d4c34 WHIRLPOOL f513fe1e03e6f400991e9fceeacc6eef668a8135c4e7833bebac1b2fb43242195e2b3c3476e339f4e01704b042eb0606e716d3ae974bd226c026cc42eb94cc9f
+DIST icedtea-3.5-jaxp-c8bf6508b7a5.tar.xz 2296924 SHA256 96a844aec7d873a260a22622b028165d862bd5842a64091ed0818309a49225a0 SHA512 5f932ce9453412d3a1b3108cf143836712cc46676093441b02db24652d4d30dbf21849cbb6fe75071961312c747289b8feccdf23c94b9e9ab2b78bdefd7c72df WHIRLPOOL d6d31ec9a2cf395e4d03c63a3ad81ef4192d699fa95b57e94265a4481144519db3f54c127bc71b9d220180fab1c4132bf1955a67c6531ff49dd0d679e50e1f4a
+DIST icedtea-3.5-jaxws-4fb919272935.tar.xz 2267608 SHA256 86ae65fb5a7566216639b915abdf6f2c8522c0bfcc1bf4fe521bc3ce0a72046e SHA512 3259181c303fc1642816e5d3291d81e80fb62764edd38734876e9581d4d1fcb718bf5f2cc8dbf0362f218105effa50fa50a4e4b79e08501e991ff4bdbbf881cb WHIRLPOOL 967599341e5cc990bcb65ddcc58fc4f2a84bdad7aa33e5b7b7114f65167e2d6ce918a8fd70913a368d252c2ce143ff45504e9cb7fa12f0ed3c66ec4b2ed826fc
+DIST icedtea-3.5-jdk-db0baea3a4f0.tar.xz 39030920 SHA256 65286cbd774afd95b8fd2c50c30d9d33d08156243805b10cb373a6463e66dea4 SHA512 9f60583ffd61d8dec73f17c7dbbf12e275c9c46b8cbafc59a969b11a0b65ae1f6366051fc1c76538b217a2b55510e112a815b279a9c19046f7035d2680ca2b9f WHIRLPOOL 8c70a610cb2d77d4c571c165ae4e118450d21425576f77585a0b694ba2abe417f06b235d808822f3449fdfd3d1491b67411ca6ffc4c80a81e515a73fbb7fd8cf
+DIST icedtea-3.5-langtools-74bbbc7a8bd3.tar.xz 2066912 SHA256 fe554a5d3bcd7d5f2a545f6e06a50e3d5adf2619d1566b80acb0b3926953566b SHA512 856fecddf01c6eb89055bd905d0df1d61d4a1605f4663ff33357c1d4372150ddf4d5d2e6e8f2c4d8c92071075b7090c9fdbe5a10d2c0c61b1d242fe938dc1b8c WHIRLPOOL 874b16298640e6555366b387a8257f4405c76e92b7764d0807cd5c33d418c4b03be4486f06f7b7c1fba4997a48ebf4f07f06f4de17f472f040c293f70385cced
+DIST icedtea-3.5-nashorn-bad6bd2d128e.tar.xz 2225708 SHA256 9e47a8838ff9f6aca596c9f07e6af6a24f7db486d1809a6e07d77cd2ecc32555 SHA512 3e3ca6942b32c1b342a108cdd08d72da49249c88c4f5da04b2e822dcb12d144584a10eb7e5c109f9bf49cd84ab957577db83d55ff31471ef76b0748b44b54896 WHIRLPOOL ca2e99d1853a75f1f3c4a6073133d2389b16c7fbd5aa84ae83177898e9972fd1b72bfffd2ab47b1bfa99cb3c509c4420fe4b385bfe1acd95b83285534ac55235
+DIST icedtea-3.5-openjdk-80ab5dd98579.tar.xz 333312 SHA256 5834862d650ed290d88610d60abbfbb1f8bf47cd485051e1617ffee011cede28 SHA512 13ea05cdc90f18a1600c7771314fcf2d07bfef186e7fe9125cf37e4a62f51a1d26dab653ee294fd9079419b3297f812c6b9c516def11ede8355dd2f6d8e7a08a WHIRLPOOL 0fae338f860e1c78f835962716212020f56c50a0dc56fe3d68542f7aa34f0b33578c9d9feb7526d441734c56534aa555a87c8fa504025a839fe59c594c5bb821
+DIST icedtea-3.5-shenandoah-26bb4cd21d34.tar.xz 6928840 SHA256 71b862293bd17e96f5f1a57553c17ae32dca5b4586ba592118b7d16aee63547a SHA512 3cd1856a1dbcdfc7fac3293b7a8b449dc7632b797dab9b665cb9248bcb14f3bb635760f3eaebafbe3f662a24c5125dbb2572c525dbe5d02f02806ae6d8a2eaec WHIRLPOOL 1f4cdb1c068650f4c9fe1c8239cdb6a3fd668d67e8a740f6f088b9d8834bad13fbdcc485ba2e0b6d6049e3f820ee44e38b2da46889217a46f3954cc12ab36b82
+DIST icedtea-3.5.1.tar.xz 1492912 SHA256 8eaa6ac93d4a1989460109246f78427acc5493f847c7b2fc80d3a5d918d811c9 SHA512 2f9283606c275c1b326b39a649cedf0ff3a6b59be1ac455f44ced2fac16fba36758a63f227fa66c1f8ddf252a67540f6332fdf415f9dcbd09fe28308d1989cf6 WHIRLPOOL c6915b3ee3829da96dc890d28188b16e89269041309d8317a7dc17338791e16589ab72c0c0708a97dd492caf770dab2e5875703319993f5aede95078da4aee59
+DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
+DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
+DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
+EBUILD icedtea-3.5.1.ebuild 12966 SHA256 c8a35f74808adff0e3f3c62ab9de5bce8dd39312ecd7c761f592ed5715b4a3d4 SHA512 03275f47964fa8eb0d9ab5c5f033bf6476cb4210b2ce0dfee673ad87860eea36a6930790c7438e63525ba0d20e8dec9be60ba74b529fc82d0a05d69f477378cc WHIRLPOOL f23f254b6a2cb2673f8a7275343299cde03527d41a98c6574033fc94fa9ac813a2347a2edbf823f87918206543903bf96d8e498e2f88f0804c9a786b9a6661c8
+EBUILD icedtea-7.2.6.11.ebuild 12061 SHA256 2aab161b8a51ebda8141c2e98d0277f803d3fdbf3dc3a94f0fc85693944b6200 SHA512 10f1f9a4b5840ed085e19c52560e7164433bf030e8b628609a31cb9fbdb7d7e7c95a767d8e64a6036594354b3192647c95f24b1cd2290e81dd0b3656dd66f247 WHIRLPOOL bd642fd923b2a599447898e10b9f0019a6132a3256456d8e955054e41d0acaeb171832110254cefcb72d0007f6a284cde629edd8b5f240023eb039fdcb4c85e8
+MISC ChangeLog 12852 SHA256 8fd3405e6b1c282f5e20915d5fa102a25f1fb28cd0075d3ab7064f36bc78b47c SHA512 bf2655d36ecbb5949a9ce75be2033a47cdebea1498f6d75f7baf3f3e88296d73692331d47ac36c2d2f0841d2e979707d9ed6332bc60779a97431581a0007057e WHIRLPOOL 130d0c513f4008804c99445fdb0d8927483b2a82c0e821628092e03d08f553109802b92c04752de4e1fc2b00a9e1c14b1bd457503ac468c81cf17056542919ec
+MISC ChangeLog-2015 32216 SHA256 a68042826b80e3d9301c28e935cf21b9d778631b87ea7c6e01e4c34841402bc4 SHA512 09387898459391016c2d63971de924f28023627800ce2358c083e2311696a818763c89b24bad2bb65ce7679d19aa9925fa1289e5997c2b67cc47c933a4f14c95 WHIRLPOOL f1a5fbff8843c6b8ffcd80c440de1bb9ff02f191de857cba6d53ba76e7e19b47a9ecc3cd8148a89b32f920475945bafd1beab6a57f1317c9a55501afd9edcf9b
+MISC metadata.xml 2106 SHA256 b13623d8f8ee3396850c941480090aea564fd2af5956917da53bcce845c1d978 SHA512 6d856e82120f59d3b3fb873c837f27ae353fcbcb8bc5143cc5cb345fef0352780153c361f8b89339cd342a2bc311a6bfbce2468515de5c0fe71da9c666505374 WHIRLPOOL 3d0e11b0d2288ac321f9c972b01617ec9bb16e279264db0679cf37372e201d7bc63efba57e24ad81282d54798955466d9ecebed4c1d2c7d22c7b1e7b4fa2479c
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..cf3791afd738
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea.env.sh
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 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/$([[ ${SLOT} = 7 ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/xawt/)"
+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.5.1.ebuild b/dev-java/icedtea/icedtea-3.5.1.ebuild
new file mode 100644
index 000000000000..60dc9b5643ce
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.5.1.ebuild
@@ -0,0 +1,396 @@
+# 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="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="b5485d6bc171.tar.xz"
+JAXP_TARBALL="c8bf6508b7a5.tar.xz"
+JAXWS_TARBALL="4fb919272935.tar.xz"
+JDK_TARBALL="db0baea3a4f0.tar.xz"
+LANGTOOLS_TARBALL="74bbbc7a8bd3.tar.xz"
+OPENJDK_TARBALL="80ab5dd98579.tar.xz"
+NASHORN_TARBALL="bad6bd2d128e.tar.xz"
+HOTSPOT_TARBALL="ecaa25cbc662.tar.xz"
+SHENANDOAH_TARBALL="26bb4cd21d34.tar.xz"
+AARCH32_TARBALL="b93c39bf2bcf.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 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-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+# 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=
+	>=media-libs/lcms-2.5: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 )"
+
+# 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
+# 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}
+
+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
+
+	# Warn about potential problems with ccache enabled
+	if has ccache ${FEATURES}; then
+		ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'
+		config+=" --enable-ccache"
+	else
+		config+=" --disable-ccache"
+	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-downloading --disable-Werror --disable-tests \
+		--enable-system-lcms --enable-system-jpeg \
+		--enable-system-zlib --disable-systemtap-tests \
+		--enable-improved-font-rendering \
+		$(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_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#/}"
+
+	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}
+
+	# 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; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-java/icedtea/icedtea-7.2.6.11.ebuild b/dev-java/icedtea/icedtea-7.2.6.11.ebuild
new file mode 100644
index 000000000000..0b01f2d8254d
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.6.11.ebuild
@@ -0,0 +1,387 @@
+# 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="6"
+SLOT="7"
+
+inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+
+ICEDTEA_VER=$(get_version_component_range 2-4)
+ICEDTEA_BRANCH=$(get_version_component_range 2-3)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+
+CORBA_TARBALL="803456f62297.tar.bz2"
+JAXP_TARBALL="46f2d7395127.tar.bz2"
+JAXWS_TARBALL="e17af60ebbd6.tar.bz2"
+JDK_TARBALL="082c6e8b8812.tar.bz2"
+LANGTOOLS_TARBALL="cddb1f9f8b9c.tar.bz2"
+OPENJDK_TARBALL="499e7894cc44.tar.bz2"
+HOTSPOT_TARBALL="809ae803d8ea.tar.bz2"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
+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}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_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.bz2 -> ${OPENJDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL}
+	${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_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 ~arm64 ~x86"
+
+IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
+	jamvm javascript +jbootstrap kerberos libressl nsplugin nss pax_kernel
+	pulseaudio sctp selinux smartcard source +sunec 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:=
+	>=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/libXt
+	x11-libs/libXcomposite"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	app-misc/mime-types
+	>=dev-libs/glib-2.26:2
+	>=dev-util/systemtap-1
+	media-libs/fontconfig
+	>=media-libs/freetype-2.5.3:2=
+	>=media-libs/lcms-2.5
+	>=sys-libs/zlib-1.2.3:=
+	virtual/jpeg:0=
+	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
+	)
+	javascript? ( dev-java/rhino:1.6 )
+	kerberos? ( virtual/krb5 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	sctp? ( net-misc/lksctp-tools )
+	smartcard? ( sys-apps/pcsc-lite )
+	sunec? ( >=dev-libs/nss-3.16.1-r1 )"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	!dev-java/icedtea-web:7
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( ${CUPS_COMMON_DEP} )
+	!headless-awt? ( ${X_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:7
+		dev-java/icedtea:7
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.2
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	!libressl? ( dev-libs/openssl )
+	libressl? ( dev-libs/libressl )
+	sys-apps/attr
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7(+)] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+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-7 icedtea-bin-7
+		icedtea-6 gcj-jdk"
+	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 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 CACAO on ppc and Zero on anything else
+	if test "x${hotspot_port}" != "xyes"; then
+		if use ppc; then
+			use_cacao="yes"
+		else
+			use_zero="yes"
+		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
+		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
+		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
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	if use javascript ; then
+		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+	else
+		config+=" --without-rhino"
+	fi
+
+	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-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_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-downloading --disable-Werror --disable-tests \
+		--enable-system-lcms --enable-system-jpeg \
+		--enable-system-zlib --disable-systemtap-tests \
+		--enable-improved-font-rendering \
+		$(use_enable !headless-awt system-gif) \
+		$(use_enable !headless-awt system-png) \
+		$(use_enable !debug optimizations) \
+		$(use_enable cups system-cups) \
+		$(use_enable doc docs) \
+		$(use_enable gtk system-gtk) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable nss) \
+		$(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}
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# With ant >=1.8.2 all required tasks are part of ant-core
+	export ANT_TASKS="none"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake check
+}
+
+src_install() {
+	default
+
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	if ! use alsa; then
+		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
+		   "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || 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}
+
+	# 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() {
+	if has_version "<=dev-java/icedtea-7.2.0:7"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
+		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
+		elog "If you had icedtea7 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+
+	gnome2_icon_savelist;
+}
+
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
new file mode 100644
index 000000000000..fd585923d58d
--- /dev/null
+++ b/dev-java/icedtea/metadata.xml
@@ -0,0 +1,38 @@
+<?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>
+  <description>Proxy Maintainer</description>
+</maintainer>
+<maintainer type="person">
+  <email>chewi@gentoo.org</email>
+  <name>James Le Cuirot</name>
+  <description>Committer</description>
+</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="nss">Enable NSS security provider support.</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="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (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="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/Manifest b/dev-java/icu4j/Manifest
new file mode 100644
index 000000000000..8db8db22b102
--- /dev/null
+++ b/dev-java/icu4j/Manifest
@@ -0,0 +1,9 @@
+DIST icu4j-54_1_1.tgz 23457651 SHA256 1919a355742172dbd18021dfb2fd008f5c73168d2d5a39d705721614029d6704 SHA512 c41f7f9fb0819767da48ac21c4883a628da8397e0ad5b0d75e51d9185b5511608c9a635933c4ae2e0c8911b2cdecf47bc661050935bbae2ba58abfb5ad04dadf WHIRLPOOL d7c35283547c598694ead10620df1511cbe4602415ca8ee2d32ee3b291d28015db4fcd5fb3f426bf524e449099562545c3bdab81209af244890b53ea091f9f1f
+DIST icu4j-55_1.tgz 23617640 SHA256 da4c91e6b89bef3da22be475e63916c4f4f304b9689d5fdc5b40a52106efc4c3 SHA512 706daed61d9d3722a0813d175fa66b24570abba492c32704d4df924861e5d2592a4a5ff40fdec2bd3fb662c3679dbc9addd580966c3cc69470d14e3fce27a054 WHIRLPOOL b6cace3616d6d0b1c185a744cc1f0a3728682557d51f4b6658f174195c1eb369a2a005e2fd9eb4b421de761e47c2424368359a1948594da7b2f8cd6e1b0d2f33
+DIST icu4j-56_1.tgz 23189284 SHA256 0b227aae833af37daf6b8dfbd265b4a3bae92ecb0d5f79d34ccb6dd445135369 SHA512 9ecc36c03a6713dbfb909e109b5e982525958b6137bd7006c93ff3b8578d816c59fa331555b43c94248f392ba9b456b1adb37be74e02e9ea818c8a9a7c669f4a WHIRLPOOL acf1bcece9cf1aaa31b05618bd1b79fc5f308a93c9f1b64c69ed2171dcda3031b0d76ebf196af27c0d1712e8be8f7cdf0263ad9432b592afbd5098f05039828c
+EBUILD icu4j-54.1.1.ebuild 1223 SHA256 5eb978df592bc3fee31af0d17e4f1c4dc74059b3cbfecba2b4103da865d69283 SHA512 cca8d8494d59bb302509ec91cb6e74e3026054ae291e2ce42d46318da519c95d0e3189872ab08678d210ff5391b5c09ceddbd6c4577eedaf50888f061fd534ab WHIRLPOOL f41a990bb9c7bf5d41721af57a184bb893c9af3204697fd599e380d6568962fcf32b0ff3aee326e374cb39f2f38e3d050bcb7de27ddf0a348b57a5b54937355f
+EBUILD icu4j-55.1.ebuild 1146 SHA256 c0c0105212736d7aff09b199c63b930a40ff9805631c1e348f64c512be4b54f1 SHA512 4b2a01321ab00fee83ebb9ea7728e5ea9f55c9fc6b423b12cfa30458df8ab8383955914e7d9d44c1d184824b861d3c719aea659b01af5b7d06d63c7c9401fed7 WHIRLPOOL ed3e1feabf7cdf55d5e808eafd642fff58686a1b854d72b1dd3221573fb340c29dadf92a997f3a12b2f6a5e637664ed451bc65062c0979224e085e1933b03d40
+EBUILD icu4j-56.1.ebuild 1091 SHA256 f697c34e714f611a95d957701b99bf09b48b2b309daaa27bf6ccf263e00722f3 SHA512 a658683adce960be5ebbc1c7fa939caa2bc8547122d95549324e0c155cedfeef968221630c03c0d8eca6c3580712afdc2668bf3e653a1d284dd54bde6868cc39 WHIRLPOOL 73e5ae496836f488ea6c774ebf401786c02b411b31ebe2f31077ddfbcf2388734f9cb432f2feb41584ef212aeeba12a788f149371d47a15a777710e1083af50a
+MISC ChangeLog 4909 SHA256 b39b06ee01e49d1ebcca3421a19c14fceb7ff6a9af8b0cbf2ce5c107d3f6c4ae SHA512 3010e6e3d2c70b6eb9594d9b26cbc90d5ab2574e064f1ec5b5916f72bde454d47669e83990aadffb1c30688fa093cb30a683f22ea002d5bafd571330cd39eac1 WHIRLPOOL f2938a21ee77a8e4e6a0d75f05d9d9909a49b60e2c477df104f415a834249d6ce5c3a81e1364d8d7cd0b22b8cab5be26f9b1047b9d83d3a2dca67e550dc58663
+MISC ChangeLog-2015 9961 SHA256 cd16a36a6f3b4c8ac6e925b564a178d6d1ad7f168cc29fb864b069fb38f49325 SHA512 d5879d54d97760f5720baecc371d56b781b250e592abd3f3b9282bc4cb923827ce67721062b907b3501bcf9b3ee7c8912a73219ca5e291870c4ccb499de66a07 WHIRLPOOL 49651f4f0ceadb15647219cc5598a520015d6b2ac98dbff836d7ec91a4ecb7437ba02397391285e5393758172c214685b59d65e2b9f491477f2893d88575addc
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..82a976fcd4a4
--- /dev/null
+++ b/dev-java/icu4j/icu4j-54.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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..ab03d68edaac
--- /dev/null
+++ b/dev-java/icu4j/icu4j-55.1.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 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 ~x86-fbsd ~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..44bf2b8ba967
--- /dev/null
+++ b/dev-java/icu4j/icu4j-56.1.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 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 ~x86-fbsd ~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/Manifest b/dev-java/idm-console-framework/Manifest
new file mode 100644
index 000000000000..297c8a64ae52
--- /dev/null
+++ b/dev-java/idm-console-framework/Manifest
@@ -0,0 +1,5 @@
+DIST idm-console-framework-1.1.7.tar.bz2 708770 SHA256 0d3eb64b2a7ce349add244b1544fb18a3dbf04c40b09ef91ad1ad04b44286d5c SHA512 ce4441cbc9917f6ffd0ef6ced44c7ebc542c14db60e7c6eeb844f8c68cbb15fe533916b9ea363d1e865759138d92d38365e9172206c7cd0fa385f4bf443aa739 WHIRLPOOL 1fc8f1dd66e61ed3149e0cf36a76b22794e2836cf3ac95c7172a85bc4b69476d0785f2cd2da05add7e9e3db52acef89a86273715339798f9cf71d8d9f8be558a
+EBUILD idm-console-framework-1.1.7.ebuild 1597 SHA256 f407e3d4c49d8dfec7511d19beda0b2cdfa90754aac5a63039354d5ee2891de4 SHA512 d9a8e630971d16262b9a519f9bc4853fa2676a87c363e944083d9d81e8fc718bb99eadbee679110e9795d711f4e6942520c93dcc6de86294c3301762e9065095 WHIRLPOOL bf2e3f687301adbc538855fa1dfd6fbad86758d3a992e7eae6324bda6d3b459ec3f7c16da3e786af93a7e46bab06465b6f9a378012e57933bbb512790ae548cf
+MISC ChangeLog 2536 SHA256 8c51370212ce9472422f173394bfda5d1185bc53548091fb7541ec98319b76aa SHA512 e51725ae55e60d8cc2b94964ba63047e61e8bb8773e34fd79d168d0a9f3e9ce848750e60a918b2a55126fedf67abed3a119505c20f26d28e6a191be91e53b423 WHIRLPOOL 3922f32b787337c593bf2203a82edae15e9391a57f63f11f8867d0a531c55963560784f5d998ecd6077b4f986c55296f613cc5c8ad85a39f5518a15baa057618
+MISC ChangeLog-2015 1093 SHA256 84b57810c83da1946a155addba1b3851887688c0d1fe24df1c9dbb7c1a6f385c SHA512 7c257b01c81fc70234d6fc53a57b3fa4d4fe8631a893a61f62184dd033468a3217ebd8e4824d6d676b360f59fdad1dd1a744adc6cc5ff46f907b6eb5f0092100 WHIRLPOOL 85a96f9c2d86a35979f6a74f4f4dd7fa731010f1693b26d054d856b3b35fbd52550a050f5831d6a26bca4d14fc548c6270de1d6bab570b4842072feb5c37fd99
+MISC metadata.xml 703 SHA256 4f3a8fcff422c9b76148216abd2d7f46a37bf8a44a5d305789d6b1d5af1ebb3b SHA512 1a753d0ea695e27f608613671beba82f8a9c080a7bb45858ce186b32b54d508d18823fbaa1025eed00f2f3259874b55f6154c6b5ddb257e770488f433b2a326b WHIRLPOOL b3d262fd70615b3ce749d8ac6561447d255bacff7b2fed3b55f7e77600975720ac0fdaaf38b1fb91d1decfde9fa2a8a9211ee512ac7fb44c1434097570ee23e5
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..c4db44265c6b
--- /dev/null
+++ b/dev-java/idm-console-framework/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>wibrown@redhat.com</email>
+		<name>William Brown</name>
+		<description>Proxy maintainer. Part of the 389-ds core team.</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>wes@sol1.com.au</email>
+			<name>Wes</name>
+		    <description>Proxy maintainer.</description>
+		</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/Manifest b/dev-java/ini4j/Manifest
new file mode 100644
index 000000000000..f70371d18186
--- /dev/null
+++ b/dev-java/ini4j/Manifest
@@ -0,0 +1,5 @@
+AUX ini4j-0.5.1-remove.patch 801 SHA256 0281921e06a78d42ce6704155dbb5bbff741bd58699d9263daefbde394fc1188 SHA512 e2e2a69311f0efc9887c089bc41ad7921b04d8a32add9bd5eb68ad528d82640bf6bf30b990ba2dba3989140c3d47fa155b81c1cb98260fe2b902dff3e28fef3f WHIRLPOOL 92b37e2f3f8e00deba1b85b5127ad9c219c4575a7d3619da7395f25093f544c4b414360b1066a794198026e14a67ad9c86b9f2c513250478d809738f118d514e
+DIST ini4j-0.5.1.jar 61117 SHA256 99dae5a34055ae2dc08f95d5d3abc4da79c7e3964675be2944510c93914c99e3 SHA512 1c4b5218d092cab9374070c8ae55c7a2483b30893f5af5cfe5d74054b2f5261fe2e1a477a650589d2fc7518b4dcce91a2308ab35bba6b3d918f5e5c19a55eb9a WHIRLPOOL a5fb5cbf6366c30e4ef4b022f70d8c7cacb28dd8ba92c985b23470eec319df96975c69384315ca63e5e84f9f2366481a7b8778ed29e3b21f5e64dd7f1d823396
+EBUILD ini4j-0.5.1.ebuild 576 SHA256 09f67baeee84874f94f492e119cf5dd846fc3abd9779c49e6870194811dfa17c SHA512 3b428d07dfae00a1db50663df64a647f89b0a8f94bd2856bd2668dda0a8f109d61890eca5c18781c7910f63c53902d21ae612669879667c66b794ae257ed2ffc WHIRLPOOL fa11a92ddf31480cf898826bbca2bf8bea8d7b83d0b3e2a5d0cb6ab5381edb5033fa1f525ea81c04a335ebeafb1401ca9d5ac6cf0faaa03df866970de3c2b03d
+MISC ChangeLog 1956 SHA256 21c2a4f26ad592dd53223ee9c8dc30a4f415cb18b10726975ed974f9427d0d34 SHA512 478b18f84f68bbd41d85a240e885a70edc68e69757089513ff4cce2c82f4b5ea7d67a071c720c382c0666b01d116078de7a50c9a1ad2b7a2f474341d6d691c72 WHIRLPOOL 1ed04ef75ffde1e72b6dc9269773754a3785db68344a03ee0bd7db8d79c94523e75501063677b1a1c34470ce67ab7672da9a44072b9c418f3079ae4396c24deb
+MISC metadata.xml 406 SHA256 8b4fc61567ed3606b2f4d70e76a15515f914632d5d55c3daf278b0759b6e4b4b SHA512 089ac1e2bec5324bf326f74f516e5d60f7019e12598b65a1cbc4004d41bb73bc0b2f0f1934204f3b39b0c92f1dba0a1a6b1c09b9269e03fa7567e0c4b269beee WHIRLPOOL 2c26d3819eb6d27bcfc1170c05cfc14bbbe8d0f011a78c78d8d3dbf9bd84c7457d1bcb76108388ad2eb57d6bc1dc0d4163ca789a2c52adb83d2137b226f23006
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/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/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/Manifest b/dev-java/invokebinder/Manifest
new file mode 100644
index 000000000000..1c5c940ebb42
--- /dev/null
+++ b/dev-java/invokebinder/Manifest
@@ -0,0 +1,6 @@
+AUX invokebinder-1.6-build.xml 9883 SHA256 0011d4419132a56398a38a5015c21e670ebddf47c1978be1d66c93fcc7280275 SHA512 d498da02a99a4dbbf6c05862a027bca3ed06b8575b8cd7f0c1413750b88b48fe6823ee0c02067a6e476f737b8884a1e7e53bcc9dfe7f74613601bd780c3965a2 WHIRLPOOL 1840b857df58bff7a1637e734cc2f7d68b174fc5b7e375190887cce2e4014c0ef926b26666d7d9fb9cc20a6cf93e8414da9dca600c04aa2b852018a62e367e81
+DIST invokebinder-1.6.tar.gz 36027 SHA256 db59600de448c9253976c0a288ad6575edbdc83ed6a6d58332b902ab9d337c4d SHA512 cacdd6dd5fe74bbba940be1b3d53b183adc247b74e89cc0784805b2ad2c63d12ca1abe20bacf0a90ea50db7574e43d4ac52b5a46e61912e5153e2ac2f6bc559a WHIRLPOOL 967f8bb39b588d381e3495756e79b7e738f631935aadddf5c6396d7367fcd19584f4d4ae3cb9734aafac17ca62906da8fc0459a9194f9f55671d5503b19265de
+EBUILD invokebinder-1.6.ebuild 896 SHA256 a5792f5d0de20b824b0a353529a7c78bfe3a71a9b1ad52b69c691a765bceaec9 SHA512 0b26690302f1676e171d618a23c9a3d0de1c2bb9b403c3481fcbf6ac604f1f3e948ba4769632e1efbde3479f2a9aebc8eaff9e6f3adc0762fa33be0a87715817 WHIRLPOOL 11c8788b19f761d7e210e64e5cba9830823ad51d890b5142b62de8d7a0ba7a474df8224fbc054845c134445172e1f88cbe5ed7f3d45d6e9b45f6ff72404db37d
+MISC ChangeLog 3360 SHA256 aa5e4c1bd812c99fedb4174f37f72085e685c59123318557d23b6fc45b965970 SHA512 c05180dd26b7a1f78c200b1a66291b24148df8b4b55cb2eb0f6457f1e585d253897853d17c32d0b9cd8155f0318bee3edb1ec2d66c4ef5434af83370916287a6 WHIRLPOOL 6a5023f50554c39c42e3b85d4974745edc27ed80636051ab8cfb885a1a98e5c75f83fe36d0c6641ff7345636e1a604d2e267079728ebb560baa3194c1974e1e9
+MISC ChangeLog-2015 1079 SHA256 72ebb34a47c8414b661562d3d30baf2b42c12a82fe387b7b0c71d0cd6cd418f3 SHA512 f817751c5ef83a051e15389ddde4b2b9c457bb236b665c5840daea24485395e2d113608cd088a7103c3b2105dde3ba7cf76c5f3c74a09cde8fce4118d9550fff WHIRLPOOL 74c3321dba448cccf2b2b634097fdf1e49a3da2cfbfc865feabb2cd8ade56dc08be4ef2f365cf25eafa9335d46d34e64db959fc81c533d5696b564441f6d23d8
+MISC metadata.xml 331 SHA256 afa4fba7975fd94257ce3ff3604bdd5365fdee8b87b4f64e8f0b08e41041400f SHA512 f3e69ac0e7eb827f93dc366045471146598db7454a4bf3eab17611189916f2f668f2d24c4ceab1790d0e67a39adabd9b76e669a52ce96110511a051fcea81fd7 WHIRLPOOL 5925a7df8729b07ab33188ce0f60e7b8cd90a1820f14c14fc037b26199f6ce99331a337a0797cce9ece6ad7727a38b52870a3d9cc42e2426fef37245eda29872
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/Manifest b/dev-java/iso-relax/Manifest
new file mode 100644
index 000000000000..2d78f9e6713a
--- /dev/null
+++ b/dev-java/iso-relax/Manifest
@@ -0,0 +1,5 @@
+DIST iso-relax-20050331.tar.bz2 696665 SHA256 3e3716ccc553c1a756503a56bcf92a64f6e0df3df89e6fa951a990d2c4601d70 SHA512 c327b461785ce647f9913afa6f5b77c41440e806d566884058be76e14a118d14fa305a1bc0157ee150b199b573e75af954311dc79eb8535599544f094526320a WHIRLPOOL e158e5a28d0f734b4a59923615449663b0dfc5b6b2a3ecbbff3ed37ac051fa1e6434d131195bcb6a87b5bdc36435f941bde29922be2ec92bea5c5404c8000e5e
+EBUILD iso-relax-20050331-r4.ebuild 762 SHA256 75d1f14200198281e592ebd12c2aeebc58a7e62b5545dfb89c4fa7917771ac96 SHA512 2bad91bf3e87e95cee700b8e073a3f349b06adfa2237bb65a5803d75758d9bf4d34d7d9233095026ab2898b15d76d7dbe79421891d31afce5ea8074d314734e1 WHIRLPOOL 5e3a45ea50c2d0287cb9bc8aeea19780459f7d6c7674513d7a26d9bcef83c65e2b590ca20a28de568528dce6372417850723d97c1afacce8d3019f7c1be40abc
+MISC ChangeLog 4510 SHA256 0b5c6049675eb4bc6c59962dc1c60ddd005d51dce7d96734a542b7bcdfa0978a SHA512 cd5beda0440e9ceb195ebf0d248b7563210d6754bd7b299026fa3aff2a5f56ef38680d5233c0873c6757bd5d1741416d541aad4f06a489554154e78d1e3da71f WHIRLPOOL 0dc2508109582408fc1e430b20a36a841c2f906936cd25b8cf83a5f99c4aed15cf8fdccabc5499066fc12d64da08b7752a9c31803e51b7cf38508d05283d52f8
+MISC ChangeLog-2015 3803 SHA256 c321d9a6d27376b98edb8d8e9e392fe967ddce9b09f504d18951fde1160c43ff SHA512 d46285b2e9bf1cd4a92b991af227e6352b8f7abff1e93df6e06f08094c655b06ffb31842d499229c4b3fd1852885562d0f5a206f886a992feada8594b2f21108 WHIRLPOOL 196cba1d3e8663837e237b00e905b98d41aaa64930be461be39078171c8cbe6920aa0cc75a9f74654ca9ecd57d868174fe9ac87026cea578d44440d31ddba810
+MISC metadata.xml 315 SHA256 4702041889b24a57a12a1a3118abe0a5e537cccca8d7f2623ad9bd389bfab2ce SHA512 08eaff739d58710deda145cdac32ab148112f2364f3f5a898095f0f135bca602354287ebc40ee9ab73d80e344330b810caa87b16b86b3c5696040e16d3a54fd9 WHIRLPOOL fade27207d03b1020a309ca309bf02971fbce47a8483bb8b95cc4672bb304145fffa9866b5891136a29db1d89874450ff11ab13fc10bd5cca7b0d4a1fda443be
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..cc473d9721ed
--- /dev/null
+++ b/dev-java/iso-relax/iso-relax-20050331-r4.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"
+
+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 ~x86-fbsd ~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/Manifest b/dev-java/istack-commons-buildtools/Manifest
new file mode 100644
index 000000000000..4a0ac8f1685d
--- /dev/null
+++ b/dev-java/istack-commons-buildtools/Manifest
@@ -0,0 +1,5 @@
+DIST istack-commons-buildtools-2.22-sources.jar 12689 SHA256 bec644682b4188813c91cc08a1b55761dfec22d6a11be531aeb9acafd896531e SHA512 6cafd354c51fe1b42bb8a6cf52ddf9f6dd97cfdd16182ed5d1a2db6440d18ab84af4d9136df09aa4703694bad546967d25e828c0e1b21fb802c66630da3f4fe4 WHIRLPOOL 6e74271502e59bf1bd64dc6b0af9ee583f79698e5b59f367f9c58af3d3e7560ab4a34b891957bc631b39fbb8d150965ff2c97697ca28b84f5399e97aec873712
+EBUILD istack-commons-buildtools-2.22-r1.ebuild 651 SHA256 fa06d9ab0dce2cb7f04103b7819e09b6394742f71aee180a2e8d5380008e5ecb SHA512 4de4de048de599bc828a973c7ef434a3133a3812bd4ee809f9b142bcac18136b2e1661cea56b4742a610590f0dcafa452d6a4a3ce406be6d02b0a69f1020eb81 WHIRLPOOL ec79b70ef20a7ae094ccdfe358ac65a52e61eebe59840afc8de828dd728005946a3e0c2d61b8b4bebb649362a5bf7843429820253926355fbc7f19a2aedea5cb
+MISC ChangeLog 3492 SHA256 66438c79d0dfd51abf439c2e0f2d1f64ca7b952a8af165eae1a2aa1d02f5c433 SHA512 313bf0f26fcd4248df4efae51c58bdc2465a3a1ae3e896969f60ff30f28317d0fa14c9f1c64674a3eac159c96b0c4c6d1f0f2044af2c6df6b0bf7d0c89318f58 WHIRLPOOL 2fc8c4493fadc25c470c7f9a8243b1335a0425d7fdedea1c6cff8559cf21c47350a738e680016a129db83fcdd4e1a324fed1a4da27eaefd4dad58dbb113efe6d
+MISC ChangeLog-2015 1103 SHA256 3844d771dfe7422de462ae63f383d3c54933f0205b4887dba289bc23d707d90c SHA512 4f6cd38cc10b78afeafcfce8d96bce7feec0388adcac9045a73e6741613a3834b4b89027b8325d8b216d9bbfd2002bb06fa4dbb183c3af30ed7cf3e9b2025ecf WHIRLPOOL e3fb7ff3daf0f3ade0f347339a7e4cba704270d3cedc20c2ac43a2fcf88524e0bd70a301482a98464219caec05b26348244ca840505e53af4dceb432d77bd989
+MISC metadata.xml 315 SHA256 ade5bbedd6ce71e4ad0b902817e7e23084980ad867b01be6a6ddd4165387ae9b SHA512 86fa3fc78d08380af738187033c0b738c63c943e9d649b91515988da3f2bbc6e4689cca0c67d6d0ffe4bfb524f323e810580d996eb03bfc68893ba0618c20e47 WHIRLPOOL 8d516e3d97321cc26b78d4ee0a5e8088824bf3fb7d2382322e0f3d9dfbd2cb6c3e00c7dd76e6198e6c31e6233b711a2be394a8d95d92b789093a0837291b6a10
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/Manifest b/dev-java/istack-commons-runtime/Manifest
new file mode 100644
index 000000000000..0be9baff81d9
--- /dev/null
+++ b/dev-java/istack-commons-runtime/Manifest
@@ -0,0 +1,5 @@
+DIST istack-commons-runtime-2.22-sources.jar 33136 SHA256 06520c4566d7ab28358ce06f03caaf7f44ebccca8b79fdb5d4ddc4df221911bb SHA512 cfabed991cadfa3562a2a281f4b3bdabadd753cd3b9ee918b3f89428e416c0d23aed928d5f61bde4f3958d12f4cb63130354cbf6bf14577ed54871a46d703bdd WHIRLPOOL d35c96f6d7658dceaa7dacf6a23f6993c7f5a0755557f24ad4f23db3a750c635dfa8769b145e100c378050136df27b46fd0ee389a458cd694cab712a019db075
+EBUILD istack-commons-runtime-2.22.ebuild 496 SHA256 cc1e35961e1a583a6f22f2bf23a9eed682ed85e16e32c7c8f4b45b57d55f05a0 SHA512 1d85ae8c5613c44c9a6bbc0bf7a66eb2494a0b70328d4377b9f92729327f78ec410a26db64a09e0b11ad59d9ffc89d0f151b53abe2ebbb6c194e989b343ea139 WHIRLPOOL 89679007fb0238e439b7f22e9ac616a730b74a28535d528f869c194d777f71b85a380a8eb412e35f7db5af9afeec3f6e32d56064c9dd65b60894cc1bad850861
+MISC ChangeLog 3327 SHA256 f28dbcc61e75025e49be0cfb62cf3e1a817135ab457624c4a358920f145660fd SHA512 67b5f24493dadfeec42f0a06b717346c41771b62b454f8ca51e22c07cecca9e505cdd9d59bb4256679ad9c327a3b91ee6e80d39eb4c695ee71d9ffe4f1aef9e5 WHIRLPOOL b83dc719d395614e784760dd373f4262fcd0957dddb8d6ebbaedf8b5472580e642b03e62f336fd274e1aff60c70b01b6ee82ae2d58b4492e7ac71a174248ebf3
+MISC ChangeLog-2015 2675 SHA256 9a54fad9e6ef11401a3a236768bd788700c3cca784a6ac17010329a82c43dad3 SHA512 2a7843318f615cf67a281a15746c88655cb5c0b5fdfdf572750bbf64f0c0644054eba47511363151cf1f25084590841560a8cc31adc2b89663ae5ca6976ed625 WHIRLPOOL eff4a6c823190c933b4376d5e8ed0fd28b41c1606d7b683dc21e19e6479fe5dc94d994f14870374c9dff714a9546afce41aec6df84ec507ea837d9c4b33e6012
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/istack-commons-soimp/Manifest
new file mode 100644
index 000000000000..907b8cb62008
--- /dev/null
+++ b/dev-java/istack-commons-soimp/Manifest
@@ -0,0 +1,5 @@
+DIST istack-commons-soimp-2.22-sources.jar 10208 SHA256 68a2f56b5c269be20ddc6618559fa7be2d9818f6bc7bbd3fa11eb64358509c3a SHA512 28b85550dd92b9fac106ecc2173e728adc7180350f1e47cb619e4d1d6f517cf0878cca87dc7242d80fc0dac5e3d683a2a599bbfb4aa147d33a2089e6f0b28a21 WHIRLPOOL 1abe78f63e11e89b91bc969a1684e869d137d8197e8a598ed14dc8095fef6a91fbfbefa7be572bc74ac817dfe11d11496f772da993466b5ed61c6527493c6699
+EBUILD istack-commons-soimp-2.22.ebuild 606 SHA256 395b5c9e49c2cf13d1f2cc39f8e936f1f187c848a779cddabf89215b4939bf99 SHA512 b8f903c2e6a17341ae927e1e7ea58d6761dc8b16ac80375ab2d2348087576a94cee9a15b72bdd28682c2a5294d30055d5e5cbfacb3e27b80b8e43a21e630e4c1 WHIRLPOOL ee97f127b3a45f6ed7252f061d4746f2b3939533b0a060e6b78ba4094ecfe8beaab0dd7977e5d2803febe92fb1d866c80215693d282c277c86510e0c0130f51f
+MISC ChangeLog 2657 SHA256 9e30130bf57bdacd3b8833af862be8957582770621063b45620a6bacde25c809 SHA512 3eadea6bdae64c897632e1052a030e0d48cc22bdf6d6e19e682ce39312bdbc433f059bf8f709f5265796c5293c712f47130bde9af201cb2e7ae734490e2d8b14 WHIRLPOOL f41ab9850d3e4a55750c374a9fc0f056107b9310d95f9858be83f0eb6a1e03ca2ad0de8670793949d2df1a1660801ccfa97d3e105242f6d728fa7382e64f28c4
+MISC ChangeLog-2015 650 SHA256 51e1a8856d620dd1353cc4553af635400f4b172b2c2577e30e0fa212d784e5db SHA512 f0e7c3f4ed532416467ad01f1f5c5a965f7b39b226484aeb1dbbdb182ecaaf903ae46ec18400ce396a191b860e970c12cbb783eacbc678fbbead34322f659413 WHIRLPOOL ccd20f4d79a41e914c7e440afe9e6f3eaf5fdcf34fcd61938c7f0425e4d5b3bd9617439c273652f1da8bab02ae68fd3df64f712ced39398c6c2fb7d9c8349772
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/itext/Manifest
new file mode 100644
index 000000000000..5ca05dcc7ff3
--- /dev/null
+++ b/dev-java/itext/Manifest
@@ -0,0 +1,10 @@
+AUX itext-5.5.4-OcspClientBouncyCastle.java.patch 1012 SHA256 4c60395d1114fd37107676e555b7867ca7dbe9a863739d254d3f09259527bbc1 SHA512 721d4c4917928ce38da2d3f83d19021423dcf6c13ed002c52242e9c22d5289ffa79dcc84421b38c0bb1450a4239496f9f3321ce47fdef45692d14f97ebe249d2 WHIRLPOOL 0aea7796501dc92a6546163ff56b1c2b40d4956c4c36f181105e159ccae3f0b2471974d64b34a2e055cca8dd257449f8f4d8d341bcaf3308b2a379c0c8396c6b
+DIST iText-src-2.1.5.tar.gz 1301652 SHA256 213599606c9b77c064486c3f5335ede99718eb4bc8c00c29a21758ddb67653e4 SHA512 ca6bc9807379923b25e45cf06976c7ddea7ebce5bd418204ca4a6f668cb55fb06ddda2b55d34e78aebd2ae307fc8040bcd702369b5c9da849286dab7f8d474ea WHIRLPOOL ce3067c7c747b2e8f07f63a0e0693bea1025b8cbad09d66912bf2c039e0f4aa9a2a284bcdf7590f604c4afe14ab21815a880b3c3f9ad13cd5584f537da3af4af
+DIST iTextAsian.jar 329741 SHA256 19c8c57b430958ee93d7a7aab61448e1627b9acd2b0735aa0ca33d78404587bc SHA512 fad669829efb9b6d3e5de8b8b6b175058e4aedaf310c1f6991487f3ebea15f2979e401b7969e6388bfc8ba456382d452986505abfc431fca714f471faa70933e WHIRLPOOL b861a2e78e71e2df07e45a2be44ccf21328f4b16b6d4cf17535b205b2592ff5135ba54133e1360547ced983356a60b1fd25e6264ec06d63bf8048439dffa6e48
+DIST iTextAsianCmaps.jar 1696864 SHA256 f7fdbd3c93f7b552d935d8300b6644685beb57e056f1934ed001b50d0b60de6f SHA512 bc5d9b06f405488075d2027fadee72127fdd81f1f362ec1f59ebbd70da61ea62a8a9f1122eec4a3f030fdc72f0f440bed049ca4c3f91206321ca5cfec79a4a85 WHIRLPOOL f68c9bf551f924d1ee531d730b147fa1dcf26ac8effa2c4caacad8b7c8b1b9ac82ac0ce78a3b3a9acf5abfd1cc71c087a2d0506a5e0a75426985b2002b9c71fe
+DIST itext-5.5.4.zip 9765296 SHA256 d4ddf4e5825f2c240641aaf3d7340cc7e6e2318576dc2f523b9da170df005c4f SHA512 bfcbc1de97a94451ac5b486bd02a764ed60d28455aeeecab4e93c6004accd015e61cce2019dc4979e46ef220547e7dfdbbc5d3aaad182f88280cc0053b4681d2 WHIRLPOOL bf7e88c16393df90e0de0ebf17d19088e2120db78bd219fefee251457b2c6dba72a084a10ac547cfc73cd1c074b312193de7c02241681c152a7746ba83d62d64
+EBUILD itext-2.1.5-r2.ebuild 1872 SHA256 ad6fb5b5c010fceb73ab00615b40b4d8da25f9c5952e2940312f5c943af17cd4 SHA512 246c5ad72ae18b0625bf1d1cd5279b48d447e12a4a24f871aed123a93a1e4120d1dd871deb24e74a366c2ce129ddafb5b5a5ba15369903499cc159117840b51c WHIRLPOOL 9f1be6624b58b60a2d91b29f1314266b31f4d086e2476875657358154367cf34622240c799707f3d39a74c1e1524122cc915984cf56e20f4fa2654907faf0433
+EBUILD itext-5.5.4-r2.ebuild 1249 SHA256 53ac4bdb83da1ec789a581fd178b5a75151ba8aca992f4a295cd6ef04d702640 SHA512 ac0c12f8ee4a7d13904d73353c4494f880659e01ba3f4ad593b7b3f25bd37dcaf9544876dc77b60557ed967a5bf97e08425484768840ab9a58036f62f3bc9784 WHIRLPOOL b0ddc24ff3f96391396afb2cc822826f4702748f15c85282a3c6f194d23894a50741ef91aedea3a6d89a712cc9ef487026ac1bdd4abb1c7d5ae6f96b7d248708
+MISC ChangeLog 3640 SHA256 c272b27c505e159efa6e2a7f36faf18777226e0ca7ffba4ba59901e6dc9359fa SHA512 e6c689787ed04ae138d8fa633854501fed5563a9f3d29a314df19fa1c649c74921841f05183c2f9a3725e05cc34e12fc2e737237845d80fcf27f44824b3e8401 WHIRLPOOL 32ccfe97f61e875bf35d182c2d8971bb1c4eab03451febfae5c2747e0fcb3aec5adadfbdf208ce450b422d897b1978a6cd71ef1dc7556f2c97680f0e9428363c
+MISC ChangeLog-2015 16182 SHA256 ad582468befc3946286c77da757726d0113d681351b494bb8c18a149a0095c3e SHA512 6d3e3553d54b8dd1331e559a13564c0a292a9911e7f8718e2206d3556f68a21891b4a35964e532ed2294e97b46bdc4ade2fd9ab84291c75be58699edc7054b59 WHIRLPOOL f1dd3662cdd44bfc85fe4486fbe9f8a19c1825189d1cf537d585e8c13351d6a88d52921fddf2742629b7b8686cf8facd39287ce6bc84c44308abe9ac99cbd80d
+MISC metadata.xml 974 SHA256 9ffbffd5f1fa81ba6d0119a1da32a7ce7de7fc3f525b796065734154331c5225 SHA512 b7a686fa65db66466457ad47734c34c7f5bd91f018d13d10385c01a3afd77a3c3fd6384d6e75ff6b68df1a3945742bb8c6ee40e5874eedca33e14a0bdeff5be9 WHIRLPOOL 7d8b4b43a420d834e31550442d61ddc1ffe3501ec153209f491c3877e1f463ef51722e4e439518eb221fc5e9aa56f1abd6b9687892ceb91aa076951b52bb2ab8
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..37eb1af5d233
--- /dev/null
+++ b/dev-java/itext/itext-2.1.5-r2.ebuild
@@ -0,0 +1,78 @@
+# 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
+
+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="http://www.lowagie.com/iText/"
+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..42f755b32a85
--- /dev/null
+++ b/dev-java/itext/itext-5.5.4-r2.ebuild
@@ -0,0 +1,57 @@
+# 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="Generate documents in the Portable Document Format (PDF) and/or HTML"
+HOMEPAGE="http://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/Manifest b/dev-java/j2objc-annotations/Manifest
new file mode 100644
index 000000000000..18e0076ce875
--- /dev/null
+++ b/dev-java/j2objc-annotations/Manifest
@@ -0,0 +1,4 @@
+DIST j2objc-1.2.tar.gz 9718769 SHA256 956d2b7f4f986e4a6edf8e4f217f983c33e6fce47191753d0dc5e0b5196fd97c SHA512 d2b4d12ba8107728ca33cfe18124eae092a2c2b9ce0b588374180d35816d83d6d6c9d029c3524537ac48f052dfa4c88b273405cddf56c54966216b1ed1a160eb WHIRLPOOL 6095ddea4f9d9e8994117651d1c45d0c2fb8aaf115ed65062565483ca263dd20a64ea46159239d3982794db48337b30efe9d6356b2c3c896d2e8c12f99a9b931
+EBUILD j2objc-annotations-1.2.ebuild 593 SHA256 936e002d826ee2ae6fcb6f0317fb4dfee054ecbec608f821d27ccd89812d4520 SHA512 75a8d461061652252c86a4d433e8089e579463feb565caf5eb341b6ec0876f9c9985dfbb6e3853e4eb3b4c928453aa84082408c2964915dff87042a1ce958040 WHIRLPOOL af771b2b0bdd81b51f2a2ce32341f6285ac855d3cbf6c3c4ca9073e96a324b390166a6c1a591d9808d9d4b6c9bad353bf2b663339977fda023a5b97dae4870e0
+MISC ChangeLog 402 SHA256 48bb2b3505e788f87bbb5dd4c5a425528c68dd53338ea13f7e8e63c24035032c SHA512 6f351f183014c233027e82db7bf587c1ff609248b5d6b26abb5759c09177f7ad4cdc033891060b4f9baa0d87355fe0282aeeb1ef08d2de592886386524e7105c WHIRLPOOL 283a0d6573921c31dd33464af4b584efd4bc6d76c76c371891b0a0f0431b1306d7b321ec60e23e0138bacac77de5d513d94d7ded50d8cef5274a8a34d5fb9c9a
+MISC metadata.xml 314 SHA256 246eed5c2882a4f0ea6ae99827c33f2093b877eab5d39fb981054c370b28b157 SHA512 94b8ffdfdd1c9dcba7553bf36af43cc1104ee95d2bff819e14a7e6cbb533f36cbd6e5befe377aa346afef29e54dbccda4a98265a887a5c80cc4e4d1f250c1885 WHIRLPOOL 6abb330581c8cd694964a5e37a1b08c1436250efcc86aea1fd8f4c41f810a2b3b1a80637e52bbd55045a99091f990fb40f5605f3dfc3359ab9334925b82ad5ed
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/Manifest b/dev-java/j2ssh/Manifest
new file mode 100644
index 000000000000..bebdf34466a2
--- /dev/null
+++ b/dev-java/j2ssh/Manifest
@@ -0,0 +1,7 @@
+AUX 0.2.9-extras.patch 7597 SHA256 7b518b46d28d9c147599298b3fd242830462f9303b0b6808a64ba2e2a2dd6eab SHA512 e60f449e7cd39c1cc551a012c97f5b1cca229d6a08c06abfea6c47a0e2577d36887ce5e710dae2a1db5d1436b1eb0a13c5bdcef84555c678d3b54124fe6ce17d WHIRLPOOL cc31661e59521df26552d11ba749b55a9cbc9f689c53119a5ca71b97651d64cdac72bb86486022ef231e03ec998f1e200a20be8fc9bf43d5fee1a53cdc5234df
+AUX 0.2.9-no-versioned-jars.patch 2187 SHA256 c81bbb752d2c211ae2d1d51e4c4c67039cef6cc7bcc747323e9176e0f7dd3e9a SHA512 5ef6e3f1f51a241f0a45810a561f4a77ddb2fe706e7ae4d0f6e36c28416435eed50cdec33debf7434f788c28f5b147987df3b1a12e59f8a0fade31183f57332f WHIRLPOOL ab7d29d5efa289d36e0f39bd541e42349e11776566bf24067fc322d6cb9cee7cccbbcecbc664469e4d95a0da6ca701a296f381bc23ddea13d67fb36ce7c97962
+DIST j2ssh-0.2.9-src.tar.gz 2182523 SHA256 9fc60e295eb7124ff2cb77a76ae6936b6583ad7dac742765cdb3f34ece70d0c9 SHA512 d7720766dcf50205089fa22d026721dc25de5def1d451fcb6680832017becc3fc8d76c2ffb5ed2e2190e08c864da24d2544515478956f78ac4d8cf4126cab6e8 WHIRLPOOL 3e039e95255f91e47c8a52ee1b4f83b8f667e1232d4649c5aeb29c9076fe92d66110bd6ec11187ed4bcf2f3987e83041d38cc1e4774bcb6b3e26adfc6feb4cec
+EBUILD j2ssh-0.2.9.ebuild 1015 SHA256 0e5c58f238b1fd20cefc8ea565ed68955aa432f936f477000d48a5e6d73be894 SHA512 0fc3e1efd4406c9d54d481dad30a7fa7b852452955059ee2b4e570fcc6fb1d93b0a734613e968825b36f43929ee749fe1493cc0e3be5c0e22e94bc51a77c7547 WHIRLPOOL 3ac4c99b493413dcb7b77751535305b4818360af03ca5beddc548b10902bcc25d14c485d9824a53490b02360fec9fdcdfd9605f3a502bdd5082787320bb47884
+MISC ChangeLog 2598 SHA256 5a191e59a291dda80e2ca5e2b4b13ad781515a49efc9920baf76cffa8eca5bab SHA512 e62ee3320e1303496b5822028add8dac456c6ee28a5423716e5f10e4d9946fb13b921a473ecf462d01afa0140193b18e4988c7d2d826fd93186b7d1a4b8a33ac WHIRLPOOL 5da6e467210aecf5a7a89d78b6664c2520ed382bd13434352fc96b22d1482327efcb201cca8c4908973c955127f040298d2a50847301c0f8e8b5c88c28ae4328
+MISC ChangeLog-2015 553 SHA256 e44e89229fa0b7d371352ecd3c7026b2709216bc8211ca7117004bb1bf597515 SHA512 71b7d3731297b91c414efe081f9da4c97a9eff4d3d54f3f331c3ac555f03eacc913ea41b01aeb0ddd374ad966b2c7f7b04a7e16b41985b91e9105263bbd3fc90 WHIRLPOOL 4fbef735d61d28f6ce3bf8527fd5c3bfc472f422600aa8cb2a2c3c272451084cc39b9749f33d8803ed18cfb5da2688aae1aa615cd2be09a0bfc1f55390aae98b
+MISC metadata.xml 494 SHA256 ba04a3f9ca9d4bf85d4b998a5f98388151300a08e5fbe0e8c1d50777d0095d80 SHA512 dc20b956e35a2a5098710ed97d00cd15979a6da488b4618cd262803f093e9281fdeb00f5a828cc0026c7b809c186d10f77683498b2380ed8c46d519696308b18 WHIRLPOOL f527feb1111b8114e56434c67a2142f4822235be0c75763ded3a0d7de9861b95bb9e45f22e4ac41400c1ee98843977ab4f1c689e80920a412cf9ed3a10cb8cf3
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/Manifest b/dev-java/jackcess/Manifest
new file mode 100644
index 000000000000..7dec8a88a4f5
--- /dev/null
+++ b/dev-java/jackcess/Manifest
@@ -0,0 +1,4 @@
+DIST jackcess-1.2.14.3-sources.jar 541095 SHA256 016cae78d8567ac8aa9349d2481f7c20d856fc7e0b9a1503d33a201a465d6557 SHA512 a0ccc39187ee94f550760d5640b736cf54d7523bad4eed715166608e18b30acad82a8db2d78f4c9da381c04876571c3d9fdb0418ee2585568c5da18b000f3b1b WHIRLPOOL 7c6ff3f291d2757feda3cdc5e8aa4605dc972717cd0751a0abf9c6d76884df84e3395667f7fd436fe9eb9aa1381c8fecde9e9430f565d52865886e3b2a343e2d
+EBUILD jackcess-1.2.14.3.ebuild 765 SHA256 5602d343a4ac50fd25926cd7ef0a724d8f98b01cd5dbd5159a7e0a65d3d4d4ff SHA512 56ee74aee1f86d43eb9356e8a54ccb7664dc6b0e8d6f502a40ed86ef93082d7f0532cf6a7366671efbf5151a562963448b9d5a2706718c4ba80d810561de1c6b WHIRLPOOL c1e1e242efe81e1969a644c6ee1974fc77708cdcf077c6692755e8bac9a7cf41aff6b49943b72037166169f764600c13fc4a48a9bace2526ccbb59daa05fb5ea
+MISC ChangeLog 596 SHA256 7f313f35424b33fd90e74f373590ed929144da0d44e8a7495a7e4125f856cf32 SHA512 3ebb5569067c2c20f79757ec925b94636fe496e6e91f949f42df58af633941ca0417de817fe3eda14990748629322f0a22a68b49410cd9a82c29f1f9a7ec2b7f WHIRLPOOL 3d3cf09d26f8ef83c2d6ae2fbb70624a6a5838f6b6566d9339feb54e870a97757d8f31bafc005622afda53ab8a4ca4ad5f0776be0dd1ef53cbf2d26415400006
+MISC metadata.xml 447 SHA256 315fec44bace38ffbb3de0aa0b0065e2764c04ee5880f5537897d05d1fbfe3db SHA512 a9b4f0b7a6f59d972c792a8bdf6320680825c8f1b7bbd0dc83e9ef54abf79dc4f7bab890dadd69484f15434a6414af2909c1dc1978eae9eb21403ed243cbedff WHIRLPOOL 024014099a8660add462b435e6ff8c6f29653b4599dee91a0ed6e464c571a2943ad403a9b7661e0b30b77770a6faa332243b177526daa209de961d5cca8d3172
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/Manifest b/dev-java/jackrabbit-webdav/Manifest
new file mode 100644
index 000000000000..57999fdb52ac
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -0,0 +1,8 @@
+AUX jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch 674 SHA256 36a21b0967e081e3f082429da1dd2e3809375492d5c93ce1b7537a1b1b7499e2 SHA512 e6b078903c2b50db451a491a48deb515d983537994211d57f16c5259bfb8bda8bd245ceb3a24b355edf430623ff4f38c8e8d2e41580d48de8f5b90f8f328f2be WHIRLPOOL 375aec409744ad8ff8f39a85ff8b4871c02c2cee4de193d3ca957f62ba4cc723b17f89cab2ec8662e02d8f1ebc46d23022e01346215fed92fc5a4428e34eecbc
+AUX jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch 696 SHA256 8f7315c55a152fb8c7532c382cf665cca8a3250218efb262102b34df28deb5a9 SHA512 ab32fefc4f24d422eab5c399355e4188c0f8b7171e0e1ad9cacb5d031e1cee01ff3312d0df47cccc15a949d374e7c07749e5dc020a7e6d1e9fab7a86289d0d19 WHIRLPOOL 48c8ae66369807d699e5d6d43775cce6efe71382d6dbd9ffbb94d0a794709a21e07f91fb3b6fc8032b56d11b21e8f563628e94e7d8f4d166ff4808fed9376139
+AUX jackrabbit-webdav-2.10.1-build.xml 17644 SHA256 6a7090b0e392bb9e01b3144041bcda74f2ff82967ad2e57fa143d0b5011a4dc2 SHA512 5b22661e3d36d227edb618b553671964be14f34dd245f1749caf9b6f3c9981fdc9fad11659ae98cdd5fb3b343b6bc450478d3655054b055f7ffb3663378b7a8a WHIRLPOOL 918551f2452505ba4fe4e307708c0fab5978c0f8ed9f758fa8d8445d2ccb4f0f2214be636d616624b11fd21533c12d3d1fd3505405dbb020187248e715af0831
+DIST jackrabbit-2.10.1-src.zip 13437021 SHA256 e83c6046134de10724fa54a500ae4f85c1caf664d29d915688ca9f1efe21f940 SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9 WHIRLPOOL eea73d558c3e814d09f4b873c3eadad68d7265beadb52d723a248a24700f7ef2753caf0a9e0670134ee8dfba775e0faf8f6d45f21a400c0ecf0c9b9309ae0f4f
+EBUILD jackrabbit-webdav-2.10.1.ebuild 1260 SHA256 6606f34602ff0a5f3e2ad295a054753faae365e63c8b42f3f3aacaec8741a14d SHA512 0135329c1d74019952200330ed816ef5d1f2c637cec3f287b780e379f0e89327742294f7155e863b27ec081d5891cd1973da554bf8e4f305b4aaa0a89fccbb84 WHIRLPOOL 52cf363707ab96ac1bafff7b8af187eed034cdea71e0191ec8f4d468fc9f39758a56479c9c13c1890704c058f0364c8ea0af17a866bb79969b897f584ebbc66f
+MISC ChangeLog 2631 SHA256 bb9eb070d82c6471fe285517c2930f71481cee1c9ee8a8ef5650b85e7562320b SHA512 9a1acb784f2ca421b9e1c11f914c3f186ca92e2ca4c97807c5bf52aa2a79721a7b1a92557007455e185be4aa030d7b618334e2e55ad784065bcf0556d3d2c30e WHIRLPOOL be345a1e96ac90bf9ee77556005c7b6e374cb997ac4a0070eb05c97ac296cfe6e26a4c8f4ad1138ac07accb5f8bfdd5870c36b6ef2525f0c2673545ddbafbe19
+MISC ChangeLog-2015 1460 SHA256 424cfe42e4f47bf4ca08840548d29248b20bec72c56fe8f6c61fe6e8e0156feb SHA512 66280c9fa584b02feffd71bde50cb3a979e61f959904b0fdd8cefc4835960fda48d40edf73db267213faf28a20779cf8e366ca1fcaeb7ab1aabf13673ae36f65 WHIRLPOOL 11fb3e2d5cbc6fa75ab2855953d8439d880965980bd37331b44e9bee31f14003f54dd4e8441ad2e63db48507cf2a21f057cfcf3267e89b724bddec90e9b630b6
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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-annotations/Manifest b/dev-java/jackson-annotations/Manifest
new file mode 100644
index 000000000000..23a421233360
--- /dev/null
+++ b/dev-java/jackson-annotations/Manifest
@@ -0,0 +1,5 @@
+DIST jackson-annotations-2.8.5.tar.gz 44906 SHA256 31484a8151cb1918b502ddac6d926a8ddc1cfa0f697b92b98c53a37eceacdbda SHA512 2d98a51c0e3b44e3ac2fe47647b0c7499d7b978cd46df275807e3802ba877717a6c2f620edfe581f31ef947de7096950816104250989eebf029d7a5bf1b53381 WHIRLPOOL 3c4f71b4724cece49f6b943d0744ce4f917d313835d2733cf631a6e3d6d2145941cc61a98a9da1600de84b5c53413986f221aa90b076ce90f1c124c22f0f7aef
+EBUILD jackson-annotations-2.8.5.ebuild 1039 SHA256 e023a10968a46dd9f98ef2658638e35425c245c0938778030c2f54a64da84383 SHA512 c5b3aaa3fdb15c111ced4a3ad2f3f5772a764d3ccc6e8a8f137c7f956a9134379bc8283bceca0eb5108281c1a7e14b5709b0221615a681f973482984cd010eae WHIRLPOOL 8fdce00be9758eaf48cb122d4ff51ad10b3727cfafbdf07e295f572853b7a719eea82d3f1d461d34c4f720ed888fcb874a29394fa33981a4b3864f81ca1dc3a1
+MISC ChangeLog 3072 SHA256 229d6c21e6fe69cabcfd6361573990034404c4ae7e9e44fc241ac025911a0dd2 SHA512 4dc454dece5f01420989ebcdbcfde376561889c4bf544cac9bf845914058ff249cba30ea1d00df5d07cbbc57271f99e3398401c85a47f7a5f1e310fdc38684eb WHIRLPOOL 42495a2f33cb284b2165efa8c596ac58421478209e053ce08c37d35eddbdd104411b4d5ad2af300c1cb40063a55db7e26c18bd418936828f3077f1aa27d77f82
+MISC ChangeLog-2015 768 SHA256 8cf45ac4175d7f52b6e7791d75ce9595d3f431faa30c7f852b7b2bbae5fd7a66 SHA512 3b37fdf622a57b9cdc23f40d803370869266035b057458e9728fb20c73912b8977e8be82609576b2770746adf4888f2a3f907548cfbc998cc200cc8d06ecf3fc WHIRLPOOL f15742d92f073ef7226db0ce66a532002da2d1834d3ef4ea61b64dfd0c17117cfbd677d344b6f28f3bb3f9bfc9026a38ae4108d0b9e673734be72719ab246087
+MISC metadata.xml 340 SHA256 736ca00761d8eb8711bde1177233122a08444d0e396d0c2c09304b39fdf1261c SHA512 52a2836de2359eb77cf2ff83ecc97efb34e19028261cb69655808cb2e939bb1120eaa4e3dcfac242747998ca397caabcf9ca4448e52c8a9772558f3ebf4037f7 WHIRLPOOL c9f7db76b622485c2e7cfbb3e9ac6895380e9efbd1598a06655c152a603e7b6e78ad6b4086d6d83f880508487e28ea894df1e5b5dfa6f802c5b3fe954efca944
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/Manifest b/dev-java/jackson-databind/Manifest
new file mode 100644
index 000000000000..9512c7e47d85
--- /dev/null
+++ b/dev-java/jackson-databind/Manifest
@@ -0,0 +1,5 @@
+DIST jackson-databind-2.8.5.tar.gz 1093933 SHA256 375f20c52fef47473c1b5ef414ebb5f1a38abbe69592d6193657a84709641d1c SHA512 6935b469804fc14a5d2e562c80449c4e3368256358b8ed2a0d5a0bf2bcea47385ef19a708b94f25e450f42f6f70e868d6fc79f22cdc2fb6f88a4faf35bfc3cb7 WHIRLPOOL ced41007e87cd9d7b65e6421a5d2a8299ab87ad0ec333b3426e075e42e4b7fab10693f62eaa3b7718f704a3be347dbce24b56be5764dbe9b90a6cf6c46825223
+EBUILD jackson-databind-2.8.5.ebuild 1864 SHA256 82e2399d242f58b97ce6b14e92d94143095c64b3a2c3423637685fb8b60a5591 SHA512 4990afed70541489c06fc01aaa08ade57c266b3353cf8f4cd09f176808326074dc8a6689321ebf222c113ecfa459a8d800fe7469f73bc86259d8b2dbe309f9a8 WHIRLPOOL 78731f864602539e6dad9ec4ed4fb380f3bb49d2da55fe5dc540274b79649936335eb35336ecd6ce65f4db27c0cf6f5ab642dff0802103909e0fe80351b349ef
+MISC ChangeLog 3104 SHA256 8d9640fc79ba115dec30ba37ced59ee99552228e0d1166c5e6063bebd3ed71f4 SHA512 08a9b88093ac864c453ee0f1fd95f7fe29c0d41c11a24ae065b4dc72611269788674b8af5097d67990d07f78561541b6cc2c1b00366ad9efd6feb1543da7d13d WHIRLPOOL c2400522d1ce7f273a3ec0dc0c3b893a43ef939ef00ceabebcc646c2a2dd0537dcb52c81d21b800e6329f123630d61908c0b1da07bacfc85c50baa21fe4b6d1c
+MISC ChangeLog-2015 1117 SHA256 2cb14b27f076e1dc9764638152c818787d875042f64b103e88b741a85776f6a5 SHA512 6529171104886521f13daebe52d5bff32fe6cca6942a6c6cd592e35af47f85afe17b03c42be94368c4c111cd2c0811254d577b5ac14e0688d3f20852467621c3 WHIRLPOOL 26fe881c3c82df4a2e76f3273a8160ad0c9158f00c6561e56fa6034c4a8d49fd11db1af45b81eaed508d006d233bb8892d71f760b3410c766b4f3b73a8557b11
+MISC metadata.xml 337 SHA256 40f5f8d47dfd457e049763c0ae3374fc41bb064c9352507250ea7515ac63c5a9 SHA512 1266365fb582e8a7aa2477bad93e7222f03bf656b952bcc0943087884adb0eb4686ceca8feb0ea1912fd81aa62cf89b7949cb69b2a1737d820de0c7ce1c124f3 WHIRLPOOL 0021c5a4ee918b51bd13e9d85f36ef87e80b0854d4de92d6b592ef75be109fdd697edb04a40b66385a3b476573fdcf63f3cec84aeb57ef69125d8071df85b850
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/Manifest b/dev-java/jackson-dataformat-xml/Manifest
new file mode 100644
index 000000000000..ac958056b60d
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -0,0 +1,5 @@
+DIST jackson-dataformat-xml-2.8.5.tar.gz 98385 SHA256 b28a3ebf380ce8eb6dbc48119fd827359519bd3e4311022983b595e572c92505 SHA512 ed93db9a44cacbe1638141b7336798ced03f7009da40e176b1eadcf38c83ac3bde3e2fa98efe3be1286a956db36393f925251b41a4adbc2b95d03ae6ef04b754 WHIRLPOOL 28ea218700c78e1b00f5eaea3b91d37cbcf3fc4aa602e410da1711ccd7070e347abc8ca2f2db809c3d8833fc8386a993e046b8de015e82421ff49ce60f107a83
+EBUILD jackson-dataformat-xml-2.8.5.ebuild 1883 SHA256 b0108901d4de1fb579f9ddad50cef33baf6f0bec7bc6e48baf2305702fae7996 SHA512 dfd8cdf55948cac019f840be80c2111bb0159480f1c4306ce96db705f5e8011a60a57d1d298dfc392e2e75532f16be3575cef0d9e45821d77feab83878593c82 WHIRLPOOL 6b06a7e5ab59d408d19c2b1e9c0dd9808e88cb31d1ac4034af29eb0f9aa73285296f733fb675269b421096cfc8ef82427ccae761ed82ca8ff0be306cbb5eef5f
+MISC ChangeLog 3099 SHA256 fdd3790bdc25f2a178312b3256fa1c8b26a107d0d6d17d642fa2ecefd9716e4f SHA512 053c29074fd6a77ffe192bb78c6d439393f087ee2f064d3a5f8a9e90da461ecf5593785445bea2a7d0a15d3f21d8c9edfb03a10fb2549c25160237e3b125ed6c WHIRLPOOL a7e027fcb82990a55b87a77b558cc460300de789e3a9b10a19061c295f49561a902ff3d67b5d37ad114b2d2454d1bfeb15f85c9ab5863d5f24d108a41becd1d9
+MISC ChangeLog-2015 678 SHA256 f512a656887852f931dab4ab6142d9f46455f1fdd3a6136740c2a794a6f72f03 SHA512 b62e02d42f4e77cea19cf30ee4ad450458d025f69bd21ae745d4a1d309252b259c2d02ff9d80362ac96bc205c36635a662916247f57c7caa0f9a8dad131479d6 WHIRLPOOL d9d809cc15bab021994490c4e18f2d812b91a4e69233f3effb6266f74e581b9afcfe3698cd7fcbb6854afbc4e5f9b5d33ab87f8651485c0c8850c84269e054a0
+MISC metadata.xml 856 SHA256 f9b2f431056a27f77bec8b59d6ff3ba0b56ac8dc0f764260c3d4e74949fec763 SHA512 95c3036a148dad86a1fa885fc024aea09e58948a3c71aff79bcc22a4aac599e60605938090a4659fa224e5983b811bd412696c4301c9ba31b28b16476f383966 WHIRLPOOL 84dc9dfc81868c199b407c91a73d8ff8312382bf9e1efb444b1e9d9f33fc52408218af0b199c220edb14fd600dccb127696730b85181890a782a27d7c521ab53
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..29d934574ee1
--- /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/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
new file mode 100644
index 000000000000..3c73faa79ccd
--- /dev/null
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -0,0 +1,5 @@
+DIST jackson-dataformat-yaml-2.8.5.tar.gz 44789 SHA256 4e407ce43534a3a0343764025e23ffcc58275b03de6d606e9436a046f4c99246 SHA512 e2c8163150647bf5071aeb4cb38b8273cf9cd1f8ed36bc6dfef4a82ef762f30449aa4b813821648e8216768a2b4c2a00964b86977114ee2a4526cab6a690d9cb WHIRLPOOL bb7c76fc1ad7678df63a21543d7ee00598521c4eee23003ace89036dca42c44d73d694fd3c9afee8c829284545e777e8ecc318f78f40bc6ef19ec1fb80a3197d
+EBUILD jackson-dataformat-yaml-2.8.5.ebuild 1927 SHA256 91ca051e10cc575fd8b60c3ed89cfbf480a7f1478da39e983202795265c41d27 SHA512 228e3bf4db2d83ed62672851db94f13051ad0ed8e5e9bf8215ddb5a168eafd3e4854dbccb5f5fc6cd197f773aa736d63643c3998f6b718a437e4b51f4f68cd63 WHIRLPOOL 7befdcca729ff470f7b035bd30c2265d560f66d6d91ab091404f6e2ed7c37277a76e20195b3782a1d732c4d1cf8b5fae93fe8e5dbd3af87018c5747c244be4e4
+MISC ChangeLog 3001 SHA256 ddbedb9c3d13bfbae465f9337c04b1c6beb81e4fc072e9e0b557d276ef5fefd2 SHA512 e20705f5c6a5c453f9e8d9a676aa4beabb8cf2e3292f38d82446b17825e8997dadcecc7091420a625f0972699df6e93c99fe0b55271ed97ed9b28a93578fe033 WHIRLPOOL 5a061b8c3f9af09c605921f65a4e79a74a162db534f6d469c51bb58fc8d79e16f446577da7dc2e6fafbf77ffd3ca1f8752f909756258def344acbe115ad14408
+MISC ChangeLog-2015 600 SHA256 8fb4da8e7e0bcd119b3d3379493bb5529ed0f8853e2d3cc11e3517bff2026f0c SHA512 61138f4c6f6cc40a2551fd41b5277ecb8e00eb97bba796be98bbdbee34242320b219f4909308ce9f33c09ff1966a4bc3267dc7fcbbed9b2ee485be9e814f05c2 WHIRLPOOL 0dce2063a20c01e7904c4f79d72b1e0da9c2ba234c5739ada56673d06f2c09c2d14519382161035932f25dc93a9581167067575ad9572e43e01f3b39f33055c2
+MISC metadata.xml 630 SHA256 e3a32e01b68d9dd1c0c7c993e467e1e9c74d8f03513657b5c59541a074bbc144 SHA512 40dac5d1eef6e8895c34f8b82c176c192942ddd17228af0c44973675633de349cba1f729b711bf5ff45a4cda98f37d24ecebd685dfc9fe50f3d387a06c0df328 WHIRLPOOL 3a1835f8eea8b3ac78d7dcdc5e5f92fb01092ad71bfe66f854d299a6728ab865313a769872bd164aaaf78a3b4da880dd7684bd5e94574be99b955eb1eecba4c5
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/Manifest b/dev-java/jackson-module-jaxb-annotations/Manifest
new file mode 100644
index 000000000000..6460cc12034c
--- /dev/null
+++ b/dev-java/jackson-module-jaxb-annotations/Manifest
@@ -0,0 +1,5 @@
+DIST jackson-module-jaxb-annotations-2.8.5.tar.gz 45855 SHA256 d8e77a8c27263b5442dc04e173e8dbfdbc447bb0e12eaf7c1bc8272bd846392f SHA512 952d7fe785d7393645350a6f5e119a2af142b316b9367a612531a93e7ce3c125d0c520a149d0e032bf876edda179f521c02d76dbd0b2f6b613c9f82e048672df WHIRLPOOL bdad98be37d5c5635a3116509f3eb93324606f3fcdd084d7c1729798eb626cfd08209cb699f26511edd03b8e440a324fb85946db1caa4b65642eb5d60cae1bc8
+EBUILD jackson-module-jaxb-annotations-2.8.5.ebuild 1868 SHA256 fac5e5532df9673a4a72a5d32e9710c40448b34157c52ceea98bf0c609188ebd SHA512 e0a3ad7674b84f0dd85bab3766cd218a137c71b1fcefd8fcf79e6627d5c9aa02d209d0addc29c3904984760aa36bfbf27e59f3f1e9862c0b0860e2b889813a6d WHIRLPOOL 3cfa497babf482ab5ecab020327a628635aa18267cf7e15f5cdb23620c392137b2c46107b2fc7654a02a7adfa6861d51876c895311eb40cec42b71953e061b4d
+MISC ChangeLog 3182 SHA256 a975e4158ec23f1d406dbc6d38fdd7e5d8d26fe5fe36f3d3602c8e2007a22aa5 SHA512 9778b15c7e5471165bad41b2c310f9a12204a813d790233af9c3b5f0bcafc7f478d68b638e594ceb3d2358a472e49241ed710c99fe33f269fde036f45f130962 WHIRLPOOL 38007b0d52e4325cf750b99f3c0abd77a396508252b72d7a6b6e341191f5a0ce57cd0b3c0aa7e33c236cdbb354e5f54e106f14da73687107c6576e59bc16c68d
+MISC ChangeLog-2015 573 SHA256 37fa9813935597533bb40c392badbe0aca64f2db2895b225ba7af7632784f058 SHA512 5f040a9c9f4df6418f969a7d8d12ba0a457661edd6cbfd71dc67a22e097648a0f99d48505df5429537a9e30064947ef8c5379e9780e1dd06d27db7b4fae9ab6f WHIRLPOOL 38b924b35e32e869c0cb89e71313c6dd60252a7e20204456847331e17f717d7f9c0daac29530269ae562e0e031b25506c4d5d3f091c2b18286684402973cbea6
+MISC metadata.xml 651 SHA256 7d41ad6ec3b310cc87f0e480de61fb00c11b17cfcbbbd7c24b70a8a896155811 SHA512 0d53c3d338f1544d637140952c101ade339acfd8e30a6bf76048ed0e5467f0a35344533186a4232c10a89d47cc46a7eca4b8a55751467d526ab573074a4e5b69 WHIRLPOOL c1ba3e00b6de44f63cddd17eb846b12117769475da58adbe2b9fef8baf5e71db85f8c151981bf2030cbb628d1f63b04f1650ef22bb9db8b5cae066b6f6a33963
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..0cd663301ecf
--- /dev/null
+++ b/dev-java/jackson/Manifest
@@ -0,0 +1,5 @@
+DIST jackson-core-2.8.5.tar.gz 338770 SHA256 59df45170cef4426de96da6bef8c82441ff23a9480be955cc2b5f23e9b3a8544 SHA512 43a2a7959b182ecf3a805d138bb1d49e1dd496d9a36274f5d9f2cdec5f06d02b1cde0e932216768689609faec2bd3f8d7747c61db2a12d0ae68bf22e87a4782c WHIRLPOOL c2499163f7a9f37dc473357256d42e214f4d7ecb7b0fc7222f535c7544d3a52689e46feca266b92f34b6633fbe721a2eebce3676a161af5f5630fb2c7666c3ca
+EBUILD jackson-2.8.5.ebuild 1474 SHA256 ec317ab703a31adb8b6ba70674d02d648c66ee0e9ca3a5684a83a229e803daf9 SHA512 5aa8a0f55daab73110fb586370050665dbd22cbeb0cc2323857557a0ad2286a4f779e411646f94cb179c67a38490de873e84f723f20b92e91beaf65939cad52d WHIRLPOOL 1cb24388a94c86d2f90dbbd5a0d9f85c5eba1f9be15aaaf08f28c9aeee1e8c43f46e4a835e22015586d053a6104fa109da1c4666db898c90b32a0a30eb107d46
+MISC ChangeLog 3049 SHA256 8e2f80beb8c953d5075a79f76d11be8ffb8f30fa30caf90ac2caa3e5fb9a103a SHA512 987e2cd3ce1e883c3d07571a070940ded627d5d5241c05c57db0f8d15cbeabeb45fbae292c60f58fdee7311572c1fb26852c3fa966d743edfc5867fa1f41e5fa WHIRLPOOL f5ef455b1ce38a7754483e77b812f96270d9c1fe8bf0b9db694ea45808b90da2de0a71202d09be76c27d11c78b4f1578ee62f048bacba68fc57b7b098c2e572d
+MISC ChangeLog-2015 858 SHA256 bc4851cb684b1665afcb9008dcc56e9cc67c3b385c379498def20a779d65b267 SHA512 b4f99b2e11db64af97460317006e1397200ac7fb8aada70e0756df421c4a10971119a1b6745fdb81d2972b739569ca83bbf2fc4274c9624b453bbd7a9590ce0b WHIRLPOOL 824188212e3e296881da35afb7310c02b18c28eedfdcfaca0a85eb822357877c777e423bd8a8f8ee578dfedbc5c003e0a2b7c6ddc17261db762d192ecec6c2cb
+MISC metadata.xml 333 SHA256 f30eef24bce48a544e5861335cbca0e9134308ecfd465410d45829f20f89487f SHA512 c5994d267b092ad22aec1586e2a884ed023f945a005310205e737fdf60648837c15764616bba08c8a69314ebee43fe9940c790c624555ec00c0e3d3d529d3a1e WHIRLPOOL 860f4a5bee59ee092ef3706f8dcac4ae8badff5a9903580d7e6a56700305e1464b9ba52164de46506563aa8ef5a67604162003c1dd1a49afb98f741d4f494cb0
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/Manifest b/dev-java/jacl/Manifest
new file mode 100644
index 000000000000..9237b23500b3
--- /dev/null
+++ b/dev-java/jacl/Manifest
@@ -0,0 +1,5 @@
+DIST jacl-1.4.1.tar.gz 1921630 SHA256 0edac0a7d2253c29c44ccc92427fa9ad4ee81b6c82142e417f72399a8584b749 SHA512 e4b906efbd3ef4ab9338e8bf2f50c3b820e25b9fbe61f194e90cc0fa128f68d64eb459f7b05171d4b86b4c9635ef483906a02952bdedcee89ccb92256b789247 WHIRLPOOL d40416577c88403a34b3f4c2c7ba45365330690832d4f7c4013a4c17b3ae2e589e99a9d7c8a93d18b4690fdefad1e3298dd28b3b89a467b8dcf2138e3e3b58cf
+EBUILD jacl-1.4.1-r1.ebuild 975 SHA256 3be8ffdcaff7a25e94476b8c7d1d55234abae7778c76070c0e5f655ff16b8af8 SHA512 7114f0f2d99e2a06b58eb5f0b9443e69baaeed5fb81ec7ac1c42a3915db12ba773903536677cdae93aa8a956b87911b8d08291ab9fb4087bcc651d005e0aa4eb WHIRLPOOL fa1beecb81bb3c4446583e436eca3a51ac23e7d626f2e2dd96d1056a77f71ea6c17b64ceddd3bfdf047572a11003dfc50b22be987b5f91f5f2c5bd7e7f24b9e4
+MISC ChangeLog 3572 SHA256 b599992e3059c2e845c5b89bbd86e7c8c106b059be4d0337ab11f479ca9e65c3 SHA512 36b19ed3cdd1b9eda5e19836fa36596d64da41ae15718be96c2ab9aa5f5d52a4361bcb88672db98c5b38ca313a58570d8312594e1a5b0c0d3ebda1a0787b79ff WHIRLPOOL f28d190f35820261b3d7c311d4f218a81ee256aac7d60e3ddc214ada0a7ba029ea9e892542188787144f1acda5dd756ed12a16a8fa164fc0323c2c59227decc1
+MISC ChangeLog-2015 3766 SHA256 cafa0c97efc434a519aa80dd0f407bb52882aee4318e4da62376e5be71e4298e SHA512 07652bf2fd3cff44ec0750a02839fbeba9675cfeefe2ad1fe5d481792ade46677b5b050883578247f33c02152fe75fa5bcdf758e78d8fcaf9e37787914e569be WHIRLPOOL dcbb8c347963dba8be612209fcf67c10b4a594edeae25a96c26b44e12d8235773262eabdc12c8aab3b447d8f4720fb6c80cb17c8ccfae63dd8c9a8698aba053d
+MISC metadata.xml 2116 SHA256 e6456fe3f69a0b874239c1450ba8e354a311cedd280a9d5f34cf2f8e1986ebd6 SHA512 221bd082cf7a036c0417d003a216bd919f8d6391211da62abaf57c560f192bbe27dba23c260a4d731e09e46dd0e30b4a185a45ccf7375908b947667bf5df7966 WHIRLPOOL d51a5381a29273b216abdd1c56199a7c5aeab6313e53b5892c32fcb4180b0fd7475ff826c7e400800c7c0a63415e426903dac4a1c78ec3302c54086393f56b49
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/Manifest b/dev-java/jacoco/Manifest
new file mode 100644
index 000000000000..cd0dcaa6e103
--- /dev/null
+++ b/dev-java/jacoco/Manifest
@@ -0,0 +1,12 @@
+DIST jacoco-0.7.5-agent.jar 4078 SHA256 df73da4b6e8f4772678077f8a7cad5b3fcea75162aa6812930bd91f049bc6169 SHA512 bb374677679bb00de2029a0247af0117393bf691b1ad54f43756e6a17dfb5745f90a3c4d6470278f56e6dfde24e54e45663938d037cd3aeb0d24780b17575e56 WHIRLPOOL 0df8fed3c57b35c5e7a33b864f1b08b235f7e1917030388f97f567812699df6a81de8a80b107a0774ebac5f165a5e3e91ec80cf897a9d99a0ba1ae71ffef4608
+DIST jacoco-0.7.5-ant.jar 18060 SHA256 5fb791065d3eb23d8aca02076cfd526d41bc76d03841933684a7b4eeca4e5bca SHA512 1404727c1ebd9af8f6be47e0b7dc0b717a8f235a10e0fcb9d0472b8286a6a0c719877947cefe472fecdf2388b46810668650fed5567038310cec37f7f11c04c6 WHIRLPOOL 6c779cf65214f670dfb3acba5e1579f3bef1f20eb902bb3611598c937fcc71ac7b9d33679ffdc325b5e0468208c07aa6d9f8c161a16c459bc49a0e7212068cfe
+DIST jacoco-0.7.5-core.jar 111749 SHA256 4a5ce92a3f3264d74033f43fecb6f644be6342ffe58b1cd322808c84cb47eb26 SHA512 7dfb16ff621b8eca76cfaeb468f9448b7c1f2bf2cffd324a5069822a03d6b70a7b9e63a08f78dc0bad7c6854e8b1059f36095a01e155f1767da6ca88913c3989 WHIRLPOOL 125a609bb62d804e4c5be9bca82dd0e177d22dc701c81d12a729640c218ce07ecadffe2a08bea5fb6d87071740d79ce825963be5fe1ad874062b71d077848437
+DIST jacoco-0.7.5-report.jar 112315 SHA256 edb049aad135e7b2bdf07b144c024860b263809f604b38678db6100a8343e3e7 SHA512 3347130757022da94b41a6b0d001d8b59e000630834de7972248ce53b447f28aeaf902226acf2485e8afbd797b84af00fdd1ea2c6f24d93ec60407e229f8a796 WHIRLPOOL 627235042c6cd995e01363ee7d484b74cba6f25a1be300aee46af0059a4597f1a16292953a4550e8a543610ca387fcd7a1c3e30a2a05b4ebfde60f8ca708463d
+DIST jacoco-0.7.9-agent.jar 4078 SHA256 abf9405491754b426267607e910eecac5f613b2f6fa9b4d2bff20e74a4ab8bfc SHA512 b0dc423039bd03bbccb62667c5dd6e2838bf75a8d98b0bb5eb51c6ebfbe3fbc6cdda86ac9e15cd2e06165202d40ddfdcc5a8553681d78026fc766ebe2f81f17e WHIRLPOOL c5375d4329c54f6bc017116707cbf9b0b8e583aacb0c532365a8bb4d41f54251ff0e4875d0d1aa387bcb49986d0b1c830d9489dbb2131283d2828115f4a1d9e7
+DIST jacoco-0.7.9-ant.jar 18096 SHA256 932b756fe099d7c765f23cc170517252b8f534a685f74f4c232d9d0539b090b3 SHA512 8238cf2ee6233199280eaa271db8a189c33c9bef3508a7bdffc9363e6afaba90ed38d9d53eb2a88ddc3b214f1f25d7f872d6109942de7a8987e84392fb958f72 WHIRLPOOL ffb325aa3a2160d5ae6081af0374fded2a02c70ebde0c85059386434c92dd5941608efe564eee93f82f7c03c7c699c1d55276de9114a85dc4757f131cfc6e479
+DIST jacoco-0.7.9-core.jar 117366 SHA256 c7bfebd8f02b8f4d37691f03fe53b82a68247ffc47a987872b97d9df9afacea1 SHA512 7ac184a92aa0054eb44bfadd54c42de238da6193e9536b26fe67c2d4b65398e9ed7c471daa69a98d7138fc0ee5035a8ef40731e45363435cd30df959eb80e5f6 WHIRLPOOL 527c26fdc8a3683776b798ec615b8edfec7f6d8cc3dba8309d2ba2e8ed5c489a2070f6531379f66c541c076c4b11efebfeb291b75da02fd9c1be1a63b0c3eb75
+DIST jacoco-0.7.9-report.jar 112521 SHA256 6317a69a731ff005482ae42b854c5b4e3bf5977db611c27faee20062cd852991 SHA512 128b254767d627a185e5794b3c0ea479628e2eba05a4188c613c4661da99f3330d4491640860a0ce33fe2663ff7c218772d09dc22237c00f78f60f6b9dcc0990 WHIRLPOOL 4d5dc69d1626cdd3d528cc002043bbd308fd368d666083198bde8f9ad18812ae470b8a391f9625e668b48a81ad6e8b272c3e404606e1b02ce84d03175977f548
+EBUILD jacoco-0.7.5.ebuild 1069 SHA256 cf682f4a5ee1280cf40fbff41531d3f888040d8d66dec59e8efc6abc604af404 SHA512 cf1ec6a15a7546963a552c374e974ce74b1d6e3798520b97e4759a10c5e511b6f7f77942b033074c350c4ba51d4191c914233a4decb51e114511bc7350fa5006 WHIRLPOOL fcf19b6885181f36ccf7873ba9af5468eb0365ed23d8c85f623ecfe840b3889de93013c757ee54957ba552ec1b80d59b28ec712eb57cce3e1a573abdb18da741
+EBUILD jacoco-0.7.9.ebuild 965 SHA256 783c83943b280bce1ba4e31f36e131af1637d5ea51b4a2cb617b59c7ea2472fb SHA512 02a27210a6ae78bd1c7ecc574d63ebedfb38c5e5b33cf59e80cd07dcfb801ecd786a32333602494973639932d200aa5e29c5aa3ee5ad021bf2b8ccc75806a371 WHIRLPOOL a89ddc6390aa8905e762824a585e8316a774e249d7760504dd71e1c845e234815625f85ab094e55abd24b924669057d94878f5f64ef8dd97425cd80e4a12f320
+MISC ChangeLog 1095 SHA256 750aae8c8f024314a06890f7e5c010774b35b864ae9df210a74b56a6290acd17 SHA512 8dad545fb5f5136a5aec352e2a8f69152704f12d9a8a2ededaf461d614336dae66500526175f84760621941fef15e462277fef60a2bb386af60072b483be8e26 WHIRLPOOL b8795d1ce584e216b7dac4e0424ede1de7df8d488ae17d86f90b36683deef12e87db162532c76f3cfa3c3b9e46a236ba2769ee0a487f579de9620f77d7545ba3
+MISC metadata.xml 325 SHA256 ee6e6aea43ea29c9669d51de6ad84418254b28b27da9520687e686e6280e82f3 SHA512 0c1d295350f6e39939497eb52d79cd0ddc917c417600170d725ea49405f2c5c4378f86798b9b1fa421f6e0d06055abd68bad27ff104fa05b5cf179415ef2f536 WHIRLPOOL e02f37e00b0ddde13fd32f48602a9a25d7aad2fdee341f13edf4d79023b6fab24504eef27aa3a1aff674320bd675bdb8c6eb4d7bc29f29b13cfdd3518d96d813
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..33b49625ab19
--- /dev/null
+++ b/dev-java/jacoco/jacoco-0.7.5.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
+
+DATE="201505241946"
+
+DESCRIPTION="Java Code Coverage library."
+HOMEPAGE="http://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..77bcd043e345
--- /dev/null
+++ b/dev-java/jacoco/jacoco-0.7.9.ebuild
@@ -0,0 +1,38 @@
+# 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="Java Code Coverage library"
+HOMEPAGE="http://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/jad-bin/Manifest b/dev-java/jad-bin/Manifest
new file mode 100644
index 000000000000..2ae12e67daec
--- /dev/null
+++ b/dev-java/jad-bin/Manifest
@@ -0,0 +1,5 @@
+DIST jadls158.zip 389972 SHA256 2878e19fc1fdd725b516f538a57b02aaec1b2d1e4b106d550230381ffa9c0c81 SHA512 5f16c51f676990ea6cf76cbee4c9fbf93273fb6a4474a136c032457fcb29c9507508b543d3f65a212cd4e21d14671f0b4368ce5a42dc7c542e75883a911a5ebf WHIRLPOOL 672e03204c9ab461d355cc1719aad22612f3b6fa921fdb4cfa0e2fe4577a000610adf9248ca859f00ffd13ed03a780b2bd8916f52151d31da0a7210bacd5787a
+EBUILD jad-bin-1.5.8e-r1.ebuild 501 SHA256 88cfea72e47446fa475976df715811e567def4e12f90ba4f2caf7923958e5ef0 SHA512 3429618780d3234c4146fac6eeb177c3d125e58f81e09082b4d5347de054628ee49cf734a63d778bb797e5a46a404c64f128e562295d781b8196270f3928f8ff WHIRLPOOL 5efcc1366d8b483a26e6ed55d68a6c7a743b700ac3f60957cf114f2661a608088b79972119637b3444eb190781141448f906a0fff871670f8f715897dc607bc3
+MISC ChangeLog 2754 SHA256 9f8c8f7fdb85b74b97f08274034f85e2cab3e0aaa34ccdf07a6b49b5ac80390c SHA512 641b5de7eea1b6e94cc1e8f9ed9ba26bc7b945b012f396bf75003ae451ed1df4b9e0d20b6df6c5aa92324967fd97006f5ffaa0dacd8eb81c49104ebc35bbb748 WHIRLPOOL 1cd4df0404bc1e43568385f11f2f8b46623de1d26d389f34eec3fa49c5940ee02d74197d6dd97d91ce05a57af8340e2413fd12fb9fe41ef0b0b83e0d3d4e194a
+MISC ChangeLog-2015 2703 SHA256 197d2b4a5d226091a0b862f0d314be1e38619a60f8a0b1982e14bf80c2a2cad0 SHA512 7b964e2cef44a2db1ceb9e76623e60b151982281cbc8e112b597afbed2cb53f79491969dd1223f9eaeab8b8d17847d2244218e330911a23bc7a62a06532b1a00 WHIRLPOOL 1b2d50aecca905220c18ba807f8ea4b9000ecfea8730b97e425e6a33339235b3c400d8c61c28de88d608777ccc38a8966ec419e89a62e31c4c4617505cb2a3b1
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
diff --git a/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild b/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild
new file mode 100644
index 000000000000..9ea62a8c3be6
--- /dev/null
+++ b/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Jad - The fast JAva Decompiler"
+HOMEPAGE="http://www.kpdus.com/jad.html"
+SRC_URI="http://www.kpdus.com/jad/linux/jadls158.zip"
+
+KEYWORDS="amd64 x86"
+SLOT="0"
+LICENSE="freedist"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+
+RESTRICT="strip"
+QA_PREBUILT="*"
+
+src_install() {
+	into /opt
+	dobin jad || die "dobin failed"
+	dodoc Readme.txt || die "dodoc failed"
+}
diff --git a/dev-java/jad-bin/metadata.xml b/dev-java/jad-bin/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jad-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/jade/Manifest b/dev-java/jade/Manifest
new file mode 100644
index 000000000000..23279a59d39d
--- /dev/null
+++ b/dev-java/jade/Manifest
@@ -0,0 +1,5 @@
+DIST jade-3.3.zip 1677444 SHA256 f16314c6b514bb4318668990788116c8c90005fb5393f7d7b3785c0b66020606 SHA512 b191de5d5406276cc5ad382f4b0627f2f2b9eef3aba46d8c23e3bb4f6489808450755e6f360a2d39a1eed88c22cd4dd2d35ab140e55ffe8f021e89709a094562 WHIRLPOOL bbbcd9c5a4f4d0f75282c22f4d88ae091c735cd58dda7bc08e017579c8da6fb1fa6204980067f311c5e3545cfacb5feac00bb887161d9db818116cf42748a9f7
+EBUILD jade-3.3-r3.ebuild 554 SHA256 05c43a73dbe8a27876bd387fdf553152b75039a0c2bbfcaf6ab186383327a330 SHA512 77f33b4fa9e87653dce0c95b0849e56ded4e4f9f16881dde290c1eccd5fd782f34fd87fa8983b928f10a96289f71d4848926ee56db3fe5c93fc637f43a8abac7 WHIRLPOOL 8e7e837b1f929e2b5ce51bb41f9a4d2e11d978802d390ed37b6406af99da12768b61a2abf74574f24aa7cf67e8ffac9e22d4467a120f9d4e49936add4d86c01d
+MISC ChangeLog 3091 SHA256 af603268f698006cbfb06c85c36862e2b9d9bb4e77718046d237c7a51acc318d SHA512 7edb00e8abc132982158fe47384e975601a4ada22622d930c51ad99afbe0a7b924fdef4f964777badf258f68dc1ed42df415aac3cc7754c1868544ccc4e846ce WHIRLPOOL e1173cc234041f8a6a12b4cefde1789b0896bb7b85a9973bd524fad13bcb668e7fb0c3d453f6ebf699a70b8a786ab4e6e61b875451fb3dcee27ae31fd07cc99d
+MISC ChangeLog-2015 2846 SHA256 b1855e338d57af8ffe4d22af81e23836d46e9f4057b0050c599cbbdb1f6b408c SHA512 8c14f0c87d816a2729d58e506bce4ea5428bdb94b5a1f3274568885e30d877ea978d494359d502d41d21662ddcff4609d402851183afbccbdccccc2994206443 WHIRLPOOL 3d6523718de65947ba56c43973216326ce272acf715555ab49136c5e2e780929aead56cc6f38ad2d1bc46e215d20c535ad66429cc0a72a3e5602c952bdc8f21a
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/jakarta-oro/Manifest
new file mode 100644
index 000000000000..c37e813f8ae1
--- /dev/null
+++ b/dev-java/jakarta-oro/Manifest
@@ -0,0 +1,6 @@
+DIST jakarta-oro-2.0.8.tar.gz 345304 SHA256 4c4f3c7c479994c3ce09f542d4fbdc03eed58a2d7f320d32f2baf238b5b6f566 SHA512 a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920 WHIRLPOOL 4392b2084036f0079a81a38550b919bc10c763cadf684e68d12e9c6dc8c43a2a03f66baba8cc96e7b4dd8f2ddca8ed550bc7ec1e570b692ae27df1a16fefd2a1
+EBUILD jakarta-oro-2.0.8-r3.ebuild 1033 SHA256 fea1c281f39691967253734681b9e89f66a6a809d3c89cc7945f89111e1838e5 SHA512 a003cb49f2db1274d351928799d70298267d0bfe8b0e9d0cb6395e195c96c125201514045425975f6f9163487c00b3a4f43fd40645002724ee8a5f2b4126d1b1 WHIRLPOOL f8c3f6996e5272741c84a162c625491e94ec311dec15cf9dfc3bdeff5382ca3900c548dc5e9878f1bf349cf5f493b661083069a73726ae55d89a86654a860463
+EBUILD jakarta-oro-2.0.8-r4.ebuild 856 SHA256 2c115d8294bf655d85a5ea0212a7c72be54dedd4224c91ccb1e373a2941ef824 SHA512 4fec9d9190e4f90e3a2e0cfc2e7b2d77d6b650ef0596f86088a1bc21a72114cdef0414a3b043dd6d106a17bfc289248b5bda9c4b8f2a971def865f0803fbd0d4 WHIRLPOOL 5a599f3e34bfb5fe353294f2859044e4a3928b159986e6b3b214bd17d07d28333ef13b3997f0e712f9c3a3b02501c314d8a6df27b86ea8f8c487a9f21b3a1fcd
+MISC ChangeLog 2778 SHA256 2776b6689bfed3c5905e61ec6b24a88518b0de6f670b53b42fde1ef9eac7d74c SHA512 dfd56b63db9790ba6bd1f11f837f0ebf6cad71591bbad77270aede3922c2ec9342d70f014b4f047728e704619d9a89c61ee8d642e1383b02a797b695bb65ab46 WHIRLPOOL 8fe558e4efcaa1312a4fd8097219dbc909d4ebfb0fa21791d2a7b23b4e8bfe7e31a753e5fce911606968c0e600af0fd890f7a1325613b7e6dc07cb52f170f187
+MISC ChangeLog-2015 3338 SHA256 43c952d0bcdee9d3ad65ca316fba66bf25f712b6681ef0c8693f4c74f44fd695 SHA512 1f34fb13c7131f4ad5fc7119178592b4bd4e9a032eda899974b9396124b966e29e9aef617a3a52fd212d8b047863c917200dc628a8dd673219cb07d9e4d061f4 WHIRLPOOL 99f6a9645b6bcfeb94ac1ab7d4953252d6cd4233ce17059add041e0ae8f01fc9b135878fd4f41f4b9fd0f336dc5995f6aebb1bb5c56b60ca6106c6ff71127904
+MISC metadata.xml 513 SHA256 24596aadb9e8841ad9117f7ba4a7e91dfefa40c98576b5c32cc55319498eeb18 SHA512 759a7e18395261364c71cb38e5ff76196588d16913f0992611c952bc0b5ed6dbd47e9a28a51b6ae74ab04b4c548ebbb773d1d813b1dd06a0c8b786cd381e43d2 WHIRLPOOL ea89b8799e50e0129344947a1ebd6248528343cf30a63bd21a120299483ea91dd5d4a1466af4e5f2647a7857f736cabc7a4ead189eea493cbe65bb75d3f8218e
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..eb90915d7d22
--- /dev/null
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.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 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 ~x86-fbsd ~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..e20990f9e00c
--- /dev/null
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.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="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 ~x86-fbsd ~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/Manifest b/dev-java/jakarta-regexp/Manifest
new file mode 100644
index 000000000000..db93876b7602
--- /dev/null
+++ b/dev-java/jakarta-regexp/Manifest
@@ -0,0 +1,9 @@
+DIST jakarta-regexp-1.3.tar.gz 127069 SHA256 4cff646b26b258897bf0bafe64dfb6d1422611ecbfaf4787a78f2e042be1366e SHA512 20e932856a2e761ac2c8b62617a0e661eb9ef309230ea8379cf3582a1a9308b50334bea66405fa47fade9b92a3cf9609c0a3e42cb7db85af4af63acaec553112 WHIRLPOOL 97a2c461af73f7396b405eb07f2777aa32bce6719f141139e00ecdc69f3856abb48ae97a41d38659d9f8447d7d8d0601477e10469fb3244cdd0f9b143578f6fb
+DIST jakarta-regexp-1.4.tar.gz 137768 SHA256 c4e34004123f4f72f5cac293795f3c547691baa5cdfcd1198852d525e3cdc563 SHA512 209b3f960cd16f05d3fd609b3b6ddb119e056f428b831788caaed6ebcb64c00279b18484845456dd07b8b761a7181f6772dbe9fd578f0401a5d8b1dcf98afc35 WHIRLPOOL a060a3d921f0f54780e573154ddef4379221a2b0986d9ac18c8cc5039fe990eb97da09c81b46e4ff179b27e808b29ead75a4a9b0e8792104f173ca3512db12f9
+DIST jakarta-regexp-1.5.tar.gz 170142 SHA256 79e80af8cbeb68ddad75a1aa6244d7acd62176bfd69bcdc0640d11177dcde97d SHA512 428e5971140dd29246ec41e698813d244efc0e871c69d2d83685d8ae3691f0e20ac44aedad3c59f3c356d24384461de83921e40f0cc4d69c95813f02e8aaba82 WHIRLPOOL 9c05d8cbb51f5540393ed327b954fa724e9715ef22c3f0ccb1e2fe9b99c800f08a03b8cdfafebdb428cd02dec576683c7bccfe2b996a90b6dde871f50b263d1e
+EBUILD jakarta-regexp-1.3-r5.ebuild 663 SHA256 1a8c2170a0246f2acc3c6231db4ba05aaf0d39ac45014217fd745eb5c59fe074 SHA512 78b001c6c35bc0d739cb45df843dc81ab3d08bc08445a55e84b52eadcf0395fbcee3b7863a870ac0c1efdf7e5671e606fac91249edf10f49960961b69fa4aa68 WHIRLPOOL 5b92cbf6e9f243869aecc7089cf3296c717c9834d0878283bcf17944a8dd2cfe4930c4faf615c635ec17bb87d126d16a5e7521f91907db83704b8c9a04e5e1a7
+EBUILD jakarta-regexp-1.4-r2.ebuild 663 SHA256 1a8c2170a0246f2acc3c6231db4ba05aaf0d39ac45014217fd745eb5c59fe074 SHA512 78b001c6c35bc0d739cb45df843dc81ab3d08bc08445a55e84b52eadcf0395fbcee3b7863a870ac0c1efdf7e5671e606fac91249edf10f49960961b69fa4aa68 WHIRLPOOL 5b92cbf6e9f243869aecc7089cf3296c717c9834d0878283bcf17944a8dd2cfe4930c4faf615c635ec17bb87d126d16a5e7521f91907db83704b8c9a04e5e1a7
+EBUILD jakarta-regexp-1.5.ebuild 663 SHA256 1a8c2170a0246f2acc3c6231db4ba05aaf0d39ac45014217fd745eb5c59fe074 SHA512 78b001c6c35bc0d739cb45df843dc81ab3d08bc08445a55e84b52eadcf0395fbcee3b7863a870ac0c1efdf7e5671e606fac91249edf10f49960961b69fa4aa68 WHIRLPOOL 5b92cbf6e9f243869aecc7089cf3296c717c9834d0878283bcf17944a8dd2cfe4930c4faf615c635ec17bb87d126d16a5e7521f91907db83704b8c9a04e5e1a7
+MISC ChangeLog 3547 SHA256 2923cf051c8cdd8881317728883cb529fbc87f362a46580d8c30ebfddb10491b SHA512 746171429b91b05d5a222a3d9b745019721149586ce2a6f0f0e618694e4304fe43c61bb2e6e1003adb9fb0314692251a42693feabf29eacb2867fd1fd10c9cb5 WHIRLPOOL c5bf356bbfc53c83dca276a71e704251d04dcb0dfb5e732e63cec8419e3ce6bd6e074ad56b6619d35548d61bb7563a91a4d8f1ec9a680347c4e8929a12bb389b
+MISC ChangeLog-2015 5031 SHA256 22469a575fe706f3c3ec641739f77f70e58f26e47c075f05dc2c3349dea9d2e3 SHA512 fe53ef0ffe08554c7cf2c57a23d3cc3e5740b36fde7dc550e255dfa541f7e47a2e45529759bbcca07b27fb582cbfb520c706c0ad32589309b7ba2fe035c15ead WHIRLPOOL 6e012176e3b6dbdd34d7b39d941a781a4e9cd8fb03b36c6780cadc8a8fafd6d346ae6a3822fd3c38b10437ffbd252a24be4527d8994a4de9dde57e113e66bbd6
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..f3397f38ca62
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
@@ -0,0 +1,33 @@
+# 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="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 ~x86-fbsd ~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..f3397f38ca62
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
@@ -0,0 +1,33 @@
+# 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="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 ~x86-fbsd ~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..f3397f38ca62
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
@@ -0,0 +1,33 @@
+# 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="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 ~x86-fbsd ~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/Manifest b/dev-java/jal/Manifest
new file mode 100644
index 000000000000..bd42038d38da
--- /dev/null
+++ b/dev-java/jal/Manifest
@@ -0,0 +1,5 @@
+DIST jal-20031117.tar.gz 48793 SHA256 2f1bfd0c9b56a362da8fa5b61af3fd0722bb80e5b89fb12291b5a40e9f21db75 SHA512 0cb6cbd5e80d38dfbf57417b756dbc3bdddb2a28c4cbec292799ee71ac86cff3121f1e09e86f976f6562dafac54835bdd58780e4f1ffe733897b6d6ef053f95e WHIRLPOOL 54e9b1a005e2b10f62bcfd43bf1cf512fc0d0479ad113cfc57e3188f90b23184e1d6340ca56736faf7f309fc88196498652d459c75cbca7e2f76889ed3ac1568
+EBUILD jal-20031117-r5.ebuild 1079 SHA256 b2d1e15d1b913806c2738112ae51228bfea41f03f485604f7f95d5239a1ceab6 SHA512 ad0c21c2c75426e8e37b59682da2f6e79f45317232ba15229193e30d0d0cfc1f7838c507255889525fd1808a8a7802e7e6a4c9f8f4deadb6ae9a38a725c72688 WHIRLPOOL ab841b395dde7a7d5cf26686f15a91210cc961f2a7d208b1ee3c263ad39daeac29d0860ed650d2058b3de9d65247a601685ab489f3e192fb6a9a67736c13b451
+MISC ChangeLog 3310 SHA256 9050c40dffb06cdf6c160637dd6d54c456fae48dbbed6d0d471b7d53918739b6 SHA512 0c9e83137cb9c9ca62a1e5a263fc4de1fd242729f16667123447131977c546b8608dd36147539429c3892bac50e2982fa4ee8d38b3112ee1c73ed59217bd3a24 WHIRLPOOL 3577d69b69e794020260483f3f2af62b634c298c0afc9c945fbf0bdca11378a41417ba92b14d4cdf0cfb0a9530a440bc849401270e9af73672638b279b4986e7
+MISC ChangeLog-2015 1641 SHA256 0a6608ed5088afe964da7143b14aae486a07832a20cb2a77479afc98f91a8af2 SHA512 6f85393b5f2881d8a74a0c1b5fe2a8921ce26f31e77ee102ee513be2e7e51cd6fb03cb43a004e1f4bb6779f65440ac32cf4a6df06a24f0b8b5848a588e05553d WHIRLPOOL 94f397aedb9d77d0cd6c1950db4cc7d420f5eae15758aa418bb726c82ead8ef6ea453667bdb968c675c62045cdaa31b84d85c54747baf6cabfad3f7d7ef42ac3
+MISC metadata.xml 548 SHA256 0a1bcac59242e11f9a823f7d27ede2e93e76e1f42650701f32416dce4987de3d SHA512 68e3dde016ecf0b0b8cd8c5802450b316ca2a523e9b36f1c88412bbb91396df16a754d730a2eedab1452c63dc543297ab654c7aa77638f40d9e6de41f49b5c1b WHIRLPOOL 2530b7b1f59d75b6d8243ca0737c080bfae9e417247d42ce1212129c14d9080b2ca5882e04d578fc83b67c7131fbfb61f018864d9e0f37f614e85098947a2a3b
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/Manifest b/dev-java/jama/Manifest
new file mode 100644
index 000000000000..4cfbac7ec567
--- /dev/null
+++ b/dev-java/jama/Manifest
@@ -0,0 +1,5 @@
+DIST jama-1.0.3.tar.gz 82188 SHA256 a8f4c8f3a4a5d5f8908304638d03aa181b7c71debb2e3c08bb9dc14fcc350a75 SHA512 9bedf8f35ea1d400194b5a3b49914ebd04b5a31247959886f1967d062ceffae30993d34cd2f15d3942285a45c6930e2d4518f4ed0cc013ce853cc26aca021b0d WHIRLPOOL aa9f303b906bead6f4620d1d307a372ccbc305bd0947948b3b26b160b4f5b6ab67901289d9525ff2705e8d9ab21d3a6c30f3715c9ae57394a373e1bbdfd9c436
+EBUILD jama-1.0.3-r1.ebuild 555 SHA256 cdec40a8866baa66853aae0b2a26c98630a95435d8b65b1450aac2664654a968 SHA512 68deecadd697d5e1f535d0c97de5166f790c1852a860153e1a85d9fd2e282f6c683766f9e353a7c487c555ea579360e563afa0aa7cec8d7e0c7b066f8a91bc99 WHIRLPOOL 3eabb89c5c6a570d18eb739279602884d354b59765d824e0eb4d4020e42462dc103e8cac389316488e072b0514bb707e48c998c20820e6b1801869b7c69519a0
+MISC ChangeLog 3725 SHA256 95864fb64d52f231d4e6c7c64df4072df4192012457f73c4bbeb60838e6f9d01 SHA512 aca69d350f871af616417875219774f5e87090ebf90759cacf4733db700de3e75621a0fc4c656dd8a854982a742888390e7a4b7ce9c8773352a5b138ffeaf65b WHIRLPOOL 6869133a6cd246c2227033b3f7147fd3b1087b46d2d0ccfc3ac2b7522bba27f62c0f0f7949ae15d8f944650ec6d0d64f01ca28168bedd3927b0e15cf4a8add65
+MISC ChangeLog-2015 383 SHA256 7d2f3d1fe62487e6548c9997ff00a8ae8d9aa48f2099d5c8e7e90bcdd4962efb SHA512 77f9c1e2a8165b6e170213bae9e5e36bbe99f2a603f8e21c4aafa9611d9ef6574eae97b711bb9987e55d4e5737ce69636c0d088bab6ddb9a9ce27a979f299c6a WHIRLPOOL f7da19ff3386bb2adb0f35390ee72164e2e91095cab8ce9667a74e2a10dc83beab93de7651a36eb0d84951c589c53f619e90d0c5f38dd2f80896c99e1fd52400
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..63c15fd22f7a
--- /dev/null
+++ b/dev-java/jama/jama-1.0.3-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
+
+MY_PN="Jama"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Java Matrix Package"
+HOMEPAGE="http://math.nist.gov/javanumerics/jama/"
+SRC_URI="http://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/Manifest b/dev-java/jamon/Manifest
new file mode 100644
index 000000000000..d0572b0fede1
--- /dev/null
+++ b/dev-java/jamon/Manifest
@@ -0,0 +1,5 @@
+DIST jamonapi-2_81.tar.gz 23149879 SHA256 7b88d90fc284375cb329569570a3c125f41590c95422239aaf661a5260b8004e SHA512 09fba65aec2754f8a1b85dd7f5691b8bae5c4f1c852dd69cddb3642a594bb44baa5b6a3c611657041d6ce2cc37c824a111adeaa929761e3983d43d7080ce05b1 WHIRLPOOL f2f281c491fe80602040086844f64ddbf99ba03334f734c9ad0a3d039903c13480a21f5eaf10acd991c252a589a0f2155d651f7015a7c728d8184125e08a7a15
+EBUILD jamon-2.81.ebuild 2127 SHA256 b5e303b6516779561abec68df6ebe8b42325d8c531d0d74587a1f68ffa6e412d SHA512 8fd75fc92760bc7b32be9b06481491bcdcec606771952c323a7161bf56762ed35776f014b20afa2a38c845924769af244284d6567609725ea0cf4c5758b14a25 WHIRLPOOL cb6fe389c8cd513be255c4cdcbbe78747817485308c8ed454096fcb0393b9b7f16481bf08a1ab2f88bf6a8c629695ccb5dc5e5318623a8780d9c2e454dfe8254
+MISC ChangeLog 3087 SHA256 60230b874da6cd788de71bd4dacf87dfe4c13990d5761cc35714080ea7b48592 SHA512 840cec1505bd5c8bb85ba591f05a8ed4c9e1f9c6a4db46d16edf51c99800eb4bfb74cf9becf7a425a44f8a762b3eda1ebcb667d07b795ebfa9dd188a42523572 WHIRLPOOL 54d4ec8900db747eee3e3310464aa018e5c453e641de9a64c9301bfd25c453feee934bbd7b4c305e928cdc2a6e649c3b72a83549d9c2eac04074f5e0e2831605
+MISC ChangeLog-2015 1095 SHA256 40b372ccf15072045e60e2240abe095d16dfa358c06371599727c44f81b1b82d SHA512 f4b9b679a21f9e3292825975b2217e24abf0722cbd5e1dd1b8d40f201acf0fd795efeabd515d9c92dedaafc3b4b7c8564b410d86482b2fde3cbbbff8a6604e88 WHIRLPOOL 8f514255adb5d90d5733ea101423f7110a335f4405db8666bbee04fc0174f8cc51f383f93799d0d8eb805f68669ab9c1d2483191103947221d99d9b0577b60d4
+MISC metadata.xml 536 SHA256 c5db77f10e1ff2c3cac648d59b7bc0a4d25d629245d763a35ee05bc40b96a44e SHA512 f0a085f6e20c4f486c0a06b802030c285cf0ee5af593b4d17ae4e05a27fa63afc7e202b8a170113add4a4af82af95af0a69d01e0abf46cb8dbf5b7e136807b6b WHIRLPOOL 17bcbe1a98181db1b1231993e6af2a00e522c4ccea3098cc84b92f6a3cd630666ae467b3f1c03b79de3a9ab4bc6669b40e791a81d4e4ea9f9b3298376dc6f90b
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/Manifest b/dev-java/jamvm/Manifest
new file mode 100644
index 000000000000..4fd4bc687b86
--- /dev/null
+++ b/dev-java/jamvm/Manifest
@@ -0,0 +1,9 @@
+AUX jamvm-2.0.0-classes-location.patch 1276 SHA256 98ecad3eeb0623b3dc01155c9cbd9aacf31e5d5854b183a7be11b64bfdd838a6 SHA512 c399cb8ebce0556a778a1511fec43eeedc2e8d4b1ca732ebd201faf49d6a607baef914fb54e34f2c5b494ace6f5c072d296fb30c65038461e97a518c9e1924bd WHIRLPOOL 91d9c75a260f6f5943d1221bfba77032fc1ce1f8d85217ec4a80aa50b826f36816aa4fe0e1a2ae7cb27c171ec029d8ee3ad512a506c1d31e02276a02b1858e42
+AUX jamvm-2.0.0-env.file 544 SHA256 4ba42be3bdb4ba71d4a1412338e8d337df5478e8604ccb5510ba4b359a325594 SHA512 bf79384865e1bcaeff6c9b11d4b7d2cbd3740e87e83470f62c5ecc69029d3eaa876c5d69a376175f703d6a169041589b8c552cfe9f136be4d3050ea1888a771a WHIRLPOOL b4021326eea003cb0b9bda13ecf93b50a5f839cba6090c6a7056f205346d1f9596ec4b831c702fac1532935987f15803570d66ffed1d32e7b76728f35fd369fa
+AUX jamvm-2.0.0-javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8
+AUX jamvm-2.0.0-noexecstack.patch 1387 SHA256 6a6028e55532ba3debf1f170790cc609b0bbd0cfe7fd7b5a14f4513e6b46873b SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a WHIRLPOOL e06573fa48c98c29ae1f53ce19b511f21ee594d32c840a4649d3a6df7754e594e729551429610c4d04d5dc97aa42678a35e68fb17709125e60ae2c53c51c9fd4
+DIST jamvm-2.0.0.tar.gz 741459 SHA256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d WHIRLPOOL 7e80be683fafb444cd417502b96089ce4f6879a049ca49e33691b4d5d6755814654ab4ed7626b666dd48f9d6101567b2a12de43b916055ea1d067c5d4df06443
+EBUILD jamvm-2.0.0-r1.ebuild 3701 SHA256 84048039ec3942696d8dd6c07a75132da66a445f7408a28df22fff25e68da515 SHA512 96967a52414796749f5bce41695d8db746d2bbe720c968c15a3db6977d9b2ac4a72de508a2512457d04a9326af5d9cb2ceecd707427a845a17a651e39a4d07d9 WHIRLPOOL 0d45b414e3867c805e7c829bc6cc17d700ab140b93a206402ee132a61c7c74b021f2cf8d1f808977556460404d6c07a1851547c94603cb2f6d0d9d405bcd71f5
+MISC ChangeLog 4312 SHA256 265172c26605720bf85007b024fbab92ab8debc3265c625409ff75d884f1bd6d SHA512 b7241c9d23c79aaee40ce261883dd82e83f60ee3cffb2cfc94225ad5825da18bce318003da00965b1df4411ef3dd46ee3a1cb890d4c2e7b0c2c5bb0238b3ca0c WHIRLPOOL df768edfff94f7010d405e6773470b37317942b8bd73588e22c7b84b4f4541af002ae336fc765f1bf36ea0213385fa55b1b0cc485e50cca7f0fdb0cf91b69095
+MISC ChangeLog-2015 7768 SHA256 39b543f954b809f83f49b75c835a8a3aae6d9d34ac7981da953619e4dcd6a407 SHA512 fbb36c8ede4a8b39da6c97af537f73b59d348de6f89343ce39f8ba47e199c0e2eed4abf657fbd76fbf427f99307f4b6710998854eaf9f3174ebced8981088a87 WHIRLPOOL aab271a43cb56b4bb05a7c958604c118b919bc4efecbee627ccf0861893e91648e91c2a414dd0909ee184657a7510324906e3e377e7f0062aa6dec5bbb31e78b
+MISC metadata.xml 311 SHA256 d1c61c433be3de320b6ad194940b3e86de437e2f004bf7eb69d718b1267c69cf SHA512 3c73e7134e8adf35e0a1418dfcb0215082b5cfc7e3baabc11d89fb1044996a382c551309e5c04dbc54257a65173384b690ad951ceaec2b8569d89bb8a5e757ee WHIRLPOOL 7fa252078e65cf175004917b0bb6abfa85212e0d77084378a696562c80a93f02f60fffcf899cf85c873a21dcdb77515100d8198e0d3e3075dfcea44f28850edd
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/Manifest b/dev-java/janino/Manifest
new file mode 100644
index 000000000000..dca4895e1246
--- /dev/null
+++ b/dev-java/janino/Manifest
@@ -0,0 +1,5 @@
+DIST janino-2.7.0.zip 992669 SHA256 9b0c089ab2659605aa2aea00431a683f9a29b56f01a31fec2db6ab60cc33f783 SHA512 0fe0faf16c9d7c63ed14b156bbf75b1ce6deebda24fc0eb0176e96693de9877187694dfb39e748523329430332a36017b2d7d04b2b26ef0847fde7396106185f WHIRLPOOL 503efab6a1b68e9bcbdfde49af81e2f29064054d551af06faf2125d33f131c9a44881057a8a3fa48f8061479bba21baf0c4f9d005a8360d432483ad201b8c5a0
+EBUILD janino-2.7.0.ebuild 1102 SHA256 0ebb7dea558dcc7492dcad4df5f15e39384a2d4882ef73ba739db0c88a942d0c SHA512 c7b00f2b4f3901003d17ac36fb8ac1230e72d75eaa44396bd05e2e5706a7965d2d35f9fc84f27ef9d2905043cd9c14dec7fdc2a487c6be5f88ec54f924c74d89 WHIRLPOOL bf51d7d838a345f8dfb85ff5c4299c16a16dde0e2dc30e4ecce13adc8f889889504b38c04cec9215099c91aefaffee5b14d5600adc0dea08a754a00c17a5025e
+MISC ChangeLog 3008 SHA256 b68d64353558962df6561c2a25c45831e23cfe4dc4e1484c3c32a1d4e7ea24d4 SHA512 081842be80a93d4abfabe8fed748a66b4d6191aa1772dfe6e80022df1e711077dace3ddfbafdfe9bc726028d933303fddbf04b525e4d1fb4820e9b25ae45ce4a WHIRLPOOL 1051902114bf7995e2ba42f0015cb430b08295a4c19bf2a00ffac87d794b50e7c495b960100d285b9b32f19738d3529d5c01a8c37c82ef7e2a83e8b2f1b15dbe
+MISC ChangeLog-2015 375 SHA256 edf7ee4b562b4d674cb884d4fca2300772a81fde156cbe2b54c457f3b9c8252a SHA512 4f63bcdf7b0923c85690767cae4013c9531ba3ce19f99eea8dd61d83f0e0bd67fee51562875daf06e43d08b4c1d5900b26c06e9f04c36350751ba6fbbb8e0ef6 WHIRLPOOL f3da016b2c8091068d56d61cbd30cd738e88aa63178fedef952aae9143e082580ee006c46a1475db7220f4b6ad86da8b4654b3c413e351d77c1bec6f42672197
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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-native/Manifest b/dev-java/jansi-native/Manifest
new file mode 100644
index 000000000000..92e6f9c17b0b
--- /dev/null
+++ b/dev-java/jansi-native/Manifest
@@ -0,0 +1,5 @@
+DIST jansi-native-1.5.tar.gz 205008 SHA256 2416e325a0092eb878f235d3771f23aedbdff2c6b85feb49a068ebfc3661b2f5 SHA512 29d178f013701b7e7844f899530f51486037e3a1403018ba4a41475ceb8d58afec768d177f64cbedd41adfb681ba08e578c2e18d956770bc039dfece8602a212 WHIRLPOOL b25c9a218b6a754bb2820722753f2adc0b67b8e04c041e5c4a6ba3e73fe9adaa21b70cf0d8bc7d2a952ceca9e0b8a407b7db1f725888e9b0d86bb11d4051336c
+EBUILD jansi-native-1.5.ebuild 792 SHA256 9947dbbdd58b24786f51b0808a1c5a4e21296f16f42a4086146f34052fb885af SHA512 8af851e639ac7096c28992ee4dd3880e7295c84aa4e2afd5254b84f203b4ef73de8135977c96395c270f6275704bf0aa1a3dbb22285988722a9089d03767a963 WHIRLPOOL e30633e59a6838593725b84f22dba840b1aa477361f5077f5852fb84fdc4c8280d7d2c345f9937421c0c345ee34ea67aee3dbee81413c255ed69865a91257510
+MISC ChangeLog 2776 SHA256 327959a3289d30d738b3ae341eb5949f2d73cdb392f8c4511acc28cd975f2147 SHA512 aee781e97604a428bdeda6520da789278b5ed0727568a4f352a2277a13f1fd0c652cd3e202e1436f38d966b8a803ed78be6121038a9aa4cd2c7337f4208382cb WHIRLPOOL 34f20c76e90f1e616f61981a65b35c8a4f5111bfb24c4ccb13899434b8377357376aefe5f08b8519a4eed4335a8d67ac95011c8e96c1e96623547c10d48a0ae1
+MISC ChangeLog-2015 718 SHA256 c6ceda39cfbf783f05dd79d840a62378a21cd6e65103216310456ac7e542f5f9 SHA512 296b978a5125ffe00f3fbf88e84b64ef5fe84ad704a674b743f688f68679f9fa12e2d735a9c5b74ae4ef06e1c73fe2ff44a14a9d7dd0cf99580e9f286973c85b WHIRLPOOL d4ad0b6b5bed5aef10d269cd248b31f312e4d525efcb1c5819b37f7c8a9f02916593a4a8c75f50c9c316a44f4aeb41b7902e4e77cba5278863123bb836de17bd
+MISC metadata.xml 334 SHA256 510e245d4d05bd0fc6bbb77c8d18b59b5a922215d3256e1f3c5136838360a5cc SHA512 0b5b8c67251d880d3a5702dbe70472234f6c83deb557597d6160b5321b1d187fd2752879215c65dd34f8ad6ccfc3fe2ade25804b29a46a584464940942e3ace0 WHIRLPOOL 12bb8f93420d09e4b89003928c6ac6f8fe580acf5f3967d79d1bb9e9b225d55cd98717e0062cd24c83a3642205ea22ec357b5a628c88e72281d140b644e671a4
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..9dcfdfe6b50b
--- /dev/null
+++ b/dev-java/jansi/Manifest
@@ -0,0 +1,8 @@
+AUX jansi-1.11-build.xml 14529 SHA256 95644be8bfa231b5f30137f46c6a13e32585058a0cfd715490e5164c28c00f02 SHA512 cc60a9f48f220ee13a22ed814409126524d22f2329c574e61974e26fd70b9a53f703ade06bb6921c13f370016be79c00d111368018132abee20780e99096c0a5 WHIRLPOOL 632f71c5c4db57d7e294ad2ae400e50882fb35023eb35a9a48bdcbeb84a91fb77428f12c9380d85af2e9b4fb3a11fb1b9df16309eb10c0d7768f8b45ac7cb6bf
+DIST jansi-1.11.tar.gz 252095 SHA256 e5c7bd4d9ccba7a2f191380111960c7bd699a7ffee370891b2ef7f905047cccf SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1 WHIRLPOOL 30bc2f3bcf1f74ed5b939e9cfb2c16e54f41e679a97c9983643207b264ddd8fdaf9a898c188f12ea2e84742c45942946f59dda97de1b76f39da050329ef91c24
+DIST jansi-1.5.zip 211616 SHA256 e904c8197f100d91c84207e0ec97aa7d197ea8c916d3aa668526b2d4d0279773 SHA512 784c01b7ab48307cf881439d5c3531949a6459e8a90667f1ee7a73f9cbce72710fcf4af8b4cae610d15085641567c0d51cab487488daa0c1b0a4605864de2775 WHIRLPOOL ddc5fcdcb04115b7c24ada6ebf8be9c374fbfd09bf368a9388110b9f8e509c2ae20ec78874767a52ffeed9ecf3ff3ee3c4bf59efcee304d274aa8154ad28cf72
+EBUILD jansi-1.11-r1.ebuild 1127 SHA256 eaab8147a1f3de29b1808e23fc1cc843ae3c3b5a88f8c14b869072221f95204f SHA512 127446458448ddb88333e4425b28475e6e9dd31f1dd7e90bd6e6b7aeec9040deafd96fae931064e922fc478f9d0cde33649da99787287c74b6de464863908434 WHIRLPOOL e9c937a72c46aba6bbe091c9c3909e92f6e0508c04d25d66426117374ae5518b13f374c2f90d28dd18868fc8fea30514cb0df898af24fa6cbe74c6ac83c913d0
+EBUILD jansi-1.5-r2.ebuild 674 SHA256 90ba6cff62f0a7289d40d2174103ff7cc29dd9e221170d7bbf832455f61e78f6 SHA512 07dd8bc9d822b963be6db3ca5e39bc160ace104741ef0786de3a8482eeb7f075c67fbc60d4f6e5cc46c4ef58f4263960f796c1c0373c07baa0149f09cace0910 WHIRLPOOL 1490f81d4875d9e163eac175c5be8ce71a69317cca88bbb878cd4cd08ef36811fd8f55d625075fe68e93a5ff467e8631bbe1e6531bf5e7bafedc715c4ee0454c
+MISC ChangeLog 4351 SHA256 37352fb7b1dea2ef4070f88aa56120c4368273a07b98ba737b00a93236acc365 SHA512 7fa1c3fb7bea64fd4c51ed73845ea0f7f83278a12e7a0562641266e589fa2b64e32df5861d315ec289bf8cf843d902220c012e038b2fe4065d3ae2b2ba5dc41c WHIRLPOOL 16d40a1b0ac4c41c1e20be0647082016347607f717ecf91ca67ca23091878ccb2e3d1f88ea2b56b8ab013657e9cb3f7654097951d316dabaa6b01cce06e5a45d
+MISC ChangeLog-2015 1593 SHA256 995ddff1e313ea62a3cc934387f9bb1388eed862e2e5f553f42cfb1f7d598d21 SHA512 6f06dec3b858c2a9a5e51f83c64fa0576309c6f78cf7ca004589c9aac6f6cc0986d41da72b57a2eeb63e0c45673d804bfe10933dcc7c5f6f41a256ae0de37837 WHIRLPOOL 37706fbd5d5e2316621645e58b9e456f092b073eca6aa4caef325fd968c3b5c0cccd125d367ab86ffe95fa29f8ff67f46fcab141aec83c145b18239f14240a25
+MISC metadata.xml 491 SHA256 02d55d54829fda279bebff3315e07bc2412319c104b3d6a67760f69bb934ca4f SHA512 46a12388363e4b59001bf8cf67923a4f38d8a4409fe158a813c9403e0da6067a8aff418cda7e0d02dc905e38591ded15e46b8f8095acb62d0a83a65146550669 WHIRLPOOL 3cb21753f1c0cd7e86c5950e73045f59ba88af60e190dfa5fc9ae223750218cba3e5533f9fb0a387e655782bb9892acaec8d0b9fa079941a6a504f11f995ccd3
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/Manifest b/dev-java/japitools/Manifest
new file mode 100644
index 000000000000..a3892b091079
--- /dev/null
+++ b/dev-java/japitools/Manifest
@@ -0,0 +1,5 @@
+DIST japitools-0.9.7.tar.gz 92537 SHA256 2201fe0252713938e70bdf0fc118c640477d8b9fc0ad2967734f4b8ee1630b80 SHA512 28e2ecb76d8b180134904ec7aef5b15c60b02be32ef2519886eb38bb468f80ab59abb7ce27752ddbd380a3ef580e8435a983cc17797f3147933894786fd8e52d WHIRLPOOL f59aa416e5f53364d949a3549cb8a93723ff869becb95a44eaedbe47ffed94b6c1d4310f4efe91e0108a5bb40baca674d537ab3c8552d96e036cfb770897fc2d
+EBUILD japitools-0.9.7-r4.ebuild 897 SHA256 b7314a4e9be4cb0356eceb39e15a9edc7f83255af473c5ceea970926acc9c0c4 SHA512 14179276f3df2934ac8eaafc136808ec0e56a00da3ba6c7ebac55fd600344329b8b5f4481776ef0ec683bd7b620cc2a445aeac80e7a76d383983f32ab7a00f2f WHIRLPOOL e9b121ea8e0fd0e9c468e55bfaa0ea0b49bcb861a67e479cb9093b66cdb16b1979cd60b726379a9ff60fc189bd48dea4967607d5cf66713c0190fe3cc0473063
+MISC ChangeLog 3788 SHA256 10cbec03a3a4eb806b5ae6dfc529321405e87e8e946788a7013331d503be6b04 SHA512 8690a2aa3c5bcf9e0f5afb9c79d1034c03a5876b898ff0bf1b98970e53ce5e9a7b7099f24df5044fc9945582508565a48d044a8d9c749f726040c1dd2f65d353 WHIRLPOOL 430fcccdc7e39c080ada5172776547777836e6561292ea24cbafa99099cf5c1da9b90bf896e3d7947a0aaeb58ecbe0c76d4dfe754392f1ece7fb24f1727560c6
+MISC ChangeLog-2015 2222 SHA256 c1e74631addb4a5160dabe60ca0e05b6f2f9ce91d7127c103c44b97c3ed09a44 SHA512 07a2b389fb7fbbc29fa7363fc85432185aa706cc26b4289998573eb4783242632d1f0300f87fc3cf8ebbe8eb2bba5ed4441d673d4b88d33423d6451d4b66fa27 WHIRLPOOL 7b1bf83ac563d157d928663cae2a03b9a5ca09d0b77a04a3536d872d2df13a9047fb511ed65bd49b59a1e44367eed05117ade7d657929fac614c09ffda7a8661
+MISC metadata.xml 566 SHA256 2d093f9e7b0dbc9aa02d5778afd6f4b4cd07f27e72e9d0516b0671dc14a9aa64 SHA512 5698677c3bce76843a148c771e9c0d66012a642fe4c2c378eed27ffe0f4fb914ef5596a2ab1895167ae8637306c912b8e4f78d764c8b705c194327e6ff2c601f WHIRLPOOL 557f75f82080ffac2a9c44ada958a55704a17b00f9a1addb2e8b85d3d91484d6460bc42ed2a1a18431e559a024637f35633efac1ada35c05a211e503dbfb81fd
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/Manifest b/dev-java/jarbundler/Manifest
new file mode 100644
index 000000000000..3e876d54fe9c
--- /dev/null
+++ b/dev-java/jarbundler/Manifest
@@ -0,0 +1,7 @@
+DIST jarbundler-1.8.1.tar.gz 132101 SHA256 19f670035bfe13409dd562753b32144f4597fb56782a7baf604ec034a5f4f6a2 SHA512 f18657aaaae749846544fc35b65fe5e548a0471d85bf4e1d671bf1c7309f2392487069e880ce5f9c1a0e076637dddd9274d536969a9df5401331835f881553b4 WHIRLPOOL fb80abf779f7ebadcb331ffc785a6ae99063955b5fafbaaca1edc1fd6ee4a1730ef3ce20c312c3d6eca7827ee47d9e62dbe3a78268e11890742c2f2d165468bf
+DIST jarbundler.zip 159874 SHA256 6fb64f13d466804fa0ca0767708a0cc9cf1db1ed7904dc92afca188608ab9a6e SHA512 8b8b45533c601d10b6f986b913b824bb05617ac0901f178ee3fcfbdffa41ca060325228f71e62c4dfade778d50dd2040504eabf49311d386d75b82f77a535280 WHIRLPOOL 3676b6fabacc4054575cb5e5cf509a848d20222b28de1dad2ae0859f3b82ca070f294bb227849a3bb9a6a7662af45442a2fcb1502450a2cc7fe36c0e8be20245
+EBUILD jarbundler-1.8.1-r2.ebuild 877 SHA256 d047fc9a5fe472dc155860f23c49e597fe1782f2823ddbc19a282567544d4656 SHA512 29b33f54bf27ae9116394810a90cd304eaa967c5431eefbbce87939f1080d2c71510440fe583a9af7ae50d82fbd7b7afcb1c8395fc965e27e6879dd322984c6d WHIRLPOOL b167d29c4772c82754db9baeb4b0bdc7563ac0bfd679d7913670de4c942cad99ad69394e714a9d3d24cdb1057ceee52abdd43cbc94f2abc6018343a547a8c1e1
+EBUILD jarbundler-2.3.1.ebuild 920 SHA256 f83806b1e30cc2eafff3302acd6d48997620bc4a07e9f0bdaca490026ba4881f SHA512 8eccb4613bac9817affe001452285718b6ff6d9c40d2f59b2a174201bb56f494467f090d4de6c680f8828d5be00b1b7283c2b8eeee73dca13a168f3646e7eb2f WHIRLPOOL ba1fb45f52e8eed15d7c27e8b753e61efd2da71a605dc976a904d92f78e8da1c1063211dfe26cc07bbc11eec7517ba4caeefafd770686394b294ec5e5f33a386
+MISC ChangeLog 3320 SHA256 751eb027ed9eafdb4c162eb0295af9a0132491d47db079339864ae4f5d337345 SHA512 8e4a48b40549557173267e065f0f14b6043bc1c4ea52c19e297353f44a51101bb878045940f10436b40a57d3dba8adcdafd190b8ab439100715c2b21dda5854d WHIRLPOOL f16ea444f4571be46c7f468c65915164cc1488f15eafb7637b9d5e9516065aa559aa4a9199a236d8864741117f46149471e6d55677d755f054633ba3645a6cec
+MISC ChangeLog-2015 2873 SHA256 1fbd03e7be717a0ced81c52ab16591388eb247a9ce3105fb11fd3aef6d2d7ded SHA512 f3bae80dc82697b74a50461cbb4b031858af643579d7934f2087e6970b3c7d47b7398861dae6da2fb4fd9f440fb89cc7490640bc4090120afb4d738721d6b4c9 WHIRLPOOL 89ce1910c87a4ccc0d511bfd397dfd46728bc68025fd2b1ee2e5a017c93493c4c0d97072b9c0bb892b147cebd0c3dafdd8cd267a9be4ceaac84da7eb40faaca2
+MISC metadata.xml 316 SHA256 4da8c7fa24fae0c4aca7c5d4e8236ca65da6d9e0690df1dda8ceb5e5ceaa8349 SHA512 c52e5fd2674ee9b2eac940e7c0a92540a12e76297216d4915ab899922eb77c0f9f8125193dbc42ea3d924dbb60dceb2c6d55e35afe31eaf864ffae6ddb82a60c WHIRLPOOL c36c7704b16de135df603e45868d331f47a0a50d09ccdec4c9090c059c1e83f8c84fed5c7503c7109fbfdcd87399ae6587c35a71d725a990b05bb4ff9ecf9119
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/Manifest b/dev-java/jargs/Manifest
new file mode 100644
index 000000000000..6a468bcafacc
--- /dev/null
+++ b/dev-java/jargs/Manifest
@@ -0,0 +1,4 @@
+DIST jargs-1.0.zip 202051 SHA256 103a8fa96c6b53b3bd00d1505e4cbf4135082b311da01f818feb5f1b0f60e224 SHA512 c121a8850c43fda1561df2ead211d526596b3aa8d01074df86ef0fa68eab83021fbb99ba16f05a0a20185b027f820643189c591bc8b79fb29d579eff4745b359 WHIRLPOOL 5c791c0c0b6b1069b62fcede99ca9e6c71a12ef925ff6318754ec24e9ce3ed6f7686422b6d15bf6edab7b694effb3cec7640ecf713d0735aafe7a438eec34e8d
+EBUILD jargs-1.0.ebuild 556 SHA256 a06d7bbf9fe55fcd831bc462d3ff2e87779e16a162184dd9e7385a95c9f090c2 SHA512 4312ddf7383efa9b098e7f9c6746f49bdd77242bf910f6196eedfed2c7531f8b23f7f3b6fa9fe32dd420a60787e85222bf60618373ae371602950e4db95328e1 WHIRLPOOL b128c2265d60f2876c1ceef6e848334f747f6121566b546ee1fe1fa0eb851c1efc4d89097313b533b0570bd3ab54e647840f7ba625fae66dcc7bc9ab31ea421b
+MISC ChangeLog 1124 SHA256 7284bd65e04520550bb90ff986acf2313b7fae20f2f68dd41cf23d2f4ff83f44 SHA512 cd82b1e6ebfd42d14f47255afe8f3ef124ccf21cc61d1e9184baf9a77e179be7071c64cdde6893600ad4a4e063eacac572fe1006b9619831a821039a569c33c0 WHIRLPOOL d90a3b3792975e733a0b9145b69aafb3b7fe7db5d3d91c899511cb5bdd1b4b2bf1c45ffd6dbfec8b86ff9a79b820b5161d4b0099f72199bc843a2ab2f601ff3a
+MISC metadata.xml 376 SHA256 da71d1f71739c8b093ecdab967051e46f389d7e09657692d84e4490d9f891b0b SHA512 6dce1f0c46259c53b16a7d846ec695d2969815566641e15efa3949304a0e534f78b2981673f71af5c851feb5976999fb7c846356448942feee7a57446abfb3f4 WHIRLPOOL b44a7433fecb569bed9a5f56ff1c1be0b2c6c09cf2ee344ff3809de415d910595e73cb34aa0557b4017435bac4083eb73c7eaebc15bee33b5c77199819a3fd82
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/Manifest b/dev-java/jarjar/Manifest
new file mode 100644
index 000000000000..a54a6b8016d7
--- /dev/null
+++ b/dev-java/jarjar/Manifest
@@ -0,0 +1,7 @@
+AUX 0.9-bootclasspath.patch 630 SHA256 9c52c664c2537fa2e251b55e24a8b043db3543faedfc83ac330237ae3934cf11 SHA512 07225e41b1497c369fcd924ea6ff612388c020f89181e583bd5dc55d5219fe81a196c76df3bf5b8bdf882bf3a25b5b874110d231c5a3e5d387bdff16b2d0cc27 WHIRLPOOL 955b87e6b93e0c80c90a96b08b83abd55cfdc4c0a771eca600ffbf78fb66ec1379a42d917ae7afde037f5cbda245146a6ee08d39fcbb49e5fbf329f9ede04764
+AUX 0.9-system-jars.patch 790 SHA256 9e1f66b2da6c774b643e45c487815288daafa8d55ab674d5c45727609ba3fc5e SHA512 6dfcd74af809b85e11a4f9c0cf5aea176ef1dff86705346e26a0f4be6f2b9f45dba82d304d83dd5be6e8def37947217bcebe408fd7627f9a1511a3d6d721d992 WHIRLPOOL 4b640b5adf367c2b3f87f16c719324c4c21ec721edceb6afd73074ab9505953a5e0fa2d0131beee00bc5a52cd0ec62741a5f84ce27e689386e11af03e716434e
+DIST jarjar-src-1.4.zip 339014 SHA256 54368bb0ec484429243dc5620ce49d428f007c7eb8f3400367cdb2142dcc11ed SHA512 62af4f07c3fe2b887da959b8251a94fbd1c142e56b3332ad81865eef9ba32ded47883fc37d943c0081a4496ab71ef044022d13f21ccdb8db690638c26fc52c31 WHIRLPOOL c5fb411211f303976d3c10c6d3063b50defb7c5e8368d9f4f5faeef17eced530e59fa7d67153d04a9be98f60a28f276800f9e672a044415d69a2e4905222e03f
+EBUILD jarjar-1.4.ebuild 1253 SHA256 c10e3bd5a0723cd44a02c1e1ebbbf93f9645ae75fae27a71d3f31ddd1765b2a6 SHA512 431774a63a9976a9ca678bbae2f3b632afb1bc36fd3b5255f5701002537b69fbcbec06a2a4c654e0f5c297070b14a187dea5ce403e1a0d9ed884e6eed14daf53 WHIRLPOOL 18d23496c0b7086d4881c162463b57a6238ad35e43815b12bb48632c03e08c548334006e7ab8777fd4c1f0a2ea7f5feee508d77b945a7cb0558e95200f8efbd7
+MISC ChangeLog 4129 SHA256 82abb2114d10019797193be752f6fc58dc329dc81f74d68ee85ed55092889ac5 SHA512 30d7b70db557a06fb1049b8f334f1a6244c9b28db9b364f01ae0fe37ee35cbd1269508b6d12394c8042b6bd1021c208cdbda90d330cf026f8ba7deac492a6e7b WHIRLPOOL e3538b985a0ccfe745ff32c89d048f5749a58be9551b0b4c107fb7777b7b8dc40f14f20cc0fb0d7dc20f8414b0ffc7b44fc924e618cad36083b57f3c63084da9
+MISC ChangeLog-2015 5684 SHA256 ee2af55430b79aeaac11b7000eed2f64fbbf406af35b452323153679ef71e810 SHA512 d256a333577b93279a2e146516c305a66a7ee921bacbf6f7209bdcd693e983c921d630bd2338e3cbc58330ecd8ddd934932cbfd70ee674b232e66512175bd405 WHIRLPOOL 399c81ee6a2d4c5620de467382a1c818e6dd81888a496b7b25bfa796fdd76529638b70f9c751255b0bdaffbac54716558b4600c56361b2d92e3f0cad9235c656
+MISC metadata.xml 312 SHA256 ca4f177e085c8e3c1db6e80b328cdedaddc71edab29ee4390f05c108f980bb6f SHA512 6e73ffaf397ce44fbfc20a9d676eb0e751da1a48e8c1e6d7bd074704b647cb7f7f87464023d71fc4f27e2cb3468b729aeb005f5d0c66e94a6bde035eeebfb211 WHIRLPOOL d4366f9753b2107ecf75bd747545575522f32e338cf75786dfdb4b5aa374363f894d8a07ef5720604c53f6e331c04957c19725fc2fe3192b05137f1e22ba7e55
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..9108139df106
--- /dev/null
+++ b/dev-java/jarjar/jarjar-1.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="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-fbsd ~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/Manifest b/dev-java/java-apicheck/Manifest
new file mode 100644
index 000000000000..f02a1ddc86d6
--- /dev/null
+++ b/dev-java/java-apicheck/Manifest
@@ -0,0 +1,4 @@
+DIST java-apicheck-0_p20150907.tar.gz 1550 SHA256 4f8a108e78b556d3400e334d3cd0b972628a8cee97bfe903e656ddbb46368449 SHA512 68a3a5443ea26840a526c2e53451e47e441f6ec15b2ddffef8f5d63a50f1129d18cd65506ecfe0bbf3f9829514697648eff8f64e558f0bd5376b0bf2add70b70 WHIRLPOOL 0640404622635f36c2dab7623510b5ea913a409382b77699c0dea5904fdedf0d83ba5bdf3e2247d3ed3b3b33a2dd271b9ba1d4b2913428adfa01381be1cdbdef
+EBUILD java-apicheck-0_p20150907.ebuild 477 SHA256 4d5dc989c82b1ef433c8b141da709c91191ea61ad08790aa9132d7530cb179fd SHA512 b72df259425ea2b1d0639529b94ead9a14a5ad7a6428fa99109487744913f68388af7158d6fd015c30f53572f1f81765f4b511f4a1b7ceb64b1e46653f9fbaff WHIRLPOOL 6da2c002114702558daf7a8ab26425579c340c1d1e4febb8b54088652bf8fb1bf5829bd59fce85a6f6569a7ba89c68d626353591af33002c210bd850cfdd9e89
+MISC ChangeLog 1051 SHA256 293293f4dc23591f90d6756b6d13c24d8372055950c850f8fc130e1b121c64e7 SHA512 9f6c9e20d2d192181086405967d15ced284691bc10230bff29011eef199b4f3bcafe0a7a840a53d8d9cd81ed6242113fd05956f7f4705d35ae2d995c6d3a8fd3 WHIRLPOOL 6ecfbd82c23533d120733f6c718c9016e6a7a9ad2f3ee85577ebaf61acab20edd8a0611a33e45744d2fe63f7ba87f7a789eb04cc2cd2e126ab49f5a9c3583e2e
+MISC metadata.xml 321 SHA256 aee463ee1f971f59c1635ff83de7276bfccc9bb6d21fdd922b343e5c53c1eb7a SHA512 d3931e2b6d1400823ab3f80a6aa28ab7ce773da8b6cb71c3661affdb32a35282c4aac3189e13dc1cfd049f1dabe0ccb321416804f90e04de87d1307fdee9b9b3 WHIRLPOOL f9a28f675772ef96829b02b7ba2589f6f81aa6d3a6fdf282b84220fd20609d41cc3f28b630703cb804ecae95a881ea1a4d3b05c82bc2fc25ae7bfed993bac9a2
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/Manifest b/dev-java/java-config/Manifest
new file mode 100644
index 000000000000..00f54dbefc07
--- /dev/null
+++ b/dev-java/java-config/Manifest
@@ -0,0 +1,6 @@
+AUX java-config-2.2.0-prefix.patch 653 SHA256 4b3dcb1c157a8487c6d84116173baa3e841eb354f6f7489c1919f9cb6246a299 SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0 WHIRLPOOL a25a4f7d435c39141fb2829771d291aa787f6fcaa9920ac5373239f6598debf6141001048316650b0b2e5db030de0581a2b52ea9ae33963266caadb0fe488376
+DIST java-config-2.2.0.tar.bz2 51851 SHA256 2cc47541714975099886156838f1f2c584b65e0cbc75ba2348cb18d9dec85fb7 SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a WHIRLPOOL 1ded227dcdd7f248f9a8335b07bf006ebfefc8368dd400558d3ed7ca14e22da83ee052fc33d65bb784c61d573fa7fae6295be4d023ad7652ed4704997260316e
+EBUILD java-config-2.2.0-r3.ebuild 998 SHA256 5afaff8330594ebc0690dd3557498a17749c116999046e0567798753bd3d7fa3 SHA512 67d0bb47febcb5bd7a1714b6c5de0a65883dec0bb655638adaaf044ab1917753facd52c3bbb39a35090066202471f260e216bb532ceec70b7d8fa0116be6b0f0 WHIRLPOOL d8f372817ed36f78e68f5592adcb0da78e97970f4b944b46806035dfcf7dbfe18f7540cc128030b90ea0acc1250969d59dd3b67231e0f49e2a44cf4535a957b1
+MISC ChangeLog 4324 SHA256 19d1b809ca13447203b83747377d8468c780fb15038f6b5e239ce3a258abb3c5 SHA512 d14b4f30f54242be82f2573443c83acb725ab4accdeeaac6ba29e288943f178f8bd957a564531e96a6c1ee0082d343bfde42aceda765c694d78aa4c7e4023a21 WHIRLPOOL ad128d3a30ebdf5ea020b42af690878a53cd4c84491d1ecdc37322a551c1e793c374cec9c42aac26a96dd54a5d259b2f9ba1712423c881a56521276c1f46b1fb
+MISC ChangeLog-2015 49841 SHA256 3c4b1140f73733563b79024964c1964b89aec6a87b35cc79eead44787d0f559e SHA512 289b30f8f55cd987c560bbc5f4d042d356da67cf5b92ea09df153b5fae04b58a4c7a685860174e149d11b05c30891b99576ee24291d77cb8854e870f8bcf04aa WHIRLPOOL f48cf84725027c2f1a943c5ba835e3f9a5c7a4b630b97f88504d67d39d900a7d70b20a5bf7342c3c5b8515cd2763a3400fcdb44f98bd1e9386819be72f5ce557
+MISC metadata.xml 560 SHA256 7f203cc0929c4e01e91de8f201859ed0e716477f1c67f9aaaf4ec0e32fe94afe SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a WHIRLPOOL cc554c57e6ea313069d15776ccbc35edbc1635d7118db97bf0582edb05765db262306fbf18f05d8b1fb3aec860cdbe1e11eb6d91bd584a2d299517288fb4a107
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-r3.ebuild b/dev-java/java-config/java-config-2.2.0-r3.ebuild
new file mode 100644
index 000000000000..983ce2cb9f34
--- /dev/null
+++ b/dev-java/java-config/java-config-2.2.0-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 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 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( sys-apps/portage[${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}]"
+
+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/Manifest b/dev-java/java-dep-check/Manifest
new file mode 100644
index 000000000000..2193e9ca50eb
--- /dev/null
+++ b/dev-java/java-dep-check/Manifest
@@ -0,0 +1,7 @@
+AUX Main-0.3.java 11702 SHA256 c74c45307ef58b3575cdb58de83dd488d98b9229d03ff8276775d1e6e967072f SHA512 a70c0161fe72e8f4b4476cbdad5ae3074fbb7321214723a7b1b7778fd06de4eb616479de2b5d6ce9a6dab2e919d721ce2b177a515039a0b9592aa2b5e1017e88 WHIRLPOOL 523eed4b9409e96b7413abe5290278f7be22efc57cd8d432c022e0e57543fae645df5154baec734cb0383962b0a56bb2b12c6ff033e7fc1ed212f124176a8760
+AUX Main-0.4.java 14943 SHA256 757eb5cce30c518a2675028be96b19bd2cf792476040adea286c04994a1455aa SHA512 340e6912285ee5c61116cd838c2abf68c573e57053d0b923fcd3929e19253d7cf29a281b226a3624a69b358f112bdf4a554b6c23b850933d60d7a1fd059f7a1e WHIRLPOOL 8e4e78324bd2f71ad3efde5fef228e266b834fdb64762c92d35c8afdd38c1bce3d89cbe0d97ab8258358d190458837f24cbb11ef34fa01c695769fe3629a9ae8
+EBUILD java-dep-check-0.3-r1.ebuild 645 SHA256 2948254a6f3ba21f118a18f1ad0bf9fd37d5641bd3263680df297261732d95a6 SHA512 6da35a65c72ef3d61f4544d49fadac6d743d8b348130ae811b620d62b428227ad4a8cc889d78dd409291dc59a621f459c27993033d7daa2eee5f23ce4d786ebe WHIRLPOOL c9df315509e12cdfd063a73d9d2e94ed87dec8324e563434a14a2fc93fcbc03558fd22ad2aa741a3b5a1b32c75c0354bf3bab56b547a1e151d6a934f39155b1f
+EBUILD java-dep-check-0.4.ebuild 642 SHA256 661252553f7b5c2f862259a48430dba681c440409c083a48f2f3220a5d15f154 SHA512 61463bfcced95396791da6dcd12135c0724294956c74743492c4fb8a21199aa855250797e6aa6a5b34ad4a5b2e6c0bc34bd77745e4769f4aae6335821ce048e1 WHIRLPOOL fd9fbb1e863085e34e4999111ade059f60611321724280b3c0e019f199f18bb5b7c76b013be49b6f14d85649f58623edac9a3852444d2a9427939e21d900e255
+MISC ChangeLog 3691 SHA256 29e43b0aba0a7e426220811d60e225e159ad3abcfe8e62ee3507242a3ad3cb7b SHA512 c2ce4395bec863212696567df89a79fc9c4f5d5582bb57d496bea40ce94cb0da220ae40552f6b661d1714ab2c29c792cd1f3817b424c695d0d516289982a3dd1 WHIRLPOOL bf79bb45e3a16e722f55f7cfd6f5640f4bce720a6fa0768ab200b1ba39bb0525b90813d53b399e989072b14e840cf26f2e057d283e84d8ee49a304f815b99c58
+MISC ChangeLog-2015 1625 SHA256 2272c7ec29fec10ed8e7925bb133621b01bc75b21a4a27403316a8b862da4392 SHA512 1d06c346e8b41c17e44b5d3313b3d5953aac7fcebd1468fccf3095e2b9a5c1359b9c09f6648e3c72f945e24019a43121025039bc7451a65094d9d8f9fb0e374f WHIRLPOOL e3cd234f153ad929948cc2d1dd6f1f3f102d0a247fad1535db0cde92bbd4bfe6c8f74f823442d5a5346751567100693f2aa06e89f6789abbee25c97f657a0289
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/java-getopt/Manifest
new file mode 100644
index 000000000000..7557af90c4f6
--- /dev/null
+++ b/dev-java/java-getopt/Manifest
@@ -0,0 +1,5 @@
+DIST java-getopt-1.0.14.tar.gz 45561 SHA256 ad0d5cd146d676a3ac0ef4bf6a292eb7f79d32d0cb4f202fa7e3d43dcb52d98e SHA512 611a08b60ed787eaa1bf6bf6ce45075ed2bd75d7eead941879e019ef12cb4fcd7a196d0e64e9a75adaf35240c872f14590d7afa4e2dda03016fa970bd2e2dc25 WHIRLPOOL 294783537a7dc35478a2ba6d3951ee5351435676b0bd9bf9c3315a697aeb32e55cb5e8b42b249f04f2a0c3c4a8052ef381c11dc16e0bfd5eafe41393f7ead11e
+EBUILD java-getopt-1.0.14.ebuild 884 SHA256 3ebe50820c8bb60335152fd3d24fc458fb9312bf11f1bfddad748f4e4b7d8c17 SHA512 7ecb8b7a0001b6b07c24eb81eaa2da47e257a09a2bdbda425007085b51a2634cfaf1f2ac879d1632d769be2399b03244a4824cff8d59a4c023628b964389923b WHIRLPOOL 5409fd65495028b44bc9bbdb2072b64dd46572ca274bd2aaa7c68151c20200ffc58bcfe4974d7ff0c608ce44e89e9228be64491b9e48c3efa48038593c8f1481
+MISC ChangeLog 2584 SHA256 4ecdefd8093cf17197f577323a4ca03ab25bcfea70b77ca0bafc8cc49285929d SHA512 6c7934eb2e62658f52b452b6bc19cc250bd2e4a225fc5b80c83cc70b8060ba21d3b657e4d9c75ede62874b9760cd59fab6e33259b8cc59ce0476d975ba1b4a59 WHIRLPOOL d6b0c4dd2792dd6273e13554726b97fcf67e554e7c3cbbd5aa5c478b5ce6c0805dc50796d85804ee8b21d6f63beea36a71041d3702de93ffa307057f7a26e2c1
+MISC ChangeLog-2015 3956 SHA256 dde550f7e369c4c27f5b0ae97b4fe2e8484e16114cfd560c1334d92307789395 SHA512 bfe75d4903168623093682ecb10ff3a76181b4bf0087ba34a182ae44e4c03be58827876f17e30ec3e1e897916edf3d1ba77642027478129adf86f998b026a262 WHIRLPOOL 6c7afc19b9f389e3f259fefd7bc7e6753926a0a610bec00b64ba97533dc48db116515d773c0fbc72fb4a24d1bf5eb83c4da1ce0aa60b08a11cd99d30bc53293b
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..e5e3e71f6d3c
--- /dev/null
+++ b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
@@ -0,0 +1,33 @@
+# 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="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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/java-sdk-docs/Manifest
new file mode 100644
index 000000000000..b34abea83ffb
--- /dev/null
+++ b/dev-java/java-sdk-docs/Manifest
@@ -0,0 +1,7 @@
+DIST jdk-7u80-docs-all.zip 61168809 SHA256 0494bd49bc9cb3cbe3203120ae8b2c8e0aeb1579cb15c0fbd3cd780d19aa200a SHA512 c673c00e55c9a19938c42512cb9c6ae65de9803a1307d11a2043903d87cc36d9ed1f5a1e287040d8570e430cfe55f496354c1242fe6e242f1245f8271394ea1a WHIRLPOOL ad18886c401ec42735665081a0dd5ba3dc7678de0171f3aa8151c2e4ce3392e467be65c602f393da38373e589fa9800ed1afd3601d2cef4e48b06e57f491698e
+DIST jdk-8u144-docs-all.zip 93446459 SHA256 ae2b2fdb162ca5716fe60d8fddbe7b0d2059d2b571311d27d488a20a40c6b3be SHA512 28b4aa92453e61693fd72f190326c69956ab022400031b54490e11d81fb16b847eab8308e51126980d04b7ac21e1ea10c3446e621fef2293bc6e5f6ec9acf970 WHIRLPOOL ac12d6a2d83e6106e30d78ce50091c0f92cdbaefaaf94d61ac21b82e472ce606729a02c0ed9362098bc121ace16f149048df2b9d61640bda685a0d32dfea7555
+EBUILD java-sdk-docs-1.7.0.80.ebuild 1426 SHA256 6c884a3c55040f7da0c974404e26e89c4c28bf9d98ceb6329e8ee74d043d3a4f SHA512 f7e85f9d5f99970e2d122e2e73f80f440e32ce74ce439c3ff2b540b5fd7bc83d7c3881622658342b5ee5a5adb2e451d22fc7dd63cf20eccc7a0d76dbed319c89 WHIRLPOOL 8adb893c98f2f3a076c8c39306c56fb5af106e940ab23cbed92eceff692c18c40d97a30acce4dc001dcf985157e8633102122ee94f756b24d936cf08de93c7e4
+EBUILD java-sdk-docs-1.8.0.144.ebuild 1425 SHA256 255c37678760fa7ee4f8dd69bc3efdffccf27db19740f0ebb80a474ca16468c8 SHA512 940af01d8aad45e3bb0de48414d0efe104432459074590d975c599fca4f9f036a0a256a08e8d2dc94cd1c0d45a3902515c894377ed10a145bcdb470d990fda90 WHIRLPOOL 14a774bd99a92b900ac197e85a2a9a73d384bb02aa4a32d31a0b6c96d7320f15a64faace70ec1cd816b0453e057f0b6e4b5e835d716e179654737d81e404e283
+MISC ChangeLog 5635 SHA256 95e0680393ed956d8dc3f242772c097a1197251811ef2b1f70eb090d00e40da3 SHA512 5539614479d9c2f4cdcdf0d4f9a63831f4e3b6097726d2755acb14c5fbf4ee08654693a0e77ecff758cc1b14b36ca54b4d0798f8256fdd968715e885ea138886 WHIRLPOOL b86a49860be3ab92ef409603702b9b341c931c1fd0f783e923015039f048be84b7989028f46de59f9bab4e92767d7773a65b721b70b24310e5d9c9fdd8f16e7c
+MISC ChangeLog-2015 19879 SHA256 2c9ffcdd9b85a1bb56678499d00805d39624e639277438a72b8b409a0a17c4e8 SHA512 e79cd5a4c6eee9da7e4561989847281d1d103ed211146845c2a118ffbb8cb6e785bbb655de5a16d76d307d6cc00005282a440ef8c0eb36044eed95962993c220 WHIRLPOOL 1a89b07b0f1b1107930aa5f1afa0beab1795ce1140b4ed45529a25f31d19268a2fedd909ae15f1d0d3f3b10321b7fbf79960617e31970df5a3a1bf8295b66388
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild
new file mode 100644
index 000000000000..42915862de63
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit versionator
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html#jdk-${MY_PV}-apidocs-oth-JPR"
+ORIG_NAME="jdk-${MY_PV}-docs-all.zip"
+
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="http://download.oracle.com/javase/7/docs/"
+SRC_URI="${ORIG_NAME}"
+
+LICENSE="oracle-java-documentation-7"
+SLOT="1.7"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="fetch"
+
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+	einfo "Please download ${ORIG_NAME} from "
+	einfo "${DOWNLOAD_URL}"
+	einfo "(agree to the license) and place it in ${DISTDIR}"
+
+	einfo "If you find the file on the download page replaced with a higher"
+	einfo "version, please report to the bug 67266 (link below)."
+	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/${P}/html
+	doins index.html
+
+	for i in *; do
+		[[ -d $i ]] && doins -r $i
+	done
+}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.144.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.144.ebuild
new file mode 100644
index 000000000000..823be122dc21
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.144.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 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}"
+ORIG_NAME="jdk-${MY_PV}-docs-all.zip"
+
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="http://download.oracle.com/javase/8/docs/"
+SRC_URI="${ORIG_NAME}"
+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 ${ORIG_NAME} from "
+	einfo "${DOWNLOAD_URL}"
+	einfo "(agree to the license) and place it in ${DISTDIR}"
+
+	einfo "If you find the file on the download page replaced with a higher"
+	einfo "version, please report to the bug 67266 (link below)."
+	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/${P}/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/Manifest b/dev-java/java-service-wrapper/Manifest
new file mode 100644
index 000000000000..59bfc6142eb5
--- /dev/null
+++ b/dev-java/java-service-wrapper/Manifest
@@ -0,0 +1,8 @@
+AUX java-service-wrapper-3.5.25-as-needed.patch 6957 SHA256 c514b890282fb001ce6dc1f798bd88dbfe451c0b76e19e2b99e2cdbe7171820f SHA512 f45dcda4ff87b98cf60d3db5bbd98b6f0dfced2d784076d49f0e29997b25f9f3eefe8b7d3410ff2df3e8cff11910a226996763982193d44b5c99aa03ade8aaef WHIRLPOOL 348f9e64a6dace8b1cd0239a8f4097726e8371bcbcf2c96ddbe0cb1d19214a07e749600dd781417b886353014770bce7121c3908bd59980027a6caa649c71823
+AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1256 SHA256 adc441746cba1baf9be6720952433cceb0ec10496a58f62521044eac9694161d SHA512 907f07bcf3debd45d07639ea8b60c21be1190cb7939b28c05eaebdd8713e818402d8da9722be09a7d20fb5598a44d0682bb32a6897b97ef7faf2bd74ca9f8824 WHIRLPOOL b6faa9159ac339f69a42cb14263c5af618b46fd641a6c4da20a8b131590505cb0a02858fd6388d948477953d9f862999a24c3bebfb72cbc6722926f62f5a3c58
+AUX java-service-wrapper-3.5.25-testsuite.patch 463 SHA256 b16e77e333be50a4e0fdc77934bec886b8ba141c6a4ae1d95d49a269ac5272f1 SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91 WHIRLPOOL 6336dc876b6ccd6f4918f1b233c940443311cb7dfb4866a2eb2caff0e5b5b2a8876669b88de48a18aefb06de1140f6e975b4369f94e34aedf8c3755122a8be9f
+DIST wrapper_3.5.25_src.tar.gz 556678 SHA256 3cbecb7f2101eda82125e3649e3245fc1e7b4b4d6501b479990ea8b18ac6450b SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4 WHIRLPOOL d6bcf8aa40525e80e7bfeb927b690cd818c69da276a0d6cfd2b6a37afb88cb0b826485fc25cb76fa89d7c6227e49735f31361641f966944caba5ee2cec44bec0
+EBUILD java-service-wrapper-3.5.25-r1.ebuild 1476 SHA256 94ef566710b7ad21547ba13ce99968424ef909ec8815665f8382eb3f40a542d5 SHA512 ed5b5d2fdb8de0f97e617dc387fd42ea9e310841bb45dc5c17b38057743ed91a6b862b83aaaaaded5d5a4a85ba67ca30fbc1364c55f8c94428f51bb33122d10e WHIRLPOOL 54cd0983d7b69248cc932556f7aaee389618d4b979197e5d70afd42746d22fd2d0036c5c9b60ce80695eb8ae224f17c6bddc74ada8a3c9ebe5ed8f4afe4db338
+MISC ChangeLog 4955 SHA256 d1d00553bc74c2b19a22280aadaee91036ef076b207268ac1a2945a990d09621 SHA512 7ad42bc7fb362fdf126b13ea357ccd852245d10acde669cc735a7fac6bb2f7523b6b49bda2bb716fccba0a0b7dfb1ff8b1ab91807c54722528dd3efae61e3c7b WHIRLPOOL 91201f305a84ec7cec03f5292fc1530278bf669463a9deb7dc4c3a533bf2359357071bfa3d41de797fa594b3bfd66edaca8538ed175d966c4119a00ea6ca41f1
+MISC ChangeLog-2015 3671 SHA256 80561e0b2a7d78f39e275748dfec553a3f071ba6d4e524585b65c2935bd4b9cc SHA512 ad0a6076e6c9e4589f7ed65eded329b9342821f16a1547353ef60a6681f2e70ddb17652a7b2aaf9ebbd8a5c9dfaad7cc569d3b93498789f7aee951726a24d51b WHIRLPOOL f6cda5b1ced477ebf64f074c832108640d1d4ac35e2f22e701ceb22c994e413a6ecc8b030d6b7ecb7174b7a5ddac9731a021714507c209600bcff05529adf2c9
+MISC metadata.xml 660 SHA256 b728d2a0e2bb3b369e08185a793bcecd091fb3abf678bcee55e5fb081433f46d SHA512 d8b4d0f62b3c484d128b9a087dab64dcfe11583eb6c6f380607cb9536cbe1854701b60bbaa11377c6fd326b4d01d5b2011a96e4c4402639b2de038f092b6b2cb WHIRLPOOL e7c664c14e333fe9e857aba6a5c12475a7ca907223eeb8d2f7207bc1fbae5dbf928fa02292b8e066b9b69faa8a9662d713378eccfa885dd0b9e50d11371b7330
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..b273b002325c
--- /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/Manifest b/dev-java/javacc/Manifest
new file mode 100644
index 000000000000..1c6e0528e5fa
--- /dev/null
+++ b/dev-java/javacc/Manifest
@@ -0,0 +1,6 @@
+AUX javacc-4.0-javadoc.patch 420 SHA256 4bef6b418576e68921583a28e9ec7789ddea35c8b8b7b2a9a7e8803c2c67774d SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438 WHIRLPOOL 56bdd4a910ef840b2899990302a018087f20b1deffa305df8b2b588bec4baf4f3e60054434edc8306aedd09c4bde01a072fd90dd9b26a165d06cd47f41fdb3db
+DIST javacc-5.0src.tar.gz 810123 SHA256 766cae9d3710054f452a7f0779db885eacfdae363152cb2e7fe025aa7ea17370 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6 WHIRLPOOL 11b299f2e2c0f0d699b0eb5f150e2200b60c0b385a0f3c8e4ca2be38971b71b52c7d351c7219af636d4fbab451fe9e471b9f2f676bc79cc2e76740e702159825
+EBUILD javacc-5.0-r3.ebuild 1404 SHA256 16ca7c19331a1c6abfc574fa4ddadb094da2f2dd5f0b0853c228e0d24fab2563 SHA512 ad8a7789976f67488cd3f749efe961b98e72530af5c9097f160eff51cc894648787882a3c69062bbfba9ae0f3e2517a850429beb5b1049af9b933dff104e8c80 WHIRLPOOL 51550849694f54b87e9ef64e8377bc0d7047ad5d26abf5515b8f706ab34e334f10398d80acd68424e3588f734a6563112e0513af9782da1d41788bab0610a2f7
+MISC ChangeLog 3910 SHA256 9faafef020f8bd57ae76d88f69464ea1ae0a15f188e37e7354809e3435442b19 SHA512 71010911cdad94486874bd6df891d2bdaf5b2223cd993be9093c358344b083bd8250d861dde9e7d56cc708ee5419470172579dbfec6d280a6341c3370298fd54 WHIRLPOOL a9223fce1288c2dcdcea3f4ba572eec1b20fcb4102f114bb113027fd81d4f351ada9f7430c75918d9df3e40b7191e7b90c2a3ef8d51bfac928da02ea37f06982
+MISC ChangeLog-2015 6540 SHA256 79301b32e783e3cdf9133ca3a3408d2f0cfd488e43f5a4c7fe1625182e55bcf8 SHA512 c7f970d6e7ac19cb7e93ad87e0bd14213fd2e2bd996177f1c5fa4ca7a95b6daa3bcd16359ad99d8dfec1bc7b2b6f0c2283b3f3a4db38e2f10046ad2989a467b9 WHIRLPOOL f00bbc8bb6c7ea15fefac19f4950a1eab2f57c3c5e62b1a1f7406e2a486917c9ff7d06bbc4e5fe6063a2a4a9b3518f8e24eb2034af725fcd5f15b471c58092aa
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..1249b0be132f
--- /dev/null
+++ b/dev-java/javacc/javacc-5.0-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/javacsv/Manifest
new file mode 100644
index 000000000000..5099e1963cd1
--- /dev/null
+++ b/dev-java/javacsv/Manifest
@@ -0,0 +1,4 @@
+DIST javacsv2.1.zip 89333 SHA256 29dcf065be4e18111c45a3b020f191bf2447e52369723e881787c522a68e0aa3 SHA512 beefeae1306163a21d4237dc3cccde9ffba0435fa898d95a77f33ec45f383e81e7a804d33918ba2a47fb004ed6f8734b8567d11a3ad63d1be3f9d1fa53e153ee WHIRLPOOL 92b3b76542810cd8ee9f2c813b3451851376c3f8e5e341a1864dfa27e6e09acf1b974cac922c551c6c5fae9f8257d02726d207d3d0373ea4db07f37a280ef3d2
+EBUILD javacsv-2.1.ebuild 877 SHA256 047a2f5e9eac448286636b71dc0fef1cc66aa1372ad2088d32f4975fd2c208bb SHA512 2acbffb471f7699767f703e5b5154ce8af631e13d55be770c132d2e410734b584a645a1affb47c301da239d0ccf65ce42e9e300e5580e9f6c9ec8086ac7e8e0d WHIRLPOOL 4dcc1bb7cc22b766ab6b728878aa3b58de9715a78f2acc9afdbf32bf72a9eddf9c2d9127e81c7f29a4aa6e42adc0fe3ce9f742f0225ee2c6276e6c29543514bb
+MISC ChangeLog 1693 SHA256 0adc0b85a33199422acd60b31c20bb700db51e45e0e427969f8a123221d598fe SHA512 e0cf78b520dcce9d753a0234143684e42d64824df005532d21439d60f8bf7ac4cd1a4beded0a9f3fe52f7d10c00c8c5ab8c09a0bb596a0c613549bbc183732a9 WHIRLPOOL 5d7919e8cbc1b83e1357df45594653112f040eaa481a3e3017ae04873b36f7525cae7fea2d554e1577210fabf6a086055c4eb72bf8a42828b6d42b29790ab740
+MISC metadata.xml 425 SHA256 fb968eede0202ae85255b00947b8614a9bb0f25ec29d98d645f615f486a73720 SHA512 b67be9d1ae7101c8c600a86d93cf6d4db67a995293da28df016ab2da205465fcb05787f8a32474496e9f0fb950d9c0585bee842c2351e2a1da98145d7906b6dd WHIRLPOOL 4c5be283a2960f60e3d5925a17af657f4214cdca32f76b7a1f514a0418b32caf6a614af17c35717ce35ecedb002b85eeb9f66ecd546f011931597a7a4b8f5840
diff --git a/dev-java/javacsv/javacsv-2.1.ebuild b/dev-java/javacsv/javacsv-2.1.ebuild
new file mode 100644
index 000000000000..ce9a8aeea631
--- /dev/null
+++ b/dev-java/javacsv/javacsv-2.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 test"
+
+inherit java-pkg-2 java-ant-2
+
+RESTRICT="test"
+
+DESCRIPTION="Java library for reading and writing CSV and plain delimited text files"
+HOMEPAGE="http://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/Manifest b/dev-java/javacup/Manifest
new file mode 100644
index 000000000000..4970780c07a4
--- /dev/null
+++ b/dev-java/javacup/Manifest
@@ -0,0 +1,6 @@
+AUX javacup-0.11b_beta20150326-build-xml-svn.patch 1385 SHA256 5f8b468bacc48ee0ba9cbdc07c4d4066286647d8efa2f38ce9c27fc55193547a SHA512 211157370c61995a05ce45e70941d99da9031174fae2b6e4bbacfdd0c402c451009eb5952a8c3cf8a586402aa138e70733dfd46ce9cf6b5fb680edf65657506c WHIRLPOOL 5c736d4114f5557bdf179dd9bacff1eeaaba345dafc354592fc895e61737e9dd023878eb0ebc579098584d912b60df61f49a8018bc874ea62390425b03a15355
+DIST java-cup-src-11b-20151001.tar.gz 313405 SHA256 959189360a8530c9e06cbf8cb99795bb4fcc25a00d774e961c98611c769b8f33 SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e WHIRLPOOL cba8a784f156b21ae2a40afe02112b5bded04176bd54b3190f1d210e5603334553f170b02f91f970ade3f68d8d00715f1237dd43476712f4e24c5d0857bf6304
+EBUILD javacup-0.11b_p20151001.ebuild 2835 SHA256 a5ea3d2b187bb0ea525aa8128230138ab54eefcf9da64db2c4ceee3d293634de SHA512 b039022e35780eb43e8c2e6be562a613048c566ae69d1fd5691ae80655396619f5253be7f0e7d5e5c65d6cc9548f58d2c3688ff8aa63605a8deb1f4a556318a7 WHIRLPOOL d60a2c41a70a163d78b19c64d0ba230789b96f487bb528cfd33993367b76b33a14806bfde162c2d99113295ba7bfc3987e56c7b5007ba89fbb984cdbcceaf3af
+MISC ChangeLog 5016 SHA256 cf8eef6d29dc8abf2c7bad07c9923596a3a91b1d92fbaa103ed59778c12a99e4 SHA512 754bfc4a3729a3f39fbf96d0f7009421f055b07816066755ed41dd72074892998926d9539004a1836b22f7394662febf19c510b4678177c2e4de35a05198fa43 WHIRLPOOL d7ccfa9530caa7d1825828c1f25611dbd2829fe2b64673851b51d902c072b270a86ea511f4534a4fde26190ed2c9997d5048a633af121ea831a4efb0683970bb
+MISC ChangeLog-2015 5236 SHA256 9ba25801546b357dcac6ca1081939a2cef15db3105c529ae9aaf377aa3cac948 SHA512 a2421bf85cb31611dba1286ec0696fdf9061f167810eea07b77caad5de93cbb68cfefbc70d2a6bf7238f3cf7dde4183f346ec3671a201abdae85e3ce63c6759b WHIRLPOOL 4386dcc98e32bd50c1174912fda018f936394e9dabfc3f65afc92aa7f18048e3a5ef9e024885a6ea3481264a0c6c6076d2dd436f609fc0b3cf5a67d36610d6c2
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..f5904bf6a0f3
--- /dev/null
+++ b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
@@ -0,0 +1,89 @@
+# 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-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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/javahelp/Manifest
new file mode 100644
index 000000000000..68715edf67e6
--- /dev/null
+++ b/dev-java/javahelp/Manifest
@@ -0,0 +1,5 @@
+DIST javahelp2-src-2.0.05_svn63.zip 3747088 SHA256 a864ac71701ed8d12ba192460cd7b4d51e78813f39a140ede5d9b04afd9eae92 SHA512 ed795dad98f8d80f4cd4cda40b6aea0978cda621b131b1563016c1ddc02afeb37f3626a28003dac26d7fe996274fb9a97e741a500b15d06b1e5a93342020abc3 WHIRLPOOL 111398f9e6731749af6a0f36b59cd5a609c8fd203b03fc219bac02a456e2ae92718acac2f75debe768c978a14fb000ad7ea9b7eb0b94f6b6f4d8c1f95a0bafc6
+EBUILD javahelp-2.0.05_p63.ebuild 2295 SHA256 21dc9a3be8ee939350dd872963270c234880a9429fa3134802976cedf4bb66fc SHA512 503a949dd78c3a1a7288c2db7e0f7fe351a6a1abc64a7007bfa714e9858135f725de493bf2bdd720332712e907996b56668ad1518f3ee09523a18c39679b8050 WHIRLPOOL c59d9ac9024dfdc22b5aa9a0ba5441eaf3b996b7774cbb36b8f393f3692ce98df4e98d8b976ec4aea5178bb47dde4086296020d525e8acf230913ff9dbcaf280
+MISC ChangeLog 2584 SHA256 c9b86e869a716dd8d71b7400ff4d5099e1ee5c71fcf7e7d82567d59e183a9879 SHA512 50b38f32ad8eb78a5e1195cb19adff29fae4f25dc885df1c6948c301c2db2c94fee95ccdf8a6db86c42d042ba333893efe26e76d39af5192f991be29d72ab27a WHIRLPOOL ea8f7f3b2f3862aafd7c266b87fdf3015130ab06ece407fce1f1ba067e8a52507a36f1dff47b758afb947581791b2918350ea6ac9d2609165b5a7393dccd06eb
+MISC ChangeLog-2015 2466 SHA256 e345719787e241f02b08ac9547bbb15f34a02921b0116cd0b4490531af16dd3e SHA512 cff7f6e51820dcd855e14fc90dca6e7a0b24ac29945f2758d32ae925bacdefddbf9742a92ab0fc5e43e399c1afd8503ae832f87e4676b0717c0f18fed2bfd954 WHIRLPOOL 6167435df6b11c6d4a783268ec16947ff795a1f6d504c2429acb69496b9fe6b9d9bd57db1b9c433f0bdc0c3408604db5eccf08cddd21a1f171bd50ba3e5a751b
+MISC metadata.xml 624 SHA256 7d4ad737c8b151bc9f2b30cd0d9308f970d74a72e563dbed07f24a769cd6cadc SHA512 bd475a0c41855b34bb58ae6d6a3e2d164abbb97348d809f2fc305e77ca80495bccb4d71ad0aeb0b5586565c71649c6e3775b83c92272dbe8518949864120f484 WHIRLPOOL 66eecd92c1f1a94381d41a8b51a77766a22a105be8533abca913058539d3930be2d847fd635cd2360a5d3b08a96f2c11262d1ddc8bcc7e50c3411d4d49c83e68
diff --git a/dev-java/javahelp/javahelp-2.0.05_p63.ebuild b/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
new file mode 100644
index 000000000000..4164301afa2c
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="doc examples source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+DESCRIPTION="The JavaHelp system online help system"
+HOMEPAGE="https://javahelp.dev.java.net/"
+
+MY_PV="${PV/_p/_svn}"
+MY_PN="${PN}2"
+SRC_URI="https://${PN}.dev.java.net/files/documents/5985/145533/${MY_PN}-src-${MY_PV}.zip"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+COMMON_DEP="
+	java-virtuals/servlet-api:2.4"
+RDEPEND="
+	>=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND="
+	>=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/"
+BDIR="${S}/javahelp_nbproject"
+
+src_unpack() {
+	unpack ${A}
+	# jdic does not currently build out of the box against the browsers we have
+	cd "${S}/jhMaster/JavaHelp/src/new/" || die
+	rm -v javax/help/plaf/basic/BasicNativeContentViewerUI.java || die
+	mkdir "${BDIR}/lib" && cd "${BDIR}/lib" || die
+	java-pkg_jar-from --virtual servlet-api-2.4
+	java-pkg_filter-compiler jikes
+}
+
+_eant() {
+	cd ${BDIR} || die
+	eant \
+		-Dservlet-jar="$(java-pkg_getjar --virtual servlet-api-2.4 servlet-api.jar)" \
+		-Djsp-jar="$(java-pkg_getjar --virtual servlet-api-2.4 jsp-api.jar)" \
+		-Djdic-jar-present=true \
+		-Djdic-zip-present=true \
+		-Dtomcat-zip-present=true \
+		-Dservlet-jar-present=true \
+		${@}
+}
+
+src_compile() {
+	_eant release $(use_doc)
+}
+
+#Does not actually run anything
+#src_test() {
+#	_eant test
+#}
+
+src_install() {
+	pushd jhMaster/JavaHelp >/dev/null || die
+	java-pkg_dojar "${BDIR}"/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 doc && java-pkg_dojavadoc "${BDIR}/dist/lib/javadoc"
+	popd >/dev/null || die
+
+	use source && java-pkg_dosrc \
+		./jhMaster/JSearch/*/com \
+		./jhMaster/JavaHelp/src/*/{javax,com}
+	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
+}
+
+pkg_postinst() {
+	elog "Native browser integration is disabled because it needs jdic"
+	elog "which does not build out of the box. See"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=53897 for progress"
+}
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/Manifest b/dev-java/javassist/Manifest
new file mode 100644
index 000000000000..a0c78e1c2704
--- /dev/null
+++ b/dev-java/javassist/Manifest
@@ -0,0 +1,7 @@
+DIST javassist-2.6.zip 1143271 SHA256 c77a56714df64996c704c76718d07ea97f582c6eba20711bfd9ecbd468bd02e8 SHA512 8a6da5e2a44cc3bc5b87538a4eda56808d13998d8c9932153f9bb42a1c7844d1a1c7311eb22b0b4ad04649bb7c22156acf851bee638cffbd3328bcef1d2a9f37 WHIRLPOOL e08b458d1fd3e1a89b81b19077c9e7c22fe8fd33d64542d9a7d3ea63ad0aef5df8bd229c6144e85e612eae288dbe6b0ca16210790bba866925148f2d90cd71ad
+DIST javassist-3.18.2.tar.gz 1179428 SHA256 7ace5b44ffdd96b64a3268a3f014d0ad9c44d9f4d8cd3a20e92877dbbac5a6fc SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca WHIRLPOOL c2fc97f00435420fb147743f4f5d0c8d7235abdf3b3fbd4fadb33dbeb42a7f3fce6d6d401c27ab84d05b93088ff3e4e9f8468e859aa1ef039522e0bb8ee52e20
+EBUILD javassist-2.6-r2.ebuild 756 SHA256 63b9ab75c2c6fd57d7536be5126fec1566e1c84496651e714c308cc139fbdfd3 SHA512 58373704cb574b16a6bae4c2a1788c565fdfc83eaa6774a21f6dcae1814fd0be1c9306209b08d8aec801e5d4e34ef6a0f190cfa6ff410515230ef626c439c50f WHIRLPOOL 26a3930fcd558e28a6a3a4c2a039c913f0df413a89e8409f8d48975d0337249c216c9ac3afefb29bd0d5e32feafd9e5dce7dc88aa95d04ae86abba95701111f7
+EBUILD javassist-3.18.2.ebuild 978 SHA256 8b34a1814755cef784532198a626f21aa116767c9b8a80f763fada4e7e28496c SHA512 c6cbd4ce4f9fb179a49a7d2f18bd9f8fc06b66b2ba7d0a3631d681d1802b71d20c54e0e07b4ce47bfb9687afc37afab1c5d03bc8ebc985405423f906495d9f1b WHIRLPOOL bc5120caf9cdfa57ba2f5f4d367dcc0d62f3bcb2b957101bae80c54bb8bb7ae47c0cebfaba129d9a22ee8cdbfd5220767d42d59551cea593b1a881ca62f7df99
+MISC ChangeLog 4143 SHA256 29eb46438bc9f9922571e0ac3bd9b78810c9c78037abff682c61e80f76b6d264 SHA512 2270168b26bbc94399fbceda5ebac70d19f62a83107b20004456a1bbc958a52cd3be0f6c990ee6c6f466ec60e852d94ace7e85607e39c164370fcfb54eace3e2 WHIRLPOOL b79869b29bc2b5ab5a9c31767ed1df5bf0203a6f18754aeb372f05f133efe6756dfb391e00b5dca08b1c17facb93a42704feb1a423ef20c8e0466a13f5823652
+MISC ChangeLog-2015 5050 SHA256 2e47c682e71525aba1dd5744dcb172b54a3cf119f85bd1a8ed871aa29b3f71eb SHA512 ba916b7a0bc7dc22fbbebc19351c95e3207cf16903d59fd3b7b47200b76dde668c8cafd129b3b065f62f92ace83ce5b4fbd4fae134d3ae165b31f63a78137290 WHIRLPOOL 246d48aedfa4dc2e241eab13cc318a42ce62030901db821cb5ed75c2553f09ebfecc196c9bf6d5533e834a7c7804df624342292cf158a5f2818abadc01aa3b0d
+MISC metadata.xml 376 SHA256 1ef620ece803eb2e4381bbc01d8e8e444e3c4da975609920c7848d59153f6a7d SHA512 ebd682e2a4913e15c4c93c7f22c10e8f540fb377f2d90f137291bedd1ed7410b5af36215e94543f6e048803bd4475ee69371ff00255f227c4f2df9432f118ba3 WHIRLPOOL 237b4efa935d125c0450e9198251829d4b891a997926c32ba9c4894e299b71a1150696a6b128bf6951433dbeec399f51e6285d3fff8556615972dc486e52a3c4
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/Manifest b/dev-java/javatoolkit/Manifest
new file mode 100644
index 000000000000..e0ea07b5bfd2
--- /dev/null
+++ b/dev-java/javatoolkit/Manifest
@@ -0,0 +1,10 @@
+AUX javatoolkit-0.3.0-no-pyxml.patch 1128 SHA256 9f0e285c15a1a477606c61fabc391a8f56656525c7d92f91ae59e289eee7d8a9 SHA512 edb135c6008a24d22bf5116bc73944fddf5a8c44354b80800425457c9c9ee8ef4f55413ca88507c991ed835945bc7d162f6b1b3a30c57fc5f41f278e0c5afe16 WHIRLPOOL b0cc84debd5be1e5abf4daf338b21ca55e6e84be7d59a39beff65c7b1dfc2442eeb5e7a0e28313606981f18e83f5ef38344887a15ce8ecc7a03bbe3bd2ecb62a
+AUX javatoolkit-0.3.0-python2.6.patch 413 SHA256 4128e060d2c3693717c64e443527380f548d663496bb982fe45463e6370d920d SHA512 54df3c263a4b8f42457eb848f3fd79ef83953cfc1069c9229e339a178d2363bdaa636ec11ea49dbf5693c5eafe4d123942bf06f3b77b80b0cd8de2177045952c WHIRLPOOL 6c15e4fff8d0b841ff13dd9d1e38a5e77c41f80db6d0460eb3735f4632953b5ae23030e31da02cde361972468ab939fa2b9aa333f09a5b17c25b8ab5b97eadbd
+DIST javatoolkit-0.3.0.tar.bz2 16823 SHA256 47bf8aad2ec58b2d850e8cbe57fe2707859d800b215b24387c7652a50353677c SHA512 e7bbe04e39ab277d0aab89f0eea963c4b0341a336660dab08bfad0510ad1b2b49ce7410a2363bcf9ebad5f8757ee254ddc27af642b4bfb374db52d82cf02c3b1 WHIRLPOOL a9b1034939a0e22c49620bb29d3652e8f5e6a8e71645556fe00463aabc0c1ff2ac2b666f59fd0ceea8ea5dc18579d90cc11a07ba341028831e3b8dd1e8a0e9ce
+DIST javatoolkit-0.6.0.tar.bz2 26009 SHA256 eea0c349d0f532d632ac7b79f65c3c90d5dee3a6db044cf37cbbacf7448ac2ac SHA512 ab17ce59032286af30f238a3f0b37b5ebee2bcfbf4029239fce5f691265f87dfec3a7b29972a3d03aebe79ec22c435c2e37ca0e009fd8d53a58e7424a5e61409 WHIRLPOOL 9454a5835aa15afc2e7021c82254b4103b76f1b9165d80eb15b41a62547da7cfb5543af06d418992248d3c4bfce4d0e07cff00fe95d3f5303fb24aabd86a1845
+EBUILD javatoolkit-0.3.0-r9.ebuild 914 SHA256 b92417c725cc81a9b62d5b82152b222ca4937d8eb351ef80d98aee7166d3e062 SHA512 4906143e70c2571a5cbffe2b25fff39a151110b8bcd59d79b9fd0b783e641dadd6f3ff304c1094fb495cf0ec190c9d059e062fbdd7a63a85b7b020746e611620 WHIRLPOOL 67d8e726e17a73f2348fde5a1a69a1d022f91f70b20bd339ee7034538d41019aca416e4f0e3c48643ac0b69bfe8238c6051422047a362ee373ae91d1dcc12ffc
+EBUILD javatoolkit-0.6.0.ebuild 859 SHA256 d2b0136aaab5b359291c04198d7dd2bb61e3220d47681583c43c95549bc0eaed SHA512 b4b137610446330088ab3e5e11817a10006969666a548efea31b175df9e5fbf550b73f3dab6fc053eabbf12682b90d0deae69be70c869d9d8cbbf4ceb4537a97 WHIRLPOOL c1a9a64296d71d1b12ac4eb3eaccf7c0e9b6af2b2ac2ea5653f4d3e34aa93249f6b222f62bcb6e1858c73f334a446050990455b6bcd9ce55d7a4592e19d95a94
+EBUILD javatoolkit-9999.ebuild 681 SHA256 213ac2f4515512759e5f6f027a1f2d465c6894c85ba061a94fd1606f587834c3 SHA512 696e6bcdcea76d9b59a65a80a79cf78e1e9634d0a7eba18dd5700edb328b2773399b1dd8c973d19b0aac3c31953015bc0dee37861ee44f551108310fc249997d WHIRLPOOL 873376c45ccc9163d43e2608659fd97bf75dd75fb57d6028c200b601bae786aef3c3da565e9ec41d1d8918fcb065b9b913e659fd1ff4c1134f26fae461370d2a
+MISC ChangeLog 3405 SHA256 f99a61fb64a1dfaf685f302b3460af59ba25605635487354fc3384fc8a8167f8 SHA512 ebad97fa9317c63da8cf4cf22712ae1f7600af5c943537d0320ab7533453b0ac90609f54ddcdd127deca23459a5e17cd1e7a66b8cc1d7c3fc3a3ba26666a2536 WHIRLPOOL 1b0505667e4e716aa4b973f3abb39e420dfdbd8cf03b42ed78a473199a82e8ce954f063f5a8d9647987b1977e2911560d77b526945f98db54a8359716c31b4f4
+MISC ChangeLog-2015 11479 SHA256 5eeadb8a2983af6d5b3831b6358b5a9ce22804922bae3ebb8736ece229fe75b8 SHA512 eaf827a0dc58c2b70ec51ed6a9ed593557a45768e54c5497c91f59323f387e527903ad0a86ff5cf65ef7794dd5c4daf4da38efca3f2c833d510442e011a17901 WHIRLPOOL c1d06f73286be6e34555b82b5b7c8533eb7f6d46e53a7e05a8629a55df4b8a1d04f89ea815f84978958c55029f146c5935604132e34266e452c0a027b59a9ea4
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..36ac61a52b13
--- /dev/null
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 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 ~amd64-fbsd ~x86-fbsd ~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..386dce2991d0
--- /dev/null
+++ b/dev-java/javatoolkit/javatoolkit-0.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 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 ~amd64-fbsd ~x86-fbsd ~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/Manifest b/dev-java/javax-inject/Manifest
new file mode 100644
index 000000000000..753477e2fb08
--- /dev/null
+++ b/dev-java/javax-inject/Manifest
@@ -0,0 +1,7 @@
+DIST javax-inject-1.jar 10928 SHA256 c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b WHIRLPOOL 4ae44b7088d381f8875d910bafb74e99b724277bffc5274bde75588b614aa0defd66b43a0774957f9cba4d28435397b3e130d9373b0e68e3a29857f0a36cf18b
+DIST javax.inject-1-sources.jar 10928 SHA256 c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b WHIRLPOOL 4ae44b7088d381f8875d910bafb74e99b724277bffc5274bde75588b614aa0defd66b43a0774957f9cba4d28435397b3e130d9373b0e68e3a29857f0a36cf18b
+EBUILD javax-inject-1-r2.ebuild 578 SHA256 c0fe67a24ee428f87cfed9ef7489dd05dd7a328c560a82ef91b50f159bf54e19 SHA512 411f1bec81aaf28f8f94fdc42325a71c30bf33a57c872b3fd34184a5603866b15c8f17cfce7727f623e8223086babed3654860449e8ed73dadd1555d05f503b5 WHIRLPOOL 5b0082a30413e4ff64077816b078af2e6ba8e4eff1fa1e9cbc66e42b37659bcfd982bdf767956e466741d544d75130b23230140da1edf84a640ec7b53c5699e2
+EBUILD javax-inject-1-r3.ebuild 541 SHA256 8918d5982b2c5e742727a92e50c69ff54be717d79a6b136bff3ba9b1484a40ac SHA512 bd58bdda1cff3471c5ea7b96f938832b74b76104fd7cc03f713ca0e2a831ab229871c0242754ae46239ceda1e8022d207b896d935a79bb6ba47bb4a971912ab5 WHIRLPOOL f08e37884aed897768f4858976856ba876cf9b2430666bf217c37321d7064affcf8bdcd116a8e7e15497c0ecca47adffc55829d5bdc0f11696b8d3c2ce0de58c
+MISC ChangeLog 3764 SHA256 068baa1cd7ae36b15de14b14fd26532e4770c1e39cc17a833982d4357d6bcfc9 SHA512 5067b0175e87c148d8c6392fdf7d27fed15fbe513cc8b3fc18b497fc1ee521bcf69d8bfa4f88ee3175b1befa0176ee3afa8dff7104072ffef5449893cd62ce90 WHIRLPOOL 33ee61b250574ab91710ce6dcccb3223ac5a02831366c8956fa82f3b51c5b07cec3275ebbe18e9caada2080938046886d07be11d96d7e7b26acb1659766ea1e6
+MISC ChangeLog-2015 1014 SHA256 2ce2020a379cd7335540f65ac922d275f3fd6353026fe690d703181196509327 SHA512 211723245921b92fa352d39e69c9eb73cbc008d5577c7e677eac9519970fcbb3a8db1952ba9a7853d9dd23392440bdef332ad7e37bc3045b5420e9b5cc906e99 WHIRLPOOL c59dc272a7de39d6605c87ad3d13efc91038503e04071ba1cc05267d4f1ab3dc17cefdae7a072358777d926a42c490f1190e956ad44df0e5334c4e15268f1cf0
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..f6a6fe6d204b
--- /dev/null
+++ b/dev-java/javax-inject/javax-inject-1-r3.ebuild
@@ -0,0 +1,22 @@
+# 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_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"
+
+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/Manifest b/dev-java/javolution/Manifest
new file mode 100644
index 000000000000..d60b5aeba5bf
--- /dev/null
+++ b/dev-java/javolution/Manifest
@@ -0,0 +1,10 @@
+AUX 4.0.2-fix-java7.patch 1066 SHA256 1b83a135bad7dd07555a542706a6d5823cea79fdec603bedefb7cae4c4c3bdad SHA512 11a9e64002486a52ef4aa35ab0d4e5faf370b2d7e6e16534e2429ddc32ce6213075c9190c06e441fdfd15d0a330826c457cc5c26b2a24ce59540c31da8021e66 WHIRLPOOL 489aee1697f4c12ed878cb9160ed49434d95304b46a8b9baa70089d14e905eb36bdf9e9f003091f5d7eb7c80f7f4009a651bfb437d1bd30aec7e76dbaf2aadd9
+AUX javolution-6.0.0-javadoc-fix.patch 788 SHA256 72458e10402ecfce1c9331dc09f14eba3fea52c61859a63b632444eb191e401b SHA512 244d561628e7444c4ab22f8bf3a4241d67aba6dd6ce593f02647e3023c81b36e83322bb7adf40a277e63165246265870de8654e5bd826564e58af37f71fd1824 WHIRLPOOL 789deac9b53a9fa96c11e0c20020ee4c77d14ca6ed578d5dcbfc1c3a87e32d2d1f5f9e25ef976160659468c9ef2c5259f031b0fb2007717decc7fb13cb8d35e2
+DIST javolution-4.0.2-src.zip 556097 SHA256 fb5256c28b9f1de67e9be2ee3df16ff989f8f7bc4cd33946425f7e19370d4905 SHA512 562e0d364aa6b564341ce197941aaaf51e286712e6b71459ac12eccffbdf1d440f1910826cebf088176562b5dccb865f5d0e652a519814e1357094e253ee2efd WHIRLPOOL 7061f9debc2efe986e7f6d5615c11c5dab5809b3b3fe75daa466577b8d29194ccd71403739a2fe4bca7cdf049c8078577bf6aace555a2e018a023cb3d81ead53
+DIST javolution-6.0.0-build.xml.tar.xz 2696 SHA256 2730a3cb2186de011bd1d5349ae151bafd9441c3b584aae1e2429c0774dea04c SHA512 5861e462f24817efec24a784625e240fd4e08117c7b11bf7145f8dae35bb90b0b9fc1e431895ef5d868a1f1d57d96967fd9f39a9b821b51875814f6e118dbdab WHIRLPOOL 69963b313441f8cad2256e62feb2756393aa813bc7cf7589f401eb79fd764f490a737bfa5c4802c2178b92bde51a480b8a1bd2249583042cbabd39d5cfe71f7e
+DIST javolution-6.0.0.tar.xz 1308148 SHA256 0af6f9725d0e50ec323a79c8b726ee01a070d860980c080270a853739e41434a SHA512 86a7a19b13b74cca6ab4871e725a1143d6a1401cc7265390ee66b83f8a9b48f7879b8ccc2d7a3d660e523b64e3779eaf372519ee98268f1bf55df1d7b5a7f034 WHIRLPOOL b4bf337dff963b766a2aa0ad8a3a0c37e9569c14c1fe7acd66bff180c68e40294decb06a6d85add09eab486cb967c89c3224cc467d013fde15e180a823890e8c
+EBUILD javolution-4.0.2-r1.ebuild 862 SHA256 7689bf6b39f2466ab9bf59daa27dfad9d7478ddf2f103da0d92d6cb5a0ff1808 SHA512 57633a2a5818ec60a00697ccfae762beb908dceed175e7446fc194bf4e096493aec2e70daa8a7ef9f67f865bf471921736cc882f6d826fca81529d9b6ea7c808 WHIRLPOOL fe1e57ecd494e9b4df67b4b8989fe9ac6fae139d51d15c382eb7a6bd2f4bddddc68b9fed19f7edca9871e5c3a977f78e49a922019c5082508f50975cb84ca41c
+EBUILD javolution-6.0.0.ebuild 1359 SHA256 d111db5abdbb041f6dd656116289336a96839a884fa3f587fec2486345ad8589 SHA512 9719d2ad63d57e897fae5692a08e67cc91da5a89a9e5dfbaf8b9a27dd6dfe07e186791bb4d88ae4ef5d59da58daf80e1a11d4b5da60e31e2d2c8872e97945a4b WHIRLPOOL 975249f89f1ddefca2ae0cb24639c66d8500ad35140f02ce1cb06c709a849e2d6c08cc232ea2bb36040a16f16132bd19970219fed2681b605557da0d78fea587
+MISC ChangeLog 3341 SHA256 13445c6264c6a90f7069ed28f12a8eb74e7e1927221a35cce60983ecde9c7363 SHA512 de273be7a183d96249e25995fe14cabac2c3833046807597cf5eb02f0e48fb37182c9ac6c9f654ed6f8842c450232c632154464365bff7ea469b4df1d6683b6a WHIRLPOOL 384f7d1e699e91fe723cde3539f316d81c7fe9bf63c33464821c6cc9df81722f52e09107758e93931b2964b9969897954179624ae6cab9f59691f5837dc22ff6
+MISC ChangeLog-2015 3094 SHA256 3b94d18930a5ffb69ebcb509aa6002374d997f7a1f4ed15a8f6cb875216e7b40 SHA512 bce068f34ea8de7423ee713482b116106c4fbfb54187db7f6e31b210895e64f55bb1e562939aa5b71203ab4230c5e9b175093c5079a211b1a060b738bccdb8c4 WHIRLPOOL 654176396e6d3f8740a18a9a92e1f3e5e4b7585346c0ff7fad509cd15ad7f15c3681ad7c4cbaafdcd0c36770ef509b84474698045372a703b36db76783a9540c
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/jaxen/Manifest
new file mode 100644
index 000000000000..1f5f6e610928
--- /dev/null
+++ b/dev-java/jaxen/Manifest
@@ -0,0 +1,8 @@
+AUX jaxen-1.1.4_maven1-build.xml 13148 SHA256 494368debe33ffdf60b93c393319940b366dded769b221e5b3f03d040411674b SHA512 2f3625a2a14066289b20e1118a87168e6cf1ce252becdccbc6f4eeefac446e528298e1e6af7d1304ff9d1d4ee8c394c2cf67f6799d3062091d53cce7ff5b1e42 WHIRLPOOL 06bbd0f73a85785b381dd10ed6b5f61c908197bc495de5a8ea2e69013d8dab66a732a1a703d9671ecdccae5606d30512749b0f48b323a0159c6d7521eb274f68
+DIST jaxen-1.1.4-src.tar.gz 268493 SHA256 97d039a029ccaddf5ef301cafd1da8549b8360fe3ca0c15d65fc57162cd4433e SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031 WHIRLPOOL 44e3449ec8c0c15496c9528c668593d3dde67da67108e5927aee630df6ee3803999f812ab7597f37a68829e95a435fe6699bc9681583f6a500cd55cc51fbd6dc
+DIST jaxen-1.1.6.jar 409677 SHA256 7d865e649e3dda2a26d9aee3f7f2e9e10569aee688463feb57d0bda16745eaa2 SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48 WHIRLPOOL a46f4be76d43a0072b4b426b41d5e2df800ec71582724cb0036f010cbc3a9c8e39d4fc87511f6dba79b329cee072feaec506d730bbcc6decc5325d3ccfe866f6
+EBUILD jaxen-1.1.4-r1.ebuild 1100 SHA256 6abff4dc6295093ef54803acd76ec213957bd0c47e447cff07ff1d15d79346bf SHA512 5702fe35ed5087cd411390f78ada0aa73861517188572daab3adbc6049c735e7339719ef540b410d20acaf1aaa4316c9a27cf8715dd5e3deb2bb38227a934782 WHIRLPOOL 1aa40755930d34dc45489d7d8cd1fd96c0d312a9f4f34db7cf854ffaf3c5fa3bbdab7d74a8f3e6ea6d1796bff4102931f02a218b5287c19142ae07b0a2859121
+EBUILD jaxen-1.1.6.ebuild 613 SHA256 34c572854dfbb053140bb1fb28695c04835fd3c02b3495590dadb04a7b7e7bf3 SHA512 4bb8b4f2c124f9eac8e96ce99cb32d39dd04c46e6e17b7217f8791d417ce8dc87067d611df50967a2caec67265fdb14aac9d0f28a57c4bfe88f941bd860bf91e WHIRLPOOL cb8d21051686d5c395704e6c90b384a04b15d507976b3bb11b2e78c79334aca0bed8c54e30339c4471da4ff19f4434fda6ad1ae15d4ba2871f9d09d2ba21d71c
+MISC ChangeLog 3528 SHA256 cf77c233a983fa334cd95a624f6bba3d2c67f17ca21224c593e7defd5d989b36 SHA512 a3390feefa2c8746958a28177c744041636e2e1b0b59955c54c73487a0172da5e2c8d60ea2b88ceb535edac5277572ff8873bf266b60a4905e88eff9d1c7ef34 WHIRLPOOL cafc529aaaabdc938590635438a7fdf7709632c6b116ef61de63322ac1c53676180153eecf0fd8c0764a32c9f73cd687b6b7429c9ab31eff6e890cb6c2af19eb
+MISC ChangeLog-2015 9409 SHA256 0c0bf863e06b54bd17cbd59dc4846684bd5f3a37fe552487f30cf4001df57cb9 SHA512 55637e052c23436ea1b204fdea76bff454ff000e2b46062aca4d7c944cb07ddc2d6ad321d977c3ed627ff8c3bf2029343e284662b50e8eab409f904cbeda89c9 WHIRLPOOL d361c602cd48d45c1ce5a989f74fb101541e25cb2f3e5ed5080d8ca2989442d126ef8c7309d8a936dfe4d6936a681dfd8990615089f72229d53e02efd0ea9769
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..a864a4673434
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.1.4-r1.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 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 ~x86-fbsd ~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/Manifest b/dev-java/jazzy/Manifest
new file mode 100644
index 000000000000..74ca502dc94b
--- /dev/null
+++ b/dev-java/jazzy/Manifest
@@ -0,0 +1,5 @@
+DIST jazzy-0.5.2.zip 235936 SHA256 df6925f924094a9ebab51f30c0e90299e93be7258c194b6f0ea06a1df04fe43d SHA512 6d20f9bc133c03049c4c2a5c8612a52ef9fa09bc7510fb762c1ba9de479b1ce9319633ae2e78d3a1dd63900198d4e2468887113d034d95ba3e05bc631cc2de5e WHIRLPOOL de286057fd174df70ce571699c2c38c4cee67f3c0d821be254e126e29e70802fcee420706a2814dab8fa45b6a929e1c78c535702e0e0dcb0e752619f5be3fb03
+EBUILD jazzy-0.5.2-r1.ebuild 754 SHA256 d170cfc721f6d1adaad6244c6a13bcd8c15897f20a97b6e005a20d2fa0c5ebc7 SHA512 a1f225de43806718f360e24b629430be1e23fcc983c88c598e6a81e7ff16b884690599e2160d5d5698a44f99c4cc75dea02def0901ab4ebca3e69ea3046c6a3d WHIRLPOOL 7dec8eda4158f7d40fa722d7791da31f93c6ee1dba588905ca99a7f345c3855087d49909a9dc204ae2e30ff6c453633a63f2c42b2678648cd8b3ea30ca010c28
+MISC ChangeLog 3035 SHA256 f78b440a15f4b34852649e55ff0130dd99093ba58987d735740dee776d2c9c45 SHA512 2440ee9e3befa8823b74b016679d6869578beb2f49c96fa22e62b5b61dda0596cd8937d4a896e4a87d776b449b2a32aeaf4779f88f9c349714bc8cccd3f53339 WHIRLPOOL 6fae4452dcb8df3762736a5b1cc2ff9508a07df80a62f09c8ba95275bfc29c67991bee1f47d0cc9c54e91211740d70009b2e79581ff8b6d12aaa6f60d534eedb
+MISC ChangeLog-2015 664 SHA256 5651448582ebe380fb67b6cb411d1afb0a21566601a7b7271b35262ed8c2e1a6 SHA512 cd3d5d81525764aa76149d0c8c6812b8c45139ca014bc9d14e091bf22fb3a136ce26e4dc0e34155fe3efe7af12b0d92655514930a17afdb82cdc89ed415822f4 WHIRLPOOL 595d983454d3387b142791803d7c9716161cbe661a3536915632e43ce3739b97106565b8382f0eb3ea670208135d34f28b8a58248b7672d2d9a397b65d7a509d
+MISC metadata.xml 311 SHA256 63df0e42c702afd5f2665957e3e6f5196312080992cc3ca61c75f8e297b7945b SHA512 12012dcf6a6f4fa2d6aeb8ee76d2c8aba28babb31e776c07e85d0277e7fa07c09eb7b0daa6994167b264745d1bc1b4e37df81f9f85e3280b156505bd7ab9682e WHIRLPOOL 7c89577cbd0973505ffc6ccd23d0a353e1e0be740e61cebe02e9fc40810fe2fe83348832d9af660cbbd100e4695600e99057c9c6c377a005498a1bdd179b1423
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/Manifest b/dev-java/jbitcollider-core/Manifest
new file mode 100644
index 000000000000..98b50607949b
--- /dev/null
+++ b/dev-java/jbitcollider-core/Manifest
@@ -0,0 +1,5 @@
+DIST jBitcollider-0.8.zip 1192489 SHA256 b36482ee9e919c669bb1797ff7e50f57edf505af67664e280fe1dff361861044 SHA512 272e9e0e6e66d3ac9d17e17d8fcbed82b508e512c5cdada7f18c2920597f31ae5968509c9814c5530ee7c5bea9f3d1b049b922d55056637642bcb515b890a9f7 WHIRLPOOL 6f095ae92410596b9b2bf51f7c1b365a1f8ae2f495299716912ab87dbfd351992fb6657846a104b73b334f883d9e762c0668cceb2c4709c45114b9f213263b3e
+EBUILD jbitcollider-core-0.8.ebuild 855 SHA256 c3d7eaffd236e0f38e6e073995a3d91f691e89607ce86b102876c70d70826f1e SHA512 fafce74a6d67a07fa646f9c45fedc10bee0ce0e2a211a8d841b169c48d18a73dfa7fd1383acc80447c476f4a30bb5724b41db907d25f754a38b1ce6d2ece3018 WHIRLPOOL 8c5bfe86a4aad9a8c2805bb7a5e9714df9d83d5c1a869ac4e2c756d2b53150693867bb612b861daceb1216fa54708ef666f135452f78631e3a2ce72d000db637
+MISC ChangeLog 2202 SHA256 c783fb6e708c32d8aab4825a77096b8a9764cfe621cb84be5fa8d8d2b633493d SHA512 69ee80b03850f3f0d572fbb33da64ab085954b43aee581c4ea1bc6949059d712dcedfb21e90ee7d77e314c387668972afdf6419af381f11e61d9168ffc77c31a WHIRLPOOL 0e2f3ba86e8bbbd6252d669d3980eb999beca16025a1cead4481d3448f04e9aa4e1cfa9ecae342582698ea70ddcbff90c5155a827572eb215a2af20d65dea815
+MISC ChangeLog-2015 906 SHA256 f7f975a657bc2b1d3a7a5d6f1417968e59b5bff8b2e5fc69ab5445016b795c9d SHA512 1d9f28b6e49cfe10af9cbe3eddbe498df2d7b54fa43697a31b34dc82b4cc216ea0a80c9a5c1a2e056ce464a6a04b3be6ad5dd783bacc965a57d78becf84efbba WHIRLPOOL 6d76f583183c260784be2a34940badba5e6e551ff31cee93bcf0f6ae7272379c0dc8a92cbc1921db77073db6c8c996e6691eab8cb5c5d80be63bda471c302d6e
+MISC metadata.xml 337 SHA256 c1138ba6a93b1308a931a11012cde3718297041f8fcd13cfc6178cff4d7ee8e2 SHA512 0efda2836e8f84a62c04efad27a95620f4c91221be25ddc101852a7a2965e173bf728ad9474451b945d333990267f8aec331512bcfb32cf5a002164b01d9e296 WHIRLPOOL d91700f004db19b7e4d778f29bfd49c04d56430de9e9f2fc9f6d6d2dcf703b03b6381b6e2aab47910bb8db0ac4a0c93b9eedd2eecf24090e710fa501e88a3208
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/Manifest b/dev-java/jboss-logging/Manifest
new file mode 100644
index 000000000000..b936cfa94a38
--- /dev/null
+++ b/dev-java/jboss-logging/Manifest
@@ -0,0 +1,7 @@
+AUX jboss-logging-3.1.4-MDC.patch 5607 SHA256 670a30cef4ffe45f3ad2a1dee902a49b917c6e3333750e5fbd8dc362e3b026e9 SHA512 74ece235664dc49db51e4026902a67773e87655edd1879137da0b0d1cb0fefe20c4e67e3ba0625214d6c85b7f036e07732d07c842947bf312a2ed505c05ab535 WHIRLPOOL 6ea8aa9a9c6cd34247a17ed6048f615918bff24c70144064dea4221913044aad771a10ccf0f6dd6555c57277309c219c431fa85b83b0a459faef4097e6ada1f0
+AUX jboss-logging-3.1.4-build.xml 9295 SHA256 1668c26371950c3a699eeb500717676a904c9168763dedb732dfd0fd871a9cf7 SHA512 a4d1a44ee69d48686ff9d4d32540c74ea3dd0b8198f8bd04e5cf1572db5ae596bdf95bc0bd091cb19dc00b248f5f1a41f4f51271be9bb27be72420cc425d2a14 WHIRLPOOL 7cc82140bc1076d181660fbcaaa394d7458a86121cfc207035638b326b9b53ab7e97c453eeaeec96289faefb6e4f25aa490d6b17ec23c2099e40b7113d21c3e3
+DIST jboss-logging-3.1.4.tar.gz 25018 SHA256 805053336b77c4c62e89a920ef9b80cfc6577964fcdcadb7c3ab43b017e1c734 SHA512 633b18b079089444a5f7406a6a2b29100abd2c752306ada4fda0c15f07a60a363d67616e2521ec079f1df37ecdadcbb46e26819a9f5647e3d1a18219c494b73a WHIRLPOOL b60657d39425309c7917a9019b957d83898462c142bdfd95fe5ba1d8c91cb6b0d119515810747f68db15623d389f955c8a1adaafbebb58860570ad9994bffb14
+EBUILD jboss-logging-3.1.4.ebuild 1357 SHA256 580e8bac26c0512e2f2f760890f1745854f5ea2c79eaba2d8ba1a0034f2b0518 SHA512 3052c73492bb17b1032f5805b1d298b0b4d38b13f361a91bd6cb3969030263529aed262a7030ec99a437c888a976130db4f8321721fe81318fd5b4168fb6eede WHIRLPOOL 36a35cd6d3e1b6e39445de126d4e140ca61a27cc486998e961556feea896743402f4727c26f72b3aa9537182586bc10c0cc89ba6ac6ebebffd97af084ba46997
+MISC ChangeLog 3102 SHA256 ae253c28bd3c3ddb34de52a2d6882d3f9a1c76d2dde5e8a8bffc55241069a49d SHA512 90ae4805f76c157bfb841433321b607b5c6cb6cb269385a994705184acfc156f4c09132661cd3965037b99039b6c029e3823401f86eca8f18b6ba34b4a4ceef5 WHIRLPOOL 0328a2bf135c846976babd2a9af56e439c08881d23a92907768ee3a03f41c54c9c0c31826a192a963d283c57eff096b1cb343066c541f06b0ca8caa7ac875e38
+MISC ChangeLog-2015 1712 SHA256 9800e58fe7798bc220e8531d931ae1dd2610bc79814f0015a8949a3ee0278104 SHA512 44fb4b1f4725fe81a59573dfa11b723a9d8f81f042786988a11d41978eeaa5de098b1c2c5c0827aadcb29724e2af35c7b9ef19e4a46b1405cf3a7b9bf3551b28 WHIRLPOOL 8812b0553a2eccff3cde548d958c711dde2025af576e00354d42eddb5f8c6f3575ce64fd64aeae5a0dd17685386e4094f160fcc6a7d72c294629d5185f9cbde8
+MISC metadata.xml 328 SHA256 21904c2023a93150188c1bf4706a7df98441edb58ba714f9ae06953b65939fbe SHA512 acbf51ab138d93d7b6d137542047e019fd30e7230ba9e0ecabfac72faa1ebea3419fd8531ab9f1304ca1d735bf2082994ac4ab57e87e6febcf30588d4a0f91da WHIRLPOOL 9ade9a5ee9edf943d48092b023b251fe9c040a5505678ab58ba587eef4ac492b49a6114d9fe400d721be27c1624424efcb5098f2a848162557427a674df2b561
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/Manifest b/dev-java/jboss-logmanager/Manifest
new file mode 100644
index 000000000000..1d949659f758
--- /dev/null
+++ b/dev-java/jboss-logmanager/Manifest
@@ -0,0 +1,5 @@
+DIST jboss-logmanager-1.5.1.tar.gz 132910 SHA256 3999086ba0c01b249daac8a41b49706a5f595db3b2f24a3e788827baccda95ac SHA512 a586f3619c90390d38c0355024f1d711b11e06efa35b3da9f12f7d98e04debad5250ef30ec9b869d27ffc60d9e5d5c8e690cc4a2b0a71553a2a994cfdef89768 WHIRLPOOL c69a6918308c378d03df37396a0c8e3f83073372bf98236f05015661cb5b3b5190bb7fc68ac7f303c65fb464a6798feb4219313dfd781026bc76e6d6f0444d98
+EBUILD jboss-logmanager-1.5.1.ebuild 667 SHA256 58f769787ebeda245e43d0aee98cfa194a5b0537222d30955b31d218f2b3f81d SHA512 958d8d75d155743827e6e805bf5df15317b92dead065f2fd0447a37affb348b82725dc0125b9844e0768d207e3493bd96c67c053d92e64f97244b2b5df015e78 WHIRLPOOL a89f03c9f3deaf25cdbbbe53e6df5cf4cbbc0d6e1e4a559e6836df7bef9bae628b0081b20c6e66e73956f153195ed3cfd083340ee3fbe16a0714e4795c887901
+MISC ChangeLog 2847 SHA256 6bbdc27cf59c4e4eee40fcdc20fba4b226d7c0c7bc2aab82823525ef872573a4 SHA512 2ceb91b4a65a9de4c9e422341198be8ef30bc6758ec47ab41f4f23fbdd40cb35a89ba41f15f9c30661cd6f9a17c576f52d6904509128f5d9f26447bf3d4e30c7 WHIRLPOOL e7eaba12d748f3ccf813655f3a083eb05bae2944aa9d9603fca9f6f83718173824ff1893f3b99737d3adac46ef6fff93c8c3aa12eb396a8b031ca48b4f88db96
+MISC ChangeLog-2015 662 SHA256 9be748e55837fa5ae50ec77249e41408ffd49a78159bcb33c5c9957b33281967 SHA512 25cef1665a29d09eab0a7a406f09d801401b13e5e814deb8188ee7f17c38be4033e6ece7e344d657e048ecbe365d1286a183069a6d1694c00c6e2fa4f5d10d0a WHIRLPOOL 533b740b8f6a2df24deabf0d26b8db12bc17d2008bc914c80866262ec929aaebab53961b22b51056c43fd87bd9954f20397fb1768dcbbabdd66644ada1a331c4
+MISC metadata.xml 331 SHA256 c15e0fed433d41d49736783a1a96d6474a804a99c9bf5ea1bf6ae32ea16e1179 SHA512 253e11bb23b5321b44483a7880aeb28747d3bee372fbfae830ff95d1e80d24049e8378750d9a84b931f08830e95d24991b999fb42df9b4a576e6397f4487a0d7 WHIRLPOOL 2dc9d984a2288fb29e34582a1a71c023b3b555c036767104758dc6ee398fd5fadee845132febf2e60be23e4424fbc654e21501a7f8794bedd9a1f31f1552fae7
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-river/Manifest b/dev-java/jboss-marshalling-river/Manifest
new file mode 100644
index 000000000000..70d42251dcda
--- /dev/null
+++ b/dev-java/jboss-marshalling-river/Manifest
@@ -0,0 +1,4 @@
+DIST jboss-marshalling-river-1.3.0.CR9-sources.jar 45310 SHA256 fa824ab4683b2da1094c367cc080bae290192aeb6669c6bf9cc88fadb326221f SHA512 0ff0ba48f8e4c1e76d378843aeae4793992fc200cf6d5aeeeec7341ddcd6bc3c93915ccb2bddbf3996661ff21e3a992e232c0721ec4469c5347811afabec4351 WHIRLPOOL af60ec5bc253fac4ea7adbd2b3c3ca5aafd79f6acbe590886b0411ef9e7f2a6f1561c5b095de04115b7c084d8bf987ecae17a080bc66e0be8fe0be640366de7f
+EBUILD jboss-marshalling-river-1.3.0.ebuild 680 SHA256 ddcf37126edc9cce9abe8767bd18efad762a4844978f8409c9c4a972b59ee9ac SHA512 8c9fec3951b2f720a6cbb0ebf06254536180cc5588f907713b8dc04867f39129df738c3dcb0380eeef9dccb417cd99da05df7a5ef5dab91204e9b2bba83bc40e WHIRLPOOL 64ee3fea5da3394c041680aeddc97d9537c04d004a4acfb45fbe99d01fe4249aa8954a3645eace64491e102bb97c0ce6fd148c7e69a47df60d9f27c0a8e2485a
+MISC ChangeLog 378 SHA256 19ea44f8051c311320ec444317f46040777076b1aa5446eee88f004155602938 SHA512 e30f465abb7bfb02dfb1ec1f02c76e9ad09a4a496afc96eb1ff60503186b005aa787128f0e01d6190f170d0abaa74e33f068b5a3f2d834e6911954c503b228c1 WHIRLPOOL d621fcacca10503093774a3d6fea17f3e7ee0a0454b3e7335981c2287a3a76ecc63dab385ebd0c932c50303d6f82fac6187aa3ae5bf96ef668e75ca50a383ca5
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/jboss-marshalling-serial/Manifest
new file mode 100644
index 000000000000..d0f214bab678
--- /dev/null
+++ b/dev-java/jboss-marshalling-serial/Manifest
@@ -0,0 +1,4 @@
+DIST jboss-marshalling-serial-1.3.0.CR9-sources.jar 33627 SHA256 fedfc790152ec146bc5cfa21be0f3cc1fe717868902a91e8eea5bdfd6485123b SHA512 23343b43d2d81fb3f9d22e82d04e3c215cf0357fe369ac316a602b4599f84602bdd38fd50c8378050b1d031db2ad31405fc38bc93ef7a9327d63a29dd73ee144 WHIRLPOOL 8e222eeea47ee69f155cb446c4fdbcc615697ba2aae8eff3897dd1bb07c05c4a670eb24df0447439893ba284498156dc4a6bd692d4443cca7485f199cda761ec
+EBUILD jboss-marshalling-serial-1.3.0.ebuild 681 SHA256 eab4cab6fc6a746bbfa66482e311c12ae7c7400d09621fe04046317e5a705a11 SHA512 7999b5669cab82c6fac7d537bed15f20bf66e89417db3d286dcde9a42d4c4b820edd9da67e2236e10102d7c14dfb8fffa844cba23233eae06ab80473daeac9bd WHIRLPOOL ee9c5fd67273bc8b86db03c99a8577027d96aa4a2096fffd34dccfcee1bfc57e55714d63821e13142b69b1e2539a0b508ebe2e163bd15dcd927663ba645b4d50
+MISC ChangeLog 381 SHA256 bbf9e7c0a45925dde6d08ae94a5a97f9592996465f7b006765b2b75ed85218e0 SHA512 0186f2e8f0c4e8a540c5b9cecfc54bb69fbb164e3ed9f3de4b99e8e90ed97c1d5acf771435c2ff81c4b6de28bce97639f405cecec52d16cd675d78d5bf594ff0 WHIRLPOOL 1739e9bf0e1f717d3b049b5764f26b5649230869aa106dcfd54d23df17f56665a59c984642c1bbccabf3df870fe620d9af63812818a8023dbbceff551bcba57f
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..ef6b9f99b8d2
--- /dev/null
+++ b/dev-java/jboss-marshalling/Manifest
@@ -0,0 +1,6 @@
+DIST jboss-marshalling-1.3.0.CR9-sources.jar 174155 SHA256 8c98a596199f029b870df34dac547833c2e2c5a25c47ece6f03cd5f38c169008 SHA512 d7a1ae24ec50acf20f8150cf6e741a846e9a5837f9d8e4c06d8429793f69b95a7c03449ba5a6debb00bd22b596b6f801e25e0f38ccce7ac25cafd601e2ef7058 WHIRLPOOL 80b8c9cd440fc8c32dc55a7d18412c84c9765eec8a5b2c99b3035464d24f61398574734b1152683afd26d2dac62751951813ac691184c278df821fc61846a576
+EBUILD jboss-marshalling-1.3.0-r1.ebuild 588 SHA256 0c1fb976f843e1cd59e78f21a19d7013006a4a659c28f36edd37d8d6c37fbfbf SHA512 7f517568ba25e4661a5c58f0eb64b9438d71e750aca3ef2c265a61ae40bbc07edc0816e55f08c3f1a66eb54d7bb0f8166de1f4dc93e89b326783ebac35e10311 WHIRLPOOL 33b3c15abe77ed0f54e25f2739e8f57a26c548d1e7950d5a1307b53a8087c9d1baf0feadee78ed4edf08b493bbbbcb3aeff70241ce3d232d75a5f7ebd19c841d
+EBUILD jboss-marshalling-1.3.0.ebuild 606 SHA256 d9205bc0416d7c38376b0ecab756d7b48e582ba40d6392670b574ebdb83b970e SHA512 12589e07068598074c588c73e944b6f985b74361b2fc5d737c427c951d6253469a0f2616353e0e50055ede05dc578bd7146bf985864a06ddad9ba67210b60758 WHIRLPOOL 7fe30530d33cf9760def3932cf5c1e830c1b78b143161f84a80fea9245c858818d7a2541e9dd94dc4533e77b743fba8609ee51f22e9c23d2696c1da6cba8a0de
+MISC ChangeLog 3011 SHA256 3ed0bfd40e3462fd44048daed13facb816b961ff338c34dbd680982ee0b550dd SHA512 8447e2fc34c80111472ea65cb3d8fbb218d9239dfeb60b80e669b066cc34de9d3baa8f186bef197f37598ca1c427253c768592492f43042cd6d282a447aa6de0 WHIRLPOOL 6b48f8bb2a47ca9af03ecfd68a9aaf57ab2afa81b7a5304a720d4ddf57cfe2c437687538c395eb3755cd8e8f43da00d95bcaf1cc4fe1e0acd00466282decd0b2
+MISC ChangeLog-2015 549 SHA256 5d4c5561e4031b68149b0f731eaf5d9e69df35975cdc8b745e17ad7d7dcec6a8 SHA512 01917450fa32c36050bd5d94bdad95545bc2b9aefef7abd8cc4f7786c8f26f015679ea8aaa2b74f613d43711f03a4b338388febce13b7e4863e3de29df47fa3e WHIRLPOOL a2704cf67281f40b95d9ca2397ecfc22c224162521073f8b06ebea95124b321bf7b8b4775dd17c9186a625f9a888abfe23e8258e85fac2f341c4dc6d7e4f5b10
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/jboss-modules/Manifest
new file mode 100644
index 000000000000..7ee3146c2f59
--- /dev/null
+++ b/dev-java/jboss-modules/Manifest
@@ -0,0 +1,7 @@
+DIST jboss-modules-1.3.0.tar.gz 187838 SHA256 d30783899f3399ff69d8a0bb86702a5788d68d3c24b25095dbff19ca17fdea73 SHA512 407858cec3a82ad81262ef1feb28e3c3c259b23f3ed768f8714b28dcb8e2cc6bd68a47f82c8422d2c40ee9d0777a14c968c432a5f10f852bbd08ae434e249e56 WHIRLPOOL c205a754943bf19631de1a5accd20c17f1c6f9813f6abbb0d1ae0282d3c83365a17900477daadfe1c0085ddabc1f6b7d56d5dd475e4991fada96c386b4e2d31c
+DIST jboss-modules-1.3.3.tar.gz 189899 SHA256 ed288523f78ce3ea529114aeed35fee2e2e9c30e90126d0efe50168df5a8ca4f SHA512 2d95d8f2661250fe3458feed9d1edc810abc5741ef0b631336927817820ec92b8f5b4ee0a329392c6ad82c68f67c5f831b294ca44dbf66bb9ca866e8ad70b535 WHIRLPOOL 3a0d04e2416bd75eff19a4784afebdf564cecffa9b19e2379a2729c90fc427592b54a7dd2a422243df0e7baf4e9133f037ba36ac9b18cce1206b9c8f96b15a5e
+EBUILD jboss-modules-1.3.0.ebuild 650 SHA256 06d758ce75776802af58ca30ebd5aafb56b9d1db1cb101880cd0d70d80ed0722 SHA512 8204523c0301788c5be83b0420c0994495a7139ddbf97b45eb3830bcf06f86fc31733a87236b32c4d26600abe20abb383d8ad751fe7548f0f889b8aae6414e49 WHIRLPOOL 0b7e3e7190f3e8110b6ef8dd9defb4594207fd91e45f439ecbf699bf275fc03748a8c3f25e8226c72dece5ff1b6c8f9a26178894fdfac4e63324cfc0efe66beb
+EBUILD jboss-modules-1.3.3.ebuild 665 SHA256 d78dd8a410708357d6cf9003a0154a03c26b5ac2f6b8f0b9b24e486ccdb9b4be SHA512 a38305bf2c7e704a1c75ed52d7585474e442507bca09d5d033d4344ae43379abb4a702d83977c83bfa1cfe53f4fd9f02cc14139e437b66c344b8fd704b8057f1 WHIRLPOOL 0ade7c709c94960be2d5a6ddde85eabef148cec999ea2a81cc34b2590c0209dde43a7f8b2d40b8272d31cd629fba5c3e861ebc14e485a18d7834ea16629404fa
+MISC ChangeLog 2902 SHA256 16c94e3ce12e565a68fd8b1040041f34ddb9edda9286048b6e90dd27af8cfced SHA512 2dca035c4ce57e2a70271d1ca0a9662eda83013c22cc6372df53deb5a32dfcadfef6b2e0f371216ad63a9fd3e4bc002118d0ef601fa4f553bf2ba654944d94c7 WHIRLPOOL b7203fce5304b04f31649c9a4e01dd6472442ece3931893a0412254699148a9fa04cb2079391688a43526075c004bc78d8ef459099d0c5d92f57879fa9734f09
+MISC ChangeLog-2015 823 SHA256 ecc65da16ea98e83164a9c000e5c3105b4ddbe62daca8f47263121b20f47bf35 SHA512 09372c61ae924dfbc332fcafd7b66b2ab0b4e6193a4c80623da1c364a0fc9a2ff64ef8193fb0f66bacf1984910532892e998ae162520d7e3a6f9eee8cf8b549e WHIRLPOOL 672d5303c3f2f267452d37e07c508f42bac9d8edc525629573041e11f7fd6536fddf9591c8e0c5e20c30b9a85eb4e5f2ea9aa0cb7edf2609552a0cf409b98d70
+MISC metadata.xml 328 SHA256 b972fd85a2537f51a5e659c925a8bae1a5b6986730345fb34dd6c72dcf40e949 SHA512 56f41e4a3acd01abe24d0ad6211e1b5f1822462ed8a3724a26fffa4e9631f310888c0b8b213d71cbe1804ac524a637e5e02cb5d4f99d2414debc560cfba5a86a WHIRLPOOL 181e6a5ac8fe87f1eeadcb0e8eb846758ce043311420df97f2b20e03a5ab059a35016ed60d5c6489561b378d897029b08307e92f1ef2cdff0466704834aa4a85
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/Manifest b/dev-java/jcalendar/Manifest
new file mode 100644
index 000000000000..2ea87e3e54fd
--- /dev/null
+++ b/dev-java/jcalendar/Manifest
@@ -0,0 +1,5 @@
+DIST jcalendar-1.4.zip 982517 SHA256 21fb9332aad57d9542e9833376686a4bc7612e979c638e97334421bd15447c4f SHA512 aeab6f98451f4fa8718e127de6c0af345410bebbd1de4fa1ca4b9e7f5a22908f9e455ba96da34ef9e8691b4d462e8a01dbd7881b6565a0f3a65d18fe58b68d9c WHIRLPOOL 8c25a8918ef7d83cce59c347701a7af8e3a1bd307398f80d9e2d9d076afae05daaa56e1430eba167139aaae6193ed84a6c860d68ecd286992be71bec9e0dd388
+EBUILD jcalendar-1.4.ebuild 901 SHA256 a56c813c414c9e922f56dd65f40d5c3231fb4bba2a633bee4170c478ca6743de SHA512 12165e035a51dd4f3a6916e0cfbfbfe054749eb33c4b28440ba10f7960099f4945b077f2955b1c3b98437fee1e270d9dbc85520ff26995002a8e667188aac859 WHIRLPOOL b803bb5cf06ae9ce42e14d56e168a556caca844707534f61db541848d540ebfd4d4e2a05182f69e2d91c5e518bffa02385aeb31eb45e4813caf310d190df2a68
+MISC ChangeLog 3252 SHA256 7a1241f056d705d62332eac5fe121ac7e9b3f673294ffb08069df6e143eb8fc3 SHA512 caf7be15f3c7db7248612801173cefbab1681e325b0fb79c05f6e5746757908143e748a6736f4d01cf53b95f6990ee4157548ce9486fce78d11ffcf7722e478d WHIRLPOOL 76d7977f7f92f8e5467a9f104dee12b541ab798a1d3bcb2e3e255228dec320c8da9c66cd0724c3b1b2da3c6f5f1e29af7f12e6c282716ddba3bcb095081a226f
+MISC ChangeLog-2015 3593 SHA256 63d8ade840b8ab72de7ed1ffd003f1dfd8d75473ad8eae37133c1f1f8d9ccced SHA512 bb7189e4bf032396bd5caa9480d6a4ac7c25e86288caa3db712562bcd7ae0453687d805e74ada6b0b2833962a52636504c31ad60c1d630ec3fcfa6837cc1c594 WHIRLPOOL 9648db8a4074c7ca6f610b54bf0e2d2104eff637f99cc4892bf8e632571d85f59f9f4f8d5ddec517c57cead0ee1ed1d46ad0a3a39ecb717343c115f5ab256141
+MISC metadata.xml 642 SHA256 ae14f434fa298fac002797d860b72ed7c4e5295515c7408dec8aca16fd0b2a19 SHA512 8622bd7dd4a96498c662b03c6510360fca1d3f99fefe51e1c1cd54d7ec2e254fa815088cfd68f4a7250c8f2d6c189e000a7a19506371b9e274deb446010c9290 WHIRLPOOL 9f964100950c7d1609583aa3e7cdcb3fc831cbdf75d6ea9dfb2d918c1dd1d773131d0ac318441581586213aa697f2985a4c292f7cdff35b06f15faf863f137f4
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/Manifest b/dev-java/jchardet/Manifest
new file mode 100644
index 000000000000..ddad805d5d73
--- /dev/null
+++ b/dev-java/jchardet/Manifest
@@ -0,0 +1,5 @@
+DIST jchardet-1.1.zip 82782 SHA256 2d83cd7a24a5a5c1cbf02f649008b0d792f5e4bc11e18a7df8ce4f885bc8650a SHA512 3a6141b1783286adfc072075f46da8f6e719361425cb2cbcd1c4c4dd82a6ef834a9f6f1aad8126d663dcfa12ad20cc362566dc2095ea95e01bd95adfae20bc28 WHIRLPOOL 4dbc0af21024b9da7d332cd2cb6c9103300a2618b189e4cbe97ad574b328db4727db60ec008f0c09b316d1d27c68371a33645d6a4dd1703f6cd906af3376dff4
+EBUILD jchardet-1.1-r1.ebuild 556 SHA256 611bb6f8a4e3c9636802d3bbaf98b109625b00141ccd920adab64ac3cf391b66 SHA512 4feafe3e025905bf329c8c7c858a76a314b59228928451ebb352ed520c15a86d52972926e57a30f156ee2ca6f2829b0b936e0895d0faa73791edce123e4c17e3 WHIRLPOOL 45fd7ba7424f09b7cbf4fe67de718314b4053684fc5ad429dc9c37ce381cfdcac042bcdd388b8f78836b1a8c41ec2f71e15271d034a1f2d73f21acb6fe886256
+MISC ChangeLog 3156 SHA256 d7455851aade95f5923376fb8d8fd148d758da069d9bdf0368b8e1ed15189db7 SHA512 a9931cc2f72d0925b7663b0ab41aeafae88f746baaf58adaacf7afd6f333662232601784981a25c89be5ca0ea75a2cf110bbc5f3220caba645e9572b1853ba7c WHIRLPOOL cdd0050e574ed0de7c899c6e0200f5bf64aebb26afacfcca5defa0f8775bdd64886ecfef3c86ca00f1c318e0051529099b772ba1b4e0c50a399b88867e73c13a
+MISC ChangeLog-2015 633 SHA256 aec8988e050edda33618a5b3d9dca6c4bdaedfe432be15b218add650773610b4 SHA512 c5599085b7a58c50aa356032e934587a9050592a2121f96fe9eb25134b9d987ba26955cad4f099f67a680b71d215534394769460e3fb06a36e334b1ea3718bbe WHIRLPOOL f2813614d59cecdb57ee8c87922b760969b41d4ad03969796744e607aa5dbc47623ef73373393c72d061707547bd3b2706ef355606e1928c16a66e67c0216cc4
+MISC metadata.xml 314 SHA256 701cd2fce44443e05b89ec5eb3f9578b0680489cf4add328978663b7a43d78b4 SHA512 0c6a938f70239755c4847299f7e3c7203b2a7b3ef451aed965782e5a6df1dde4b4f2b2700aaa8e1e09d1fcf543f71b6c105747eb628af953a927faff4b2d3a50 WHIRLPOOL 3097ebfb27225ea2b6c127c629944f5526ac94fe159c992f7df4610c90265f4425f1a6ab696257a26dbc8ce1646d978ac4d86419cec6161dab5bdc90c704b73a
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/Manifest b/dev-java/jchart2d/Manifest
new file mode 100644
index 000000000000..91e22ad2a2b8
--- /dev/null
+++ b/dev-java/jchart2d/Manifest
@@ -0,0 +1,4 @@
+DIST jchart2d-eclipse-project-3.2.2.zip 3203952 SHA256 dae0bc6312657a853fdf1b35715df1374436634d389cef58c63a1109ea12c838 SHA512 aa369b78aced9f7884d51f5298a6772d00cd4003d970e0bb401b717b4bdd2fdd543cf9a382edf7c9a6d1837cedb483a04aa89aac1e66d6e365655e99c76ee812 WHIRLPOOL 1f96d480cdc2994f2baf44b106dddebb9c36cb6903c3ee24fc93ea21517a5b0430120b64a48ecd8834e6ada0be281816d358e432c4fb008d8993bfa4ba0818ed
+EBUILD jchart2d-3.2.2.ebuild 912 SHA256 09fa39e3a1834abb1aeafae861cf8a1741aa4796470fb56868f47666d3dacf54 SHA512 abf365afbd13a3f2ccc937ff68926ad9abf0e53deb8c96b24b3dbf0a8c361813e51d4e9b0cc95a0fa145062c36a51b412c0d037b75fcc8442df4250002e1ab49 WHIRLPOOL 0622a9053a4b5f4e5868af0cf0d90ded0dd1bf4e20974d98c5f8878ffb8704087138809a00d664033829c8c9f79c73e244d5da69a31ffef8d292c1e605b90f9e
+MISC ChangeLog 328 SHA256 79890740d6f6282f4dd7dac61885679d3cb2b0f99daf7e00cbbdd8d050d70c15 SHA512 8f8b04b56db2d46a7a604689e8438bd8c5468f56b077f98883b6730fbea4b5212f47d5878fb4b7d061994b1cb2b63f0fb69ea2ea6309a9c99a953d946d890b44 WHIRLPOOL 35f65e3252ec763cadb2a0e4bbb911569582b62b6e53e0c5feb02992784215e0190bad190994f388117035c0d35a40df4bb4b215c0231dced991d580d32545dc
+MISC metadata.xml 887 SHA256 7a5d7320ac24b2cf736fbd7f7c8dc3a9ae9da234b19c2bf63f35b5c1a4f5dfe6 SHA512 a6e967cc43fc7e346a28b9a9be8d66e361ede6843ce7cf32c2e7bb1cb1abf147f68722d5de9e76699bdc51150f1833153b49655bc3292f81b05c1dda2d287396 WHIRLPOOL 4fd4ee05d29714d000922603e80a2056e8da5f01df3aa87139798f8cba7f9b8c639f0f36544fbbd4829abbb85d27cae37dd58e338fa77da6ec638da1fa37e81d
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/Manifest b/dev-java/jcifs/Manifest
new file mode 100644
index 000000000000..aa66cee6e1f5
--- /dev/null
+++ b/dev-java/jcifs/Manifest
@@ -0,0 +1,7 @@
+AUX 1.3.17-build.xml.patch 402 SHA256 786dbc33834023bf57a2ffb8a45f4512c9b1e54a5261cbd07d7c9f521de30a7f SHA512 a044037c94a8f4a1ba1f9635b4ac8426287fdad9b9942caf89b96665abb7d38f451f8e05666526087cb93511f258491f034af46589b4d611770044c62e27c732 WHIRLPOOL cb471ddb81a4f6e7f576d3dfaf2f4173e94673346bc2db71a78efe3af2193677667b41a2f05d617ad1c01115ae0a7c59372917aaf552485cf28fee3daef63e6f
+DIST jcifs-1.3.17.tgz 862091 SHA256 b6c5d82ed0bc015986206101a908eacd96bca8915187a092e34ebb373eeb545d SHA512 2fa1950f9ab6f0f3d45fd9b7866cc94993d1135f48d78ce357dca1d872746d22bff6097da8c418d0d11fd71d86b3fdc79b23195bcbab5bc460d8d0cca87efedc WHIRLPOOL eff4a90de687ac21525b9502a85e1b75a29856b46586020f929d46e2a8157c6f6c602fa3d848456ff864b22c2c2c603e34c193afea2cd03433dae74d5a4b1fea
+EBUILD jcifs-1.3.17-r1.ebuild 966 SHA256 384c8b86fddb5806b5fd2ec4b8715508ce0ed45f18919163f63ab9d8404d2a47 SHA512 1fe94a46df75f08ed8131ff3a9517127c9f1d27099cde072008317f281b0bb5eed597ccd54588330557d0a461a092c70a5113db5c465c4ab42c6f1ffab7fc699 WHIRLPOOL acae979a097d076445c3313cf6c19a227051c6d2fd274894743373fa10fb1f028a7b70e211518dbb80ffc8d08f75491ab7e3339a9115993ebca950b4b53999d7
+EBUILD jcifs-1.3.17-r2.ebuild 805 SHA256 f01c1707880828fd8d2e07b57ae297e9729bbafacfc7158d44af76c51a0f0e1d SHA512 b32ea12e876af6811d91a2fa17e3cc2d74fe39c428f634efb2c73127ca679f82c5dc93ac13a15811819a9f2e4e3aef9c7b466d6525bbfbb397bb1fbe957cce23 WHIRLPOOL 4996c54c7619237f70fba52e844e63e17859a68a73867787cd3f08b51e621f3cf0220f9b9fabeb8b6274d768308beb46cd5e3ea72660c5b83d28b834bd4f3ea8
+MISC ChangeLog 2993 SHA256 23eff8d37edafdccbf8f84f316fb4327f8ffd423c473eb27393cf632cac255f0 SHA512 3a8bf4a1d1a9c8f7706d6164fed213263e9d284766a3fb8e38e0c54d8e3b57570ea09427e20b903ec10f479cf6362403cbe80c4c1f4e8253e90fd393890c98df WHIRLPOOL 6027aa53e289275dfe7a66f830f7d244b80853388fa279966efa256797f1cb63417bf839f6464848ef9dc9cf107c9991dbd14cc5bd44f155cc843a19940e1ca1
+MISC ChangeLog-2015 4413 SHA256 730df5a6b02c37ccd427607d2cf020f43e1e8022223b8d9943c8876597cc544a SHA512 51227b548b96fc74df2a246072a6e348dbc8dfc5df17da1c6857d2ddec6526adac8e121c6884def7cd4ccee2b46c5747d95c5b9d5f8230b0e7e7ee4b6079e33a WHIRLPOOL 109ae6884c701ef81ef08c2db11616bfe82bf94eb8a26e12d4dd5ec50df92238b7e8049c964b5cf6fbd0a115dbbc732387afa2b57c0a0b99e3155d65440b3d50
+MISC metadata.xml 547 SHA256 76aed62c2918faf51ea81b2671a891146f05f408f477efd1e7a75f1a0ad7e645 SHA512 5783f25610ce9cf8db737748ca4f493d62e22ac5014de06d8e051d114b8aad73484e496b0ca10216462c8f68125ec501f604168fa1957306b8a2ceaed64d42ae WHIRLPOOL 5d0f72db9d03ab3a93840e54e36cedf10baf169bd7fc918d44ffef4a8dae9a4b0729fb3dc2a81ebc4806d6617c3066b11f203558a5cfbcdc8d72532b68d71148
diff --git a/dev-java/jcifs/files/1.3.17-build.xml.patch b/dev-java/jcifs/files/1.3.17-build.xml.patch
new file mode 100644
index 000000000000..e90c6ef0ace0
--- /dev/null
+++ b/dev-java/jcifs/files/1.3.17-build.xml.patch
@@ -0,0 +1,12 @@
+--- a/build.xml
++++ b/build.xml
+@@ -52,8 +52,6 @@ dependencies: Checks that all class dependencies are met.
+             source="1.5"
+             target="1.5"
+             fork="yes"
+-            executable="/usr/local/java5/bin/javac"
+-            compiler="javac1.5"
+             debug="on">
+ <!--
+             <compilerarg line="-Xlint:deprecation -Xlint:unchecked"/>
+index ae4c8d8..2b09fa2 100644
diff --git a/dev-java/jcifs/jcifs-1.3.17-r1.ebuild b/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
new file mode 100644
index 000000000000..b4f799d13ee7
--- /dev/null
+++ b/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Library that implements the CIFS/SMB networking protocol in Java"
+SRC_URI="http://jcifs.samba.org/src/${P}.tgz"
+HOMEPAGE="http://jcifs.samba.org/"
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+RDEPEND=">=virtual/jre-1.4
+	java-virtuals/servlet-api:2.4"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+IUSE=""
+
+S=${WORKDIR}/${P/-/_}
+
+java_prepare() {
+	rm -v *.jar || die
+	epatch "${FILESDIR}/${PV}-build.xml.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_EXTRA_ARGS="-DhasServlet=true"
+EANT_GENTOO_CLASSPATH="servlet-api-2.4"
+
+src_install() {
+	java-pkg_newjar ${P}.jar
+
+	dodoc README.txt || die
+	# other stuff besides javadocs
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples examples
+}
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..d58c3b62d305
--- /dev/null
+++ b/dev-java/jcifs/jcifs-1.3.17-r2.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 examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library that implements the CIFS/SMB networking protocol in Java"
+SRC_URI="http://jcifs.samba.org/src/${P}.tgz"
+HOMEPAGE="http://jcifs.samba.org/"
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+
+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/Manifest b/dev-java/jcip-annotations/Manifest
new file mode 100644
index 000000000000..e1ba6cb045b3
--- /dev/null
+++ b/dev-java/jcip-annotations/Manifest
@@ -0,0 +1,5 @@
+DIST jcip-annotations-1.0-1.tar.gz 7524 SHA256 57d47e633507ce6e039dd52752720fdc96262093d58e1f43a117a995e312cf09 SHA512 22eb285a445b25a718846dad45581dbe7a324a2d670bd05f4b2aa5e850ae34af6bcedbf143e17a7cd6cf7e510e0dd447992ba1d5316432e8a8db5584a1e1973e WHIRLPOOL 1f840e4ff7ac1a84c92aef73f9f86e3f0f3ec1849975f50b4603953e409ee61207181c432cc794cc4c36b0dbff107d55f45b2f33822a92bdecd18757b69eedd5
+EBUILD jcip-annotations-1.0.1.ebuild 705 SHA256 c1c074b4fc086a2b338c16e0a776abd73a459fe8ed5be170842d8623149f6c17 SHA512 9ee18887230329c7149ad8b5d3e81eb57bacb059f7535a9c1ca92c1818edfdf224cd991d8056f1034247a7a717f3373bbe7fae1b973c8c5cc74ce6025e740038 WHIRLPOOL 02949d556a4ef8f9d91dc26e1515690a1efea99fd005ae91451de6e38fdd3314e1567e62f6e6532e4243241fb612a61ac49b03128a06ff5d7499f1c3e0de520a
+MISC ChangeLog 2454 SHA256 6161538600cd936f0a6ba269b52df4aa623159307216a7bcb43686f4fe9d6b3b SHA512 b5ca838f721af54d3d3cf1bc38cc83ff76e120c4f08444b308e939e3e80127a81b26032fb14a63dcefac40e220bf7d3a16b2f385a850215292e5ad6503ca451d WHIRLPOOL b809353211cdd4a724620bb48b0cc4f118052e37afd0f60c337af1ea9fb406d3c7c7cd24caea0b5ed78920b5cad3f975aea1aa0ea0da24de80a0460e7a265546
+MISC ChangeLog-2015 749 SHA256 5acbb9f354a707975506b5fd1ef57223ecffaf47731ac2a8e392ba1136b3e57e SHA512 64baf4c980d937d790277e1b5ea734c25cf7f3687e023e087181d495f1c6e5557c764e3b5d121fa19ad592008ddd0c1fdbabb5b0c5de7d80cb43178fbcf7757d WHIRLPOOL 3757a62555653339db9832dadc017947d9be7d198aaa1aa39743c1f6e4866e80d98afe653f9b88be739d501545ade08ae87b10700b6b92a712dd303d12b5e751
+MISC metadata.xml 583 SHA256 157edfb2afee039784a79096f47905d087596e20208567ff2050e423bb5d4984 SHA512 d05c3ee0c0349388f4504ad9b04c17f92659317878215b49f133cc8f9871ccb9cc23625b6d476b88a255c5a452a5c5d82545fb5ef79d8f08b297298d7be92bc4 WHIRLPOOL f05f9c87cbdaf20e00283591e76738c19ef59870cc1d2d60a99cd453047618e7abc3be2abee8a8de059b7177927936fa8cb103f07e728861ab0edd9e61b578ae
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/Manifest b/dev-java/jclasslib/Manifest
new file mode 100644
index 000000000000..93775d78ff9f
--- /dev/null
+++ b/dev-java/jclasslib/Manifest
@@ -0,0 +1,5 @@
+DIST jclasslib-3.1.tar.gz 4630493 SHA256 60186b7b613b31eb6260be00c56d28e5cd68ee964b9dc704fd0735db83bfa648 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc WHIRLPOOL 1a13025507463a148378152d13d2348ecbf08bde13c0bbe9aae4492111e9e90036020561bd8287fdd818fe4522682a61d0791b4c601c79c06b46a1c90a1fa400
+EBUILD jclasslib-3.1.ebuild 776 SHA256 8235b1f20dfd3dbb2750d6290262ed944e31c2ced3f0fc889d59f0406b48d8aa SHA512 91d0ebeffa9539c9e6aeae71951d9cd89f1c1aa2c701a086c3bcc904f8692af6cbd3038c63faa40c918bc64af4cb6fc15b1dd26347df0a96d3c8ca3b045e1cb6 WHIRLPOOL 46a84026675b7a3dbaf5227f94fb9cd49a949a92012a633067e48319ce1dc8a4c7873754a6debad11cef04d982343db6f8c505d2cacb9e8bf1e55a394d8d9887
+MISC ChangeLog 2657 SHA256 0e59d3fb0ee9eab57d1f4c06099a32972ca8310c56ef57ddb48ee6532a37b848 SHA512 8d66a40ea3aed4eb693b044b07375ce982ec84fbf6d864b2b01a510540f601c2711533c10fc63ecb479867816d8a9b5c433b21ffe9a8cbfc8e6a49931d94706f WHIRLPOOL 1ff631ff6cd20cc3a60aef4ef165cc37294bd09729a49c82a18afb799c9cd2be2d59839fcaed28b6b13747052e9d8eef8aa24c61f22ac3618c633250e3becc6c
+MISC ChangeLog-2015 2053 SHA256 e5f73b368b2389b2bb2e59331211380caafc489541e747ef31ebbb8b8758806f SHA512 49d73943f181b72fe2043772e4bd6eafa7226ef4bcfe5538214e9c2a815ebdbd35424580826b6cc05316b24fc6ef19f25894ba8cd36b6e5360e3fc06f70040c4 WHIRLPOOL c4f2c49ad17fcec015faba927a3105ae37f37f4c9a6377525149b3168130a79f7b7dae778d34427fe8654be0d2eca5acd3ffb906d6bcb5ae9c837332c92fb5ae
+MISC metadata.xml 374 SHA256 c53e2f9e5745f0a3712335822468789a3fd3f7f4c7f5ffba6f3a277e0be2b00f SHA512 7f7c3383fdc738b2e67837e024d23c6b9fc4a3288b443ecac539c69766b94769a60a0bc0e1b271d6698266fe3c7f3fee81444e36c4e6dd57e8568c51cea140ca WHIRLPOOL 2f5799c3cde67b2d3f7a8138041599fbbd8923a07e4cca5203914269791816f691cb8cb8ff693b0f9b81b83aa01ebe1094f09dc24b8c79b369485eb1bd761304
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/Manifest b/dev-java/jcmdline/Manifest
new file mode 100644
index 000000000000..18aee75a36d3
--- /dev/null
+++ b/dev-java/jcmdline/Manifest
@@ -0,0 +1,8 @@
+AUX jcmdline-1.0.2-gentoo.patch 934 SHA256 e58c9b66e3d10dfcdb6ba156c665e55082eeaf6d9d2718cea5ec8ce9d279adcf SHA512 1326e1867b6fcc0ad37e0f0d557f518c5df5b8a2d87be91c66c2d9e72c044221713df5a864f5500e3820f853b415bea0612f02d8e30525d28aa10bb5002d2608 WHIRLPOOL 354e5d4878222d281370c301e2e87546ac13b65a0ea38d2c4c3c98bb91351a7e3667ae39cb527829ec73f64e3eaeb95df746f9c3f1630816757f70e0e12c47e1
+DIST jcmdline-1.0.2.zip 397472 SHA256 a042f7061c79629cdf298ee4f7b334c3ece9c1a4d87acf7c2f051ae0372bf43b SHA512 b261856eed9426257fd6391d45760f96f0085a40167632bfb2f85d35071e58d766553819bc0f8022b92fa193d47464928d09d2b0772a08ba484dd954b6206fd7 WHIRLPOOL a62bf4ab0c3e5236655d246a193135f23b52f692d1e1865d194dcaa03e1a0db6249f32142c212e34661d62fd2c4ae4714e18687b97f2bd2ab08141ff1c76ef3b
+DIST jcmdline-2.0.0.zip 395547 SHA256 663cbb6af09f4b0eee9d06a65de804de87062a96517c6382e2d93399c89ec421 SHA512 cbd5fcfa01b733ed1904bf56fa509dbf6d6764091902b31d2a620ba1e302d1ebac8c54d20ebc9031d7724aa1578cc6ca5befb6f38625780fd021e1b002674cb9 WHIRLPOOL 7eec3308f52fcbe536e788301790bcf5493261405523de70ba89dcb456e6a77d6431543789d17f152ee8a7f1c4f6fdd67b160ec08c524b1f472791e68db491b1
+EBUILD jcmdline-1.0.2-r2.ebuild 753 SHA256 343d2966fd46191f6f663fdf877b81e4d681187cefe19e47c75dda846cc939fb SHA512 8cce1e6185e352cdafcc3704d8eedf7248fc4a19f15b0ef49de53bdcff5e14fbd8318efb3f30162a422a3443d4f636ad85f8fca210a7c411911cfe7aed9029a8 WHIRLPOOL 49b3fc880459714a4376d1bb076301f878d34234fdcbd9750d137dd92d3778be13402c91d052c493555580e8ebb77bb40ea3726b8c0e0be59379b665598dedee
+EBUILD jcmdline-2.0.0.ebuild 545 SHA256 e4f8d90ed6cead893ac04088c4a6d480c2cbf2df48a7890f24d05ef41f2a05ed SHA512 2a148a9d420453e550e7343037d7e607835a539904b53c08ca9d57b32ec09335efb4b9683099a6d6e0d93fb0bd5eefff5836c980ad7d3c5917f45ce4d4b5da01 WHIRLPOOL f74adc03d0d99d5862464e295f230b4ead00d0f61a6a618c458ab76efa5ba6d2f7230f8fc57f5dfb262fe5c461b2bc7b237189ee4677889a890e5db4a7e864af
+MISC ChangeLog 3074 SHA256 cc1c269d0ce8cf6e6a063e3ded62237a081c373999cb946a28ba625e1731522e SHA512 bdf68c624aa777a030eff4cf4cc4564824c944973e68446e28fa01fe246938fc511d041f1bac5a4c2405290dff12234b945c46530755f468f5edc7ebd3e36c3f WHIRLPOOL aa39a0c2399055b724db956c78973b3c97770256230bacc49562051c5986e46eb51a5421ad64c67196e09fb17bc0a9e599128f68e8d0feed009b03b4a6062710
+MISC ChangeLog-2015 2082 SHA256 ba35ba6aa0e61bac13d9d83ea664e93152a926a4329fb0e67340cb3aa96db801 SHA512 8307a197dc3ff64eedb8f7b0551fd333e029115c66dafee0afdf2044c5d9315b297ec75e24e268f1dc53820e5becf8ce5d912e87895123a059c01510201b61ed WHIRLPOOL 591b5ec6886df8a1309aa4a5264ddbefc34a6210f3d62e213e84ca924fd56f161818466c1dd86cf7d7cc18fa8c945b39c3eb18d354acfc9917ecf6d1f9c8b11c
+MISC metadata.xml 489 SHA256 630d7b55773a91a74e62dbef9f7847e8757a75a926a6383f3269ce12c6c0544f SHA512 c332bc5180c891457f2cd34ea744b01771ff771b0ad4b1138ce01a0563d82212fa9f2988967ab0c1b7e41947bf25d8c0f627732dea9dda728fd887c287206430 WHIRLPOOL 88fd67ef53917ebaf02b4d1e9aae27bbb1ae889bf4472d297e15485de256bc53876992a1f98f55963326c1dcfe46e95d3071e2b394efc0effb653da3757f7419
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/Manifest b/dev-java/jcodings/Manifest
new file mode 100644
index 000000000000..aedb47b67f2a
--- /dev/null
+++ b/dev-java/jcodings/Manifest
@@ -0,0 +1,10 @@
+AUX maven-build.xml 7254 SHA256 70d00599492b6889a07f4ab27d8ef08df173ba5fda5bb299523f0a2ef8227252 SHA512 0735062e262c9abcb3649ef48d87a9d7489d0d980ee9c77c1e7b6aff4f386344d423403dc54e4d1ae08606adbe1ffea4ac4cf531d4cf1cb2dcf21f1ab95571ad WHIRLPOOL 91b0e092b5ba49e540af8a1ea162918678779ba89220b75594e971d9ff6e1561dc8504072b4d6f989f56a54e61a3657bd14bf4ab0155989efaee336b78bc75ff
+DIST jcodings-1.0.11.tar.gz 123802 SHA256 b96089463e291ae73215504eb0db876f864e394c767740fbddefac751850542f SHA512 6bff29718ff04fd2f52cff767440d87f3dcb0f4acf71ee7b037241af7ef7533284176f53d08da5b1f37c643b766f4a9113651c994d1893ef302a2056d9ff40f3 WHIRLPOOL 27d5b402a3bc822d126365f4bbc5f3dd87bbcdf69720634333f9b04c4e19ecb00a4af25e676b7b5de81a3f7debaafa8d5b14f6da3aa0583248f96d8b4b3701df
+DIST jcodings-1.0.4-git.tar.gz 90294 SHA256 25332bd415cb0fa997e5f89e37d1c5ebb259629f5be5796c377e0b0624a1767e SHA512 49cdccbb27c9c6859447fa783b22dcd4fa1b9bb6fe9af3e8bddfe3ca4cd62850e4d6c51589481503dba9ea5e27139407834c9163063b74e960bf848ed4f9531e WHIRLPOOL e753dd6a0256de610f65e15eb0988b1790064175ab3027362b8399f11093f8c088399fb9348eb3717ce8bc6803bcb9bcefb2d2f61526fff2b707870ce5cfe7a5
+DIST jcodings-1.0.5-git.tar.gz 90788 SHA256 a5195911c9fc6fb911200b4939acb60ea97c70429da025b02cb03cae8e09f4c4 SHA512 a0122eea18077daefdcf38ec9e6f12b000c558837835fe900f6e0c282fdfcf95dbb10652b4cfeb32e556ae8ebe1aec8c10e4a352cdb565837b2f16335140f8e3 WHIRLPOOL f9b31545169f9539d8c3078a56c721594982b666cffedaf0541243051b1e0237d2169eb414e1105e4b6948ea86f382975d7792d0ca76cb84d9d1165cd78db497
+EBUILD jcodings-1.0.11.ebuild 828 SHA256 ca733cdca5b71f123adbf15ed523bb7c29206972d1937b60653b26ce808b066a SHA512 f4495874eda08d74cb2639c5a584ef789344d54a3ea6684d96c15df960ef54fb155d3a2ad7ad342d495435e406931550a63f69dd3dafbe51af333a85a5b4ea9c WHIRLPOOL caa1e74afaed2625a8f72dee41ff301a4e73b274050bf8c4d966fcb2f798f94b90f27b8c9be02d9a6dd255997116015b1512a3c1a425f5024a87f3fd8c2adcbd
+EBUILD jcodings-1.0.4.ebuild 732 SHA256 b65d265d201ea859c1bd703dead3f1430455abee982ba113cd986d71371801d8 SHA512 4592a5f24ec84d056d3c46e9459d4fe9fe951a1fde6cbd8c7b08a9dbc4c40d1f5a420c6f0962e976e3ed9ce829d1cd99defd88dbc78708c16d8d5d81d7ab7976 WHIRLPOOL fa305ab364c51779a9ae3113326d0bc02045d4bf9d5abda6fec3d79c0f1fd13ecae84c2c22431d0f5c1b9e0761190a2246109c9503b3af8dc23b6e33d0d094fe
+EBUILD jcodings-1.0.5.ebuild 763 SHA256 1ec426b7c8938c97519910b2e0aab17cda22e46687d5f9ae1af567a900532e42 SHA512 bda1b75cbfef5252d46fa1f927775727fd73c306c62e6c2095a5cbbe4a39c9acf318fd0added610fb29c2d39fee198eb3a856fe500aef8199e13c80f5fc435e8 WHIRLPOOL 49208f31626c43a3755e3b9b77beadb7ce417a67732d41f15c4ac39b62ad09c58f3a0063742ba355cc489a6a0837ffb3f776ee17933d76e8a36295e19e60857a
+MISC ChangeLog 3114 SHA256 8844374ba3dff0b7ac0b3e9b7c82dd48750f5502e061030662dcc22824398a6d SHA512 64db6d5db8d9302006b06ec08f0910c9cd97d63fea69a9a1ccaa0ce7eedd70d233847882a64d8a63d8989d106907bbe006e3309374fd57c48876216363857497 WHIRLPOOL 1b9ce869b4f70e5cd2bb60d9b3bda6e1aaa215ed2f2d01a453472e3df6540ec79e38dd7b3ab3af6475ccdef17ca9c5856953eb5612307ed46e4f18d8a397756a
+MISC ChangeLog-2015 2507 SHA256 a5fbc5444913f3c9584327f10b84e1d187ae405af2ab2de3a7d922b52ec9281d SHA512 dff91688f73457dc135247f0ab4224159cdcfb78123e9040c62b666ac2662b0168cd4987c3fc71efe09a58449982b9021873c96eecc6d95a7467280772a344ff WHIRLPOOL ea696b3fb03d1a0f6f0f2b091275ef2bead1ff7912e943d2a1aa6cb592a0919efe66285925e2fa38d232444959788ab332546f0b59618175c2d24b916ec2b435
+MISC metadata.xml 325 SHA256 bdeb6f5f54887c96e48a80d00b88b9305fb9784f0c5c7285e0263ef3bb9a5ae5 SHA512 b0a431f148289e90b6bbf25940157336603658375d13d4a256e224174ddeedac53e6dd625239e51763b467678090a6305463c4c89fd878027ca8c4b369434095 WHIRLPOOL 6e73f7e452d172bf915159db0df52b168510ecafe1d555cf9fad34f8289e260bf8611e2f84dfc879ae8953a7576c1f08e119a03c7933a9a17baf8b0d5c7fbd8d
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.4.ebuild b/dev-java/jcodings/jcodings-1.0.4.ebuild
new file mode 100644
index 000000000000..f710dfa7f2a4
--- /dev/null
+++ b/dev-java/jcodings/jcodings-1.0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+inherit base java-pkg-2 java-ant-2
+
+MY_PN="jruby-${PN}"
+GIT_PV="0-gbaaab90"
+
+DESCRIPTION="Byte-based encoding support library for Java"
+HOMEPAGE="https://github.com/codehaus"
+#SRC_URI="https://github.com/jruby/${PN}/tarball/${PV} -> ${P}-git.tar.gz"
+SRC_URI="mirror://gentoo/${P}-git.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+EANT_BUILD_TARGET="build"
+S="${WORKDIR}/${MY_PN}-${PV}-${GIT_PV}"
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/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/Manifest b/dev-java/jcommander/Manifest
new file mode 100644
index 000000000000..4f620f62334c
--- /dev/null
+++ b/dev-java/jcommander/Manifest
@@ -0,0 +1,5 @@
+DIST jcommander-1.48.tar.gz 64544 SHA256 dcba3a05e60731c8945166089f7f1a1600150f438e5f23d36e6e766d1a34c5e2 SHA512 1304bb14ecb89f9945e8219f3229941e556c7cccef52a2eb4e4663da9dbf9fa5ecec4914275a743fb7d90ca301153284dc76dd380903aac93db1507894d72a6e WHIRLPOOL 85d1bb10129e93c69932b84d5af7c6084fa089c51a8afdfe980512a52dfe47ec9c678bfc91cfaffa61a13a4dea8953a3df50d96fdbc53ec3e2fd8870dc34afca
+EBUILD jcommander-1.48.ebuild 542 SHA256 3a5057015b88adebd4a0b2052a8ef5da20031c70b9507e0c0784e31180af3237 SHA512 f7f001bc32768c38926da521bc2851973726b12f12d6309a8fb3d0ebc7b86af60fed88a2dfb83e5ec3b007e9d1a751dd78fdd67bf7b0e89af63e97c59d3e687a WHIRLPOOL 0965a61ae71193a9ee57c8e98bf50ab8f264c7ff389d9463127dab294d6b23115bbbc55693c7aadff3c5f0d76cba6da884b0f39fe331ea55bf4b4d28e0f67e85
+MISC ChangeLog 3231 SHA256 53155ad73c02f8c3a4f2f7a9b70cbeae228687849a22adae89581e3146e6fffa SHA512 1744026e8433ef5736439bb9519f6545a54d24eac1c508fda43235c10648962cd4592cf46ad554210f107ce4103518a6c323e121fab7ce8239412c2add533a70 WHIRLPOOL 4e3b713bc0c7e1a5b70f6c3cee1754fcf426622ed82ca4c31d423d1b4570f0ccab26a298975f5189fc76647ccf812ffa242f3d39cdbc0476ba3c5e1787c679a0
+MISC ChangeLog-2015 1509 SHA256 971cb8ea17f5c03e1d0f7df41ebe493ebbb3048fcea05247e24e85ca89cf9b27 SHA512 4c2646bad9b8a4c9e74be51d7b23ee838e11565ffd4f4c12d1412a63cc5419339e17b12379bfee6d4c4d8dd88bdd2d0556f3a1133fd146ce68def17f1dd0bb0a WHIRLPOOL 496cce6cd3eddb7dc18dd8f74d66d9c6e3e6a16b27f3def5808f8a6d54b2d820e35dfc84da437033eaefe7ee98f0456170cc5f148c755b4677aa8ae66168d7ba
+MISC metadata.xml 328 SHA256 2b27e5e01592da2c8605da8d3e875f6cc0dfa403197d46e705913dcbd4ede02a SHA512 6f2e953c14b69de907b9dce573cfa0e9fcb1d4197b25881efbddc9e4983222265f27679f25a307d7acd90bd29e8a1f7f1b3332f6699c0169817dedef08576e17 WHIRLPOOL 50535c4993730f4140866689e2200afee05e9ab78a7ead731a05452288e79ee68ac99d95bfa1a931e13f800944a263e871847c60370c7bcffd1672539b808981
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/Manifest b/dev-java/jcommon/Manifest
new file mode 100644
index 000000000000..cbd922cea26c
--- /dev/null
+++ b/dev-java/jcommon/Manifest
@@ -0,0 +1,5 @@
+DIST jcommon-1.0.23.zip 1373666 SHA256 6351512b94fc2228034a5c43da52d9ef8ecb7781dcecdeba733441de7d7e18f1 SHA512 c358239da8b1ddf53ce94bebb00b6518456aa921dd3aa84fc6a23144d499f14a85ba421cd71f3880e8d10153a6ab816f54c1fa872a4ab694ce3c7b8d69bc2a4b WHIRLPOOL 467d7400a7009c38b86041977dd59f8a309f7a8ecf02226b80112d12aa3d472c9a42a9cc3e5620b64b0333d44f497f85d95a2184603df9eb21ad66a51ca7fa6c
+EBUILD jcommon-1.0.23.ebuild 1383 SHA256 5b7d4408c3affe7178f73c588eb2f8954f90cc9914206dd487488e6aea5a2c3c SHA512 e2d8b97a0503ea3cffb721208e698ba1347dd3c0a354efdc323bc81bafaec425d26aeadbd65c254cbb8c7889a34c6afe80d0d028fe6375ef96688d0a029cad73 WHIRLPOOL bd92d3a75c93701f230725ba61299e70d7e9bf152f0018b957db19a70df0ca97c6c887b2fca297bb2bee14bf0f490e236afed9b8ea2f32ad1aa3f9b72987d94f
+MISC ChangeLog 3259 SHA256 c38cf70453e26aab9f9f10bf51eaeee92a32e1078a6a6fd7a0fd561c9d25e12d SHA512 d8247cd04c8410f95c3adecdc24410cf4cdf0b29c7daed8ad9cb09254a3123246076f397ec28b14a2a57c36966dbce499620dbc47f9972ab97c2ebfca0455d1a WHIRLPOOL f2f05fe03452a416b0c35db588d27a30b0799536b7f22889e0a7011516b7521e59b19bcdadbb0c34e8db4b559155e56d671cc415e4295e3f7680306ef49517b9
+MISC ChangeLog-2015 5350 SHA256 4c414a056f429cb31940275202406faa7d0097deee939395c1b91dcdf538326f SHA512 62a1893962413090bbe0cca84b2c691adaa67adf42a7a8f6860349ecc733981912450b8ae8dd5e5024537865d0a5fbe23e2aef28ce81bb386d23f71f8d7a3fc9 WHIRLPOOL d5072e0ed6389a0f98efd005209b4d2b212cd13d3ea4b11c165e7b2ff2ac4ffb475d6cecf5e2d5b7df54a7e4b148069588a780b5eadbcda29e0e2cc4561bb226
+MISC metadata.xml 316 SHA256 ddad70919a977de5f5a7a240d941e934e6e1ed2c33fe5cf06a666d86cffc5452 SHA512 23acc79c59e65a77790ff6b915c2727b53352e6c989aaa5d5936cc1a09fea10c15dc35e5133ef142da97af85770b44c3b33e28cefc4437de86afa5f3b3cf90fd WHIRLPOOL 21b446a34a33c1e28c958dca612b46fea8959c5ff7e0545a2e4b14463e0d35cfd630b04bbecc2ddc0779f161b4be4f50cde090520653120f4ff5a141ce350074
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/Manifest b/dev-java/jcs/Manifest
new file mode 100644
index 000000000000..0b82f79653ac
--- /dev/null
+++ b/dev-java/jcs/Manifest
@@ -0,0 +1,6 @@
+AUX jcs-2.0-build.xml 16360 SHA256 749112f080215b6a6a948d8db4b9155011a07ba4d9c50681fc7ff7e9afaf18f2 SHA512 8b11500fb24f7166475b3bb37b210884d8203bb73879649bcbeb4f892059c16bc20a9871b7d306c119efa7033e91a64ee77c5244a2adb460c4d63473de0f9b33 WHIRLPOOL e09216756276538663167cd9058e261f51c6fe34c9df8c4803a52e08a6b8a466a7b071f74dd0950563427b0a86868fa089384297d065103d6401f47fca529be2
+DIST commons-jcs-dist-2.0-beta-1-src.tar.gz 825048 SHA256 2ff60facc31b52625f1f2d8907380947508790bd864e2fea03625dee0c36ffa5 SHA512 56d68807de6d47debc893584a738bc797c2a150503ae460dc1444e9434b438926f6ad9fe8c1292250f6a0b2936210084cbd512083b5a8cc4f20e692b759a314f WHIRLPOOL e5e67465a7c318ec73de3ffacc566cce48304a3379885dd814f0c32f362c1d2e24abf2935e090056df0bd8db0fa85cb36553203e5eb6e837e23e888ca6cd137f
+EBUILD jcs-2.0.ebuild 2482 SHA256 a885f58dd3da8e451249e48dbea900938bc514c77bb97501f5d3156b008451e8 SHA512 b6134c8f7af9b2ab8a5194028f92b46ffbe30c2baa472bfe2df558d87e79a8d23ba58277a8823e67805780dfa3ef6b67e8a3e51d1869d37548e1217683b26008 WHIRLPOOL 60e4d91ec3da16292a2a514ae8bbc2639b360eb99b98c8e76a3e62abaf4b0453f089908fedb35ac930025826aae5c8c57c07b0080fde2ea3b585031555822cef
+MISC ChangeLog 2822 SHA256 ab7b4365aba83c50b887c28c7ca28fde2e9d3835b89a65ecaeafe6684c26bf21 SHA512 aa3a5529effce06a370058d0a79994e4ba954c92b95d3a9c84067cc796fa2b83295b59359c59c603a4b1a6d741b39741e0bb3e1a79d4f6cd2dd6f06a6705f79b WHIRLPOOL bd033a39861ae109d0b88a9344480ea64af81e6fcc288f5306b550d48a3bbbb49d7c1e57e6d7717cbb82cd5ec9bccddba1fe57ec3d57373a2112cce3b94d2a53
+MISC ChangeLog-2015 4471 SHA256 e144710a24b16e6b7dc8eee831eb65b46c489196e1d76f26aa7e4eb873455aea SHA512 fb5623ec62990591120e286c30d19469c2aa8b81080e864365cadc77a49f7b3c29c315b8b43d4058dfea3f6e1c38ab32c2aa599297ac3fa12c5b7f0e1c8a34ac WHIRLPOOL 29519b918bd1bca5b8089e5964d70e1ba7873d15fc1d3633c15b0e1f5f3c30d65b6261f7d9766c99e02d690f1aad4931ab9a5210ae4d850efa1a988565bf44df
+MISC metadata.xml 315 SHA256 1d82cff06d4c3437167e7ddf4f92dae84d212efce68be89faab53c83351a37ef SHA512 d9bd0e859afd4cf87e40f48facb8fc28df61d841277eec0df36d3173ec6b10af0017bd7eae5b0b31bb4ec16f051a24b64bc45b27cf22c720f2a6fcbb4add21de WHIRLPOOL a52c86f61be6409747193d3ac762b04f5fcf47401af1b6d0d7e75a158433f04952aaf824d5cb355fc695e60ac6f4ca1cb8e371518d4b29dc3dd4261aa8346027
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/Manifest b/dev-java/jdbc-informix/Manifest
new file mode 100644
index 000000000000..63ceb1dab15f
--- /dev/null
+++ b/dev-java/jdbc-informix/Manifest
@@ -0,0 +1,5 @@
+DIST JDBC.3.00.JC3.tar 18447872 SHA256 b8a894c0aff02bd690d2082cb4e0e4d2f8e73ff59e3cbdafd28562346902ced7 SHA512 1f5d0848964b6e805ea735745e8af94664b55dcdf8de664d649b0b261eeac5f36ed0a6cff9bbfdd70b3b574c28b988013c97b1c2011fbcb51f21262f8dda0525 WHIRLPOOL 242e88daa3b3f7b4fbd9611e28ad3e979098d4ab3fd1f2f188843bb60301a7c1b71f20bfcb84da7ce8a9b2e0da75d2d6afc32cab878f4195955571707e6e239c
+EBUILD jdbc-informix-3.00.3.ebuild 1649 SHA256 d8cdba4f28fc562f1cd296554e66fa6610789dd0914be97317c873d1813dfb99 SHA512 a5f50f50e43b3d16f819da314df8866d29b4d5fac9b7af278b1a10f8412ab24d4d60f9d2b4cfdfac8cd834919f6544d253f32dfee72ab5e2cfaac70ffecd5970 WHIRLPOOL 15f2af874519aa50f6b87518a1e563604c9b2d71f4b5b3276e097dc41bd11e58e6b787b7ab4f1f7dc9f904020f3d5c55ce82bc20f5b5897122cd6dbc0ed2fb6e
+MISC ChangeLog 2592 SHA256 f678a27c0fdfa0ac58149fdb49b2a42358ade3a482a52514bc5c93896b0efed0 SHA512 93871c90f675c3d770c7ab9fd729a8d135a9b765418520dd46645da34080e96fbd9e4e5616746eb29aa6cb40c8d52073ccdfe6732779f3f27b467f42df25d2de WHIRLPOOL f5759586ee40448556e772a3eb083c12fadb81db88c97d3de93029f9fc159577fbbdc407ee5a591d04c3138e491fc1521227cd176feae2cc264d82b270dcd81b
+MISC ChangeLog-2015 2959 SHA256 e4bc6f04f39ac8f2e83c4992872c6ce93a9401e288f106d1dd359553036e31b4 SHA512 271de0b39371010f82b18f3d1e70c8ae8a0cea3aa221788e888fee026970cb6c28c4a72c2fd9b0ad1a68ed843617c1991e2118258a6f7c921620891fa01c8ac0 WHIRLPOOL 4e36566f66be6e068ce0265201ad292cafe80b345d9218a690e0f19ae746daa5d6c3231d390045fecb2877c3a082be281bbace154789a1122b55bac5bb4cbae4
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..0c6cab80492d
--- /dev/null
+++ b/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/dev-java/jdbc-mssqlserver/Manifest
new file mode 100644
index 000000000000..5788e40f577c
--- /dev/null
+++ b/dev-java/jdbc-mssqlserver/Manifest
@@ -0,0 +1,5 @@
+DIST sqljdbc_4.0.2206.100_enu.tar.gz 2391092 SHA256 9bc2b6c216e1a82eedcde2ad10ef2fbd9629aab6806544596639fe080f914423 SHA512 7b18d56552f08976b2da5216f3f5504bc8b3db02c072a696115bbee1f5bb35e7125d4880e8e0e034116378b479465315df530eee7eb8a73e90467e1a67265084 WHIRLPOOL 92d20517c6068475c916cffde922fa597eaad4d08eae62f5c74ff59698f0caf0509d19ea1f07cabfed861b0b725ed13a2e4e1416c6dd67d34ba6119303e869bc
+EBUILD jdbc-mssqlserver-4.0.2206.100.ebuild 770 SHA256 67fd80ac37208b8a4255dba459fe6736b3b8a765b1429b320201a9aa87b2a21b SHA512 5e506a782c6e80e2947879df97b84ffcc92b562ab76772f3d807bfb76648aa8f6094b5ac15bb8c9f1dc2935a6995d9630b219f6a11777f1fbdbe5093d9472ba0 WHIRLPOOL 0a45f3ec9deb1cb444cd4ac9c4821b3fc18e66837a2e2c7e18007bc008f8c1d10e3df6cf1af1aa00e1d58eaafdf9b5ac50db87d5a7acb54a9d143324a7a8f532
+MISC ChangeLog 2624 SHA256 bf0d566ef03a9a0e34f80a626117cf18049095b9672342bb0a60419482884311 SHA512 1593f335a64ea79f09483de2c54450da424008cbaee14e785f8a32bca0e45166c79223e9d8338fabfcf822c9bc4f1e5cfaf8775b1d6ff7326f8b647b3a700ef3 WHIRLPOOL c4d1d5aa567d012c7095447939e8ae7f252f8294e64b633f36c327a14954df78da7e2dc724417f2c6c9b3b2929d8578a30c56583a43d0b4ea5f1ca924a402279
+MISC ChangeLog-2015 3354 SHA256 ba21207ba875d421ea121dfbe48fb5e6684c0f363299c38a88fa89b1684789d8 SHA512 98b3b193e96b9a4fe56a57235313efa506cf5123de987563d7f9fab30e021f9e6a61dac27d3acbea6e864c257ba41b6ffd5284fa8efdc7de54cb02cbd9045273 WHIRLPOOL 346e660e202d788d498fa9902eba398b73af77a23841bac1333f975ca16a7bed3478837ccbdecb63a84442a287b2272f18bb7f2e2686289814cb7b2d714aac40
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
diff --git a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild
new file mode 100644
index 000000000000..cd682cee9f58
--- /dev/null
+++ b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit java-pkg-2 versionator
+
+MY_PN="sqljdbc"
+MY_P="${MY_PN}-${PV}"
+MY_ID="02AAE597-3865-456C-AE7F-613F99F850A8"
+
+DESCRIPTION="JDBC driver for Microsoft SQL Server"
+HOMEPAGE="http://msdn.microsoft.com/en-US/data/aa937724.aspx"
+SRC_URI="http://download.microsoft.com/download/${MY_ID:0:1}/${MY_ID:1:1}/${MY_ID:2:1}/${MY_ID}/${MY_PN}_${PV}_enu.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MSjdbcEULA40"
+SLOT="4.0"
+
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.6"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/${MY_PN}_$(get_version_component_range 1-2)/enu"
+
+src_install() {
+	dodoc release.txt || die
+	if use doc; then
+		dohtml -r help/*
+	fi
+	java-pkg_dojar *.jar
+}
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/Manifest b/dev-java/jdbc-mysql/Manifest
new file mode 100644
index 000000000000..42690570f253
--- /dev/null
+++ b/dev-java/jdbc-mysql/Manifest
@@ -0,0 +1,8 @@
+AUX 5.0.5-dist-target-depends.patch 380 SHA256 42d4e0a8ac2217045116403bc34642aed78eb99210aa259a8dfd8663a2e5cc84 SHA512 407ba02b1e2b3a514a9e270356a15f97eaa19197117a9f2752ee6b78fba0dd7cab150f7eaac02f8d6cb9d3bfe6d0edd3e68f38457310d69123c97b9231d621c4 WHIRLPOOL 5693bd335c9e713920260e8b5d0f53f7e518a7ecb70088b44770337820fb197fb87473c97871d4d7732177a00b1da87fbe77dc27c875eab8e989e3f5843890d9
+AUX 5.0.5-remove-jboss-dependency-from-tests.patch 1541 SHA256 8c7cfb3116baafda7c708c8cad05b63e15ea5027ce7804b268f8b245e1e1a199 SHA512 43e91aa4ff599cb958cb6c098cbc1a28511b2fe12ea44dcee20fffe0efbfd1ce31bb29dfc9330a30d99174ed80abbb8512a0cdf3b4155fbf3d78ef776a5ebcb5 WHIRLPOOL a359149459f7b5106e3d366e77c68fd08c9a90d63e2b38725d7b0f08a391326fdf743b998453ed52c0e6b5b134c0aae15c075da371e65c1a68e0001a1a580a40
+AUX 5.1.14-java6.patch 1301 SHA256 ec8a6063e3bd9c6e37dc5be646b47dfe86c0bc819411d280b19645951f7b3376 SHA512 1b630781201478dee6da3d2322755ff87b2e2c9c1cd49a127bbcd56a0cc25e7bed06ed5f0758709c2e120fc85273755ee28c7ba21ac7b75e97ac6043216413a1 WHIRLPOOL 4f54f083bf388320eceeb5eaae0358b938804589aa20571f4741e3eaea59cc9f63000848616828603e6b234321d73f72627c09b8cdb8f315c751239a9d06957b
+DIST mysql-connector-java-5.1.26.tar.gz 3724076 SHA256 fade4caa398c41f537d9b7bcaf83aabaa1eab1ef23c81de49979b5b04ba395bd SHA512 93b882f5262dc991aa885ed9ae7fead02b9d28431022c86c6724272b508e78eee3df7310e9964e60f68953ed56f4fcdf9159a90f463eb39aea65af2453371879 WHIRLPOOL 9ecf39094c1a07f5658a24574f7852aadf51c024495572bedf38ee74f83f6380159e60ce8b6a415480d8e9ec923174a0f6ba2209cdcb96167bcf8ed4e1e3a9b9
+EBUILD jdbc-mysql-5.1.26.ebuild 1883 SHA256 ecbe23a16f8e39a2c1592e076730192396f1e033dae307fe326b6850bb655fc0 SHA512 0e3f1135e8f19888853a76f5fab00c2fca122707affabbf2b08569b71aa03bdf0a15b25288c5d550a8c0b6b13cff11b1c64bccf1f173a3eeb53bc28b1a053638 WHIRLPOOL 6b63e52ebdd430d55ae789d11b68526f836b8b3a5a1fcd8882775ba9d1a495a6230545fd35523d5173a691f596ba09631a1c973027c0282c2b9e380f944ab5be
+MISC ChangeLog 3193 SHA256 25dc72ddc9477a80aec0cdfeaeeb59e61d57a065e9aa25bbfe51a19815d419bc SHA512 e5352277db53edd17183eaeb8506e49ef89c4441320a913d7421e1b636664da22dd84f16dbb9d0ce46458e3eb5af6b6e925b7d364242df2aef56e3f0374a6c40 WHIRLPOOL c4a59e58ec1dfa337b34a493facd68a31e38399cc259ee285942817a2d4d9d989d81d01090a9bbab1ca5f3d9929ca1860f8c53f1b584d59d436915761299738a
+MISC ChangeLog-2015 16107 SHA256 294751cf9f8205d80ad7a2a5fc42dbab5377ab2cb3f4761f0e7eef842aa6a348 SHA512 fb7b857cefb77d88754b7e941847c6be3803414869aa66430268af2055e0e0426a0d9e8d239a12ba14ad24660ef34aa50abcb6c5f5e3005aa69702f38fd372bb WHIRLPOOL 131ac144cf027ed45a079712f4a53137ba7af1720956a3aeea3d000013ad1f2e3946bbe77c7e4af2ffca43ec20c3e2355d360c6befb1662117fbf96b2a1d0b72
+MISC metadata.xml 358 SHA256 528e6cc273eed7d566cfa7c791d9a71faa2913ac969fbb1b954fcc768ce52c93 SHA512 4db9ea2f30ecc92b4b97e5159d4338b73c59e3f8640336764d2766a1ca33760b7c0fa6caaac90125102555a5128fff3b2d95e20d92df22e705623f0e2b7914e9 WHIRLPOOL 3ca1866d3fbd6b301e6df54de9c95961f56377dd4fc853b9dffe4c9bad38a686d1fd4b7bf5f0ec66110fcf3775ddb75c14ad44fde5fd6d20b5092f33aebe8f07
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/Manifest b/dev-java/jdbc-postgresql/Manifest
new file mode 100644
index 000000000000..c340d05b18c0
--- /dev/null
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -0,0 +1,15 @@
+AUX jdbc-postgresql-9.4_p1201-remove-osgi.patch 1629 SHA256 cfe41a3ad3727a513ce2fab910b4ee3b9cb071bfe732fa40f21f1ca3b9e15231 SHA512 dcb831f6828980b5ada1158cb80c2e5c8d6921b24b69cd0f40faec9b8d41bdaa468ca995e4a804282b816ab8b0120e371e5f21a2aff7fee6068f13affc6b097a WHIRLPOOL 5e319d73f9676ed44130f035780e0ddf8c469cb96f0b7eac14db7759295ad4cc5f7732f791b5e0442267e0a552c763248020c2c7e92bb11eebb82c911336eca8
+AUX jdbc-postgresql-9.4_p1204-remove-sspi.patch 6853 SHA256 c870ab7feaa09d0848a9047b6db44d7e3e98d2534af47ba6ebc2f0148192edfd SHA512 17d6a1514fc824008c8f0464c4af30d038a379ade44120dc24d8f9a4f495393c6e75e82f8e9da1e51c6d22c2301ec83a842d0db6e22842661b4dda97b8335dc6 WHIRLPOOL a2d832c729f809e294ee47c995d6f1a035e33deaede374c00bb3316fd98979e1de05f6daf64391f80c2cda1d6aeee7b25ca5ee1783549a22d7da02f2ad513b2f
+DIST postgresql-jdbc-9.2-1003.src.tar.gz 1843082 SHA256 d61449b8a17ce540b26437382c33a59a49a94c578c943fccf91139ee06478968 SHA512 f91d9617726722998a51275c625f6ea89dfe0ac7ce415cc6fa76302b13762bcf825cd61ec69d25d0199ca21de8a24286eeffb843ad59c06fd3049a289ac2b702 WHIRLPOOL a7994d7ce38bd17e9353339d2838601a22328c8eff03baa122663526ef2c0c2afa8b16d9c93ea9fbff7a756612cddffef41ec00552640766acc5e1fbe4996282
+DIST postgresql-jdbc-9.2-1004.src.tar.gz 1842921 SHA256 eeadff0d830cd19a4f52a9489748a7126b0c1d4863bf9a5d65618158dfc6ae68 SHA512 6e218b7df3d772e4fb9053672f5f77f6012fe6e652a536dfe171408e957465520b05994d4fa13c4d478b595a55b8068da663b9f3dcb544a46fcf91d71ba8fdf5 WHIRLPOOL f1afa3201fbaaf47edb0224d3263642b3202fbf6fc922318354db86e394f0005611b0981da043a4e14cbb67224ac8fa6d96880e0763fcd4d5b502423c7eaa0c7
+DIST postgresql-jdbc-9.3-1100.src.tar.gz 1852465 SHA256 e6be53d4cda04735f5f147d2296acb9a22630b062fa3a4ef894073f23efc6d55 SHA512 43968a62f9443739721016ede186b2f41fa6db2d1ef319cd65059f8715e90eda7c7f568995b293578c39e04d43085cfdfece587500f99ed1a49964c12d8c747a WHIRLPOOL 9bf218936a00df00fb4b4f6ed6c3bbe06cdcfcd14d306a4f7bf3073e83f1c51bc85c0a061c2e04790bcebf9183b8aabd056522fa5d18b0734a4aec34b3ab14a0
+DIST postgresql-jdbc-9.4-1205.src.tar.gz 2028968 SHA256 bb06d9d94ce1f873df4f6090b26f8d2bb358601f71ba1fbdb782bb58a1164366 SHA512 ebb46c0cfcabc34083e6f481bc97536fba98d082462670d39efdd75e6463f1286db6fa07cd35546c749e456f1c06fb1d022cbc9f5cace2a1b968fab76a57d281 WHIRLPOOL a501cb12486ea1903442aa15c03ba7e9f5b127d3e1aa0d90991f6ded517b4dc792488431cf2047efe1a3ac8652ff527d810e1138235a4353cf5cd44031d2b641
+DIST postgresql-jdbc-9.4-1206.src.tar.gz 2029837 SHA256 2793d89eb87f913f82af0898fbb17c2d1b64c4b39a444fe19fe621cb5f11fc80 SHA512 b16816f1afd3ee5986fca197bd7608c2e2f334054e41a8c541c47985827f4f59d7691d23983bdac01c85fc364cd001c991ac6b4e8567429b9d1f4161388dd6bd WHIRLPOOL 0729913fd98088c4f8caeafbb519b45ac673cdb9ff1342f0a1146a2dc87d0c530385089c80c498d416d6601151e00d863831be22b570c3c19070ba3f1ea3ff73
+EBUILD jdbc-postgresql-9.2_p1003.ebuild 1952 SHA256 04a42f061b711b0600085092114fc8fd2466f15754c65ee1749adcd113f2dd23 SHA512 96b02628ac725712fc9cef2fd8769c2efe6f44fe676f8069d9c2973725969f49615f028f7f5ba7d0bc8f92fe04eabd08c96cb4995cc5a27e7c3f7a1c73d9a19c WHIRLPOOL 1d93e4e0dc171cf093eb7b2c02f743b44acc9f092f9a746efe791ad2caf02dfebf82630a9c60505f9369fadb6f326a20be0ee72a8913b9607f05a62f1145bc3a
+EBUILD jdbc-postgresql-9.2_p1004.ebuild 1955 SHA256 8361e4d3d459a9d53871b7e9e104847dfee31a50e5b9115274d765cea3658b06 SHA512 bce895daf8e33e08f8240fce8ddf0755cfdb76af71a9157681504d4ff4ac560af34164dad3a195f91f808f635dadbe7627ee2c28f37be8337ef740151a5efcf0 WHIRLPOOL a42f9bad01158db345b8548bcb355123789afdc6bd0e4e6feb8837786aa692ff449b5c3250d4671fa7ad55759a2582f1b741b52835b667518cb91f3aa9ff745c
+EBUILD jdbc-postgresql-9.3_p1100.ebuild 1955 SHA256 8361e4d3d459a9d53871b7e9e104847dfee31a50e5b9115274d765cea3658b06 SHA512 bce895daf8e33e08f8240fce8ddf0755cfdb76af71a9157681504d4ff4ac560af34164dad3a195f91f808f635dadbe7627ee2c28f37be8337ef740151a5efcf0 WHIRLPOOL a42f9bad01158db345b8548bcb355123789afdc6bd0e4e6feb8837786aa692ff449b5c3250d4671fa7ad55759a2582f1b741b52835b667518cb91f3aa9ff745c
+EBUILD jdbc-postgresql-9.4_p1205.ebuild 3125 SHA256 bb712c03104d4fcf6e9ff3820db45b2adc54ce8f0745c48fa3dbcdfc513407a5 SHA512 8fe2eee869e0d58c98e2fb55e2ecb7b362e0e88f7f1c40ec696def253fa49a4dd7c2b6357321abb111f64349508fe7ac395613b4ddf2e7378acc58edf2130bf4 WHIRLPOOL dc1cdb65d8c24c55d94c546a6a9610f0b68a5d1318c9f2eb7c76ea6e1717d7897894ad209a81e112e30ee51b30195b3a3e535de41a60e3aa5357283a443d5363
+EBUILD jdbc-postgresql-9.4_p1206.ebuild 3122 SHA256 29e56de6c31600950aebf51b9edcd53690d87e48c3a38ce8f070b16c1129226f SHA512 48debfc40a905a1cdcd041a6cc501c040491105ded4cdd49d898f4e6f25cae15b6f12f93cd60f36516b01e690646ccae093e983c74d69f6a68907bc0605092e7 WHIRLPOOL 59991b4c1142e2689ebc993b1c4c3c17f00cfb7a7b20cc22431103a83b7e58828766c200c0796c8587001e5e06bf5cabd38a27074c6b991a479699cb3b301c3e
+MISC ChangeLog 6114 SHA256 2595c21c22beec81cd70396222cbbf792c797edb5a417abd23ddc8404a8d6620 SHA512 b0b074b1686b7a724c1340ff71c22d55aed3d17c78ecff28ece1ad31a5d11da16de1318a48bf7675b2c0fcad5e3ea9dc362f899623ac029ee3f50c88d217668c WHIRLPOOL b5b9445bc8dc256169a076f8c53ca7ab99df994b66b5557d186de33bb5dde77399320851612bed04bd8999d1e084e0c151480d9d2ba411a5f5ad28a886386d1a
+MISC ChangeLog-2015 11039 SHA256 741385d4a0f10e7a85ff99553dda613b4b1b5b6c8a58364db0a81d6221811432 SHA512 936f5533597f7fe0f1c6c705c414ceed518438bf7f001f6b6cc3e702f6466308c5eb231df4f9d8fae7559c7f55ea1ab02fb79eda0744f0da7f067caffcfde001 WHIRLPOOL 2cc233cd7a9c78c68655a27c6bb834fb100d971f1ac3bea5f5b375641e4e59c414e40be9d82ad74af5f2742f06ba72e4186a3e33bee03a3386cd011d754e096b
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..c69374a06794
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
@@ -0,0 +1,78 @@
+# 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="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="http://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..a0f2da4263f0
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
@@ -0,0 +1,78 @@
+# 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="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="http://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..a0f2da4263f0
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
@@ -0,0 +1,78 @@
+# 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="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="http://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..8da80597d544
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
@@ -0,0 +1,102 @@
+# 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
+
+MY_PN="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="http://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..6db452316d8c
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
@@ -0,0 +1,102 @@
+# 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
+
+MY_PN="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="http://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/Manifest b/dev-java/jdbc2-stdext/Manifest
new file mode 100644
index 000000000000..8f5ecab161e4
--- /dev/null
+++ b/dev-java/jdbc2-stdext/Manifest
@@ -0,0 +1,5 @@
+DIST jdbc2_0-stdext-src.zip 21642 SHA256 70470d9f3a2e1f4e29b909bf9c89005a9d2523825eb50cf70b2fa2957ff8b2aa SHA512 5157a5835983c094b13d947a39311d08ea57cd8e60197176681289d41a209f3f8b464e1e0dd97ed714534ba5afb749807e02efb3edba4e2c91e273e71f6f1ce3 WHIRLPOOL a57f77ae2b268b21e7733b7cf4edf1cd8751c8c5c25f1b7a6ae78677c14d5f499a9a05c36cd88a3c9ec9c4fc361476cc7433fa81cb94ed51b09ac4a2bca341a5
+EBUILD jdbc2-stdext-2.0-r3.ebuild 1523 SHA256 dc89289f7b867c137efbe4cf17825421996cbace54a7a88d9634be81543b2834 SHA512 1532f846d6ce1e2287d28e963b68ef689b2572f0eea2c795b97f22ef373eee2a4b5b618f4442221b5f8704fb8eba111618c38417d749735aefa911a145afda30 WHIRLPOOL 5d3955a3f321a1f9fb9a8bbc9b65b19cd271021ede9b0ebae2009c83e8c04810a7c9f4b08a2d556689a2004279b625dc02570770d28bed8c8d6aa50bd2eb9015
+MISC ChangeLog 2444 SHA256 70d770d4ae003a4d6d1cbdeae48156063fc4aa04ac84fb8446b568c66acb208f SHA512 a13f46199bd33fa9f854df440069891c5b763eb5d1158c593d1ddc4a0a18a0caed3ee549b97e7fd0172ec8b7e18afdafb87e1816dbb4e93d3554a58ab5066de3 WHIRLPOOL ad5320ee874840f93a6dbe6335ba6a4ced4d09e60931f0d2916d515759c1ac578149b6d1d55f25e193e9c42a129141a9461cdaf23b6a0c165006137de5a028f0
+MISC ChangeLog-2015 2386 SHA256 a582b25709fe7d974bf6fe0d93147853aeef5273c89f229134240c2364e4c306 SHA512 e9f412741585ac51d6edd5ec2d6d6e4377ddd51a7333b6b0627a5b3324ee74be4b4a1e8dc63ddb3f3051c350a1095f0988c8468f4be27f8992d1f1e145d47846 WHIRLPOOL 6116853f5679731b22168724cfc1bec71d0ad2ba5b8e514a0ed3da2068893b6ac59b63a3d1b656d9ad9ca4a6c618fdbecaa514683cd64712f176a16c9a1f2162
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/jdbm/Manifest
new file mode 100644
index 000000000000..5bf0987e29ce
--- /dev/null
+++ b/dev-java/jdbm/Manifest
@@ -0,0 +1,6 @@
+AUX jdbm-0.12-buildfile.patch 2260 SHA256 90c4c98d734946a12504e89851981fbd8a489c6fcea09dd6fb4bb5c3a5939e3a SHA512 22a86d1d647bac6d384fcf69cfb17013396235c113d40c5c38cfa05702ab38e2540d5bd38921d0975f4cac0f22d717b550417569a8dc9a4442abb392e9865565 WHIRLPOOL c8768eead4844b32b00dca67ba81fb1a750ae245ae1242204a98bb530fdbd25f7d34690e18d914deac7133c01f53b96004d7f9a3b47f20ecbd14d782c9528399
+DIST jdbm-0.12-src.zip 969490 SHA256 ec431becfd915f4908e5e3f71dc13b05310890ac2ad1664e508a9890151ea10a SHA512 cf65a89d1b3262aba40a2b10cdf3bbc1ed75fd60facfbd22baad2cfbcf81b5d67d3b7a372c7018907eedbcbb0114ddbb8d13b6cb7bc47896c47997996b0d57ec WHIRLPOOL 2504311219194c370509f91bad895d2b8818221f3d1ad454936484cd63fa028958d0c1e92c322bfefafff6a017a441ecaf952a151b5947fca73ddb922d717b51
+EBUILD jdbm-0.12-r2.ebuild 871 SHA256 67c4a5d97e642e188e73b6dd8f58f21cb7f84c2560355d982a444ea990341537 SHA512 82f51ce34d95f45c8e105766d4a59200acba00a4069ec1d7249323a42b4e311a867381676d2eed5120cb8ee40e1244bc0975ea5ec07ffb4b84b8831fde022054 WHIRLPOOL eae655fd4174a890e1e1822afe019630ba4671fb7f9eee2d1540ec33ce8d1c4f48d6ed00e92bfe6b745052e2b57f114d8a96682a057e49f6029788b8505cfc12
+MISC ChangeLog 2593 SHA256 334c81dc9caa213f84c9cbbd3ab3e5aa7cbf5f029fe938bfb2ead4636d830e1b SHA512 1e2639e605ca27b890683064e1220892a528cab967247dc24609a72dc769e313725d08ab1f8f10d084f080b6e24dbd76f6d85968599caacf5e0b04d724f536cd WHIRLPOOL d6bf201497e6248f156fc160c6741fbb1140e46b586069283cbc14a586d65887a91c533523405fc11aff3799edb24d492e5375a5ac0602851bde196e8f4fa05e
+MISC ChangeLog-2015 1848 SHA256 5d6e725bbdc578ede8e50e8bcbd63748275e18746b1734a27e10146fedb7449f SHA512 e5b87535d593aeb2464d1e5ca8a5ab8e4dd9e4e7b65be7b4f7eb786d038352765d02467175d7b9a62bb266bc70b4b063a7a9a8f8561132ed89876c923e9d8d41 WHIRLPOOL e427f82041d73a7bd973fa6ff9c26fb603e59025dcb0c377209198aa56717c2b2f3dd0fda91d02b7b4a1afe8b38629076b18b45d7d7aac44f99b2b14d924b4e9
+MISC metadata.xml 310 SHA256 d2c7d7ce3564851da15ff2880da1b5929e26afd4fc54d722d89312323322b977 SHA512 2a8c6e7833374873e0087786096a22d53369de951067051786d9d11fb657c8285d1f3dfc1c5b77a12f3172096eef2cfe4129477990806c7f193dad47a068e724 WHIRLPOOL eccc502e126c0f54fa2cd91f04b39a09d4d2def6f4f379618c61c1d6c6066b1b3755644b414310b1e7949c350c81226abda7cbc3c24adea0f4f9f0e17ffc37f6
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..2482de8527f3
--- /dev/null
+++ b/dev-java/jdbm/jdbm-0.12-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/dev-java/jdepend/Manifest
new file mode 100644
index 000000000000..0aecea298ea2
--- /dev/null
+++ b/dev-java/jdepend/Manifest
@@ -0,0 +1,5 @@
+DIST jdepend-2.9.zip 302836 SHA256 202de62e2f3d0667cc464720d5897d0ccb29767ec24e0a4d4c5bd6c4d37425a4 SHA512 93ae1ca82422be0dce9794f25ad98c078da7437bca59c697405806a462f81b52028e0536075e2a2f428d8f8c5a27ae50fa7a580b75edbd4e8c9c750315b1c919 WHIRLPOOL a6552404d405e2ef51a40c508737ff00fd7a5350f71f4c5913563b588903279e4a49bef71b9af0c10032f4ad5e45afeb2bba55cca9cbe1c8aeb0451ac0c337d3
+EBUILD jdepend-2.9-r5.ebuild 877 SHA256 b29561bd15aff8ec4b4635d4fd68070f1cd1ee977a926235e9cb1b025eedd986 SHA512 514b87a80c7a6a76aad6538b1058f88aee3adbcd9cbe82bad1446014ea8eb28776cee583ea5d878ea8a28beae792c3b25c890c7b0bd1399a2c75f7a31d08761f WHIRLPOOL d34810caefb75b35a2acc88e114268e52c0885d8b0f0e6813fd377f9f799d4c132b80e97799cca09c97c6488fc482a4a5a159ac404585c8292a537e448294274
+MISC ChangeLog 2568 SHA256 86aa19bb89837a980425d05826c9f02e6e4dc48bf89e5aeb2601367d0d13aff4 SHA512 ac5e2fae2b7ad6fe0367a5f02fcd617303ca358657622df865663b418a31b129d5350502f9b0467e062e8dcb3b7af9c3205c64918b42565761faec749372e362 WHIRLPOOL c0446bb464652bb0ae1336995d68432d7d3e90ac02388845ec2ae6b42733bec0388d4f10daaa7f52e333fcdd6f293063c4e3f848172181e0470f4500fcfa1185
+MISC ChangeLog-2015 6953 SHA256 da50f86ce1e3d40a63e904b024e1c262a63d6879f56b73bc8245202911ec7546 SHA512 7bbb92cefe2daac9c3f7f3ed98b8e6566a492f837eeff8a30f42a559d43bb8e5c08b3f5e9c2a5e8d5240a8a38baf048e0032d39f464a56121dc43e793997b70a WHIRLPOOL ef0ba431044e43ce0b117a3eff3f08bf0d8ef4ab68daf1da3e3dc85e84028563ae1327bdb94f9f3d24cf844dc483d7586462f6078f146ba2a671fc41b6b1994d
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..2aab642dca3e
--- /dev/null
+++ b/dev-java/jdepend/jdepend-2.9-r5.ebuild
@@ -0,0 +1,33 @@
+# 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="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 ~x86-fbsd ~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-jaxen/Manifest b/dev-java/jdom-jaxen/Manifest
new file mode 100644
index 000000000000..b9e07348f8dd
--- /dev/null
+++ b/dev-java/jdom-jaxen/Manifest
@@ -0,0 +1,5 @@
+DIST jdom-1.0.tar.gz 3571788 SHA256 fdb77a2c9f8f91a9bd898a0d99b941b79137b5ab692e35ca17dcb73a58b15f77 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24 WHIRLPOOL 329163b0a6838322be5174e7a6eddcafeddecc54e541cbdb28748f99da88c79349f67bd79c88bda6944d142440df8d21b21cb0fbb2b1497a6fc84f30a531f8f3
+EBUILD jdom-jaxen-1.0-r1.ebuild 1170 SHA256 29322de2412d0fe2ab57c83cc35226dac5d12762150fb30af1ae249f095fc249 SHA512 7736af072555f31133fb21a20da0a0bc1a97f7eba5b38f4518f71330b270349dd3cbe05e039f8b197ba15dcc20670366f07df5d854d6de788e0876cd246c0e28 WHIRLPOOL 6052b988fbde798f06b7c26eb7daeaf19a8a3fccd41d78ba7ee0833c35288e1ceb63d4ce950620fd0e833d41e123f397c4a55bcd84f62878736cbf0f9b26eafa
+MISC ChangeLog 3375 SHA256 38c687439d75197c37c8ea6493e9e05193ff40dd0a6ed19340f9ea56082077e9 SHA512 3394c203f75398a2391aa4b055ea0410436eb6f4b1ef7d94ad649997c28fca7ba9e033a5aecb350e6baf0178f43d3659e3eea02c08129284b0812f90fc02e062 WHIRLPOOL 8f365cdd76b61517267c13f788d1536540ca2785f54ca77ac96dc886a530408fd369fa3cf9200dbae686cf32033b2e9c4508a1d9e3614b9c9b823bef677e07c0
+MISC ChangeLog-2015 3293 SHA256 6bcc289d5eaf0efaaeace9e152efd6a412893f32be4f9cb863d5b508dd226385 SHA512 2f931657a1c865522d4972fb1e028e0c4ecd8f912cd50c43d1c3eed1c839dfcf4ba5b32c5b85eed8f0e0371ef19abe5317470313afeac9c6148fa89acaffd347 WHIRLPOOL 67f817455135d6be272b122d926de1e45644916b6cb83148b04c21d50a996c96d85c7aa16be48bef4b7ea437c190e6e5798792f44f5248d14fb1344c3f9d6956
+MISC metadata.xml 354 SHA256 1024c6821ff368529d7acc7c461c99e766c11d3e4c59942bf6b0b2ff0bee620b SHA512 8576436758389c1f32c253956f783ec2ca0a6b2cc5825a373fc7107a74d7910d718dcc9fb803162500edab7d01d2f068fce61398119bf23da3fd6099eb695d3b WHIRLPOOL 227b68f2674a1216aef2eb0d9ed1a953536606db78aa7eca090368b126a0b53b26db769321f32f5e485087193e3d1850aca02d0ef9a3910cf215ff0fa0c1b73e
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..2edf9483f6cc
--- /dev/null
+++ b/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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..f42dd6750df6
--- /dev/null
+++ b/dev-java/jdom/Manifest
@@ -0,0 +1,11 @@
+AUX build-xml-2.patch 1529 SHA256 5ae02e94deebf76a929b9f4e714bec777290b6dd1dbed34f12651b70cc563dbd SHA512 210f0fa113a75a0bb2f34b50e3893df69e5b7f02174f7f10ea981cd16371da515a6c8514c2f82045c3a6a64c5a11874b2f81e5ad975270f11eb8c12fa707f563 WHIRLPOOL 3ad81c67c147764ca5e387a1648f9b0bee13b36cc8e205ef7e194c1346c1de01e8a08370cbe843f4e728b1e37a7e98e5be83cbf778db9c6c70702f107b6d27b7
+DIST JDOM-2.0.6.tar.gz 8344114 SHA256 81790196ecbd9cf62cb2aa2a9c14153d74dae3a0364a9a262f42098c6d3c165d SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1 WHIRLPOOL 71df273140951ac9f5b2f9b06b7f8aa2fe43d05d93ceec9a508856a1cd5c571d897809d5b692fcf28ea0f45c203346b02745f170fac548b77e47904a3f8ce817
+DIST jdom-1.0.tar.gz 3571788 SHA256 fdb77a2c9f8f91a9bd898a0d99b941b79137b5ab692e35ca17dcb73a58b15f77 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24 WHIRLPOOL 329163b0a6838322be5174e7a6eddcafeddecc54e541cbdb28748f99da88c79349f67bd79c88bda6944d142440df8d21b21cb0fbb2b1497a6fc84f30a531f8f3
+DIST jdom-1.1.3.tar.gz 4233403 SHA256 d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47bd8d1f SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278 WHIRLPOOL b9f610001e152c41fcd3a0328b4ff563b33220f2cde8571ba09dd9063bc63fe51af80229c2bfdd7aeff4a0b354cd04a8d11f9fccb42b8620b2225c6f9ecd38e0
+EBUILD jdom-1.0-r2.ebuild 1638 SHA256 6fb9f52673f6e65f877e8ebbf2e8d8a84c3f2ec1eb7b19d406bf0bea83e12d02 SHA512 f615d7b6ae05c42433d37d0978e4c87291388291fd2f6324c498fe2b9c7e06f2b7fb5cbb81e22429d7e5b6759ff51da4039d33638c43702a16cd0ea5cf1aa80b WHIRLPOOL efffb8cb11442d732417657e0327f58ff28b0c85c816237d7bd0b8dddc9be6ec58e0b4e50bafe91c65a4f356b78ce1d9f4cb5f1a18a6067208e60872d3727463
+EBUILD jdom-1.0-r4.ebuild 1357 SHA256 0b8014ddb54d88a4102654db5f732a62ae0ea1970eeecd14f97444e2c64f2cf4 SHA512 e328bbd9127c23764479d64df4703e204558a5d167b2c100741edcfc5f81e433d0e80c2df3b959d42ad61388f78f2ccc8f393864522cf75d540cf2ba7b807a08 WHIRLPOOL 986c1bd9fae58c27092ba3569f48938466aa5f54352725d8025889549b904a6df8c924e7a1f49c8e53c4c48a56b7ccf915b2b2252d0e28e2963f54e0e173c204
+EBUILD jdom-1.1.3.ebuild 1257 SHA256 d3235ae397f19caeba22451c2feb836ca8c532e3fcb78598f5794be87a7140fa SHA512 91cbb5345d46dcd100384da0f249749dc840aaddc90f4d525ae14dc22e2dcff06d8649713d343e81de1c5d9cb99c5559adcd23156a7be33e6be5ac428ab6be41 WHIRLPOOL b0e6e8309176336760b11c05b2b2cdd095024871151eebb1d2de1c0ba6320fc4387c45acac9a5e4e2beaa17e5a797307e0e60b86f9af79c90abf1703c6ef3d88
+EBUILD jdom-2.0.6-r4.ebuild 1358 SHA256 d4cb6f93522cc5256dde7a2bf55dbda8214d97a1efc7351cd670c55966543528 SHA512 32aaaca3059544b6aaae40545f3350799efd730cf790d5acb101886b3534f6b21d75df5bfc9e2addb0964cf5466a5f527a0ea127eeab2045b70ebbda9d488b01 WHIRLPOOL e311b76e4b58be3685fb2a1e19a30843bcc3681a064a76761f10898bc42a4d3902c56396b3112d344a332cd31ed5abb9709dbbb21c79c70c767519062e5c30bc
+MISC ChangeLog 6090 SHA256 2a2cb2fde13bd7e9a08d10249ca498509e7e950ab0ea9baa9304d33dc77ae781 SHA512 bd9665416454ebf0b096a6a268f790f137bf82ff887f9339da1051f4911d5e475173c99918aeb221bf348ecc3bccb78c9f208a3acb300f3eef5b5d17a473d391 WHIRLPOOL 421c9c7efd4dc307f06338b4addfcff63834b431da9cbe07e160884a9af79db5023b1a6c3eef3a4b5561648395a8114301d65fe318806272c5882fb8587e2723
+MISC ChangeLog-2015 12386 SHA256 9323f57b5da0783f67c5a36c8aaac501a353560617e4ea52197a3d57eedee88d SHA512 7836863ced16a673d3158377a840df998060574690828cd541f35208e5c3686900ea418d41e893dadecbf3648a4b85b4c1f804d46999dc1ec0f22abdcdcc6f96 WHIRLPOOL 86549c47426aebd3e91dcfb30315d0de0ed73813da64349976193613fb4789328d271d24c67d01f82d1fc8578514da15d3bb84a9ef0ccc92914fd08a694a110e
+MISC metadata.xml 318 SHA256 d212ac2f09db1ec67fc711d6829b9121471ea2491b95ecd25525f11a5e62384f SHA512 1587f961d80cba775d94e97a9c41516766d6a502f9b144f401ebcd0ee0b21b2e04220730c03a44986af8bc860a0311acdd6e721d4de201defcbc89599df5803b WHIRLPOOL e463e09b75d1bdf1299de6a4ce9940d18de95cda158bd6702c174f35597e4f96729a2247e9fad991ea324da1f32d3df74b022e04d4d3b269f7d06b4d2340e370
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-r2.ebuild b/dev-java/jdom/jdom-1.0-r2.ebuild
new file mode 100644
index 000000000000..1f2e691c89e9
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/${P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+COMMON_DEP="dev-java/saxpath
+		>=dev-java/xerces-2.7"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v build/*.jar lib/*.jar || die
+	rm -rf build/{apidocs,samples} || die
+
+	cd "${S}/lib"
+	java-pkg_jar-from saxpath,xerces-2
+
+	if has_version '=dev-java/jaxen-1.1*'; then
+		elog "jaxen detected - building jaxen support."
+		elog "you can ignore the warnings below"
+		elog "one day there will be better solution"
+		JAVA_PKG_STRICT="" java-pkg_jar-from jaxen-1.1
+	fi
+}
+
+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
+
+	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
+}
+
+pkg_postinst() {
+	if ! has_version '=dev-java/jaxen-1.1*'; then
+		elog ""
+		elog "If you want jaxen support for jdom then"
+		elog "please emerge =dev-java/jaxen-1.1* first and"
+		elog "re-emerge jdom.  Sorry for the"
+		elog "inconvenience, this is to break out of the"
+		elog "circular dependencies."
+		elog ""
+	fi
+}
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..8351544e8888
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/dev-java/jdynamite/Manifest
new file mode 100644
index 000000000000..d7a71d821bc6
--- /dev/null
+++ b/dev-java/jdynamite/Manifest
@@ -0,0 +1,5 @@
+DIST jdynamite1_2.tar.gz 216501 SHA256 cc7fade32f35f84bc0cf64a37b205c45f719b7234299f523e9da58546d9e57de SHA512 922dc3755fc673d228edcbb7d20084a7d2123b936b5c38514781bd0c5eeef4a6420a4ca7256fb3ca8796fb057b854c49c6bacd9ca76ac9fdb24b3d3404ea4aea WHIRLPOOL d1a1f1f43aa73dcad9dae1646b9069945cb4ec0f6fc1833dd88e64dbdf7cd9fa526d16d8a7683cac9f56a88d6a4fc4c8737c1c753b3cee2956b58ea74caa09c9
+EBUILD jdynamite-1.2-r1.ebuild 703 SHA256 c8ff35f7fe054c58311715def8cc01608ebb23d6fb4a7917857ea808c7660fc7 SHA512 0a874cd9a657e9bc6b43345146094770c28f8854a9af17ca98e03707f8df8585e5d0f4acf34b2bd9c0d5263760e19cff40b3759083c255b30cf580fd17012b75 WHIRLPOOL f3f953e25898ae6732caa5bbbcc3713b5bd21c2d212e3f9b899d634442ab17fb06d5e8ce065b5ae331777367dec00fc6a1f09823f0594cc89afa7589c4f6968e
+MISC ChangeLog 2882 SHA256 ab094a3420b3831ecbaa5a67ffd98cc8674b64ba2b3678331f0ff15828e10e0d SHA512 1a264bd8f4fd5ea575c86cc37f1fb40cecdd75de5ac27e8384bc68500ddd37889f0a4cfc351c58c1b7ab1bb4f1fb06548e99479630c77d994c53bd0bd6640fa6 WHIRLPOOL 073f2d6824212800ae4dccd7c6d819738046cfec194de0983d73035a870955b8a0a38c47d44c6bec9316b6d0e2e75393eac54bbb0584ec5fcc43e243c54b161c
+MISC ChangeLog-2015 1370 SHA256 df8bbf048691978b4b93c0de73043b842fd76051006b7ed6475953f0212e76f5 SHA512 ed415d92417277fe59720e6250f1aa7cacb25318489208e568549f274eec0fd423b600527789d61f5c8d43e80811157082751ef23704976872c711260aca208e WHIRLPOOL 524efea5c5ba2827ecb8f21f21c80e85ec76c325055e5f95b2cebae44217f06a0de18f7c954e187a4ebf501db0ee5b20fb918f2c527af9747e861ea448b64609
+MISC metadata.xml 315 SHA256 22e1f3529b1bbea230bed31e03260a6d925412c07ac2b2d4bb9be05ce56d0b59 SHA512 4cedb3a84f7a4de55bc8059324b56b70019f8a95ce578180a8bc3c73f4f25528a58be4c08a22308f6db43b0f224bfaa6b1cdc701b5aebc499da83dc6db6a010a WHIRLPOOL 4277f5f9e6358f3f7ed3c6569fbf1d2e359b27ddc53cdd3e025e55a3ea4bb27e3715a19faa0943f3656f1b76a96bdb4983f744ed247f499c6936daee7beb1e80
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/Manifest b/dev-java/jebl/Manifest
new file mode 100644
index 000000000000..dde094a301b9
--- /dev/null
+++ b/dev-java/jebl/Manifest
@@ -0,0 +1,5 @@
+DIST jebl-2013.02.18.tar.xz 306444 SHA256 b20a815980241b8e9c113f1b0fd08361f1bfb10b69ae3f471c8a8c62bed4060f SHA512 2f18ebbe30efbaab879a290a771a6e3d8fd1ba8afb6b8e0b3e9fb36252a4f65adf0929b77ef6922def61f9430ffcfc8486d822cd463f7ca6752418139d41aafb WHIRLPOOL b7687fc6a1975298e73d9bfc353a51a9197de514a72f72797ee8bf5c7926b28791acd790847414101d7bc0fc369cedb723f8f30e9485d3e90bd6a87ed8bcb088
+EBUILD jebl-2013.02.18.ebuild 683 SHA256 25c3a7d2ac6c754128d2c3003776602164244c997921d2aae852c40e44d54f92 SHA512 60f1e9eb39b5d5e2b96e726dd2788208a05c5ec5aeeab3e9b3195a70db87832d5dc5c39774dd0891b5af5825b1c0ae6451ca8ffbcb65fd99ed5f581ab23fe194 WHIRLPOOL aa0665d7a54ece98f7a591966a667eeabafd2138b03256c534b9c852d8dd1ae7ccd24e0f0b2e78fa92959fadace8a8500520523e6cc7834f45aa19ac7bb36b11
+MISC ChangeLog 3338 SHA256 ae94725629ef8085638d93da4247da8092bf8afafd6d82088e61f6c0c3428f11 SHA512 41e0bc9da5c60ed08491b9b2ce13ebc6b31ee3bf0085612f693165d2375c340982af576437115ff17b7ef8704c844c2d25dff0b6d3de683502bb21e84282e8a3 WHIRLPOOL 6c7aa22560b8e85786da564b6a0eaffd228c9d74c0f33f958ebc3b37439949c3fed93f0950aaa46cf8cf7ce3526b15e728fed493f361370755602e411aabcd4b
+MISC ChangeLog-2015 1120 SHA256 9dc627ab3c0ad14e5e97e130e22428372ad49fbe3650d9c0bdb22c59c82c7c13 SHA512 74eb15c5a787a90b2fc1dac2e29ada5aeede8ad2000a3c89c1f7dae8a65ea5e30396938abae80976815d9c939922be1e3d3c00cd0e1f37093dfc83f65d56f7ff WHIRLPOOL 4effe68abd8858dfada5be2cb22058371f82aa0b707fb1f4f34e4e9f64101f6d2889fb16221544103e567a2dae6a13c420597490770f8dac1f19c305e3af3c8e
+MISC metadata.xml 310 SHA256 46adee67ae11e0fa7a89cd1d1e8a4e1593dde23373526922928f9147bb016e44 SHA512 658351d53da5fe4c1409376f11154e1efbedf0563253af62356e7c63589973fcfc6c1fabd1d8951b2f40029b8da9e900b5dd5edc29d9f18d184f3bfb6aa35dbc WHIRLPOOL f8ca2649608745297f0dd9d15d5d6505ca8a0b2fda773aa5c77959501dee2be22251c6b7351baff4614e27f588b69844197c51ce4a9a8d7e5113665794fa24c2
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/Manifest b/dev-java/jempbox/Manifest
new file mode 100644
index 000000000000..108afdf83959
--- /dev/null
+++ b/dev-java/jempbox/Manifest
@@ -0,0 +1,8 @@
+AUX jempbox-1.7.1_maven-build.xml 10502 SHA256 de55ba873b5ca0dfa4e837ce13ba8faa5271e1ea33bd64c1d4dfedfd0acc24b1 SHA512 230436b03ddd8146f6aca41b26f54c0beba208eed9836aaf12e1326de75f226572e473e28c3d313c49a53266d3a827ee62097a49849d1782c546fe9e8bc1d269 WHIRLPOOL 7b566b3b4256c7399689d637a526b83c7308ea594fb600414e1206050e78d0892d8f09ef4fd81f4e84c58a72ef02ca426431d536a3126882563bf71880c7b381
+DIST pdfbox-1.7.1-src.zip 9167805 SHA256 805c6b893ff10216cc826aa44e7a2eaf35bb43ca8ed19896c43132d253d3145e SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0 WHIRLPOOL 438fcd6f2d0128b972dfd5be83b2bc455daf9f126ac5b7a6a5de8a41e29f482b462e8e48e07a21ac1e896de4daa5ffed2eee400ec96ac93fbbce25fef99b0ade
+DIST pdfbox-1.8.11-src.zip 11026359 SHA256 160a2d058325845234eaa6b5ae23535b9226aadb4e570a1a76f7106a00653b1b SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1 WHIRLPOOL 9f43dff9921283d074b332ef08a34b56d58fca3624b6c263029554998b0595bb8815ad91e31c7cdee17a95db0807cb88c579ec1b1f9ab724ded3f50382220880
+EBUILD jempbox-1.7.1.ebuild 874 SHA256 0d5778c3d3f5425a43f800680747cbe245fc55a5a7d0d3369a57ee87f2070569 SHA512 543459515df66a6315938c6a5fb7a9c4dfdbd7ab56de552bb84da1bb6f6ec5aa59dee390e3afb479b477cb79d2e011b9fe1787b16329fd7a283d1f3463d29857 WHIRLPOOL 315627aedd970d9630f546bfea6ea6640f61579a5f14fca7ad5832828cabeb8db13af6826fc3d2211e1bec15622b8125d47831a8884405636bc054fe9326aafe
+EBUILD jempbox-1.8.11.ebuild 1017 SHA256 efcb901c588fe6e1e9523e431026d579992ce34b1008020f4fe5ec0bc69cf2fe SHA512 7d31ea467b558f892ed798df1dd87bcd4d0f1a8869a3a8655162036bcafc8641c7f797edabffdf3be0d2382e6a96bac8a0d67f7e09dcfacb95f9a4a239081754 WHIRLPOOL 46fc9360882e6c51d676e61ba6efd3488050d18c494fd6d9ba187a1bb09172ee8895c2424640ce037f589b0db229600ae15cec312d8a4c78b2d765e7ab5d1e1e
+MISC ChangeLog 3775 SHA256 ca45da335dc1f68ad776145d6504d8e3be0addfb6020cac0e8780b7b8b0446c5 SHA512 047f1ccfd6124b09893ca7a21eff681a5a6c0903e12f0a906e1b50769c1bb6f700258cd233b5b0925c16b8930b02c79701e5a240c35b0e3ef492b3d6bc319b7a WHIRLPOOL e32b00aee1f9bc402234a9b6365c923ec560cd2b7e6be8520a3f12d625e6550cf0b5a58d4b94b6318190029abba7cd7a72b4059ba2d1cc36b070f90acb13f15c
+MISC ChangeLog-2015 1575 SHA256 84deb7ba09fb0ed1ef4b7cd777aa5193ac1b529336362017b3a5774583df20e1 SHA512 ca40ea29ad9da0f15bed0efd21a6f47179fae084cf0e72fcedd38df0cba26ae1c6899c95061b4ade7024bb9cfdb026f3241b70edecc55f348e69b2ceb7632472 WHIRLPOOL bd771aee89149eac34550e8abfed1a43160bdcd617ab8a4f82e41f2d60432809ac2a44241774b9a42c8f8ca058ec52f88c34fc747a33f044a42716ce60399966
+MISC metadata.xml 314 SHA256 150fdb05c7e8e64a88183a7199b5096c0b58d54bf0b5db3c272b6aa2e324595f SHA512 3b771fec64eb63ed8b1de377745aa069c22e8cae003bf4155729ab8cb5c6a1ed5ca70cb977de152bfc926c2c4f6e94db6efc6498091736e0aa5304675b5019e7 WHIRLPOOL 9239794ae58353f284a8bce5657723177121aadb258be3f86a1f76ec70b881606d6140f3cef3a6c3bc5e97c6e189464b46179fe99f9f7c3bd37208f46aea6df9
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/Manifest b/dev-java/jettison/Manifest
new file mode 100644
index 000000000000..26acc001c204
--- /dev/null
+++ b/dev-java/jettison/Manifest
@@ -0,0 +1,5 @@
+DIST jettison-1.3.7.tar.gz 63200 SHA256 0fdf66e0607cc3ea130b4072d4f2b03dfa6e71248069c5232fea6deebb77b065 SHA512 c669d0c1c4605c683d1d726ea7eea0f0079cd5fdddc40f4bc4e08b20b7ef7df414f4b2265fd91e1c34e30809c78f9e8690382c51a1ba6653a6fd688b22c07cd4 WHIRLPOOL 638fe310d82cbc2daa3e655e0c3ac7e4ac912e7827d94fac8ba93da8ba231d18b53afc86a39896c724bfd16142c714bfd4e4ed8044a3bf624d4737ad1715cb03
+EBUILD jettison-1.3.7.ebuild 942 SHA256 f734ea6f604d0652ca71e2a5150823d06e201bb6c16bc13d4ac4297895a12379 SHA512 09604f1cad60d54a76e01d6a8fcb601cd47ae4d42fd28c721af30917c34929ac5e5d148852da9284757cda4224be2193d8fbccf9bc732e9a0baa6bd67b634cf1 WHIRLPOOL 9d014c09540beaf528150a8c796e557f812acde4888836dbef2b2ba9ea7529b121d1c58442c28bc749f2e4f61a41f8bbc162e558b4bdb0fbe68c186e56247864
+MISC ChangeLog 3895 SHA256 79bef393b0db993ef9e154fe23c6479c64897939bfbee3d1aa859421c3a5e11a SHA512 8307d823bedefd2ef4591638f2e135f2535b598ac088d49e0dfdafbe935b2ce05e9aebec8dd96bb3eebfcb93036506d81530bd121805f46c8e59e9195e85ef7c WHIRLPOOL a4a395f168f032b241bdbfc5e6632defe41af89689fb0e7e02670ee2635459fe5111a6f74f7296bc2380178cfd51a04f33679321fc54e30038f5e4b6c8456ddf
+MISC ChangeLog-2015 1434 SHA256 c91aec6723423f4b39bd7b810d0b2b02d187c60ab351bfdfd300d9d88cbbc1cd SHA512 268c20c2ceca08154c30764af078305683a136b9375d3c4c3feab56eb6e43cdf103199f9030fe1e1dc87d69323e07848f776a3c55c83ffd1d451801ab0e6f877 WHIRLPOOL 9a0b40fea62027d6c9757d4e17677d5182dd96ab5df619a9338dad4fddeeb50c87f2b977aff32470f453a5f77e878bf71b187788e28c5beba6dbe6238e9353af
+MISC metadata.xml 829 SHA256 39bfa5fdb44e743cd34c751dca39369f73e276be91ea8258de9b4efd96622bba SHA512 56c56cc4f3cb22c45c83f8e4819310100f435f498df5082b827688aa6d2fd0402df1226c5d7616236805dc602817ed9e990df8b847e2d67275379d9c6ee51205 WHIRLPOOL 44f0c415ef1303875e10878fc4c3e4d1b19ae97042ecfc250ef69a8eebfa60b184f98c22ccd4acd21ba13f957fca00c80226f525d4eb8bf85386e40f29cf8799
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..132fb4280d1b
--- /dev/null
+++ b/dev-java/jettison/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>mike@weisso.com</email>
+		<name>Mike Weissman</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 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/Manifest b/dev-java/jetty-alpn-api/Manifest
new file mode 100644
index 000000000000..866c8aa37b7c
--- /dev/null
+++ b/dev-java/jetty-alpn-api/Manifest
@@ -0,0 +1,4 @@
+DIST alpn-api-1.1.2.v20150522.tar.gz 4246 SHA256 d6cb4ca709fee42a0f551447fbefcf66a483c78487923e671c6c553b57f3bb96 SHA512 5c7cedf80bf7b3e27fe365df2fb1a2b0f4eb5d94416f54565c960036c73a79aaee50fb7d00a0a856f2808be7dafa921b8ad89772101ff7bd97fe452a0e395e79 WHIRLPOOL b05a44bf094bd3f87699c8577ddf14e1942145464fce4caaf19a6bb7766d35851605303b25eb3caad98c0f1767fb142166e019fbe2990524c67b577b34a1b85a
+EBUILD jetty-alpn-api-1.1.2.ebuild 608 SHA256 57be25d571cb4afe4b9b5e072a6b77349858ae5b9f266524a9c8115f4aaba9da SHA512 1a15814152bf068dd1773d8e4493167ffe9da0824efd57eaa2955ea383d4276f1938a7e915ce1a14365c8003958382c6e74837e640032d9ca3f8dc7f481270fd WHIRLPOOL 581c647d277fd2b7595cc3b1888853b2abd1d98cf297c04bcb5b2c682bb80a7e3388b6379c5232031eb7efd572b0c1abbb9587038ac3bbdb3d096cd35697762d
+MISC ChangeLog 398 SHA256 aee8b6c99cf4d96a9172a40cda8d87445a91801613745f6356ada0d56ad7d7ca SHA512 1912bd64d34e2a5f0b42aac0a5121c7dabd26ad3741e7316fa467738af2c0ad101e66e353326124cbe74f137ff0a072730fb9d29d5d2557a7e42460656b195fc WHIRLPOOL 29919e246c32194a140f00b7622703a8d5adbe014565e9aca3be99af4173a7268c60bd8cb1e8ed11aaa19f29bdeaae0d0753970052627f858aeb90f3046dbe26
+MISC metadata.xml 1025 SHA256 f20f241b28f52d7857f8e256260d33b37f0dcd927015e8957aa1708ffc25851c SHA512 1bb04f6c262f4b95c6d8e0d48e46712cc7f11014db5991fc865926a5f03fa487567c08f38bbb39db66a519aad4ecd48a3128264894bbac04a4d48c06a59fe8a4 WHIRLPOOL 7c5b0618d934fb809ed965377cbee73a802233dbba9190e1c4f2f94b776c1b76c70cfbbbcefaf0d68d16c6db64748d5788f960e4216aa03025741ab86ed8044a
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..d0ea9f190876
--- /dev/null
+++ b/dev-java/jetty-alpn-api/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>
+	<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/Manifest b/dev-java/jetty-npn-api/Manifest
new file mode 100644
index 000000000000..d827da9d6ff6
--- /dev/null
+++ b/dev-java/jetty-npn-api/Manifest
@@ -0,0 +1,4 @@
+DIST npn-api-1.1.1.v20141010-sources.jar 3078 SHA256 0d9ec6fcde094ff785522fc403576e338b29207f4266155398c91defb1a26455 SHA512 8ae7847dfae1e2f0561f976ed887eeadcf62594c88df6400a79cd5f02b877e83016ade6f93153a9c31eb2ba41ea436c1c4faa960713f72c0d2bfa818c96cc13b WHIRLPOOL db15844781896fdf93e54fc6db302fb20c48e171367e2132dfba82e41301e8a665b78f270a5ee6626f2c98ef257caa7b120cf7c377f799b2f7105fb4183b63a7
+EBUILD jetty-npn-api-1.1.1.ebuild 551 SHA256 10d96288592cb99bddaac8557e3c74503c5054a3fbf21b53f3a6c08380d6a8bb SHA512 e223b56b00565ce7db96e0fc1f8e4ab871430336396c204f06d68c9bbee653ddf79d635772e008e85a564e4d492efb8c8672d465a7dfd3870ec873c75d34c3d5 WHIRLPOOL 871b653647830f19f59231168746698280abab70cd3e2cb81b91d19993c425f780848447744393ac7621b84f3ea4126e34b6fb941b298e3340c733256d62648c
+MISC ChangeLog 488 SHA256 c26bd32332985c3d44040c53e40b8c631a4d8efaae95989b032b1ae717eff8df SHA512 4a96cf64ee1d1c439837b5deaf34da4971f8f5730899d7cd64a261daf3347684d7e9e837fe590e727c0c9d662261ef6ac8cbe486509671a507806d5ec2903b89 WHIRLPOOL e1d4c65f0d1840e418ced936989db8591865f0f835d64b6248a58e87c7c43748e4533dbfefe7ecf4b02382ddea5aa01bd1deab1710846da8b3d787957a41d0fe
+MISC metadata.xml 845 SHA256 95efa64272448b391bf068406f2b1cb690fa04869c4909e059fa86000336c74b SHA512 e54631d9c51269e9d669202cedde5f104cfb3cd3a1cc40ff7d5103277106aa4a196f8bc2c8c1247ecfd615d0963e6b360dd80f2ad3d5ad134d8fbe9a8b07804b WHIRLPOOL 4450a918fe0455d7ffb023355f78d71cc64c2a85157e63b9f5bca2adbebb476bcc9219752208e5e813599be1670579eab7467ca69dce235fa1f0d69c4d140fac
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..6aaf1c0d7d08
--- /dev/null
+++ b/dev-java/jetty-npn-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 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/Manifest b/dev-java/jexcelapi/Manifest
new file mode 100644
index 000000000000..b13ee8df469b
--- /dev/null
+++ b/dev-java/jexcelapi/Manifest
@@ -0,0 +1,5 @@
+DIST jexcelapi-2.6.8.tar.gz 1925926 SHA256 12f05e4453c203b91329a65329b564e86aaa77a005101f876c4de7b648c36034 SHA512 c649dcff8647530ca719f3e546d45ac585fed46d0a220763848f6d97b3f42c871b6520aee3575202598c7aba3391f647690075b6d9d52d1c2920817ff69548c1 WHIRLPOOL 24d60ad81961b224c6d63267ee4cb4432bca5bb89c1462797dc96dce4f7fb6403741c34819c78a36312a1df9f0fce756c1d026b1672c751fc8b3a42cc9f0e3c7
+EBUILD jexcelapi-2.6.8-r2.ebuild 831 SHA256 49412c5e7aa0af9730d9274edc9f6cba311b3863754cfc533df79e463a2e7cab SHA512 114772ccf3ad6806115123fcd66de70ce14a291482d4a7729c5357565e82ab46b3ee46742e8a930558793e108a075b07229e01a47492d1b91427b209f21a2bd7 WHIRLPOOL 46c518b2fe368c23709e6d473fc9f0adb68ced268026d7596621783e0df6e830a0a7f11991300a9a12dcc47508584b64c50f9bfc183f596f09562cb7f2b9af7a
+MISC ChangeLog 3245 SHA256 fb41c7286d6d48c3480ab9f62724a0ff61a87961d3b852aa220ead4f22ba67f2 SHA512 3ee4d5d75f03a59ba26d33301b2cda28c335fa9f41c76d9948cbea85cacac63f75684f7618db324fe59059ba4a81968ba73b1cc21e4846a55bb9dfdd1d427822 WHIRLPOOL 3aec892dcee96b4adbedc303437f52cda85e486783f72ea2da85ce3ccc4382d9aec3f9ccb03281c2ddfec34ff0e72a3a484d113522e86b24ac504169f7c4f108
+MISC ChangeLog-2015 3160 SHA256 473b344d2c2ea5cb8d6c2c2d4bcadf5ab639a5130848e7c7066092dd541bcce8 SHA512 65333702930385ea5c219bad97305692e49ce1b22a3f4230021b75da8b8dc945dca53ac6309834618d4decd1452da2a91b5eb6ac9502905eb2c61aa45761911b WHIRLPOOL 2f3c0afd235167fff6b9711347b555e2db748544b80c5d0006a59ef956a5945943563e5209b9049a5aca1e5812b2add0d20741d357fd1d852a9473168e7bf183
+MISC metadata.xml 668 SHA256 5f534616c51683b68d39bf7ac72e443befb33d6a2fe2d953072c56cbdf3974ff SHA512 37560219e338352fcfa1b1f0335735168206b9258e4ce8ede92e86ea249db24073ea0e8f7bb9e75d6345cc9cd8b58390d25f4e549535f96e4896b8f83673713e WHIRLPOOL 609983e2159980561191791757d2cffedf70dffe04ffc58e9d2b5d7f41500e7aab41ea6b44753ec89e58771cb37538b5d61ca235e8a6e290f6a64c108e0230ff
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..cbb59f0a0e7e
--- /dev/null
+++ b/dev-java/jexcelapi/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>
+
+ 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/Manifest b/dev-java/jffi/Manifest
new file mode 100644
index 000000000000..22a0df94d0f2
--- /dev/null
+++ b/dev-java/jffi/Manifest
@@ -0,0 +1,8 @@
+AUX jffi-1.2.8-junit-4.11.patch 700 SHA256 db896154d8f55aae69f564a908ca1ea79c96af44f561bd2a1cc47a99226fef4a SHA512 9cc2d41665ec3c2271d6c1c2e66dbfb506922a290e906df51fa66c61c918e1835dcb93313077fac92a8a622f132dfee08cf3b79ebce0be3a4b104c1cbcda5ea9 WHIRLPOOL 910bfba3cc1164bc2f7197195dfb9d739e32eb406185e8027f9d47a3e3cf6759fadac01b8cdfb0127d74ffd0f487280d5dacc360a81595f3aa5e93414197081b
+AUX jffi-1.2.8-makefile.patch 1443 SHA256 377dd2eed51f174041a2270877dd35352b0d4d7b5898a967f5d8bbaed908bdee SHA512 02f28b00e1ca6d16046c5f25c38268f78a41b5b202c4f284e8dac10dc245ad150f4639849c0af8c20f50dc3e7cf715bee6dfd2f1edc48496f822d78aaef01b39 WHIRLPOOL bedaa91b31190f703385654fb4211c7a01634fd019d96b7f11359df73e74975fc98004808a870c6b00e9182bf76c47565f52495fef6009d7a4ad9f6dd2008ad0
+AUX jffi_maven-build.xml 11287 SHA256 fa81bee544d5304731268fd807c5176ffeca6d50c0882aebd2d9510118782a0b SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7 WHIRLPOOL 42f50c85cad6673cff32b41593c3b30c5193b1ce204a1df6a97d68d70ee6a6cd61f2b6d887bc36002e516849d91139fa1254a76b8951e839a483865e875964a5
+DIST jffi-1.2.9.tar.gz 1952668 SHA256 1cb854a913d295cb9a41cdb1349f68efe3c5d750b3135a1fa07a365d6806f5ef SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4 WHIRLPOOL 79ed9433b2b475fd9f5ae228e54bef1d637c9cdac97e63bb16f5510933707c968a0989e6eb7f09a9a79f06bb725ab5267c2373657da1daddbbbe3b093479de3b
+EBUILD jffi-1.2.9.ebuild 3133 SHA256 7af121b1ad4c977ec17ba2bc30ee6f131b105528e6f18c0ef4b3e948c0d79a41 SHA512 d19837738e4db90dc762ea76e6e067e6270d6d11d8f50d72c52c18c542cac2a07bda089935fccd1c0392eff1b056097e5d3a1bf18e10a08de8bd0ced188bdd2b WHIRLPOOL ada80b99174ea877bb41882f5693d18a5f6e882276f20975c7fb8d30d570b32810d48bc4dc98fe47b6c90d47672df3c3bac575e54864b8bbebb4caa0290ec12e
+MISC ChangeLog 5693 SHA256 3dc2b871d1fe672571a86d74be644a9bbe4ba7d5bae3f667c80521baa931c299 SHA512 7ef2bb6a574d9a7987f3811edcb4cb1be7a10f2264a8e2f413a020cae53fdae099798567b0236f4ac3a7f6b663fba499ad90adfc4f1c2b1908ca8c6e61091ac3 WHIRLPOOL 7f157efa2571d90631e81a82f0306237574b8974000120ed1788b75187a5132df9efea6de88a763d7570f13fc5563f834f23432a382d250cfa7c873e0d156336
+MISC ChangeLog-2015 7331 SHA256 d157793bf471cf9a68b7a795452bc1a7f5e3e8b78f3b295b1c20ad2371987de6 SHA512 305bf9ee59d090d0555a03374771d7c6e2efb1080bd086da46dd5cc47408791efab1446b14ec54156a72c29f03272e6649ff960f1677cab9f1847da06304d80f WHIRLPOOL ea99e75ee7251702794f796c3f2e2c861dfc1f6b664975a8421a2065acb497a5dd30bf097f84cf9223638ecadb7986e32434dfcd6447c14d17bc55880c62a224
+MISC metadata.xml 319 SHA256 aaaaa72e37a86293e5acaf63ea5dfc76d1ddeb0d9d138ddd9da236db08a2ed38 SHA512 ed411e700c518b64ce76a437771c3a4779ebf47207d839924220ae6174ab7fd9cde92cd347c93b1916849cc2fb7fd4a5e5c29911420bc3485cb2916034d3f71b WHIRLPOOL 367a3a9783937080d317f1a8dcf72d7867085a03847f6f216db55f107e850121c48d7c9fcc3c76e51cb7a60147259a671d71d8d8a5d7e5f53d5d6ca813e6bd33
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/Manifest b/dev-java/jflex/Manifest
new file mode 100644
index 000000000000..05aee61a80fe
--- /dev/null
+++ b/dev-java/jflex/Manifest
@@ -0,0 +1,6 @@
+AUX icedtea-arm.patch 710 SHA256 b3d588f1f9906a75b2c7a730ada19aecc23169a21d951fd415e640b977fa0099 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6 WHIRLPOOL 83fcca1bfd1c5f8f9b89cba83030312609c777a27d321301a5ac0a371d5ef678ef199206ce652841de2bc8a1735f27cb4c21c3dce06a7390ea88ee10f330246e
+DIST jflex-1.6.1.tar.gz 3027791 SHA256 9879fb4ea7b286af3c3439cf148f5739dfa722edbd978f2f798268b2e016f8c0 SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b WHIRLPOOL 27e2769b1b1dc720cee71718eca024905fd9e200c53771c2db293471b0190d9a3c9d2245fbbc5ab76a1f22e1496053d35d625a34c09819b1e367f78840152666
+EBUILD jflex-1.6.1.ebuild 3548 SHA256 ee139795063e11f2e616322461762c782362554d97f89c474e11979c941a7ac2 SHA512 cb21aefd34f42052dc666747ed7aa397d2e0c7f97683db135274838ec45f0887e15b69b18dd8b8da3ec91998d6642818c37566f374c185bb03f84fd8e482b4c7 WHIRLPOOL ec200b5fec4c1d7288ed7c79ff3903da641b19d37f4e7e2a6004a2c07c672c2781870251161e179e187950ec3db55700dbe13ec2750a5c0a957a9be0126f9e19
+MISC ChangeLog 5814 SHA256 d27f0e9c3319655842a6b5aa622178b32920900c4b5abe7a471be160157ef22d SHA512 792c9113ba384ccee8bc5685e23cd61a896649842828f063a3d051676087645c473b3d3e65ae04416f6a388761afb9b1611f74dbc3e7d254cd051ca90620fb6f WHIRLPOOL bc15817208631d611c6355a68833c9cae937c0a5a4a6dc5871bf5c63474e13ced5e469375568206b898d0a3aad76f3377195441a271d071157fb749cdc449885
+MISC ChangeLog-2015 3651 SHA256 6aec9e999bf54155d66ecf1c09b4faf1200f7b32221f9625ad575bf3a8a340b6 SHA512 7c7f5254603ae88ccced92bf54c76643b3888707c88395eef739c71225509f84d1b8f6f6f1c5ee5b5f77a897c5993069eb0687c181b00a1491e9669dd682a00a WHIRLPOOL beacb1486b91c1136353ef7c58758a4b38a63f564d51802e9b656474b5d172b6cc3a5815003e6ffa0295c8be668ad987bb586daaa0a8483cfc5433738067a7a5
+MISC metadata.xml 365 SHA256 4a7143211c51874add1713c29b122c94e4b70135d578ef3d22f5d0ce7eb4eebf SHA512 cb20e2901f90975ffa7722c69edbc884b0f6ebc7500636e6ea41668754e8d8dd4732a71774dbb74a7d38240b2fbd6c1941adfc092fe83154e1ee70f6ab89e379 WHIRLPOOL afbb589cd83ad96b92bf14ffff4d60a8e1e3ddeaab12a2d067390c41dc28fa25ce1dc9feb21da9f17398707e0b77a744b670da9b98fb5051098a6f70abff83f3
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..a9b7189a0559
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -0,0 +1,120 @@
+# 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="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 ~amd64-fbsd ~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/Manifest b/dev-java/jformatstring/Manifest
new file mode 100644
index 000000000000..361515c71a8b
--- /dev/null
+++ b/dev-java/jformatstring/Manifest
@@ -0,0 +1,5 @@
+DIST findbugs-3.0.1-source.zip 9625065 SHA256 bd8ec66550d419ed40283bd78a6268f9af57dcad20b732a9309fd1835abd33ff SHA512 d967769f2356f28b34d92c7451cf3e2ac004e667bfc3b049b5b10b1c19d7be2cfa0db132a77698d042300330f77a2bb5dd8c4baa0d67c37b7e5ae6da9e83a64f WHIRLPOOL 9e407cb5733560d6a548da37becdf1b1b120459a2453d85d4a345a7ff30a3ba1d92179a2586ebfac3c23c6d20f591aed6429b501d6ec791f4b1a390ab77ce387
+EBUILD jformatstring-2.0.3.ebuild 742 SHA256 ad0d1e6a2742746a1abb4ba7afbaf35ebdee125b5af0372c9844533b6cd60a8e SHA512 e8bad5064a97d7306b5197bad4a00308c6da9a72360660b505fc4f828abcb0bcb801bd3be00f2ba2d5d5283760d5ef17514da7ec56d8a839d555603960042e5a WHIRLPOOL e0087a59475f4bf0e7074c84f9030a49ef42fb89537ea9bed3d3fb0057fc04e839a3754b4b888ad5b6a1675555bbf52201b7723db3e2c966950239c6e203599a
+MISC ChangeLog 2750 SHA256 917080c4d2cb68d9dc50d1f149a5594220a58740f810287406cb4f88be75fb7f SHA512 32eb6be25e420b2c6fcefc4c2c3b72100260d9de6522fcc0df90891393fa07d61a753fb3a14c12e9ca6f233cc66ad03378fa90cde788e188cf89a84af3fd1c7b WHIRLPOOL ddcdc6fd234a3969289ed77984111fcc77aaf1bfc31276394a348d8705d977ad3872e63b4129cb20b27d10978acb67fb13973007c5b253dd5cd5c798e7fc6a7e
+MISC ChangeLog-2015 1287 SHA256 48a0bc27c7580cd89eadcd0e3c11574ba25cd73af76c7b32181abc8761293346 SHA512 55be35331270f8dc373be8f94739393f257fe2ba2331fc7d69932485b0f3c0daad8f2aae14120210a6b089a3fea18730236e5926aeb75421e3db2bca923f8b6e WHIRLPOOL 7ab99a02e4e5ea00e4e2ea99d658a68cc94dc85668193ee9fd14ff6516141445d6e028b35256b8cc48a4add86029c4d17f2914eaa1f8ef37f56135f62359ec99
+MISC metadata.xml 565 SHA256 dfcb0128c63995db6b6a731e5307d71bc23dc93116d5f7f3cd2c97b5a8b4e44b SHA512 7e8464b49caa095274ccb367f36b78267accaff8af30b88148cb5f91b32e84b28069445c3fc84338b9276308ff487662f070e8f9f82d167f586f264ac0a31501 WHIRLPOOL 8a75debc2a3f7803ea71976f75f5143a0434f84faf113de0685c5d549ad8d8f016ac3f77128f1bc157376509eca38c55bae49e6ce065868ecbf81846cf4433cb
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/Manifest b/dev-java/jfreechart/Manifest
new file mode 100644
index 000000000000..f3cb3e7b77df
--- /dev/null
+++ b/dev-java/jfreechart/Manifest
@@ -0,0 +1,7 @@
+AUX jfreechart-1.0.19-build.xml.patch 1017 SHA256 4506fb16f04f78cd297b4f377c364b3c8c50a0d00cc511839a7dd972378fc3a3 SHA512 e48ce320ea75e95ba099bc39b98b32841925128fbbcf3790496030df7270b671a2b0cb681db017e7c7d3eb73269911f6ec51d6c18b0813af7e86acb194be736a WHIRLPOOL a20a43474326a7349c4130cd219753d0d06126b9811d9e25f2b3c7e12f8d63e9d3722fc9650c7755107ba1c61648ed1948fad8916ba7c20dab95ce02229b0ea5
+AUX jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch 1155 SHA256 8e857a1673b31efe737e1eaf1fa80871eae0a0861226acb73a1056106110380b SHA512 013941c364512e576ba10f3227b4d5ea57c31fcb22290a62b9bdcfeb3636b638f7be7653399bab026c69dc456cb66eb13b03d6cb580aaf5d4e1212a2640a3cad WHIRLPOOL 5c79e8431d645cac3c84c465fe944c266b32a1c5a6fe9c5f21cb0726b0db93ba0a25fa74f6eb4eda5c8393ca82b6af9c06bc65b5490bf9949b7d262b12d4b5e6
+DIST jfreechart-1.0.19.zip 8050676 SHA256 bfe8d38fd48250dc04a3ff1aff477f2d226f49ba1ec2732ded981a3fccfc66f2 SHA512 6345e6a6b4a82862f3908794efb70a6f5413f313ba5bcff1dfb713d21948034d80c743a0cea61be81921c62736b07209ed4b942fedca0c76226b1202a4596b31 WHIRLPOOL 69a5d4c1851fd613a70cdc49904671f22cd7edd25b956c67cdcda5f5960228bfa0932907f0f4432685d4310851ffcd4e1e7283d2f2187a06666b296e84606cc0
+EBUILD jfreechart-1.0.19-r1.ebuild 1360 SHA256 4fc33316563b0d0062de4c038f9502ac4a44258b30b3877844c738a687d4c5bd SHA512 90b7ccd6c7b58d13e8622501d5b3bb4111d202ea064fc1deefabe8a9e7d70086f232fb0975652e0f1d5d06756d8117f867aa9a700af1b60809aa7569a7237104 WHIRLPOOL e9fe30168167fa2c66f9d092bfb61295fb83b719d54fc59913c0460927a4f308d23a114cabd06d821705678a8237b92f151ddff73beca4e35bc5859710e609d4
+MISC ChangeLog 4381 SHA256 7e5bdf87ed635de30077d8bf7ee9931a5b6cffccc749f12f4222ba71db3db16f SHA512 3778ba87d00c8102a2a383a79b1985279a4de4a9ee862f34de5e270b50f29617e27f5528be461fe9b74de4de7db01f6d757f6338e0934694d5efa790f45adc9e WHIRLPOOL d347d80bd73bb6530b50d15e558654e91ab598c6c2a65e38bc3341a8ed1876f2394b6aabf708549a359d187f6f4d6a6841c94b55ec8645d006c72b29671878e2
+MISC ChangeLog-2015 8477 SHA256 816d5058a4dbf4824054af7dfa24d6c298a2367eafed91e553ad42927b883eb0 SHA512 529e82be4a21045e95c6189411327f4c4702e493acfe703268eb4d964d4477aa4e39e8d6ceb8b7f2512e10d0ce362e954f25a663b0ed04bc77886a997da7c429 WHIRLPOOL 3f38d9f161ef2f37ff5367ffd52edc6f657e5609bb735b3c2476f73a4c928d762adda44f8c7603aa59f7d45f0e997a0728ab86679282d188fa05dd3f6e54de90
+MISC metadata.xml 316 SHA256 ddad70919a977de5f5a7a240d941e934e6e1ed2c33fe5cf06a666d86cffc5452 SHA512 23acc79c59e65a77790ff6b915c2727b53352e6c989aaa5d5936cc1a09fea10c15dc35e5133ef142da97af85770b44c3b33e28cefc4437de86afa5f3b3cf90fd WHIRLPOOL 21b446a34a33c1e28c958dca612b46fea8959c5ff7e0545a2e4b14463e0d35cfd630b04bbecc2ddc0779f161b4be4f50cde090520653120f4ff5a141ce350074
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/Manifest b/dev-java/jfreesvg/Manifest
new file mode 100644
index 000000000000..9ac974a7d10b
--- /dev/null
+++ b/dev-java/jfreesvg/Manifest
@@ -0,0 +1,7 @@
+DIST jfreesvg-2.1.zip 2042545 SHA256 51601035bd7d35c16c2bb7ffafa38e94ffa57f52c7df37a9a7f53e773a89be46 SHA512 6c1556c640e749778aeb969540db7724895fe2113a7ceea732793730301dd04a1beafef35249b27b75696271bcd67a59236a15c106f7717482561011a1a08bc4 WHIRLPOOL b4e6e4c527822ed6729910059b480a3213e7c3b11f34b55c197793e84f3e9de54986fc2480f03f353ad019935fd927e4d57b61c55c01128a8b93545e5653b10c
+DIST jfreesvg-3.0.zip 1946062 SHA256 b7045b95ef51ef68b3c48308b72d5aee666a02606ace938bd1e54e3eca4502d0 SHA512 7d0bdcbf56f0a7110058137d53e291c41e53040cbc19442989a0c6d28f5d6d3ed26ecedbfc947ce845b8a971729e2d784e8ce5a041f6f095ff626a3494a55715 WHIRLPOOL e179d71b71ca25171f58baf729e89e0cea9a6ebd9ea7c723ee6391fdb2fa2c59a4aef73d4d42e49335b53b78cdd4b3813ac9c3aef990ac8ce7881f8b666ee957
+EBUILD jfreesvg-2.1-r1.ebuild 857 SHA256 9379d7ce91e37a9fe7523bafdc9224bfba44abb7a42f4360b3380fa7990c76c6 SHA512 f1008bff54e47306623df1a972085adff1b95872192587a5aa361b8cc4f6d2a387cfc1e0c5d7864368ef2bbaf07d1413cabe4ed8d91ef893ed8f446997cb521b WHIRLPOOL 2de0159721e0f6e3464cff7c31ab9d4e2deb9005ca3994e64a0355af501e580c8ced46060b15bc580ce72f53e5e724ac194b50664ac68861a41a8d803564c898
+EBUILD jfreesvg-3.0.ebuild 891 SHA256 49d9b16bddc9572ff7230d1a2280b7ed61c3b3e401394980bb66a45ec87341e2 SHA512 23bd9825d7b44024c7218dee3761ea0fae08a8b0c6fb2834d9da2bbdb852573a6248852ede1f38194ac01710055dfba4d66adbb57c57822bc85440b1d5f8eaff WHIRLPOOL 246c759279f4aa44e7dbaf2ff36ddd9dfd2b60ab7497de0a6f9c053f20df5008b52e97d4f9479b03f9655357bc474d34c1a797e5f945829230b2482a4c75e940
+MISC ChangeLog 3575 SHA256 e04bdce2814deb50a75c6c3f5acf4264de87c1452db9fa7af171316d2390a39e SHA512 ada514cdffc73ccc77d66071a22ab050cac516c50a61e1078f6495d22e7eb7393422ee1cb79d980073f49571751cf2dbfe4667fa433f13f389752b90a1aaebc6 WHIRLPOOL c595f8bb1d9c53a8c08acea6f2e6e98e3beca2fdd1df8c6891566ef28e5db84bb7b18d8b1579817aa2b9f0c84be1140fcbe0e9d191ab0f0105fb02edade13144
+MISC ChangeLog-2015 551 SHA256 278a8fab0b3b1605accb61b9bca49ae68ba59d06b09e91375506cb6119f60bf5 SHA512 18410e29d32c0db1d92d7561b3a550dbe5da27dd1d7c31ff6b1b91d938fb02f773c7df5e6b9664dbbf73a2926035b245d9a3c1ee5fd2238752b9ce2f96aa9667 WHIRLPOOL 610211b298a0bb9985d5f981bb3780739d3fe9b725861547b860f89d6e8947ace319d5c968bb351a4d388f7fb894f6f791b601ee843d8bb6d072509b568701e4
+MISC metadata.xml 489 SHA256 21d83254fd33f400b6d951882b1f3119e8cfcf5f2c80f8fda9bc2992cc0a170d SHA512 67cac1aaa899e86b2c6a0f1222199116c2d0bbf6872d7c794572840248ffc24ac5bd04f1e02f8a500ae43fdf229d999cc470eafbc07dfc55f6fa45d5c77b6310 WHIRLPOOL e6c8d9c87bf70f02351b6fb511d49fa108af85d7e19727e6c183916c8c027acba4b10136bcfce371151fa2b872ca07b35df8934fb1e19694109a28087c1f517d
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/Manifest b/dev-java/jgoodies-animation/Manifest
new file mode 100644
index 000000000000..95277a3f1678
--- /dev/null
+++ b/dev-java/jgoodies-animation/Manifest
@@ -0,0 +1,6 @@
+DIST animation-1_2_0.zip 728028 SHA256 a981ee7e9028158b77a10be4f748bfeb3b486dfcdf1e6abf2f4b3da94ee765b3 SHA512 2220630d7fd70a98b6d9605de7a1d6fc3470cc19b39815b9777e6bc8cf7db74ce77338861dde45aafbe336ce8b48ee00bcd8149af701a7001869cd3da3cf6a72 WHIRLPOOL 3e42585c5f31b7f6db5faba70bd19147a16cb061a4965f1b8746a79c74ce1553ecde98378a255e8d33d78b8b033789f448df23f881025c262cc082916b50a3fb
+EBUILD jgoodies-animation-1.2.0-r1.ebuild 1087 SHA256 18da6e1decce6ca25286dec2f32974ee3556c7adf3db60cf49afa749548ffe05 SHA512 aeb3018c5e45def60b6a19a9045310a74d121eb5d3a2b0022236fba55b76d2af5e14caf06e7e658c166aa5fbd2b5a76ca3454835ee481c33e440a58d868a5532 WHIRLPOOL 460d98764ac1dc24f5278e32965b9c6dc3076ae9402822f2a3d3d32887c3919d66e8cf79fd255d633dc55935a659186a99f96b5fff5987a8e8059903c6f7880c
+EBUILD jgoodies-animation-1.2.0.ebuild 1369 SHA256 00cce012c6f3ed7c000566d358ba49606977dc95ce594b4c4d9bbf9b67d59cc2 SHA512 8a37c8dd7a2c3c83553a411dcac7a9445674eb846837dd92bef8daa6f481ae1cdb85f5048cbebd113c7b44e1cb45657a0c9bc7ac27ad6f0b15175596d8d6d32e WHIRLPOOL 2f017b42378638fc6051845dfb74f9fb7c791bf50ea21739547b37c1fe7372e6d4ffbd4bd52c0fe67f05e185334da0a71479f2fb6b4e78282ac7cee02b91500e
+MISC ChangeLog 3122 SHA256 36d5a51b3792d542e981e81fc3f7145372e4a3eed65d11a927e49eadfdeeec3f SHA512 f8738dff191dd9ea3550de613713bef10bbefdd1f09eecfe4c83000a6f0200dd75309b861b068e71514937e4d3c7d1ccf854b94a22806ad0728582eda9ae92b3 WHIRLPOOL 62edf24993e13d6f680ea49debc2ba1b38258591c9c70b7a29281965b5005234487fa983c50584d1c014f14e2d86c0c5512a983709ddbdcfd8be4ca25b9c3162
+MISC ChangeLog-2015 2224 SHA256 65a59e4f3a10712c74e97ba55eb89d77f27a7201e3771a920c5d2c87c2880a8d SHA512 0424b24a221efe4579aa491333a4534c990532ff76b15664e5d734e1d9ef1ac566aeb419115a21a115a2121059ae56f450f6e7fd9b2206cda82efd23df32ccc6 WHIRLPOOL 85238f6b97122a01e36ba07764baee96e34567d5317fdbdf0351e041d4220f78a9ed52484f4dd4367eb223fbcd6c4ed38aaea8b01da2ffc3192255cb45b1bca7
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..da08207d8668
--- /dev/null
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/dev-java/jgoodies-binding/Manifest
new file mode 100644
index 000000000000..8f6a21807003
--- /dev/null
+++ b/dev-java/jgoodies-binding/Manifest
@@ -0,0 +1,8 @@
+DIST binding-1_1_2.zip 1265099 SHA256 dcefcf854c9cfad7281ba86f767191ab657a0e34afe83075c96925fb44cf2958 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7 WHIRLPOOL 9660c62af445d28632c31a2fc0d7266d9bbbb8dcecb9080d63d2bbefc750d7501468dc8759c887c3019371595267af7b955717c6d13e2bce118be1c2c6358e1d
+DIST jgoodies-binding-1.1.2.zip 1265099 SHA256 dcefcf854c9cfad7281ba86f767191ab657a0e34afe83075c96925fb44cf2958 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7 WHIRLPOOL 9660c62af445d28632c31a2fc0d7266d9bbbb8dcecb9080d63d2bbefc750d7501468dc8759c887c3019371595267af7b955717c6d13e2bce118be1c2c6358e1d
+EBUILD jgoodies-binding-1.1.2-r1.ebuild 939 SHA256 9e28fa93db3f559a5ec593f966eb732424644f3cd6dae5f2381f597df0919872 SHA512 1dcf0acc99204a24da3979d2dc6cd5bd4d6127fc9ee976520a51d4ffb1ab58b70c079d81cd4036f510f46f0f5012afd92bd9d9d037f4804e13d881f67670dfd6 WHIRLPOOL bc9b1a30f69943eefaa9134a865d528abe1753f5a72a8031e61f3a0b7205a14a414295fb043a865c027c9689203f057a382bbb85e4908c4f8db6d72a94355419
+EBUILD jgoodies-binding-1.1.2-r2.ebuild 729 SHA256 49908bfdbed4797ff50eb791adf7bf7a6f2b26a6f6493f90bdced4b830c5a864 SHA512 6c789a90fa223c2253433e035e64ca5631104d1ff277ab7bd08661e35e0c8b7db20d9014ee874a5b08b9a8957078dd5677661abaa4544e57a20838c89bfcd76a WHIRLPOOL dcacf49a82f7a4301226cd987f5bc507e3714fa5771218e8630ffa3d42e8a625cb1a88776455eb48c765b17d96b2c8c3f4b6d48e5ab46fde4181c9bb827e1113
+EBUILD jgoodies-binding-1.1.2.ebuild 1295 SHA256 5918c0d8ff2bf10d23d70e08f149244b86732758abc3e77904b1cce512ae8872 SHA512 0eda77fd71e65f2109a4d2ae7995e92469320a9af6cbbb6f402ede96cc6d6320e6bd6d7b9b90fdd4d826580046a91648e75652b1b5b99be957286260559f3aeb WHIRLPOOL 91c34890449266abc508414fb531065b27621902b75fa2641b2ddb4f577e1569c637098e28f313a88188fa5ec3e6bc113157b07a46928a6e4289d009025eaac6
+MISC ChangeLog 3108 SHA256 085657f1d6a5f418bf55e6e055e4e23b1e81247b55df751280fa2b38c5d914f1 SHA512 9d031c18b0d357d629e72f68f627f074d52fc392c7465aa340dcf9a792b1a9e94b3e21bf96ebd40bbaa5e6890401419a03f391037fee6f1991dee0c16225cad6 WHIRLPOOL d4ab645550bf0359a61b0692515866d9c9d069d0439e6c0d7af0a91d2bda5d1ee379aecd64e0c1793031adb839ab99f2fba5aa414846c6d2096903176b30781e
+MISC ChangeLog-2015 1676 SHA256 3f36e3f04b378db228f4085c092ccbbf499d72010cb90b107b907a630d9efa38 SHA512 097534e6ce9a6f11f5364b6d097fbf2d7930c48523ff889c811c4071f9d287f0c86dbcdf5a536cbbf1ba590b9a757390d412789a08e87e86917c746734d29a73 WHIRLPOOL cae3e1d0c6f7c47b3016bd3850fa63071c44199ad7031901fce20280b02743d87a32c03b1e87c4c75cf458a9f52f19b1f893fa9af6a1aa9f4314a7c68693fc0b
+MISC metadata.xml 341 SHA256 c65bfffaf15aa10ded3ff6c5f375adfc81bffae4ee201c75f59cdd99c9fcd67f SHA512 ca7c045eb07e88e8cdb6c6639ec651b038159d824df55dcb5f0819dae264edb8873e4dadf94fd6bf71879ddd64a75e44820fe2b6cf485df18ca743b264c9f267 WHIRLPOOL dfca0c6dd2e21655caa5ea4a4871d4b112a3ed26c43a5e9619899b00d2d1c54d7204b9af55f8fa456e47ea187a0a95b114180e279de7336749b4f8e833c24080
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..eb59c57ac80c
--- /dev/null
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.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 examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_V=${PV//./_}
+DESCRIPTION="A Java library to bind object properties with UI components"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/binding-${MY_V}.zip"
+
+LICENSE="BSD"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4.2
+		app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4.2
+		examples? ( >=dev-java/jgoodies-looks-1.0.5 )"
+
+S=${WORKDIR}/binding-${PV}
+
+RESTRICT="test"
+
+EANT_FILTER_COMPILER="jikes"
+
+java_prepare() {
+	find -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar build/binding.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml README.html || die
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/core/com
+	use examples && java-pkg_doexamples src/tutorial
+}
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..c135a628f182
--- /dev/null
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild
@@ -0,0 +1,40 @@
+# 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_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/jgoodies-binding-1.1.2.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
new file mode 100644
index 000000000000..9ed5912b6c50
--- /dev/null
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_V=${PV//./_}
+DESCRIPTION="A Java library to bind object properties with UI components"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/binding-${MY_V}.zip"
+
+LICENSE="BSD"
+SLOT="1.0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4.2
+		app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4.2
+		examples? ( >=dev-java/jgoodies-looks-1.0.5 )"
+
+S=${WORKDIR}/binding-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Clean up the directory structure
+	rm -rvf *.jar lib
+
+	# Copy the Gentoo'ized build.xml
+	# 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
+}
+
+src_compile() {
+	eant jar # precompile javadocs
+}
+
+RESTRICT="test"
+# Needs X
+#src_test() {
+#	eant test -D\
+#		-Djunit.jar=$(java-pkg_getjar junit junit.jar)
+#}
+
+src_install() {
+	java-pkg_dojar build/binding.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-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/Manifest b/dev-java/jgoodies-common/Manifest
new file mode 100644
index 000000000000..20ba2bd7b1b0
--- /dev/null
+++ b/dev-java/jgoodies-common/Manifest
@@ -0,0 +1,5 @@
+DIST jgoodies-common-1_8_0.zip 575972 SHA256 602873af50ca8251623cb7f2fcfb9d4289844834670dba10c143e70380cad685 SHA512 c00ffb6498b40b214bccad3ee8f0f3a9231bb8e67243be5ea15956694466485ac75aeed09f340aea323c6989190c10015b7a72b82d5a251bb5ea12ddaedb6b25 WHIRLPOOL 61dc47e3c00842999572b49c61d6fa6383f44dbe658647202f6599ea00b76e301903af2386bce4134a777fed00f5f307f6e16d1a31fd821700fed4d2216d18a8
+EBUILD jgoodies-common-1.8.0.ebuild 688 SHA256 94e9a78f8b5c3cd01d324cf8155bd63bd32a934fab5bd310652efe293df4c3fe SHA512 c2c9f27c3d8b37fe5bb6679849ba8d8576d9f5b6ab9817b64d09f7a0ce4ca33fd15266dcf7e8dce6d7ead1d86e4e77b8fdf669ed8049be7a13b5743de14218f6 WHIRLPOOL c19b1ce03d2d6b9399e3e416391c3f4cca4002545eac23554cf31b4a45c5b0694f0140993dea39f604055b0c7887bfd8b498d04c04652b60ad5d16579e7b0f9e
+MISC ChangeLog 3309 SHA256 bc5c5232b48f67bb1c43519583425821ab783bdf66263129548b22162804e610 SHA512 471f8e6e3f873feec8366aee53bfe5f9b9e785932964639fea274d5c3719b1aa8256577944b5b21b83ab0a3b0dfd2383906603803013985b47735b0c58c2b47b WHIRLPOOL a55d7ec97964c96207fce65af2a55563e6bfd63a3b570a9f443e12481c1a51c2de889799dcc69225f4f10a1ffdc9a9b49d27fe3ae002ba09b9ea98188101046e
+MISC ChangeLog-2015 576 SHA256 123a056729d89053bfe02ea47e59fde0036ee43592f0415789a5dfa83f4b711c SHA512 837dde0ea0396ea4ed1a53e38946306a19c466db0e1166890782fb04506303b4efdc96a31af6066ae5abc215dd6260460d417a9f0ee23bc86a2143344d028566 WHIRLPOOL 9b3fe7fd6aff8091b65bec9ff58648361cbdbd65f85dcb1f8493fc0957114085cec26ad96b80afb01e0c101785f5c1fe9901f2a3e45a147ce995bde11eebf86d
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/jgoodies-forms/Manifest
new file mode 100644
index 000000000000..e4a272c4f9e6
--- /dev/null
+++ b/dev-java/jgoodies-forms/Manifest
@@ -0,0 +1,7 @@
+DIST forms-1_3_0.zip 1320397 SHA256 f707a074264c43e37dce7c42df24e433d089fab828a673bf264082397d1f5329 SHA512 d155cc85ec77f23f55e59d4651ef1f9df2ab749bc6cffd4dd7cfbc0035587a2e6bf03427e7bace6feb71e6c43efc87115d393fa54ea6da331ded21996b32a6e8 WHIRLPOOL 88c6aab03ab8e640bb74360c9ff96e3f6da2e64e4da29c851217e6588ffe625c7c73e2ede6ef211eb6a7bfe32ab46370edefb8eed6ff8bc06e875e50e8e33a46
+DIST jgoodies-forms-1_8_0.zip 1668539 SHA256 b090e455727fb2c2ecd1a6bb09b12d5c9f62f662d14b5a53d8b5cbd06fe064ab SHA512 dced4ddaea7e9157f99b7c27ad06bfed53c307181bfc21cee8f454ba8cececa3f5fd5186947fe5bb299c4de2032bd7489248e3e77623785ac47388306e3d6933 WHIRLPOOL 1e38380d171b381f94b3bec2bd4d492088755f40152555f6bd0f281042bec289373045d278f9e1634f5a05e554f7fa80676b6dfaf532ddbd5bde13abd343e37b
+EBUILD jgoodies-forms-1.3.0-r1.ebuild 791 SHA256 b0230b5f207055284994c6c1ef468df0e654d767c9311de0f85658919e068793 SHA512 09da514783b6a49ac980401305f6dd700c46a5d5a3f381344d70fffaa42a2f9fdc7ebedd2a68f30febd239d0dd02d8486acbb6ab1d97be9f7fd4ebe21af760cc WHIRLPOOL 160d3aa21299327619a7a52125e6e58e93a6cca3489decac80459d073859eed5e6625994ab498a558f0156bdad811e2a693abce4b89946f662a93e28831d1d77
+EBUILD jgoodies-forms-1.8.0.ebuild 801 SHA256 4a9a248028efec08e45af2e58f59fc72727d022b166d702d655adf7f5d1cd027 SHA512 313407c53c0a99b97d6d1d1fe6a1ff084390f8e1b48720db98f07dc305d7a18ee4f1fb7194ebd32e46d99e8321efcb4c31b2bb3a67d00ac5262848b5376e0a10 WHIRLPOOL 04d4d202342dc0871d6ba1c91cab0fedf9470cb2982e85451a741ef9e050d8b5ba6c2717bbae095efbe75e0ab5d9ad93d3d7ecf966c86b20f35c666848fc135d
+MISC ChangeLog 3160 SHA256 6f0f33241ccae36132caeacb3214b4ab5123027f6dadf21ed7641584ddae127c SHA512 8434c9994b5ab52368a34949e8333bf8dd0735f03c32085b68ce32cbd31ac96155d640b7fde5311f994e3bbce5008e21c427ea596701c34ce575256adc24e92e WHIRLPOOL 3e0e6aa2249020a7131994123c5552192aa324f32267a772c2c144fa9f75e0d27f033a778e01b166f14cded04fa461cf82eef69b7bc6283d143b6656a7f9704b
+MISC ChangeLog-2015 4799 SHA256 d0e7d9b5dc89c8502ddc18ad7765ef6b2b7f542c2ea35dcd0f5321fc56fe1c5e SHA512 9e4750dd14e50e07c2adfa986c9d29ff07a94e6426cf5b81f01401ac32224fee9c8a660aa5569774ebec9bbc2876fec7b21ee24e5854a116ba4b7327255b1dc1 WHIRLPOOL 8ec1777ef0e6298cb04d0f4a50645ecb51e3e080736ed6ef4d52eae917a91c79f6ef935bb7fb4e4a71f5aaccc1ed0e398e398c2840e109f98668202f57748305
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/jgoodies-looks/Manifest
new file mode 100644
index 000000000000..c1884cf7cb81
--- /dev/null
+++ b/dev-java/jgoodies-looks/Manifest
@@ -0,0 +1,12 @@
+AUX jgoodies-looks-1.2.2-build.xml 3035 SHA256 f651978e492c674d894648a131e9ffd845a7a2a27cf558c56512f521e10c19e6 SHA512 0653e5d3cf536f482198e003589a526759cebff89aae40916aa9d80f9d2c89d78fefd710dcc9460b26e794c4a64ebd4c0f039b94145c2dc5826f3170d30ae8e8 WHIRLPOOL ce3136c743de4f6a283512526eb3d8215a1516f34c15b5532344dd3ce6d5cca41ceb93fb987a9ef7eb07f0290fa5cd11f5fd1e43bab445c418c3d8af34942b55
+AUX jgoodies-looks-1.2.2-plastic.txt 308 SHA256 0f0601fbf99f2601e9b2a03c69ec71bd1f18f09475090db430a9322ae96f5544 SHA512 4b0212758a260a43b3d6e67d1b53e7fdccee3a584ffe9f2687b46cada832eaa2fe352ab0afb996df066ea4e03478f83a291b22681efdc25e20f963102624556c WHIRLPOOL f0fad2fc14ebf3164e2198405d99b7ff41a2f792bf9d071ab56e651a49a43c4153a65e26b1eded0219527adf3b6ee9f11e4c1811960d0aebbf4c0c9d673a87a6
+AUX jgoodies-looks-2.3.1-build.xml.patch 2443 SHA256 db48ce7fba36388ad4e05ba2104f585ff62dfa7fd91be06166b270ac16001df2 SHA512 478455b021091b6344f352a628c037013ea03eef53ba934f8599ee080349cb84231749b8a4a36f8528852529b02ffeb7de4b0a9f4e3138bf5747655bc6c0e4f8 WHIRLPOOL a6e2f160ca84df7af0624203c864330e5df2de496130de4dbc6cbc091d0e1ba49abcb9a76171afe9fed4fb4d866058c1bd1e04b4f1dd37d9e5381528a45a7972
+DIST jgoodies-looks-2_6_0.zip 2444893 SHA256 2f992c25309e00aadba7c6a3af5c6596b3d487bff64fb1a5e94921647929f7e5 SHA512 1c33413379f391109d1db35bdf301acf0cc6d66bf8aa1026280015946bddb230b4cc1d233b700d46a519fb02c169df4670c874058f5e636e1e924a9d3a42442a WHIRLPOOL f6848e9011001353cb115298465e7da981335d15f3839ca749418d975965358bc9595dbf9a1a36be9b240d0b92866a953dc4a7500b2eb8ecfe50ce46b5e40973
+DIST looks-1_2_2.zip 1811849 SHA256 d7b6cc296cf9284bcbeda9a2c9497e804abae66ae3fc3f31174cf19e9a0bebae SHA512 d9c5f0590a44dbc7d778a9da135361f5753eca4d47bef3636f21aa0d014df86dbad90031b5289928b99c352147ea702948028b18b36eb3bc44aef800326fb302 WHIRLPOOL 20b67ffb888322967103de3953ce825976582f5031ee1609acc91c86d9a621d22656b3337734ecee447c665b35784c595165f7732f2eb0fccc988fa4ac734235
+DIST looks-2_3_1.zip 2105839 SHA256 f66b7e79ca53e849d6082ba0d937f9056d855cd6269edb9b3c52dd1347b14b8d SHA512 61278cc0b8556ce19cfb5bdaaab2b42d7035fcdf71d614a8d3673629d5b04c5698e2be521df3e0518e781f78c03a8d3f466f1fdfba525f679e9de7409faf1088 WHIRLPOOL 964806f73587ed116e4cfb6c330f0231598fc651286085c40bd4a6acedc9a1565bdbe5a4ff48f3e7dfb976a4a28ca667994d146b3d3bc9bfbeacf3c520915425
+EBUILD jgoodies-looks-1.2.2-r2.ebuild 961 SHA256 a0f34d642817d26336e7d94dc5b962875c85b568b7b5ac924a4bdc29617c4888 SHA512 2987e72904bf7646c11679d18b7b8a0bd000d16dfea7b2f4b4f168cea5e574e8401bdb06691e846835c589c6bbfddb326b68b100a144f288fa4bd9b932ed601f WHIRLPOOL c22715dd244d45d2f3f43de24c7bf928d1b0c11c7aa2a1dfb089d6ae0479ec2a67385e4d8c714499e72371f0313984c1e2fc48406a747dd4863a1989d1275330
+EBUILD jgoodies-looks-2.3.1-r1.ebuild 1469 SHA256 8dbcd3bc8350c1aaff1afe5cb2d70f9ce9a6f17c697ab5f6425552c72cda97b5 SHA512 f22960412d85f1b3d50785b01301d8e0c8fd7fa21014c7010dec81c1f8cb763597d80e840d72012973d83684c664c1ba18bdac714385b694daee5a13688dc78c WHIRLPOOL b6281668f4cd8280d0991d56cd40385c3f1a8a578e6d78c51c5069152ab15e8b4affef9e10b4a576c5b95b73c7d489f9609c4f577440fd7003d94cd4fa6f3fcb
+EBUILD jgoodies-looks-2.6.0.ebuild 779 SHA256 d9ace357546d20ffcada3464a887a5bb70eb77aa125f7a9b10c840ca75a5ebc6 SHA512 c5999ca3a392652c2b3cb36e88dbc7081fa9ff0e2d24acc179bb0c983a414775eb3f67ca3adf66ef309d9dc275d2f6f25089c4705f59cdd9ca4522712771d788 WHIRLPOOL 783cc935f3700fdaaf47b3c9aedb99c5b60ecff8ef7127894097533ecae15d7787fe1fdb2bb04840f1937c3a5ee4ad5ba6d46da6ace127ab19bbc13f390d2836
+MISC ChangeLog 4565 SHA256 a320b8378ac6bc2bf1e1af32eb91d19e2561d653c832566fb4fe807e7ceecc6f SHA512 86872c7ed39d4e9bc40bd4ffcd61c95338088c4341c430baccb44ce598e6a5c9ba7e16b0a2041d24320a39c2ab1ad5936d3f83e805365d4965664e45bcd1115e WHIRLPOOL cc37e7c1aaae8c835f1700516c956be3e594c622cf12f969461f62d6784242351e7b3a7d368c5fa567bc2261baba4cba94d66f5fff12155e0cd268a82f5c0032
+MISC ChangeLog-2015 8194 SHA256 876619b104fc93eadb7c067b425bebbfb0e340315eca9bebfa32d319ef915d7b SHA512 f0cbd10ae498e269e2537182db7004768c7a90ffbef5593893e83c2ead4a7c51854a8e2f5cd4d2b75cc394727de55acef7cb73aa65cb30284a4e8a6b18fdb0e0 WHIRLPOOL d4d9506462af792fbf3059fb4e70c638b682b405159e4bc8909d0844bf114c0f1f98510880e1e80e66d07c722507dbdec9f2e3414a7d19ce1574cc963bb652b6
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..f95a5a17998c
--- /dev/null
+++ b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.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 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 ~x86-fbsd"
+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..f73bb7366c22
--- /dev/null
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-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 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 ~x86-fbsd"
+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/Manifest b/dev-java/jgraph/Manifest
new file mode 100644
index 000000000000..1fce239bca43
--- /dev/null
+++ b/dev-java/jgraph/Manifest
@@ -0,0 +1,5 @@
+DIST jgraph-5.12.0.4-lgpl-src.jar 3460750 SHA256 73b8b6a656a0c8ae8ec0b42ea27633c3bab22e981859aa3570c597f7f051ac04 SHA512 0832afeb28c4d5abb9288de4e1b74eefc432bb98f622e71f0d192bf9f01741feb406ba0473b923e0cb93401120c1456a00eec4653355c37bff7e9e1863e81b5d WHIRLPOOL 89b21eea236717aaf9cd885c227b43d8a81702ee1f51fcacd8139df474dda3ac1bfa2892a17d998efbacf147ebd29c71bbb555d7a0a40561bedecba839d0944c
+EBUILD jgraph-5.12.0.4.ebuild 987 SHA256 03de9ab297d85b474ae8cae63020fec0f69fd8b201c570094bb32849ba998d87 SHA512 dee0f6f4764a468cedb1f1effe50e56da2c9d897ee72546e472a93ec81d953606a9edef655f2a6c5c7a4819894d055b117ea4e86b303f3b1e6451918434b32d1 WHIRLPOOL 16a85a0b21e0e16b4ff80ab5f74534067f18063709641cc9330c9f6c9bd5f43307ef18063a246fc794b451d1d7a62a7fae7ed75f97479b2d579738187b2927aa
+MISC ChangeLog 2570 SHA256 e458699c4f521ab307fddf55dc6ecef7a3a396dd49be20520fe2bd814b77b2c0 SHA512 d6ab49773464a307d0ee2d287b4e89e28d55534a7aa62333fe080b46ad982ad16a880f2a9778ab728b7e802062fd9e07fc8c14a73afafcf41b4e8be035b4eecb WHIRLPOOL 749f2db0feb82e2a2136d9ed61deef0f230e9a14d2cf4e37fa5edbc6a0261d77a2087b2c6c4c89ea09e6a538f4a5f4b1b0d59452fbc9c3f4d79c11c3f0383c3b
+MISC ChangeLog-2015 4089 SHA256 c48c6d2c16fb5120be61ea66bdb69a78133ebf09bab80e8325ec0e17f9941bc2 SHA512 617b6092abd2a68d6c6eaa02888281ffc7a33aa963af1f857f977a09d392318d1727cc6def4c9499152ecfae0b308ab1dde4fa2faa583af9bd215f1bcb58aec8 WHIRLPOOL 784c9023b55e86911ce3f2d5b85fbaae7d6c9970f7cf17ba146d4de7986a7d02745ef578ae385c804cd3083ec01ea282d8eed18ea8fd9921d32a1754df6914d1
+MISC metadata.xml 312 SHA256 9b6dee3622767e2ca61bf31be8959a3f1f47e1028554e87f4516f7ab694238b4 SHA512 270716861776916f2d7a6ab6671b6dcf220ce6b3cce5397b3994c19f83a91c110a5eb3a783ba6277d098b6382481d98cc610397c836e4a9166d857db92da0b56 WHIRLPOOL 76e7e66cb3ab30add871835abed907af5a776c661ead8f2168dddce5416d592e01fd52b633cb34b6fed3e42ca4b0103583b0054f648b072600b3f4bc076c3660
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..aec07697aa2f
--- /dev/null
+++ b/dev-java/jgraph/jgraph-5.12.0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="http://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/Manifest b/dev-java/jgrapht/Manifest
new file mode 100644
index 000000000000..f910637055f3
--- /dev/null
+++ b/dev-java/jgrapht/Manifest
@@ -0,0 +1,5 @@
+DIST jgrapht-0.8.3.tar.gz 1268147 SHA256 be8232508220773b7b94928da17547d32a68ba9697f7ff15f4f09bd9b2a7aa45 SHA512 964790dc74fea1d84f4a4cda4a253ede810725ee7173a2b376acb3f0e10baa2eefcbc38c76441600e0c282e0486243a464116cb803308eac134561181a2c28e6 WHIRLPOOL 53cc13347c092b70210b5246692cf71261c5014706dc6adcca16fbf8ed0b774b20a41a00c6f8e819d5e52e78ddcd84c48ae339cde45d7314f1ad39cfb2823670
+EBUILD jgrapht-0.8.3.ebuild 1062 SHA256 40fb3c049d5acba09f997a3595fbb9805db3cee0b903094392aa6acbd475c474 SHA512 cf0dda5088d2d4326f37c574489e1e6bdd4651800529c99ee474e3f4e26b702dbe31e56bafc2ceed66a6f54b2dd4a09e8ff166315bc9d2d8f5e9b20db329b631 WHIRLPOOL 89665e3dbdc873af6e8917fd6d21039d0d25afb00822e205bcde8781af8618833d7f44ec8d92ec740ec9a329ac3435fdf436c3d4fc8c49cb59488d3c77d66650
+MISC ChangeLog 2565 SHA256 3f2f9f00931d45dd7f3fd34c031e2256ff52148720989bd5f82645c80fdf099d SHA512 58f17e304a3dccc2ec4efb718991db3bb2e9941fe4494dc9350cf8ad5686e0961be3663d15481aa553b41e66fa816d1162afdae63123f2d2558bcf96a447f7b8 WHIRLPOOL 1bf81c719b740cbf91ff580612d1305394a2040d433e11c21fbc8b69a03f2586c54d6d37c4bbb5a26cf2c7a26c2e2f4c2f73764d403499219f3f8f52d85b4d66
+MISC ChangeLog-2015 2200 SHA256 5d397e6907b0da8cd976983475c5b80e87778e345cc0247c11973d947a5d9360 SHA512 028b1ad245f45f52a349d33ac5d2ded307fd97857e3b144dfd7c451a95cf0d384fde6b8f05a34beb8cc44f261303b0354339e113016762a1b3a29f14bd9f3fd7 WHIRLPOOL 047fa57cc090808c1d85e71e3ba363f7b98e2149045f66adb706f1ecf8ffb42607e822c64ce8b31629aeaf28f64c1baeda66abd8d3cafa529ab6fd7089499c01
+MISC metadata.xml 313 SHA256 1595ebba6face78ecf0bc3ff973f3eaf031175aa52438c256bf224e13cee7fe8 SHA512 f133e2841c59716d604538e5472d1b1d81a1c0a01d8ce1dd43d8a62115bbd3cb272a1c9c257c40f760c1b3236540e7ec0835e949073c6ca6d1c20d3de825ad67 WHIRLPOOL d57006d81006edefbdf120fa8dba3edc6132a732e654de6cd382ccbe5c070688c2df0cdca9b8c4777578d38c44cb3ce99212df81414dcfffd024567c00add130
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/Manifest b/dev-java/jgroups/Manifest
new file mode 100644
index 000000000000..29c018706c50
--- /dev/null
+++ b/dev-java/jgroups/Manifest
@@ -0,0 +1,6 @@
+AUX 2.9.0-ant-1.8-compat.patch 733 SHA256 71b28581158c44ff9c4ff5734db9b3d6843f1ad8583abad2d6be4ae88bccfa88 SHA512 71c8c0f4436c983a86b6eee8b4600cc573758ea5da7e33ed4fde8e40f47b47656cd453513a4b367807d51151d2298cda8df5ec1229ac6abd68f3d6bf3fdeaf22 WHIRLPOOL ef759ca617a8630460990633a9da1a1e8195c7fb363727c6e0e6958da2e1b52dd25f2d0aac4170f9ae2308af3c00bed29aafa15c97ba4d765616317239863a45
+DIST JGroups-2.9.0.GA.src.zip 9227273 SHA256 d8094e696b399e109a71289ddb4dc62c0ac52000528bc800056d225b80871a53 SHA512 5482e3a7d895db4d455f92d14c27559eca9370146b397efa4dc17c416a3b833fcfe0753117ca00e1445e49be239f817aad9bb8b626c1b0fb68869f7d1c9ad0df WHIRLPOOL cd46cb18db2b5fdda63f11b76793e58e2b2d8cad1a7e9d391c315b383498bc592ac6ac463dffdae1a33d9e01973fb9030b147b945a72d2ee2a81c692fb2c8f37
+EBUILD jgroups-2.9.0.ebuild 1875 SHA256 a421816407b917b7c19d529d08e2cbd5abf90ef601bb4e459b04044633060536 SHA512 1d940f2d63a2812d1475d84c8c7d586ab9824c7d38b364c746f1a13c306b63711db4c0c39e872bfe612edccfcf8781a0d23289309ec04e232f26d8d99ff75110 WHIRLPOOL fd429b7301152f4a50f70e70244e8becb50dc9e9ae1719c9a78e2b4fbe175b676648f5a2590a35cd57dd63bf72f91406c95c6a8087065b4b3bf57c27e9504b01
+MISC ChangeLog 2600 SHA256 19560a97f361bed41b57d0637ea70d8147c89f0fe1db4df5d7192886a3611ca6 SHA512 ca96ba23cdcdc70cf7aa01a225037d99b311e9f080b97d3c2f2e2b50969c05b06ef58f86afc36c14c274c7f72dffc7e7e416c882cba46a65d26aa2d21fdc79ab WHIRLPOOL 59d10728cc4c6e89efd951df2c1857d2d32c7786f2eddd717e7970498691d36be72359df9b04d6b4d1df0590bacdbc9458299908411d72ab4519efd18864d368
+MISC ChangeLog-2015 5049 SHA256 30eac4a73da059d74570fd2a62f11ad4ef3a5b6bee878b0414838c6137723f6d SHA512 d83916ab2eb4f2b231fd74c4e6e5d5cd4c106619c4f8232c2b836758acc1c242dc229f64a92b8991c7aaa6e20e3e273c6442d84ff514fd8485fd819907f6a03b WHIRLPOOL f95e6770b770345b3650b32222fac9eb9343c34e8434f55ac05a106fda3a5deb3ee702401289e9faa73beabb0a860d792a302c0f50c77605b8e391b173eae3fd
+MISC metadata.xml 316 SHA256 358b8657fd674758e3c857eda09adc36bad4b437549e0fc1d3f315bedb8508f7 SHA512 7f02e04f7c3598cf20c483279e740b88099344445d13559f198a863223ef27cd30fd8f9f7a8a33585899fd826db827eb7592b41805551a84ba3a66c3082f280a WHIRLPOOL 05245fd5d514e67b210c524339f8d8fe68c8cc31c2a3b45c2a41313ec6aee4bdd1b7413e718a9df0a94be41c33c56cad8eb6a4e6fb7b6ec60d57b76c7b0b2e5a
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-tools/Manifest b/dev-java/jibx-tools/Manifest
new file mode 100644
index 000000000000..c73578ffd4f5
--- /dev/null
+++ b/dev-java/jibx-tools/Manifest
@@ -0,0 +1,7 @@
+AUX 1.1.5-build.patch 1082 SHA256 c0474fdb4f350dc5732c2044ca6a9575e243d7f52cab498c2e54eb6cf6aca0c7 SHA512 5e9b2814cfcdf2624c3e8c813d74cecf6a5c2fb1ed8fa493dbb8af039cb1b13b526018dffc512cda9abb48c3b6a481f7a3fe3095c71218f7231cc0785529d064 WHIRLPOOL 30dbc7678518799357350da44bbb6ecebb82e866d116e96837668422eed798b529024b1b2d932627d7c6b8b6cbe18a282baad96225e0dc562ca3581312afe954
+DIST jibx_1_1_5.zip 6788994 SHA256 121dbe5b7338081ffbf09cd1175afe5e1862a63673f467d560e0ab4c27fb3f17 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7 WHIRLPOOL 427b9970850f5497796e65e43200262e567965bd5ae07f59893f00eba4cf6942a70cf15fb0985d99e26c649e56f175b8dd0b1451b77c27a9859b196bc5cd9d91
+EBUILD jibx-tools-1.1.5-r2.ebuild 1112 SHA256 7c6270e24736c59e56eba265a1e959d7c4a6c59fb3c309bf5f5ef3b8f8bf4ec2 SHA512 3a33add19351da5c3c2a358329a2e0b7ba68a120d9dd00db0a3fb6533c0f200259b175d0548ba1224d31f2c47287c7c2be60571ba6283e5a12e39fe5c52b1c1e WHIRLPOOL 8708d7215fc3c07b4c0a335b97cba4137ec7c44b7e1788900208400ad3bf69c8bb8b99a31327fb8e317a3d2d427ce71fc94e8f9c051ab483ce800c75f5c45050
+EBUILD jibx-tools-1.1.5-r3.ebuild 1079 SHA256 492501538d5caec9ec1e3c349c3d99e24ca8a66ba2160b9fdba24458778ab3ee SHA512 bad3f13750ce06d8832d7ae8bcc3c6be6255ba0528d473cdad871c45ca2a5f3e7688d961a8e6fb040bf1fd9cd6bd42ca53a233ea5243493048520632d9630135 WHIRLPOOL fb0cc1a6f484b43984ce3bbaf0e567d05b4db326d1b3f97a937f23141f619b597aa0fdfbeb33ff69d3bd4afac790be930a42fde3defc2950baf2f0d9279b265b
+MISC ChangeLog 2945 SHA256 4e3cc3955908ea6e3db4dd745b7bbbf557b801b47fb55ea0254fc86e4405271c SHA512 66a0bcdba8ce4c0c02fda8ad54cf917fa72b1b1d6a5573ac7d78f2b76d5199c7066193415bfdcf00f3c9deb2755f2ac26ce5e97a15a3e155f53ad6fc1e79199b WHIRLPOOL dbd4a63aee8aa61431843a8ae6f43e0f91ef05a1d0d02aaad1d420f81257a251fcec782078c0c13b5d0b0e8af2d4898106e55b6b62220070ea07a814ace93486
+MISC ChangeLog-2015 1879 SHA256 35e96720e05f7b402ee6533c8d8fae6cbbde1a390dbbf3f2495985fc3807b2e5 SHA512 d8414991dd43437f9e9ee3596ebd3bef449dd5b6675a499fe470cd30041380151a1d5555f7c965792e00b5dffd56126a9bc58ad312dd242126276fcbd727c811 WHIRLPOOL 2f2ce961e660f081579342af9ebbb97e5b1720ff07dba929cdce5154db4378e5a188285c238e3cf5fbfcce367ee702064b1dc46af88424901315e019375dcad4
+MISC metadata.xml 310 SHA256 4931bb087fa84f1808bc520ae22bc3de8ef261e29db47f026e1c4ea65a882ae6 SHA512 40d0f9f66393bca25216d7953624b713aa0ecce6badf7a8021ac269813131cd630d90b48e042f31b27b8681e2286c50f24c15938b14fc7a4fdbc224a626d75dd WHIRLPOOL 2d5aeb2ad102a6a5d98168a9661ca20e4fcf1ad5eaeb83c0c21f834275b5f847a1967dd19b72e70285b1dcd3ef472ae926fbc4cae6230b3ab1747ee3cb59854a
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..ed7eebe9698f
--- /dev/null
+++ b/dev-java/jibx/Manifest
@@ -0,0 +1,9 @@
+DIST jibx-1.1.5.zip 6788994 SHA256 121dbe5b7338081ffbf09cd1175afe5e1862a63673f467d560e0ab4c27fb3f17 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7 WHIRLPOOL 427b9970850f5497796e65e43200262e567965bd5ae07f59893f00eba4cf6942a70cf15fb0985d99e26c649e56f175b8dd0b1451b77c27a9859b196bc5cd9d91
+DIST jibx-bind-1.2.6-sources.jar 450003 SHA256 fa0a5b86677e2158c553bed1b10ff03666d3d9c293c584b6b3fc0a2220f73829 SHA512 8a93aed76d00c465f4fa1d4929bbecc37497b05d7e094b68745bd740bf06cfe87919f3c02b83311766852845e763a2ed51f9ed1d543d03921dea1b67526e7668 WHIRLPOOL 3a31eb554bf37bc7a5b6f4e5ed619dc24bdcca3f7e567df9550740b5c31ab4a15d785ecfa9322a385d0a0e49a645777bf4639add32689b0997e0f4421bdfc69d
+DIST jibx-extras-1.2.6-sources.jar 61737 SHA256 ef92732594b865f91de6a652eb4c7a990b486274ed7286ee21252c8168ca3f7f SHA512 355e387f92766e2cdd8686e9ed26e80584c668ca6c670532f8f24ae758bc4713cfd505890f0ea634b3380f41429725e2ca719652700b0dc3562d5966b108b3ed WHIRLPOOL b8b6fe03da804c32dfca3c82d8e7d7049d39147f78646f9f017f71bc5164d0b376c2df716daa7b0b5b311ec2cc56048d63745fdeaa3c565000fe5d907194016b
+DIST jibx-run-1.2.6-sources.jar 194660 SHA256 64efecf8e948b3e76c701a342164463adbb6a378000ab0b80d3ddf5e27676407 SHA512 623ef57cc411464fe1b936d9795ba982fb221334ad8ea8448afa73d9c229a2b3dacde1ee424864d1c12830d59ca2e9431d54b5cb0d1e8273b4fd6fbc47a3cf5a WHIRLPOOL 8ae9f1b2bbd504283b7e1a5399c8da396907077fae74a8cf8f6e8f552776536f9e82038803c3f9e0870571fd906af85347104716aa3ef9bfaaf585e8b478a2c1
+EBUILD jibx-1.1.5-r3.ebuild 1090 SHA256 80f21fbf32d8911450e02a3556204d33c752d8ddcbf6c4e6c510cfbd2700371c SHA512 f41ef60c7a4497c3a91076b2b3ca0d775734bde53ae797dd44f37bcfbb11c77b60e029264925a87eeaa3bff4a7c4c035a615e75b407779952d9d0d476ec293c8 WHIRLPOOL 7ab980de29daabf12f3feed91319a2cc11f538db0759f88a170c0175382d73bbad372a19c23517144cd9d040dafe68057ce2537645ee8731f9a8740cd98bd8f0
+EBUILD jibx-1.2.6-r1.ebuild 960 SHA256 bf05005629312fbac7e46f544f77bf2ab0f9f6c051ebf8439f736614da5e2a8c SHA512 2eb8dbbe4bb26d83e664bc98b2d57190eea9b333a406753af8268a08275a253f2b84d205b2b023de887a0c6c3f004c33733affa670aade2f47a7bbb44c9a64f3 WHIRLPOOL 774d5966384eb31c7e73ab4a9daa95695435c7e85c51731525f0155269f9f5ab66832833634f3c0dc692e48b8a75a0e67593f38d6ae776e8ee0e38dc9e661479
+MISC ChangeLog 3081 SHA256 4bff9d8792bd03d60e4918f60be6aa0d51bee0aad5a9b1d8e433f14eb28f27a4 SHA512 7e69eb1e8f932947909ac268d1388274170395cf882b24687ba3a5c606255c9accf0236bc6dfa24971a4d08b269378e48340ab7906b1e87b0e37beb7c760f0ef WHIRLPOOL e6b272667c8e2e2119692ac2f02c7e229c3a78edbf5fa14c9b6345834bd13d37aa86f07487c5508aa328ec5e827a00a1a31aff6e2a715b516d118bf6f59b9df6
+MISC ChangeLog-2015 1944 SHA256 04f35ddb0ea1bb15a2a7d0576443102a1f499a28134b125b581ab83c58380085 SHA512 47fc8574ff38ec2e9fa068cdeef533861f099fae471527ecae2d5bd93ca6765833876ca4e2af71d2e5cc536b32304a86901d030c0d50c438f85dc47e269f5c83 WHIRLPOOL a59a8adfc770db47a74b5bc18785f06b38667797c7df5d82b914dff1d2eb4ef3d1b5ab9cfe747df68eb546bf96dfb17e55f262c19477155286b785a0a046a7b5
+MISC metadata.xml 310 SHA256 4931bb087fa84f1808bc520ae22bc3de8ef261e29db47f026e1c4ea65a882ae6 SHA512 40d0f9f66393bca25216d7953624b713aa0ecce6badf7a8021ac269813131cd630d90b48e042f31b27b8681e2286c50f24c15938b14fc7a4fdbc224a626d75dd WHIRLPOOL 2d5aeb2ad102a6a5d98168a9661ca20e4fcf1ad5eaeb83c0c21f834275b5f847a1967dd19b72e70285b1dcd3ef472ae926fbc4cae6230b3ab1747ee3cb59854a
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/Manifest b/dev-java/jicmp/Manifest
new file mode 100644
index 000000000000..a40dd32c0e2c
--- /dev/null
+++ b/dev-java/jicmp/Manifest
@@ -0,0 +1,5 @@
+DIST jicmp-1.0.2.tar.gz 348805 SHA256 3661c2dd59d8be3c72904fe2cd4e0d06054eef5f8e7f68023b6d241a594fe0db SHA512 8633f12fdbf978e0312c07966fa37ddb9d904fc9845343e7d947400352d3a42d53e83a97a847cd61cf44f4fd1a6a47bab208525155eadadf62c222995a6e2d7d WHIRLPOOL 003590f3f785b88fb739ae7a54b364a1ffe09213da03f081b7b88e49ea2d4af7f28bcaf8cb7ffa30eec5fecc524c0ec2f0bd8556c1eaa7d8acb09ac83630b7d7
+EBUILD jicmp-1.0.2.ebuild 799 SHA256 e22271da9c18f6591a34696599fd87061f01a2f4a7a631684c8d97ecf302fc38 SHA512 487d8a97993f902d57f9cb8ca08d0085db1c331429f8bed8e87f38aa696e6bba6073c8c9e3eeb923fcb4db9ada08b9144951002d307cc3c1fa821d3c31f7e061 WHIRLPOOL 6a32509e013d1991a8595ced7b64fd642bd9628a761c79395a56d304ffc05884aa20ee24da8d7c8d43c8781e188d94f9b2e2979591d276d7f309bad89e17ed9a
+MISC ChangeLog 2421 SHA256 81cf0bc20c53c6dbf7e5eab3e0351519bbf4ce7eb61985df6590baa39b3e4714 SHA512 1699cd0e32ae40b658db2b40abb8500b6f3aed7f832ec7015a547552f7f477c272416d37e3bc93827e6b5799bf428d987e737114432b1f93ac845c20a41b5d46 WHIRLPOOL 8e8c1009edc6e767b1da36ce21991561c7bfdc9c46b71b555ea45bc571288662146641de54cd60420300dc7d48213e65e4b7ed0d205116f289330b7bb0d58109
+MISC ChangeLog-2015 1047 SHA256 d1f5d195288f5e15efaa679b6aa7ba9e21e0169176333b436c769993b73b4df1 SHA512 792b8ea7297956b0eee86e0f45e9a2ae0cc471f51afb288a08edf340257ca59d43fe939eb75b23e887963f7b3c4946a70975f5ed08802d9b7055d6951dfa64d9 WHIRLPOOL ba6fb73c32b2694b0db813872f3afc1a41b55ef8df2b9beaca36abfa6d6ec857931e3e7c355445ec444868ee5824ae74a6f51e40bbaa18bd5f169087f197cc50
+MISC metadata.xml 313 SHA256 9c064ede40c3bd5d8fdba2d4828002b501eb5c422a1612164575abc803b9b494 SHA512 d872cd4e19f79a2c3966435faa85f40ada954e51a0561e90c1055113254d653d51e387cadb5d79a15a30eb4764fd3fa985f1e2183fe52a5bce2ae9dd2c824089 WHIRLPOOL e9c1ad1043d9189fedb5ad7d920d0704c9f16bd90042d0ce771366a2cda56f57104365492239b50767f8bf7558b426d65f0d976da31ae9f95bb98c6ef0deba0f
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/Manifest b/dev-java/jid3/Manifest
new file mode 100644
index 000000000000..5ff246def652
--- /dev/null
+++ b/dev-java/jid3/Manifest
@@ -0,0 +1,7 @@
+AUX 0.46-javadoc.patch 521 SHA256 90ba9eb669e1220722be9b69b4ef1bc16303c6f680deafb372d347ac02e343af SHA512 88a57f0c15f1915ac072bec7d420bf8a9eb1ca199175d56828f5439958f474b62d33f49a2eddcbcc01bb39dd07a22febccbfa58aa95be5e6b5413c54b94bca48 WHIRLPOOL 2cdcd3f63c73369d4303d575745f7ecd65030f9194571387ebe44fc6f92885d0e5928aeba9ee5859607fcaccd82aa461152b05fa79f7804c767ce88d7a5ba079
+AUX 0.46-tests-and-unicode.patch 17518 SHA256 cfdde9b8bf9e225b16a9828ebd0f957a2fb30aba4690aadf161a44af035270b8 SHA512 d1448b2474af1d404999d1ac1df126814405840d8d80074ec90b7f4e2506a6d3497e2b6defa8c9c04b6fb7d86d815aec7dc3b7d7455f5fde41ade590db4452ff WHIRLPOOL d7e9ead37e4ef97d707de49ee03768c6bcfc52b352704421fcef2bbc848cdefa345c0ebdf964b6e78398489fcc5fe94eb43c599a937dd2819c903cf866758b26
+DIST jid3_0.46.tar.gz 972609 SHA256 eab5813cf0268c4a114f0ac361e6ffbfc6e233d493cee8a6dba00334b1833491 SHA512 478a78601613ab0e7965145733f1adec10005ef8069deb0595880feb47b065573d66cb5eb2b810869970a6b0272f8fb3363e4946ba5737ad740e372875cfa707 WHIRLPOOL fbe23739d84e8bbc1134780c1788f45a8442ec309bbc9eb92724d4c226dbb0d2b6fdd42a10cb5fc82765423c0b5652a82b2fd11f8a42672bb2048640b6789127
+EBUILD jid3-0.46-r2.ebuild 1269 SHA256 17072e5403e75ce3bf9c184a22087c867fee2be4968c9138f56f3015e251f1b7 SHA512 0babc2575e023d689564d0385805408e489ac5a25cc408e5f37e40bc43870bbd7eca887dd9d4afdaa84350a35aa287c2e85de6610babae041211cf44ea827134 WHIRLPOOL 734fddf8e6e930ab5ef72b277a5d491e9efb389931a82cd315a5aff5ab85f2f064dca2a447b8e2b2ca0e85f14ce89830ff84955f63043126b612dc0590041720
+MISC ChangeLog 2513 SHA256 41c9108e77c945e6f1090fdbd13f02879bb18e43c7d7016fcd82e877135cc7b4 SHA512 3dcc4dfe9b75f425ca6f9ab2b75f19ce035a73f38d97c69e9bd9a45cf61688f3ed5de58127d31314e9f520dd5e64937836ef2fd2789d8fc33f287b8707a60b53 WHIRLPOOL c5c36e7670135187b124316b81872058b40a77d32a38311e972ad2c5179184bdd0f6d3fe44584abc57a0ec28957c37086b288c74be13a108a37fac3e14751f4f
+MISC ChangeLog-2015 1873 SHA256 3787422dbe088a6ae1bdfca795ef3ce5f633b1f3126a3790e37bf4a98a84138c SHA512 a89c22f8aae022fb81ca2b80bb3dc961b0f7cc020aee67d319b9708801c62860f92bcb8a78aeb6ba6a766d47d1ce32410acf70685321c5b6e2816681b46f10e7 WHIRLPOOL 7f28704b2b095adcd9ad9ef6f18ec52dd9c75dfbcdeca59c12af91b105229475dd4828c4bb2172b1858dc4188b97a70f8fda82a13bc6762f67f3296721ef0ae3
+MISC metadata.xml 458 SHA256 b6255b7a587fff6c5cebe1cf491c9f32dd89d8bea00bb676ad3b1e0f94fccdae SHA512 8dbbc0044f192093b672832681e521d55ff3ea2b3f3c74975cb493b0192c03f76279caf358f702449589d8d836a0b035c590c1fd4e0efc450740b354727fdc1b WHIRLPOOL 6eef654d6034e50b8fa82e1a5c244a264ed09c19efac9c79c2bd1579be175fc3ab22e80c5696516e616e22bd1654ceccb3d733f7978241503382dca43dcfa8eb
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/Manifest b/dev-java/jide-oss/Manifest
new file mode 100644
index 000000000000..54766555312f
--- /dev/null
+++ b/dev-java/jide-oss/Manifest
@@ -0,0 +1,6 @@
+DIST jide-oss-3.6.12.tar.gz 4751908 SHA256 a9b2954fb919cd0dcde9c01bd06e674fb7d5c4c6756aafdaecf2c7e8f1bc747b SHA512 a2a60a2af653a1c20099fe81479aadfd252eed086c1009c20a17b561502748cca1cc4b016fe184a60dcb281fd5843c63ad876ca93062bb788e55b485d0e46124 WHIRLPOOL 2cef3106ca5c29ea4763f0be9c93ccc6b1b23dd3eaaf0fe5893a3787c31374c9c55a05f40078f259b356deadc93fde1b38ded03e2145bb8370e79b6a19a4bab9
+DIST jide-oss-3.6.18.tar.gz 4752506 SHA256 bffb9b7f387256a6d4d5b417f0ac464f41054506d6e1c12d0592b80ec77517f1 SHA512 c35f4e5b0462247bb8cc207e1f2120f6a861e796893ce6e7c55e06cab76da84402b3465d420f3fc8d09490f0eb98361d3609bb1675beb9fbf145be4c0bd5ea8c WHIRLPOOL 4fe5aa8d17bca1b32b429535fe23a926ef0b4998c62e5574a97cdaac0b950bd885aa50362e4557ae988f835c05297ae9651ec077d5bbad3e1eeda9c5e2bd28fe
+EBUILD jide-oss-3.6.12.ebuild 705 SHA256 0e9a79b79e4f1328b87b6a2df34beaa4c9425dcd8bef6ddd95d6fd72f609e128 SHA512 4bd5def7916adff670bef949d78ff3dc70d07280b7e75060e6e2bcb3bf3fb98c571d3911e53abe30c5be6bf45188466f73d0e97e566febaff5c1f798f8cf2fa9 WHIRLPOOL 1116c1228d7e4b40fe29c943f7e409a19f56553c18eec0a710ae2658dfdc8e424cf097caf9daf5ac94e820ca554449c87260520038fe71052998a2321b43e175
+EBUILD jide-oss-3.6.18.ebuild 658 SHA256 92bd0b1ff4e9c6ce76cdea7689e27f7326353672659119c8f077f316a3b46fe6 SHA512 ba47cd9be0cd006fc0beba591e4982734050b98692fbf12c09fd1317029b2e930aa69f2037cfbd1912b16b7cad2146c734385ad1ecba48baad0483d9c5d23a9b WHIRLPOOL 9de5c8b87f0d8df0ba1e20174e6877ed3aba7251263545fbd7fa75fdc84c13241b551aa23e79c38da5cc42e174d17025534882c8aba44c0397fbf0ed5211186f
+MISC ChangeLog 333 SHA256 0636f217d023248c9804c89d7795cd5958084953b3b85c9e7b3d61dd0270d1b3 SHA512 a10e6e766416a6f0e65c9728fe22ad921cfabff1233fe6ce8eae6e1a9cdc806f8e0395102bc1885c4f00d5e80fcdb0f1ecf120450d88f6a1c8273a9071fb8498 WHIRLPOOL 1794637b4ef2ce76d9bf82d9b42a95c2d2425fc3fa6ab9f3d0a22631337358b51d64467951ce4736171b905796cd445052993e089299deaec6379803bf6ff5d2
+MISC metadata.xml 647 SHA256 434ddc8db4399a3961bb936d7495c6260b17aaa24803264f10da9125a5593a31 SHA512 bb875ae246009af7e6fae09c53afda05547a12c4a6f4a06a0d9f611d2578f4787c2e4dcf4bcdb220ad2980eb4f8317c3a4a8f51e3697145936b5dfa56eef34ce WHIRLPOOL 3dcebb9791ed672c08aa8ed56657209a8b2c4a6c1a937227edca9f57e3cf52035fa50e42068aab7134156d9265935685aff05c43e14063c88dad6c4d90a3f0d6
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/jikes/Manifest b/dev-java/jikes/Manifest
new file mode 100644
index 000000000000..24706a39611b
--- /dev/null
+++ b/dev-java/jikes/Manifest
@@ -0,0 +1,8 @@
+AUX compiler-settings 148 SHA256 1fbc811d45721ad8672cdbdcf826c26ee33a55956e068e52a7ede11e15f6e472 SHA512 65694da1b1520b062761da80a225e3a37117c981302b98f294686d0fc8b13e163416dae36e5db4eabf3af0e735edeced0c19b93f9bf9b0ca66f5900143044ef9 WHIRLPOOL 430d564f6d933ec0031305fd5e6f401fbe5c4542fbbdf97fbd993305ee72eda7e923fb2353029aed58364f371bebd8f22598aba416c35fe164cb85c0003fee8d
+AUX deprecated.patch 995 SHA256 59e09d783e867a95bb2ddabd29e2e8f0bad173731e8b859a45e49f2a3d0d88eb SHA512 a99d25d3cb588677695d5ce549ef476b3bededd8ea2e84835fb9e3af57c182fc2a87ca539991e963a9aae22ff437e453a8e2e20f15e08dbcdfbf83a44d084a18 WHIRLPOOL c55baeb130fc45702ccddbf6f0468f7ea7fea6d03a78f63dd4087a6912748b98d43e4fbbada1a9ffebf838b3f0b9edfeadf28ff7dee54dad8199ea2a9b6d20c9
+AUX jikes 381 SHA256 ede10b0f53b1499aa14337deb7b39d932e635aef0087ffe0cf58672cb1921c09 SHA512 9d55888ab0b372357ed549b16cd16f7592d34caf32fe3bd9f599fb8bdfcdbec184c1ca86be799b696e1dd131da9646cad09b82fa920430e8f0db65c0d3f1efc3 WHIRLPOOL 5e21d563fb5940873b84d621656e8eb3e987e8300b6653a48b19d75b7474594451dd6f86d5bce44dd6110c91e8cd8376a458f68bcd0edade832bb5e774a9bb92
+DIST jikes-1.22.tar.bz2 616655 SHA256 0cb02c763bc441349f6d38cacd52adf762302cce3a08e269f1f75f726e6e14e3 SHA512 6b318f49f075da0cf0558512748bd77072f5b5b0428160538bcba01201c94719ec0f4b0cd0159ddb04fb3a86c323c8f11f09dc4b31cf880fb94e00c1ee0bbc58 WHIRLPOOL 1c97d130c72933d2eb302e3de782f33c0ef2ca59377df554b6391f6eece41d7142a8652d9e9b5e49e0ab134dc7223793b7ef1f67c0fe2ad787993587a87855aa
+EBUILD jikes-1.22-r13.ebuild 872 SHA256 d3893c20b5c11f83da05e83806ee542d2a084b54013e26bd9d4f7637d697f742 SHA512 31ce33225ad05d1e6f3031619310d4562ca00866eb2d7f8076449d944eedda78292f381e28f8c3f613d32f54a2d21d6d7681f57500a058ed7b76242eee88efbb WHIRLPOOL ca4226904ce65eb64d077cf1e0afc74fca5d29d6376dfdf867fe2d59313b8fb08eec7af7e5dcae13e15a9308c369b66d55b9d7105cb7a435db61be6e27ced1cf
+MISC ChangeLog 2633 SHA256 b3e91a2f571139aa62ee5d30055f21556904de3509d28cd9506546fb9e8fd8dd SHA512 cc30cc07fa2d822217efa211f1b861a1c1ab179a1ce4db506e2ac3499b96d4f41c2ddfbc53118cb8ab549c85d34e0729275b2185bf15a3805679a4ee825c82e5 WHIRLPOOL bb6ccc48723fef134d055359fa7f1faa7e7da31ac5cc329ff07a0c862ac1077aed6b14986c90c250c590c190e1232d1005287379fd96c181465b78a3a9cc7485
+MISC ChangeLog-2015 6807 SHA256 2cdad99f33c6deb58479e2a09aecadf465862f35c53a8a85a48e009f4f1aca56 SHA512 d8a528edfc2b505c1f93fbcb1a970b011bf965190fb4c99e585b46157e214f33b5621d1bbef7f5cfec516f238cb2e911e4d9adb412de966e9e59c958e09de252 WHIRLPOOL c8197533fcf7c4161cc4cacb98e064e328d9fc16a30e6bddb8c46b4f665f0c3dc0af06483b4d13437b19a12edfdb2d5003637337ab3be4a54e6ae698c98789e4
+MISC metadata.xml 311 SHA256 6f02edc728ca395542ed14f7512402fec9d78162e2c36f84eed179130200c365 SHA512 bba5366ad9a24c0531133a800ad83a2e7738cbb302ea5fbff4296c0e2943e8b6b86854499ddf0b536b1e82594d351335bb034c46d8c2d60c3a7f2b8c2a43b481 WHIRLPOOL ae2e3f0ff8b04d2a4bafbf8fe20a9e02552a18398f4fe4f95006e865a962b9558b9b04d80e8f06e75af8395f6c03dfa8e2ea35cd1b5e3be0d8be3475c959434f
diff --git a/dev-java/jikes/files/compiler-settings b/dev-java/jikes/files/compiler-settings
new file mode 100644
index 000000000000..0e50102cd2ef
--- /dev/null
+++ b/dev-java/jikes/files/compiler-settings
@@ -0,0 +1,6 @@
+JAVAC=/usr/bin/jikes
+PACKAGE=dev-java/jikes
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4"
+SUPPORTED_SOURCE="1.3 1.4"
+ANT_BUILD_COMPILER="jikes"
+GENERATION="2"
diff --git a/dev-java/jikes/files/deprecated.patch b/dev-java/jikes/files/deprecated.patch
new file mode 100644
index 000000000000..0fd05253a6df
--- /dev/null
+++ b/dev-java/jikes/files/deprecated.patch
@@ -0,0 +1,25 @@
+--- src/decl.cpp 2004/09/26 22:40:411.144
++++ src/decl.cpp 2004/10/09 18:04:501.145
+@@ -2596,7 +2596,9 @@
+     //
+     if (control.option.deprecation &&
+         hidden_method -> IsDeprecated() &&
+-        ! method -> containing_type -> file_symbol -> IsClassOnly())
++        ! method -> containing_type -> file_symbol -> IsClassOnly() &&
++        ! method -> IsDeprecated() &&
++        ! InDeprecatedContext())
+     {
+         ReportSemError(SemanticError::DEPRECATED_METHOD_OVERRIDE,
+                        left_tok, right_tok, method -> Header(),
+
+diff -u -r1.159 -r1.160
+--- src/error.cpp 2004/09/26 22:40:411.159
++++ src/error.cpp 2004/10/10 02:59:401.160
+@@ -513,6 +513,7 @@
+     warning[DEPRECATED_FIELD] = WEAK_WARNING;
+     warning[DEPRECATED_METHOD] = WEAK_WARNING;
+     warning[DEPRECATED_CONSTRUCTOR] = WEAK_WARNING;
++    warning[DEPRECATED_METHOD_OVERRIDE] = WEAK_WARNING;
+ 
+     warning[UNNECESSARY_TYPE_IMPORT] = WEAK_WARNING;
+     warning[MULTIPLE_PUBLIC_TYPES] = WEAK_WARNING;
diff --git a/dev-java/jikes/files/jikes b/dev-java/jikes/files/jikes
new file mode 100644
index 000000000000..e80c048614df
--- /dev/null
+++ b/dev-java/jikes/files/jikes
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Copyright (c) 2005, Thomas Matthijs <axxo@gentoo.org>
+# Copyright (c) 2005, Gentoo Foundation
+#
+# Licensed under the GNU General Public License, v2.
+#
+
+[[ -z ${BOOTCLASSPATH} ]] && export BOOTCLASSPATH=$(java-config-2 --runtime)
+
+if [[ -z "${BOOTCLASSPATH}" ]]; then
+	echo "!!! Could not find runtime classes" > /dev/stderr
+	exit 2
+fi
+
+exec /usr/bin/jikes-bin "$@"
diff --git a/dev-java/jikes/jikes-1.22-r13.ebuild b/dev-java/jikes/jikes-1.22-r13.ebuild
new file mode 100644
index 000000000000..e6f424f95dde
--- /dev/null
+++ b/dev-java/jikes/jikes-1.22-r13.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="IBM's open source, high performance Java compiler"
+HOMEPAGE="http://jikes.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd"
+IUSE=""
+DEPEND=""
+RDEPEND=">=dev-java/java-config-2.0.0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/deprecated.patch
+}
+
+src_compile() {
+	filter-flags "-fno-rtti"
+	econf || die "configure problem"
+	emake || die "compile problem"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "install problem"
+	dodoc ChangeLog AUTHORS README TODO NEWS
+
+	mv "${D}"/usr/bin/jikes{,-bin}
+	dobin "${FILESDIR}"/jikes
+
+	insinto /usr/share/java-config-2/compiler
+	newins "${FILESDIR}"/compiler-settings jikes
+}
diff --git a/dev-java/jikes/metadata.xml b/dev-java/jikes/metadata.xml
new file mode 100644
index 000000000000..4841c1e936ca
--- /dev/null
+++ b/dev-java/jikes/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">jikes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jinklevel/Manifest b/dev-java/jinklevel/Manifest
new file mode 100644
index 000000000000..28068ff306e2
--- /dev/null
+++ b/dev-java/jinklevel/Manifest
@@ -0,0 +1,5 @@
+DIST jinklevel-0.1.tar.bz2 7892 SHA256 56a9fe8c21611d116662974e1dcf70157ce8d454abebb5705df349f17968f928 SHA512 6ec30afd7331e3ef3393f17495a3b0f5f89a014f5f5b3bb45113c1564e856e46b79d7c7f6fa079ed6436f28034175db84aa6ec69b2b662967808bd22b2d47797 WHIRLPOOL 5a0c72503f250fcdb0729b981199f3fb1e72c98f8071fc6743e70a9488d545646d848315287f4a4c55bc046c6fc780ebd27d9369f09d094d8f2f2273c9dbf48d
+EBUILD jinklevel-0.1.ebuild 721 SHA256 c3120db68a20462c407bfb7b6c8f8c330cf06718c2b98ed9490616487febdbe8 SHA512 a42cb802e83d13427e4f267d78ff424ea28bc48b5a1ed6e57626d0f768ee1713db405964cc8504314b340dbaa2c0cf152e32a84c3c56a7a00fa838b9ffbc4a1d WHIRLPOOL f4311213838984f0ed1831ab9c0bcbb11600eafbfbde29451a6f950d13ec19888c85b9e8ac58d3d339ee92f2d6f98ba9cc41bbd2a6b11d314aa860a081572aaf
+MISC ChangeLog 2592 SHA256 68b924e4a82ee16d01552f8c302b1065b652c1bedb078522734b9be4011c7ebf SHA512 030389f042241d81566159ecf266201b5e43ce0afe84d6d59d88b232c559315cd86b33cef554289f0e40a981f0f9641f8a17864eb5576560a555f301475c4e4e WHIRLPOOL d336691f72e1accf7a0517b967b625a892b12e867827f1cefe156bab4063d6981ba038a59ee85a4036e83fb9a16d2857af461479edb9a6d6ac29d19dab65fcca
+MISC ChangeLog-2015 746 SHA256 ff073ac9c543dc866f65dae2cf31f0fbaf1ebcc7e4f5da645239e986271b79c1 SHA512 64552f09c3d553e8392ef105aa565ec0f2dc3a25b9d2a92d65f76ec969206c8f434ad009c756d712a2080c89b31291225cf8e6294928002e500afe534f572fde WHIRLPOOL cbe141a45b6b723fcee18b7e0245710ac5c9691185bcb5474d20960170144a8e97b7897b2e0e440d41e1f9104a8a1719719e80569f9b5299661110ddc48e81b3
+MISC metadata.xml 289 SHA256 ea9025e7be831da54a8581215ed1133ed73e427d53c462a530c4fea8116450ca SHA512 a62a10bdcd24d253d4134029406c417dabc1f6a1a675a5500a848414fcc18235bf20e84926b11108cd213fcbba9536fd7c10520e8eac65052a62f0af1be660a4 WHIRLPOOL fab21cc2c12a0b034a9592bf7bc6ae94a791499e8902526987b2049de3adc6eee8a22abf9bb9fc1b7d9c92aa224491b34ccc9365ec0d4493fb45fe90203d37fe
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/Manifest b/dev-java/jinput/Manifest
new file mode 100644
index 000000000000..461ade13453e
--- /dev/null
+++ b/dev-java/jinput/Manifest
@@ -0,0 +1,9 @@
+AUX javah-classpath.patch 469 SHA256 7653b41686f8cea84aa926cc58b796ef3b9474f3208116043026f61779e9f7a5 SHA512 a10b34e593980e24e0d9dbf0419cdacdb9c03059b54d3a811f3dadc8838d223cc3e4800feeb1ad0cf3b65d75117a0dbc7061740b40e051c683c4180a323bc916 WHIRLPOOL ff7806ee4a1e5cda6fba848b6bf5d05ad3af91d9e064b0d12936a1eb6e708e559215a18a6b3f0bfb0e120ba175f78479e6757b5341286b05ec6268a733525713
+AUX nostrip.patch 431 SHA256 f9c1622eb8795429cea8aa91f5f30ab829cadd50215f1f4214bc67d81371c1fe SHA512 0f1cccfef58afca9c1db074ae179bc9d06c0ae758a859671e362c229279d2b3c570356ca2e06bd319f1ba6674f601f4fd15479adf1e1410779a52eec9e1172c9 WHIRLPOOL 5ea4f713e84b9ac2100e86fd9d30ce0f70daf04d41d0e7cdc8dbad0aede1f4efda554d20ed17e3fd87085b06ce1637600e24c1e796bc99cc7b8a3167a9ac04bb
+AUX remove-getDeviceUsageBits.patch 4109 SHA256 25cc77c93bc82689ed7f78934c245551a88d3a2fa2d8f4b90174964491e6295d SHA512 e5d5a2c4715b00a08b909965079fffb2a0797a0a762481c76135692a66f208bc86b7610db525ed82997c90bb5c70f590ba1062833c00104b86112b0a1e0d6176 WHIRLPOOL bd7cd28a387ccae991bf54d94a20229d2d19c00f5ae1fb71d47b12bc7c62a2cb2f25b9e6f89904a8b53689ae34313ec5ae0c0754b075766140f94b42ddcac30f
+AUX unbundle.patch 354 SHA256 70ff37191145a870738e4753e9b81c8a7e43820865be26e8d3f8d4f57fd79e44 SHA512 99d933a2bf501fe209df2bdfe8dbc0f756b78715c322f6f4c605e40b96aa3773cb8592c52ac2d752e720245bbb310e7bcf52409e97a74e06175f3c995a55454e WHIRLPOOL 887840f774dd1aeec353ef965879bfe6a7fbfc96383cd0d9201e0426a0d390a915b77617bdafff5ca1c41483fcb9378eec5fa8cfaccba6dc0370fa5dafc9395e
+DIST jinput-2.0.6.tar.gz 1590738 SHA256 220f5cb5c9ab8d3fdce4429393f1cba4fb47f835c5cfb9a982292709d39b02f4 SHA512 770b3a0724334b9182098797923cc11e575b42cb67c5583d8aac7aeb432ec80189199daf1ef624a56923c4ecce271f05adf0481c13b8cd6997bb1862a7a91eba WHIRLPOOL 04e487510976980891b588c56be2245bce8d13145579f192761621c2b43511060c7a06fcbc3baf27f3ab31a55d735d0fa66bc0c3e2bdb068032014f118743bd0
+EBUILD jinput-2.0.6-r1.ebuild 1251 SHA256 5da2e24ec9a93c5ff47a10f0c744f0cd61af8d83732751281e66bddae36f702a SHA512 6143fd69d97b780f2ba8b22eb29ceb636bfdc6249a53828981a73c73d29fa6740457ad217f77c4f7944362285ffd7a1349d140ce16e6fb34073816b7e2fb6b70 WHIRLPOOL b098cf98dd4fc78001d470ef5ce4433fc07a5a18264d5625596c8c83badc4fbada99dc38ba23632a83d62ccf5c660d23c54b2aff22e61e0923a8d1c0ea8346af
+MISC ChangeLog 2549 SHA256 fe66830f96444cc95560f12cb1163d826caf878e4f0652639b8e8e92366d3485 SHA512 38c7c62ceb4f50b014d143b77d5c347e5b7b67a9e36d6f94d6440d8176877e271748f6b5ccb92fa9a5ca40f8e6573d3f938801fa90f65eb9d160c2da349f2291 WHIRLPOOL ce82f0cce2d0449f7ff43da1d88ba5d12e087f918e9422e9a69e34a7022af1d1fbbd9dea6636e7d3ee76c34974aaed0d6e715b10752f7a9dd725fad3c5a748a9
+MISC ChangeLog-2015 715 SHA256 8917a39820ac3493f1e588a4b264319c334d5eb6b11401fd43945283e99b7bd9 SHA512 b1342ddf51928e5774b4dd51e7c43b35b97469eaa83ceb90446b0155fa072fb460d2bbb35877246ca7d124545d53e21ee327056a7d51276095c26cedef3deedc WHIRLPOOL 9d69e50ab341857f02eff86e7e9751420458b5c508411f8802b1f1c625a7f5c5d1f5324805fa2249abed2f64c9295a52370959e2381cba0a54fc457b119fd483
+MISC metadata.xml 657 SHA256 6c97b9ef40645bde10ca3fa9788dba0a0112f162b96c4d291b77194db8e07a73 SHA512 2fa1026b4a776a5c527de51e4291b4cf12f58e0b526e329101b6c1cc9cd05b405919b4187b96b35c93977da3c8e80722984aff841d77a78d5e2ea6e6911073ac WHIRLPOOL 7821c391a431b36328f72b8d74cb29c842f1e69a8fc1e163518c2a914d9e34bc37889de549959fe102654c6b347a5eb0e63238e1f2cd8dc4407e627913788b29
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/Manifest b/dev-java/jisp/Manifest
new file mode 100644
index 000000000000..3390e178bc0c
--- /dev/null
+++ b/dev-java/jisp/Manifest
@@ -0,0 +1,6 @@
+AUX jisp-2.5.1-java15.patch 1828 SHA256 9c96ff406dce1572ad86461f662c41de8de4c8b1c0b9e3e274ecb050481e54be SHA512 b6221e375ad98ec8d4eb86b3a0d720b898358d9528966b31e8f4f39e8eba595424ecca3d5eaddb0866efbdc056d2dc68b1c1e4e7e09ab2bf637f7e7e00c4b039 WHIRLPOOL f464ad69245d6a35a06c6e1d85a5f5207c26738c8d266b994c80a0a1cd4a529ec5b08daa8724655d6434ea6639f61f14fde323492a775ab9b990b1983f019781
+DIST jisp-2.5.1-source.tar.gz 63282 SHA256 fc45285b818f69aa92cab72f8a87a070eba9e8ee2c199b9d0e170fb2cf7ab7ba SHA512 b82bea547e6725e37285a5d332daeb8ecf300a6f69004845a308a3ee87f143e7a7e8be34925fd288523e36eea64479010915306ac33871b3bf4310c54a1c26d0 WHIRLPOOL 850f0b617066c30f347ff2d5c0e78b423be3ef062bd481f5610f43774a64421df7ca59613b30deceb152b055479b6392a9474d82094f25acdaa4ca4dc6df21af
+EBUILD jisp-2.5.1-r3.ebuild 797 SHA256 1c24c936f8f4285d633047918692a43e247fb1c267605bc0d6a130903ebd4751 SHA512 26d5c32ff26de6b83c79e6bf302349f66db636273ff4a8d430075b1bcd55dfdfef00eff4f4e2e2f6a1df64aad2a5dd242aec92ea314494334b0f8eed183ce390 WHIRLPOOL c07874a89e9e08cff4c26178c67b30673c69b97a56610e6f3629a74e02fd6f91952ef7481fdd0940b5f2721c1edf9f45820817b155d3b19bc423e5528706eac3
+MISC ChangeLog 2920 SHA256 e8e7645ada8debe200e2105128649836b8b2412fadc76fb0bb91d2e7cbf62009 SHA512 2cbeabaa053d46618b90b7484ee89fd927a839b27d5f9a0f8ce8081e6e72d69d58ead5018762ee7e39383ff7b5958c06cdd53fcea97846dcff4c4f8b4e5c7c6e WHIRLPOOL afab0e577b18c35bbd3b602a5c525ec14959078fcc3b4e47aa74745e48d20b3d5ecc1779c000b8f596d1a8ea185adbe0e1979f57f97915130927a516adb7d3e4
+MISC ChangeLog-2015 1523 SHA256 c8c046aa5ba1a2b1d276d6c59e02d73eb0d921758d4729d9d3bb0e6a727e376d SHA512 d567211300025b1b5d4dab2863341b32444180d3e26309f5b2021815adf7383d08c1a6441943356e746bf5e6ba441e0883152df04f3b0dee70fa7bf6a1a07a96 WHIRLPOOL acb860adbc97f4b70f84a5d12f4cd103e175be665bbf51fe52afe754bb2a360419972c4a7ffd24d3a5cb9036edb67a3d1081051865f0e3846cc3543ecf2e4d9b
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/jlayer/Manifest
new file mode 100644
index 000000000000..2ab8c3f1a32c
--- /dev/null
+++ b/dev-java/jlayer/Manifest
@@ -0,0 +1,5 @@
+DIST jlayer1.0.1.tar.gz 370583 SHA256 1492b28a62fdf13d3f42bb2ffa5628c33327c42df5d7b66194937c65deb6382f SHA512 904c3aa049d9be4c5569a233abd8c933fe85c58b26cf9e467d01e09a4245fe9933f8e7d8e3b2abf328e6f7a197f69acdcbde494b99c97056eab2e4936060ee08 WHIRLPOOL 50ab10177a2df905d478bcc8bd21f7cf12d89620c8f557994e9f52a9e48cfb5d3980f98e5d3706b65b95359a26677aa47c4546924432d885c5c51eb11f3fa216
+EBUILD jlayer-1.0.1.ebuild 1182 SHA256 5e77d608302338dbc9575702a22a948339f9fc55d650bed79e89124a7b69876b SHA512 8e6972c19043aefe583fc0856f23e4dc198edbb2f167b7035e54aa80f4bfd285ad6ef2b2692f24e8c28bbeae451eea1c145b33f062a23873c2f228833fb5c0fa WHIRLPOOL 8c495e8fe91cbdced74a65c488d639d094742ce64282bab2ed91961e50d354cfa4be27589f75aca5f2b2d9c36ec733c88c56090cd2f6a7510fc854420e9965c1
+MISC ChangeLog 2424 SHA256 91a15975055417b80eea8e2c2020bd8ba2a53758a3f85c80d93d29bdf7d67563 SHA512 21a605a57c4977d25162429d1fcd980c5e685b0d2f20d01f3375ecd3ae9bd5cee6f1840e08af1fbe0a02161518803866402634d9c62356f6f5286fdb9c031db6 WHIRLPOOL 994b71fa194bea7b0cbf99195d7b239aff970815492ecd8ad49558b8acb5aaf7d337e5130ca57971ccb2a95008a9a64f796a5fb1f44cac2af9f86bc27e8f17e9
+MISC ChangeLog-2015 1177 SHA256 52ff2b1a14cef244c6ef6bd6df5590c1f1516f4e080be26de94fae6d25c788bb SHA512 740470646cfe185980c5ca323f77769593debfdacd9cf256ebf291d9c98344f37a8d3751562e48d68a50888798f201d87b8866a38ba090ea4bc3c00ebb36c314 WHIRLPOOL bb6c8aa5571c80bd89d10de733bfb236e02985ab3df48296002ff275b2c9d1dc0cb6ae362cef1091a091c99f92f40989a6dfa856a18e529d339dbac5eea8f233
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/jlex/Manifest
new file mode 100644
index 000000000000..3a3a922c16a0
--- /dev/null
+++ b/dev-java/jlex/Manifest
@@ -0,0 +1,5 @@
+DIST jlex-1.2.6.tar.bz2 45868 SHA256 8367edecc3f31f0f55d6b1d92146d6ca9eeaf76de5eb0ff8614a0a2e38e4a2b5 SHA512 ebe16f87fe5b524de5c31651b0d5a0c282fdac99814c8f432a850a394657da4016880fba0f7418c8c42a989e78145d39188c3e68b79ed64fa1911d5680b00b9c WHIRLPOOL 43c51ca8b3ce452329bc7681f34bfb7304a0c9f6f2bf1d83eb8d048bed8863d7f037c38444146234160345692bcd3a3838279ffe7746e3919c37710edf156d9f
+EBUILD jlex-1.2.6-r2.ebuild 870 SHA256 4ddae9ddde665a8aa32d559e56d6d1de72efe33cbefc53f003a5051b39acbb97 SHA512 27aa4c8efdee4e0300ae131f7401a748e2b766a2741a429d36b5701a077eec6e7f858999165440741e1be8c4bb31b00898f67125057fb4d34fc98930afc9e234 WHIRLPOOL cb2ae9f75d3d6a230bc155ba478c826807bfbf88d8ce6edc277f9e276d775b85192912c1b864432c72e849edd35596216dfbd0abe5b2116ff56a40e9dc2d4335
+MISC ChangeLog 2980 SHA256 127290b65bd9213af91788b695b98a13a8b71a665d745516efb048829b3fbc21 SHA512 98e20f0024ef336555dccc376c7da102864a2f732124f17301a89f870bc9f3b0c257909517ccfc2026da3c6d44d1b1ac89a2ec07a566380617bc918f038aaa65 WHIRLPOOL 3d2552f53ab22cfd5f054e521b361d9c41c5e4a923861a39a10fe9045be3cb57c97a18d5bce244e5e8ca697fe17cfcb4e18ad5fcf07a6cef064c0bf75d59b920
+MISC ChangeLog-2015 1955 SHA256 cfb8711b5f6c95d4f5fac74f77ed06f632091897d5fe013145f840ef0357afd1 SHA512 31f60fd58162fa0cacf68d25632a550322ff5d1681e5f56f4382e817bce12cd2ab96fdccf06e4fcda206ff7cede23bdcde9db6ee2e6b27d122e9f985b38c799c WHIRLPOOL 507cd90cf32f65dedb7fdcc1b1963715308ce7c65aecaeb9be7e45550d9e201311eca5fcfae19cdfdb3b57397a4caff0798bb340bcd5f9a824c1d432444db079
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/jlfgr/Manifest
new file mode 100644
index 000000000000..fe965a747e01
--- /dev/null
+++ b/dev-java/jlfgr/Manifest
@@ -0,0 +1,5 @@
+DIST jlfgr-1_0.zip 66708 SHA256 808e70ffb84c0b948638bfb799be42ad9eebb026a6fcd322704086dfb257af1a SHA512 a6d9b6a617508bbe95afba23eed414c609078fc76dbb0bb86d1a7aecdb7d2e3ba57d58c7d60d29b0f7f36e12937e2838ad335db7fc714efe8f062b84dcab674d WHIRLPOOL 95612d1241f5c4143e66e99708bde25e9279a64767380cddd5c780a4a113eff88bb626ac71c3341fb9d6fe0a42312645c04ef6bb12ae4307511b77ac0918f3ab
+EBUILD jlfgr-1.0-r2.ebuild 647 SHA256 c822663cc90a7b43a64315498b4a77baa4aed2a990895795148bb2597a32f485 SHA512 f9fe2ec2d9de64f79117efb272dfdf7a15cae67ec1ef1ac677b2a8fcc49e2d9f8e137c42edef7285d18b2fe6494b44850fb48290946657f28951576069936c47 WHIRLPOOL 9894b4821b9ee8587502877477eae7c2e6115c7a4919b4cd5fd9887c439585585e5336a31c1e84ef2f16f7e0a68811bdad2608a75bb3885535aa84872b32b8b6
+MISC ChangeLog 3056 SHA256 39714db794f60efe2eda843803c2e1b5ab7c6af11f7e3fc0a929ddf8257231cf SHA512 0b0d255f1aec8debc824172dfdd5684852b60f1e92b1557d2a2c036af39a022e8ab3dfdb299e2ff13686b426132e5e9ff6f2de263498119a35c6790fd82a4c85 WHIRLPOOL 8ab682d74b17be6badc972238267b8cc08fd9bb64b005714dff1a7b8f49592709b6d97a29346252962f85ea29c68d2e5a6422771d4ffaf34453aa3d5b650d516
+MISC ChangeLog-2015 1518 SHA256 8136d58911658bc2b24710c60d358b4e1689a80301a7bffa072b027c4c5822a6 SHA512 2c70d027e7b9c453a6cfec90e4803df8d7a737de7b46fac01d61859db5d00f14df0777e6e4367ec948a99c7f58b330cd631e4535d1acbb69d7f0ef41888219d6 WHIRLPOOL a85ee7512677740988bba97b59e8b767a6aca0d690c12d7b338aec8bf3342409cca671fd778342648a288a9211a8e301798fb9c1e078de83708d258975bfed7a
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/jlibeps/Manifest
new file mode 100644
index 000000000000..4d20956ffbbb
--- /dev/null
+++ b/dev-java/jlibeps/Manifest
@@ -0,0 +1,5 @@
+DIST jlibeps-0.1.zip 85686 SHA256 078fcf9ed6720f693f6eaa669e340e84ab67b938d9cd92357783194596017d44 SHA512 ce28d31d8aafaac2e493fecf8cf95e84ff5076fde7e4d2be8abcca5d849b823ab2b31303fa4f24450ce29aa1bc71f451c880213f820343a98f1aff0036693b5a WHIRLPOOL 0802ba9d4e0560b5bca9ba97112cadaac8d6911acf5774afad98adb106201d1624349d1e84a445c1d818c3bff9319204a5ddb87f4880a3595fe2eac3eedce871
+EBUILD jlibeps-0.1-r1.ebuild 534 SHA256 9d5bddf5681990c2e03d427030297b2ec331b189cfa684350be7748d0746946b SHA512 b915aba64fc8dde67616dab0fbcf1892b3bffd3c531414a38d4582fe14b44ab98b377dc987265e0167a4b36833cf162375f7ccdb42c41029dbe89cc6d0c3ca80 WHIRLPOOL 93d2974a16799923675cc5e0078ee2fd7ad6b57b5e8dda3ecf9c503d4fa0f557cc2429e1490799c0d06826de3039c2ff85e1b05329eea0189dbfa7fe22259e9f
+MISC ChangeLog 2972 SHA256 5af283b6c97850f4024a300ded9d051c67bbd1b0a3d13e1eb5a3b8d72260f5a5 SHA512 4a838869b1a85bd84b080f152429186d58a48394bf504b834f3f24e882b9cda289c71274d44a08bcf229b9611112281ff47a7e2bd687df0dc4cbcd014af8c7e3 WHIRLPOOL 4a74b41eff0e9148542740d59075054d7e6466fce424b86a418f09dbc178a5de52f408b4710fac4a802dcb1e763bde5276e4af34f7ec17e55ce663cf5f4bae36
+MISC ChangeLog-2015 523 SHA256 f7800a07e32f4f5f4c4039d1ff3a1b493bbb3c3ef8e88d5a21c24be3257b668f SHA512 0619ef9ae8ddb27d9a7b8f61759d36225af189a22af84579ccb23e84d9c4039bee9d8e5ce84a2a151bdaa79de44df92282c8ba88da7bc473d8c9e7641b8e19f2 WHIRLPOOL d7b74ade3b130a119c19e6d87adcdf227fbc24b2cc1551130a38e6f73520001b4760979bc2c2bbc84a6129dc56967b77a88ff795b64b92e2215e3b3e5c520b09
+MISC metadata.xml 313 SHA256 d5163d1828ae661a14f72899e0cab95923dc1c304e721ae093a2a05079c9eb81 SHA512 5009d20a82fd81237740bebc3aa937b90a189286cf4dcae62ad69c5fc0830b150864a520ef0eb2d87528d78abca4bd64a3c8106b53069dfa78911c64fc4e4a19 WHIRLPOOL 25cae3e3d87c653d02a90ad1261d15e62380f6123e3af0208a71fa6f50fb48a993ca60099df2fedad583cff8d41f9a7cc343370fd24359a19903446541c797b7
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/Manifest b/dev-java/jline/Manifest
new file mode 100644
index 000000000000..9904800b6f3f
--- /dev/null
+++ b/dev-java/jline/Manifest
@@ -0,0 +1,9 @@
+AUX maven-build.properties 501 SHA256 ed14880aca9146984f0b988b66e83c1d77e3367003371570855a9ac5d688dac3 SHA512 2e3347c2b53266c7d41cd9f73e79bdfecd28e41e78208b360533414ed551f101d04e4a76d416f061e56bbce43baf96c4c52fdba65ded3c0be18533c2c226ef6f WHIRLPOOL 29ee5d331c7bdf52f0d6f066aa936ff8dcf4b54479aae46d9f30f77e35443646c82588229a12f30fa858d901103913790a5b97227d1078b9874f246e516e9294
+AUX maven-build.xml 8634 SHA256 92c9be86eb0fcff6c3e44cb352f81e615627a96a7f25250ee53c5b9b34f84c0d SHA512 45648b88f3df01e0623483c6c409ce1fb57b6b73e62775064b4bc7762d1dc3a3ead3a4925efe987986081ed34c26195827f3f34a1b631fdf4e7ce227376c2936 WHIRLPOOL 4631c8b7d4475fc67be975669943cf208ad0610f891874eed31678c05ad9139e06a7c62127a981f89c4a69c9fd7ec6393c0dffceadb521a4861a2defaa38dd59
+DIST jline-1.0.zip 463082 SHA256 761458d1541a44e678b3847917116a90001cf5cd22287c24c55dcf2c69ec73ca SHA512 2957e19a3536d89aeaf8f27afb1f8eb4eb8bcc99560244c7f1ba14693a84a2f5e677a6c21d5f85ec519674cc4cd6cb3c9e4725cb4797144168d2f6df3954aba9 WHIRLPOOL d80416660992a9fd6d13f350d7620556f46f48fe9071e939de555bbee35d3e68f6c6eee64ae18e03d826e8928987f4e2193bcf8fee1cb027a1a9791ca89c0cce
+DIST jline-2.12.1.tar.gz 97289 SHA256 41c03847f862c7eceb3c5b1cef9bc89f62db43c53f3328e46a6257bebcc7d68d SHA512 368492fa0b28e6aa3827db05d266b332935d9a03c2f6645d039941c61a698e85fd57accfac444503de4cb2f2dae5787496924b8d258faad1c18b6cafe787f99d WHIRLPOOL fdbebc7e16fadced5c0744be0175d47b3a0f12379c588f994d5870f685f421adeeb842192e0c14f855bf0a094ace4d11cb541397b19453324a1e6b031a3f5166
+EBUILD jline-1.0.ebuild 1644 SHA256 2358c9e955ad675a40a0dca177cae9f39d1e50f006d01570a45238880082f23c SHA512 195e08810e2e05ab6c3b2009ae407d3040505dfb12c303164e22110a9695e471d030e513c7cdfeb7bdcf0374e3f2fed3c1330138db0d119ac667e5a25e7ce26b WHIRLPOOL 9fdffa099924830f111060304da194b31381a22370a1da67dd40f761cad8194296981c514dbacb098e9edc880eda3af253e33ec85252343696c76a9d92bb042a
+EBUILD jline-2.12.1-r1.ebuild 1261 SHA256 3e71db91f9b6705ab5d72e7e4292aaa1eb7495ce4627baee9dc72cd340554b51 SHA512 5ad7918d7a0daf969d45fdc2c3b3e8355628d331e229e989a0818943a940cd77900a305f5f7c46d2b95333ad2e8fc6b14061128aa5603bfa92352696bbba035a WHIRLPOOL f4d68d46d359743a0a1f2ee9109e4c58f59967b6b81c63fdac7293386397d4716bcb1ca6cd74b0d481e27ce6f5b33f7d5a3e90e7a535cf0a9b2132faba14b439
+MISC ChangeLog 4102 SHA256 9e68bbfd34d5af634d7af0c460ec8847b7c8e546ca78a872b0051ddde8c0c67d SHA512 65815b935e4b670787cac8647fed64ce19d24b87bd9feacdf03d7e5ae321ce37606b8a44b4aed82e2009f03badca709d366cb51bc5db9c010ed9b8cb000c6f50 WHIRLPOOL 27daf1f70b8638260867388f7df5890365feb3dcfb58f780d569eef2a7d70f89f8a37ec4cbf1240fdeea2b09e0970ada4755b8aaee154809751b69d5b7092ffa
+MISC ChangeLog-2015 4601 SHA256 a07d790663e275a7dd9ad20e43238d5d4464914dc40ac97ce74d9a2b3bf3cef9 SHA512 46b8da0bfa2fb9dfd6801650ca2e7e27a580d2922ce6f6f672b5e2de1f706e6e5288ea5b4eaa0e71dd9d9ac285e7cc89c43caeb52b04bcef6b331537457b2b27 WHIRLPOOL 69d69c9d38a8931fbe91ef3936e6363e5f3a94c80a23437392cc8f8179945baaa8ea9c2d6efed66395fda9ec32cfe7a9d644d71eae3786cf3c6cb64cb8c6a0a4
+MISC metadata.xml 375 SHA256 efff1585858cf5fbab12fd0c29f6107eab4da9dbe48a00fcdeff37ddce4c6050 SHA512 17a44da075005f0417e99ae638ba547800d799b98375f73c4bf7fc418b12e33e916952812850b63c623234bce98ebfd6eb525f7015e67cdaee16c38ad5f4b684 WHIRLPOOL cb84612b64d00efa67bfcaa86acb03c51240ede84a41f144ad119385365ddb011dcb76fa0cedaaeae021326c4d1db43cf01b6c5e0d5c5a4e2139c46e2ff243d8
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..d1355aaf283f
--- /dev/null
+++ b/dev-java/jline/jline-2.12.1-r1.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"
+
+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}/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/Manifest b/dev-java/jmdns/Manifest
new file mode 100644
index 000000000000..c78897f280f0
--- /dev/null
+++ b/dev-java/jmdns/Manifest
@@ -0,0 +1,5 @@
+DIST jmdns-3.4.1.tgz 665503 SHA256 aefc28fcb0a8d8d563abfe0b764fa91a2737aa8b19f8a8f859a96a50fe663ebe SHA512 06e01dc7ef9eabd1ba75be016d688294043a6eec53de40d20026587f2c3d82bd0b025efd9b662bbe28450940d277da0fbc30ef69293ca3e81426212d8e85d7fb WHIRLPOOL 1df820435d9d1ad72daaff2d2467eb0d5080b8e74bbb9b18da7333feabdf48b25b39cdd29d453535b00ea3f2a20231282e49a9bf845075815bef6eb498bdd9f8
+EBUILD jmdns-3.4.1-r1.ebuild 631 SHA256 bcdb7fe6116b1567fc4fa1a1afc6f5ed981506187bfdde612525a9ec126222e4 SHA512 8b6697eaec225ec03b51be3159168015866ff8a03b909eff50b619c0925f0b63251fabde7333e3d75309aa43e65227f915ad39df529fe220ac0d0edb709d16a9 WHIRLPOOL c6a69f12c4c7c527d1a884d7a6dad566b4c38c267ac7e32f35f950a2c72987fbd06babbccd34efeacac64000b76dd1c16bbb42c0611a8ce5d9e5b00f34e7cf76
+MISC ChangeLog 3341 SHA256 79ee0a5f62e5168db17ae354b3fed1a1edcb8b26435bf94cdcceef175fcfbc71 SHA512 c1e58243c16c1bbfaad24b03867497853f31d4a8aec4b0fbc90f5596c48247be4c4db9e41b5fbdf56eff23cb24d4bc77243769511a1383a185026b99a31c12f5 WHIRLPOOL 7079bd46e1cc11cdca633f3f0b852bab1ab7dd74423a0ad5989bd91c2d46ac64bdae90d1d2bfbc0d4d710afbcb019a828852b96b668e206d795834f2e70599e5
+MISC ChangeLog-2015 2395 SHA256 0bfca4bedf2187bd37dcd379288f1a90dd479310ea5017d00810cb7c6e77b138 SHA512 f8ade5cc208300c124d5ce3f2115b1b79566c8dd886db79ef700403221eae1520a94a9a083dd8a70004236b9131a25969a59a375ba37c3d4a21699da0e0d9136 WHIRLPOOL a4033681e5e21b7bc00a84c0eafe4f56c120e1e2efa4fae3e35f0cb922886bbbae7ae82973a4f6d8212f609574db1bbf0b94f31dbfaff0cc2ce341b80594620a
+MISC metadata.xml 517 SHA256 3b9422b11b781d82c009deff7e45e9bfe5157cf4b4e1e0af21fbcd92a143f39c SHA512 4f2ff275a1b5807fce359c7d536f3e723d43d2e0c0e83ff6ffae787b4b25bf64eec3b7a3abe3fc959736f0eeda331c1fb2c4fcff15b7b4e3bbf1ded234e7796d WHIRLPOOL e40e4cec9b7c62580a357af2b26440992859c9114ced568bdda571730dec9c3e22b20f9d894baaf5a5f3d0136db3b2d6b07a9cd034c89f1e244b75455671f77a
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/Manifest b/dev-java/jmh-core/Manifest
new file mode 100644
index 000000000000..fbe6b0b05b3a
--- /dev/null
+++ b/dev-java/jmh-core/Manifest
@@ -0,0 +1,4 @@
+DIST jmh-core-1.4.1.tar.gz 585746 SHA256 1014bbea20eb5a3e5562ddb26c109dccae73cfbbd2b240ed6a40d82f543c42bc SHA512 a33c63b82712deb53218bb8d955c9606e5f393ff0c6256052ac8df022ec45be79bc0ee5ee08ce0d3762594214814bcf1e562717d83daa9ce13c664ca9e7c431b WHIRLPOOL 656ca251087231d7c8b2db99fb8753c9e62c9f5a71c629ba30aba3662bb19131389eaaeef9877790d705eca5bbb7e5074f328fe6eec99f58fb15e3cb34a9d177
+EBUILD jmh-core-1.4.1.ebuild 977 SHA256 db63c434b2aac864b4c9197ebcb7170977e071ecd97e31021f8844436bdd99e0 SHA512 38beaf02a01a0c12e6148ba3c0d337cf6c04b2b6c996955f74071fa522b8369bf2e86f4ccfc12dc8b90b917fe27d64efd6c6cd231895aef22d31b4ab3508a8fa WHIRLPOOL 685017bf12047fd7115234a3f95eb4c93a961f86fcdccea2323e7cafb2d67cab5e42e16486cdd06d5d217acee15787941d3c4476f1af243ac5fd50c1ac70425a
+MISC ChangeLog 315 SHA256 51d8ffc3d1d62a3c009bd20c5e8b56817b594fbe0b3e84c038032e85bf1815c6 SHA512 73addc8182219481d122da728ab99a66d6458412fa601f4f5d2830830528bf1b675661675fed75aa1140eb725f4b0b11bc2d0a0ec0f86f830d2da6dbe874a4e5 WHIRLPOOL d40b1018011934e8ef3f1ed08fe814d4d837170b34ec04a6f693666772331186b298084d981771a3fbb370d8445eeaafd18153d4dd859d3489241ae9fdf79c4e
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/jmi-interface/Manifest
new file mode 100644
index 000000000000..728802427e6d
--- /dev/null
+++ b/dev-java/jmi-interface/Manifest
@@ -0,0 +1,8 @@
+AUX jmi-interface-1.0-enum.patch 1334 SHA256 38598be041414d96344c8507ef3e0958f655d370e2f6fd1efc3bc4b48c5ecd54 SHA512 462a3d987fbd2e5461db530c9b0af5d9af17a2b964050da3c7cedcd42159e9acb97262ff292293df9f964585d5652b48367ec13153ee3a2a14135633430a5a1c WHIRLPOOL cc5072a017d9f86c1efe927726aec83f3b684c0f85913a0907b365f0fbf8be530403f754f71a411b7d29315f1c5e280c30f5ebdde160b4e6cf55119d44fba71f
+DIST jmi-1_0-fr-interfaces.zip 38946 SHA256 a5b99f353ffee25b34c8fd628ae896d4fb9af70d2e6433db9e74669ffe456da2 SHA512 40a7b983ca8bbd5c35f4e2ef0acda7ecb09230c80a41fd17998a24ae57216b579e0e33bcbb2348d0091d1e75c1132be9bcb959a957519fe9d5d29f347bf1eca6 WHIRLPOOL a6affcb7d67cc52a1594921db8e57f5bc22b488dbc303e828525db847254a9bd777508565b608526f58af4297f36bd389a4a2a29f84385123646ad4b03f8faed
+DIST mof-1.0.xml.bz2 7076 SHA256 e4b1f36ec115624625912894f3df07eb705246ec3aa1091d376763521dfc7db1 SHA512 72dfee938fb3cb019928d3813743d5d535e1a5dbaa39915f5af84c39f9a701f8b043150e53f25b3745c5bbf25010144735834b121e3884bcaf044db6ff22e722 WHIRLPOOL 132db0a562e1529daa77d89db738ca8ac6d25950fd4c9e86946b85ada5d1d4ae36eb5cf8be0e118a2dba43989dd24f841052c0e79012c6d568a288f242184102
+EBUILD jmi-interface-1.0-r4.ebuild 1066 SHA256 52fe4a5c0c30e2e9b1dc2fba49fe43df08ae83a9b0958d45011125bf5c2f868b SHA512 ad36962baf004dec9d9e207ececac7b4810b4b495754f97d00ba40e2ce4d276778ee2a643c00472ea52839c3d88eb7f7e8f3b87a3e38194143e995a7082b0ceb WHIRLPOOL 7fee093c5a99f62370de5930f0d8a3ec275ea7de1238efc95a664fa0047970994d2497676c933d0c9ac7d44878397cdd5f2aabfdd28314068e318df462752820
+EBUILD jmi-interface-1.0-r5.ebuild 1049 SHA256 fd4286c679c6131ce69a0222d6450048dc7e36334f7fd5deb2423f7eaf31673d SHA512 f2829dff8811db5854a38fd174d33915fee7e79f6dbc580db847cc28deb4c1872f968fcc260c2ef9f67880c4fe87ac30de762e54f3bdf2ad91d76b07e79dd6a3 WHIRLPOOL 49cb8ff9a333010a9621b129165600b3acefc6c6bf2fbd46820087f6b07f384a145a18597845b115642a128f26ff31485cd70b82af728db8cc54217a0150f599
+MISC ChangeLog 3125 SHA256 3404a5261da3ff7a0cbab06d0fcbbaf861aea6d9a16bb7afc3f807777d09cad8 SHA512 3f8d70ce36364ddb80f347b9c1d829f09d876c8f99001b508cf584841e53f9f09181cc51b6a4ccaf9c73e3e492955214a45539b79285654e4da219d0d25b301b WHIRLPOOL 91482933bb5e68877715d40e21542b52177f81de8c9e4d3b64baebd9f996ef4ee004e42c34a38b022cb1d848663bb50c1c2d640697aee9b16c7cbd258d7dd1ba
+MISC ChangeLog-2015 2294 SHA256 990ef96a48a19e625cb876ae1627e5a9abacc952b7f7752f3b9d32ef695a964d SHA512 665e719d457d30e589334325672d55f8adf25c1ae80235a618edf266f0143af76d9666739176f06d3961fe2d4604f12a12055cfc4602acb6e0820a0f63a7c3fa WHIRLPOOL 8a71e03ea9a21e9c17651eb3f1f48a38a1d2bc0a277ac269639f2b82981ffee544e38ce3f235976093383febfafcbffdb3ce26bf4a9122131d3131daad3fdd57
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..ba12af789cba
--- /dev/null
+++ b/dev-java/jmi-interface/files/jmi-interface-1.0-enum.patch
@@ -0,0 +1,24 @@
+diff -Naur src/javax/jmi/reflect/RefClass.java src2/javax/jmi/reflect/RefClass.java
+--- src/javax/jmi/reflect/RefClass.java	2006-12-09 00:45:59.000000000 +0100
++++ src/javax/jmi/reflect/RefClass.java	2002-05-02 13:44:42.000000000 +0200
+@@ -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
+diff -Naur src/javax/jmi/reflect/RefPackage.java src2/javax/jmi/reflect/RefPackage.java
+--- src/javax/jmi/reflect/RefPackage.java	2006-12-09 00:46:08.000000000 +0100
++++ src/javax/jmi/reflect/RefPackage.java	2002-05-02 13:44:16.000000000 +0200
+@@ -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..b533b75527f6
--- /dev/null
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r4.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="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 ~x86-fbsd"
+
+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..5623e41a4f13
--- /dev/null
+++ b/dev-java/jmi-interface/jmi-interface-1.0-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 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 ~x86-fbsd"
+
+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
+	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/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/Manifest b/dev-java/jmock/Manifest
new file mode 100644
index 000000000000..5db997368a4a
--- /dev/null
+++ b/dev-java/jmock/Manifest
@@ -0,0 +1,8 @@
+AUX jmock-1.2.0-AbstractMo.patch 1189 SHA256 a0ee7711ae0c47d0a11a5e16ff5268361e5476c3c326a07cde773bf58514555a SHA512 b4d59d16c2c513031b3b36fc2bdf4526cee8bfa405cac4c2c76d850289a835ba6e57d4e042ed4afe2814a217dcc1493afe80af9fd17fa066d1ada96af6dfa663 WHIRLPOOL 020c9dae844296c0883acdf1eccdb102924ba68c7d43d88fbb816b29b0c0187661b617dbf9db8f3f113b15d4e46a092accd8a33c84312acbcf171a81e03a8f17
+DIST jmock-1.2.0-jars.zip 153214 SHA256 44a98a4982b7b8fc65a0a2b12f73c488d25981df1e938069639baa28df0b0f01 SHA512 5290f1d14cbc3d0f223bdaf59716b037dbc021c8f39a3784d13af8d8be3edbddc5e2eb4754b80e78ae954daf12889210183e7e11c110012b4d9320344efe19da WHIRLPOOL e8e6f4d976c7678fe06882df6e17e22d80f4dfa5f21ad09a9901d991e8073651af2dd71a6e143d3fa55c941ae16e08278474f08cfda2f3bf8503bafe39ba33dd
+DIST jmock-2.6.1-jars.zip 1249841 SHA256 e49a0f7628c6368e46de1c48dfd8aed084f03661d87cf3a78025fdec367021fb SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e WHIRLPOOL e67be30e6718b998a34a52cdaa59ba7afc19969b5fe08529ea056867c0b8b3fad2628eb04b8b0b778bd215d29fe4aa962b0021afbb64835eac845f76c4b5987d
+EBUILD jmock-1.2.0-r1.ebuild 998 SHA256 4453307e8128738fd5c239abc5ca5e7ca1134d9f52fee19a843526b6ee12e214 SHA512 7539d04bf327d02eefee2880f17b66bfb7374ab98a4bd632cdf14ca83893fc8868dce06bdfec573e432108d64bfd9cb07f0a6e4b1cc0f9608c37d3069208ce19 WHIRLPOOL 48e275fd7b35c55945580ddcdf9230a02650db20d5bfb67eb796b3d2b49920f6d77c33e0720a52e9e629f5c103c31b916cd46acca324ec46997c4fc0dbae4bb7
+EBUILD jmock-2.6.1.ebuild 812 SHA256 6fe7faf27e7be63af1c01da429d6087dde48200ca7fb4b0abb5c33ba1fbd28d0 SHA512 a1cad09703ea22c47a6e898daa43764c708eb2ab400674e7efeb4b0d61451de1d0153495f81d42ccfa23a73ca4884df841f5262a148cf7c284d609874a9624c7 WHIRLPOOL 0ecffdcc7b3246fb96d9748999cd8ceec78021347eb5906ea7d763fb7ce9af1eb9da1c9dc0b917d2e3a3dd4061b743e144f17fdc7bf7ff157cae8bce6724059f
+MISC ChangeLog 4417 SHA256 9d8949bcd6e976da3dc7c2d83ee3aff798b987098d983f0d1905147900af1882 SHA512 d8ab0ce18cb7a1d379afe069131f4acd9a78277e9d6dca0daffb2fe36036b98cedada325836790dbcb7c9e402ee2cba16834bc94a58524b8e87d268507ddc7bb WHIRLPOOL 21253b0e8b9ea6502c8c1e1312fcb5b025d0d627b981086d2aae1cfb749d264eb566f027fa27a891d995dc60874c53a35fef77284a61f5fa10807220ca3afad2
+MISC ChangeLog-2015 4483 SHA256 a3079d06a719dcb76ebf5fbcf77787de4d29d320ddf689833db2765e65b08f51 SHA512 9a44b08d193887e57fa2e8c5ca3be06bbe2708f195b3d33af44b849c7af16a7f63e88961bedb6037daa1449932613a0d5f6e0de992913692fb1c7ae3e9bfc10b WHIRLPOOL e02060ba8196f12c05e47e09aadb1a14c9a9ee1876712c6db82f477458742163d90c74869227bec81e71054d9e6a3c85472b2a57020bb4038e057d2a2293e720
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..a3b3508b11b3
--- /dev/null
+++ b/dev-java/jmock/jmock-1.2.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"
+
+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-fbsd ~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/Manifest b/dev-java/jna/Manifest
new file mode 100644
index 000000000000..98dc07ff9076
--- /dev/null
+++ b/dev-java/jna/Manifest
@@ -0,0 +1,9 @@
+AUX 4.2.2-build.xml.patch 819 SHA256 52329e01d05e16e2ff8baedd1ba0ed0594288dd320ca11333cd4bab3222e54a3 SHA512 8d2e0552690c9282ce93e39aa489c1fd829e5e63e39c6e6db935b6b5e2308a3ee3cbe1a274ebf2ba59d9819dd4f618d89e22194a9f88dec0763d2a36cd3ca44e WHIRLPOOL 5b1c32397f3238b13ea26a505ba0553b35abe33e5d6b04abdb677a1852ab07d6915f162b520867c794bfe049b13adf808537865b3e5fca87fe4587863c933660
+AUX 4.2.2-makefile-flags.patch 925 SHA256 8a281010a35367ae49dcf3ba649f2975b6c3fb60c563b2a4fb9b96ba78e2e8de SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54 WHIRLPOOL d3ee51e547be96df1a5730dd8967d87261326c730418b64c2ce75a7c954e0fdca1ac68ebeb4f382f19f44ed52753cad2073e5bde52979f625cc0aff53a2ce2ce
+DIST jna-3.4.1.tar.gz 35285043 SHA256 fb0ff552a11ddf18b82f1e3fbfe01985fb7a41e242124c63257bb685408ca16e SHA512 8164de9d213f670e6408627ec13fc128802351c2b906e1e1e95fd3280917ef1eba24d8b6b913a9df8034d20a5d46f6f823b5ee2d18b83248093a1855c89c5917 WHIRLPOOL 9c06862f76fbab7175f134a3f965d7d944ff536a03f03256307f8300b1fd1c9888c6e312bb74a80088128278efa9f8f7dfca668e4ebeacfff91bba3bc97951b0
+DIST jna-4.2.2.tar.gz 58638853 SHA256 46330123be97fa5c11b1747c74470a39f2b1a3396d66fd6ead4d034660eb094a SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f WHIRLPOOL a8cd562276c4e2955ad5aa178660810f6dd45d0bd51f1c267d1a8fd139f9fb6a45aaf794a03c9f333c51617240cbff0d79f57ce73e4fc341c431b3ab959055f1
+EBUILD jna-3.4.1.ebuild 2305 SHA256 0c0649d2e4b1224651cce4172d8f9e99919f30bab3a2441149433d2aaea943e9 SHA512 b1847d11f7e80f3d1e29c642ff95c571c77ee352699249bf8c4ae70ee3032c10fe292cbc77e851438184f0535b7bfde72940a465f69bcb8b8d8ce71c4b3399b1 WHIRLPOOL 31bd6e1ea8a21dcca00616d4bec17823486ca8e3ea88980035ab1f68edacd525b5cb4ab9f5b4942a2b4e586e4a205d01562761c72a976400f1aced39f61adbcd
+EBUILD jna-4.2.2-r1.ebuild 2076 SHA256 ca1ef991a5ea5c665c7b5c53f7b4925e9ef631f48f432f16b772e2e1c3ca3892 SHA512 6b6485c517432b2e03c620dcab0fbec437dda6dfffe856b097d9bb71d9ba64a97609fd2f84afd152b14f2c3acc3c52ce67e701e2f026ceaff056c5185202c135 WHIRLPOOL 4220e5e9cc6f7d5d1813a13de046cfdd930b89ae9314af4feea0d302ef1e130080f5dee12da7a28b5c31b2614b0a14ca11f4dc7590cd9aa201074ff984b3a2bd
+MISC ChangeLog 4210 SHA256 624f8459237a20bbf5d2bef83738a9e05119c5c5f1d4eb3945f6a8d494000360 SHA512 e3fa6a6cb013a4c5f62fc6bf4ed19dffd7f49f0c5c9de39cb83236660fa394243e8f3305e1642597efcc837efa5765bfe2b4d38b0a419f607ddc4da74843f6b4 WHIRLPOOL 85f872808f7f455275e6706bde8c1ef5d52c79009f4d1c2ca990c2d50febe8e908defffa94fb2c258f28ca93cc582bc13982ad7c5cc5e14be36572d5b60184af
+MISC ChangeLog-2015 3948 SHA256 90c17fedcb24fc33f874a8178a8a5235acf23fea8341081a9ba477e790019cc9 SHA512 6674db251a789663014deff2b3390d367980239351e5b4841af6656ca44e2181fa2f8fc6657d072ed0981fa5355708e969de732b9c2f1e6723307b3c95bf828a WHIRLPOOL 705650e938a0f087183cfc22104bd5fd4ad50296b0bca763ba34a88f4174ca33fbb5a485c0dd47c1c46fe6490810d7bea419403e1bf0912a2851c142ae3d54b5
+MISC metadata.xml 462 SHA256 effac54ba56f7d3804d409d16a4d1691516925dd38745785afba8276fc9d2789 SHA512 88a027ef32c55e551625950ecb2efffc75a7611568f11a4abdcddd4fe24b894eb7d8fb805cba3fc0f79ddf6fae6116804790fc24b3d5b6097ade9ad92ed4c118 WHIRLPOOL 2e068fbd8b5f832cae34149b44474eb999f404a00c91da4eea1ad453b817cf788d379512417028468eaa4e631308759774fe4f9c2e9ff9a7419fc608db33cdaf
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..a3210becfbbc
--- /dev/null
+++ b/dev-java/jna/jna-3.4.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 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-junit:0
+		dev-java/ant-trax: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-nodeps ant-trax"
+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/Manifest b/dev-java/jnlp-api/Manifest
new file mode 100644
index 000000000000..f759fdb35023
--- /dev/null
+++ b/dev-java/jnlp-api/Manifest
@@ -0,0 +1,5 @@
+DIST jnlp-api-6.0.18.tar.bz2 10518 SHA256 880c3961f99c8d8895a972d44425066b173804f67169538bba5b9ab3a5eb8489 SHA512 e3b7ed5092255b665feac2c37341be81bd71c1f2c925851338f1dbfb05bf1e1a8f09f5fea63c08ca1e737db7072b6ee25ec55cfaa18789e40101d6930785209f WHIRLPOOL 94590d3d345b6d5cfba8cc35d583fe4f527ba988fefb44dcadafc538057b1fe472e9c464c25fcaa788bfbd450a0a9ec1a4cb50e9a4709c7f3b12f3d4485ab8f8
+EBUILD jnlp-api-6.0.18.ebuild 605 SHA256 d2d27960ee67561a45ba281656dd578f4c6a7676844cdb0028d149a429792aec SHA512 a8082c8a10c131d5609968018bd07a04d35495a8ab5260229a91970ced0a23e3cad00e33b01606763da38a888b9199d69d2b0ffce4c11b1d2db349ea1b6aac29 WHIRLPOOL be9d4115d50c36fb66d1b63078339d3f2db8de9aa75ab6ed5865cebe7e6f687fb2b661896dbbac26bdf7e10347c766c2734eb987f11e36d12300e7730b61068c
+MISC ChangeLog 2458 SHA256 e9bcc34f7e72bf25f970a7a54d6084406eb145c6acf8ebbde9fbd1e82f526bc3 SHA512 e075825aa4672618b31817635c9bc14251b92e1fe7b0a66ca2b21af547b16372a39c158b5b61e6ddf144c3a288b613733e16cee77e79a924cc498ea9fb68029b WHIRLPOOL 4a7cf290af80f911dd46bfb75129544dda5b14c0644be9c3dad1d930e3445c3480d71fb922fec364cc9626bc9613626f44d37d9b90b0740055d054424cce407b
+MISC ChangeLog-2015 915 SHA256 0e5c3bb9e813d852dafd9456f25404763c065a84782e230da903c8fd9d1e22d3 SHA512 aa31130cf9b2bc1c77f591fe5b3c9d55392d27ba4bfe5e7f01d0cf874974b6d3b0ef8a3de58ab584d4b025c56b99947940ee4c80de175d80923e7a1f421c65a0 WHIRLPOOL e1383175e9de3688527d53064dc23fecb899cd6bf2125117498a36cba28c192f00442a2ecf2cbf9b115efc73ea172ff207ec9331ce4b519bb4eb3ad2b799a63e
+MISC metadata.xml 353 SHA256 2c4e6789f43efaef6ebc6541c2fcac7cb40e0221fe15200019f50413d8839d0e SHA512 488871f2e58d0fc66bc3ddeb7f6ad7a62be17716e5af4f33cde5e2c755afa760e25ee935f50a186a32dc91a3e74ec635cc84d59dcdb6c2ee8f6bf67cf5588d0a WHIRLPOOL f54b1679b02005a5f317813bfdd79a0395a636eb14255c3e9704e74ce8408023a87fcaf97a93e96b053f10e7d6c0419367a499cb427f4b9b8ede82577405a7aa
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/Manifest b/dev-java/jnr-constants/Manifest
new file mode 100644
index 000000000000..37531fc9dee0
--- /dev/null
+++ b/dev-java/jnr-constants/Manifest
@@ -0,0 +1,6 @@
+AUX jnr-constants_maven-build.xml 11304 SHA256 ece9c0e5dec6f2794c5dfa64bc3031520597dff0c7b69faa286bd2d3d593d047 SHA512 ebe66da46f9d80e02361a895c2aba7b635cf0a4e550f7a4f4c5534684bcf06585b43458381d6a3dc526d0f020b96bf93a259d2b4b6125c23e5d6d571a373ce2f WHIRLPOOL a849304c97578fb41ce810d10d884ab005f3a942e41b8cc97c982ee2b49a3edca8ef12d380b8fc793f105d79befeb58224435cdc8245e6289eb5255180dea82f
+DIST jnr-constants-0.8.6.tar.gz 71080 SHA256 6c90abaa12004962032dcc4958adcb256b663840b082b07f3fee8e038c30cf26 SHA512 2098f8e1869b9c018ba3afa70ef386fce2609d9c650ee851dcd7cf7dc9d4d87dbe26886eb2e744d96cc11425f6b66144a018826360b7bab48a4b99e323f3717a WHIRLPOOL 108fbe7cceb25b21192047761e418e56e6939e62116a8896f14a804f56c541e58b43c5904df972075b8307dabb8134b83555c13a2cce5af294677ac5d0e6591b
+EBUILD jnr-constants-0.8.6.ebuild 1058 SHA256 39a126ac196742e6daacada5a1b549c9d272314568eee373d9817affbfb934f7 SHA512 d1fe0d566c5b8749bea6015a5cf6955763d187e48d4855147b9660a87dd8f0231f4a678080569f5b0b6ab48024d61948b232a0ef23451420c6969e2ad830d985 WHIRLPOOL eaa230e7536b34544b595e34d5f26f94728622e8502838c1bf29e1739ad52588b2df7c62cd4e625a858a8c319af32c028a5e69632b4abf7e95cc1412b83bc982
+MISC ChangeLog 2687 SHA256 e289c6daf772e290746a7b1a67cf8ac8e2fe39cab61ee86577108fe0faf32262 SHA512 83c8670eba075bdf8645a164b80303f12e10f93261504ef67ecae88fb652974e624086f7bdf9ea4ad1a53dfa756546404fd9b50fabfbcdc7f00e72b7a843b5d3 WHIRLPOOL fe2ad2b3f3f70b35d02e9f1351d99721efdd9eaba1483eca89e8bea653eb8ece72b904a6fb77388be68d3f8d78b534ca7eb57793b905f49da33e742351bf9355
+MISC ChangeLog-2015 2665 SHA256 51ab5d6b56a9a279cfc3698e620a568d35b323d8ed4d3d2557fd61de91a35518 SHA512 f0daf5f22287bb2e40ce092ca54c254f94c71af883dec7d5d9b5b4841b897e1746b8c5ed1103d62c003b9ca7157f7a38cc19d1244b8d68ad52e8c0c1ed42cd86 WHIRLPOOL 67877b9888dfde509a6203e5e5c603632693cf5688bc801d023236fd82560a6d37ba9f948eb17bed051e00f93e5172a921be9c96a8d56742d14427de9999bd8e
+MISC metadata.xml 328 SHA256 db4de756aa31d7394e307f2bda848667bb7d17a0be61d9faeceb0b50f62aca26 SHA512 1d1c798e6e0c6443cd8e1bae74248d22b7daed826174cd97b1f9471113421e8aea7dea46b98f59f79ed47386a297edaa16ce26099af500e4e4b766d6976df008 WHIRLPOOL acbd76902fb529c129096e07fcc30a31524110c737240c7c5cd4ac2992c920a90f1f8ee033dbb33c3f99ff83cc508b5a6ef3e9a994e2050ed9687fd009dfa7ce
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/Manifest b/dev-java/jnr-enxio/Manifest
new file mode 100644
index 000000000000..4e01af2b625e
--- /dev/null
+++ b/dev-java/jnr-enxio/Manifest
@@ -0,0 +1,6 @@
+AUX jnr-enxio-0.7-build.xml 17106 SHA256 80963afb03b7738fc888ebf9388492d58ade76530fd07e3b964e51a56717f042 SHA512 e655b5c8900ef050f45fc2a59dbfea520061fad94380d2e43757ed35f676a59f0816d006b4c6c3100cb063c29b44eb6e168edee65027a4a86f9c523ba018ba5e WHIRLPOOL 4a4f974b608197086c5cc93322498ca9cbd37d1f28799e641de6a54073cf7005041909a881ec7310a0174c874d570f691d3b177cda5d67d4ac25673520398807
+DIST jnr-enxio-0.7.tar.gz 10520 SHA256 6fa9757b7bea93e780f536a124d73dbabecfe0a3badd78cca33021a9ac8244ee SHA512 ed8c13ae4de2334aa9ddd9a13534e0c49fb1bde48e3bd5085a62c96f2b9fe6970b4ba08fe6b27901c5e6db1b360511265ac276ca56f89fddf5e18db9726bd834 WHIRLPOOL e5d0d4f3408578e5f92e2b7dd330f19b484018ed1ab90221164a947e938adbe6e8b679796f5e21a2c031484fb974c2b5bca591b5d3ef6cc0a0c9cd9be65b2b18
+EBUILD jnr-enxio-0.7-r1.ebuild 941 SHA256 dbbcf27a2c2c5299398596528d92407bb6b9589895c20265a8a8893ea6ba5504 SHA512 e3457d222de26e86948170130453b6470c5f7e63d7e01cf5f42c39389c775bb6322523e93f3d589d99ab8a31b8a39fa0a25d73e1938709207df742c16423c12f WHIRLPOOL 49564ba989976f9688ed50f53a595789379ed7b25b29298f4086bb066894329a8bac2a1c7fb4e5356d36d7dc1f1816b49ad90d20a9906072309e3eb8b6f45e9b
+MISC ChangeLog 2933 SHA256 3d53db3cbf25aa597fef2a9c4be0d87e3b0208b5a09e398b366e8905ee2e37af SHA512 356935d7edf98ac869e9534b0b49b298bcf73e410fa81cb2c2456404fd7b3abb85fb624df17c2bbcb43d26e535a411e8fadce0139d19de113cc1c52c483bb7a1 WHIRLPOOL 12e19ade54cd9330cf7363f67b61dadf7a4cd78362de7a65aace82a000ec1155abd0b0181ecea06477eb41614b35b43056b4fc2cbda61dda5583164ec3a5d9c1
+MISC ChangeLog-2015 1148 SHA256 818424dfd334acb30aa9abf03626d3a88faddba8c895230e2b5a7e77f3e87d2b SHA512 a75a4766147c970d1c08809c556dfaa89eb83e1614a3e33fe8e5df372a1c878b0fcfa7c25b69cfd3bfde8d99da448359290082539c1711c9babc7e6465bf346e WHIRLPOOL 9cbba110336af9f2ec7b8cc3db5f092e9d5f6ea6a7d991c73ecb45c5e6323c1c14caf548d4e5b433c4281e3ed339d47c86eaf1c188e85fa9a6f9bca5f381d5b1
+MISC metadata.xml 324 SHA256 36bddb3656d8c3c25becfbe28e30227b16a5b422e7907b35b94917b6f0527e40 SHA512 6f93b386f5899bf9771f983da31cccd57811bbb3b5691c71698f5a09915e448ad7ba4258da0cf1781d589fbf40611340034048b327b0242bdfcd06fcaa4c1578 WHIRLPOOL db89c609bbbe0d539715bb90702be29a308bcf33f8230fe0cc3f60c9b9633453b3ad66f9dad8bf74766fefa43dd33a21a2201af669f1cca130ccaff35070b253
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/Manifest b/dev-java/jnr-ffi/Manifest
new file mode 100644
index 000000000000..20d168938434
--- /dev/null
+++ b/dev-java/jnr-ffi/Manifest
@@ -0,0 +1,7 @@
+AUX jnr-ffi-2.0.2-junit48.patch 467 SHA256 9aab14e22055438d5b6fc8aa50c6923fdc5775458d558ba97309277eb7455e4f SHA512 e7b5bb64d65b432a028fa709e4e050feccd4f3023fa6d940f89a2ef67f489f8eeb6dfb87c08eb056f47f4a5019c875225013ca559eb065cca105d54f51b5e884 WHIRLPOOL aa6317f662efd57901f986043366880b629fdd45e30ccf20c9c37aa1e92a9022479c12779a69b6b434a0f9da9da06677a7ced20e35161252b85e87633a128092
+AUX jnr-ffi_maven-build.xml 11211 SHA256 8a69395ee802785c1b55f4527cf594ca18c59e2ff35b94c43a40dde8eeb06919 SHA512 612b793b664b71e1a1b924aabe2da16c6b0b70947640b3d5b6d6994ffecfd7c0b30991b3a2bb711130052870dd63b9d41f43a54221e52017510119c5d3e4f359 WHIRLPOOL 81497fd103c5f445d5ac5a3548fce4f3b138f066dbd8bff0aba58f7f2c3f17af072a152ff9e22bccfc8a787871caff68d4bb960bd72db81699e891dcbd445be4
+DIST jnr-ffi-2.0.2.tar.gz 170707 SHA256 a79772f3c46cd5afaf272752bc9a8292c8fd53c8302f8dc825a3cf2444ee2ab8 SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0 WHIRLPOOL cdd7b4b27dd2018747d0a669f7237f30def64bbde18486e81ac99c538a8d0c4679237c2402f955cbada773558a54492cfdc9f0a127d3de4007472339215891e8
+EBUILD jnr-ffi-2.0.2.ebuild 1388 SHA256 c981d96b0d31844477bc51abdf4be101e15732f8a89ad0435a0313e8fecd7ef9 SHA512 6a3d4b402eb4b8e6ad0e80509e510414c3936bcd7f176e2f17179d117aabcf6adf50d53cc28c2744a21eec0c5606494c8501060c6ef88b3bb1265ec408604c25 WHIRLPOOL 3c4a8f91cba272652f71b676b8d6144665fa738a90051867334f66c34d5bae01a879777945dccd7cb0355a601910149b726ad030b3c5fb823fe9f8dc0cc8f2bd
+MISC ChangeLog 3233 SHA256 c1272a8134afcb91898be3137616e0da8e9f46cace3263959d377d05535f0d88 SHA512 6e306bf1db9c5dc922a23011409f1007793eb81077cec3cf210a20ebaae99a5a9db72f4aabe661833fd8b903f95bc4bdeda018fce9e8d8005125cc48b745b650 WHIRLPOOL 831359a8951b52f72e40fbd12a8ec02b05eec5df0e497233e9013dadb11f1833307976182d3db27f5e2f4795544d2d81afbce7476022bef46c53ea5da0fc0391
+MISC ChangeLog-2015 3795 SHA256 a6c4051e7108693d97be7beb8193badab687afb2c44564c6c6db22b366e8766a SHA512 4ce8df490bddb5813cec6080c33f233087b94037ff94821c35ec9d8d602745c52a83487b253012590a5707921f1b5587296f92faa771408ea4d5e6e2199139cc WHIRLPOOL 31c4d149d86a2773f6c4e514315eaf35a5ba6f5be6b35a17364e920f12a8ac652a1b7f6a1faa62ec5b3ef25a6ae5adf9b96eb77ac8d4cc19c1ab57eba0a05de5
+MISC metadata.xml 322 SHA256 b5168fca227563ec9ed11c5425addbb9a68ddcc07858931b668029a0b6b16b34 SHA512 522ccfcd9fc4871e9dccf2c2bb56fac98f695fe999f0967f1e689d24bba779c2c9e8cf657c68b1be9ad54861fd70778c0f1c8b2bb7da589085660f0882896efb WHIRLPOOL 3395c0caf7c24569fd96a70aded500d7e1f3dd44607183b777bbce4a23d059e66b0a1e5c555ad9e7d1285bd56b520fc04f1caa98c4c37f26187e8015faa79391
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/Manifest b/dev-java/jnr-netdb/Manifest
new file mode 100644
index 000000000000..3f767e229870
--- /dev/null
+++ b/dev-java/jnr-netdb/Manifest
@@ -0,0 +1,6 @@
+AUX jnr-netdb_maven-build.xml 9637 SHA256 fab6833838210cdd393863f9fe2d69b3bb26e9ef0d7f37a00074493a27350c94 SHA512 befe514fd332f5eb6495404b0f0d8edc428be34a1745b16dd2a20d2b859d251670e549036099884a810e3b5da0c6a4d311b6b0691409cae1b6c14d20ee763d24 WHIRLPOOL 999d99a9d1fceb4dc90fe88882cf7b097fa16784dea5b5a2385d6e8f2d09fc59677fd9997ea7e26c31dd0bb63a02ca0517bf7c0b134400fff5647cb8ac22c064
+DIST jnr-netdb-1.1.4.tar.gz 648347 SHA256 d67327943c8ca59432bda152bd4a8611ff1eab099f2d4bf08a743dfd5f963c69 SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195 WHIRLPOOL 0319025334a12e59df01da1f13e74401373ec7e7e2ea30db549e9e19e226d74cdc74b62e9c5c78d74374d05f98adcc3d18bdfc40a8e760a4c5f2b5fa3c7d4a76
+EBUILD jnr-netdb-1.1.4.ebuild 1133 SHA256 758b934f4ace072f7b0367201c109fe8090852a5667e6212306f0618a0e11619 SHA512 8083073e3f32192e19787ca01b05278c9e0b7d58016d0018202bbc05a5a6beccadcf543e710d59acf0250cd9526ae7a527438f7daf6765ac4099e76f4afed0e4 WHIRLPOOL b1dad457a63459d3bde40c5f4ac3e774b66fc79970940bcf38f9eaa55ed9f7db7ac9b30637711931fdc83984e80139685468c42f4eb43deaa43e0fd0a04b5d07
+MISC ChangeLog 2859 SHA256 a5cd8827bf62fc2a6ecb3ef2dc8ef095c475a1cba3e896f6b836162022eb51d9 SHA512 f1a0fbd4a83b61411261accb08834ebe4d3cdfdffcb98c48155c66b70d377b09fb183cdd2225ebaf1132fc82e4a7020b38df3d9de4e540fc4ce082024c50c9cd WHIRLPOOL 235ea3c5ec4afcad36776b26a42614fd1d157abb43b1c765658c19aef02acdd488864cc5e765ac076f7067dd375f980871933017c1390b88c3b3f8c51d5417f8
+MISC ChangeLog-2015 2980 SHA256 725137ffc1b4ae2e79386d0d01b1ec0d7f501c0b568dd7595834ec3b790b6ffe SHA512 d195afac4438d8ca1bbabf7b28749b65760fbfdd0c78bcfd3f8c01c29b6a199b8f3f8478b60c10d31f724969d0f83c4c8225f597bd702eedcfb393c4a125deb4 WHIRLPOOL 2950d5e442ebb528acbf71fd4f05407e94e2ce8076fbbb6e23d99d21e55c575a6adebec99a897285fe48e22b2805e7b5288e10ed13bf44c7faf7a81386c161b0
+MISC metadata.xml 661 SHA256 2a980f970fc4b2466aa15dc570b4f0aafd52e7c674bf512a653e5d1c8e108fa9 SHA512 0c7660f9c73bfbfb9bb766443d175a817e21be2113beed0d2167d3cd630dad0d89efe7ca14808f0db621549836515ad05f1c40f826e0e6c2801d456fdb5b1428 WHIRLPOOL 75a5d990975ef632bb5815fe3a065a4eca8f6c1372051a2b2d776ccbdb678828c06e4ee412e72efb5e0905cce7bac2b93ab41940d32d86e3bd089e975f37eef4
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/Manifest b/dev-java/jnr-posix/Manifest
new file mode 100644
index 000000000000..99c80cdfb0b8
--- /dev/null
+++ b/dev-java/jnr-posix/Manifest
@@ -0,0 +1,6 @@
+AUX jnr-posix_maven-build.xml 11760 SHA256 1d9dc44187241278fad78b9030d8bfac9ade7ea4e1f92ab2c1fa60616d13c71b SHA512 ab3f6b00e08cd7fff5f44df1c2a0eb9e73d3ad7400e6e708dcd1432b6ad122bfb0b8dac6417eb67a02d0fc2d19477d81287d2b202275676826081610d3e27d8e WHIRLPOOL 977c8324901c0febb7a14732ce7cbb3f12e73cde1ce8a4d73d5b8fc07c6f5e80135b1262c5c892bda4b9d1e5a509a0ade6511b0c92403de67e9671eb1c246fc1
+DIST jnr-posix-3.0.10.tar.gz 85912 SHA256 bb68f39e911563458cea6334cb32733618836b5f96d996528a300a457a1e3746 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1 WHIRLPOOL 169a774516eda1176e8b631bbb16bcaebef287bf5c9ce1da871071df40081842e5405e7c4dae15f1c7054554b2d8e907bfeb3dba20db176912082cba1b83a525
+EBUILD jnr-posix-3.0.10.ebuild 1241 SHA256 201a18edf4c018ed7db8d2f4243d4672fa5ad98bf21859f64bfaaca622cc3d93 SHA512 a89817b0b1217cf3abc7ab01a58167f7fdb860e0e90794fa025cdcbc236e82763c1f7134cfe3830b51ba67bed21d3d00e63052c959d7551a8f4370bf3eef8892 WHIRLPOOL 9033ba607327464ee98eea686f153412897236c6a16e74f1a78544b9f1426e050eaa88bbbbcaba80703c30d0bf0da43e39f1b1ad3867970418ee116b8de999aa
+MISC ChangeLog 2890 SHA256 8a4ff6457dce3ea361794294752355f0eb807157718fc16c27303e578e136aff SHA512 d8add9b8f6003baf561c5ec9a614e7581f404b6c4ac89fb497902f902510c3a74c163676eefe6365e4024f14d172b51906340d4e9cc89989851986c706240b1b WHIRLPOOL 1d62057c5638a3a19416a1b00cd4341b07a9452b744f469fb22d4011e7e99f52e187ead8eb7b08a3b0fe6e2bc9151530e05f5979ac5ce88cd876c523785d5b3b
+MISC ChangeLog-2015 3759 SHA256 cd07af3e0287313e8c409c5a5b73ba3f07ffbfaec529479bb54b4a46bb90b460 SHA512 b2735b7531ac226fc9c979d6e38d969f6f76e57be56f6da52f73b955658bda087e6cb6a4c16d67ff877ccf56fe4131b5a5b59b5059b198f2e0d976fa1e9d45a6 WHIRLPOOL 588d974585cf6d0904c8a69bf190c20f4fc20d51f8f247541341e675de1bc737592a28146661012661257719db58656ec432d6d31ba247b34f924879118b3b91
+MISC metadata.xml 324 SHA256 adb6b164fa318db319bf3cd0f9925424470fc8b695750e2c3561da42df127bcf SHA512 9f314e4997f05bf23bab85356f0c39bbcec2158d8ff566ba5ab6221ac076c46e8d8e1474b05b2fc25cad4b8d95b40a3d01b08858c0e4325449520d7042ab2eb2 WHIRLPOOL 2006cc7ce020bd7834c3920fe12b235846ef12f36518438abb5b337cb401bd73b4efe14bc1f39d29ef17c971e21601498e85c5b76426b09f6367807ad8ca9673
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/Manifest b/dev-java/jnr-unixsocket/Manifest
new file mode 100644
index 000000000000..9c2ae0fa657e
--- /dev/null
+++ b/dev-java/jnr-unixsocket/Manifest
@@ -0,0 +1,6 @@
+AUX jnr-unixsocket-0.6-build.xml 17192 SHA256 947a532b91736fbdda74a26b5c1b29f4628eaac44477fb88e67995b7abaced76 SHA512 d9d33107fa8d28ff5630e806a6a0415cba0fb0962520918f6e6373163a6eefb6ad58a4c3a1f87ca041f6c0dfc48c5bee95e729d591472199b8f07153f9ca9426 WHIRLPOOL bc4210ec8adb0706190b0d976a373a63385cc522bf993653d9b474ffd78048964debb9bbf5fc03e09d93855ebd8c8e644a63a6b80f7ea26ea9a5dd99401b7f5b
+DIST jnr-unixsocket-0.6.tar.gz 6756 SHA256 f5243dd27559790dcd6a9b70d2671ab2e20f20ff8a1cba9923e9bda4133982b9 SHA512 93ceb4f90b259c94eb0a68f13da1bbdae547b77637102fc36b9aa4427ed079bca1e9d503579c52cb4ea591bf67df30efcb99c6c4d71e7545cc6ff35f5ca65249 WHIRLPOOL 6464e8d6fa895044095c6ddce4dabc761c6f4aeb9e0dfc04df464f3e20b9b4546d16a0fc6f617cec4e937b6bcf59fc690cbf0246fb3dc04ee80b8acb804715fa
+EBUILD jnr-unixsocket-0.6-r1.ebuild 999 SHA256 2441c600cf49c415291030d8e1629ced38423979fd4fddb8b9eba0f03a593584 SHA512 3ca6ba21c64f3dec69f2478258c086c54ad609bbc56a7c07293c13439267968682cede11d7e3ca17649df02004c6ff8dcd23ea49408f01a44d795dbe56aa4908 WHIRLPOOL 5fdc12fa241fe3b20b4281f6d0910b2b3faf06b17afff8d3c10d6a1260e49522e4d3fe41e55e9945d23cc0cbc77bd53bf8756225b905fc751d9eba7e53a2325f
+MISC ChangeLog 3511 SHA256 d3ec57a6cb45886b2b7279d1e1249d0f0f1acc0cdf1b3a86f3209f35360e67df SHA512 497028377a4f3c8f54504f6f0989ceb46d3efafe0545ea081e7b2bd009c21be50492461823d2d95f3fd584df6b83e8131dbeb799c8e9197f5833dd80329aaaf9 WHIRLPOOL db53617bd710a6ee3fc2b84c948c801e57c0b0b89e48b2ee9477f75e53e00175721df50fb0d93a3d44ff89dd4deda7bef607bb329b2e9585d15e515da11e3426
+MISC ChangeLog-2015 1177 SHA256 30dfd3101769c72f404f330980239ab4f706f99d5c8a4a7919d68c38a8b227ed SHA512 9580ea4430eab3f0135850340c60b6afe50c24da9060f38194b6e323431d02026a9710fe12b05d01411a106e76f84e2dbec4fec7a3af6b321174a7df1bae082e WHIRLPOOL cf9068910c0bf67871a4a748b22cb704bf0087f041f0b2d377295f1a221ef5b9f3976aabfbd57240c3726f32a046a79fdd72effa50415d34703a573e765cb170
+MISC metadata.xml 329 SHA256 b7fe15dd6aa8942101ad0a11d52358d24dc7f3e2e49b12c0abb9055e1eaa05e3 SHA512 e895c2ce843a28901420e7d8dcf279442cb3f419b49e7619464d300f9259d0e71bad90658a553163ce3901d8f0879cb948a896f4c8e8c42c949a1ff8fa6dc435 WHIRLPOOL 54910c9339ac01c09440f675deeae7ded2e0c4fa478403edc7a4cdfa56580762b6c36bb6e5a163c36c7497238e213583edebb52d7501781278932c2073f895c3
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/Manifest b/dev-java/jnr-x86asm/Manifest
new file mode 100644
index 000000000000..6df11975abed
--- /dev/null
+++ b/dev-java/jnr-x86asm/Manifest
@@ -0,0 +1,5 @@
+DIST jnr-x86asm-1.0.2.zip 180046 SHA256 a4af22b926cfb4e2880ff15da014b8c0c6d915050ce59ddca40cde85cbb988e2 SHA512 e77124b7f0074dcd8b17ba200a1c99350827e6a3c641d6caa33b6bd900c95af9140f8ab716a5299bc591969f295158709b381f9b45faddbd6b75355949e4f463 WHIRLPOOL c8b4f649b696f10ba659b499e62480f10f61b4282032e0c129ad067d6470a53beb760589354510bee0132893b7dedf87c5fe6de7e1ce43586cf8f095571c1a4e
+EBUILD jnr-x86asm-1.0.2-r1.ebuild 537 SHA256 a3134b9c89f08e039f5ad4c360da1d27b3054989402be5f8f87bc2008efba10d SHA512 03108db31e9dff342ce7017f19675267193790d16d8a9a6e707bf8187e98392ff72fd3908617568049a7a8887ba45050f1fec2f836bcf4b59573b3918377b185 WHIRLPOOL 9ba7a74f4f0969d2fb393ec8a3f1e6634b390f3ed9a261251babc01739af81371541482d97d4760356bb3131d51870bd27472e6fe3c76199b18564ec711d2123
+MISC ChangeLog 3902 SHA256 a38d5af5c6ce2393d46afc25cb5d12954d94e23e1a1d49763ea757916da93fa9 SHA512 2f3ad65d3ffdcb4fbb742b31e4be5ea1bc29706de7cd98680a094a9f5047fa7c40cefe43fb447bae4126e34399027de7624bdaa57e975f60ff772c471d539de0 WHIRLPOOL 6e056f331f49f47aeba6302674a4c03d218df5d64955db016ece27a103c9669b9dbd0af7036e81d7bc360e471a1ec9c2308c95b780b4f291ac858f19e3e44025
+MISC ChangeLog-2015 1928 SHA256 369438fc1ed9db447c2c05f3e81e91a3c7ba498b2b51adaf2748b99eaf5b47f7 SHA512 8a696a9c00cf715632a0c364bd861c8ad477783dcc29c5778226d68a3e59ab8f02b5601cd2d621ff31b63639d887256e8abf896e937abe4f78bf371a9942e571 WHIRLPOOL e0f93b9359575036d1b8f0bbf127ee12d7551016804484127106e92d56c4b96d3eeac7f4abf07464fabb89a74cecf21d90728f6c82767bbf417610d00403d2e2
+MISC metadata.xml 325 SHA256 4f07da8a5aefacaf34c0eaedd3229ee2e27fdd429ab5a0ceb8155e43e665ce1c SHA512 9340b2600f4e4131177b0cb89acefc78c9d580bcadb3e69bb73ea536b36b7c81d7ba880f78df917ef6061c09b2da5da5a7d22a5497fa61bc8815f01359a95617 WHIRLPOOL e9a09d436f55ac2e8ab5a2ec843aeb80f7a74517b1b1606bd6773ebbafa7436f9f61b921e722ca7ea9d59cf1e96e863d46cc1d7a46034b7b709d8520bd8a978a
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/Manifest b/dev-java/joda-convert/Manifest
new file mode 100644
index 000000000000..9ede20c6f6f4
--- /dev/null
+++ b/dev-java/joda-convert/Manifest
@@ -0,0 +1,6 @@
+AUX joda-convert-1.3.1-build.xml 10459 SHA256 f8d10e8045681e688424de6f2db9d703cba1cca7906cd7d263f3e6ed49e7cf6a SHA512 cfeec9e9ee537814eaa3277037e45878a71b80cd73705bce560cf24d1c0d20033dadd030dcc447b1be5ad742fa97637f57931cab96ca7e21d6b79c7897d7f0ce WHIRLPOOL 69b1790299d38202d3bdb790f40a0eac92453b58b223532c4cbd0e1878a51fa99b27b3e7bbe7734181b6c8e90e2e9f25ecd5ce98f239924215b9665c8858022e
+DIST joda-convert-1.3.1-dist.tar.gz 131288 SHA256 f73decd925a63ff23f010c2e0f894662ccce087eece4027dc0353574a7d2e537 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451 WHIRLPOOL 1ed3df81cd70bfa52bd82b74d5a4e412d46ca54ca250e2d24a0ba6d0711ee29cb82696b9d3e24dc1f43d563506d8334a76646a3902513c2ba221b91f6e79583b
+EBUILD joda-convert-1.3.1.ebuild 929 SHA256 ac6d4dc0339bac5962c878699420fee8f04394745afb91defc284c60d71b1eb0 SHA512 ab4fa2ac52ed7e70a1874ff7ae23eb98561669ccdfcaff994ba447cdca92c101d8e4c493a9a9bf3f78cef4c3271deb2dba93839d279e4694f0df60edd1924334 WHIRLPOOL 08ba60227d0437907fddad5d27265fad79bc4e223995e78ece9c1778af2f114385f28b3af914f2af5b5b0678b93d127ed897ef92f4ab31e919727bcc50728efd
+MISC ChangeLog 2838 SHA256 c998ccd4a54a004a9973dd5383e9144dbc8f3d53361455b2a5e4bdc54ebf0386 SHA512 5fdc6118c579f96968718e840353424707a746b889a33f22298537e7efddcaf26266ec1386ab5d5a428fac691e3f7390a84428a3e4b5362252d098ffa7b22035 WHIRLPOOL 5bdb3abd211cc5a59188022ba057457bcf8aa9de53bd108096342f0a542403930b577e4b3fb2b239b8dfb5c2c154d4613d18e2c77efd4fcf0a8721139903dbc2
+MISC ChangeLog-2015 1412 SHA256 12db7be006df64189d3c90c4ccd68ac158de902a08a899fc445531afb5f835ca SHA512 169713a636b522e137eb1a575c183a4d8ca8087d721fd5061bad183c89f2f7152867441cf865786b2b89cf831561fa7ffe581d96c1fcfd5a611889f17a43dc61 WHIRLPOOL 4445cd4837a81a98fcfdee3b6b7187fcbe1e8569997451a278f423e7639671f45647b8e56d518d691ef12fee088ac3f2ff84f89695e5ecd0b953c8a0a794669b
+MISC metadata.xml 318 SHA256 9471af4a7a8aefe485c697fd7d62c144a86ad778ec7e6f5141090b9a119f9acc SHA512 13ce055f2cf64b4b5f7f6b780c98cfae6bcae0792d5bee30633cb465ab49045fc77da1337042d672bcb1c74cb3a1dc0e26b1d6c5e38f17d3a79152b423a97030 WHIRLPOOL f9cf362e6c42010bcadc7eee1bebca81c0a492caeb5e34e5a70903d670b8a4ba303ff24ac990169e1452b75ce7f33f55635e25b57356cd2247529f495cd9d972
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/Manifest b/dev-java/joda-time/Manifest
new file mode 100644
index 000000000000..78385f726d36
--- /dev/null
+++ b/dev-java/joda-time/Manifest
@@ -0,0 +1,6 @@
+AUX joda-time-2.7-build.xml 11231 SHA256 0012657b2c03bc953ef442d829014b8e33311b36a8b406d239e032af0e632462 SHA512 c614cc2425b0cefdc5f9def196cd5014d6d65552038dd22f876bbb64ee25131ead57aa94ef967491e292cf1ddefef933d9827dd588056d58c9a311640a5af63f WHIRLPOOL 55fad18901e81b2021e5d5e8dbc6f2d1d8cb7aa59df3a7c125ef9f3427b93a10c46025e3aa9d55bd7951157d4204aa8d6f79b292cc29c9a0433a30a3505e7ae3
+DIST joda-time-2.7-dist.tar.gz 4007765 SHA256 6f29f22ff88d39d988c600f1e274e7a59c451184d7d6d400e2ddb9e4bbb2ceeb SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209 WHIRLPOOL eb2f91d5bbff641495d3a7763872321718415e49c8adb864805a84a73c583ee562f145821621ffd38ce1b41a813a15f4dcf609c5130b7557ef4d5e9fed86b17f
+EBUILD joda-time-2.7.ebuild 1913 SHA256 d710c0d1780ce786cc8b0649c3169698cacfd6392520dec64b419edb68f1fe32 SHA512 ad90a7ca92d6e5f0514e9d1a6cb5693240395d470fbf5d59b5bba7678fc2ff679a0e538db638c259b92c160501519105ae3663977681a376b15b989d28b8ab38 WHIRLPOOL 5f1fadd4ec482081f5fce6f24e636e7d6d2d731889944c73872feb3adf914d35f3ac475aa9dd4a9c268186d95c50a7b63c9bcd74ab7de4c7444571d4059dab22
+MISC ChangeLog 4005 SHA256 7f9de578acc63b2d71f6c971c500ce671d824d811a53bf78613b8f4fcad8e1c1 SHA512 49c50cff797d5cd79965aff3263bb4d5afe227042ae4432affc625da71eaf2b9c4abf173404cd5f8da5760d81ecc95892796f04c6ab301198b3dad37f41560e9 WHIRLPOOL effb974aed8f2e5d5ca3e4d05efb57f32e4f7ac5cf0a47ec3684c41bc01f3aab26d06f0a06297c631b4087d68e2d21a853989790b31f9242a46b7a487d7bbc50
+MISC ChangeLog-2015 6634 SHA256 82a342048c0d11e22bdb616099a1dbde606b3e15678e668bf13a6c76f9b4418e SHA512 11d39759f2a670f099e83638b802ae4a3598eba0a55e2bd9bb0444cbc7f7bd662501f18975f415332dfd8ca9de2ede1d6447572c8d851453869454743a3a7528 WHIRLPOOL c5101bff8b43831151de807e6036f64a2c4b7a299572f10a4e9f5150349aa8b152705a680a0b5381d9c86a424a369274c874135f6c7b6bf84d306039d6968f0d
+MISC metadata.xml 384 SHA256 34408ffc8c822151e55e0b645b9d90c217f5d0cd75e3cfc88341d4876238b41c SHA512 441aa3d5876d8ff91b9f9d368e817bf6869266c27f7f8686e9eb47812f899f37c5fa2e65337e979dd3247932b61d84e4b4f0d7325ea2659d54221ab428c9c089 WHIRLPOOL 586556d3fae636a4904c31ca305c2e4d32bddbc3e85dc94124ec8d2e71e924c3fd59b964379a0dbedb6b7f343b34788f06626500ba57b0a0885bb504d6373f25
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/Manifest b/dev-java/joni/Manifest
new file mode 100644
index 000000000000..f1c6fa68e2d2
--- /dev/null
+++ b/dev-java/joni/Manifest
@@ -0,0 +1,5 @@
+DIST joni-2.1.0.tar.gz 125084 SHA256 9c8cb9abd7d8d086b777ade94a7ac68aaf7b9343720f81796d8c1a6c49e4cc39 SHA512 dd40b3a857deb02848d4a87de010ec6b9c96fb962643ea1022833a1bb5ebd76ffac403ff2a54497df288998939ed81910c22c02a2df1f7290112bb2ea506db0e WHIRLPOOL 4f5befc5b9813fb54cf813184fd152bbe3af98c73fda0d9c89dfbc42aa7b2f621b20738c23bad0682954ff8c7566a4053173857f06dac36036d6178c8ae9b89d
+EBUILD joni-2.1.0.ebuild 784 SHA256 7d5ae51c769650c6484f21ad6412b4137b87c6e4ed6d6e7c06fcf6bfe23fed9b SHA512 ca6bc1c029ba81937fd36a5abdac67c985fb8bc1d5abbf21e88b030327387859584e254f7b7eb74e970f02f82b01af2196e170911c4c8bbbb561f2a1332a0a40 WHIRLPOOL 85cf960a1a4c95ace3b509e311d6459aea6f022c8b81eebb7a12a605bc4373f13767ec3e0a1bedb956872cbf207b86afd072e5c122b61dffccd9ca9c74de153a
+MISC ChangeLog 3379 SHA256 fbe2febc61f03feecd0d169c868810d87cca19251613b659ac8dedcafcfd740d SHA512 073be0ffa79ca927473e774d2f04513063726261aa71512e066e4a37ea52830c2b3a1e3bd0a05580b30cfad25c5abe12009cc2200e79c48ef1a7245f49c02c0f WHIRLPOOL 7d219f665a90778f5978d3dfd2da4590e22ba248b845fcaeb021aa106bb783ed7ba0b02f2346a9f70c36937b716891c23d3b3234879b9803bf1f705a9d23dbaf
+MISC ChangeLog-2015 1612 SHA256 38736ebbbcf568e5dc6d361f8f7be4cfbf43a46c80117cbd3b04edb5fa7741dd SHA512 7ea751d540a59429c6a132772bafa4dc7dc5e08e6ee7cbdabcb1b8bc97022e254ecd3856dcb9824aa17361e72765ce9dc35c3c4f24dac7c853ce635d375c0cb8 WHIRLPOOL e829339cfd562f2b1eca6308d6c39831490c5316fbcab2e3c9b14ca90f306a3193e11b6f2ab335f8c2f25b45896fd4d500062cd1be11d2eda6c6a5b1873a1534
+MISC metadata.xml 321 SHA256 e22fcb26cbe1bb6a6578ac5f375fb87b90c3cf31cc94d06fb8e7ce3c799b66d3 SHA512 4d54ecb85b209420ffcae97f976124f7ab297d96bd7eb3f38efba72ba112bdb790c470289c7df005fd09eaafd8c89ad857a2c1bfd2cc95be4233638359a517bc WHIRLPOOL 45c90042d311f325e48a3577f12966b265ef728c94cd15f98f5467030960b61a4c3ae9521134aeb5b231ca79c779f59df5f1c2ec8ad9627fae9e27cc3a7ed521
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/Manifest b/dev-java/jopt-simple/Manifest
new file mode 100644
index 000000000000..6167fc3e6a65
--- /dev/null
+++ b/dev-java/jopt-simple/Manifest
@@ -0,0 +1,9 @@
+DIST jopt-simple-4.6.tar.gz 107066 SHA256 11876a03ea47fe2d5599f256078e23696a1f753a4ff1b0da9f111acb17cb753f SHA512 33c7e111312c46376d46195cdc659f011af688d4078316a2b8dcc0dfdee480a658a331902b53bb53d1b952978623e012ed595fee269e24680cffeb6c04b40f8b WHIRLPOOL 59b0aa57405b976376a8a158fcc8ae58baf68a91077207e20966ff55c360cb30df953e860c316e5d1d7c2b733a578cded7e5f147aa0960a74b4d85a1224ba960
+DIST jopt-simple-4.8.tar.gz 110173 SHA256 21adbb508568d244a827999c1ab1567a9021febad0566b0d0464de262859fed9 SHA512 cc5360cf97446117849f93397c41734a9a001ea623e9ea4223b8d760f36897c62103ab9d2dabfcf0fa032db8e33f7bc51759d626d7bd76dda3adc61fa6622984 WHIRLPOOL cb0e88abcf34a77f617bacc39a9152dafcc04ff9723cfb78bc454250acd4c7c78717c9772bb809e79bfd5da8ff032b323dbeb9d158ea79e53337db400a872050
+DIST jopt-simple-4.9.tar.gz 114636 SHA256 23885a2253923a2f472e1c09f170e5f754346b5c3a2812b4d7928d773436c151 SHA512 28b95ac9a508251b80b0283fc57422fef3f36676ad9160974386faf7f02eb7a0cda00ca1970046ed66863d49e784efba955695fcfd8b5b2535cfaefcb1035360 WHIRLPOOL 69e8ec5d7538141cc01fbdd0ba46dcf2404f05b97d6aea25ab0fbf8ae2144aac8b6693f2f580c52fbe12e80bda33b80e3caef60915b85c7c54cbbc9dd35bd285
+EBUILD jopt-simple-4.6.ebuild 698 SHA256 4d90cdf280a347ed741d58fb5c5bafc8ba8e83f585054a92d574d4c3ec176449 SHA512 9041520b0490eb2566f860964ccbac55b6be12c3bfd111963a3fc9d7a945268db36acae67a39d8044288307bd5db339e385cde73cba0aea8fce39b3014f68617 WHIRLPOOL 9c0663f5059cad040ac4ebf123046e235099677f4657cca9982523d7064b5a7bdb1eea479d65367d72f9bac177087a39867560cdb70cea5164f793c86895b62e
+EBUILD jopt-simple-4.8.ebuild 689 SHA256 d2c6ff70cfe3afc48bd77c9bba82e77239c0fa343f2a164d99ac431fd7bce872 SHA512 32b16f5431e8210f1187a6690e65be0f95866d5c1aa996032cdba5c8608bc8b43c363c9f7bcbbcbb22974b9411907d897538ff2333b8ce9811c55b3bfe71b6d0 WHIRLPOOL 2f4525a8c0a726f59719b8b2b1fa6b0b50951d6b0da1091d4656acb5d7bfe56e0ed8af8db3556036a13b32f60300f023c3c207825fad5ea50ca437ef3a7f5f1e
+EBUILD jopt-simple-4.9.ebuild 656 SHA256 3761e58501e50c9e535198311a4e25f32952cbfd4e2162f006a0bffe8a846989 SHA512 e1af8baac937f616554f77a501ebb1ba26f6c274bd531d4b9cd2de2389938001da5e55dc4f8144f52e00840a5a6d1493a60698b5477303e82862a1c81f1adf90 WHIRLPOOL dd77245a031b59c2640e736f721de8653f630a11acbb2575c7f5a646314fc0a373f5192eaaf2e06a184a0b43af8071cc6a1eaedb595868ca15a8c74995c666c4
+MISC ChangeLog 6248 SHA256 08bebf9635a1ec4662a7447b48c03bce7d16d1cf1be373c68194942f42c9e436 SHA512 ac721c600ca19b49d618b50e26c99d320ad04b47e668f8160243fa860a6ca21ac640ef702a783b2adaf335cb3d974898b45f8dc632ed7def078e8c32d5363817 WHIRLPOOL 9fb1f86b5074bec81af8bafddd61d3e9a3ee5f6911b025daacb897b2a4da63a111a4db34bdf8a2cb51fcdebc6e6fdb52431348f8cd0d8d624687b6374fb34528
+MISC ChangeLog-2015 769 SHA256 2b75e7b56df7a5899e23af5f3496fe82fd8e6ffa6a2f59ed59e50885133fecb6 SHA512 465e271e6f81b1f0c08a7b8578934398742e96045f76a394416007012635590d07f0ca58cd23f40b861ad669fd403458a41bf8e2bfac24698a6c70c364a86a54 WHIRLPOOL 09fb47deb282786250908aeb05a2a6ab78d594914e6f6a8718d7486c5d138e4c1ac9a99531a2399e4fcd81a60eaf957639c019f8be0ee192b6a356b21f20948b
+MISC metadata.xml 320 SHA256 dc8f91cf2388e59ea17fbcd3f4c64e64fe24fa165d44df7f536d6ae890251acc SHA512 e64ac86acc3088038b5ebcca26f7481730c5bdcda5d7fe05fcadbf66a4ba7d472b9787c288c1b8b4ed077d2a960cd9be3fa1645deba813de3b55e7ead642b61a WHIRLPOOL 0ad0f6891b54770e00ad5ab14e90b563628b1ff97d6ca8c777bb1be3be5f337bd728e1e2e879af181151cbe3e7ccd6a85e5eb2f704bfe1fbca8003abce283628
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/Manifest b/dev-java/jortho/Manifest
new file mode 100644
index 000000000000..f11a2308673a
--- /dev/null
+++ b/dev-java/jortho/Manifest
@@ -0,0 +1,5 @@
+DIST JOrtho_1.0.zip 278599 SHA256 fbe9019ced6d13901024948f9f6dcc14a7faf7bafcae841399c0564d0b0456c2 SHA512 e9d99984e954711125eaace5d6bd3c7ec92dfbcf85cb567f0643a61533334a7d7b3d34bc47e2b2a147631edccc6898b9fbe4c999836f1638ef284aa0479a400c WHIRLPOOL 339735791ad3c6cc7da5a02279d0cc0dd9a8b7f9111a622ea75febe76237e5579bc267d2d069ec6a647e508ac34ed88c58b9b1335c71137ea82497a96a0e529c
+EBUILD jortho-1.0.ebuild 913 SHA256 5f887a95e7919e6c54d610e32d1a0d9d8ff84c778a874d8036f656faa0e32bd1 SHA512 f1f6b6c0133aedef93ac8ba3378dfe73f778ff354f701284b9e9eeccf9cbd8667649415eb6ed66de7ccb46b55a36434c7d932ce5de785e4cdf1f286b7ead65cd WHIRLPOOL fdc24de09212f6d5b7f70a93080347a5f42140e79494b8982a1918f88c99f3ddb0e5a48ddd957ad7a238c2a7c29d37ee3e5e5df140b5be7f681f78ad7ada57be
+MISC ChangeLog 2555 SHA256 b671114933b0ae7ace1ecab70c61f0676f2b33db25133bf715c948a9b7444eed SHA512 2a2b3a40c92a54fbfa9a6350b0c05b030528188c7a9a5f8cd8d1b302810b453cd1240f58acba0fe7c6c91e68bc27f004a4036b27e01e7a770cbc81ccfb8bd342 WHIRLPOOL 6d89aad7c4762491c7c11f9053e835adb6e4b07a6969fcb138045de3b62538c169b278d0d607d37c61394c7c90c693c091805d4e901a6384832a7b90efce1263
+MISC ChangeLog-2015 754 SHA256 8182eda98c07d20bca675761dfc51a9987982cc72d9c2a47eb0999853a83f5f7 SHA512 d5bdf26620e297fcc452216895ff27fd68d3e95f193f47d8a8abb65b5bbc91f261c7966717e852d559bcbecd2e524995332bfecba3ed41d08d37ec42f91ad9f4 WHIRLPOOL f2a27093c2cd80faf2b539c8d3d8979f10606c9a027eb7e79f90cfba86393a102adbfbded0b863d187d26741e06cc1bece706200ae36365f6af221068e89af0c
+MISC metadata.xml 312 SHA256 f55244f1ee0f434c54674335c2588201b2f87d8d10c86bba8f23d60053174810 SHA512 eaa94dcf310fb056e6d27e7a9ccec7cfa8aa0f36c0e827dad5d839e39e4d7558296d603deeb584b6f4ee8e9ea92058c03102bc6b8ae6f3e4870dd26b4524b9b3 WHIRLPOOL 8000bc9eb038c1082c7f3dd1d297d2842b1626112eca46430565099e2de5e9cd4e32d3be37e3e4fcc786166c31dff6b952fd9bb9e59c0cde14a6766d54fea7f0
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/Manifest b/dev-java/jreleaseinfo/Manifest
new file mode 100644
index 000000000000..b1d12ffbb012
--- /dev/null
+++ b/dev-java/jreleaseinfo/Manifest
@@ -0,0 +1,5 @@
+DIST jreleaseinfo-1.3.0-src.zip 38437 SHA256 a06af23a25f10a9ea943b4119cb4bfe79554e4a8fb87d13f2074de1e4b5d646e SHA512 6c339787085ad0701f1054ebb96e387168e0ea5997a977d01dd758b6a5cd9090fee1f63124960112f2a0c8db3685e98fc8c3ec90821b13a70b0dac8cbf25c38f WHIRLPOOL 2acb87fdf056fae8521b8038a22e4fbb81f9df31abaa12c6fa555ca40f430daf4014f7c841e446530196b929351e3303c0c2e5add6e0d3b24e8bf7bb307b8e89
+EBUILD jreleaseinfo-1.3.0-r2.ebuild 764 SHA256 b7119325557e0dce38cfcee5850ad2edee24e03958937449e7b0c24175a07416 SHA512 f8c1eab6bc6cf17db07844425868026c1e1ce7103054b159944bbed50d5017016657fdfea2e4cf9ce04de71b3b11595d83ce23d64e06c08aea7e730d62238c8e WHIRLPOOL 8c215250b951b13f74e2e79a58d2c7d95ecea740b5db560afcb11a17f3bee17d3147de57dddd78171f465068aa851eac6434dbd879b392dac87c7825fa5a4d5d
+MISC ChangeLog 2448 SHA256 cab51fd9b3ed0234750781126c52818f647b2983ee247b61b4f9894bf1aa7e5a SHA512 5817fdf41bd99bc642c46dc302fbef2d302f69cb2136360e53f673695f7c9acdb8c14f8dbf104d9dc1b8fcacd970eca1a5f873dd48d49af49155b5c235140ded WHIRLPOOL 8e82b7364c6f1c24862534783cc8b4d31269ade3b28b5eebbf3d1678675fffceb8fb7c3372076e0d188af09590d8ea714088cb3f872c06035cbca4513c0cc4c2
+MISC ChangeLog-2015 1045 SHA256 ff3c45140659403eb12fbfacc0d7999f3224987a6fb7c8613d1630710c070002 SHA512 0ce630c16cd636822b6f20c737f90acd6df082051206ede16fed7dd80cc1d2de138c57cc9275dbee7a0b2fdda10716c2d0934a71438f14e35790bfc88b2aec9b WHIRLPOOL 16f88301d0deedefa8545f86e61a138ed02294f1bf68d1437b786f267941fd52b132cf4321d8262fbc8728bb3a6d754633973298265b7dcabc2eb884e1cd25f9
+MISC metadata.xml 318 SHA256 ed0a0e8a9890e3364aa9cddf0eaea2cc7b322ac4ec73c926074d1e70cca68229 SHA512 99675027c08cb4257cc954a308d74352466f09399640cfbb48939dc788938db92c899427f1bc6a1746625052b4f709265eecbdbde7e8af2fa5c69a76958aa6d9 WHIRLPOOL c797ed3860bd9921f0b5a1eeea3394abb28bb61947d2fa1e82fafb9ebddb43c05fb3bcaece30584ef60415253a5ab81d9f143e0b53cd34ed6644253200778b18
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/Manifest b/dev-java/jrexx/Manifest
new file mode 100644
index 000000000000..f04ffad6731c
--- /dev/null
+++ b/dev-java/jrexx/Manifest
@@ -0,0 +1,5 @@
+DIST jrexx-1.1.1.zip 62878 SHA256 6655b611c7693f20da86cd8e933908483615341a916556e777535192aa8f1b0d SHA512 dc3e84e9c6313d8fc4c8fb57bc2713976d07284eae5d36ca4411d0e28eaae36351bbf7a6a16d9db365105e592d2e0cbccf7c3662f8d24114662422f02f0707d1 WHIRLPOOL 1f2e4451672c1c557efd5edca511504095196746b529e14a9ab1a7bbe82a243cd59ffc047561e066f4f54a65356e6c14e88e0b809609b3ba2ae12a696c0792d8
+EBUILD jrexx-1.1.1-r2.ebuild 612 SHA256 b077641ee7e1719e2ec234f031e20bc72a426aeb0a618810ed5e53d24b77c0ee SHA512 a5af80066ad5e6f843266fea08e85cbb17aa40bb5e58abc6477a1bc8167517f96f7a85830928cbee26d7b00ab7e13709f921b3f581bb1f8940fb26e6abd31dd1 WHIRLPOOL ee6be4879aa8aa8432af769d1f86d1e26623b716f982ee8a56ecc2c92a22ea74e1daf37834da4bf3442642597622127c4baba1727ce956469959d99abefa5afd
+MISC ChangeLog 3346 SHA256 d0d1ec7a7e52e1c63885bd47b961b626a77c3af328cec32d135ec2f3432b79e3 SHA512 f1cf107c0ce66257d9d8a32fc2d02561e089a6215d7575b1f7d51a587875e41705b7e45174bae943e7cfa32d35aaeb91fe0fd90bacb29f028e6c7cfbe268571f WHIRLPOOL 07bfe57bdebc3e349db35d22437275eb7edfbc64c38cf1c6d5b737911a41a7ac0fcee734c8ad56723dbf4cbdf8528fa68c994a1861958963b08622423d4ad99d
+MISC ChangeLog-2015 2297 SHA256 42ad3c9276e0b13385f7508417f12d64925dd31857104dc350c4dc3c07b066aa SHA512 aa678cdc51176196c0d28ad6e5946fd227732ab8ab9b2e6ffe736462645d5a565d0933d8ce1d45ce8340b72f51d4c969e97d0102c8306f903c123d8590f9dfd2 WHIRLPOOL 72f933bb34e50fac24dac37a2a48c9b792ef12d9cf8a87d3d520490d0916823dc43c43fe67e2fd2fe7758755d1b68a82e033f9f3dd0840ddbddc5fb6258bfbe9
+MISC metadata.xml 311 SHA256 09aca4c697da497da50505bc4d4e1f11813b29f5a4171d0a716e8f0ca6419634 SHA512 5758f1cc5327cddfa8f035d816fbb86dbc77f0032c8e23e216b203696c5c94f3c9dc7e46e3c1a003f5027a9f3af4eef8862710b55499b56cc4041e28265867c0 WHIRLPOOL 8ea99c8344c5886f0dd6cdb681a1736a1425d61ba5db60173ecd91253af84283ff536e5a3d9aa98b9d6079d27915e67fa3b0d65941d8734a2cf6a8d85758d13d
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..67ff2e86899d
--- /dev/null
+++ b/dev-java/jrexx/jrexx-1.1.1-r2.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="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-fbsd ~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/Manifest b/dev-java/jrobin/Manifest
new file mode 100644
index 000000000000..b6d9584694ef
--- /dev/null
+++ b/dev-java/jrobin/Manifest
@@ -0,0 +1,5 @@
+DIST jrobin-1.6.0-1.tar.gz 7340700 SHA256 0e00afc9b0fdd45bd7e62b3857fc7bd40f08e5f0cf155e0ba614cdabe58fcf5b SHA512 c5428906bf975f6c31f90185da3f0cbcaaff74d68e35e37b5e425340899fe01290d3d9813f1ecd60bd599512e3d62f635de290db9a9a1bd45292ac9c187b15c7 WHIRLPOOL b83007fb4aea92aaad62842b56b4e3bff98ce6ee509684536176420869228c8a86057f03bcebc2a1a637a9ffd2ba794d05756cc479901fff2765ced352ef5d25
+EBUILD jrobin-1.6.0-r1.ebuild 1568 SHA256 8e99798ba588aa74a905fcbe7d98a63803eeb416f85536c7f19fc7d2838d66b6 SHA512 42f36f0be9c58a03e86632a99dcdfeb404e84c17aab715fc00ed9b2b5bd175c9ecf764bd82165caac56e715f51ff573547d043ee29a3548d5c7865aea3d626f2 WHIRLPOOL 670fa93a6a0af7c281acefe5c69a3af2ec120a4844454610cee2159a386747094def161b1bc43d054039a680b296eeb379ff4eb08f9e26383a7d8c7888068475
+MISC ChangeLog 2665 SHA256 2e76d3722c01f20e69a9546eb95746b696a02ff78b2f83be4835760e1fd8bad5 SHA512 5c23e173e417d4e851555c0a551d0cb2f713063bdbe2129378958430e87a6ca0e0a75d1c73b879bba0102972f14478fa907484cd59cb87d714d27bcbdfd2b14b WHIRLPOOL 2a749b63666436a6f40db23fbcc3b5929d574419bd831ac7c3d43370a1390c6f921a69e3139a6328ba62d08767bf04fa5c76ab8570e720f995dbb99a5c1706ab
+MISC ChangeLog-2015 1382 SHA256 a41e8e824671a63394f277c101e44e6a2aa4881acfb9f6165fb468c3e1aad946 SHA512 62792c918557e84eef599b8d42aa6bd2e8f01ea27ab65cf6d2072caed26094003fece0767ac60095ce8ba53390c74d38a6a5afaa7e1e93c6ff934f3852600de6 WHIRLPOOL 775fefe5b2a3ffd6574ea2f8981596cac9267e62e4aa137d0d6b3e20a2b03d03adfa99c571b419fd462d47d08f9f836a970f7d914c41aa7f904af40cb1f99871
+MISC metadata.xml 602 SHA256 efa158b2406206084560f1a29abfcdc7eff23308afebfac8941cfaed8260b6ac SHA512 38a6b1ecf0ebe88c64718f48d77cf459f11facc7b422cda53630da3ae9d040de0fd004e4ea571d93bc9f8f315e8f0c65cfc16d0f57c399174198facd98613d37 WHIRLPOOL 6d75cb9fca43176581f389109b34e584fdfeb5244f7ed1c9ecdccde95bb6250746c419c02e37ab379dbe6d2193133e799ba6bc0d9af7357b1cbb7bf7bd67ff84
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/Manifest b/dev-java/jrrd/Manifest
new file mode 100644
index 000000000000..6e068f2c66ca
--- /dev/null
+++ b/dev-java/jrrd/Manifest
@@ -0,0 +1,6 @@
+AUX 1.0.1-javacflags.patch 346 SHA256 7080c843e1facc232d03984872a12a4df5fcc87deaafd5716bd73414c2cc3413 SHA512 4c7383d1e55bdb56657cfd3de944ba1e18fe299d90b4493ccf9708abbaa0d4fa141215170c2bd9bf0f71002124a8221d5af657cd9c28817971801349be71ffc2 WHIRLPOOL fbdaa6ba9aa8bb03e96b60faac9b4bbade37abc28c38eed2d87b5b63dad5d50a9e6f634f0c57dbb6e6380136c9a6e604af9e2ea66f4f9415254a9ba8cc38c477
+DIST jrrd-1.0.1.tar.gz 320476 SHA256 ec209fc07b5cd776c96e4e2bab817ed7158279e3e0fbec20642b89f95e5d1728 SHA512 f794f052af32544e17d5aef58c7acb068f442c85e991d7f11c25119d94edb4aebb75f744df53caa64f4fd1e9f900f9018a82790a77dcac48e071b13833a8cced WHIRLPOOL 646dea281471da5b5b96878fa9c331d2010b24faadc0baa9cf0749a42fb2f35a16c2404c6f3d2662b531827fdde4ceb59348b752a25807c45244a69a750b1f21
+EBUILD jrrd-1.0.1-r1.ebuild 952 SHA256 8d47e29185a5e0082b74bf0570287cb4e1323a5087c702f9d2a39f934983741f SHA512 da8616863627bd08c5e7faad5def20f419b14a3028c50d56c01583947b926356f24c030644ff3ad9a6461a974a6879b2d7fe78a0342b4dd2acdfbb3df3531507 WHIRLPOOL a26f562038975b1aa80ea74c33ea61865350c7377a3077f25e057e3dd3fcf62995ff44bb314c461204ee99d05408a116ed4e90a7e26e890740ceee37c7594920
+MISC ChangeLog 2455 SHA256 40a6a1e00e148027bc715953d58fa1ef5fbeea90165b99ee46f917b316ed2807 SHA512 cf08d7ce5c8dc8dbb4d3e65b2adf46370a60c9987150e56c480bb07011094448abbc2c860e62797e1ad1db86696b714e256673aeed18570528c34b80981acf8e WHIRLPOOL a241fc2517e91a919d5178440691e9e1414483c41157d99cb45320c12a99050ffaec4ccbf90229816f21bcdddf865ee2adc309db2400584bed055d71fa84dac1
+MISC ChangeLog-2015 1354 SHA256 d23d9a008311c09b7082ddb03bca64b065295c840baa9b0db46447ff92b54b7e SHA512 0a3eb66c762846c85137b9ab1137bf9dfd0dc0e43b1f10835e85340d44b872f32f277f4eda2f1bc724d1563541b3109218de486391711c61b9784406144c1ddd WHIRLPOOL 7f910e15464355812271930f0670da20221087ba08ca1a0c7c0580beddcec90d545efc2158a440def11bd01881e906566bb22183af934401c3d5356bb236240a
+MISC metadata.xml 396 SHA256 3eaee5d8e6165ba5a0c07873fedd03e8a57776d73b4ae4e0ff99e5c02d7b13e8 SHA512 4d701ce0342203d158d1fdb3d00d1c2f0fcdaf7a5f891584be4cb33e2b3ceeac22a25b780410c9be7c1c4c3a1f4494561a2dddaf37981b68b23911d55ae1f26c WHIRLPOOL 38a182cb7d02f6888b2a5d14949b81cadd6b14071a381375d09576c1b32c6d0b36cf9917abab6d4c7632203d3aaeba559ebecffe691c485226a66712bf59a765
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..c454c5dbb3d4
--- /dev/null
+++ b/dev-java/jrrd/jrrd-1.0.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/dev-java/jsap/Manifest
new file mode 100644
index 000000000000..21b537eac0b5
--- /dev/null
+++ b/dev-java/jsap/Manifest
@@ -0,0 +1,5 @@
+DIST jsap-2.1.tar.gz 1281840 SHA256 5146bf75cba18fdf9299462a4127e95919c884494aaf3ed023cb2950217a0862 SHA512 5509d67b8af11cfbf94ca1a4d2b055b84c6c025ca26cd70390f63394d112a842fd39271181dfad0a88856964acd66f8abe49c72c58cc0086445d810837ba3352 WHIRLPOOL aecdc479d5d088429ca10a24a90b8aefc849ff7eef03276e9c2667a28420a2fefcf6d6541b1eee5d8c7891c3aa2c7392dc9e943084aaeac86bcc48d4a4d1dc78
+EBUILD jsap-2.1-r2.ebuild 768 SHA256 d4292296a4b6ce5c09e3c58a82812c6cd6a75dea19e2d436e683eb2f972813bd SHA512 fa8a2d6f571391b8ad941e5e190a6b9b9deeac045d846f1f4555098ef1670edf27252224c67aec96f52387179a9686548ddc56f1a6496894fcb08820fc3ea17c WHIRLPOOL 20197a4d1f61a873fa403b522b3307b3a47e912fee86fc795486f0bf39c39a2167eb656079708ddca9a715c70b7cb1ca5e2c5054f124e714ed1b70e6ffb71fd8
+MISC ChangeLog 3587 SHA256 17da5aa564531e2141d46a419d1445b8d8d6dd0503a17485a56d81fba8e8c4ed SHA512 05641e2c030d0be32ea42a088d361469663e86745889763fce53584ccf1f40f05ac297491b3cb926c55a1c52a114fba4f790ae37fa03e0c0aeed5abf739054d7 WHIRLPOOL 69e69cba805cd42c3fc92eb47d12765340b34dd2ee304e63d0f8f9c8b0df109fdaf96f8c9356e66a1c532b926a3e3926b440cd2145a0fe46c48508e75cad4f06
+MISC ChangeLog-2015 1071 SHA256 1dba97e9e302648421dad38513deda84cbceeaa12cfb3c4c20df26862d365805 SHA512 61c60cd2040b3060f80973d19cbce7239dcbb0fff5695179605b578583be09a21b7ac3b85fe74658685e943f445e95d988b0667b5791542fab9b21691e392197 WHIRLPOOL 6b1e92fe3a2552060bda48ba2e9d2fa8f4b28987336309fada4ab772012a45bc7789d7156f0b72c8f5ef4475b964435dfce1c904fb17cf971540a68f7f603bd9
+MISC metadata.xml 310 SHA256 5bc97b46f5b99f70e54bc9185e18499ceb11c5d7d13d42489fd2e9f799aae42c SHA512 ef2fd9df3da998fc5b0add86af9e5d6d2829c3cfc566152d3caaf9957e55ee15da76d8af6e97bde9e616f0c1ac684f11d7f72bd6c67b43b281c795d459c73f5a WHIRLPOOL 120b9d07cdcf65ea0b30e1d48cb9be9b085bf0ab49fd1fdfdb150e75b04cdfd0511df80c767688bdf7893664e96109f05fdfff500e29c704bd2a0ffeeb9ca98d
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/Manifest b/dev-java/jsch/Manifest
new file mode 100644
index 000000000000..40336af3cb89
--- /dev/null
+++ b/dev-java/jsch/Manifest
@@ -0,0 +1,7 @@
+DIST jsch-0.1.52.zip 363648 SHA256 ceda29572f9bd670e425e48772b066e62e7a728edc6a6e23ba75f10444832ab5 SHA512 a5a998b6139638eee403e120f5f217112a5c09e81db8e1b1240d53ca311df4540b56aaa5f67f7a5c40cbc8420535d72d456e4fbfc95fe86d46376a00295bec4d WHIRLPOOL b820f35aab95e385bf457fbbd3ea4fc3c30057114c5c7025ac56dc435a4c708c51b450bfbac9b8202e23b90f062cced194def4aa8b479d629f1bef8121c66e5b
+DIST jsch-0.1.54.zip 365455 SHA256 ab71e1e5ff665213b7d892ebd0829b3da835538a73409fe11bb006ec5b6b3909 SHA512 2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e WHIRLPOOL 36a4713b3daaecb3b7031a7cd5658771230e4e5a24be0c1bd1822c9d842be6794f42b1084c8274a60ebc075065bf3ef8c0ab432ec75038b5303e831481ed777a
+EBUILD jsch-0.1.52.ebuild 1206 SHA256 d5abc2f2480f6202870ef9baacd4b8e670e2da2d6801e496610b45a00c94a3d7 SHA512 e062f81eaf660728166f826b698efb5e44d7789050e25712f7b4d5d566d57dafe4d551260c1b803811f68e3d8c2c01350597829af0ffb92599ec4f0a49b6748b WHIRLPOOL 25680158e4db5b6b8696f486e3081bd10c5e0e37551c6a970044c46ad061abc75530933514d6b63f68a7a186252b1d0280a20ca3f220a72ae73cc87762f836ae
+EBUILD jsch-0.1.54.ebuild 1179 SHA256 02a5f4defa67f7bc9002a6bf421194d7e49445ef9a5a61f583e3dc5ae1adad4e SHA512 3b50a8984cb255386a495a2b5a8d0c0faed09daf28027e36f452d57a096a5ac85b57ee0158037389e9ef3682ac23190026f12fafe4dd23649bcccdcecd7ae973 WHIRLPOOL b51bc0147eac524cb092823ec1c41ed54692d73ca8a95b2050bfa529ae802d2097f1843bd7de6e00624c379c44cd860f9aef4642a4f44ffee47be95a72f471fe
+MISC ChangeLog 3054 SHA256 8b4715f8b160d6e89c2758ccb7fec2b2982c45125bc074af0e27dc6e7051035b SHA512 c3fbf7755b9e1040b13a50fbb95f7d5ef973fea91d87507205da9f8173e8a291a59805f8c1f0d9733d065282e7a8433c8fcf33bfbcb4fe0aa44d6575d21fa17d WHIRLPOOL f2cefcb22512533db44ad8c9e3e3caf54825c857dceb13c101900e1d668a4557aa66125c3c406e0d4ffc9f93ce3163af8e28dbd9c73224f4ed1f10e7de5450c7
+MISC ChangeLog-2015 11318 SHA256 7b1832b84f22a31df2213fe3be7a408df870c98ca06b16a5e6ea678db19a5d4a SHA512 1ead95af3df9234bc513476b1a13e9ea0097487d4079d478acf6fd3f10cc1fed9fe35558378debfe2cd3c608eaed5ca53a0553b7042a77b0b96b0d988d092495 WHIRLPOOL df3fab80f70813804a3671d09118738670bc6c00e9981462955e9f47386b3da007a5242c708790d3bc5873333868e3460c971f3a0a3714cfdfc22235c1721696
+MISC metadata.xml 310 SHA256 50e0f9ede16c9cd418911fce154fbf5ef4d2e7c7a89ae0a447e11cffb5c45a12 SHA512 5051c200e3f618fda4991704418d902b513cf94b96917a1c23c1e552e1443cf9ccbf8a0a2ceddc8db46d7104284b43689be62dee0353d50b207c7c6ad3336262 WHIRLPOOL 1a3d473561389397b9fd0fcf3d1aaca97cd1f8f885850b8fc550d74282f2ca428b582c0c288bdf44074e444b74636d23a41b02cacfc86851dfa0c19100d48678
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..6646a58dff68
--- /dev/null
+++ b/dev-java/jsch/jsch-0.1.52.ebuild
@@ -0,0 +1,50 @@
+# 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 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 ~x86-fbsd ~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..08cae6103282
--- /dev/null
+++ b/dev-java/jsch/jsch-0.1.54.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 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 ~x86-fbsd ~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-simple/Manifest b/dev-java/json-simple/Manifest
new file mode 100644
index 000000000000..5d5f8a0faf3b
--- /dev/null
+++ b/dev-java/json-simple/Manifest
@@ -0,0 +1,6 @@
+AUX json-simple-1.1-extra-constructors-from-azureus.patch 1943 SHA256 4d2721add0dae5abfaa5d2b31be61dff88e72db1b69e4f3b8c8263b4541673be SHA512 603d6f580e4e546a0eb230b521416b7d5409ec896359f4ccf5755adf79bd666da9cb0b1496b58439323b1c8cc18ebf5f550e3c1fd4894ba85b89aa2854584380 WHIRLPOOL e684a75b848dc98274f267f1814627a7ac1de92e81587db27a2ea454207a6a68db25c3466a5f7c367f4096f964f62792548552f4774c85b01ad055968eaa5d5d
+DIST json_simple-1.1-all.zip 44814 SHA256 007568a235ed018142756080e73ec7582af83bd90bbdc227489d186e1529ccf7 SHA512 02a5300456dbe2a1b5331b247ad964237d11d2281b35351f1f7bed6867eaf5bb6fb07ca1a50f87e30cd93221c5119e8b5f6f273357ab5fcfeda164ec119c0404 WHIRLPOOL f1169a8a52349a65469c8ef5ea61fbde469ebd30fdb57b591b0148e2244edb1f78ef99b5d79bc66e4cbfcced3f74436cbbd71e0463aa5b5e6737e81eccea1c82
+EBUILD json-simple-1.1.ebuild 1003 SHA256 8bc41ee24f21ad314ff5946dc057c659ea6d1297226cffddd9cc522716ce2e2f SHA512 2db813f156311abcf75e6c518cb96e1396c8a27ea9c0de11615ca860be88e211ebc137b772d01cb39b6a5087c4621f316c2289a2db0221ce194b98151316aade WHIRLPOOL 2a56341c5ee130366bac609a732bdfc8c87a046d91530f5549d82fca2abc8d0545cbef35fbe67231cbe9707c2d245bc15faa5b486146d5a30860b61d663ec9cd
+MISC ChangeLog 2942 SHA256 8cf79250108ee22fa5862a7ec8694b57e2561f1f71e260b47ee96796a76b8095 SHA512 e3544ddccbaf7f7755eb77ec5fc7c2434f5224f26907d420b1e2b1f810e879dcfc584eaa8839bf5b4c05e9c151d196ad1026668a1c693b2935462d2387e2e986 WHIRLPOOL 716ebb17249fb3cf5e1750099f6b293fa391c07c1e4491e036624cc9f1262cab9c9f66043c7b9cad3d8194abd46eaa69bfd85285968dfc83b3f803275d44e35d
+MISC ChangeLog-2015 2534 SHA256 0df3dba82f8fa7b5b3b25c74c2f935a6661b39114a336a65e2d4a71b09c840da SHA512 9d8b8803ac939fa0af6bdf9cd738ae7e9af18781ad2685c199cea2837b42af122f5c53ae846308b33fce2cf9022b621d0e3466915b6ef9806e969c506c785cad WHIRLPOOL 15c92e9821c9bcd281d642f58757f4092046b8eb1ef68e8f82e26119f7fb562eb3307cebe49be328b145e68d323ca71253529bcbfd6f3d2392709e04ee571987
+MISC metadata.xml 884 SHA256 48c3395d0a309839ee622ca312e72512f56d557e3a88dbb1efaf7f72682b58bb SHA512 c62d038f6913bb8beb903930ed6d354c89b9b5fa231d9096690d263ee35812aad52696a3d15d74c83d99c02392f5ed3ab997bc6e9d2532cbb4ea12cbaab1ebe9 WHIRLPOOL b53b460ad64bae9fa5063cca85e170c510c1924ab800a8dc169f228b0523f022fefb43a9d7f494088c77c55cc2c03c00e41ad63ad684ecd4776d69dc16ff1b36
diff --git a/dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch b/dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch
new file mode 100644
index 000000000000..5b45a973e41d
--- /dev/null
+++ b/dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch
@@ -0,0 +1,48 @@
+diff -Nur json_simple-1.1-all/src/org/json/simple/JSONArray.java json_simple-1.1-all_patched//src/org/json/simple/JSONArray.java
+--- json_simple-1.1-all/src/org/json/simple/JSONArray.java	2009-02-01 12:45:34.000000000 +0200
++++ json_simple-1.1-all_patched//src/org/json/simple/JSONArray.java	2011-09-25 11:23:37.398818358 +0300
+@@ -19,6 +19,18 @@
+ public class JSONArray extends ArrayList implements List, JSONAware, JSONStreamAware {

+ 	private static final long serialVersionUID = 3957988303675231981L;

+ 

++	public JSONArray() {

++		super();

++	}

++

++	public JSONArray(java.util.Collection arg0) {

++		super(arg0);

++	}

++

++	public JSONArray(int initialCapacity) {

++		super(initialCapacity);

++	}

++

+     /**

+      * Encode a list into JSON text and write it to out. 

+      * If this list is also a JSONStreamAware or a JSONAware, JSONStreamAware and JSONAware specific behaviours will be ignored at this top level.

+diff -Nur json_simple-1.1-all/src/org/json/simple/JSONObject.java json_simple-1.1-all_patched//src/org/json/simple/JSONObject.java
+--- json_simple-1.1-all/src/org/json/simple/JSONObject.java	2009-02-01 12:45:34.000000000 +0200
++++ json_simple-1.1-all_patched//src/org/json/simple/JSONObject.java	2011-09-25 11:24:34.815103065 +0300
+@@ -18,6 +18,22 @@
+ public class JSONObject extends HashMap implements Map, JSONAware, JSONStreamAware{

+ 	private static final long serialVersionUID = -503443796854799292L;

+ 

++	public JSONObject() {

++		super();

++	}

++

++	public JSONObject(int initialCapacity, float loadFactor) {

++		super(initialCapacity, loadFactor);

++	}

++

++	public JSONObject(int initialCapacity) {

++		super(initialCapacity);

++	}

++

++	public JSONObject(Map arg0) {

++		super(arg0);

++	}

++

+     /**

+      * Encode a map into JSON text and write it to out.

+      * If this map is also a JSONAware or JSONStreamAware, JSONAware or JSONStreamAware specific behaviours will be ignored at this top level.

diff --git a/dev-java/json-simple/json-simple-1.1.ebuild b/dev-java/json-simple/json-simple-1.1.ebuild
new file mode 100644
index 000000000000..039d5734474f
--- /dev/null
+++ b/dev-java/json-simple/json-simple-1.1.ebuild
@@ -0,0 +1,47 @@
+# 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="Simple Java toolkit for JSON"
+HOMEPAGE="http://www.json.org"
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}-all"
+SRC_URI="https://json-simple.googlecode.com/files/${MY_P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-extra-constructors-from-azureus.patch"
+	rm -rv build lib || die
+}
+
+#JAVA_ANT_ENCODING="ISO-8859-1"
+#EANT_BUILD_TARGET="dist"
+
+JAVA_PKG_BSFIX_NAME+=" test.xml"
+
+src_test() {
+	java-pkg_jar-from --into lib junit
+	ANT_TASKS="ant-junit" eant -f test.xml
+}
+
+src_install() {
+	java-pkg_newjar lib/${MY_P/-all/}.jar ${PN}.jar
+	dodoc README.txt AUTHORS.txt ChangeLog.txt || die
+	use source && java-pkg_dosrc src/org
+}
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..42a64e839358
--- /dev/null
+++ b/dev-java/json/Manifest
@@ -0,0 +1,6 @@
+DIST json-20150729.zip 52114 SHA256 62ecc38b4b86a2d864123f1d68ec9e898e250ea2d4c0798fdff52ba79db52c38 SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c WHIRLPOOL 393a81436e9441b7f0b6eeacf45323c306ffc623c15bb786c46431893318c128e4ab48b4ac610480897673ced33e7706a65a68107d42be0b58a65379db886624
+DIST json-20160212.zip 52295 SHA256 3cdf14d879be05e2749edee7570d8747ce63df72312cb66cc51b37ab258ac5c2 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c WHIRLPOOL 03be8d2069f2653c596baaf82eeeffea45c94272961e9a62f8e04823840813e7a9284592e90d2e6e6bb8c9fbb31aea76229786495d5c0f997e53d9306ebd0047
+EBUILD json-20150729.ebuild 688 SHA256 84f950f549f2187d3fe32414acaf3707b94d08c0127795c0ed1f2e0d18e9134e SHA512 7d7fb2348310ea877e5406bb20e156dd120e269cd3b0b4c144901c01fef8d745b763ff2809c9cc2f46f1d012f9e9619c35ebb1a3aa472f91f5da9eac72f13b33 WHIRLPOOL 379c039fd26728f2d88e01d5e3f65ece3e16f45746fc5aec2059af4575da8087de29fa6461d3c5e762a3ca53cb4cc93e07d74554d60cce882ec398f03ce0fd5e
+EBUILD json-20160212.ebuild 681 SHA256 538722a713ea6ec049918473e062635c6e190337a0ab87fdd5c937a385292069 SHA512 bddd61f652ba800c27ca13e639280519d5fef30cc042a3cf02f9d416a4f91cb89e787db5f600c9b680a78a837676286344ced491d9a1bc3273ef8a5b72ef74a1 WHIRLPOOL 4f217374e3ee8cac52e3c4da9666db61a296e644775337581201e702266a69db59282918520087fe3b219b40a807011f85cc33d21df9f386a3f44b66ece335f3
+MISC ChangeLog 1436 SHA256 5c993b663d1d3cf20c1d62e1f3728b57b5563ff14031b10d564f0465caa6b28c SHA512 94c5b525fa9357fa5cef44d4fb59d1f0657a7868b40436a58f8e7aa310b0b7b5be41942cd6cedce39a95cadd26dedd64b5fcbc2b46b99e9984a6a5c3c1a32789 WHIRLPOOL f8b30653f3fc9f4f2dce90117ccabd5c31f867f2be58971bd013aa98ace63b3e1329fa7bc01e6886748e14ca89c0fb944bf02fa0103378a45148879337c66d2f
+MISC metadata.xml 454 SHA256 7b4c49ff63003ded36ec1360ba04b34c38dfa26b21ed157be245315717565d70 SHA512 18ba78f62a286b7a86d2dd7f2f407b145946e5b79df2554d3252706f38162e562f176105746dd028ec46f50dfe07e00fdbc6a37ca31a7ea3d1093e069192b2b3 WHIRLPOOL 6891bc715fdd42e2d5f33b9a69bfe174ad2f8a09c50ba9b7c2651b110cffaeb985b9d516761cfb62d1ce457808d5885b6d1a423c278d92398af40e0e076d4d1d
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/Manifest b/dev-java/jsoup/Manifest
new file mode 100644
index 000000000000..35370f8343be
--- /dev/null
+++ b/dev-java/jsoup/Manifest
@@ -0,0 +1,5 @@
+DIST jsoup-1.8.3a.zip 370626 SHA256 3a2dd962eb3f3bf0ef14f526d89795836d06bff411e68f0adfcc4a8dd5915876 SHA512 d044231fc70ff6d5428707d56853db77feedbb29a4ea1a501e6fcbaaecb2743bdeeaa8dcf4c76f7d278905b31e83707ad2644e7876a44c9d2325537d647aab85 WHIRLPOOL e1b5d4ed64b4460223b38aea43466465638236edf0ef6bd987430e16bb2bd12796a4900da797320c5bebcd8de0f823533f2a40bfb6cc50ad30183912eb34eee7
+EBUILD jsoup-1.8.3.ebuild 1172 SHA256 4ef9149925a8d6561e7bf13cb8f741b8498dbb1cbdf853989583d868e433fbae SHA512 5f4de990ce860a2ea95da8ca86eee940c7e56f93dd2d2c6561ab9ebc180b56845935b46d69af74e260de561a90e4aaa764b2ae9b1b736693150b01b812d7f8ff WHIRLPOOL 954359983e8eadd3c229ef7fc61e4be65ddcc14b17d40e290157a7762a73b544c9995f73f88b26e2400872e41d026e72f2091503a72ea9298c3a6e590b8782ff
+MISC ChangeLog 3729 SHA256 6cf866d736dcbb80a5582a31e25b9709ab579fe9d87c34d859cd817e896471e9 SHA512 2b5c2dc0028c1e93296c207f4e8c80829a200dcf9e309750a18f14ad8d9bfe3c4110076b7a615795861eaea9bb8c996b2726ee821363dc831f751a6996ab433d WHIRLPOOL 4ab8812706c035c155efe77eac7e1d423362edf7726f182864d7bdb633812c3782ee5afb1e9b3951283d46d0912966b52c41a128a6ee0ca4bd60101b687c176b
+MISC ChangeLog-2015 709 SHA256 dbbade21f6258c1434683efdb400efa09f2f06341889a89f9cd8ffd495abda2c SHA512 e7addaf8a2f743ae9039e68172471fd70a1952454dc73708e84466ed0c950b357b8cf47ec2fcc0543edcc41343ae2c3e0e5f01cda92251c0495b49d0a7032491 WHIRLPOOL 9099c4e7442f6b4f9acbc8016255731cacdde1ea9e91f403ceaf2e40875ff07d078c7aa7d7174e7a5eafb7ffe0921f1d38019ac0f3ca10e70c30c20d40381b6f
+MISC metadata.xml 832 SHA256 ccd651bdc5abcf2303ed430f5b97f09025803011576b00b9169ae4f636da8d58 SHA512 795f0cfdf9dddeb803b917a4383e5b5d6626f3ba7e9ba1c9a3225c253860e8f66934863cb6d718a6eb96ce8e49b552beb849bb9dd33880166e37c93ba3a0e0c8 WHIRLPOOL 76ef4a9f011e7316567cc557980f407a9f60cc393dda5f60a00b8be2d797fc77e3b52fdaa3d03dbf17dcc04285996819527aa7db20641d3d66ab78b435a488f2
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..dd2cf1cba978
--- /dev/null
+++ b/dev-java/jsoup/jsoup-1.8.3.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 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="http://jsoup.org/"
+SRC_URI="https://github.com/jhy/${PN}/archive/${PN}-${MY_PV}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+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/Manifest b/dev-java/jspeex/Manifest
new file mode 100644
index 000000000000..39921fda412d
--- /dev/null
+++ b/dev-java/jspeex/Manifest
@@ -0,0 +1,7 @@
+AUX jspeex-0.9.7-remove-junit-report.patch 530 SHA256 4d826766c13b91991e6189014e0a9641a901924433762960cd73411a1d8ace74 SHA512 8a38a6033ca138a131ee716712efd463c2fda87829d46eabd8fa561af0327fd8718a673075eaa0f6a08a931bfd142be23c65e16959a36e1a845dc002744010aa WHIRLPOOL f8e7b03866eff9aec912add63c49828597b9f5c781b6f5be84e009b8094094a0112e6142d4701683f490bda5beb889ea1b33f834222f0c2bd081f7b2896b215d
+AUX jspeex-0.9.7-remove-proguard-taskdef.patch 1655 SHA256 a5cf1d2af63fed9c255f30878627d952d180c513640bc03d3a512d223133d7ef SHA512 d8c6358d01c659bf2e83d99d7831f1177383701ea34c76e8b39fa83a85477f8712b6911b6bea5da4e07b0e677816a1b7b4e90e51ee3c71fb7d0faffc9fc9b0d1 WHIRLPOOL 8cd3815b3ef36db1b185c29da6dc6839f6ac034e9c40f6823c6aea57a99202063d964b03967adda094a230f5c35be5d84c22a0d1d765d7609998191fd6113d0a
+DIST jspeex-0.9.7.zip 733580 SHA256 55d04780617d87ea2216401dfb66dfdfda9ecf5c018e48a2e4bcdd5c60910daa SHA512 9673bef155f1cccc45bc0a0d5596e79b48ba044309ba3446548b570bc7bad60b4b22cc7761749b0769114c7341b9fab6db8e8a155070f9de6fe2730c843199fe WHIRLPOOL d7555da834098c223b0b0f7c188d35594ef837a79d044c97ea14504a1173c65cc3741e993d936cda2812d3121d3a57e5226be9502db3fdf918b6e55e89bda5d1
+EBUILD jspeex-0.9.7-r1.ebuild 1150 SHA256 7f0a549b6c4d6a1d92b12d7297ce3512c0dde002019cf60b0e8cb3ca7896a570 SHA512 a816a6a0f3e12a2da2daf0ed90d00852ba341b280f3f6b7a5aa1fc6bf2676d97bed9162c9c990dffc21d2c6be3101800157f5b2df146156e9aaf8a92d9778a71 WHIRLPOOL c2e0be0fae78444c9b2839306c9a118debcc5fb738ee323eeff67291f130772142a8f3dc541278c058171c910eee16898e14f2434f4cd701f5ee1f833cdf256a
+MISC ChangeLog 2532 SHA256 f7dbc62b97406d105e4745e9d1c368a2d394e943c5aeec2933d0cbffcb5638ba SHA512 eaef1ff4c86d6c740289c431f8997fb03eb1929bed67dd4b67eceb2e20161b8a7e54df64faa9c97dcffe28d2e77d78936f12ee81d9ae7ce0d74a5f812c2fc680 WHIRLPOOL dd4a8c81f86e6ff1e86b309466c94ebfdbefd64cbf054283c7af58af404cb641bdb7d0618a5d5225ddcec9044885a390a2b97afd63c87c39bd53d89e206e6c4c
+MISC ChangeLog-2015 929 SHA256 ca520e844928506f714db5e57868582f784f62db8488fc8a434c8ce8398c5ebc SHA512 0baed61f061ba8ee60a9dbb5cc2c23dc55ccbe9ef50cdd5f050504e82325a983fbdb9012a80a82dd52b0925e640ccd08d1f805451247282503371d917c235cf8 WHIRLPOOL 07a9aa67bb4c870f913a0d264502bce8b413713f74de8e8781b89c84335027a11db4c1818edf79e2f7c48b0b8463ad8fea39b198655d981b1dc0285a15aca559
+MISC metadata.xml 312 SHA256 b4342381ff7fdbc2e3af8d4368a2325e6ab236ee39456f16641ff9e20a179163 SHA512 bf48f9daeb64e474b08e897e502436b21db0f65ba4cee4987654e811b6b71a3a82c3ccf9ee49b37babc9a8d8f3c6d13978d9c2e19b4ae27da51c1fc28f15aec5 WHIRLPOOL 24894bb2dab194ff03b43605aa9ecbe8e4dd816e61982efbb0a04afb6cdd2b61b5a571e93f3cead1c9ad7f7a35b9167f854bb5b255beb8f28852983c64db483f
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..89f27c78cd74
--- /dev/null
+++ b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
@@ -0,0 +1,58 @@
+# 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 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
+		dev-java/ant-trax: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-trax" 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/Manifest b/dev-java/jsr101/Manifest
new file mode 100644
index 000000000000..bdaf7d6bc656
--- /dev/null
+++ b/dev-java/jsr101/Manifest
@@ -0,0 +1,5 @@
+DIST jsr101-1.4.tar.bz2 18614 SHA256 2f2e793c0ece7240d7b117e2f05eb4b32d29e7fa7b2fbf85d912fb8693b0a55e SHA512 a29cca7e0ed1eb8aff4b70da6d804cb1cd61cdd9a800f420be6794aa927bca6a4146a95d71c8521d4dc16a0da56419f3e82079d942194380dbddb9d44d773317 WHIRLPOOL ad710d84c000f7711d0bcc3d93071160bb85daa0a854ade778ad3e636b49860a25739bd8e175b7c4a2a1b19f6c59451c0781b6b59f8331ce87cfb1c589d1e8f3
+EBUILD jsr101-1.4-r3.ebuild 687 SHA256 a2c0217059b0f34faa9708269e8e95c7a3c5a476f85616d555832c1452c0afdd SHA512 a48b126f917cb8414ea6f6f9891363c65a59cbf3809e905445d5a39696b0914502888c8e414dceef778331841d48bf07c7cb26f1673935adcbf2108afe2b5599 WHIRLPOOL bf59cb5498c9692fba28e720ce3426cbf2e4dcdecec3534d9471f18b35962cf1e1153f6bee6af7e21528a1ba89e42b20fea03296321b8939f2043c57e14444fb
+MISC ChangeLog 3291 SHA256 1945352429b1c277dff844ced33b6f96fccea021568f090f79be07175cc7ae30 SHA512 8d17c157b0fa6fe5809bf606accf968fe98813f0839f3d5f037b3f452419091cce6e40519c366a771f7e7b1bbc32de35a60d6b5d5adae1da7e674230d1600332 WHIRLPOOL 18346379722db64e4ae9ceca9a7ef7a89d1c48c215ed7118aec38277bbc9fd9871bf0b92640810ec64801d390e0287fc4a20547c6550e27a4a1183eab37d0f4c
+MISC ChangeLog-2015 1832 SHA256 d796eae101706f5589cd572350867ac8dc05c7ea5f86611abba14b46fe95583f SHA512 0a9e676c50b63252c0ea1f35f4bacf3f2a1f3afb581c0e1a9ed4d0d53268b4b52c6886b0d176e8cad4f82c6584b8c5cef24bd02ab6e8c66a624d97a13dcfa13f WHIRLPOOL 089bdd33cdb53c923284bc5e39459d42f28dc4111f44810e7c725b490b4c9035fd574badc066a56a3947b0c997625acc39f3f5ca315a4906560c652db6bea0e1
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..8292ca79d0ac
--- /dev/null
+++ b/dev-java/jsr101/jsr101-1.4-r3.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
+
+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 ~x86-fbsd"
+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/Manifest b/dev-java/jsr173/Manifest
new file mode 100644
index 000000000000..e9bfbd718041
--- /dev/null
+++ b/dev-java/jsr173/Manifest
@@ -0,0 +1,5 @@
+DIST jsr173.jar 639734 SHA256 3f6976396e31836dfe99fdc7aa72ee195546b6b6503618f60e2dc2651ed990ba SHA512 8b299532716682772e5eeafb63a5dd125dec8954a9a284f6766bac05409fff611724ae1a9b6f4f6f303b64c12b19e394371a6b0a87132b36e88f94e20b69efe4 WHIRLPOOL a4d7cc586e774bde385faa5b2ee0dc084bab31b3ae3dca9f862ffd8560fddd8fe76e9a700c1a63f6c02edf63d22733e07eeb14acd02fb4269054e0287bc72f82
+EBUILD jsr173-1.0-r4.ebuild 906 SHA256 7d10373905dbc8141dd40a4ddf9017be4019c405b4c8b3dd56d37ce113f550ae SHA512 d56da7260ad3e049a2a18c90ebd52ee3526e2e3abdeb24a2d8be199dc561b7b4d47c97cb727f3e47d719d2ffc8247500dba311c88bc99d762db72fd3146963d0 WHIRLPOOL 9bd418285159c7fb14850d99066f380d37b4db34b5b9e6d7c8a766b72604934efa4c8d8b68514d6ee1a5fd5ff6e89405dcb1364fca9e055ae8dafb98f75ddfb4
+MISC ChangeLog 2735 SHA256 904918bc8a840406916a3f873ed9d3dcee01456fd8b741e278f912ebdac39ef8 SHA512 de2bb6aca77b979fdc661de9e70a25af6c27daa0d5aeb0d9834b0a7c3be2b7e181eaf149982414b44b09aa7f1110ac46dd6bd19781a1877a226a16a2d1427939 WHIRLPOOL 374e10b9579e0777b98f5126849e05d7cc8feac155663c8f15d824086c83420feb5738c549bd9e431f9dc5ac6c12f979d1376f5e322572b7ab2e9d086c22a440
+MISC ChangeLog-2015 2977 SHA256 0f20deb60ec7fe7499d05e842ea8922b64dd6f7007d08d88bb23f101fd4e4cda SHA512 c921022dcb066db88dea1c831b9167cb94c1396bf334df8e2ae1e6e88bd432a651c368058a70c12bdb067ccd709de8c7a8c0fdc82b815a5a3c97b57e52fbeffb WHIRLPOOL f4fadd19b670dd20224bc764b95068cfa208bffd39b9de6ffdecf946ffe609629f94784169e81986aced903a13a8774c436ca5f4cca000658f148e6a9cd254ab
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..4406645826dd
--- /dev/null
+++ b/dev-java/jsr173/jsr173-1.0-r4.ebuild
@@ -0,0 +1,43 @@
+# 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="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 ~x86-fbsd ~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/Manifest b/dev-java/jsr181/Manifest
new file mode 100644
index 000000000000..505b502afa72
--- /dev/null
+++ b/dev-java/jsr181/Manifest
@@ -0,0 +1,5 @@
+DIST jsr181-api-1.0-MR1-sources.jar 3929 SHA256 abb37e9c15043bde98ad27bae9b955bb43ccf5c27c1a0f88d57d2bb8bc509b14 SHA512 383806428ebe80e94af2c80a3d383f24e934cde57d5628e60b2e2335052ac037ad45f1e8c265c579cf60ed7383b15fd8f2e8dda6b08d8edf1d171b9f0ef0080e WHIRLPOOL 0e611e08d8aa78555fecefd7a6e56a488e555db0dfdc62c1ff1e96f643f8e5b67f62142d1935190ac7a23aa7555a2ce389bd459f0d482cbba03bdedf365408e2
+EBUILD jsr181-1.0-r2.ebuild 529 SHA256 1fcc80fd41153a7c4e5ebe239458db5492ff33fef9a76f44821111a0cfb83ac7 SHA512 5318dd6299529344076313604257da701ec518df73e6de4faebf09f5a973055832026445225ef01a662250bac43a509cb11aa4bf44e5e08022fa9e7f28bc01c8 WHIRLPOOL 8a304dbb8459faeb1c9555d46b2b5ab41feb6969205308e48490b1237b297fb95db6db809c3ab92640797091498bb8e4e7ac0e032577af047b642b2cdd275310
+MISC ChangeLog 3368 SHA256 fee7ff01fea884237b2e81093cf8fcf511f93d8c48550d37c6b30379ab82b55c SHA512 45806c8e4f64be957ebb6ee969675569334916e5125f6421dac46dc161d24571fb030388642904b6ccc32f5d57fcab242d6297e7c853fbd8f0b81403acc1d553 WHIRLPOOL b888f72216655e26814cf021a3d25b178abdc7eb8542ccbe30159ad6d2c524e13c85d9e46c4cfaa593d452e0e8e2d7910cbdfd4734ce07b07e0244ad050aa11e
+MISC ChangeLog-2015 2101 SHA256 df28bc3bd10ca8ed3615205268e82877c7dfd97db7524f78331ef59e784e65a6 SHA512 3d708fd1975586f8fe07447d03c2eb002a7ccc9e2d7b93a01be1ab93c15b9e61a6d62da9bc90e639ca3a8d514b4449b6cff95b96e31ab13b52e8ab9710676d57 WHIRLPOOL 90f63c18073c3ac6b0d4654507d530b21e583b1258ed6ad35f265e083f2c9ae628babdc5a20d3f89b0bddc52f1e969446124386ef12914415280f77e39fbdc17
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..82b06439c8e3
--- /dev/null
+++ b/dev-java/jsr181/jsr181-1.0-r2.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
+
+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/Manifest b/dev-java/jsr223/Manifest
new file mode 100644
index 000000000000..ada98c2e9235
--- /dev/null
+++ b/dev-java/jsr223/Manifest
@@ -0,0 +1,5 @@
+DIST jsr223-openjdk-6-src-b19.tar.bz2 15936 SHA256 efbbe1f9a589bc92d8479e793a6486d7c07d452255e6eccdd8252dfe8fcd3646 SHA512 69e09e7cce017693abdbf1a9fc1c4b412686f05fa6a3098bc2724020c95bbb8e5349a0a176b930a364a8848b91dd4383d9e9c40dde317b3ab998139bd528f205 WHIRLPOOL 6b91fe11c7f64bbc9993bbb87f08f0b2843acc380e1110e7aa4e69bc860c2d0d6a67b897837e97f7eb316a8e8343d560fbffb258aa34381989e5de754a3631cd
+EBUILD jsr223-1.0-r2.ebuild 476 SHA256 73135bafe8da1f86310c22660b9f33d57134858348cb34d1a55085ba0ebbb32e SHA512 a4a3849eecc321a29955932b616641d4e9696a2b6115a866b3b775a8f2f8e4fe6258ae33c5d603182d7cbced993880b12d29bc43f999fe94091e3cbad1c0be96 WHIRLPOOL d57e57cf1cfb8c9274d06cd1649f10bbaa5f14aa771734008543cbad85d94f3f09760acb9ef00917c0ebee012c3b872e3811580322ba3d7f734e518e25c08787
+MISC ChangeLog 3233 SHA256 0f8eb176b996950926c9acf0ceff8ae46f333b83434d02f9ca4843cbec5169a7 SHA512 d3dccc08df60e9061dcad08df1b8ad2e51b4d459e6e022b3af0b5811b99b68bf85580d2b3c041a91054ed6c2164963d3643d8096b089de2371a938609e4054cb WHIRLPOOL 0f4998a9722537396ca095c8a1c77d35fd2611ba7b59dfefe0d78f97110630ee9e218b5e4195b9ac54eab25cc280e546b3e1a5bb8dd98ee119cee990d6890d39
+MISC ChangeLog-2015 1105 SHA256 1aba29f406297993d09dfd578c711e83e8577d0e83be806eae07f74c17e6f2f0 SHA512 90b7f24a76bbc237a5aa5a8efbf4d5db723959dfc322701bb2769c93dd595cab8e273a22a50fe8c6d20f55fb01250d394775002d0765c1d4240d2701586e720b WHIRLPOOL 01d837de4a8d854ed2aed0cfbd3f4855ec22c718d0aab5a604cb1117b9741e9f2e716686f4a98d24ca8e4ca9a53829369742998e95018fc1f8840f7d0729b7c7
+MISC metadata.xml 214 SHA256 8e5c772f056babed2e7e25acc12ab79a32dc6a670548468aab55a9e1a8e5b848 SHA512 d2b6ecfbbd79440de1909d9f195e5d4a6f9886b685ac1e6d7a1db39b8925b29942fac2998cde06040c921f2cc9ef2cbfbf836b60e191d894b00f75628476b1f7 WHIRLPOOL a6545983d0a39cfcee27a2628897a5a59ee0daefe93ccb53968cbf386db1dda3b41851ed1ba61406ae5e5c17cf94b6f88a5b479a838064c99406a93f91ca7628
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/Manifest b/dev-java/jsr225/Manifest
new file mode 100644
index 000000000000..b83c425513cd
--- /dev/null
+++ b/dev-java/jsr225/Manifest
@@ -0,0 +1,4 @@
+DIST jsr225-1.0.jar 58968 SHA256 a3d8096a708a89bf1a1b857e6819f6daa246eb3c9c5acc07a6a1f39be61058f7 SHA512 c7f89904269bb09037599914cc4199b467f9d882b982eeeb7663776b61dbf6868c3aac8d576ca2d8999d0fe3378e3a3896776316c24039487d2501d6e2872712 WHIRLPOOL 8b84dc91bf18279395fe14d665d05856df645fddccf1dcbd1f7577560a00cc17ddae782b331a973adc2a3d9d709be1c253dc8752c32ae913292207a7d4299b56
+EBUILD jsr225-1.0.ebuild 591 SHA256 64a584aec49f17ec66a670e822ffb4b0db5bcb9374212f85e67a90d1928ac769 SHA512 8c320fed17fde4b654b49a1b327179bd39a4ad8f507f5fe96aa5f63c423896514e891b9a90f955090f9c574071154a590f7cc814b1e63dacaf3e1a376850e1de WHIRLPOOL e298a2b5a661fa5076f5e770ab7040e7da5d75ae303e20a0e8e9cad9c589ba1117f7ed5d521fd3ea984bb0075a356ce82c066508e11583e7d4a7cec060c8ed5b
+MISC ChangeLog 1683 SHA256 e58e90e0b5f2f7698c9102bdbfad4953bb49334866fcd6a093abcd36abe5be01 SHA512 b3cab1be354aaa2417b0fa30f1249cf3678e79e2fc00ec659a83345e229d9d4b4e2671bfaaa8e620e6952c31c7a33cad753bbf0a8b72789530369ffb2bc7b4d7 WHIRLPOOL 244038c0828ba1c9f4df2854006b062a5fa7d606f95e326181a7112c5b2217d87be9180ac46cb7f968636d19933ebe9e3c13335039dbc7972ed18b488fccf42a
+MISC metadata.xml 310 SHA256 e30ffdfd65e9c7b6a31a8fdb9b497296e76d7ed12bab5db2c7349454721a2ba5 SHA512 875298f3b7c7eabdbdd0942a787324b5f2d9bb5c7d48c61cf48869595962e6ec7a632b606d4cd4c36144851904ca76c075fcb1d8b4008f48e9df6de42edd108f WHIRLPOOL 556fa382d80ac1e1aff04ab93acb3483781315fa39620a700f461f8e09c79e614261409bb495a7ebfaefcb8c1b2f085606778959ab93d9bbba24359d0bd2455e
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/Manifest b/dev-java/jsr250/Manifest
new file mode 100644
index 000000000000..114dff9ba24e
--- /dev/null
+++ b/dev-java/jsr250/Manifest
@@ -0,0 +1,5 @@
+DIST jsr250-1.2.jar 42311 SHA256 8bd08333ac2c195e224cc4063a72f4aab3c980cf5e9fb694130fad41689689d0 SHA512 bf6e816958a74009e6aa13d03530c1ee4520ac756305544958669bd6fd0fd1de0ec036855260dea9c7a3f86a10f88a866a7cd1d86a52856097d1f1ea3ec92d63 WHIRLPOOL 59b6aa41cb704b80c7b96b6697f878a75cd2ef77ce13964cbae75e988e06bca085ddf4befe005755dbdb11a764edffb29896e2cfb363eda3df25e2520a500c43
+EBUILD jsr250-1.2.ebuild 528 SHA256 1bb6f6c5e2a6d2996496df1bebca8e754051ed66819d28ace12868e095882bd7 SHA512 8906f534eea13b3ae339d4d07aaa90dd705d0bd016afde717cc16c28f19cb798eb2758155e5211da828640f097425a6df77664fcc632fafb85aea2ed915a84f3 WHIRLPOOL a346845972d80e1e5ea7abcd07d47366c42f6555219e7ee69a469eabf12190ddd93eb8c9e1ccb581661737e09932a4f602f80da07666990902e2464903ad0f43
+MISC ChangeLog 3592 SHA256 9220d61c9d94cdc973eb56ac0fdf26b9670609eb4b95c3ab497fa33e8043c635 SHA512 e5e73dd9e60d6cef63798f67155009dde41eb2a0d0f20ae901905d3b207126b2e865bc252f9583ff083a225f83413d9f6cb99f63cf550c2d412b7e7a8de2d19e WHIRLPOOL 9d717598fb9a24cf48a60ece5658b8bd6c2f2d6b002fa49ecec86fc0a8c928faf32b97f45ae872cb8d9d767b1791d7b51b3f9a25c99d4a2cc25358ecb66d9fc9
+MISC ChangeLog-2015 1771 SHA256 7acee1f76f73ecfb76a99f9d3906cabddd3b2bcab03b3047eb7f09a019ce7db9 SHA512 d8f6fb47868e21193d3ead5886248e5ea3a2887566fc871bf34a1d928fae27df2b4dbeb132447db7f264cf131e6bd7c7b129e586297dfb967b7d73cd927af58e WHIRLPOOL 95de68a8e268b1e54c0daa89fed9d62388d1f485ed8b059061dcb2d02ef7258cb1fe719e7e442bc0ce4b71036f2cce581aa82ab929ba194baa4430333c398597
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
diff --git a/dev-java/jsr250/jsr250-1.2.ebuild b/dev-java/jsr250/jsr250-1.2.ebuild
new file mode 100644
index 000000000000..66f82077acf3
--- /dev/null
+++ b/dev-java/jsr250/jsr250-1.2.ebuild
@@ -0,0 +1,19 @@
+# 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="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"
+
+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/Manifest b/dev-java/jsr305/Manifest
new file mode 100644
index 000000000000..6619506750eb
--- /dev/null
+++ b/dev-java/jsr305/Manifest
@@ -0,0 +1,7 @@
+DIST jsr305-3.0.1-sources.jar 16622 SHA256 56c80429d828bfaaefbf0358334c2629228a0ca25c073707be589e9d6c9406e6 SHA512 ca9902929de94fbc03b848599bb1f5f542898ade724eb0d6022f799733c9093bb27c0a565f0a90f47dba7bff72d5a6d24de687746721a1bec2050c2061ecd148 WHIRLPOOL d57e98eb34fc46b82946287cb73fb1009ab5347fad6e4407e7d94e9337ccc1d4552084a2eda0fb4c5b9d29b68d1ab97cdf6d6880352559b4b022e8ffb1021a99
+DIST jsr305-3.0.2.jar 18102 SHA256 1c9e85e272d0708c6a591dc74828c71603053b48cc75ae83cce56912a2aa063b SHA512 02327071dde09470c8cd0fe39405263146d7e86b15312bc3f909c6a6fa9b11c730bdb833b6cdbdf1aee0c6553e519cecd0257a296947f94636650e88cd8c5b79 WHIRLPOOL deb547b3b0f551292848546e6a016728719beab0808f963089fca9dadb3e6e601ffc936e2771dff8977fc5307d3c624abe7d00f296caa0f99afde9c34725f9bb
+EBUILD jsr305-3.0.1.ebuild 503 SHA256 e0e432f9a4f414c415dafd1bc23b35cda008edbaeaa010e6c0073817500e13bf SHA512 22e394320bf2bbbfe313a0228e6bebe6f67e0f66e23ada4c2ab1989dbb21a7ad602e2df1fd4ddbde6c005108fd917f7ef6f70db3bdd6c938201ca92181b8f88d WHIRLPOOL b584dcbe663b6448dae9acd88337060cd6109293bcec0297e9a18f96392a4693bc6aa0281439de350483a459b8b959e6ecf51c2dd9b8b4d5e36c5c959ef936c2
+EBUILD jsr305-3.0.2.ebuild 515 SHA256 ab36b36bb1bac0ddc1c4ed2703ca73f8f126489ff30c47997c57efe592ba9aca SHA512 d823252f6e0a007a2994009a15361b284cd997144b7f18679bb4fca8147e669f0dabaee8dc53bb8cf002204e18fddcc331a913812ec033f572499f74a4711f2c WHIRLPOOL 32f2cdd06eda8f44ad076a60de56dd6ac9b4a82e8caa956f15956725fe99d0b0a1622361b3d39530c9fd78c86d19bfd138afaaba25b1ad186abf09fab1c5978f
+MISC ChangeLog 3398 SHA256 faaee91b1d820e345570313b4bf7362b13bc4390ef2904216046b5d63707ba86 SHA512 5bcfdad6d76add68d6363cdd90a38a78c7c572849ee91bef72524003d3a2a697732431d1fce550242147f08f8b8d81347f5c4a5f77c40d906345d9b3292dd165 WHIRLPOOL c4af296aa5646f16599acccfd2c0491ea95366a11eac650ebb97118f6500fe3a7d578fbfe7028a3da94cf1cbbda94d054c3f8a9c6444a8053ce56a909b9d5757
+MISC ChangeLog-2015 1041 SHA256 2577463134d4d5bcabe23cede48ca20b369fa56783aeca0dfee05f3a011b4c12 SHA512 d485c26bd32a3d8d62ea1f42dbc8be8252254765ed64fbe7812cf3b7fe8b10c30efd62e886600e0a4309019ff8b72800e4ff82783e6b9bceaeb4c0b53ef2b5f6 WHIRLPOOL 188bc9ed91ddcdb95486e6e6eae4a6662053ee846c7336b53d583329156caa32302f2809110c86cd622a769423c758a397fa5a0e531c04187e7c1c2167ae6a32
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/jsr311-api/Manifest
new file mode 100644
index 000000000000..0ea00d63de90
--- /dev/null
+++ b/dev-java/jsr311-api/Manifest
@@ -0,0 +1,5 @@
+DIST jsr311-api-1.1.1-sources.jar 70022 SHA256 99227bada18620d29406be240e7c749da68e646ce1d2a61d6f320863f05a30da SHA512 4f32eb290aa312794ae91b3b4e2baa72efbcf2036962c7223320f7f7e7cd9b5de10c4acb1c92277df946b12710e0699bc1d3ddd7459903c43107437c21cb5542 WHIRLPOOL 022dbf28ddbc7df4a4a020b710c3b64a9f639acc388e3d6370cd426eadfc7aaf1c5ee731c15cd20d75c80829e8e5423714df6007c4cd7408111c8d48c52d2e05
+EBUILD jsr311-api-1.1.1.ebuild 481 SHA256 82e372070b6562fbb13f50fb118f51c3b95cad55532e180969462755167493c3 SHA512 9fa64ba0a95532e29ba88eb0219e7d6161ef0a8eb2f09f2f61a15a0a5a4ee0499d2b97bf7174010a857a0a5eb6d035145d2b6e5a4ba7c7476a5d5e7bca7232f6 WHIRLPOOL fcc605f014cb968364c0bd7f81a9472b035d558c186fd8fa7bca199a51f97543a46b878265081f22d7342b5e674515849574bdea3c9e3d89694f8647ce4e75a1
+MISC ChangeLog 3698 SHA256 d258dfbfb65913e9bb535e067ea4fccaafecb2d5c8286de8367d280c68c40ea1 SHA512 fc26c87a7630f35a0f67b15f260e3f9290b4fa1db7e7896d1fb74ff392b964bf1cb286c11588daf11025328b8113f0a9cb3db7580942e588314da667d841f2bb WHIRLPOOL eb6e9f43e2c4780f45f0cb8836c2f0da185b6093743a6312ef32faa455d1de15f093abfe4d52d26d3cd67271ff2b10fb392ce0ce12b60bd9dbcf4d82f4c69ce8
+MISC ChangeLog-2015 1468 SHA256 be2ec4be331f0da90e6e06b42bfd0111648e1ce6c35bec09ee07a72fca96ce22 SHA512 400dbc87893fd6182387db8950f955b9a03f520eaa27b06eb1ac3457369ac74efd2560739131a292bf6e82b31f829fc15170824d679bef86db05f193f42aca05 WHIRLPOOL 00548cdaf70c3ff6611542a3f60b56ad179a75d2fb4fca20c6c659acd4a49761d55de9c095ea06c65285102e272e32b4c4070620477278b29f30018543eadfef
+MISC metadata.xml 311 SHA256 94fd9fb8712f902619226484ef7dc261baf118517f048b72e6dd6f631ea05e9a SHA512 8e793d62ff46c9527765620d70db6a304f5b4789a2cc7a5674c736d80ac4ae96d30d463cd5ad14078375887ca034823e2ea499c3b9ddf544157d001d1b273211 WHIRLPOOL b8edeb606075f6b5097e18c67705b29ea7b5d9a05d12437bd86ca8c4ac53de357ab787bb04abfd198c10f54440b1386fa35886f015aa7e081115af50e472a620
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/Manifest b/dev-java/jsr322/Manifest
new file mode 100644
index 000000000000..88366910441f
--- /dev/null
+++ b/dev-java/jsr322/Manifest
@@ -0,0 +1,4 @@
+DIST jsr322-1.5.jar 86462 SHA256 f059b4df36671095a759f09e29730fb2b34fc5fb370cb87c5510a3042d7695d5 SHA512 e96d54f8ac8279e53754a3950590382f7857abf26a0a97f7ad70dc72e0da66c11c537627a329bee943756ffbb4d96e47b0501663b51c3775fb1dd5e8bfe3a9ae WHIRLPOOL 3bf9264ca67cc987b2b61d58f66cee3c58622ff400d853a6942a73bb87f36156f0061bb4959585a5376f56522bd6ab600e4b8abf25e1e1aa9558a95da7dfd5c6
+EBUILD jsr322-1.5.ebuild 536 SHA256 a3d9d41f606378930043867f25ed3005a18821afd5f140611cd08cb44ac3e831 SHA512 7996cd39fdcf80da79498a55ae1f91b20a6044e049e688d912dbfe523b4b70957c998948f5706be3710cb1e55a3a6a8f20063ea33281a7178a74f98eb5f5b237 WHIRLPOOL c56bbd140239d0e5ba552ea93e256c49c2c47dcd7563215ccf43cb867270378aca9dc4415fe409143c45f995e9a90444905fd1cc447d93fead7b1ec7406bbfc8
+MISC ChangeLog 877 SHA256 1b5b70acd90d71c333d1c2f78ecc4953dce2a1f4382fe20482a4e48552ca003f SHA512 24b744f189d42bf9b681f399becfb0ca044f67247af5e6152f0d2cbd477fd22ac0d3cac1a0079a56859ebc48a3b5e654c3c26d54a830aef033c869278ff4ef1b WHIRLPOOL 334bfe06c6af2546fa00d7b418aa5973508d6d7369769436217c627c12d60ad0b8c9cc44c9acd6350f9554be195ae00ff59263ca6a2a8266f5d1ff5fdf7260df
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/jsr67/Manifest
new file mode 100644
index 000000000000..c4f934931d09
--- /dev/null
+++ b/dev-java/jsr67/Manifest
@@ -0,0 +1,5 @@
+DIST jsr67-1.3.jar 327033 SHA256 fe2b95887477f7f39c8d3a33211c0d96cf73872364a0b0478bdaf24500be6225 SHA512 c4145e5870af677542a09a17b7b57d9e5501f6354b26743b9eb9946dbd263114eb705c023af996ddcb256961df28a7ac2420a54fcdd69f73c8595901ee21760a WHIRLPOOL 25dcffa1eb5166867158211ae209e2b24f648d6806e392b80527b8c34f4ebdec181125f80443c1b6956856b1b9c14e83a9df9a72781d14c4fb366bd3a7ae9479
+EBUILD jsr67-1.3-r1.ebuild 551 SHA256 9cebffff94b830ebcf4d38f132c4588e04241be2456e18212c0edb1f2d84eee5 SHA512 e166b2b9e1ab8757b8d56dd057a78c1e03efd88f1aedecf90d3f0d94789f9142b7e7e564dca146376e7d4a0b7fa0d2fc6657216b14219d071d6acf4f1cbe1930 WHIRLPOOL 855108e098bc611d9dd41fed85392260b0101cfa1c319b0c6c8686d1468008ca2143b66a58f3be42dddc0a221731a348e5513c0a8dfc50a8ddb198c0b91eb1e6
+MISC ChangeLog 3071 SHA256 fb86d348321a2bfb649704b5187432bb50dcd1919200476fedf66f90d2e35613 SHA512 f1ef53c7cadc9bd008da1ba3aec4fb7e95ab3b7c133c2486aace3a0e0d5c7c8ca19c4d92fc649443b3d389c301719849b0272281124d3349d75c2c9dc386ebd3 WHIRLPOOL 961e4c1d4b631d2818e1b3fa0f95f1d47c6c2551a273e605b936967c8a992f50bffe094c667c57596eea77167de38b8fe80e31c50491b10f32325cddfcdbdf0a
+MISC ChangeLog-2015 853 SHA256 0b705b484247e82ccf81fb9df4895c67c9ae6389e3e7d8a546ee9dc67fd7e7e6 SHA512 e4968a5ce3f76605c76e4e2f18735c246733d856a745c717cf1407547b27b181e625868b358e2dbcfca2443bf0aca6ae58c7c5ea7973d4ba5a1bafbf29310ae8 WHIRLPOOL 8ff3119dc6f9c1f18ed5d676fd29a429666430663b97f01ff4f97c629b0ba11019ab95d8b12ec875579616dd542e1ede2035a20756eadd9125b189a3cd318de1
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/jss/Manifest
new file mode 100644
index 000000000000..47dc36b3348d
--- /dev/null
+++ b/dev-java/jss/Manifest
@@ -0,0 +1,11 @@
+AUX jss-3.4-target_source.patch 633 SHA256 7785f02cb67d47198e5d6052ecaf88ec1f237585e3244ee6bac147d5a5336732 SHA512 5e41d3c7ccebdf91394f8c2e341f2d4667ec1b8a77417abff69be950d41824409f065023a927fa9836c3301e8df5ff2183c259338636cb04c31c38a6385fb4ce WHIRLPOOL 58ea820397de15e2f656a89a9a092bbe2a08f723292c743d34715c68fdbbd73b21746a646a7b2e46392206b06a08089462f5448473f7cbcf1531b27113a0b755
+AUX jss-4.2.5-use_pkg-config.patch 1004 SHA256 04fdb13b7435e11149485d62218aeeefc7d20544f057b3097bef46498b8aeff0 SHA512 1e32d7d9b66b90ed4e974ad5e3e0bf35c5d36fc749fa8398597b17bab27f076c533d724620b57a2cabfe2020a2b9979aa393ea4736bacff86798814e94367559 WHIRLPOOL 81288d3a3d243f72f52e1b0d6ac03a0bc09edd271c61ec145396607d126949d380cd5805c30cd96867d2a5de6745381bd6332e832a0c887ebe28a2f1411e1c05
+AUX jss-4.3-cflags.patch 511 SHA256 f73f9f182735480b4f062c00339aac79cb9d25e8c517f6af850d2288b9484536 SHA512 80d01093adf1006771a3e0d8a03e826b4f68819297c4d2f1ef28b9403a7c9d50a08929c1e84b3ca471bf0a56fd60de2bff8555bd25596f3d869daa102916d513 WHIRLPOOL b99b02c26cb758875c64bdc0e914821b0202fe6236573123d2f7a202ede4bfa482235c67e307532f8a9903481bb826b50e7c0935cb7955a5c94b0daa4a82cc01
+AUX jss-4.3-javadoc.patch 660 SHA256 1a8e6c3bd973bda1ffd85d9278e8ff7842f5d47111aa0a3cec32d22dec11c01e SHA512 8ecc605934999a1c6d063b71345727561daff776c411147e8c2858c127ca8d430e79f155b19e7527a4be41e50d8b96f19f02788d2f2db673e87bbbaf9ca0f7ea WHIRLPOOL 7ad5fcbf4567cc6de6e96303b8659ccf89d1ccb5f1d179af1edc3de4d8092cde07d0c14f67a85bde4c43b1aaab960127669fa0b35a624e7a1345cd0856292616
+AUX jss-4.3-secitem.patch 5259 SHA256 90e03142840da904a8f1c9a962043c197d99ff7446c034aaf4e55ea46ed7b3e0 SHA512 16eedbfd311829e2fa73ff88767b2474fcd1f5750cf3351d3bc23efdcbcb2729f861a7f69d6589418e6308576846b93a8d7dc615095c0cadc0accb9f63f6850b WHIRLPOOL 16db2a3ba022b45244b001e3a5a871e9a55661e1fb5c781960cf45e0e4a436e6c2829a16ea07a6d9949d975e297df3af89748d46a23f45903db4b7f203f9ce25
+AUX jss-4.3.2-ldflags.patch 465 SHA256 42e9f70f5db93429cf62d775182de15c051dfaf60b4f7b778205725ef06b868c SHA512 19910a0aeb0b994d0f5c871d011a7b97a0d323f43dcc86d88442aed17561c1bab379e0eeae93961afaf595a2651d29c17a36daa28a2bbfe522fcd04955d82214 WHIRLPOOL 18ac398b06831a1c39733fa6a51ce9dba75a26f4f4b80ab4614ae83617239f2de0033b2922b1532246545fc8ebf66b93856526c48284f4dbe85c69b470788eb2
+DIST jss-4.3.2.tar.bz2 435542 SHA256 8bfe94668e8aa1b8fdfaf01fd45b18daa2336e1901f90922c44327116df8a278 SHA512 3296da72f204fc4a0ea58dd889cf2721a4afa0ec7b5406312e64354cc67edcfc370140ad22a24f0dfcf11e438e69ebe9da45a70b5cbaa4026b40fd5fcf96c232 WHIRLPOOL 5f72f6cccb49c40e840472329461475bfd83e6ac98ea60cee63c0194374e210df5dac038fb891635f84625c5643b0b25fa36253c78b3cad4461d647c7a0fcc15
+EBUILD jss-4.3.2.ebuild 2759 SHA256 60e46248612557555eb2e51bb4278472fa4dc71061cdf436416cbde4f60d2481 SHA512 bf3369ab5385c7a36bbe51a0e4b4efa4358febe655e8d72b0ccc46eb0e8ad46d9054d78d9c1e19cb16f5348e352608c5ca247b4e07b96dc40352e586fbc1b830 WHIRLPOOL af3194fe2cb6d25fac1b82455d30cc1fcc0bd0f8027fdcf84a1c03b5ca4ba7a836a96da0dc7e50193c37aeb5492960ac70e9d078bef05ee6b2ab5dda97c10f89
+MISC ChangeLog 4215 SHA256 1ef4b0fb5a30f554c029d66ff05063953d49f2cd5c5dda2ec33add9313f9cb33 SHA512 de6faf84b7781061a126987fbbf5be2c7e625564b8f8a6359d093777bc3bd2daac0e0dc7fad2e231d6c53fc8ba285a91f1db5b83740d92043ad09e806edcdd6a WHIRLPOOL 79095bb422c678948197138e72901a6981d4fa1c5e3bc361083866ad8f35ec9525933dc65664bfcc7e0bb8d6e283185c74e4ae5de1c8a9f7f2f9db482190eb51
+MISC ChangeLog-2015 4719 SHA256 b569616862cd95e487b5d11dc8763afcb773cdd87208a7d9f11df9a8c25de8ac SHA512 722511c33c8455f23613e47b5781aff3715c0c739ec44ae248a769c5a3cda99d11172df4d12d680f1dc731891e87cda639616b995c7590993200555da0c38bd1 WHIRLPOOL f5199f76336ecf6aaf62dc1170323d90bd66757aafc15e98cb5e1840570964fa88a14fda29195aa2bceb1d380d2fde504c97b741c2a94659aa3cad06c4aa9313
+MISC metadata.xml 508 SHA256 523ed18f31f9593e61bfe2dc179eb9316aba410875e7529909d217cc3b122ca3 SHA512 025f9d7f269f4c0dc744e6b705311b1efcb730bbe32e08a70233f2bb8a62a69e3d65de6cd2c3d3c8afdb383cee4bf76af180fff12b187dce7504d1e55fa56d4f WHIRLPOOL c571fe4af9d59ee0f485d5797a24db76e7652ce416e6ff1cd08b8711691fb95d5625fc6e58ab96b36f0ab6f5703cad7bd25e2b37ae463a74469e5c3ad6328120
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/Manifest b/dev-java/jssc/Manifest
new file mode 100644
index 000000000000..fdb038a32382
--- /dev/null
+++ b/dev-java/jssc/Manifest
@@ -0,0 +1,5 @@
+AUX jssc-2.8.0-library-load.patch 4572 SHA256 822dc1f360dc737af336d5b1ffef9c192511fa5a2b4031511a42bb08887e8b54 SHA512 5121cc00985736236fbeb05117135aa187d9587cb85c28f96958d9d7a1f9564f6be91a3c82856353c477728bcb725c86a9dce4732b3a2b67cbd813af7544c646 WHIRLPOOL e741b34b11f0af73c45cceb3c00caff3dc01acb57018e5e25a5e325657c1d6e8f7cbae646fd22b30260ad1f48ce68ea283d9dcd8a253f82a4ebdd486bc5be22d
+DIST jssc-2.8.0.zip 171914 SHA256 5909c4c2103de81e274c53617cc72c17a5b6fea761b8e06b8cc4006fbd1f893a SHA512 4d767054085a79cff4fe60d96d664918f69a791c8263d96c9d9fd622070f567acacb621079f23d5c54253366beb9d2a01fea7ea48b95f6267bc693a9bacb8466 WHIRLPOOL f9f63980f93698d5d2529e774e3bc855703d363aa17ac505eabb562b648d8c15f392a940d27815ae8f07da2c12946678a75ed35894dba4dadf1ca7db9bc98773
+EBUILD jssc-2.8.0-r1.ebuild 1183 SHA256 e4e3308a143eec9c34e947af3283945830543d2247f15f114ea6073f19e4aad7 SHA512 55d8817e376c68a9a05a7b92d1022698a1523342c32316e26724cca6c35104e86866a7c06d9b0ae5e8989a41de89bd0f1c3f2748c0f5d91b05432f69c1646791 WHIRLPOOL 934415f6e067a995f925316615d9a9bd7d7214b55fd3431d75c404a475dddbe19fe2d55d926d18feb376d324e25444bf429185b0c4ef43cb4ad36bedbd6ecbf8
+MISC ChangeLog 2269 SHA256 8828398d46ee822f63d7011b20baa51d80385f812ae9549442c645198d82e926 SHA512 85386bb1bcbb09f14a91917268af5c1f058177e6419897860814a3a7d4a7b2c280aa7eba07d0d857eebc43fec635221b874e5509ea107cf6c9220d55f2eab39a WHIRLPOOL 3eebabca3c25931399ba8bed354e8f708652318a853663262a34f74e7e02347446da1c747f6cf801fc19f4a532a732ae33ef29b15929e7698a1a0223f7bb9750
+MISC metadata.xml 433 SHA256 7d0adcb50433c7c50c0f8c3fa077516e1624c39fd4b21837d46e24d6c327ca13 SHA512 260b57a995c9d91cf894a0d56f23cbf07498f3256f4f86dbf4d37ec6b92085f9834437878b0addc7e91ba319798bfa18dda55627c89966c871f61b247f11449f WHIRLPOOL a7e5dbcd48d8f39867361bc192c37d4e77d819677583c5bc8bfe03ea18512db988dd88f06b081a9573f5127f9603f3b2b2808cd4522fab9aefcc806c3215be06
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/Manifest b/dev-java/jstun/Manifest
new file mode 100644
index 000000000000..0a0fb9048f3b
--- /dev/null
+++ b/dev-java/jstun/Manifest
@@ -0,0 +1,5 @@
+DIST jstun-0.7.3.src.tar.gz 173666 SHA256 dba79de7a92ab7f9c9e67e995999db99df75149369eff3571779702351f7509b SHA512 03dd54331c79992ef2c387eb78fde8c98b58e3818515bf57beafb6157914fe9295d3ff043ac8aab78490ac2582969c07e1891ddbefaa702c3816ddac061ceb18 WHIRLPOOL b7d7553b17e656b537b701615d9774b0b814711ee41d100128bcbec30d939962fd8d397fae6cbd0e923f0e45541685f44473aaa8a2edc0751d7a51144fa45202
+EBUILD jstun-0.7.3.ebuild 1319 SHA256 32d428b8f853b6b48ceba38e894ef6d0a41c636667d7277b52d657df7d602e34 SHA512 e9c159248af1049f249c38f19135d62a155788151212ac5e2b3c625f5e10a7d6d23072aa9a881732279580f3e37ce5bc069b9891ab7e9d24b5a2f107c6c2383c WHIRLPOOL d92c1181e3d85c5453ebcb00c7dab5c3c8998a3441d03bd4d6f9f82469da2a22ef7afea43bbf04f06ea22d882c5136f43322632d90204360fb4a1eccd88cf5e2
+MISC ChangeLog 2554 SHA256 75d980fd9cf3893b2db584bc9e947ea00b5b9c4062a314bf11241e9da5c42246 SHA512 d741bf0c9f16b94d8ad2bee6560f1b2f284569ba88d1006825a0771302988ddaf42aa37195b6a171da7d2f2fab37ff4662378c4d14e70b9803185a4523ca1705 WHIRLPOOL 3be1bee5fcad9988aa504c041d41a6e2b1674db742e50a9c4b79b00698fe62b10067bfc0e4d5765fa1b61636894ad1c2ade3f408540906f3fdd9ef640c15af32
+MISC ChangeLog-2015 528 SHA256 34065ca37e99985f1fea6d2d844bacb9b1d0e75366db62d03cb7032707503c37 SHA512 23d4ded1cad75fe3de52ffb847e05b26593ea959f7d90a3548293abe5f0d969ae162d9db21ac97399c1a25649fd8ed9ff74e0a34c6aae44ef8e1a4df24b38265 WHIRLPOOL a72746647dd63b306ce8ec9ec78e5b3f5b98f8b1536dd5708b959aab19f878287f7c1400939ac1f2813c4eadfa0706973cd2a9691abddf6aeb75b4633479598c
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..a740c831f918
--- /dev/null
+++ b/dev-java/jstun/jstun-0.7.3.ebuild
@@ -0,0 +1,62 @@
+# 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-based STUN implementation"
+HOMEPAGE="http://jstun.javawi.de/"
+SRC_URI="http://${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/Manifest b/dev-java/jta/Manifest
new file mode 100644
index 000000000000..c9c53618f09a
--- /dev/null
+++ b/dev-java/jta/Manifest
@@ -0,0 +1,5 @@
+DIST jta-1_1-classes.zip 13236 SHA256 6202127f8e3fe63ebbaa8c3ddf455bae862d5563b4c210ea29484df52ce505da SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14 WHIRLPOOL c6b97d35eb09cd027596594ce009c251cc61014ceacd7d49748eb157ddbec6700eb29d07a4f9fd0d6273652cd83e067fc7f2a4d99e584ad13c7f13c2f8a07271
+EBUILD jta-1.1.ebuild 1048 SHA256 4342272e47c34e230a3c9a2a8667e1217c2eac8827af17e6954c21b30469d2da SHA512 f8d6bc92cddfcb63d5d0f67958d616bd0a3247c4ea08faa90277039bc2bab07eb7f9a5fc2f00d4cd7a26d4073925d42cbc039423ccd86891624732b69c09e6db WHIRLPOOL 168be971afddd58f95900586b51ec0f41fac9a7008ea8f44e748ab6bca07a1b36ca6243e48410c855291ab833a66f3ffd733055d5c300a42a1fe32b5a6972f25
+MISC ChangeLog 2616 SHA256 e689acf0c5301e249fec315d2c7a97f8e046c6d3a03add51e44ab29e0d0811b0 SHA512 71c657e9facf8d116bd72011cf8aee251ac7fd90b9dcb8dd6ad56c9bc80d89c1987b72d4e9ab8315a8f4961c246d575630edb86533f19c807d83e3df3f85d5ca WHIRLPOOL a2f0a27b6055eef903b70992a7c5c410e666603797945fe44af2e5dcdd2c78134e21459cda68368ab0980bda02bb4ef87504d3533ae8fb84023801951fa8e770
+MISC ChangeLog-2015 2550 SHA256 adb058db361e31d831ff150feb549632ed5f91ad01d9df8930ff6f6247a8fcb8 SHA512 35a77ec190e191994e8fe34de440ffe54a1b7c90f9b264cf75660fb2cf1b096abd0915626d496e01635c6e680a1e5f62fb24e6374f8317fc94b65a41cfeda50e WHIRLPOOL f53e5f5da4dace6a6044ddb6ee955187a3548b0fc1d9b2940dc0327871f99e59385f47d93aade92f077a9472eba8c69a2c99eb303f1e7b4b284bef87627bd2f7
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
diff --git a/dev-java/jta/jta-1.1.ebuild b/dev-java/jta/jta-1.1.ebuild
new file mode 100644
index 000000000000..44221ddef4d8
--- /dev/null
+++ b/dev-java/jta/jta-1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/jtds/Manifest
new file mode 100644
index 000000000000..9e09722c72d0
--- /dev/null
+++ b/dev-java/jtds/Manifest
@@ -0,0 +1,5 @@
+DIST jtds-1.3.1-src.zip 3377625 SHA256 612dabd65542690f3b49b69cae6985192914594584f3eaa76c7523dc584b2d84 SHA512 1744219a52c7167449388d774fd5e834ef551f60548569c4c54e6caefaade1d932a3879a023869d8d9ddb29ce4ab52b6d08bc4c364d5f372ff5fa96bed6d9864 WHIRLPOOL 54e2ff6c0e208cad2bb44964b18eacca10cfa33bfd246f8eadb053e91c0cc52e57c21b9fde3528371bc628a946eff81e85cbaa09c1a3799eaa429b81cbd23546
+EBUILD jtds-1.3.1.ebuild 831 SHA256 6bb3ceca74025b5f8aae24264b479d99555cd172454d2fd4c0fa07a5a550cd75 SHA512 f786464f334928b4f6aa19f51682233a9ae2c675a711ff20e3b7c08386b1afb4eba507b17c7d70446cfbaa0fdfe191b8dcd383f437aa5f44fa1796e24eb7f4c2 WHIRLPOOL 7bd352c5a6844edf1400ca855f8c705ed8b7e708e3f81307807b8c2b643fad31d3fcdd57e8fa973dc872ee99cd3a40d27a366a33d02ef4487ab602bf855de6ba
+MISC ChangeLog 3210 SHA256 0d75b6f857398bbc0af9579f01f19c46fb18158fb07e6abc20520c4600441276 SHA512 b23de8826d2d30c776d74668f52bde159d8e3ab3d29c982451e74a8da8f5880543e5ed16a651b905595d21c27a844223e4a7fd76431423e00a879bb88e1dcde5 WHIRLPOOL c476c7b612e117628d9cf8f4832e3625f0492b066b6b8a7b11e7a62609b73f30eef5446e6390dcd2661582c078c15b2a6f0276b0e11b87943bff59be763fa857
+MISC ChangeLog-2015 5160 SHA256 3ca0cfbb671a653a40b4500d0eea838cfba699e738df8df2414153301132b8dd SHA512 4abf06bf692fcb27a8e92ac57597d254c13bcee18fc44fffb9856e92a83f01926245a0ce64acae5e6030b2df1fb35131a0b86f383441d4759cd373936e924346 WHIRLPOOL f25312d573a6c476b4df6fa3c7a47c2dffbca9996488c16dd6b70e005670a13d5ba8406d20e285d139210dd9848c927d5b1a6054010121797d6e0e06a0981894
+MISC metadata.xml 877 SHA256 2cb9e3cd4da35a73fa5a67cb44dc339b704e2793412a2062693baf9e3093b63b SHA512 0a8371b9d8819206fa47ca34dae6a4ade669eabefc2b94fadb76bc4bcbd3c5d563a0dbe36860c8a90ca23d2b74f2088ed7d89864c94bd0f8f4650bd31844047c WHIRLPOOL 9e5bcf5291c3fcb6c3fb67b8264d156e2ff87bd281a92ab10e9dea3182de3a2e6e0914cda700b178adf7769b7e09a314c9201c95c37496806b8edee421915971
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..de480e667577
--- /dev/null
+++ b/dev-java/jtds/jtds-1.3.1.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
+
+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/Manifest b/dev-java/jtidy/Manifest
new file mode 100644
index 000000000000..938bd7feaa2d
--- /dev/null
+++ b/dev-java/jtidy/Manifest
@@ -0,0 +1,6 @@
+AUX jtidy-1.0-build.xml.patch 994 SHA256 2e2fc28e6d5a6533cd65ce2c2cf0a3b24aa4606f471c0f8e04223af2765c8d34 SHA512 62a3f995ab94d9759196ae48047d6de75146a82438c60e55e4e6fa27fea0c80685619e19224200462d54cc8c560e354cf1bf5953deddcebbe485c2b217912d30 WHIRLPOOL 1546256b1e0e668be727b5e285b4ff4ab9e1c47ec0c4b645cf4d946109a6314afcf5f5d9112f8f5b00ca923e2bfe72c508269958826be2eda290aedb2fe4dddd
+DIST jtidy-1.0.zip 240642 SHA256 50d7d93aeb9b53f4fe3e46a685c334482f2e15da7f81c93b53aec128f1fd7aa6 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a WHIRLPOOL 24cd2b55bb7713c7ebdee9bab7b1ad730a13f3bc825347a6fa6e7d137770891a985811102c494155b56c15726ccbb105a9421ce720699f9ba796ab4daf1c0f24
+EBUILD jtidy-1.0.ebuild 1041 SHA256 b30262dda5239d0b8900aaeb99127c43543cd8b2700e914a0929a62c39dfecfc SHA512 cb06626f07e65f7e58dca3e4629a1bfe5b9ac3cb8f720f1659c0f38e3f458d1a220ddcec5787507d5df809a880dba6d6826832ce7d0fa485642f413d03851422 WHIRLPOOL 34d380c0cb20148053015864596a93e705400db14eeb359ecb88ca17ced92e3dab2ab2a203f3eeae0f6ab09d1379601a0148edf91ea54f32110f250326e8c757
+MISC ChangeLog 3422 SHA256 090eacee949d74728d2c4f4900c4f4fe650663e6c0c9719e5e844d732b7de575 SHA512 5f93febf9a353896cb09ae76c40f252acb70f38536e5c6d4c8b3cbe396a216915917aee0e4e3b0d61e29c4b249f786d42ba154158fbab0040e7feaf19987dec6 WHIRLPOOL 2d2f6ce074d2324230c2bcb101904f75757b41a5cf72b88bdebb9a3ea5e02ae0dbb79b35912d9db8e1c43ae093257b0fc7b8d7991f45d4f5c75f35207b625c70
+MISC ChangeLog-2015 2798 SHA256 fd4e9a0a066476384cebdd0b65a31256bc1471a0d74ce1443d271edd1f8f6b0f SHA512 2ae7ac5d20c0f329046c1832e4e50770f8d75fbbce056c97b10b83e8d4198de24d0577a16cce2678ec14c77ab57a7c208680b40d7953081d98d6e25024209b59 WHIRLPOOL 446d4d30d0a72222fa85e669a6eaeeb9733a514567d67320ee28ca1a48ff7ea3f94b024f3f67ae061d8fb925701f0f09b9fdfc42082d3fac3fbcf42814c1b420
+MISC metadata.xml 311 SHA256 4ebc0f880c4870290564e11a37bfe1913a167fd6feaa0c132dbd7aee91339b94 SHA512 1852a1e51bb36399ee3211139e6e6982bbcf87805a92d6b1d677a07aefcc86f6f4fec05c91e4dc3b83cc28db1c8c7001c121f1004683b16b9be72abffdc08368 WHIRLPOOL adecb46e4b1bd3ca45658d8a45e82541f162503e249de7411c4a1c040514ae43b8e70d0cda3b1575eccd5386748f45b797f8ec4ab94351652bf0352d1fd34f4d
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/Manifest b/dev-java/jtreemap/Manifest
new file mode 100644
index 000000000000..6890ef035618
--- /dev/null
+++ b/dev-java/jtreemap/Manifest
@@ -0,0 +1,5 @@
+DIST jtreemap-1.1.0.zip 7358161 SHA256 c6e27ec233e0da4e9ca7dc8b9a07ad60e99aad4cf9973c0fc4f37d0e58a158a3 SHA512 61c6b5e22cc839d6cfe8368bbd51db94b3667c8f4064645c3d70f5e6c93b029dd495b64b602570f59559dd99723516a197dcd1d915799411dc7f7c516bfce84c WHIRLPOOL e82944d0317b7ad3848552ebfe474d1bd8b58d13ce59a36f7339c15b8d23ab1ebade829072b79b46606f340c4b664038d1156732d57791cbd191c51d136d7ef2
+EBUILD jtreemap-1.1.0-r1.ebuild 822 SHA256 ac179fd6f710ae7884d30bf890f7f03bf9c55014a252e8530eea92f34f8f8f67 SHA512 8e3b866684d54d1b5a6a314d25e7b5fd376d77103d2d504cc3eaea4ec0edd17bddf8b3d11a4739d92a3e8883815e126a93e93c3fcc0aa89a00f5abc05d916a8b WHIRLPOOL 3bea4e5d2e4babfecaaadcaf00127dc8f4c50fb928d8a29b7ebdfbdf766711cacbaab347f843579705e9902a23e1d16e14e5c021190b196f580bbd7dd997a86c
+MISC ChangeLog 2979 SHA256 cb9ad6d649b66c3b341b665be79462f723f55c45accbe76d07a77e301a4fc709 SHA512 768933524a8df48430c43f3777d1ea734a4402638c4da2cc3267e42ea86c754acde0a0ad00488aa12d46427561238ae8c378a0a23141179f52988c57b3773a16 WHIRLPOOL 9469c4f53ce8bed8621c572c8b0e902c9397e88bc250daa68439ce976d5a5e17004f0208460a3b0898b69c6c068a143af9446310c77dd39ed1e75d308a8f241c
+MISC ChangeLog-2015 737 SHA256 4c6be9e83c5e6baee8b5c4e22203642a7d1dc7c026140ee39a83cad164116bb7 SHA512 da475ca03ee79b70b874bdba93f77d4e822a5f0f6ce6e2e3da84568f14a2af9f2406499a5fa76ee4bd3978605a4ac55a985119aec2f16bddb064c7bf49871536 WHIRLPOOL 86fad0deda99f6a5356480d345a4f0d75e4067ad04008e45149aa9e5f564a1537a833092e6d96f90feb18c033dcfdd9bf56edb36e7193eb4643cfee21f6248b8
+MISC metadata.xml 294 SHA256 def3ee4696811e3918b62a334c717180aba171d020c4d52ae1484649ab22cd3f SHA512 b4ae787f6bcebb464ef0ca28ac24c07206d10d2cdfea55d2a8b06a7d75931e3da022cbcfcb4dd0ad4995490ac3f997c4255ef1cf031149d7e0338de881301329 WHIRLPOOL 8121a0111729754e246c5486a774d214d243aa9ea93cddb7532959e6d42704202b8274744b5a8d4742ad215701ad5d6d073791a4541cd82afe4a0c904211a500
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/Manifest b/dev-java/jts-core/Manifest
new file mode 100644
index 000000000000..f4612e883f88
--- /dev/null
+++ b/dev-java/jts-core/Manifest
@@ -0,0 +1,4 @@
+DIST jts-1.14.tar.gz 19693410 SHA256 27ab12f75302eec4a38b9a6e7b0ecb943a39367e71d4c346d4e38d105c624056 SHA512 1d90f2e2774bf8738ce24fc65c5430f7970fcc1823c304a18bbdc243040e66409fc33bf9058ebc22217640e4c384772f852316031ef1b8779592d0e041e2261d WHIRLPOOL a8fac2e5a2d757bfb08f5ff32b15c507b79570e42c9d6e381b6369a00eda0a76f40a899dbf8a6be4737275d95be707a5ff23088903725e6216c5ea575dad0423
+EBUILD jts-core-1.14.ebuild 1071 SHA256 31fd7c46e35968d9c847505e7ff207a334edd8d403d2996ba7b324afd1d3de75 SHA512 8e92da475d601674fe81292b4d4e965b892ce27ba3c4b872b6b86fab8f45b33042ada0ba5926ead1829457c91947b6aad1f2c18330dfa06eb65db22298c53dcf WHIRLPOOL 3b2fbd78f4cb999875bd675605cfdf787ec0359206f2fb33a48c93735c649a1d38b0aad3b115e208487d6389a419c7a4fdff460ca7374a9fdbcd6850faa14702
+MISC ChangeLog 411 SHA256 558639b50c99bdc6b98512ffa8f4baa8483ec30a30a92cab36e93a7b014e72db SHA512 3a31d1f090e0fcfbbb821110a22fa677894bef888deebab95b0d4a7420c321574554a888674ce92caf2c16225688e28b30722d3a29dfd79671f9cca509612781 WHIRLPOOL 23b5771dc13a984c077a70ea77769f79cf9976b562fbd89d5147e1a159c77749a4715beed819ad5870b9a5872e2d69c83ef4d55ffd58d94df1b495894533324b
+MISC metadata.xml 311 SHA256 57f0ae3181fce7c56f05f3627b5427f6a1f07891edb31a5ccaf3d83178f43ab2 SHA512 58a717b155e3578187d875a85037af30366c22ed5f2a1c634b7cc43442d7ff3b123f11617569643fa5f0b7330e49c3e9d50f9850dd771d7e9a5180146ba251c2 WHIRLPOOL a870bc769089e981b74bd206653909a76708f30997da71d2a0169ba5ee41e4a377c7ff03667eb5787a72e65874eb10b8d6d3c1e48c57bfc77daeae430e5ecd00
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..f22113445268
--- /dev/null
+++ b/dev-java/jts-core/jts-core-1.14.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 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="http://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/Manifest b/dev-java/juel/Manifest
new file mode 100644
index 000000000000..6693c9e6f58e
--- /dev/null
+++ b/dev-java/juel/Manifest
@@ -0,0 +1,5 @@
+DIST juel-2.1.0.zip 477363 SHA256 31e581cc27b9c05d3a545fc399b6340efb1f95e03a5deb8979e24c17b87719d5 SHA512 eec79c301491b8bae5c394591feab0abed302da55e8cded798874286af32f15ce575bdb365ec9f90add89e320d23d3e40fbb5d465d34c66da60df26e1f7cb6f3 WHIRLPOOL 6d4b1b1c6a041738d001cdf5b78d0a831a6762ab2a1286065019a6ec17ae62fed6acaf7e1c43526242ca9948965730bddec8bf61ac5bc83890f0558f4627da9d
+EBUILD juel-2.1.0-r2.ebuild 699 SHA256 9e4bf4e7e58221d460a1b9edf3b21137cdf1b3e6ab9a6d0383bb1fdf3a7221b3 SHA512 1fb3e59b161c322a39a37b59ce30181b21edeb0686c2fc8cab079f7fadb294482c3eec8576c0a72eef62d1a708bb56b9cfa7780a914f6e379f4c128de1606167 WHIRLPOOL f0209f3980f0e3f666706ef0d2aa8d344c34c4234f2aa5cef368b8ccee5b44ab5b2df90c8f70f074f07251e7d24ae6afdd7f29a776e77171db9bc6c303764a5f
+MISC ChangeLog 3456 SHA256 4344e3b82263101947dbc910099e72774b57ddea55298f28f268f5f4729147b1 SHA512 65c2fdbbaa5b168d8ea989919a1a093f95e5a0b459d1eae41fe9eeabc43b457fb30b4fc765fb91449faa75e671e63eca40c5b1ec0c03ba912a7049dc04bb50c5 WHIRLPOOL e40ade39454e7f9a922ebd5f31d289be9a9c55bd765c7d1624824a13472c52ddf5fe77a0e96593bffd290fbdb62fac9f321b316a47f0318e6c5620afd701d566
+MISC ChangeLog-2015 1170 SHA256 9125d8396bad4965035abeaab5ceb458b27cd76e19dfc2d465c876cac01b3a36 SHA512 45e51db29fb6df38db6c3a36c65c03b3eea0550131e7a0c2aa0efdeecad56970d01e211eb1ea50ce1176c8691ad19aeb7990c180f4916a7284a97d1a6ed9fe77 WHIRLPOOL 761b41b5484e2113d770288d647292fc621ad2a64c252add240c3d5876caf2e70c07b5bdc3167defb5407a290da6b3ded1b828c20ab0101b4cc562afe87d45f7
+MISC metadata.xml 310 SHA256 49ec6c6a070b7c596ec79f25a544a23b1f9a5ffef40127aa9451e51195f39c23 SHA512 9ea87185947ee4bebce3ada55cb9ddeb79392467a115d7d809b6d0942f3455742c5172e5a41540098db0b5ea7f36642e89958ded9ad4a8870d8b5f01bfa0c294 WHIRLPOOL 0d71ff9d9bf9e0c86c1b6c203688d499d0ed89ab5ec83805611aaaab06be9254a65ba4a1eec57ca6cfa1b455ac91d1f6f0f0ef54cec28181a0461b52b5c49c9e
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..8f986aff5a30
--- /dev/null
+++ b/dev-java/juel/juel-2.1.0-r2.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 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"
+
+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/Manifest b/dev-java/jump/Manifest
new file mode 100644
index 000000000000..b29c7d6007bc
--- /dev/null
+++ b/dev-java/jump/Manifest
@@ -0,0 +1,5 @@
+DIST jump-0.5.tar.gz 31266 SHA256 608c3ea156cca8ce6890f593467a8b5b41b257479a84178bff8b957ed56ddac0 SHA512 9772ea61e921c4342f0e25a951d74850b9dbdd2bde5de9fabad4d55ddb82b6d09debd478f92f3f8c02a05425244b7eaf12d7b3d7d2876263234bafa27783bba8 WHIRLPOOL 6f32af4aabe2964edc9a450c06d01d7f3d69873cf8d7988826941fa9838e841dd04ea584eca59dd3d1c4dec263f62762ad72a090324f411a63915acd1d8f3140
+EBUILD jump-0.5-r1.ebuild 673 SHA256 59db8baac8f67f55db4823a3ea986103e1fea3315f2fd95170c9e1aaaa45360c SHA512 438bd98331ff2eeccb06090be77e3960193b75e24844990ef9437c7cf57b50f645c4e157dec77642acbf4defe1e3a0170dd72f0362d45feb121568b6a25477d7 WHIRLPOOL 5c8adcda9fee7a7a79d0d3bb2f0ab5dfcd6a6c25ddc36ba019a2f4cc895e93c49c04e3f747f02ff479f0c40c308e32fb1aa36c7bd73a8306fa4ce1dfacad25d5
+MISC ChangeLog 3355 SHA256 5d041c041742c474d818549d7653b4849cfd2ed991ece0cd37812630fc23c503 SHA512 0d5d7f095902d79a600f344b510829365c348c60066de95122e1addd09506d81e8d64c6fa8ef6587319fc7114a86214c86dfcc2f95ba292a916063ff447d9d57 WHIRLPOOL 088f68e4b1868de0240ce5b3010dd0a944efbe21453d020a88fa0f01b219d50ae8a5b44fa0f57df4d45738e4eb7b1cbb79b898994863614e7cc67702724735dd
+MISC ChangeLog-2015 2576 SHA256 c8da279403d8f29f7b0b86c63a2ae4f298db6f0600506e9968f6a2b3e2e307ed SHA512 20b5245fa8d30725446decf190eb3d0e04c8ca1671630f484ffea876b9ac0c0a891a389dca6448d0efbc802fd2bd15fa37bbb77a8323cbafd173f27fb4de72f9 WHIRLPOOL bf0ef51fa157186503afc536d78fe65cacc2077dce8cab16c5f26f2e42c75f6fa8136a96ad795028c91d11d130873b7b8c1d50b178810083da1e3e170273a941
+MISC metadata.xml 315 SHA256 d2356b9bd74cc370c928fa0163aa7d9ad57a06d82bbd3f9b307ff0f71fb55f0c SHA512 608ae45bd9d707c202f5e104fae67583c7e2c7edabb895767b8450d6e7765c3dfa934ff3bb7b994074f73bbdc9765885411ffee355ca16cfb22910b12c6f5b39 WHIRLPOOL 2215ab9a1e185dddb2659bbcb7dbeba8d7bb949c7d5b0d2ddb3b2acb0de607dd3248dea0901e1d3bb9f7687752bbd2a82110bb64d8331fd75bff7af0164731a8
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/Manifest b/dev-java/jung/Manifest
new file mode 100644
index 000000000000..d63c58d3e3b7
--- /dev/null
+++ b/dev-java/jung/Manifest
@@ -0,0 +1,7 @@
+AUX jung-1.7.6-build.xml.patch 714 SHA256 f3ed0bb93b662ecf05469d3a79b02c29473f5db52937ffd2bb9a29f5cde5893c SHA512 d9e8548ed4b0271a88aa827dd94a49a95fda7e22e78dfe0e0490ef7c9e161c86d7289f5f3382d4bfcdfa95daf84582143ee6d1cfe7946114c9fb35d2fea17c4e WHIRLPOOL 489dc9721d8ed00810c20f7842fbc3376b61762575ef4482b74d50a90ae90ac73ef4c46f9f232d41736e06e83dd3c031f24796fde3cc4a8f7496bd436b6e7b82
+DIST jung-1.7.6.zip 8164548 SHA256 2443f63f8a81a31a9c9aa2a8b8e6864e20e04be220082574536044b4f07b93db SHA512 126f06e34a6db6cc55df2b1c1b52612ddece7db7a1fb45cbc91892122678b0b629eac00276fc501aeab558cf1f01a4e5e7f5d0392bfae977ca1950df2c3d063a WHIRLPOOL 63e37fd53dd3792e8c1bb1b484ec2eda89e5c7768e9b0d3d8a3f5886277556fe8209ccd756fc4cfab26e38519d7cb39b3f31219c3e294718ad007080c58a27c3
+EBUILD jung-1.7.6-r1.ebuild 662 SHA256 4bf7910693eca35f0ce19f913abb0b4830084e0783d216bc2938827434d78e44 SHA512 f47e630f5800d696a06aebca124bcf72df7dd95035e5532efab02b91c298221ad52f67a5d41757a9936fb0a85307f456fdc58da716365676853ca9a815912c8c WHIRLPOOL 52e13991df8b3126a95664c0950d2ca88decc5ab5a0b37845b36f4447522cd90e63aceda1847686f189261bfe367cf279ce7da53b84212246d39942029a89f7b
+EBUILD jung-1.7.6.ebuild 1081 SHA256 619186cdb7d9f6f441c0fde195872f73afe2f056dfd8b965d33832d0847e2c36 SHA512 ff85c9c612b716df1913a6bbf9525fe5d0bca1202fc67e76382d7fde0cc4c597fc70eb800c63157288d848c44275fcc9af2db1e7ce36883200df5a8307d222cc WHIRLPOOL 52dad428b6372508231fe8138c5b68286cbe5963d4a2e6c486947363e8b2245e515cb81184ffa04aca0357149a1195244e122e8e4c9ef3959b722ea2ad181043
+MISC ChangeLog 2836 SHA256 3a181c9626af34fc4501370d8a80ca94e561a4f586d96d9541748434ef8e4247 SHA512 48c406c611a6939506e48665821cb6ebeba370bde44a96072e850b1cdb1b4ec07611803d96ea7f2ca5c720026ccc81deff0948094d88a72c86a69f5433083d08 WHIRLPOOL 4caffa3c5cb628dd7957c4d9eb3ddeb957d3dc65958e550233dbe87a53508ceb17a1e0adfba9d0eddb51f8ab24dd4fabef3434f88979e3037dcd4d18a95936f5
+MISC ChangeLog-2015 1037 SHA256 c84cf885929adc29cec9f614aa4134bc94ee8725aaa1f5f110e8e248e93155c1 SHA512 ccf596f798e49e4ac43502a7be8189a5c21ee7e187b68a1c3baf68e19a88665c26bbb3cd43a9d2bf07e4bdc720dd013b7acffa59d64d9dd9b3e7cdde284d174d WHIRLPOOL 2b2f19ede5214298d242745e422007490ea8e47e50a5e52dbab7d21e5651ac24945c46d25b6fac4064984d3b08f92765b0e330374d3c530df51994839df0457c
+MISC metadata.xml 532 SHA256 92be64851a6e7ee2d01305f0e096f2794fb6cb966a46f952766879424c78a270 SHA512 2662c5bedc6f2e200bbcca0af62dfa46063e01759e4abd5ffdaa908abe82f20f875c3fbd3e83134616997d67f8989e059810847ee5951cb0c2b296bb127f3c14 WHIRLPOOL fe5c778c0f415f28696cdcd2ee028cd630c62157227ad04e8d0e8feb84299b18cdaad192ab6d2fbb2b4543ddc28381b0a3bb60cb3af88deb424b223545b02c13
diff --git a/dev-java/jung/files/jung-1.7.6-build.xml.patch b/dev-java/jung/files/jung-1.7.6-build.xml.patch
new file mode 100644
index 000000000000..1ddf38597d6f
--- /dev/null
+++ b/dev-java/jung/files/jung-1.7.6-build.xml.patch
@@ -0,0 +1,20 @@
+--- build.xml	2009-05-24 12:12:51.007684864 +1200
++++ build.xml	2009-05-24 12:39:01.796913330 +1200
+@@ -83,7 +83,7 @@
+ 		</fileset>
+ 	</path>
+ 
+-	<taskdef classpathref="jcoverage" resource="tasks.properties"/>
++	<!--<taskdef classpathref="jcoverage" resource="tasks.properties"/>-->
+ 
+ 	<target name="clean" description="clean up build artefacts" unless="cleaned">
+ 		<delete quiet="true">
+@@ -157,7 +157,7 @@
+         the instrumented classes reference classes used by the
+         jcoverage runtime.
+       -->
+-			<classpath refid="jcoverage"/>
++      			<!--<classpath refid="jcoverage"/>-->
+ 			<classpath refid="alljars"/>
+ 			<!--	  <formatter type="brief" usefile="false"/> -->
+ 			<formatter type="xml"/>
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..7d0f9b47d836
--- /dev/null
+++ b/dev-java/jung/jung-1.7.6-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="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/jung-1.7.6.ebuild b/dev-java/jung/jung-1.7.6.ebuild
new file mode 100644
index 000000000000..bbe81f6a7456
--- /dev/null
+++ b/dev-java/jung/jung-1.7.6.ebuild
@@ -0,0 +1,51 @@
+# 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="The Java Universal Network/Graph Framework"
+HOMEPAGE="http://jung.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+COMMON_DEP="dev-java/colt:0
+	dev-java/commons-collections"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/junit:0
+	app-arch/unzip
+	${COMMON_DEP}"
+
+PATCHES=( "${FILESDIR}/${P}-build.xml.patch" )
+
+S="${WORKDIR}/src"
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+	rm -R doc/*
+	find "${WORKDIR}" -iname '*.jar' -delete
+	find "${WORKDIR}" -iname '*.class' -delete
+	java-pkg_jar-from --into ../lib colt
+	java-pkg_jar-from --into ../lib commons-collections
+	java-pkg_jar-from --build-only --into ../lib junit
+}
+
+src_compile() {
+	eant -Djardir="../lib" jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_newjar "${P}.jar"
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc edu
+}
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-addons/Manifest b/dev-java/junit-addons/Manifest
new file mode 100644
index 000000000000..39d99434a0cf
--- /dev/null
+++ b/dev-java/junit-addons/Manifest
@@ -0,0 +1,7 @@
+AUX 1.4-build.xml 8725 SHA256 449d3c41e228c0403d272347a362d5243f8d390e19d34983d1c02f2e77787433 SHA512 3f3eae33867f9e311e8e2e58a87dbc67dc4beb6eb89793b2b477953a1fc5cba45aad2a8241e07717de472969ec448c6205617da2427243cfdb21f0cf4ba91b12 WHIRLPOOL 91b5faefc1560341518ae4ada70acefe78efe1b6bd45bff812ab06933983ce1e2f00174ff5997ad9dde6288e5d97ab63ee95686f7b019e5e55f7bbbc0b3f287e
+AUX 1.4-common.properties 540 SHA256 71e0c35d7677d4673886c5ed13c79e3ed44b3158ab22c893c7f4c95fecbc1426 SHA512 9362f56305b2d6cd97a10ed6cd661de6ae86e700d250cf69c55f922fca2c6f57e8ce1c306ad4378196c18cc8b839bcd5440816f6ef60f908a28da7b4ef78bbc6 WHIRLPOOL 842f586d028b66ae74a09e6e9e3c01ba1a97bef0debc5eeeaf910418d57f18c65b3d8845840f9a830c594432e7ef5fcc75c5223ff3404e7359526935da82abd9
+DIST junit-addons-1.4.zip 293750 SHA256 8a7456eaabf1c3528b8e73c15df1b8a467386cbf3905b1d5df536201f1981990 SHA512 0ddc9a95d80190417c92e86697669020a2947e2211d2394334b80d76bca5397f132d90e00d0c679bf48607fbadf8d1d6e97d3770d06c35cab78c6cada198434a WHIRLPOOL 2bf3c99b31d0eac1d76e8d6bcd8fbd45f668712798d4ba6ecb019762dbdb045ad877497140a83317bfe1439af33a0637e7964023472ae776d7f457c69cc66be3
+EBUILD junit-addons-1.4-r1.ebuild 1458 SHA256 3d8ee1b6509fecfb9f63069564d9f343025895201b1ae1832fca358cc315dc5a SHA512 9b429406c445445282184cda4f61ee0cf8c43d3a7a7bd0fc27e0e59628e53121c752e659850e79aa07bd0f7fe426477a7c1a9f0e72cca341e77732e05d75ec57 WHIRLPOOL dbf2b81f04c2a8bf2d54ae0fbb9046448dd3de505c9e4dab6ebc12415c355a488e65700b2e8bce9005d9accb432299317b764776dacdc66a52807b85b36b7d28
+MISC ChangeLog 2931 SHA256 5022cf9751b839384f35e07117479e18f35ffef48bb72c548f66b49f2c35e43c SHA512 aa32d6ab02678e7381ad02acbcd1583ce098749e4ef893c23270fadf3bc0a48aa471c864591cff1c87c3dd4de46c54be0e68ff22aee88bec2be7e7aeb9c2b259 WHIRLPOOL 45b1ac28292eadcfec47cf09a6cf7adb95a26ac21181326691a0e525fb3dab5f9e3c828bcc0e41745f84957d166c0400806d85d97722be633646a87c4f524b94
+MISC ChangeLog-2015 982 SHA256 c557bbe2324d24b46556edfb157edbee5e2762acef0da6c7e81ca76c21548839 SHA512 57685c3443c365bd5bbf98cde1bf0752ae1ac41972712c963ccd069bed2bcdd47f68df16f269404e59f0c7426ef7c20036ef42306d83cbb2f88942fd71bae7d5 WHIRLPOOL be77efc21504712ddd179748f269d7e9fcd3ca28916c0eebc8a67973d7ad6e86ae53fe26fa5ef29b68d7eff49471a6b85d1cdbc8bcbb2b54f6c746115684ec26
+MISC metadata.xml 490 SHA256 e94445cc0472cd4a1294cb05204e6375cc3c24fcc93286c9e70c05db023d7106 SHA512 bfa7b8058d0f28bd1455f2ab6841b562f369a62d90bd6a1a875c67c991dc75ade65c6e854351a4dee83d2ae059185e82a84f3159095a174aa48fdbfa8070b3fa WHIRLPOOL a6c43d57a1d2396199bd2f8ab1a1d8e79494b89bb79c7b88702c289ad0a7eac99730cbe4ac8af903ff90004e19e999cc42e595cae593187203eaa996ba2c3f06
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..4e8cf56a0267
--- /dev/null
+++ b/dev-java/junit/Manifest
@@ -0,0 +1,9 @@
+AUX junit-3.8.2-build.xml 3179 SHA256 ab78187535ef97b9984d969f313aff39944efbb57427071a8851f973dedf9042 SHA512 6d2c74c70569feed235db70fdb646c813ce9453b5e7fae6d5fe8c818d0ce820fc155eef8426d8f3263cff45cd4b78542d5524aa1d5efbb84e43698c1d4466f55 WHIRLPOOL f73a9854484abdbbe5a5a04a425627acdb76eb0202bb4b9e1d2c44ba6e20e9a8d022dad15b4e49d75c7584beefd7fc026936b79ddebe6e105ce15cceae157e6c
+DIST junit3.8.2.zip 461426 SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930 WHIRLPOOL 284a51a8b659b8dbce378a381475ae2bcedb78231cfe5435382053335ebe5d44b4eec90b9f14bc510fd5b9060b44672896fe0bfad57743e5aca0128f006781d8
+DIST junit4-r4.12.tar.gz 443804 SHA256 9a5b458258c6537df0d2df7122a06895a26b9c7c8061e5991a0be81d76b10d24 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32 WHIRLPOOL 14eda410942900d8be21ea29096c387384634ce9f679348d5bf4dbb11d22e23e1be990486ae8a6004b95f3a9383644e4f70988f84312cf16d5e4462c64b26814
+EBUILD junit-3.8.2-r1.ebuild 1017 SHA256 328b41407b6b2520741112e3c3f73edd88827d5fcbbf92ea4ffb7cf61c6a4586 SHA512 bdf20d5bb244732f1b63b93644dc21dd2544187e020c20af5307386bfd459b232be993adaa4ac0c9be68aac97eb4c794c78e285c9d3535002dc4af1268d456a0 WHIRLPOOL e7a384d889bd8683c953536ce255bcd423ec2e7040eb2991986ee50585c9e8886b39a17c830b9fc01b18b280e83d1239cccf9a5235c0075e4eaf3f7a70833d15
+EBUILD junit-3.8.2-r2.ebuild 853 SHA256 bea62a2afd54263586241110de3a17b063a6a941ee18fab685a6fccd9b2b777a SHA512 8e738e576bf5b9cd56571f605e6de9994cbeb825b6033caae676e2e7093fc54cc25fc6225a1fda3e6438a13f6f844736058c68b57b1bb6427d3291b052973f26 WHIRLPOOL 443dabf72e87decdf7f1329fa0554909c1c6bf78852fefc5b991401f3503833f3867821924137b564ca067faf0d0f66817d8a11d38aa7c4fdc476a24e7f751c1
+EBUILD junit-4.12-r1.ebuild 1486 SHA256 f49149eb7764e3b04d06be44ce2095d0aa529d1c9e124fb99f91703178ee82d0 SHA512 0ce9332b550ebe45b7f09905c776bd9ca8f0a2d3cbdc0f608cced2858a82e452d8f11f3b83fd8c1061aa49a5a639a888d28e2aad4215661afff221d9f01bd9cc WHIRLPOOL d81ff3a4df8806c9d51996c91ff2a14a0ea14accaddff60ad377281152aacb28e62c2011a25716b263afae9547481382d8f0606a32a0b471425c24371f6f9422
+MISC ChangeLog 4497 SHA256 28f3960dfa9139d1e47120a58eb8e31a1da7b2b14cbddf3d9425f965f7027194 SHA512 29c91f0061e78d2567887a8761f382c366a287a592088501d2be9dd4cab6ac62b6c1c1a204bfc75f05b3676332e860fbfbe4950d47d41f3479f671b07117d2c9 WHIRLPOOL bfe2e12b7b7a2331555d8c7dd8119524e766e0cf49ce2d23624f6621e4cb3e1cf3b39a7a03a886438dff01ed2365340d710a3972f1f7e4a64a5711570ae7bec0
+MISC ChangeLog-2015 12318 SHA256 ea6cb94a9c5fd2aa511039c157aefd368a7b017fe4844cf70f12b575127a0766 SHA512 e1481610795a58f9fbf28823cbac63b2afee57bf1e2d872a5c36c2c04d5e1641a986ce0319a6e52f9589b0f2e02b61004e7c0cd748fa361efbbd379b0066e9af WHIRLPOOL 792f66175f5e424364c8d5fa5a014f5dd13450fb751b616031453020612cf617252eb151ff15a09a9f44eaaa5a0a3c983e0890db285795cb2cc81396aba86821
+MISC metadata.xml 367 SHA256 b203981905872f1125011ff262f8a1230ecbd51c2f1fd1f2e9438ae9f3a2aac0 SHA512 44e492dfaaa9faf54f4aaf420d5816da8d117951d6a52e37c76a9e533fcefbeaa3c44bafa4d525f878deb3af2b7f426e72a62b16464e85ce9690c61b1f0da71f WHIRLPOOL 337b42e5045a2bb71792eb8a743545b8fb1f7bdd241e92bc7f5f2fb62b57d4c71ad942cf2c7beaf4d397b31192a15193384c3936d1c8b40e680078008df8cd18
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..3a9ff4344dd8
--- /dev/null
+++ b/dev-java/junit/junit-3.8.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-fbsd ~x86-fbsd ~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..29a5fb5888e6
--- /dev/null
+++ b/dev-java/junit/junit-3.8.2-r2.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
+
+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-fbsd ~x86-fbsd ~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..c022aac54dbd
--- /dev/null
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/junitperf/Manifest
new file mode 100644
index 000000000000..da09460de8c0
--- /dev/null
+++ b/dev-java/junitperf/Manifest
@@ -0,0 +1,5 @@
+DIST junitperf-1.9.1.zip 110600 SHA256 ff350b8b6bcf79826b96ab786303dc22f0d096d2e9d333c52ac567cc4d26b79a SHA512 35fd3cddf5643ede31a89f39e0149ceb5a07c97521bcb4e661fce32b08a5299064f6b52828889d4918485f3ca000f6020dd6cec802d8b1579f46bd861ad74b1b WHIRLPOOL 0ad8e653f87d5cd34f1c3630a7a185934cf8ae13a8fee05f0cfcd352d6f6aa8896bf8cce3e013e33cb73fa253c16fdad6c5b3edf16e49b3eaf5cd3cd56cf80cb
+EBUILD junitperf-1.9.1-r2.ebuild 1055 SHA256 7ef0dbdc00576045cf55489baebefcb5514805129f2f66256acaedc61875378d SHA512 9633ad3e64884114db7ae1a54a72ce5b0fc8bd891e8cca017fab59c68a09291a923382bfd338d5b5f1995fc0a173f098dfdeee5ce827b2e2f62e62c97ac5d5f8 WHIRLPOOL 257cf6e735cef5001596aa0f36b0ac36b1dacb133dd655f8ed2420d62bf5a516d49543b72f99d4cd6ad6b130eafee5aa92aaf9de771acb9667b8ab5efd3744d9
+MISC ChangeLog 2752 SHA256 29649dff8d1b486396c95fd5e6a18f56ff4bc9d5c7dbdc7ed2f074067e320e95 SHA512 ac7b6cfbed44befb0a0946c8afcd82810469bd805e132604434ec6decebebd973c993ad9fd9750b774d89a88fcf41901e4a8b05a9f6e351b67907342dfa1c4f6 WHIRLPOOL 3fcf167474472293a3fcaf20ffdef9b910bce56f2164d52dfa11c280e651bc308e5699b88cbc9d994fa38b52bc79f1b744f1fd2c65473ee6b5992774494450b4
+MISC ChangeLog-2015 3621 SHA256 456b3f437357e31c0860efd8829b8bf83cafdf7fe1a615d5d12737ce9d1a7b44 SHA512 d4669bf5fe7c755f9f9040517f2cbdfd27e3510ebc19cd8aadda1d46925a983e274731f5f12c4553a800607b5777754964a860471129e46da60afbd19ce7685a WHIRLPOOL 9a757246a72f4a696a88e6001cdf5cda56b058065ee45be4793078df6427ffd3db1a8d5accbd182b8e2ed9bd1d31c1bf1c8f5e8f67d53496804a9db14bb9ea23
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..758e8b528c1d
--- /dev/null
+++ b/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/junrar/Manifest
new file mode 100644
index 000000000000..051ccb6e3f7b
--- /dev/null
+++ b/dev-java/junrar/Manifest
@@ -0,0 +1,5 @@
+DIST junrar-0.6.tar.gz 70631 SHA256 999c61f4cdbd0635acb3be2b36390e323f330988eb357c64cf47cf2a51b13721 SHA512 21da07fabb9f9c605191beaadad6a7abbdd1c02c8daab6913232889e735178954c0e2e7c4546734bb3b530d851d9016a549fbb68cc7795d005119fd176c15991 WHIRLPOOL 379bce7cfad99636fa4ecf8819fe02a6bea83845e6300af80f27c9dab871deb757e5817a49cd83ce1001b5d24350933a061b0af588dba04e609a518f1c2f4540
+EBUILD junrar-0.6.ebuild 726 SHA256 b28fb745ea5564f2d9b915b168d4a62749339ae8189a7a3e17e2260f05fae6a7 SHA512 4f51e3c2f02c78b30b94a12a582b73090a808bf3d048050aaa479eb19598c9767c54b2144e068a7d7e92e85f46605a62f7a241e27eb3cf225b209e4a18e853d0 WHIRLPOOL 6eb656fdd83ab4e6d092b8a0cddb01a2ae398a6338c79c904b429a35339e0ea4e14f74ca5d878c9fbee6ee223b9013e56319a7bf748cead7cd818bb1c73e2fc3
+MISC ChangeLog 2420 SHA256 c563100f3275f6f1f0274f02d101f7ee37ed51c1459d959a76fbec02687b7dab SHA512 c2ac7a0389c7a9b69d9ec882dcb63c4be234d56223bf0a372c009be47e92a6242539ce99045e9962d42e1165de5154a90531a0db2294b28452be22df46c2ea57 WHIRLPOOL 6981df6ab11bb4fef579ef469a4da4b12dc42e41873fbb3cfb6ebf7f840071b73cf01e12cded6f921e9dc5806c7deb5069d7f74220ec6d34b969b15060994be8
+MISC ChangeLog-2015 390 SHA256 26f3119fa122b345509196b1ae979f4e2d5ce3fbc8724b55fb69b683dec49048 SHA512 99229e1ccc2cb43bd63bcd79b5f8023106d5f5ccfe91ba7219c9ee69e3a2e5443c754f5b808b129fc617443dd0c69a47be28c4be915e95d617540d967d38bbb3 WHIRLPOOL 911120fbf1c60f95daa551e78582ba0ef36fb98c5000327a50540a1566d27181c26dc9eff964e1a31ae98640860e68f9db02fbaedd4675c9eccfe6203bca7f36
+MISC metadata.xml 321 SHA256 4b6faea3a707c939f495a617c93b6dc5dcd8ed47c13f9da9fd32f1cd5b2c7928 SHA512 429cc777075ac0714111d1ee012b8bc93628e16477e64ba5716e3b96d457d54f2055a15c204e473db3593079baaa1e33b48ed557e7f9bfa360ab2eed624513ef WHIRLPOOL e3f68e663f6b03b473c3092b58e7fcaf181875724945c47528da794f12fb8862987b2222a58617e03f18c465ee410672803494f61e9045566fd8092afed9251a
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/Manifest b/dev-java/jupidator/Manifest
new file mode 100644
index 000000000000..26c9db490f71
--- /dev/null
+++ b/dev-java/jupidator/Manifest
@@ -0,0 +1,7 @@
+DIST jupidator-0.6.0.tar.bz2 253170 SHA256 00213313f794363cc3b4dd8c335cb35cc8582d0d56d72cb941b3edc8f2b94580 SHA512 5e96831ca41b6871eb5f6c883c21eae17474844a74fc5e103b534d6e225d0a16ef98149da1d52728e737607eb7ece586f05aafa0a0ada29c4c28ff3e078a2415 WHIRLPOOL f8625ac738c610c1b3ed60f05a140b0e7367d97189bc27e70666886879c1da74117df360b938718861a4f8a52fdea7e8ed8355b68b33fb459272145481a3f45a
+DIST jupidator.0.6.0.tar.bz2 253170 SHA256 00213313f794363cc3b4dd8c335cb35cc8582d0d56d72cb941b3edc8f2b94580 SHA512 5e96831ca41b6871eb5f6c883c21eae17474844a74fc5e103b534d6e225d0a16ef98149da1d52728e737607eb7ece586f05aafa0a0ada29c4c28ff3e078a2415 WHIRLPOOL f8625ac738c610c1b3ed60f05a140b0e7367d97189bc27e70666886879c1da74117df360b938718861a4f8a52fdea7e8ed8355b68b33fb459272145481a3f45a
+EBUILD jupidator-0.6.0-r1.ebuild 638 SHA256 a27cf6ceabe3cfb09ceb9ab58f5d4d4e42539bf5fdde816609bb6c6128ed9b94 SHA512 7a1d51187e1053b1c9e967f40b7cfb77c0a59a099d35e50bbca1ab52c31d62182b64678519925b7907d27cec32ff1d6d3573e96fdf73040341ea417d52b5a8c1 WHIRLPOOL 73b957b1350c38de9149ce24ff0ec3e2bf5c1df6994c1b9c0e77ea5283da34ce4550ddecca99051844ee62c7e23cd1763a15807c2c9bebb9443872d62adafd87
+EBUILD jupidator-0.6.0.ebuild 1085 SHA256 79c2bc88939dd43b05ba6e44bf06654a35ac63334834de7ad0305f99b9d0ff36 SHA512 c9768062ea9909206fb52aa8e3ab1b2e65f8e8a54efa06a9317e4ca4bcf4c09fa603ff0dbe230226db492bbf36c37de90fdb8325a7dbd2a9b07623bea1311642 WHIRLPOOL e3d61260565dde778af48f1830d2d9b228c0351f96b5613f7259a7f764c1d0299d5d182103334b42c0ce4b497e1f6fde810a13aa57e73ba49be5559adbcbef4f
+MISC ChangeLog 2603 SHA256 19699de332563d583dc38300467d3eb36d71fea23daa48d42c3f6a6cf4682baa SHA512 8d0dec195521ec24367400b1e0023f1bad6faf58f3d5a44a2deb61097e69cffae07ebca3021a02ae5c21feb13178a09e8f49ee7486c1437250d75137a34c3227 WHIRLPOOL c2c686b5fc64a13b2fb615fe9802a1ebd185df6732823d9b7a47223b227d6424a52515fa3da46aed06f80ce0af2e198f3f009e774436edfcb628b29b2e75fd38
+MISC ChangeLog-2015 1698 SHA256 ce8c0db637590fb5c9c1137ad326ee5ec887066270fec3915077beba7eef8984 SHA512 9828af9700eb3eb415c5539a0ae95931cc50e4735c1aa180d8835a0a506b05ae17c6d517e372ec52838ee207910d59059cb8bd1802f8b66ab1e91e35b5ad1444 WHIRLPOOL d4eaf1dd48e32524822e6a67e235cedc8cb071c51954616b2e63d6ed6641329b9acc947b2476aaf7e74abd277dd39de0aff19e2c34dae3d924c746645000a681
+MISC metadata.xml 315 SHA256 ab71cbb81a322511feb659b3fe30a5d166e784a400c5e0f110850f9d0c8c65fb SHA512 ee74e4fc53d2a94b32fda03601185b2178e7329c1ca4a0560f94d3715b9f8cb8aab34ec1b09a8e388e87844bf4cbed70f36bad166eb2f7ee7420259ceaa95203 WHIRLPOOL b9fee0e5ef37bb2e1575772466724bb318c60552d4a0221caef8b0216c3b28b3f38e8b403f41b4995ac1d1e7ce2d3887df8476b8328c0f5d6359aaabc9397d8f
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..c5c0a870776a
--- /dev/null
+++ b/dev-java/jupidator/jupidator-0.6.0-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
+
+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/jupidator-0.6.0.ebuild b/dev-java/jupidator/jupidator-0.6.0.ebuild
new file mode 100644
index 000000000000..690f152de270
--- /dev/null
+++ b/dev-java/jupidator/jupidator-0.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+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"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5
+	dev-java/ant-core"
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-core
+	doc? ( app-text/xmlto )
+	sys-devel/gettext"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	rm -v dist/*.jar || die
+	rm -rv src/java/org/apache/tools/bzip2 || die
+	#Bundled ant classes
+	java-ant_rewrite-classpath nbproject/build-impl.xml
+	chmod +x i18n/make.sh || die
+}
+
+src_compile() {
+	ANT_TASKS="ant-nodeps" eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)" compile jar
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use doc && java-pkg_dohtml -r dist/doc
+	use source && java-pkg_dosrc src/java/com
+}
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/Manifest b/dev-java/jutils/Manifest
new file mode 100644
index 000000000000..9269fefd1e7e
--- /dev/null
+++ b/dev-java/jutils/Manifest
@@ -0,0 +1,5 @@
+DIST jutils-1.0.0-sources.jar 10247 SHA256 f5715ea3c02519553ff1a48129e6fe123c590f8fe8f68f5f27ef4a9b013ea1cd SHA512 3bf29fa8e0ca0cb6cdba022a122f152df929d9738725839234b15eb6ef2f87c72d5a30c8788783e44f73a39aeeba459882d4106ccfd44449e43d838054a1fb01 WHIRLPOOL c430135320837c487301f16cd58d9ca3f10138cad1e072c23b2abe7783c67ef5f6cedf6c8387e1532ee0e19602376000d4ae26a999936fe50ac9635374d7855a
+EBUILD jutils-1.0.0-r1.ebuild 506 SHA256 838508bbab5d80766a0e4f94f7c7d71cfc29992197f1034a007dc3aa5f3757a7 SHA512 d842ebbf3857bde2b3c6028432a7b7ae27402037ab26839e419afcfd2b6a01f96ab9e5597cf68b0074a0556e65f1d2796c1e6845840a7b123d8d1aee34362ba5 WHIRLPOOL c7067a4965251c17388dd56e32efaef153bcf5deb4170de35b328c090fa6321634553c12f1058ced1225bed9714c8bd98cb3284f2c7dda8de75086e1cd5f5289
+MISC ChangeLog 3056 SHA256 04ccbb551f1acf7d4760badedc2a9e3c8ca6998654ae2c7630b394ae56f73fc6 SHA512 75a2706e4e17294305cdcba8e0885c7ff588ceab37d385eb2632061a88c14195e8a1bc98b4517fda86ee2d54d90e49cc9afe69e6098fa3acbd499e153620c679 WHIRLPOOL 5f60d440f1891ccf33504d9ae03814af422100facdab925e7eedc292fe3621a3e0988dad0a83c401e8948d53d473c5af165adbc31d90479e3a6c6bc2d7ac576c
+MISC ChangeLog-2015 371 SHA256 c6926da64c6e9c25a3fb323574405bef3f67e209da6dada6db13ceea4eead8e3 SHA512 4b0ca041547f35ac590e5b0e952753a445ef4371e25e3e205f0db85caa7331fb017ef0db5fd4d4ecf7c521e094a42530e4fa9be1edfa1c9b0350e1a8198e141d WHIRLPOOL 7ecde96015d6805ab11aa9ef09eceef942f7607924f83a9ea6a69a4ba93489b9c71aeb5a5392f4ebe819f4129ea6d0ba9fea15f5b1c1b2723b813c3cc0b502dd
+MISC metadata.xml 510 SHA256 257d396295535a98f431a78666da6a6cc9666d5d16687118baf5a9e3d1d4bf43 SHA512 27f43318fbec4a4df03d6e642bd269b4ca65457789694fa7617c9f94b9bfbcefd2a83f2fac2f5508ccc58de262364703293a5df536231e03ad1339fe707e492d WHIRLPOOL 98be05a7dfc3124d4fbf95e7b7056ff0600d55cd944bb5ac859657aa84f2437146e735a0a7eae9d11ac676ef7f8fb6433cfdb944953660f2bd7fa03dbd0d82e9
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/Manifest b/dev-java/jvmstat/Manifest
new file mode 100644
index 000000000000..13b5f7a0d363
--- /dev/null
+++ b/dev-java/jvmstat/Manifest
@@ -0,0 +1,5 @@
+DIST jvmstat-3_0.zip 153629 SHA256 3d3fad22aa65f356f6ecca050216f814fcdf20c0611a1f689969991d7a1ccb79 SHA512 c3967f5c11ef70aac3b3131c7ca1330c4ea377e59a2e9fb18329cfd9c82a8363efd960c9fb71e4d5f7e81867bd24e5bb6263d2f38b95878222c9184c0aaf4f12 WHIRLPOOL 33c476ca900bad34b5fe177ae77add08af3729974e93049f76da76d6c2a950af39f863faf1db9fce0b3634571fc4c59a8971b9b672175c9f1f8a43ec82f98228
+EBUILD jvmstat-3.0.ebuild 1010 SHA256 32ef11becbd7a923e69e440127e204e16f441d6329c4298f58eb361c11cd2063 SHA512 7dcb66e9a04c4eef51f9c1f92241e509bd01b7aeaa6cee667be515c67afd81be05ec3bd6cf84b585bfba910dd4df3556ef54260b345ca8e40b6f32e69dd92e35 WHIRLPOOL 0eb6362eb5101848ad390c098eb9db83a94c8c56da31cefbb11588fff80ddc50352803d490949e6c52c7f8bc548fd2182f2b3407679c3c7c4dbe3a81cf395721
+MISC ChangeLog 2423 SHA256 be8fe53aaa504a436746eeb52c7f5a83aa1f62b4380988c68b1ef24b5c46a211 SHA512 035d52949a374ec3a2d87b223b7095c3e3db9a5de132d72b1dafc5a112b0722fb1963820b09a637da0f7b68dccac9025a23f764fef26206bb38ab4afb4fe7db4 WHIRLPOOL b326961240acd13c58b4ea1e952decda52c0dceff619718f3b82e208c0cd21e0f3bc9282b1e3f8781f3c115cfc8b4fcb4bcf3fa6d041cc41dfe2bf0cd091119d
+MISC ChangeLog-2015 1216 SHA256 2f71d8e7061d2d1b875c42ede9d65d7730ea283ab771d9a6a8515af9c10ce4e6 SHA512 18941eb2d2ff1a9b46bf455b8445fa77b461d33b205f9ca88edcf7a809d449eb86117f0f7a941de588b42b4a95cef8116e85ca0c1102aa6ac95fc82612b5256a WHIRLPOOL 0226a319f6461e395bfe198144c43061773c4f567a80c1a7bee92352a836ce94a251fb1fe34b4a6a8ec54644685ce63da7ef073b9d4429eef31b2a4be50e1a46
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
diff --git a/dev-java/jvmstat/jvmstat-3.0.ebuild b/dev-java/jvmstat/jvmstat-3.0.ebuild
new file mode 100644
index 000000000000..9e79f7c6a476
--- /dev/null
+++ b/dev-java/jvmstat/jvmstat-3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/dev-java/jvyaml/Manifest
new file mode 100644
index 000000000000..0e17adc4e9ad
--- /dev/null
+++ b/dev-java/jvyaml/Manifest
@@ -0,0 +1,5 @@
+DIST jvyaml-0.2.1.tar.gz 202550 SHA256 a21c47679bac174b6185265358c7c8e151ac1ee8c4f9fbceebe9b15a37a10382 SHA512 edac9309c285cf569c453cd63f2cbd5e0a29012936af181616010bebb4eac2c474e2b37463af61b5e66876ffba517040796c596ac2bbcc9dad2af7aedf324221 WHIRLPOOL a30e39f862ed5eefabcb79820f190bffeccffda79ceae1864cb3364fbda1588eb345e7b1fe1264cfd84710e56aadc36e9c816e6371a46e7c1f0225e726065304
+EBUILD jvyaml-0.2.1-r2.ebuild 534 SHA256 076b2b9e6a724c7730558d54a42bb6de6544373e8d9d4ed50656e643f11d77f9 SHA512 a4bc69598701c3694398272181682048366364abc235095973336cc82a8f3026183a4289f08b6e42c105dd4067b48459bf9e67856e2aab9996a1618978a22020 WHIRLPOOL 0e316dcbf3e97737f1c8f8caa1b841702320293b705299a610615b08de4dfa70199bad612015e06a433c7d2ee08af52a6bac90b46dc6c09764cfef49cdb29375
+MISC ChangeLog 3024 SHA256 484d5d47652aad800015e6aa57eeedb45650ef10dc4bd7574b3d1ea6c9dd3b0a SHA512 614c61ad1ade640cd37738e830ab0152beb4c61bb46ba8354cc9af2c6f82ded3a60818520be41b42cfbecccef1d4e2dcefb49edf9a255fe7ec3753fa2a56ef14 WHIRLPOOL 49817a31e15de2e1d136368659555ed49b7188ddc8fb80677b664ee04dc6674b3eab72b273b1f746d938c32a621384875aab33ba70c4fcb5be8ef249cfa705b0
+MISC ChangeLog-2015 1860 SHA256 cd983002c51486bc752d0cdeec2817d9f0086899613158b67cbf3573666bad74 SHA512 40003cf37d1997937c79a8f9abbdab7a0a5e3cbf0a938cc945a34dd2de43355838ffe7928e2239a70b6f897b9c8dea8962aadfc48e2dc0f29ebf317bbcb62461 WHIRLPOOL 3b51aee3e4aae950c791f856b5e9af0aa9851b63e1016b6ecf843b7e9651aaece62bde8a0b5d9cb187a23b62b933f5e2de35f730bbaad5c042ba142b5506c3a1
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/jvyamlb/Manifest
new file mode 100644
index 000000000000..2c9a1fbd831c
--- /dev/null
+++ b/dev-java/jvyamlb/Manifest
@@ -0,0 +1,5 @@
+DIST jvyamlb-src-0.2.5.tar.gz 1767828 SHA256 49294affa1a43dbd169c0f983575b4ed4b15e02079740115bd4c9cf9401c8793 SHA512 1e853ff957b888d706a4d264aac4573cf4aced02604e2679d5871f3a92c016136a7fb73adf5d5c0be0cea9f28b4bc6faf11abc0334fe2f96a251a7d9cc228711 WHIRLPOOL 150906b115fa76e0837422d5b139721a072e6ccfda376a9958bc8c7731cdb2c4142fedadd2148bd4cfc35314c8177b34c32819b7716ba212544f4c84543669f1
+EBUILD jvyamlb-0.2.5.ebuild 1010 SHA256 472ebb697a69483a4f58aa681eaafe227bec820c714e6807a3f7e78acd823cfe SHA512 d3dd95121a759a52c3759283147f5d9c7a4f87ee9f2a0d6599fdfc4a020450c8da87fc89ee4c1a0867cff2ecc93a16719e9d5332b22ddcadd1c9231484903a94 WHIRLPOOL 4e4bd052fd9f5ffffdfeedc7ca999b2d5fcdda0660ce7f94e3771a7a8873b2ab966059dcdcf10e3cde74b25075ca5a7c63a7cf80e156f8da042637b5a206c8c1
+MISC ChangeLog 3196 SHA256 056307d19d7f857ad0facec19a2581c5aa27cd2e83e37962dbc53cc6a95c0ac6 SHA512 d4ccadb060c936d42c99e673427462633c864814bd8ea3787e10c114b7a08dc6f2d3d2bbda78bcea33d2f6ffbf3734888083aac018426625627bcc3c515e4fef WHIRLPOOL d320b7be5219bdff75643653edfc3909ed1e3281c03ff45a5622d5f02b0c59bf5887807c0596e11b43a78da995936f0b0ea9b25d2dfa5291a8a8d28df5727973
+MISC ChangeLog-2015 1258 SHA256 06208b1302a550244903efc48040750b30979ef34f91dd433cfef024e81d1714 SHA512 e1492ec030007ac0052789321a4f32b6fce975886aca78ee11b6fe1567461e4705b749cff1f7012680ea3c75c39897864fc01c1c48ea7306e36ceba18ecf4d69 WHIRLPOOL 999fe5e9ca368e083a26cad6cec8e35d1b89ab1af7005ffa0dd6b6b10225c42f0bb682123bdc1d954d75272e0ebc7ffeb7346335516dfb6fc0b88d26835efab4
+MISC metadata.xml 348 SHA256 3fa1f7d3ad0db630d9d77011e95a77c0c9bc689756da740d1539e39127911ee7 SHA512 50cc0581097381b62f98172a0c876c5835dbcad92e6c1f966bcb2bf48614d9768a4577a511e49f83c3f9ed1679adf708ef709c1aecba40b5abb69626cd906e22 WHIRLPOOL 1b741089f74e589847ca6f1549a88c195a6a007a448e5526a206ff3b74345061643df957d982dd0ed8ad21bbc0966010f56b59ca54e0f30400e1faffb7af4050
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/Manifest b/dev-java/jython/Manifest
new file mode 100644
index 000000000000..fd94924addfa
--- /dev/null
+++ b/dev-java/jython/Manifest
@@ -0,0 +1,13 @@
+AUX CVE-2016-4000.patch 6415 SHA256 80f3e5adfbb6528043953ab5ad3c1a0dd1da49e7aa7865b640d0df7e74ed7d7b SHA512 8fef03e890e70a7a514a03e9b36c8b7b2ab744a7e7f53e9fbf970a2990553cdac9002cb6cdfd9a9fa0635d9bd231c41d98cdf0406889a162b9aa64c407a043f9 WHIRLPOOL 918287c512e55cb5b2e3d75546e4242deef09a9c060bb97588d74874848ef8302fecb4118f5ab5190435ec731808ca7279ee238e970aed8f598cc282594bd696
+AUX jython-2.5.2-distutils_scripts_location.patch 350 SHA256 832e6be53cd43db0107db86bcd214f109163824e41a1565821b032f8ce11a20d SHA512 bf6e32641c539251550c979630311f0d3e4299fb1e4545d6c9fe18d42beace3959dadc22eff39ea53f20960889e19c73acb309414f007980909cf3a32a6b1b5d WHIRLPOOL 148f307da7ef3c6dd0c3932c58a669fea927d16a1278e578ba8171e75c6df80eeeaea64e3bb43f6edff2c4c482031b30ba9a30cc42c73fdf07ab4a914742f3a0
+AUX jython-2.5.2-respect_PYTHONPATH.patch 551 SHA256 63bc68e3c2464b1c22da369b2035ad66e9a0b0402c6051d4cb2b958f367408c8 SHA512 773d595fb05b687dfce63b3c2f67c663135d9faddd811c0d6939bbdd6da3e295f7ece9d913923205ca6fb433d90fd494bccafd8b421f14ced1e493a1a40682c7 WHIRLPOOL 41ea2e9a99a7338dcd961fa033a7a77e94917afad85ee47fcfc5e2e49ab224a94215ffaed647f500099c15592515bc430f798caa31254ca8e3c39cf2a6d0ae31
+AUX jython-2.7.0-build.xml.patch 547 SHA256 ab808d84e0d8048c28ad29225282b37c082ae5c9c7e24758555cd94467f7e8d8 SHA512 d5a9cd75d99482996d3fd09b43c6becd2c45173e1a34116e74b43baba2235863eefbfd509bf714215bb311eb6f620d972249ad4593e067b91b5d7b88467f635a WHIRLPOOL 9a54db133815b90ef703bbe945ab0caa33c8b0eb7609dcb9545e3371bd4e2b21b550fbe8712f91138301f31a806d4bd7187de9500bdca987b0636c5a7e731e54
+AUX jython-2.7_beta1-ant.patch 996 SHA256 4162eb543c70071cac05c4220047296809733f2b6ade731ac995e7e0764260d7 SHA512 9d6888c0af9b0ca39f7e70c3aad868c17b65d2f703b1fcd05fb71fe0cc8a289ca055fadd878afdc7fd509e16099abb2ddf0de9053994010d09757f275d243c70 WHIRLPOOL 51da00d838e92acb2353d75b32450d02afb11e6cd27e7c05e7f73d67397eadf9871f527a138353513597980b564c69a2e6e959a30ca5eff3cdebaacf55b348cd
+AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 SHA256 323b52653b511d3d4a299d0414716aa3d6e7bfa21094b6090363878f244d7af2 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18 WHIRLPOOL 76300b03adaad2d979e4a5a705088ef3410d93643fac0c87b333f88181d4f93c8185630467a272d7fd5f2439784e907814084f5a18f11715d9bc4ce102d03bc5
+AUX jython-2.7_beta2-maxrepeat-import.patch 457 SHA256 0840c1039c0e5821d0ceeb44bdfe1bda52fc2b9da00330c52c2056def2e09a24 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0 WHIRLPOOL dc685f8cd5d684a9ea72f3315d9d74b1e51712fb6ef46fb2dec24ec1cb1a1d0094d28c06e32a0089ff659b7a0c402e35b77725e7c971db46bd90767d0eaff3ad
+DIST jython-2.7.0-sources.jar 15371691 SHA256 2b534595d4a08059ebb71b881c58ee830499bb6e9daba7c828a7f1f6c8943f7a SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6 WHIRLPOOL e0dbd289c522b41ef2d3f54b01a2f6d44de8755e2eeb7863c8b807d1b179839f20d925e102db324cf85cd82503cd03106b5287ffa7a322a3902d6f24e9cd2a41
+EBUILD jython-2.7.0-r2.ebuild 4299 SHA256 e5d72b08a405a1f69ed621cd9b072102b0900f9cee95fe4fe55a553aaaa1b7d7 SHA512 433cfb7397f96a7e0e7673dab0f788d459d9fa490266d9434c0c0e82f0ecb1d28ed3276276fd3196f865e9a9a456ca75dc259060afddae8ada53700bddfc887e WHIRLPOOL eda646073b481c76fdd96163cfb8549753da2cd02f9a6b1eb8613d8129181db6ba8473d0f977c4359fd231a8673b13ff96d6147c402a85627b91313cfbf1f169
+EBUILD jython-2.7.0.ebuild 5666 SHA256 49b2ac3c6eafee7037c3f6b165f24810d4c0d403e634186be4342f90b728dbf3 SHA512 f8fa49e48f06ac9ecdcba3800d0e9050bd379df36058b0e7ee47a6d978dafdd3aaac8c03db28a80de12b7141259d9297827bc2d7de044a702864a9ed81bdf701 WHIRLPOOL c36b743cad1cc908e4185af8ce12287da9808cc5f56157872d57d906dc0a5bec4969bbd681fd2f013b873f5bcabf1789f0c77f4f06b80872d60b6314729c321e
+MISC ChangeLog 6493 SHA256 db425c5e8ab43a03c932063d59e827148f0a3b48367c77f0a361b8594e515688 SHA512 70d8319bca8e3a4faec942dd16c88ca7a2441ea1b896f17b4559d645abcd62b1d3d78df78621556c6dbfb5b58d18c87ed99240b7dd3ba74c847a79bdd9bbe5f5 WHIRLPOOL 6c3b155f81af4cdf1f18b6290caa248e1a706dc943d730be7693711269b954cf33bd8909aa241890362d2c088f0d5f21610f77c11fcf9eb7dbc3541a86c03952
+MISC ChangeLog-2015 16851 SHA256 19dc522aedb70b79948459e970080a6d8a3a10303079a273586eb2a967b81380 SHA512 5e125a0a005ceb0fdcccd283b4f9dfd310af0e90e4b9be4901e47702a35db5f846373f3a27129020afb1659fe22406c89250bf610a95470d76ff82fe062c8b29 WHIRLPOOL 15b10f7f076cc1eb6d866320c2ffc1159adbba022e006a6ae308cd3ab38603cb81d91debf8950f48e0ee4e6a00736116e9447f8658b377884e093b3d5e06d1fd
+MISC metadata.xml 406 SHA256 aa24488b1d0d7c1227a27148d330f242ddd8c6a65602c8a21a4e3ecf42b5a6b3 SHA512 9f2143723240241788a922cba2adbb5917114bc052b2590eb76777c5db4140ab0360c55cadb17fc5b2006d1947f37e91f5ce88d6abba500e6cb9419854014dac WHIRLPOOL 49104dcd67ccc7794af5b0bb38ce1a5dab51c6bcb40350dfcf4e98d67b2445a05d512184eca3e5f72b7b377bc2ecb6fb6824893fdb3aed6d8f08ba63d790c99c
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..852db859cfd4
--- /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/jython-2.7.0.ebuild b/dev-java/jython/jython-2.7.0.ebuild
new file mode 100644
index 000000000000..18b533ce3672
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0.ebuild
@@ -0,0 +1,191 @@
+# 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 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="+readline test"
+REQUIRED_USE="test? ( readline )"
+
+CDEPEND="dev-java/ant-core:0
+	dev-java/antlr:3
+	dev-java/netty-transport:0
+	=dev-java/asm-5.0.3:4
+	dev-java/commons-compress:0
+	dev-java/guava:13
+	>=dev-java/java-config-2.1.11-r3
+	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
+	readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	app-arch/unzip
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+	)"
+
+S=${WORKDIR}
+
+RESTRICT="test"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="asm-4,commons-compress,guava-13,jffi-1.2,jline-2,"
+EANT_GENTOO_CLASSPATH+="jnr-constants,script-api,servlet-api-3.0,"
+EANT_GENTOO_CLASSPATH+="stringtemplate,xerces-2,icu4j-52,netty-transport,jnr-posix-3.0"
+
+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
+)
+
+java_prepare() {
+	find \( -name '*.jar' -o -name '*.class' \
+		-o -name '*.pyc' -o -name '*.exe' \) -delete
+
+	epatch "${PATCHES[@]}"
+
+	if ! use readline; then
+		rm -v src/org/python/util/ReadlineConsole.java || die
+	fi
+
+	# needed for launchertest
+	chmod +x tests/shell/test-jython.sh || die
+
+	# apparently this can cause problems
+	append-flags -fno-stack-protector
+}
+
+src_compile() {
+	use readline && EANT_GENTOO_CLASSPATH+=",libreadline-java"
+
+	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)"
+
+	sed -i -e "1 a\
+		CLASSPATH=\"$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}\"" \
+		src/shell/jython || die
+
+	java-pkg-2_src_compile
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
+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[*]}"
+
+	if use readline; then
+		sed \
+			-e "s/#\(python.console=org.python.util.ReadlineConsole\)/\1/" \
+			-e "/#python.console.readlinelib=JavaReadline/a python.console.readlinelib=GnuReadline" \
+			-i "${ED}"/usr/share/${PN}-${SLOT}/registry || die
+	fi
+
+	# 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
+}
+
+pkg_postinst() {
+	if ! has_version dev-java/jython ; then
+		elog
+		elog "readline can be configured in the registry:"
+		elog
+		elog "python.console=org.python.util.ReadlineConsole"
+		elog "python.console.readlinelib=GnuReadline"
+		elog
+		elog "Global registry: '${EROOT}usr/share/${PN}-${SLOT}/registry'"
+		elog "User registry: '~/.jython'"
+		elog "See http://www.jython.org/docs/registry.html for more information."
+		elog
+	fi
+}
diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
new file mode 100644
index 000000000000..6034fcc96aab
--- /dev/null
+++ b/dev-java/jython/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="readline">Use GNU readline instead of jline</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">jython</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
new file mode 100644
index 000000000000..5cb8ef35d868
--- /dev/null
+++ b/dev-java/jzlib/Manifest
@@ -0,0 +1,9 @@
+DIST jzlib-1.0.7.tar.gz 50303 SHA256 20923a3f771a14c58c8cddfff2b589d568aff09f8a931919dc63ddaabb32407a SHA512 8cbc492857d432f79da08a9f6dcebc401e25bd888adada8d94caee15d67d0b89b4f66876a5b2275170157977527e1505386dd5a1575dbe658de233d4389941ea WHIRLPOOL 343a0158bdcafdf2869ba2c5582a45e4188486eaee54682726250449a6768daa4511f6f4b7d9fa8154b33d607693fede5f56accf35f249e78cd4a4dacb587c21
+DIST jzlib-1.1.1.zip 105191 SHA256 c3f4abc468febeb01e38c4916249d5c241488a25eed6f762bf42f66315979f58 SHA512 de76c008e640f17788c69ed2aae72cddbd0a72d039ce61169ca7af640571952080c48ec588b0fdb497a795d3f7644170ec541bdbe834b6b638e6260ffb57dc07 WHIRLPOOL 02aced9b161bfafc2d5ca75d76b49ed39cf32871a3f3460bb72011b1b33c0e785f87488ea318da37832af902355b7d587bda69bee052e5b17de466c1495f8dce
+DIST jzlib-1.1.3.zip 176747 SHA256 a93126d4a8e5bd431b37f0f662fb652f628a8a57111a67e7c777142a5bdb453a SHA512 844a157053a8d6c9b722e9c27e0f1520f3061d7e323f0e50d276c301477128f46dc7b1250c2ca337225690bc641b6f663ee76be8831b6e0c288438e64aa935b0 WHIRLPOOL 81cb56e0edd85e73bf18cceb56bcb655cf82b5c2b5d140ce5c9a3336664783e2fcb0a5b56b165602becfc788f2de934e6c5ac7fbe4386ca723c6ec2dae9ea3b6
+EBUILD jzlib-1.0.7-r2.ebuild 772 SHA256 9d07723a386f0e82807adb02a08085d3ef60316d4a285a94fea472cc6ecdbb02 SHA512 b22a8ea4cd20f4eed7e35c63db64f99af105ce84b854f0bffce9eeaa3ed9f7a02771b9e5159b0aaa4ad7617f278926b4002b421f36ddf1fe3533ecb86a9c484b WHIRLPOOL b8dcf5a022ca53da8218109b3cde827222634cf2d43c8b7f863b3c4b8e713f660e57390567603f1d61a0345f61c6030b475ffa1b4a1e1adc949df862750f2ff0
+EBUILD jzlib-1.1.1.ebuild 1370 SHA256 046b81aa13345e8f42e49eb81afd5f307e27dd20a1008c593c637f4d0f7d3b72 SHA512 46e2e1e47f51f44765ac061d1d07495c85441b12b7f634d984fbbc53947fbe99b4ec0893eaa1c69018ebacf70a13b4b1c22301d7a7260aebc3fa5cbbcc148a8b WHIRLPOOL 000e8e3295f8355385e66933cd3a8426ea7d472667767f14ff41eada7f48bf251a4e60cecc7546f8307fb6c053dab4650b6f7fb3ecbed35286a351a9e497c9c9
+EBUILD jzlib-1.1.3.ebuild 1323 SHA256 7495a31307e6ad9ce98a5fee10c6e47efee882f4db551e9e8a86fec0fe230bcc SHA512 e9c88d5d91caa7cbea56cef689b2d276837c0ddf7e4cac638cf468fbede03ad72c2ce6ee4d640eb8fce20fa907f4bfaf7fec25dfbeabb13232de677e70aaa86a WHIRLPOOL b8efb92a3f0466bf8ad07ac32e1141ea73d3fc87204dce05ac20d43656641960c84e0d3fe79b010e74d43c17e30ea62822f2da7de52cb36c3ef9774f98c8f6a6
+MISC ChangeLog 3426 SHA256 4e71bf4d65edc3b5aba42e19bc31993a0bebbf30502e076253cb704169d2a81d SHA512 388ce7d945445b65816581d4901d296a5d138c19cef1c7d9de10b9bd0df7a0fdc87d462287442d234cfa169e2d132ae19ccf183c1ea335cbefcb95b224a35d87 WHIRLPOOL 4162b5d07d3a5c56f6f0afd12f491eb977c7181100d0b13310e94569588c744da87e57b0300cdc199c6590d9c2a62c81510af3572cd6a81291a6e7c0a4799959
+MISC ChangeLog-2015 5431 SHA256 fc082bb78fd9c848c87bc7cef2509c1e46e8b67172b2dd8fc204e15426820a26 SHA512 4274e0c01df319ffada3d0f4acb93b48911bfd7e0eda1396584e65be5fc94e29ec74a4b0a85c809dca3f031b470e6f1bb6d232d4e7e2a5a61a951fd2600044f5 WHIRLPOOL db716d494e30d537c333bc7d9b0128c8580a5beb4ecebb15bbf4f5918f9b5627651e77d959d649388a7a33c9115341a4bef0b2cdaf2e7fcd12fd40f850f485e3
+MISC metadata.xml 321 SHA256 36d81de4252acc9d1dea65a21bbfe7ea89a5a37a62abdd2fac52c07985e75c3a SHA512 0602c7d4ec61795409acf409461bb44105b58d340a3740ace885d3dba9bee4ff146ee1a1ad6a8dd995d51ea406962fe6e5654b1a55a94c05c14cea3482a6ab8e WHIRLPOOL ae9377ad60789721e4d2716cc71b6050d8c99efc3959aaaae8ad252f4f74a6aa1826d6d2b14a5fa2b91319e7c097873d28d7653b7e58d1a5fdec076b2d16a157
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..bcbd7be61bed
--- /dev/null
+++ b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
@@ -0,0 +1,34 @@
+# 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="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 ~x86-fbsd ~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..344542899aa8
--- /dev/null
+++ b/dev-java/jzlib/jzlib-1.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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..3fcc2b5767d5
--- /dev/null
+++ b/dev-java/jzlib/jzlib-1.1.3.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="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 ~x86-fbsd ~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/Manifest b/dev-java/kryo/Manifest
new file mode 100644
index 000000000000..25e5639adbf4
--- /dev/null
+++ b/dev-java/kryo/Manifest
@@ -0,0 +1,5 @@
+DIST kryo-2.24.0.zip 1203526 SHA256 199306ae97ee63f6f692d1725e0074ca1bc395d43526d4923bac436b04c0740d SHA512 0c804e7986678339865cb0dd000bce063e5a91d1f3ae56eba1ca1b1bcca5e917a5d69fe14ff0c986e36c49f115336efb6221d771dd19b4dda91a9a7a6daf1463 WHIRLPOOL 23f9d9f9536b820d9209bdac9769962b17d5f09af9f6e713c8e8f8a35a266da21fdb3bedde93850130b54a01b69faa75f6a230fd79ecb2e1d326ab7f0b02066a
+EBUILD kryo-2.24.0.ebuild 1239 SHA256 c1addfe3cb0f4230ac6d00d159499047f0a04b82d04d168fcffda40b62eb671a SHA512 311f2771735a18480c79dd8e2246ec131bdad70dff3764a2df942a27208a55e2d6fa857fea9214bade1259f4e6545929e7c51d14b855ed91d4d01a7724ad0575 WHIRLPOOL 276e27ba05cc8a354f3abaa17beb5b631fd05621fa32e599bd1a636f2536e4afe82e110a8d93baefb4e6d6165afdac1964db2768445e63d76cac2710de160e7f
+MISC ChangeLog 3171 SHA256 9b0a868cdb9a24653bdc2aafce7e79856767cbaf7b7c6c2538a9a4e7de6df9db SHA512 61ab2b6be918e8b3a8580fad682f9933913db6e7f61893f11b29a8226cd2619089fec50194553cbd8839ea6a15c0930257eadc759ccc01af64a66eef541b1150 WHIRLPOOL 98692f93b2e3671c6709d5f833d346c2036396c4edbf19f9d3f1bb9dbd201a5ab30074ea86900a6eb53cabe61091e4b4b85eac5e93e26c01823f9e12509e83bc
+MISC ChangeLog-2015 658 SHA256 9f696d770bfa2aeed8ca87e0734fb643b38d677f97420938d0d19d80cc7fb9ee SHA512 688f1f7f02218ba492f2ddf2c8a961f4485c6dd826a7bfc057e30a6878211392bdd750dc2418e65a3d27859d7d0fd0e63307063f7527c808d8a52c54a45626ec WHIRLPOOL af9da1ba21435a203604fc81f56c365178d748f8845487edfe03f6c617c9f05f625c4513f837a873a2c3c0b5f2e0752fe59df05ad4c6f360d26569038b6c0f6d
+MISC metadata.xml 770 SHA256 016d7fb9506cba6d3deb23f8f22b5531f0149f554a3ca8b5fa63c1aba54838d8 SHA512 0874395033c8921e6caeddebcab9bdbfacaa4e57e0e7900cd8baa36717db48edd4e0c6e05d152e93ffe8e62477f4d733cf61536fee8c2f96aba75884f629a6e4 WHIRLPOOL 7e2583a49ff4e6a422d1bb789aea91a0f0de94f29d823922765ad8b608e4cf27dffd4f75d982a1210cd0ba7309d4924922720024d0fe559ec3c55c2fdfc534cd
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/Manifest b/dev-java/kunststoff/Manifest
new file mode 100644
index 000000000000..d3245e4e1d86
--- /dev/null
+++ b/dev-java/kunststoff/Manifest
@@ -0,0 +1,5 @@
+DIST kunststoff-2_0_2.zip 77078 SHA256 cef7a76dfdb48460dbe805e0df560cdbfe73a427f3a16c479f9b88f6ce79a2fd SHA512 30e4d74ba28795152b7c740430ac8e5aa650bead2adcbe17442b6e2daefb36b0000d6f98653a161c6d504a6ac77b40fd1477d64143b77e73bec8c28f1c03c5d7 WHIRLPOOL 87839d5d8a69ec971de32421e3be25357069d7e17772bf371f4bebbd72209172f446db3ce8e10ed8f8aab3bc317263a62968d647a15fc811fb3477c39a54e482
+EBUILD kunststoff-2.0.2-r2.ebuild 440 SHA256 452c85d35b6aa60f6175cbc452cbfcef4c5d948c8426d1c094857b77e99fd575 SHA512 7e7bf5bf7c3d8bcdcffa239b36955ad9806f3aebf33473f53a73328a928ec479f307b173c022a4014c6cb88ae45a062985d07632fcf295f6858f2ba5ad3b2072 WHIRLPOOL 5ae6125bf67f6801fc2b7e297b76ffb0cf820f8ad6a2cbb51d009a8ae1d30f9fe3c80427f1004a0a5718ed89ef7a9b4a6a6ef522fe4c91205c7958ebed369bd9
+MISC ChangeLog 2997 SHA256 c5a2a3ae2e9d161a6840eaf4b6f6da2a39a3123d099995ea54c89a8c1c0999ba SHA512 f37301ae415d2875c556306288b7b3ddd2d633e0d2cef9f82051af17fb54f0c7db332678710fe2123721401edddd7a1b70538d97c32a15aee860068a75366b3b WHIRLPOOL f9e5b7b1421ee5f7cc0401b84a29459662047150185a81de663e31722a4d44dd6851f0923ee3df3ef7d68e1b99fb2658044f6646a23151cc9eb0385a962169e8
+MISC ChangeLog-2015 1664 SHA256 26b75418194d466e7baac0e139f1d73b5fbeb0452f087bc48e0d3658d8c66fbf SHA512 af4b8cb331ec897c6581c5a3908cfddc61e410174e1d5800471a7cf9170fc0701317a7bc05070f982d9c7ca1e659d1ce76893da63e34d335fd2b252b1028d5d4 WHIRLPOOL 1cbabe3dfd6f5d3f63d16900dc614205d11756ec305399dfc94cb3682a1188aff8de7c6de78a2a928392784d1f3010b5c32ab03ba181a8053a3087a2a77068e0
+MISC metadata.xml 503 SHA256 bd73ea056ef917fcd816eecae25e6ee3a8e7053ecfac91fea9e9abc5927b486a SHA512 839d0e124e49a8476debca71c9526eda35e91cd3009f04f154fdbc90e86c2e2e8e0066ab67de6982af4b7b5474e503a6d20971fa552b0d6c33e21c35950e5194 WHIRLPOOL 6d5c8fa49740dbc0d414b7be9059e624683f0c3673483e36aa5e33dcc8e7f5c6fec24fdd7ac6194dfc6b911dd2b9616625a5bd6e6beee5f9a746c93753e1ba83
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/Manifest b/dev-java/kxml/Manifest
new file mode 100644
index 000000000000..5f3b2f554f1c
--- /dev/null
+++ b/dev-java/kxml/Manifest
@@ -0,0 +1,6 @@
+AUX kxml-2.3.0-build.xml 1888 SHA256 ee9f33adbf7f7a7dd214f9d34cb48e225ee512d64bba396ecc02f3d5a039d0ba SHA512 4fab1fd2b9abc410d0df327ba08f99658c1752e07fffd97183c924e815f72c365293ad5771d3eb3375b827b80ccd17bda3211d595066cbfd16e32a080950148a WHIRLPOOL a2e36dd67d284152f21d15c31f65832954e554cd90e41e6f48c5a64aa81b94cbd57391445b1801b46247ea9a663ce0088e83dcf492c17e5acec37697822b429a
+DIST kxml2-src-2.3.0.zip 354878 SHA256 f2441575236be69a460c6a54344b6ba8b8ba03fd0bab242b989f4f0976944cd8 SHA512 f4eeaa71fbe76b51cefb9a195d292c22c79c241920915fe8ddcf30dc11af39bbeb6b848a8c4dab9775fc8e327c5a29586ac53263a577de361312bbf45e25c1e5 WHIRLPOOL 0e8bca0f903477b8d83ca2558702ca17d8f15db2e4526758d6a78e29b070c8356840f140f2671e621ef29d052a26236073a6bdc1c585adbf8a5181932c44ffc2
+EBUILD kxml-2.3.0.ebuild 941 SHA256 f77fe23f4fc880b3eb5f2e9027330ff9dc2aff47addb300fee0b2ed34473ceee SHA512 98e94185940701b7fe28f5c6a1a0536064e41a98554e4784f4046bdfa0e2e3249766d1b8fd06d88d085c070d43319e61d1f0c30e3894e6b523d6d2c986815dba WHIRLPOOL 0c1d6e734691eae106ce782813be7b8abea8818adf26de2cba89dacb9b64a99903b338e433ee3f30c635c691d8ef85f1ea2844e4fbe9416ef199910ae4581ada
+MISC ChangeLog 3742 SHA256 667c7faec6f64674764393951afc18d3f8beb9ec770b719c9227568aa183ec3e SHA512 81d64ba693c4750cfdb6a3d00e45194aa34375e826bb6d6fe8a908be02e8d52b999e497c0f592a4375353fd6e33c909b9094098100dae21d1baf8939356f9b3c WHIRLPOOL a4e1a502ad96815febb314efbfc391f6ee23dc8f10143a881cba04f8d8849acdb41ac7ae23c5ad3fda2ab74b83afe4a008ba6407c43e83f8fbcd7e0cd9112aa5
+MISC ChangeLog-2015 774 SHA256 d65b8994f7bee0ddad5d84c548d4de1f3aebf2d8fa86018310318994c6cfe751 SHA512 a46b61000f7f01271c6200281de111d8a2754fac8911f37669aa85f0465f3d94b1f19d2af6610b15b6114e17c6c07cfeb2879e584a801fe889b9c2c64a735c22 WHIRLPOOL 990da07b5ad39cf1b264aa8bace29abf1a46b666e9aabaa46320ae6caf6fec13fd28c40d3ce221f4c8ca3e48aa0f1467442b447009b2266912cb45fb79225704
+MISC metadata.xml 310 SHA256 d874336092bccfb613c6beb7acd28a90a2f8c71884e26e79d3eabd0cdb36721a SHA512 f1a79f86c1602f19f9adba874fc1ae1f747c3d150ed9fbe14a90f5084fe08ba89d2164b8b8ef65e1eb52773e27c064f4b0ba7846204e605df712593fc5159cfd WHIRLPOOL 3d0d80d5b3ffa2e8840c90b4d94f7d059e0d2a12cbf697bb0ce76056c45a02c8d8bdc31a0541b6a53fcf5436133a7984a7a0e8ca3b9194eb420782e5af5eba18
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/Manifest b/dev-java/l2fprod-common/Manifest
new file mode 100644
index 000000000000..1b7d83080c98
--- /dev/null
+++ b/dev-java/l2fprod-common/Manifest
@@ -0,0 +1,6 @@
+AUX l2fprod-common-6.9.1-nodeps.patch 1776 SHA256 e739d4784cbe28f4e6b275da141e0cdafa670c4d3a0d1bb13119e03819312a76 SHA512 636ac2851bc24b776fdcb54b2786879216cf112d400a67b032ef50b44dd3988fa0d35ba31044e74174906242aaeab1a8563900d23b0cee728d54eaace13f4086 WHIRLPOOL bbbe1c24ef058348ae52634f8bc796110c2a9b59f37ced615bb36a5b7679a84790419ea2ad0aa11c433f4f0cc41558bf37c6f18faec5b379ad252b227db79019
+DIST l2fprod-common-7.3.tar.bz2 475662 SHA256 d774fc617995b584a5d8a73a84f1f0feae45c54a462f8913a86c96846aafef0a SHA512 685dff4cd7a171fbc92d31c6ca25faa2feda2c5a10d5f646e8fa649f53c532d83bd97388518a2720a3b4b8b87c0fa54a63ced23aedbf500e19aa0f618b938a3a WHIRLPOOL c2dd0a4bbbc1b985b3627a1c9461ea5b0d004c5926c4b21e4aa7405299734c68e7fe774016093ad11ada4d832762a35b6a9f1f96ff09f6f782cc0929c826954a
+EBUILD l2fprod-common-7.3-r2.ebuild 1208 SHA256 43203beeb9e72cf4f4001d0a4ee0d8a22c46459a3f0328da989c612c7ee67f6c SHA512 4d6a89f237229f2e7559bd0dcbe39c38706733c4966930f9c60dfce1948a87338cf46120b7f1d50aa8804db552680000354104d0dc15348ac4c0dcd2b490d369 WHIRLPOOL 1aaa95dff62b37e47e365b82dc85b8eb134638feae8be3ed7e476178573ba090ff2e0d33a13fe69f0e9ae8e4e28293fbdd900f2fd8bd42cce709d54b1525b4d2
+MISC ChangeLog 2494 SHA256 ad2e6961ecbaa51052c2272485d83a9dd3a2fd9c28d83aa91ab533d6dfda828d SHA512 be54d4ab64dfee3fec60003e4d4241ae789de6016a0127ee6c018e98f20e41d27bbb5843d541c277afcd1aa8b7be705a10f605a70de340637cbcc46ebaa7bea2 WHIRLPOOL 618e5bb46569438d35bceab47c9b14cff2a40c270399e10e11d6a48c4c86ac92fd353b7b0bbf6c5d76a9a626ac4d90673c37eb7a793cef25286f0bdece4f28f4
+MISC ChangeLog-2015 1369 SHA256 c99088ae4a7686cbe716dc89806f0b1fd0855f7efb19f7e21cbd92f3eee69a81 SHA512 8e712c87f9a6ed40624de8499bc586e6402a979d66a0266a2ca66dcf9ec4a5673c66c86a5b9b4c2bce94ce34c5514eed631c28b362d2eb94f9e539e49d329b56 WHIRLPOOL 045ab97514a307f17461deb6c06d784f23879b8f2dd68d6386a42cbdcf6debb4ba2dc45327ac3cfae859b49d3be6daf7b9b89f535f54b39047b8dba91d9d9bfa
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/laf-plugin/Manifest
new file mode 100644
index 000000000000..80e3a83839e1
--- /dev/null
+++ b/dev-java/laf-plugin/Manifest
@@ -0,0 +1,8 @@
+AUX laf-plugin-0.2-enum.patch 1987 SHA256 1bf4c0c8bc9db9114d1b712e45000049914c742e0cb6d5955fdea27978ccfae9 SHA512 3f32b546c95033add7647a209ea269ee398b90a3e286e60479dff83f20cb93c78318d80f961c544ed728c09b1f61297e492b7963736eb56e802ec7401298b801 WHIRLPOOL 529b0f7575b291cd6e25c76dc6158c07f1e3651a9eea6214301be8ef3a1acc53432d3370d18ed1df7a3eb8b380da67ea41208ed3476f9b1d47d0bfae16d56757
+DIST laf-plugin-0.2.tar.bz2 13799 SHA256 e2252f74efbaa1f0c32a475c320283e614932e3af2d98a65462bf0e1f8cc00ba SHA512 91ac3f9f5ebfcd70e7cc76f2e028e9578c6113a848b0ccdc6b001fff006bf5aaa12af08b1752851693d218d4b2d7d053f62461481e49d5a0bde21e5a7d086331 WHIRLPOOL 6aaea36bbcc22eca1704185faf866fba1b723cd3d6ff02197f28287ded67fc43bb4c2f9cbe8a2dce9e82eaa88774b1fdb4c66e54cdc4f09ad946718641cb1334
+DIST laf-plugin-1.1.jar 8105 SHA256 2b7919c502906983307b556284d6e86df2034b69ebf3394f303490e99936500d SHA512 2ca265d23ac95e5d194e4905ead4c975cb8739a0aa30096c028d2f6467b148de2ac0ff71c6730752a666eee53551867d9d8c852d25238a873fbd4bd994cf80c0 WHIRLPOOL cda35e80834745d00ab2e1a3f3531ecc0e5cf4b140c5a167b86ffd213ccf9cdf0bb76d4582ec1745d738fbccd5fa81e1267e6f54a7a330521cd78fb6897d6e3d
+EBUILD laf-plugin-0.2-r2.ebuild 562 SHA256 89fa4573cb191c36332c7f7a587a586ee38bef56879bb61c49f5471a12aa3383 SHA512 63ac19a8ec061503532f040ecd85c809f088fe0f263714afc9ae92177f6e599aaefbf4f5278bf76100e8b8377409217f928d823f2acc1e2001646c6ed95317d9 WHIRLPOOL 6fd5a71f6e3fdaacc19ba7fa53a4518949e2a331fa50ad58418f1d63a9f5964c690b9531b35b65dafa74369628828b01d6fd507329f6a0d6e8453b60eb57d0b0
+EBUILD laf-plugin-1.1-r1.ebuild 648 SHA256 3d0e28c139036cc4a317fa9a717a20b9091767bd61c8e01e11313568b4124ed7 SHA512 4d788eacf78c97ebc3f873766d2872f93a408bca6be7524c09c095350b4825df1e995a6a26437a3c4cf34959d6ccef0461f6e1afab9f88551f781b924a9da9b4 WHIRLPOOL 82fc97de88a63f5e9be90174a56705da84a255303d93e856791540421a9531cffcf07afcb5e79f339691e766d007da349cc69457fc591d5246163b160d44830d
+MISC ChangeLog 2841 SHA256 5564baf7d453ebfc1e6e0f3438adc008630e20559e140c54785c5081719b6dc8 SHA512 42561ae5553d2e2a10c270d9f008af08c06f1e41a4fd28dd2f11baa0481ec733d9761444a5d6db01e54e162608de75eff26593b498d828ea73da92aacae315aa WHIRLPOOL 0151029cf1fb23746e15b6e68e6f113075e1cdf3f221574decd926b846f1b9ce5a177f1b41ae451928d9bbd662582d2fb1829ba9543c3a5148e41deff4279f09
+MISC ChangeLog-2015 575 SHA256 27a1e31dea033abc047d8fbebd91e5fa3cccd16d5ab9259a983e5944109d7b9d SHA512 22034f8795b418a9200aac95ab5ea304616fde09ba7d9f17a2ea994f83f737a5d3f891af779514155810bb3b4bab70827e006275fe76ca87b25ce892af0de794 WHIRLPOOL 3e588a673aac724e45e1939207452f58c10ed64c797b8f83335c648496d4e0d1466ff94e46d2304a84a8233ae85b71d071868085554513435abaaa0b9b3b983a
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/ldapsdk/Manifest
new file mode 100644
index 000000000000..1f743f1d167c
--- /dev/null
+++ b/dev-java/ldapsdk/Manifest
@@ -0,0 +1,7 @@
+AUX 4.1.7-fix-jdk-1.7-enum.patch 8395 SHA256 60784d38f11a67481713641066183e6f27d4295f451640555f8435d052d04b22 SHA512 b62749328c9ca64342550771a4aeed8321b2995a81b15a103c8c3383beaa471f657c13b9eefa6035f0820c7b39e4640f6af1eec4af8bcbbce75a2d97252bc20e WHIRLPOOL 09627f846c3bbae7e0e604862e5fbd55e55d08f7171a52eef3a2b63854618a3416fcbd7b9872570fb54f6fa85606e81d025dcf680b617ffa249df3bdc8858c5b
+AUX ldapsdk-gentoo.patch 5569 SHA256 842cf79d529757a851301b881fa95d973a10cc45de112282a5eb1f10943187c7 SHA512 2b3eb2b0cd819f6a5885235eb75b20c60a1b2805910fd0f11c4e54edfa5c5c802db79378e43b02182ef6acb60eae20fa5110835e8a772c9a34daf6a4352a3b0c WHIRLPOOL b051adec27ddee91e302e482ef9e9aa0e6b75bcb8d506c700549cbacc094919293963f1c1572318475417750547c6b9b5a1ab6e491d91fb742d75cf46f91bf02
+DIST ldapsdk_java_20020819.tar.gz 1068301 SHA256 2f9599a2c5afcb0364c095728a909b73c59308a6ebf1849f6e8c3090be455df9 SHA512 e27be2a3c41db07589a0f4ee32f5b9dc2700f27aadf07c6c3db32041b3284ea8132d4aafad3cc0e132a68e1d438013df0068ea838c98cfed5ec9227f39d3c33d WHIRLPOOL 057fa56755aabedba5e74a5118e768d1653565d431f64c9f8a9033db86a4e67b7c7365ae203a2c2757591dbadec874543275e53e576fc39a82c35a2978746691
+EBUILD ldapsdk-4.1.7-r4.ebuild 1309 SHA256 ca76247a178c8177774fdc6bd45ab0bccc17a1430c71fcb9a5d95fe2842289c6 SHA512 8c6b76e8f3f72016c2fec988d4faf90530e8d0c1e45a7fcec313d78ac734591500325b1fcf7a6bec8411c9204abcb6818447d5019e8f039b5c1bf2d498dfc205 WHIRLPOOL 36ed0ac3a76c357ede78502f501596804c85e957bea294fc6ce00f6d3bafa9552cdf425eb0e75ad85514a65cc19d18df024e285fe436ca1cec3f52d5a91bc78d
+MISC ChangeLog 2894 SHA256 2295a0b07353575a9123505113696d3df943ef8e94de3f39381650ded86ca78a SHA512 936a292ca5c789630e1a396a6d870204ea6678f9523eec4f8eec9e74f11cbfad1111f2ad7ebbfe17c00ede63e75f6eb2ed9ce0195363f3f5345dcac9455aa050 WHIRLPOOL a20c7b76d1b9bda11dff8e7cc898c6fe89cd360261eb42fe3f7abc84a80164ffd3b35681e9f743b9f94b82bd4c967ac231a61bccbea62076051a5c7686141a59
+MISC ChangeLog-2015 3025 SHA256 bb89a0c1a5bfe0e9b98e4c34540476b3aa854f74698e1fdc9ab237e685c55040 SHA512 17af20158b96206e1a09fa68510b0f52799284de5d0ac5340c74255e573d0f391fc00d6e440074cb2ec2a84931b3dcdf0991b97f801c97f61e54faa2f98aa102 WHIRLPOOL 9b5927a07c4c6adb096c979d3863de0dda3514123cc94dfc838a80fac787ded70202b18802918f6095c1ba284dabcd9d2d7daad70ee090acd5df18d26268c430
+MISC metadata.xml 313 SHA256 4c2fa816836c921f1cef4031f99506b2133b1d3058698d454f3daf2f652eebcf SHA512 5b8c3260975827e81ee947fa27f70953bdeb6adb436eed116c63f377fb957aaf16e686bc86a0a3ee4d25ed8c752f9f5403bd831dafe731d8d297c9ecbb3b0240 WHIRLPOOL 3295e56533c7fc9553ce12d1ebeb37fc1427d2bdf3a678de7c5c8c7d515054d5a38eb4539830e20efae53b78a012af911190f09bb55c1afb4431c9e3a41a1def
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/Manifest b/dev-java/leiningen-bin/Manifest
new file mode 100644
index 000000000000..96101376ff8b
--- /dev/null
+++ b/dev-java/leiningen-bin/Manifest
@@ -0,0 +1,9 @@
+AUX leinrc 37 SHA256 c75b525d9b7b0864a9a36811ed8b71dc7ce08c4a08ea46ea8e6fe3ed74de1847 SHA512 f948d5f355d43fdee6cf68d0dad39f53f72b341649869a6ca161f5d8c83bf30434ed03c51a7e01aaefa422ff4e93ca3db5680fd4c2af92f5393acde6e8aec7d0 WHIRLPOOL 10a9617766ed5f0da69dc8ec70e2e24f1a14a5b826f8d8b44ee533c40b684580250927217c56a32ea6cbecefc00ce72e226579b28d6e26545294b1af529d4dcb
+DIST leiningen-2.7.0-standalone.jar 15366772 SHA256 b0a53fd9fa73e9d87c04ef25ba1ca174b0c062b803108648d7157176ccde7435 SHA512 d42288c696d5b4d86c41a0ca9b8e748cdb9200c3adc23161b9b97b8c2f3da9c5bd811e2ddae265bf11d323b1449291e9914bf1e222aaf403e73ceef4084ed082 WHIRLPOOL d37e5a17680f08f7fae63051b6be7f8d12ee89d42bab1a6cafde6a4579b6d0ea4a772393031e286a57fc5b5d534674b0a270a32b39e9767a4dece70986bc94a4
+DIST leiningen-2.7.0.sh 4301 SHA256 3865ce138f0a5f175819d6929203bfbd84377d8d5b7720af59c8cfde2289a2b2 SHA512 241357de3f19dfe1c729c14d1540140fccdd6a6c7bae76d6ccfe7a28cdff95b01f52a671ccd2d6712e11ff33115c720906e34a5118ff6bb6d232520d77125f5d WHIRLPOOL 52fe0420a7f8da17a8e01504a515627b85383f6c28e31c9317d4cb51c80fb1236149d30f5b8b0dd73c10157a73e8877f3d7e235da1e95b3b78709c96016d2a8d
+DIST leiningen-2.7.1-standalone.jar 15370238 SHA256 2ddc7e89bbb45cf1ca3d666a10dce0d3f154b77ad201aa58f430e84e71587c47 SHA512 6f0ac01917b273c063dd16d8a5e98cba0265ba19766ce6a2c1e160367e3514e637c969f831384845e752cde015e1357eecac7141259e279584577f4f527bc08a WHIRLPOOL cdea21c8fef2ba1d7e4397d32ca1c4d5c7ffcf52ca088b8b1148c970c463ba219adbc11b208379659f3c255afbffe1edc7d82d38d67945fa85cdeb1713c3e3b0
+DIST leiningen-2.7.1.sh 4581 SHA256 c04efcae827ee0883bdf44abef87b5bfa7da6f4b9864b5395dc341d60985ba66 SHA512 88e52f843a9b3cc4ebe2d8ffef1bec5e52a9e1e492d69b75c1482f7a97f6bcb766360502a5f1270ced1f4c1419af8b0cccd79219dc333a7305d3e4b58082d1e6 WHIRLPOOL 577044d1cdc931a695677fdc748ecafba656fbc66d8137a32ccf8cbadfd7dc137e45c91efd953e4efe9d55fbdabfafabbbc5f14be09d5415971814f5257c7a73
+EBUILD leiningen-bin-2.7.0.ebuild 1525 SHA256 40ea2a90bd992c9d917fde436697a4fccf09506d131950904b40775a96e73595 SHA512 0eb203650b4d4f98188ee7e6f66cece8757f39155a26f17c16041d027c90785eccca5fa9535c99f20a55e471f46baad3bf0f4de11bdaf4b6311b7d722ed43ce3 WHIRLPOOL 462d056c53ad8541a5f0039873469c08d4a97adfe8dacd549ee6d33c3275d7905217c1d8a393006285a7f35dc0a090cb6d81065cae36fe2ce0f2805f011142ee
+EBUILD leiningen-bin-2.7.1-r1.ebuild 1549 SHA256 7673466162f8cea354fef3da0e1e7f8a7593b923434b476ac699e7935d60242f SHA512 cd6b352eaf5fb136622075031a2f1033f86db1393c3ab31e0fb5395e69aa758ed7fe357227fbfccd8db07f056dd0a259dea4451356a974453f32438355192b4f WHIRLPOOL d6be0198a44013ada03b1f6d4e0b7833e35bf7ddbf069e2725eaac6c27a8503d047ef183382138f1d39cdebb1f28354e29700718c6fea4e0f07f4c1b6c0cff38
+MISC ChangeLog 839 SHA256 87781853d5087084954d3e1f14de0251e41f5a95a8b5da0570eea8dab1257f90 SHA512 833fe01637440f186b96e78dcc5601dc43643c92d86860e5980f418527eb7c38ee5134851d7ef765a09c19d10aafae5158685abd56d9b94549faa22af7bca5c3 WHIRLPOOL 24676c67347c1f98321ee4cc625919450303d35426405d8f1d9b3abc146750e9a46df0a8fc11a5a4476bd54be52b46d0190c8511ce91b122a0b5e894d73a3268
+MISC metadata.xml 408 SHA256 11e196a46b7e8ee4e374b41a0285ce6ab7003d2e7aa65de3a9029394a40b7736 SHA512 be76fcdb5d5ab199c951e2b563976b5c2bfe4f95000822073dccd71305f2409e90488e4c0fa726e503cbb533b16ca6a85599d84cadcf15d46e8070c3e5d0a5d3 WHIRLPOOL d49dd0094c7f45e51f1059e837842896001e5c6d5ea9acac7ab4d64088a329ea5e5ce31f3491970d53068ae8b1a6c585b8fd1e17ce01520a4b250c469733190f
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/Manifest b/dev-java/libg/Manifest
new file mode 100644
index 000000000000..8f10174ad65e
--- /dev/null
+++ b/dev-java/libg/Manifest
@@ -0,0 +1,5 @@
+DIST bndlib-2.1.0.tar.gz 123217291 SHA256 5e4c3c5d786acc1044103f57f4769acf54ea7d247f58f3c6a7b7769fb37df30f SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e WHIRLPOOL 3df261dec93655d2f4e483952b58d531fdf1936c505552f013f9447ac7fc8100e51f2412fd66224fe7871fa68fe1a6ec86c9c2787ffbfc65c8dc9863bac31fe5
+EBUILD libg-2.1.0-r1.ebuild 1365 SHA256 f430be68ed2f1d66fb0420d58632c888e2ceb46fdc89069ec022c91c37f3cec5 SHA512 34d78f327d082e95c09cacb764b34391311d76b76aeea147ab1488fd781aa4955bc7d6f6baa09ce364953f2b13f424096fc0658b7a974b4adc88b429213ca829 WHIRLPOOL e72a8bd9246afdb9a1ac7f1340a5896273f951f0ba04bd2d90f4a9f4209c69003b7d7ae14d2c00f7fda883c26bb5733f866b927749345d706b640c372a2f602b
+MISC ChangeLog 2424 SHA256 5809be0fcf761bd65817f2cfa9155820a87134b424c3f1336ea6cba085116666 SHA512 f8e4f7a6ab437411cb512dd6844529c81d805ad45f32df27b48876a31dd1aabcecef9dbe57b58b0a307008d8a5248e65f50fd45b8fcaa5a4ea3a1bdfa41c198f WHIRLPOOL ffffb0dde0d050301b40ff0cc95b5b8fc34b66e0c06afb20e24a770629f0d0de3c02300a8bdf8f33eea87ce55534c5b53ec80df95602358f0187746fcf70a94d
+MISC ChangeLog-2015 1105 SHA256 91608bbfdb5a5669cfaaa3d95778be45a0a499726bc4860c5985e783988fdc34 SHA512 71f62604f82c0842656877adf67d63fd57a5903b0432103730e2fc1c8e7250f025848a2ab5fe97f223a022576404ff70ecc87c085c8647789a9eb0a7299af8e6 WHIRLPOOL 365d44f651571f94f6917e9dafc04254db80889dd6f0bfbeb8256ee8d192e846c43bf64126bcba1fd0b077d1c27a9fc24eaf46cde09154d9f8e7f7282d1af663
+MISC metadata.xml 323 SHA256 5d4405e7ba4bfce2e3cd8fc106142b56daac9f29abf53107d4fd5df8499f25b5 SHA512 b9affc0513759478d6db10968d574cc820ac19476a539d27e279884314805f663f0807abd01ce8107154fae445ad3e4fd37f485004130f04aa890c0607f85fcf WHIRLPOOL 70184d5185c58b4b2af3ee3f257ed3488d06ed1ced00cc41393465ba3911762cd7b0287ea4dd5c15c6fefbb41bc11339caef3d266b93507ea23c18b1e66e5850
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/Manifest b/dev-java/libmatthew-java/Manifest
new file mode 100644
index 000000000000..123dbc16554e
--- /dev/null
+++ b/dev-java/libmatthew-java/Manifest
@@ -0,0 +1,6 @@
+AUX libmatthew-java-0.7.2-makefile-fixes.patch 2545 SHA256 8f771431c745595c42426a1d7b339e323e34c21aa7d6a342f70dea531490e0cb SHA512 698883f9f0a6485c7d751c70441d0791ddeb78260eceeefff1661983d04d81960c652f9dd64522cd3431981549689b8c9d3051674da5b0871124c912b4d9e3f3 WHIRLPOOL 636640657809835b41ed89f71d7aa878fea7330f6c5dd25f155885db6d1c9225f12752959607c39dd0dc290a7032845c4057ef8ba2c02e01a6feaabf317f1f9b
+DIST libmatthew-java-0.7.2.tar.gz 40601 SHA256 9f48a00caa8c9731d7056346ba72445ebca508e17715e32e310aee45ef36ed03 SHA512 d4a0024fb17221dff4d787b83fd5d9b4a189db0b3110291066f037dc33c009d479a3b94ec8d7c00ab5a39731ec8015dba212f367a858f4329e9d203325fec02a WHIRLPOOL 772118df8f11ddba8fd89ec1b29af63a3414a9e681b52bab591c1a57866b6cafa5efbfe248f1e3270b675bb07fdcb07a9ae05a748e45154d9fffbe2fb5887958
+EBUILD libmatthew-java-0.7.2-r1.ebuild 1294 SHA256 888be2252bd5801feb38115ac4b1f99e351d84f2bca877a3c00aa58f17895cec SHA512 5c5839b643078d4da6b8a68111d9b813d888f825e16a38205f8adddc3f682904b3b7b1ac3c1b4e7530418eaa7339af109df4e0f1faa2ce04f44de84adc2567ed WHIRLPOOL a0a811a619edf5b31d861303012cdea7d8ed5861b39c93f19417810e95f750069ca175dd2ece33c9cddef49b84b3f3db3ea23916a874ea31a263dfdb5b030a70
+MISC ChangeLog 2661 SHA256 f7fba4981c8d4318e20caa6b70b9610db986ec1a10db835b5ab4065c95f61704 SHA512 e76dd0d19d83d10541985aff80a647a196526f46b81060558baf32225d99d4ea7a1d99ef399569cbf0e320a79cccbaa2eb60e37b521ffacb4757f2020e28ec6b WHIRLPOOL 620f64999e02adefbf6b805f500be65a3c38d166397915e2306e107586537899b9c17d326ba19f5ce7a557ce430f1145c94f0dd39f93a4e0b5f3fa212c4108aa
+MISC ChangeLog-2015 3224 SHA256 e96a69d7c128856beddca0359e4ddd5ec937b6ffbce9a195cc21cbe455eb7b51 SHA512 793ae7e6946fa02ecec1149a6fd03af10facbbf47d2f3ad3762c9e55070277f10bda2dce47ae66971739a9c0a64c97b51197136f68a0a5f24d0d73e6f9c97da7 WHIRLPOOL ef5207347239765e3fdc45c0cabe1e20d184f0071da15a0cdc67d0766dc6795077d0e9eaa0ee4de7c80711b657457ddd3e96fcb57635156b63e75d96adad0f37
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..b18fec24f39c
--- /dev/null
+++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd"
+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/Manifest b/dev-java/libmso/Manifest
new file mode 100644
index 000000000000..4038901a07d1
--- /dev/null
+++ b/dev-java/libmso/Manifest
@@ -0,0 +1,5 @@
+DIST libmso-0.1.tar.bz2 2874 SHA256 4eedf17777b5724a3c7c9309dc88c36c05fb8f4ae24de35151bbe8d8d5f9b335 SHA512 b0f2bf5d7eeba6d1053bc895484142d3126b40ef40ea8a624ff2f83661151157bda194ba7a0aab3633ff66ca32768818c7dd8ca42cd5bde81454a807ec1f8e28 WHIRLPOOL 7a58f4ab136c31be27a01d3f04e44d508c7cab68768bb36b4086890804264ff3c18bfb77f47f30fb2b129d7a920ad619dd9e9b4fa42da4c1951da6b0bd26c622
+EBUILD libmso-0.1.ebuild 796 SHA256 c8e996982b5fe3228fcc874f52ddf8a78222e1d329075495cee845384f64752e SHA512 9b21c5c9c24a818fc8d41ed3104f06c12c400fca4992dfdc819b20da778684f0920ebe93d2d6c484a1c97edefbe651aa2cf9186057aecb909c85077003c9f5da WHIRLPOOL 99cd7a795b08a20392cb85dace793e6b7fef1aa88051b5b81ccc3e96b88e3add256b7e0ca0f82d68f49a50e1ec7f6b7a0c9b27e6066334e124c4f18cf0dd8105
+MISC ChangeLog 2580 SHA256 33744b56c57b6ae110dd6c10bc08c4edf02e12350ba4ee89ae2b4e2b17482c27 SHA512 6ae02980ecb47c54ab53053530a3214f8bb514549a1e0c23f333004270da44057ed2ca87b5637d089da88bf0e0eafbf04945e7c90a6ca05eda4319b7f7c1946e WHIRLPOOL 9abed33ed7ec6e75ef313d8fbc188a4f1137d72dcc54933614d749c69d48796e95e7cb281dbf2857b39b11af3744c754b79cc188bdc39c18dad66df3d0088846
+MISC ChangeLog-2015 727 SHA256 039403b62b214f9e3d53679173bdf1382eedc2414473832cea9470a78c458d62 SHA512 2e2c30315222e54f0aa7628cc6e40027a00c02f77756bc77dafb1e18b26de9d6d70f23441f3f88d4abae728905dbb027865849dc3ed08b3d12e12169a4010b71 WHIRLPOOL bedf599aaba0c7e9d6531ea29589bd3d6ab765fbc2e06624ef15454d870fd8c19996287b3ea3eaaeee6c0098d4badcb0c758d86f04b9218c025e921340a6e98a
+MISC metadata.xml 289 SHA256 ea9025e7be831da54a8581215ed1133ed73e427d53c462a530c4fea8116450ca SHA512 a62a10bdcd24d253d4134029406c417dabc1f6a1a675a5500a848414fcc18235bf20e84926b11108cd213fcbba9536fd7c10520e8eac65052a62f0af1be660a4 WHIRLPOOL fab21cc2c12a0b034a9592bf7bc6ae94a791499e8902526987b2049de3adc6eee8a22abf9bb9fc1b7d9c92aa224491b34ccc9365ec0d4493fb45fe90203d37fe
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/Manifest b/dev-java/libreadline-java/Manifest
new file mode 100644
index 000000000000..2f022e35f60c
--- /dev/null
+++ b/dev-java/libreadline-java/Manifest
@@ -0,0 +1,8 @@
+AUX libreadline-java-0.8.0-gmake.patch 532 SHA256 2d8575b101f5856bf7ced9eb8d606eaa6be2386db9bec871aadb5033442f182e SHA512 079f978e90968a6d04f717e25511320f69e4eea76b64b9ae928eea868433d4cfff2586c2598ff0b73eeb5f6146066d2926e5c6c7ec077a69e0f2abbcabb9c2c7 WHIRLPOOL a720c1d5f42fb3b6ec7a8d02c47fe87b9e082f7f29cf730e8fb8a866fba72afa935dab1660e38ee988a7900f1f864badf8ed96c8916a287377d15152bc145abe
+AUX libreadline-java-0.8.0-respect-flags.patch 651 SHA256 4c2fdb6cc0b2cc3071fad5af144a95462d6ee3d8a4c701fcc1f973eca34546e5 SHA512 b3419484c6732d3396ae90fba0c77bec656bb705d63c8ec2bd999222c8e687d6fbecebfa10bcb91c8780e6ffa922e2d58318978073f382c4b7601cd569ec7abd WHIRLPOOL 57ecaefc09834daff218e7d68f89baf8922928bd474037e7b903997998115b3a1334fb23a5884012b1bb521ab3a125d31230c107bfa0395502a33ac8df40017c
+AUX termcap-to-ncurses.patch 498 SHA256 de636c7cc3e812a276ac530b571d7c9a0fd63cd7011868ceb46a59fc55f2e337 SHA512 43b6494d94da3d8874da34caf3e191e489bdea3e680d76514f3acf7d1c55db784efd8220e9aa914831c8dc753c231a06d5c3980bdd28835a3369f4c1d862a932 WHIRLPOOL 2d9b02dde42f2d3297858798765a33d2be803a8b6d57bbba91ffe819f12134cb9842442903ecddcb869665616d42a95c61de698de49efb1809bb418687c6d6f8
+DIST libreadline-java-0.8.0-src.tar.gz 77122 SHA256 cdcfd9910bfe2dca4cd08b2462ec05efee7395e9b9c3efcb51e85fa70548c890 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2 WHIRLPOOL e54b33173b26db1c7e81612f01159feb895ae47ffaeb2ba143a605a3c484179d993c04fc716cf1db2729225585ac6ab4a400f986cfd15bbcad0f1bf73c0e1d81
+EBUILD libreadline-java-0.8.0-r3.ebuild 1292 SHA256 b73a6f3066cabde88c70391dcc4d9dd8cd793b1ab575f7297dc67efba9ec5fcf SHA512 8f81e7992ed426ffdfe6e3d800aca91705264904d4c43cdaf9939efc4fdf3dc6e15b122e5b219466278287e177274b37f41e55976933d667c856372ec68894c6 WHIRLPOOL 7a2a3973f29f80b65efc72f35ba581681c042a510d0027d05f010014ce699b61d8883fb4b6ad24075f8d61b9ef82ed64d0da00e49fcf0439085b0b3048a4b0dc
+MISC ChangeLog 2940 SHA256 90590301de7dc1d5180d3ad6b952fa44ab8ae0d9cdec5653ad8e1a1acede180e SHA512 cb869c3916e1ce08e8f6cc005e7281dbf6e0c6a76a2e79125aff85751f9777611fab17ce4b801f3ea289201d557cc2969337a39a2528584114fccaec2c6790c2 WHIRLPOOL 2a84add922bd8e74bc798b5a34b36836ebaae21a6f33f04d534c182e9195c90b8a234e815a9704179b86c1ba72622fa45604e92b11aa5288a286d71903c16b24
+MISC ChangeLog-2015 5709 SHA256 881d2e0f6386d3ee4ad33b339b62bbcdce22eb1433e8f11140905c59e9b649af SHA512 e90daae8ee10db28ce85dd973fb90814f7470c92372f461c5321e20d9a58e7987b94c8051b10734f1b63bd7a6e0ba47b4d224755c99404b82384f39b52d1a18d WHIRLPOOL 8cdf1293051e121dee9283cb80b0cd900d052e27eb055c47897f75f8f7ceddfe729ec5a9d9dad65d2ecfaa133321fe75846d693e3cf0469d335f6397645bf120
+MISC metadata.xml 319 SHA256 6c04e1a3dda805bd500fe827705beceed96fc1836193898facc5d03bb1e6dc2e SHA512 e13714611711ecb54943d5d3ccc5a8ae8f9dcfb6e9a6e6c6e96d04d7d80dec6a07d76225850cb2cdbb6b2d6a99f0c5c5fd0c9c4a9a3c0724c6e8ed7b21a75e8f WHIRLPOOL 16e0023c3e36dfd39f1fe0d4366a0e1a3cb4a9f9239cf82a5d949d23105657968db6dd12ad67c18dd7c0b28e304ae49b8b84e3095abb37ab0b046d5ec35cc0b5
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..edf28fb9076e
--- /dev/null
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
@@ -0,0 +1,53 @@
+# 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 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 ~x86-fbsd"
+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/Manifest b/dev-java/log4j/Manifest
new file mode 100644
index 000000000000..d93f53425cc5
--- /dev/null
+++ b/dev-java/log4j/Manifest
@@ -0,0 +1,5 @@
+DIST log4j-1.2.17.tar.gz 2864448 SHA256 a528e3771ee6234661b5eb0fa02e14faee89dfec38de94088c163ddf2a0a8663 SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8 WHIRLPOOL 1fc1b420e78bb56ca05282c81f12d5911f8966228194a8f5090a32cfa0403332b36589c7841b06c3bfd602f0f13cdf8342e678de01446e4260cffd8a57a6c175
+EBUILD log4j-1.2.17-r3.ebuild 1404 SHA256 fbcda20a91d3343bc27ca7f7d877b38630c5533991988b36500b19d84b9ee7a7 SHA512 55a5793ecfa5d112c7934926f94a318bef2033b6caa805ddd97658e58a0d4b24bacd7d48e19694a8972d99e61ac339bf5581bf50bf86953cd56e1b89c89a5914 WHIRLPOOL cd614c06307ae13658709927a6ec9e0c99ab2bac2d6ca57ab30181f11df37f05a41b2cb146641002a91aecd5028086e95ab36776d7675402efdd8f5e37b514c6
+MISC ChangeLog 4143 SHA256 631935921bdf9cb23e9bf71872f071c83d514af8a68b1b8d22bb2b5ff751daf2 SHA512 864ecf61fc93494bdc07a0e0dc231627b96869079349908172bef955a4884940ecaf5aa1f173d10a5efd7e85eb586d9cf79fcd0b66f7615b8d817dd32e2c1ae9 WHIRLPOOL 5f512940175fc721e4faa14f958fa27a14bd0b06389bbcc532718d6c3515723fc5514b3dcfc3463664edb20fc371618ed32d3614dd6e042ce1cae0ba9cf6a984
+MISC ChangeLog-2015 11819 SHA256 56cfb70fd35ce0819e14aa0f417d55460f566eae4c6b387915abf1f2a5aa7572 SHA512 b17a0ed9ed94ae7eeadae5557c2ff1fe1df4f98516ef757cfa7027009c91b54c50f1a3660cef21529caaa2866d8bce59800f1c958316f4376986f7073c8c3be6 WHIRLPOOL cba9b47f4252a0c037d16c1151b06832978d0c1a739893f01ac23922b046d8a23d2197f73fe712a590e28fc3543c37faa848c938d8bd995fc95daae8aee4b40a
+MISC metadata.xml 365 SHA256 3133f25387636baddf7fe9234fd05f9c25c9e6130f699a19b80c1d76facc2571 SHA512 0a4edf2fd6a980baad45c3282db2f991b7c806d8a36a06bed355a4491472b58e0e79f96c5dd2210d0ea51f5f4e83731165345c21b0b439bb2a36584b543b18a7 WHIRLPOOL ecc1518aca40dc0c4a22f533d676f66632638cb524780d6319c89e505c7c4c6113b7ffa0fe779315da9a4db2b478d3921fb8e9998a18140edce14069ac36938d
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..0707d2074e3b
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.17-r3.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 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"
+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/Manifest b/dev-java/logback/Manifest
new file mode 100644
index 000000000000..4b57e5b7a3da
--- /dev/null
+++ b/dev-java/logback/Manifest
@@ -0,0 +1,6 @@
+DIST logback-1.0.13-build.tar.bz2 2079 SHA256 eba80470d668ff30478d8ce060a97beaf1f2478db3785279e9c102c57ced52db SHA512 4d5a4385f427dbb6a0897459ab6d691c4b77460ea667d7e7a05e2f353730ef78ff712b1c0538e5c5f04fa4daf6605ca1da2dc1b9d0a35741192236b40e44d81e WHIRLPOOL 17554dc78acc7663475b52690c31d4be514f2c32cf0875894f42fb635e04292c4520735cb9187631baf14a13a56b33c678014b86cd07bf3413810f9e7559e887
+DIST logback-1.0.13.tar.gz 6989078 SHA256 4e5479b0d7f563e327cae486e4e3d7a1e1ec9aa950d7a0f60ea310db6223d5cd SHA512 974cdb6ba77c4654fa3f3bd6e7526eacfd6cf6369118e37436e441ac7742b0e98e4de49af4677cb0524b571639843059c6252751b2eeca58a39d6e9a12aa3814 WHIRLPOOL b7cf4be408499ae4f606dbce0a84fe0bb9e97c8aab88f097a8bdbfaaf44cb3fa035847213ed851520a1202f04b1915fc29d0af54c86ad7b2cb698c3891cf5d83
+EBUILD logback-1.0.13-r1.ebuild 1667 SHA256 7bf59aa14658f9bc5313b224b9c8d5829372b8c5b7ee450a961757653f31b257 SHA512 78b4c352e94833e7494186d0df5255bfe220e5407b2cd8bd40d3fbcc4aa73256365a385f53f81fe3b8134bd6e2fc8f07a5b0c3379167b16ec0d98b88540aa857 WHIRLPOOL 1d516bbfdc4cd4df3d07fbc57a22e7d219be2d8887433bdc70486ccf866096cfc9c00a3a06a00eabf98e4ae00084b78f5d3987b1aa32814a81f4389ed396a9e1
+MISC ChangeLog 3288 SHA256 0ea5e34b666b3ecde9da66cb4df1519a0d8fa4bd6f5d103b0d52ce1d0e8eaedb SHA512 c8d5e34b4d53504855c058f8228c628da9434291ed93928c8a01ff5b371fdb7c6c5425eb8ac6c7071d8d41638e2cdba630d2a873c9cb8581c9c6ab2aa72c3102 WHIRLPOOL 542dedb2e9e113320a92a134126b59a957c095dd6709f33ea5dea34aa09389c811a80fa0c81c64527ae0980d06461e4274690702dff5c382593447b5adb70fdd
+MISC ChangeLog-2015 572 SHA256 2b9eb45a2eb5d8e0d62db46c24308c3bd372fa31eadf4a33fd556561cf9127ad SHA512 67021c7715f1d6b9b39eb7e73d51f4b9e534c136b4a4a11f2880d80115f03e0fe1506a6d0eb5c3aa06f4944ca2ed00b80ce0b8247f48a9cc9047a8636f041674 WHIRLPOOL 5326facfec82209a02a2563d82812f489ad5be27f71280486d2159dd907b7a35d7643b2b00cb7e096cac6e8098ee73982435beb839e53e8667ae622cb53297a0
+MISC metadata.xml 309 SHA256 b27a13d17b865e5a5470b091112d2fb7fe5740841494acafd698f4537c37429c SHA512 f14e640a615329341196a8b003f1b12de45594ca6a5b2f1927f210ee94c619b586594227fc43a737c889b2036bfc80a6a11467775b657be853087339742d181a WHIRLPOOL 3d4b9c3789caf7f4210af881f79386b59c4610c152390f91555baa9be010b3c60ac081cf2021d2f79dd1d9ca86ff78ec437e5517e72f299b418376cb7a51b1c8
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..dd05a98cec6f
--- /dev/null
+++ b/dev-java/logback/logback-1.0.13-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 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-analyzers/Manifest b/dev-java/lucene-analyzers/Manifest
new file mode 100644
index 000000000000..edee3ede7cc3
--- /dev/null
+++ b/dev-java/lucene-analyzers/Manifest
@@ -0,0 +1,8 @@
+AUX manifest 489 SHA256 93388d2e6f6bdc08c6c44d2a53e8df7704da4e5fc69ef08365ccbd5c06fa8797 SHA512 959662da8f99cf3cb87bb81f6ca4df39eb7e76bfbb9d60eebc1bbf204dfb1beff48448d8ee5d3d2f8ecf8bf3eb01690a9a50b046850277609f3df77303b77c88 WHIRLPOOL e83017a4c1540457e8949f0e9c78ee77571ee073ba3f276444853412f843e17a9fcbeab34e189c1bb358031da62d32fd161fc82ab00fc75bacde7555280fab5e
+DIST lucene-1.9.1-src.tar.gz 6135056 SHA256 a06bd64ce779f3d4e4b539c280f6a882efb2fd8cba4ebbed02a2b6f92658524f SHA512 fb9f29e0d38d6525d7f6f86d339867a08bfe77ba18a023885a3ecb093d217840c274c767b6e1451f7c58135919c6159122756ebde4640a47420526502395a994 WHIRLPOOL c9d83447742d2d0a2a30e73eb6ed2659db9be77d8bba0de716bdcf73af4bbbf0bf789251a8657c72aed217bf2b2deecb0ce044cf38d1b9a835cf66c338e9d548
+DIST lucene-2.3.2-src.tar.gz 4602041 SHA256 d0cc4b8a40900bbb3243d2e9d9987e0ea0e7d359a2992222bc9acf296b208416 SHA512 42bf988b2eed45ea8d8a3523d9fcf4e384e0e9729a25a54e518a34faf960370a8f7d824f537df7155dc2b64ac11e1b30a8e1ea745a0e054c86722f6e8551360d WHIRLPOOL d8db8e2962624f11e35d69f49a4bf000ebec33a6b01d42e71b5e19cc160c0a29167f94d6b96bd9d45154aa7292469d31c502670bfd0c54e78d333c89e6f33c03
+EBUILD lucene-analyzers-1.9.1-r1.ebuild 788 SHA256 e18815f53618556a9bb37fdf09836630b14ec42beb7f8658f407527feab37773 SHA512 f166c5919c9cee07d790d015b788f1b2a424731cd9324ce540cb2b69fc1c805209a2b931946125a87b716eee6b03f802804c05d3b21f16239d21d09f4dd78d00 WHIRLPOOL f069f28808c072be7befb677b1e03709a8b5d8a742b0d0845c623ba22034a40f54818132ca8ab3df313c2194ae539dc1618098f428c6cd7f457c0b44edf38d17
+EBUILD lucene-analyzers-2.3.2.ebuild 770 SHA256 a15d44ff59f97447511d77f9f7cc95929aa75755326790a3724954a0f9902c31 SHA512 39292669332a857dcb770b5fa8db81afe031ef3faa1e9f2fb8ddb3b93e26b75a9c25e706d71ef5665aaa3cf413915962894d62d71d6a7604c5201c4ca3f0fb19 WHIRLPOOL ad335d1497282d1fadefb047c1fbf1f45030a1050ffb0a7845898a0b432222661c8d3abdf8e6249aafc78ceabd6a5ca3a761602bde24a72a8235629a56c602f1
+MISC ChangeLog 2732 SHA256 6896dda4709224ac7e96fd09cee5058e2e4422ed478f524ff7c7670a71e14b2c SHA512 38f5c9692c26aabd5cb245e0a3bc99018fb17553ca2986f19aa6c538ddd7c476d23c97c6ecea1d29f4a4c3ca645b53a4ac7879d2c3dda33215b50d4c752b7a79 WHIRLPOOL 30822c788c9b4f90b0a216389072986b8f677df670a95f3e8b0903c29e18fd941d67e13cab8c0191fc3283121d07503a7d65cf1fd3f568d5f48981fb20d3d473
+MISC ChangeLog-2015 1790 SHA256 f2148da382e0db2c583b17ff97373c1e2e9aa532b33f79fd9459e0ff04408b99 SHA512 6e12e2379247735b3731582db267be96d43923cb06ed572069e4c5fd3a0b58fa5578fd6dd0562ddc74b91ddb6bb5c2e8a4d521c9aec7866b6b0a7970f690a8e5 WHIRLPOOL 39d025932e6ea50397b4f5f2a89963cd2dc22d804bc485744847b657d6a1732dd0563b9588e226ae487b43d0dd4fede6506f6510fc87511e99a124728a6f7a7b
+MISC metadata.xml 455 SHA256 69900f6bd8c523c0e979a0aa4486b5b9debc5f07c85a7ca1d690e2e6332dac3c SHA512 41dd077d4e3c0771fdda58b3ea22ebe491e4c6ef342df8bcc144e09d2fbd60592c3077ce4763f238d1d8e3f53ac3bf2945da1ebcdda27841e02fbe5563f1226d WHIRLPOOL ccd9957338f63512b7d0b5f2c47e46f81a708b38463c7d66ccec0a74e725b6c5f0e115bcab5f0331edd03890041bf8e30a9cc449efa96c1fa8fe93e516fb0f2b
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..22bd9404eb83
--- /dev/null
+++ b/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd"
+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..b520e4342ea0
--- /dev/null
+++ b/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd ~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..8e7e40174f01
--- /dev/null
+++ b/dev-java/lucene/Manifest
@@ -0,0 +1,11 @@
+DIST lucene-1.4.3-src.tar.gz 768320 SHA256 62051daecebbae50c4e9d1c4d840f32fc58d85b0a5b370095c98e346c9ba1049 SHA512 426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf844449532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911 WHIRLPOOL dea750d36a33689fa46926271a5c3be62b011e327ce9fa671a480a7ff9ce4d430d678fbf6f82befd81510d574e303f71b627d15b438492a8a34d5f60b5569b95
+DIST lucene-2.4.1-src.tar.gz 5057003 SHA256 47ecc5e105717d356e0468433d1a60f84f620d79ff9f48a78ca4be6c349b6a10 SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e WHIRLPOOL e452450c1981724b133af16098b29a1bcc6bfdd1ce2785929599278c674fbe9c2863d35fe93ae78a361d790eda29da62b25613a4ee57fe3b49290dfd11ebd3be
+DIST lucene-3.5.0-src.tgz 39564076 SHA256 814dbfcd91b76522ae350817c306be8c4a72dfe8c809540be4b20209acfb9a27 SHA512 58846190ed0e8c0747e14cb46bf27255d0e4ee93aa0969cf16140713ce20c8fc3f451353437313f14416c92b7b6825d4ce3416d9c7ce4cb1854f31877c2af275 WHIRLPOOL ca2994a3de615d4f80f30f26f852ed6919830b81de666034997bdc65defdde2e0777f924d08f67ee7ca6467624a036305eb86c31fb0d7e59e0ffb57f3f69404f
+DIST lucene-3.6.2-src.tgz 32139784 SHA256 984bf1e82e32ecdc6c4ff7f582b5bd0a4c2bf68acd1d48bf6df74ad86c97ca8c SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965 WHIRLPOOL bfec9e7f937c75337b3582b7d5c4de5b954eb4d256f0218cbf36ea67bcb9fae8dc1e298c0e69e8168865ba21b75c271c29dd6b0adf40cae5f725f0b777b66f20
+EBUILD lucene-1.4.3-r3.ebuild 1069 SHA256 70d9c49926e337aebd10f0fd99b12eb2e8b769ce9636c92a4373e119c090c86b SHA512 e2110e99f3d724604e593c4d8f921c8a35ff4a91c20bf76a54276e6db24ce3287b9489c1a3b5b22750d4cf99ec744bd486d1e1e73d5f5b5f817c213062b658a7 WHIRLPOOL e6b7df9aa33ec39e4008401b7314a155c0d94e1bd99745b286ac83ceb143e91231acab9d551fc95a114b6426e8b524b87a0591b90d17918345149e87d81a6582
+EBUILD lucene-2.4.1-r1.ebuild 1737 SHA256 5b1cd7c30da92df4ff15dc419e33aefcc80731ec8a00ec25b7f90c1f576e1fe9 SHA512 33f9206b1b679d994e776ca035df5abf9411ceb7a807bc7c12963706168a223c40c2937bd7596255cce0028ab8979413badd73c3905484dcdd0db75d3b690724 WHIRLPOOL 6076631e1ea2eca5129b59da6d7d1704f35852ee4f865925ae5445f77b9363770a5044ae6aa3cf248ea0bad359e6c971db69585008230b4603d9d3e84f0becaa
+EBUILD lucene-3.5.0.ebuild 3269 SHA256 bd2d82299afc87f561adfe674b7ca837c91a744becf4be503c780aaa56505f47 SHA512 c4bb455bc497599433bdbe0c86643de91c428112ad68d72e7e5165c7f4848764771d15359481f91c303b2988b8289cee1c5d03101d7c851d76d702dc38eff8e9 WHIRLPOOL 389e079756fcb9337f71cd1ae679eda2786750d1295fa15538f90b0e57bef4e2ea1c5eb6b67fc787bead7635af86a47856521f981c38455f1f0b99e77a678c6e
+EBUILD lucene-3.6.2.ebuild 4233 SHA256 8202ff387d5ac49ff37ad021520ecc169c4c124a6d8a20d5ebac3fcc46c495bc SHA512 81fb07b209c67b604ab4b89095bb42ec98e6c52e887b37a75c9f33c34b3ccc0815b721530117766645d9d4c5ae8b60e875e06ab8a17c9c7cb26878ff1768c9ff WHIRLPOOL 56441a5d83d8a6c64ed477a5e8d93cc971ecaf9e17f943b1b78e153a247ef4236b1cc115576b0df4446e7f97c73af3894f1dc464e40d6d3e53a68040d490d2b5
+MISC ChangeLog 5322 SHA256 5cbc8f6bd12a70f104d65ce20a940204b4cf84d4024bca24c9419be72dbd7556 SHA512 12f9e0aa67ad8f944d4af3b9edd4f5b636a32d53418531dfe630a96296f1ac1f9434ab0d6c0f9a22db20b290b3215d0fe28c26271edefcf32479af52944044fb WHIRLPOOL 7156a5bac3289231f94ff34fc7a8927f4629a97da7ed86f9c9f73b2e4ec42cd2bce24994e1f053a6d7df2ecefff5ff26e4f58ee9c26e8dc6190ccb3ca419c937
+MISC ChangeLog-2015 14427 SHA256 b5bd2dc93ff3207874b8831f1152c29dff37007de64389560ff0c625f79c402f SHA512 cdf99b803407db3a34151fc1131e3bc78765fe74e89340ecdc2cb6548a086c45d1e7a980b347d1cc8546dcb713032f9360faedd77839b7b5bb2f58f7ae813930 WHIRLPOOL 2ccdcc85f7ad6046de3a1b6673a0c115b4d41b63d70b6640b3b9437a712da71402bb4bcaa39c84e4901a7dcf29da8ed1c9198efa4a23b0ada2b05dfcd09dfd04
+MISC metadata.xml 462 SHA256 bb13f9bb5e855a03a8da7ae04d4457ccd18721bc090c30d2a0116f9b89f1bf12 SHA512 611e91130a53366e58e7a628f1eb63317064eff25cc9921e3f4c0c649e7e140a5478667fed236da8c10c52d3c4a70cf0f3d87445d6e82f052910b6b35550036f WHIRLPOOL d662edf559a3ace1280c867b84142b88fb3bbd6bc88bf7b53962ce33e908ceff47dfdc29bfa540a212db364d5cbd273d1bd086db4dfd0a8a61695a7057260c8f
diff --git a/dev-java/lucene/lucene-1.4.3-r3.ebuild b/dev-java/lucene/lucene-1.4.3-r3.ebuild
new file mode 100644
index 000000000000..3d238b008570
--- /dev/null
+++ b/dev-java/lucene/lucene-1.4.3-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+JAVA_PKG_IUSE="doc examples source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="http://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
+LICENSE="Apache-1.1"
+SLOT="1"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		=dev-java/junit-3*
+		dev-java/ant-junit
+	)"
+RDEPEND=">=virtual/jdk-1.4"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}/lib" || die
+	rm -v *.jar || die
+}
+
+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() {
+	dodoc CHANGES.txt README.txt || die
+	java-pkg_newjar build/lucene-1.5-rc1-dev.jar
+
+	if use doc; then
+		dohtml -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-r1.ebuild b/dev-java/lucene/lucene-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..ae751585ba3d
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+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="http://lucene.apache.org"
+# when doing version bump, SRC_URI of the previous version should most probably
+# be changed to java/archive/ !
+SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-nodeps
+	dev-java/javacc
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.5"
+
+src_prepare() {
+	sed -i -e '/-Xmax/ d' common-build.xml
+}
+
+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-nodeps 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() {
+	dodoc CHANGES.txt README.txt || die
+	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
+		dohtml -r docs/* || die
+		# for the core and demo subdirs
+		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.ebuild b/dev-java/lucene/lucene-3.5.0.ebuild
new file mode 100644
index 000000000000..0a804109766c
--- /dev/null
+++ b/dev-java/lucene/lucene-3.5.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+#JAVA_PKG_DEBUG=1
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="http://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+LICENSE="Apache-2.0"
+SLOT="3.5"
+KEYWORDS="amd64 x86"
+IUSE=""
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-nodeps:0
+	dev-java/junit:4
+	dev-java/ant-junit: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
+	)"
+RDEPEND=">=virtual/jdk-1.5"
+
+#dev-java/javacc:0 - no longer needed, files are prebuilt
+
+java_prepare() {
+	#find -name "*.jar" -type f | xargs rm -v
+	sed -i \
+		-e '/-Xmax/ d' \
+		common-build.xml
+	# 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/
+	  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
+	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 ant-core ant-junit" ANT_TASKS="ant-junit" eant test-core
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt NOTICE.txt CHANGES.txt \
+	    JRE_VERSION_MIGRATION.txt|| die
+	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
+	if use contrib; then
+		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
+		dohtml -r docs/* || die
+		java-pkg_dohtml -r build/docs/api
+	fi
+	if use source; then
+	     java-pkg_dosrc src/java/org || die
+	  	 if use contrib; then
+	    	java-pkg_dosrc  contrib  || die
+	  	 fi
+	fi
+}
diff --git a/dev-java/lucene/lucene-3.6.2.ebuild b/dev-java/lucene/lucene-3.6.2.ebuild
new file mode 100644
index 000000000000..a760e4fc1978
--- /dev/null
+++ b/dev-java/lucene/lucene-3.6.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+#JAVA_PKG_DEBUG=1
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="http://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+LICENSE="Apache-2.0"
+SLOT="${PV:0:3}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND=">=virtual/jdk-1.5
+	contrib? (
+			  dev-java/commons-beanutils:1.7
+			  >=dev-java/commons-codec-1.6:0
+	          dev-java/commons-collections:0
+			  dev-java/commons-compress:0
+	          dev-java/commons-digester:0
+	          dev-java/commons-logging:0
+	          dev-java/jakarta-regexp:1.4
+	)"
+DEPEND="${RDEPEND}
+	dev-java/ant-nodeps:0
+	test? ( >=dev-java/junit-4.12:4
+			dev-java/hamcrest-core )
+	dev-java/ant-junit:0
+	>=dev-java/ant-ivy-2.2.0:2"
+
+#dev-java/javacc:0 - no longer needed, files are prebuilt
+
+java_prepare() {
+	#find -name "*.jar" -type f | xargs rm -v
+	sed -i \
+		-e '/-Xmax/ d' \
+		-e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
+		-e '/<ivy:retrieve/d' \
+		common-build.xml
+	mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib
+	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/
+	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/
+		# 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
+	einfo "Building main"
+	ANT_TASKS="none" eant -Dversion=${PV} \
+		-Dfailonjavadocwarning=false \
+		jar-core $(use_doc javadocs-core )
+	if use contrib ; then
+	  einfo "Building contrib"
+	 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 ant-core ant-junit" ANT_TASKS="ant-junit" eant test-core
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt NOTICE.txt CHANGES.txt \
+	    JRE_VERSION_MIGRATION.txt|| die
+	java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
+	if use contrib; then
+		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
+		dohtml -r docs/* || die
+		java-pkg_dohtml -r build/docs/api
+	fi
+	if use source; then
+	     java-pkg_dosrc core/src/java/org || die
+	  	 if use contrib; then
+	    	java-pkg_dosrc  contrib  || die
+	  	 fi
+	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/Manifest b/dev-java/lzma/Manifest
new file mode 100644
index 000000000000..cd63fa0106ac
--- /dev/null
+++ b/dev-java/lzma/Manifest
@@ -0,0 +1,5 @@
+DIST lzma918.tar.bz2 533322 SHA256 fc5ec0f356ad6cc54f39826564d036c444e495fcce4d8b876dc2697dbef2684c SHA512 fa32920d5c45e80c6d029fa1244154e7ae2a2db676e9b115359e955bec829f4cffa6cd8297cae388aca540fc2974dfced4ce284fb351992d7b4a337292da3803 WHIRLPOOL e6aa0f6929c5d422c0dc49c2981ea17cbe2c90fa55c2856ca512d716730cb813ba63d5c7313670aac3073074410dad567f4d854d2cd45ea02309e0c64337dd17
+EBUILD lzma-9.18.ebuild 502 SHA256 8177873720a52b747f03a66b3393af8f029bb912e06c6f935d8e6a6e90bd3bb5 SHA512 9fe23d62c935779701e838be4495827cf0cf8dfd94b25f4724ac41384c011259bdc95fc35259543da06c4c89bdb32242e8ca0efd9e19a3bbeefc30fa1b6e8938 WHIRLPOOL 2d984287042cb8f1cde7fc370c520e5706d9d0576e85e8824d5a9161e1423f82e5dfbc2f97f4793adc28d5836a2013fac0e1e7f847e8a02c4f08253b69ed3b7f
+MISC ChangeLog 3101 SHA256 c5e3d65e5a00aeb02aff9cda274bb9c4246095f77b84119ef1650be0d74a196b SHA512 9b53ab8cef4ff8c80c5fd02a00bc46259009447497cd262e842602ccaba7954928f404e4228294c459039a6056c3620e78dfbc62cc120ec56f0fadaad713d81b WHIRLPOOL a9a31a101e7fec95751eb656f62d4a34d19fe71572987467a829df69cb366d8f16650bbb89ab4c00c6b039d04e929658a160ff7a34f576bd0241332da8d24281
+MISC ChangeLog-2015 829 SHA256 03f1f83da923096c9f408d702a8824804c6318ce19d0c431ba7e46c83a15ae23 SHA512 15417efebe1eeb99450450c928c10b43ba4074fc2218fa15793f5aa3c1c35a7eed2e714c4be9175312767e77e6c5bde35756520887fae2d139a582bf55cbf005 WHIRLPOOL 5923418c8aaa288d0693bdb786efd7c5d3322ad2a8d7138acb36ec87c458d3425e354b63c4f96f74cee0ab9b9d33913558e65bccb2b16743e019c13a719efaaf
+MISC metadata.xml 431 SHA256 5c660d3c478fa0be8d091912b1f7e2296d9a40b60035dd8003087560edb846b0 SHA512 7c4883d6b59a9494a79dc774c5006de6b3a6b53ffbaab9e8f6fe8224083a800c800b80619e49b3214d9711ab22db53013109c54f4768c472c6f274302cc19e9f WHIRLPOOL 4a3455edaf1a7ad92a60a1a3ddbc49b1f1ff3a5493ffe2c28f0ccd08d479803772adb3e9678984e18b01ae83f999c8e5fcb75ba2700907121d5f76aecc1d36ec
diff --git a/dev-java/lzma/lzma-9.18.ebuild b/dev-java/lzma/lzma-9.18.ebuild
new file mode 100644
index 000000000000..b78809bc5e67
--- /dev/null
+++ b/dev-java/lzma/lzma-9.18.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="Java code for LZMA compression and decompression"
+HOMEPAGE="http://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/Manifest b/dev-java/lzmajio/Manifest
new file mode 100644
index 000000000000..697d56c259b4
--- /dev/null
+++ b/dev-java/lzmajio/Manifest
@@ -0,0 +1,5 @@
+DIST lzmajio-0.95.tar.gz 20790 SHA256 d5856cad5909cfb2d808e64478904479905896df9b7433ee2276b527e4f8c04d SHA512 65736a66ec8f5eb63688edda912718f4e9b0518c68b0b1eed3df26e7b6bb15728024c637b4cf40f6ab52168c913cce91bd7cafefca7515e0f3e386738cedc6e5 WHIRLPOOL 13bef2b1eada5f02f6178af5ebb4634a328ceb5d5ac373d22d7b007aa4862c0525929878b9a24b01eb51889f906160493e7e7c51d9ec25f1ce6c83d23ee3097b
+EBUILD lzmajio-0.95-r1.ebuild 644 SHA256 a68595a1ea041154241377d98dbff829e591e7c4cc9a55270d6b011db39ed93a SHA512 3554e864b71be0267dae3a18dffef1efd70fd511873d3f96bf07c5475e6a1bc5632d3df1ec8f321bf087abc2169a48e7407d38f75f0a2267bd3c76f5965afa9e WHIRLPOOL 17c5f4df7f4e3c34a13b837ba6e38f85946ba8b9e301385af5125892520d7003c25c47549b76971820c407cdb893a890e20117750b1552241644669bc0b9acc6
+MISC ChangeLog 3648 SHA256 e5e18a98aff269100ce34bc765ef7753acac2f5d14d2bee7d567ab78ce3bdfea SHA512 01964173e0b575e1e2c9a49c4d6c75f6e2737a0045776c32ad6f3b96a3d2b6c625b14241185cceaad11b2ade6b1ba1d301a97d4e53de138fb76ed173a84dbafd WHIRLPOOL 115d82acd63de0fd5e886a6f3ec8d72024de052e563a5af0d01cdb1f5d48f480da4dd60260dd7fdf29e38c7ac29c29deb0b3450e9a1c954e59646f5a4d03360a
+MISC ChangeLog-2015 1390 SHA256 290a683d0a041a9e51aed046d9285b996698abd13f1ed914eb9383b157ea6270 SHA512 79afc2a1c584ad31e8afecde27c4d5ec0ee8edc701a0f1a95e0644987b68cc3eea686c4e6a8531a7dc8cb719215f1bb332a4404bf43bb76f511d9b3e28e6673c WHIRLPOOL ee770992ea5c89271eec11d80f1163102c3bc82c1932d8bc99986bb6cc45a311b9ba7fdd74f5b56730343e1dea2a04644b14bcd224b61f6a78aa0a4df81ac677
+MISC metadata.xml 354 SHA256 d10fba499bb01a933f07135a8c2101b15955d7c8ae79b53f9916f697c4e3eecc SHA512 75420fb1c8b1ebafdc3e237f34d2c70503166f248eeba6356d9bc703ca4c89a6dc2e28dd67b29fffe359f3b35bbc09539ade4f3c4b968fa1b76fb6481fd849dc WHIRLPOOL b7f3617e79d02acb08bca826c839864ce5e77a0ae939ab67592da43b439919ed26b54fd40836b4c29d1720923d2a523ae9a41711d05d93ab266144de91f6b8be
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..a58472f400d9
--- /dev/null
+++ b/dev-java/lzmajio/lzmajio-0.95-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="LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders"
+HOMEPAGE="http://contrapunctus.net/league/haques/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/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/Manifest b/dev-java/matrix-toolkits-java/Manifest
new file mode 100644
index 000000000000..67f7376cec34
--- /dev/null
+++ b/dev-java/matrix-toolkits-java/Manifest
@@ -0,0 +1,5 @@
+DIST mtj-0.9.12.zip 2576775 SHA256 19bd4b710fd7a3ce798e7e0cc336cdc0f77b80e67d9cffff556bfe5275058bcf SHA512 526793d02d1a5ff7e8b9a2fb1c8fa570a88f96fcb4926623bae6cfdc31f206dc6103efa4e14a29f7b600ed2e1eba516f12c8da7e749983dd6f75a1a4c6676f4d WHIRLPOOL 4a32721aeca6466d46ec7030ecd927576d109c20a4d2ffdf2ff4b9e1e0ee0db643c6631dad88b81e66f403e467ada077b9be3351735f9f4b21aa9ac39d838b08
+EBUILD matrix-toolkits-java-0.9.12.ebuild 1158 SHA256 71440d1d79d4f0cfdfd5246fde53651cd312a6a8f374c97c9406e64151d2a199 SHA512 c5926c67e2774c3bd2a07147ffefe68389937ec1ec25559e59a9817d6fd0d012735e0e310791fcb5494ab071de841468c266815b49ae5ecc17ec7aa4ef854c22 WHIRLPOOL 534a1459066e3c19dd2d23a535d02b858ed4f51c1f10d48f99b6503432fa57832232df3b6e4a665d2f3d68f402a4c2a68388e4d4ceb029595db0373cfbd838bd
+MISC ChangeLog 3147 SHA256 762770c738df54d82b7d4d455f80325321459a741ad71c7047430cdf9828eea2 SHA512 ddc22c2ca28a398695ebf8ce2cc10767febfb464f2d7e3ee5b93dd1683cf299e4d8380ba6091e677e4fc62d4669519af25a2aa29415e8f8d69b23a03902a6235 WHIRLPOOL c62228afc3e1626ef95fbb56c8c35a003d9ac8691d6454d865e2af82ea99e91a89147fdb89dad6bf293e161952556f87619dc0d6c1c8071af48764afc54c6ced
+MISC ChangeLog-2015 703 SHA256 2c1812811518ad9659daa7b46db9ad937c52f5b8dec4463fcc3fc7654b1d82f8 SHA512 be6af0a72e79ba0fea28800f6df4805b6eacaa25be81f6b9cae884516eba4bd2cf36b9286af568ddc51bdae7b1629f93bdbb0ce6f0a97eaabb3991e058458078 WHIRLPOOL 1d2f7d6bc0c3ae8eecb63dfd9909e886a53d9d3314a0080ad7b613a0800d6df8a36a99bd75eac928db4cb99bf689845169b6c0de4ef345212355d33139de611a
+MISC metadata.xml 405 SHA256 2bd8e748b09c5d08660d85416b0c3571c2570ad35f55b6da535eeda866996d56 SHA512 6f4bcbfe1ce195a54a8a9f8d51e02ee26b65a2b1b1391bfe6ae80b519728825d48621510881279d5b09587fdd72d8949fc806d1df55933eccef86f5ad02b176a WHIRLPOOL 3bf6946052e839b6a81de09bfece4f9a61262360cd04f67441424a74ef63acb7588d3669d63578b7ee0dea4c9bc1b98183078edbacfb4fd81c90a7b69a305c30
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/Manifest b/dev-java/maven-bin/Manifest
new file mode 100644
index 000000000000..072d140ba299
--- /dev/null
+++ b/dev-java/maven-bin/Manifest
@@ -0,0 +1,20 @@
+AUX maven 5108 SHA256 ddce53375271fd6e9515350083fd4c97ae86213e5bdb9984faf770ccdac1ff10 SHA512 91901a50153e148b2799b8a1298b4ef26ac07af4b7bbb3ae5c76edccdc8efe41b5613ffd78bd1dd917a78fae8086cdbe737096ff2d4912d0333fff206026dd0b WHIRLPOOL 6f281693bcf3201e9aa245494dd4dec6b623adf19bf89a44461eadb27e6747c590cebe7c73b5f16b77f5eaa04991236ce6820cd0e5980d7e109f110338c6045c
+DIST apache-maven-2.0.11-bin.tar.bz2 2104711 SHA256 f8e91b43def9b78d01f0ad8374644aa737365144dea04a97f9503ac0011ad39c SHA512 829a583e44ea997576cb0949d74f95e6557069489329523c28c44b546f07cd9487a75f4326d7dc0a098a9755fd52630f2ee27a60daf35006eb48d6af250f84de WHIRLPOOL 5e467ee3f35ea7bb4a7d396e61c3f163702d1cc02d7daf4208b475e3d28be5e0d6d6e0a15ebc1a6d2d6d9697047562064c5309eec1491a3837067a71bcf81b42
+DIST apache-maven-2.2.1-bin.tar.bz2 2839688 SHA256 a8d819f78bec0505f5773962fc50117f0c5db4a69c7207d0c27cabffc950939f SHA512 ffbf74b6b51616dcd87252973ddd776f13861fece7cd25df9cfba4bda1d8dd574772cb5d37ac7ed97ef8b93b507939d428d47b9b81742c801c7958b9fd6188e7 WHIRLPOOL 17cdba09856646acf5a37c252c6dcc200bae6eb16ee07ee6620bdee832b452a3a1db8d61289cff3f849f5c0d57c673cfc4749e220dc52b2b5ec50d4d9cd1062a
+DIST apache-maven-3.0.4-bin.tar.gz 4873043 SHA256 d35a876034c08cb7e20ea2fbcf168bcad4dff5801abad82d48055517513faa2f SHA512 d6935daff3b80ed6e40ee0acb4f269b4b16e63bc29b792316599a9847f1b33d9309d3c399cdb170710714a1d150957eedc909754de8f8a77d87bd20a0abcb36c WHIRLPOOL f1e15af0bc0f942a8c4e435fa2cde57221e3ef8f86d43197dd4486812b115b684ad8e0ebf5ba3f2f0ad9d0ae0c5f0b0ac26a10e5e170fffe2d47bb77522c4e68
+DIST apache-maven-3.1.1-bin.tar.gz 5494427 SHA256 077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1 WHIRLPOOL 60aa84a2f6441deb005c41e00b4dbc790f8679d5387ffd6602d8008206718655784822816c9a9898cb9b09c75bb3b3d824c71150e4ac747bd0eb1dabe2bacdcd
+DIST apache-maven-3.2.5-bin.tar.gz 7956528 SHA256 8c190264bdf591ff9f1268dc0ad940a2726f9e958e367716a09b8aaa7e74a755 SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5 WHIRLPOOL 79feb96c42dfd2235b0513ce50cf3d684224dcbccb290d2d80565648a6b30af8961b2e3d02d38818ca5c89386c5a25f2a8025e696279a339844535c2d2733f96
+DIST apache-maven-3.3.3-bin.tar.gz 8042383 SHA256 3a8dc4a12ab9f3607a1a2097bbab0150c947ad6719d8f1bb6d5b47d0fb0c4779 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5 WHIRLPOOL a3bbce5c92878dbf58f9e63a18cefbb8de90fa4d91ec6ac60cee01b684891a9f757ece5f62659b7838ea347e0d27b8801c10b0e4bf1384446607b60d46a1bf9e
+DIST apache-maven-3.3.9-bin.tar.gz 8491533 SHA256 6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0 WHIRLPOOL a17d87711a925d502bb05d09166708b50304942aace82a6ed69dd9f73938590f1cf488eb4b9fb10f94250d804e6342d264f6a9407218fe9b38c242c06375b28b
+DIST maven-1.1.tar.gz 7625074 SHA256 6913083d2db1d32ee5e18db7280be0f8ce36224aba3595690e85054f2ad5e731 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0 WHIRLPOOL 2137afc57306d840d04a38a09f5b40d946d10f8216ebff4a3a0a385f475316266339f4b8d07b461a2004d487c6b74a68fc2db5f38cb831ed0947259f1cd08d48
+EBUILD maven-bin-1.1-r3.ebuild 943 SHA256 aceeb53b9b3b09a292681fbd6e6a9dc11dc95ca1fd9fabdf4247a6592ecba69d SHA512 cfde3cb81d60eca2ff500228baf7aa5aaffbaa333d8364f05143811aee48b263dc3df8f5f2764bd486f04271f916e52250b7ec019fa80792527a4ca2c591e110 WHIRLPOOL 9bfbc6f085b38b84cc29fb78adacb24eb98d12185831a8cf07c9874281e2a2bc91de430e3d89e3f0562cf12427fc2012d52d5bb31bfb6b70574d94892e6304e8
+EBUILD maven-bin-2.0.11-r2.ebuild 1198 SHA256 e18151523c2dafc7b66d8922c59638f9e757ac9192a53d19a28dff9f7ba01004 SHA512 87e71fab63238961ab03f2509c1b1a7f19e5d027072d1c48c8e4a0b726a15e5e502e1f5afbe19fb95a2159c48ce88e742f8266bbf154ddaebdeeb4cb82379433 WHIRLPOOL 239376399a3694754af2d16443e64cb18e61950f91c3be43b9889518f1bf2ad7b3a008588db5011ae9d8a8ad0b0c0a8fb2f7384f28d667db906de96b04ebaf65
+EBUILD maven-bin-2.2.1-r2.ebuild 1198 SHA256 a99026bdbd7d42614526e133d801a26f26d992155e2ecd0e009b7630f48d1bd4 SHA512 81db5d6d926eba62e7104a832c50799474e7a1ff2aeda48c9f0d37cb9d5649159881afecc68850538f0f946c7de6559faf6fbe728b9e1199f4a55c9cc5c5cfdf WHIRLPOOL 07cdc1af35784c858344ff39cbe48d131ff6bd2a93d041d8b6d65f734c6b828b170f04743b3013212a3d9cc36bd214e6b4e43e2bf65ed011ca1be3188e7695a9
+EBUILD maven-bin-3.0.4-r1.ebuild 1275 SHA256 9148bf0dd91efd01c963c5c0d354080253cf2a3c0e7054689ce24a11956291e2 SHA512 962818f9a4762a4422498d67ee878d2e2cf33f1372192e4d8c1becae1357daef156a6588a08e7b7d43190b914d9b6d341a7cac61ce4161fd9ca1b35a1eb74fd9 WHIRLPOOL faca75d85874fc3dded3ae7f501848982d704ff3ea72e711f8744829482e9ca5f7e097a6df3fc8ebfa35c543cc8cb86bc9aae6b22658c4a1c261f21ee58ab927
+EBUILD maven-bin-3.1.1.ebuild 2276 SHA256 8d24be8c77353667aff18f99efaff9811abbc57db9a8dca63b3e527b339cd7a7 SHA512 42935864e2af19b20851fdada4ba22562a995fca5bcc63e178c0771ff5d6d9560806cb288ddf9663b1da12d1242627cf9c7903ad8acef32174b2848b4527a096 WHIRLPOOL c69099095ff9464a6b16c312d249344930389fc29315ac775bf8f16ec8cb64a1166c6510f9f9155e5e7f850def468b88e330b812ac6e3f6dfb145eca4b0e532e
+EBUILD maven-bin-3.2.5.ebuild 2283 SHA256 2b537a21d8c56b3b160b0ce5fd49fd40045483cc9fd40156168b7a30a27f0509 SHA512 2a8e8145a454c2f88cf4d48c9cfc2a2cd7689f38f3ce53ffb6d579523aed92d04fe1c3368d8da1035c9ccff8c77142db25dd8fdb6a0d5a9682daf733bd6da71e WHIRLPOOL 90f3d8e37906bbd5f9e5d63db06786148119d28008a2384966691fb34aeca2aa455870a711c483fd29485689d64c7ff0f4b94f6e251d6e6ef8c00d40f07a19ca
+EBUILD maven-bin-3.3.3-r1.ebuild 2220 SHA256 c3c0c60d4b0afe428cfa9fd9389aa58168f4ec676198bc28a15c4716694d97f5 SHA512 188beb36be65bc2699fee7ed75407399ecd66e13791242cb12de9a1c18a0c8a233018f5e86d779e597d6a7f7c0e7001a726b437a65c1e51bfba69af57a188683 WHIRLPOOL 9e2c36c849ae6962b41b95aaaed3d0ae7a51079e221f47b05da3d6b98536649874b69ee616c7598f4ced8519488eae813fec53ccb29c59cc0681a82b635c95b5
+EBUILD maven-bin-3.3.9.ebuild 2222 SHA256 3f5330df7a0f03678120d313f607875029d720390b3187cb82f420ecf381fa04 SHA512 5ed211c1017f9079251f7888c9920d3bf37fe2d9be680f0d7dbc142da340da6467b328d3972c6d69cf26eb57f2e80d084f25344e02174953aa886f76b6a3a8ef WHIRLPOOL 8d4f690f911029c601ae46fc9454f91d037e74b261582ca05ad664ae678204e28d6fec08f4bf18d6f1f5f43f83eea18d89694a282d195a9f080acbc413e04cf2
+MISC ChangeLog 5964 SHA256 e1c9461e7c566c834003cd6f7e2ddc766deabd8c405a099795944283a4d0c332 SHA512 1425e21129f773c58895135b464cf4ed728dd2331f5b3ef029bc378a81e21ea8a2c7688d6def4e4f04691e44a89b4b125111cc447563ac6b1cda027c26bbd1da WHIRLPOOL 6a0b7c559a6487ca55faabb8250bba07436bce2cf218dc5f40ab01f2d2654ae85c839c8dd8d35d9a12fb5947ab0f99bc2feb74b4df6515a2fbef81fcd2ee8575
+MISC ChangeLog-2015 17454 SHA256 4b24beda23c5e62882fe189fbe6011d6aa3bef7dc88924873a46663032eca97f SHA512 3b8f5b181e78d89eee0ea8a72674aede4b33738420c6edbc936bbe52dfbdeb4bd4ddcdec066017a6a0552d5aea074b3c3e3c71dc810b075dd17c656176bf2524 WHIRLPOOL 0bf3d95106459cfdd0f88ac022bfc21ca696dc4d0ab9bc7ec18e28464b022fdb9c7b35f527a50581b0b63a5e96c3ad45524f9d475ca924275d3c986151db12c9
+MISC metadata.xml 610 SHA256 dca94e44ca19f3b145f69e2aadb51e59d03b459d815481caf0bfc133c6d41980 SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083 WHIRLPOOL d820d91b274003c53c4348ede269df7ba304b3bad514e14458f1222b7ca44f9824c9e7b373a3122630c8281033f2f1d45e81c28faa1bb8513c923b01b1021191
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/Manifest b/dev-java/maven-hawtjni-plugin/Manifest
new file mode 100644
index 000000000000..c072a0a93a86
--- /dev/null
+++ b/dev-java/maven-hawtjni-plugin/Manifest
@@ -0,0 +1,4 @@
+DIST hawtjni-project-1.11.tar.gz 1603735 SHA256 4f8665931329effd0d0b3444e20d2c5d72b01640da2f180f05f26e79f0692fed SHA512 0fafe29dd058eee07e9c26179b7605cc092254199ccb913064002c882e7ab55ecc4045dd2baab99bbc46d6bf28a9f4f2108c210616e3a9c4a92582c65e6de4e4 WHIRLPOOL 60bdab794130fa85aa2b27da0bb6d1684793b45575425dcc06e413426652703b673a1c735c3c4c5c12056bbc2005316c00d13cc9c46ff362579b172a564ddccb
+EBUILD maven-hawtjni-plugin-1.11.ebuild 672 SHA256 7c05a48ef7a923f8c87a1f88f043f17f03c1c669ca7045a784418ff91438bd2a SHA512 6eef7c1cefa80c1eb7411c8c0d799e5d9562598bf3f84f32d4cdba102df0a016581dc76f863181784fd49b75bc6ad0f4d4712273c5145b60c7b73941165e7c7b WHIRLPOOL 2b883ed5af30418fa1ab49ace1d539d5ba4e6bec762b98fb8df56ba77e1bb1fd05dabcf5f48717108fbb643399a1eefff318ee7a9f2a7a7e6d21f4ec1d5f3a0e
+MISC ChangeLog 566 SHA256 3a7798ba2d1ea8c0739b65fbafa071a1938e3cbad8a6ae48828c40cecc94184b SHA512 be7f565035bf657b2d76b6e0f01825f9fedbb3881efcd593575f4e545d864d4991fe4eb962582b359a17dddf546ee4bb73bcc2498a5bb2d54240f7c55903fa1f WHIRLPOOL 09e4503c53ed1c6cb7324274d578df8ff3265afda096ee4a0e91ddfe5cfcc905146e02c3beba208111f432a50a9f53df183032e07e6a5bf41351474f625183a5
+MISC metadata.xml 319 SHA256 98165dbf9c506110f8fa2c287ec73bec50722b42315da9e87d278ff08a2e18a6 SHA512 898070ae9d50aff49b3a7273149ee1cf57fb770acb71dbe57c40bc53a10ff5b07d1a461c7a88d361ddcbf15863c228db494092119d84c1b8b0439b9e5dfb2e74 WHIRLPOOL 842b932020c5d21e7fea3f32e3910972ef564b4a5eaea101af613603ab2945fab01b7d7e49d14d6cb4543be579524627bfc485265fd0b643e4addb3a729ca3fe
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/Manifest b/dev-java/mchange-commons/Manifest
new file mode 100644
index 000000000000..a809f9b0b348
--- /dev/null
+++ b/dev-java/mchange-commons/Manifest
@@ -0,0 +1,4 @@
+DIST mchange-commons-java-0.2.10.zip 773768 SHA256 ae3f9d3d12d517d19036a8ede709d9df5e158733aa79e8276e800b508ee278ca SHA512 8196cd4476c3dea55355ba11cc2f801602235de3a977d75eff3835dacaf612647adc0e595e0bf77a6313adcd718d143d08ecf6fd5aa0e6638a419cf1f107c3a9 WHIRLPOOL 8c1f1501001bf94eff17493d0a3efaf0f844381e16c608d4c009d687de4597eef7ad47642b7ae58ef972347ebe6470ebc635ab01483b4b5b5ee7aecab57ecfcf
+EBUILD mchange-commons-0.2.10.ebuild 775 SHA256 7e98c1d0eb4e203746cf53058b83ae85f84b9a8fb2b8762e8434fcd6e42c052a SHA512 53445826420dbfbfbe553f3e6460c58012b9a79ee0fd28173e79c4ce4ff1c571947133b56e4a71159b69ca868cd5837a3b1585426064b520b649523460411584 WHIRLPOOL 13ac0990d4208d07667b8e557b93ae898b929fc698e52959bd7150797a7037aacecbac49ba4db7d20dfb45289e6d9171eafc866879633163a6344f9dbaad4763
+MISC ChangeLog 1829 SHA256 1410009d172e353e333b5919217bb354a7a106e182053c7903b3258f1260db7e SHA512 86575b05f0dd8efbeac69fe6ef47d6350b9cad0ca4395aae9b8e6ff4324b74b13bd2ebd9972577fce9b0a8f4b35f7652afd839e72c9d33960be5a40c8b2f5dc3 WHIRLPOOL e2dfc9f9c556786674e0c6dddc0e6e59e96531704331a608db5cd307f37bc1b79b61e90b282455fafe2083ce5cd7d6cc5567b015e36d70a10e35269657609812
+MISC metadata.xml 340 SHA256 d70b45f9c028f91fdccd506268ab7eb212583030126c73eca174c144cc60dac8 SHA512 28af226bb9e6dff2c469c0e6b46802c64abd139826d5117ab8b1ebdfb6a94f8b5e295c85cbb36048c7049bb0d77b10313aad4a3038d2a7b51c6ff12c81d799a5 WHIRLPOOL d3d63fb35f9b69ff4fc9c93615ce8533b1b789d01dbfa74c53e4fd01d1241c1cd374dd5fc9fdc1c0cf10225e345f93108bbfd8165840a74454ca94d59042260c
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/Manifest b/dev-java/mersennetwister/Manifest
new file mode 100644
index 000000000000..311cfebf2363
--- /dev/null
+++ b/dev-java/mersennetwister/Manifest
@@ -0,0 +1,5 @@
+DIST mersennetwister-0_pre23765.tar.bz2 4974 SHA256 781fb0614aaae4e5d5f7c8cb23468248564714e44a7dae357b5a2d450027f9eb SHA512 3c3b970da3ddc3a0b7fda299916781551867b6ce3c8ecb1f89670783d4d51e2681b07c6b2dfc15e11a03c8b949f4880b0bf1511dde2cb4ad0600688809d38e46 WHIRLPOOL 082b6ffa9b8aeb02dc37393749632a65568296048f2cb7e572e2c8bac1d110d64f6d57b92c4928a46435d66436777ec57535c618302927218df6ef329957d3ae
+EBUILD mersennetwister-0_pre23765-r1.ebuild 485 SHA256 f694ffd7830383a5e7a11a43b84fa13ae2f08c96f55b3b9ea21146b8073479ff SHA512 8793bfbed4be02fda5edc8455e544ba4eafec8ab3a6af29e1cf39672271b92db4a3520f6833a278100e05ebe9a13de2bc484717a240db5deae85f061345925f3 WHIRLPOOL e9be2c5492977f6cea1e96829ab830aba7cb9f5b1b094b48478ae4987ed047919ab3243a3358034d09056f3cc729a35db3cf9ab26dd8f6dd2ee8411fda3fc41d
+MISC ChangeLog 3409 SHA256 cfac65a41ba69dc3f0224ecaae4ca46cb4e9be83cf0f25474bc31bb127176451 SHA512 d5dbdf7e488e1262c2dbd973d028ad48534334929f2ec5e9f364346fd07fef894d31457c4c035d069efbfde415d1140ce7fb91cc5c2d9deed9b90fabdea76410 WHIRLPOOL 659ee3448d7bd0123c757c8402354b925d06d8eb7b322e644a5bd88da881b7ed3c6207cbd59da2160b0d49524cba6fe46b095e9da1b3bd7cd59e0ec7f9e1e131
+MISC ChangeLog-2015 660 SHA256 4f656c41479ae3e2368048987096eec663f4cebdc389b3bdd46f4d22253d59d6 SHA512 e6db8cee57f960aa5fe2e91392be091edcbc6e19b5c827ae8eeeee9edc410a66af10e18a309ef277438b736d21f7de105efa7a84fcd6a11c762af816257aef93 WHIRLPOOL e4d4eb6803d76af5b0883bbcea27fda9d11d817a2419bab1261ab2a97fea9313bea298b28bf35d09a5d5439409ca2cf968c2351dfb3aae233d0dc21299064fb4
+MISC metadata.xml 352 SHA256 8c0d6e0f8946242af2c5b2513ca0b18d3408d428e6c84f63a93ee2dffd857194 SHA512 a3c6ce3cd97b39644238700277dd416e1ee79df975184de3429810ca4d77f7160112adef6a9b56f77243a003187f6642798b278cf8501d55da766ccfbaa861cf WHIRLPOOL 8a92408c9175845d852584035d1f33f0f032c5457ce8809d5f6c88710577ae6c958d55d2ab412d703e680d168fff0b00a41236472f8a866418a6d05b99335d57
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/Manifest b/dev-java/metadata-extractor/Manifest
new file mode 100644
index 000000000000..1e4b9ecc972a
--- /dev/null
+++ b/dev-java/metadata-extractor/Manifest
@@ -0,0 +1,5 @@
+DIST metadata-extractor-2.8.1.tar.gz 3132397 SHA256 0d734971e9896709fb9e11406cefbeaa0cf11d57fa7dca6b02acaf92a2a686fd SHA512 4e9fe88be4112fbf9ce481e7fd3b3a7c9544d1d5b1ebd646d2c6e2a2a1fe2d53a4b80ab859fe5e277c3e72f5e035aa46d7af7a953a182f5b8215edf9cde99974 WHIRLPOOL bc296ebe64b82ec9485f364e287139369bb1da5f98eab47db5014d0f1d263378d0341383da95bda3efa5fba6c81c3ebb9c30a3586aa7277ec893d2ad6ac5e52f
+EBUILD metadata-extractor-2.8.1.ebuild 1179 SHA256 b97c87e0c9afe3100d7d683b8da13fda243369687170e0d9adeeaf15f83fe557 SHA512 86edd91c93b17f35fb6e62f4fe04a69f27cce096d0470c46be2f3bc02c296104cc80703cd4feb40c1b38d2327ed962076e0a9ddae7a094770b1a9a095ce93aab WHIRLPOOL 9d2c9c9a008fe3002f2739061a56a15f424ee9c066cb2a9c57a5657f00bdc7f83ab9a5898f8485f70a7f761e466a6c271c4361ab62f6f234a3f2e638bcde35fc
+MISC ChangeLog 3491 SHA256 f9aa02d0637c09f9efd7d612a6f49d5d8e59fe124d6f69122785c46031962dcb SHA512 f2648ce70155222c1659180a6beec4600cc2101cfc21d9be65fad8687a78f7316eb33e71e276bae0a1998d15a3949bf0e967d783688e0345dcf01e9e30dab3cd WHIRLPOOL 4515e15008ae0c3d998c7e0d7fd895d89f8202e41f7e7afade3c4607e418fc07b529f2e71c6a681db72072c9a0e28f897e5eeb5a0dc9dc4d3aa04c4a7224cff4
+MISC ChangeLog-2015 2622 SHA256 a98a432afc33015b707c185dea0df0a0110617a5f821faea2ce85f191bd8553e SHA512 1ef656c925896fa7f488d11c83c2ca7bdc5ab78d19a64f6e40db79af2b14fe2be0b0f0c8918dcf66b359dcf483f017f0979606dc0d3a3f58d3f848244387c8d2 WHIRLPOOL 5c304157e1a482a9eed3890a6e373be3036464ff32e2125090426eefc80d76bba5450f3930cb24a612e5f33d29e9a282c14f086ea4cd62fad015ebad921f76f4
+MISC metadata.xml 748 SHA256 0fde4b02f4e3243963f3b5bf88f34d37bdf7466739647c28fd547a0ac54f883f SHA512 d92645cf069566265332a113fa053a8ca33ae6146a79adabae34714294a11ed030008945a6a7704b103b5c253241a191e0071794d4cc87732becab772d0449a1 WHIRLPOOL ce3fb0edf3f2d4e35eaaa7ed533539a6fa7dd60b8767d4185ced45f26e062d32981e5c16de3491f1747d32738fedc9c6feb2eccd577ab490659edbcfc7fe0416
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..3d82341578d3
--- /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/Manifest b/dev-java/metainf-services/Manifest
new file mode 100644
index 000000000000..33bccf58f18d
--- /dev/null
+++ b/dev-java/metainf-services/Manifest
@@ -0,0 +1,9 @@
+AUX metainf-services-1.6-build.xml 8356 SHA256 41d53e6846c3a4bcd2f6a42d948039eae0bed89daac31cc649c4621cc12e9a78 SHA512 22ae17b70e0760553cdc6dd641a79533712c8512a4f43b81a97eadeb674037fc0e1019afe82d7d98dc6e5346c048343ffe7ce747ab81f51a52f555974545a012 WHIRLPOOL a57fe9a91cfcfdcf3688faf94a5151e782886617290e6a0868c937df7dbb0528716e71378f3e68d422ab8a8b322b2ffedf133132f477cfaab6b3d28e891391ae
+AUX metainf-services-1.7-build.xml 8356 SHA256 ee9cddf1e445fa1b174dbe93b65927ba495c8f3200ce432721646701b20c2adf SHA512 183ea6c131bc9d63172d34966950f6d7eca5aeb4b23e2b9fc4f6045ac2688cc8e2931ab7d1a986c36bedbc0521a7fc13263be3e5cebbf915b07d12c4e6aac5ec WHIRLPOOL 6d81cd1346acb3bead68e75ae5aef573568af4e5162555bcc0a676302451987fc15e8fda851f21880d245eedeff232ad644cd79e023b55e68c9d763377bae1e6
+DIST metainf-services-1.6.tar.gz 5282 SHA256 8d2801432106d4a8ad0bd2c62d827b62142df25667cdd11d81e2909c09246135 SHA512 237f37b8eaa384dfd7df6d0a31fa7e5d086c6923c5eb2435317701402b14ba472839d0e49b9ce9da25c265d6e128679f7d637d41439756242ae591d3b15e1108 WHIRLPOOL 2ff20a901540ee38c6faf15ccb26cc15b75fc5e57341f9345e9eada677f8c1b4d95d64d336d3345ac876fa512f45e41a25dd75dae2c855e3e84c37973c2f955e
+DIST metainf-services-1.7.tar.gz 5301 SHA256 214d3be3ac676b61545ccef7176367f77a8c5603358af2e086818886279dc5f0 SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df WHIRLPOOL 4daba6ef687b24facd901b0afe2998ff8c647f18b96e4ddd386d53723c3c14d31cf47542cd19cd78691a1840ad3c55c87a1741645bfa9e183ee9aaee531841a2
+EBUILD metainf-services-1.6.ebuild 577 SHA256 719f346eec4a93d72121f9f3862fd7662ba060cb3a34174376b23ac4a386dc0b SHA512 0845ce1d6f6f0bc69968361ca533d33b2ca5f87f166ef033117b0a951a597b4bf3bb22baee0101b75c91edca8f7b92130cc1f46459a13494abde838bf6af8bb2 WHIRLPOOL 98e15ab2ceddc79afe89dbdd253a63fdb7a2b95daafd3a7721813bc3a92fdcf1ab383bb95994eeb900586a656ecfd17dc41dadb70e4eb5d9b3a8ddbc9bb52891
+EBUILD metainf-services-1.7.ebuild 579 SHA256 9ecd1ce05f613aa5a0fa8c83095f1f12cf53a584d9ba894c248bc2cd965dabe2 SHA512 2985d856e58088c9051fee25cc2336ff9529529597161e33df7eefdc0158041eeaec073430661f6fa380c0df28fe7f13ed727448d9ce77765cebd80cf44ce81b WHIRLPOOL 700db34af39edb789b2164c2401992166980eba51880f6f04faff49629caf9b3b60f48433428ed4492c341daa20960aa1b7cfedbd924cd48e2df939d73ccf84d
+MISC ChangeLog 3406 SHA256 799126dbd241f2f17829b5984a2e30d9a4dedea698032974297ca88d6464ddbc SHA512 60dc703a63f4a59aae5aa0d3b28403a127c3db5b9f0f7e9793f315a690060c10636d2c630bc6ed93fe813732954815be5cb72b2dd2b0a9597431dd587a7e18e4 WHIRLPOOL 5520574dce911ffe3cf617f2a48358748c98a5f0968527ddd4b73c41b6d0f8e401549b2eeab20126d77458750d80db8f615ff4ca98d42075cee7fc737269801c
+MISC ChangeLog-2015 955 SHA256 5f90d68875e0d201a12100be8006d68130dbd30aeab3c3b1bcd3b3fa29f71474 SHA512 2f29d373addfcf9efd1776005306be33a379940bd767f7bf1d25454f8ce5e5fe1652a52a93c5f20a3f52f5405f9fcd280ab2b80846e439f42c3118eb203cc208 WHIRLPOOL ed4ad90ba7a9558e4a6c492c2d4237d53f12e463b5342a65357506afd7b59eaa939770d72e3a2a382e5c2f52d47284419d44da366766f35f4142949bb285d0ca
+MISC metadata.xml 335 SHA256 9c870e173dce34d74dd537237f66dd6948b6097a081b56e21d764da8acea18a8 SHA512 7dda5e5b222befb2e0a0040429d96d8e9bcc721a22576400b0ee16d827011dbbed85edd85383ed3b398564645d94da56ea48fc7aa3c8a65655334df74b8a6f5a WHIRLPOOL 8f8944651052602ab792eb1da07c9e397091ef3c2625fb00e3a51eb69f29bded66d7ae3267da04424df821e251026318757efcfe1163f6986dd75b124e4152f0
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/Manifest b/dev-java/microba/Manifest
new file mode 100644
index 000000000000..717bb1de8f3c
--- /dev/null
+++ b/dev-java/microba/Manifest
@@ -0,0 +1,5 @@
+DIST microba-0.4.4.3.zip 89737 SHA256 793ce6623d9eb9d0c765c2f7dc8caeff56020adcebb3227ece0ca30eea159cab SHA512 17933578fe101053a1004a1aa0ef342ffa1dc1f2ea2d670fa8aa2523c7d8207bb79e54755e58d0b7ce5ba627ca3b348ac10870718622e818f4097a966acc0a10 WHIRLPOOL c94e947b9f033aad529b018d8e33a3c69dd45081ddb48eb6c05ba86e24868fd0348a4fe3a6d5eb7d8fee3937e8361208da6bc1847613acc19e83d964118d450d
+EBUILD microba-0.4.4.3-r1.ebuild 768 SHA256 f14a902b15e20b0fa30a0f8b8a522714e04edb93b9a39bcdca6a777fda33ad56 SHA512 57501fb0b7b526e150ac60f1d6ff9435500ee771348e63f6487e2d78b4ec7904fca664c9bfbcc91a02e7e9e479af483492c5ecdbb9ebc30528901aa61156cc16 WHIRLPOOL a5a98a766af6b569004141d05ab718a0b87c76dfc56019ae6faebbd6996c2ef22523f3785f933f4c58e45b43e2edb9dc8bc9a8ded8b52709a800283d7cdc4d4b
+MISC ChangeLog 3112 SHA256 3d170501e5925dc1de7e0878d1101dd643d9993935949243cf8dbdc355f80f49 SHA512 9bcdcd277168194e6d4b7918b96ee44aae82c0a537f7b0f35e0a8bb760589c71dc756c3a78aa2145f60fec4abc4f02c7c4dc7ecb0124a7f16bbb59027b7e05a6 WHIRLPOOL 02204eabe579218115cf9da7034bb7b296465f2d2658f240c0ea6ea71864c76506ccc5fc93c518701a2f5c5cce3ee34ad02ca323585a7102b8c8f87f4a687575
+MISC ChangeLog-2015 1721 SHA256 b20660de9098983e868daadb41017271962f55adee5c4f4a9313ef091b39d022 SHA512 ee429ee79f44e8b5145b4d7056bf04e864586a92cbe166ae27c66fb801ff6ea0e755537f95b9e9a3df32a62033ea9b4ebc6c4d033b3d7ab99b7d05fc37f7356e WHIRLPOOL 9046a9f046e69c8bff37d5d128b0ce41b6a3a7ae9de45b88a52e8dec582709c0512eb4ab360f7e14c17bfa905976884de89795174618f91e754e703ccc2ce009
+MISC metadata.xml 367 SHA256 383b787802828e2175469361046f215c87b024bd5b35e03ea60f515bd29ce813 SHA512 ff305633c3f8b368c57882d57a545755dacd718071f0e3a00e438c1eac3281057d4572b085cea61ea2ef40574fcd924032529b8267485ae6a5788d594b0305c1 WHIRLPOOL a2576f49e9c5565f53eff988fc76dadc20cbffc11b93a334bb5781f3460bbdb05687dc8b169fb876e6d300257436efb211538c4f6c79f9472a37c11d498b2f81
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/Manifest b/dev-java/miglayout/Manifest
new file mode 100644
index 000000000000..0b75f55ae302
--- /dev/null
+++ b/dev-java/miglayout/Manifest
@@ -0,0 +1,5 @@
+DIST miglayout-4.0-sources.jar 194675 SHA256 3b8e14f727a14f3179b46d6e754804a93e184c657491d44ec76179e6f619cfd7 SHA512 27284ceac254707428351fb2451ffd5f2ebd580374df59624bb6af06011f70d87b27849900c2573aff782ebe6d84e1806c18a59741213948f0b238ee5a51ec2f WHIRLPOOL a9ab25becba5ed9426239c19865cb01a6d8c7d0ba2da1c878d06dc75bf111b9c76f36c27012d740f935619e9ec92f15fb9470a7de63ccce3f7dfab698b70e319
+EBUILD miglayout-4.0.ebuild 1244 SHA256 8571d8cb7355f2de16035feb6bfe0a6dc537263b8e9d8844a0b31a6141603b41 SHA512 4d85706df61b695f511ed2a2e197593e692a2492682cdb304c3455bbbd4f9a88b33305e40f6b3af283d30ed029972b79d7d19ad40a92e83a1d87bcd664cc6bcf WHIRLPOOL 30895ee2db01255093973dbd4bfdac4f41e259339b7a074c9d6d5e7b2e05995509072ea3d27efcfaae555b5b52e178f9a765ae46bd4ab0efdbfbd1e80568d065
+MISC ChangeLog 2429 SHA256 16adf9c45980ff281ed3aa3528797ed292cfaceb22656622c27b730fc608afde SHA512 da0d510186cf6fddb271b13550fe53d424518fca16645224f0dcfe927f365573b2af756ee22b3567a94c8129f5555e2a461507257a41e6d7b5780becd73963a9 WHIRLPOOL 4becb700d4d297a2f4c20dea542842a76e0838a12d3084c3102d2a757928e6f8fd0c2d40e0674b6f9aefdfcd4a1010eb585c31a3730cd4e9da4eaad04ebbc58a
+MISC ChangeLog-2015 701 SHA256 48a46d73884f842cfb9cc0a5813a6ebacb75cdf1c022fa41fb67136e41871ad9 SHA512 b12900fef1d9720d0bf5d9bfae883f53dbc4fc72e963b65e9030b02bb7a9def9a51bcc769e324447a86e9cfa23b0b0e380ee83bd63d35bd654ac6eba5042c664 WHIRLPOOL c43a9a405cd33f9c34a0f1a53edad434d6af51f7a8cf571b11fc1c6b3aa207d4293378a56109dc47d9e466b2eaee67d1e4bdde0e4a31e22e5c48badea1cceb88
+MISC metadata.xml 751 SHA256 6a3e2dc72d130afef24c130da4b55974d76951c76904b1b0a5bbee5e2e1a4996 SHA512 b097936cfa00fa8468489722f2d9557ee93efdf0d9ac852fbcf745814d35b294d0a8b5f559c4aecc62480c6f59e8329013e133a7dc7618c4f665b79c3b03375d WHIRLPOOL 0ab481f09fb052857fa9274ae5db601e3c9ff37366841564575a3f6f1dfcbc589a507cd23282508814f3b06ac0f8c8d0918c2b9842a1989bad0dc0d0d43fbc2a
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/Manifest b/dev-java/milton-api/Manifest
new file mode 100644
index 000000000000..68dcb469063a
--- /dev/null
+++ b/dev-java/milton-api/Manifest
@@ -0,0 +1,5 @@
+DIST milton-api-2.7.1.3-sources.jar 240367 SHA256 56d79201eff9d2287ae4a516f2d70c71d5813e20b1c5b669f16acad7b522d5cb SHA512 9d73e830a4c62b872fe756679158a961d6160016cc6db6915dd17f65f9ca6008cf7f451aae71beb735b24c7b0872b8b672f53f4a0ecb1279d9572e1908fd5f08 WHIRLPOOL d191a43b4c3d108f933f900a1a48a43cb8ce86e94bc84227152e89ba4bf7b7e38f95af67f61735ee174106ef7c92bfdca733a63c17359a43d06d2c62a174c564
+EBUILD milton-api-2.7.1.3.ebuild 612 SHA256 92e0e59c304461de671126f2f2bb106d1b5b1a9b76faca939a2c8c253bdfa3b4 SHA512 201dc2312ea3d727d56884f0c06ea4656b5fe6830371f201284fcc3725ad0190f9223d2cfa1dd2746bb960dd6e63ae34ee3616535a4ac065584d660054765507 WHIRLPOOL dfd0b3b03b36e79496e3f88668844e1468c48c43df28ab7740926aa2d4b93d94c9dfbdbf30c943706abe308566a0ea980fe5f56c0454a952e51635090e8bcfef
+MISC ChangeLog 3434 SHA256 fe6cfa581fd40eded01109228ac7b1315bee2a1cc88653f5c75da5aabdef2df1 SHA512 2d24b3d54bf0c793a732a08d7f2965b0a927cca52bd70dd8e4828012ff7197ac6a2e2f9d890c4a522dd95318605657e6561cc366129f336ffeade54ee1bd9169 WHIRLPOOL c7f34410c950f36f8c29056402055ef9ef7a96eee4cfc8d6181f7b1265b8a0bbbbea8ba328432aef3619bbfdf96979ff545f6244d03d63a6cc0e762dce1c0c18
+MISC ChangeLog-2015 570 SHA256 f4535437d70daba6cc05bfd4dc4a27504354d8adce71f3f90abc4ceb936d6bba SHA512 dcb10307bbc64464a5a45cf05349ad2c584c89665526703878c6bbf46b72cd2f513f6124f0c79c3625c07942a4b3071df09b9dbb27da5379e1a1f0a59cab2765 WHIRLPOOL 88fb77e0b68ddfdf47b331466fdada916c51ea4bcdc34036da657314faa7bd43ea5e0b09a6afa86fe144c4651c2bd1fbda0f578469b379c76796a21ca3470b3c
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/milton-mail-api/Manifest
new file mode 100644
index 000000000000..6ba7a4775172
--- /dev/null
+++ b/dev-java/milton-mail-api/Manifest
@@ -0,0 +1,5 @@
+DIST milton-mail-api-2.7.1.3-sources.jar 34106 SHA256 4947db22c73db8f7b8fbf3d549b62d622c7ec33a42a774662e60bb8bce88153a SHA512 c0b7f7d62b54f996f42c44e8b28eeaee8a76e8990be5a9894a0f3b2daead699e78442c5cf96a272f71a54536c87247f366f10f3aa2c3adb9d4870253ec8c3b67 WHIRLPOOL 7109d5a62f919503ad21a557e7e15f0428afe1ae72f9a8129dd58ec551d684934e8d48095c86d0d5cb2c250163c143e6ea7af6d172152b5e60fa7aa643a9eb86
+EBUILD milton-mail-api-2.7.1.3.ebuild 619 SHA256 2ea3235edc1d5a021602bdc0e96be0c188d8f22ad5eef26b8f58cac5305e81e9 SHA512 2d29a0622006e52609b2ac50eddca9ee2ff1debb662c1a1c30f36051067a64f2be3214a20e1d006385d07cb03a891c4a549ae1febc790abe2759fbcd495e037a WHIRLPOOL 79501cff7e52ae1909ea1d84409de10b6c576e9d9407d3d09d0050e6ed252a2ae41e4c38e8fc9208ffa53c1acf0889d20b6e82ba6b43994e193cf642437100b6
+MISC ChangeLog 3983 SHA256 169fb492af6219c2b4f9f5adbee39a8b401eec57ea24e9e68362c81e1df6db61 SHA512 e6dfde4ac89b028ec80a4d3f6786b8c579c667e4fffa5a4f978cd1f75b24444e71295707ff1bc3f6825d0708295afa371cd2b6c67d2a82eb156cf052d00a8b11 WHIRLPOOL b5d15ce44b404b30608a459e5ad6d06fc378e8959c6a2b456993d49289ce271d4021ed48ece4cbcde4140f5d7090c186e33be4babc75d78d48e24dec942050c5
+MISC ChangeLog-2015 436 SHA256 1532d42cae53a513130386da2e5f28f453c98f1c905f6cd9e4120064fb056af4 SHA512 cd16902e3111885ede3939eead77bb3f2ec9688f1a1d210f5dd9cc1231dcc241bce08cd83c2481ec161c66ee82c991ae0ae77689e843cd6474e46aec36450471 WHIRLPOOL c024071db0836b718cfadc5e3674863c221bfc8c981a2a64570cd517e5e12d110b8cb26a86ed9a18e34c48cc6e14935b4c38db0500b5da98af40c44392ef062f
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/mimepull/Manifest
new file mode 100644
index 000000000000..fa6c0f00563c
--- /dev/null
+++ b/dev-java/mimepull/Manifest
@@ -0,0 +1,8 @@
+AUX mimepull-maven-build.xml 9697 SHA256 6cc30b2ae017b8a47b4603aacd6b800649abf0c80629f23d0ccb3f4c5a9e58f9 SHA512 23ec5dfc06aa518632e9d69ddc6633010f0a41baa73f7a9e8695b8666927a2612b9ba3b31a74e9fae436dabb51657e39f2623acb41da14b3df71a93eb64dfa9e WHIRLPOOL ca75a7dc9c45c48aa387de5ec0740228f407d4f074972d3bd67e6579f5c4093598c621d211141cb62243fbe146fc81bea2115436896d3f110acef5b04a7df9c9
+DIST mimepull-1.8.tar.bz2 48841 SHA256 357f3c2b558a755c4f3d7b71056d8973d723cd2b8529ed54014fa8d164378702 SHA512 60de5b888ccdf89ffdeba0a5ccd98e77f7497e57c6b3c71049446dab0293836f8f2b84a39354602e9073fb6fef880dbc11c80323413f8ed15f0a3af68086ae07 WHIRLPOOL a7a9f58210b47eb37f5994233339773672f1ff12f6e0aa2fcc04873b6e29aecd3181a28131ca45d5e275bb111d1a990ef6d8545d3eab8919a7db73d91c903b09
+DIST mimepull-1.9.6.jar 68382 SHA256 615b78d220c74b6c924ed09d51698628ad098786cedb5646bf411aae60f50301 SHA512 528eb77d6edbbfb1b1d8aebb617f9d20c84b9c18f7ab763163ea136c3898319519bbfa8a8e204bd0697a4eac9b964eaf3fb2ee214555efcb3da152ebf467ae64 WHIRLPOOL c38827897a903642eb5c6a79b876265f665412aff09219e06692bdec9ee1489394a9398534e3240d6bdef1b18e6e1caefee5048d800b77c453064fa0da0073de
+EBUILD mimepull-1.8.ebuild 963 SHA256 cdf4e7af52aee84915462afa4ddb1216298827774f9dadcde2b98a8553498fa7 SHA512 24f9bbcd439f4c9cd9ec49c89e529e9cba5a699cb42c90d949f485b10c4951f27548f7636025c8630de2c82b1b8d50088f3fb7cac6ea111b5ffb28040e19cb5d WHIRLPOOL 83b0750dd2899ebf708fcd369ec4144b6c9fd3809dac95360018874910434118ee45c464243e5c3ff750e881b836502cf85c446f28d21a8dfc7de4308fb9a6be
+EBUILD mimepull-1.9.6-r1.ebuild 496 SHA256 4414bbaac3aba5d683756eb0a32a6370b19347dd625d304b0f03b88a6f424f5a SHA512 97fe69a0ce8b215a306347a17655fd156754150a22593262927b0dee1740044239c433478fc6bb44bca14ddb9f2b60872b32cfce81acf65550e8d95faeeda357 WHIRLPOOL b6669d5a2d16a92501eb025888d26e5a9669885240ceccbb48e38ef3f2378eab25ed2308c4bc95078ee4eb610dc87654f7787fda8f3841dee937935cc1b5b2fb
+MISC ChangeLog 3532 SHA256 cd31d2920dd413d3563cf1ef23abfd2d1fef10bf1e798ef1d1422ab788a89d20 SHA512 dedf1685038a49e2cc8b57e2f46410dd575a39ba94259c411c9451f940e82625bc19d7837d87d024792672aa3b7993226e25cb46df2453a45ee44cf738612511 WHIRLPOOL 3a14c088fb431b7225238f4a0b43d136257dce57edff1c9c1230a10a1954a1403353045cb134c456b3e2c25cb538703df11602b3d0d6b4a20cb795679c279792
+MISC ChangeLog-2015 776 SHA256 941a75fdeb4b9a98cf2fec38e2798ab0a5673493c33e0457ba5a26f9c1c2119f SHA512 3736deb8c393d1197c3f5b1bd630b6435ef808489573ad34266ad7f4b47ee0a8418c4b1b847be23ea57021854720952db2b567cd243d7e16570a7ff09a365b7c WHIRLPOOL 3ce488c6e9d1ec2ff0cac9ffac0f6dc7250d0167f04606c36e040638810ae975e928f0b6ad8abd2a4e5a3548cfdf86650f639ea36101e222e879c24a3ca19361
+MISC metadata.xml 580 SHA256 68942269385d0c9ddee91335bca45a372615d93a7b190851277d45a4f5067780 SHA512 b337805ec86960d64b0a0beace8a9b8a764abcaa273f81fe11c7eb710293b0cc23852e59c951b99381261c9ee6b6cfc562f66c70407f1ddd503ba763ff4b2a75 WHIRLPOOL 7d81ad5b0f380fabb333d0942c6d087296da11d2fa0e1c9adc7afa285287b69bd3e2c723f61d6693a605da0bb2290e80ca6b6611d42987c1b0bf99ecfbe40734
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..ba80f7d6663d
--- /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..1e80184557d2
--- /dev/null
+++ b/dev-java/mimepull/mimepull-1.8.ebuild
@@ -0,0 +1,44 @@
+# 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
+
+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 ~x86-fbsd"
+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/Manifest b/dev-java/mina-core/Manifest
new file mode 100644
index 000000000000..a9a4431e7ceb
--- /dev/null
+++ b/dev-java/mina-core/Manifest
@@ -0,0 +1,10 @@
+AUX build.xml 445 SHA256 43e456dfd734687876cb9e67a3c4a8b2bc430803d617238a767a1b27684f23f1 SHA512 b4856f66f231862fb30b903c6c128c0acf5762ad7346f3f3e9124f4f5307827196d30808c11fdf6f68e8d257b6459b07b3245a61e5f16efdbbe65cbf9b068a68 WHIRLPOOL 68968aed23a54c118de232e5d922230931e8ee69838439ba793cefd6d84dcb619a31926da9dbaa039da97a574787512a3656d297280061a2e8adf094b70d84dc
+DIST mina-core-1.1.7-sources.jar 272148 SHA256 53890e14b238eab91f70459f01656a6afb520364b6238c8fa9c3855b02cf8573 SHA512 44f2f94aa356ce1b4ac0379ecec7b76b15210e54314c911bd8ba6d48910415363c9a34dc50e29b8e04ad08a371398ad9e2a00065a44b71c25caa3ef14a72b832 WHIRLPOOL 82f97287027e3c32ff489345ce385bd31325e0755ef9744f1a81a9cf295f8cde1bf0ba44b1afe506a3b08f37e601e55a88d4dd0936abe7c4eccf716962bd8943
+DIST mina-core-1.1.7.jar 272148 SHA256 53890e14b238eab91f70459f01656a6afb520364b6238c8fa9c3855b02cf8573 SHA512 44f2f94aa356ce1b4ac0379ecec7b76b15210e54314c911bd8ba6d48910415363c9a34dc50e29b8e04ad08a371398ad9e2a00065a44b71c25caa3ef14a72b832 WHIRLPOOL 82f97287027e3c32ff489345ce385bd31325e0755ef9744f1a81a9cf295f8cde1bf0ba44b1afe506a3b08f37e601e55a88d4dd0936abe7c4eccf716962bd8943
+DIST mina-core-2.0.7.tar.bz2 1953751 SHA256 619c309f21c5d315c3a6e40d1c94b155b83049832d7404c28f75a49aba14f8ff SHA512 406f5fe9c389dc0a2ebe602207e1c914fee308368d5a1e15815ae4c160a986a30a453a1bfb4e010452de87aa28a6817c02f0b5a669ad272fdf603084e994e57e WHIRLPOOL 38fb6597d819758dae7477c14002b3705119bc60e09a62b55da93fdd7516cf37cb609b2b55a9a3fd36427cc3775031b6376d8ca200de0883182a5d23c59b51c9
+EBUILD mina-core-1.1.7-r1.ebuild 529 SHA256 257b96c061ceccae7b2bbbc8b58602668cf617ecb5f517c2f8a82edf8ac69d31 SHA512 274f85ab75ea429ff9dd959b9e7c91fe2974b92f64c4f8fe37865920cc5137b7265ae23017698ca73bff2e69b25014ed5c292a96bb8386683f112fab5d302e92 WHIRLPOOL 254866dec823d9d106a0f78443a9603923f28fdd326b73ffe32126e500c6c44a13d0aea34b0762e024d7da3a627d5b830aa2963afc81136604aaa9c25e558177
+EBUILD mina-core-1.1.7.ebuild 700 SHA256 fc2d4caf0d8d6816ced1175b2f582802e24d8300a8636bf5fda9ffcb32652e26 SHA512 67fe2d33b6d05525008c4c4eda99280ddbe5e237c1e78bd04b3cfd0baa02c474ccef3db64e3ddad5230956881fafd3e605fb5bcabf7ba9a49ac804e9267d4dc8 WHIRLPOOL 3c6aacb6ea41b33583aef1c1a1ff5dae51c494d6d6307d5c2cd4fc2b620c4ede721c52837256f5a3bcb111b9d446e68d22cc9d58793e19ef774e274d4076a5b7
+EBUILD mina-core-2.0.7-r1.ebuild 704 SHA256 0b3238efaa1bb662298a9755913dd970ef5dd8f070f1997ea6469d7f0eeee1f8 SHA512 43c3bccc344f62e3af69203f8e2d00ec9b8c1e0f5efb109f80fb60555a9b3dd932e9ee2c842ef34148fb6c404cfecc60722c9a70decfd3040d613a4a88949b10 WHIRLPOOL fc5f8d63ad47c9678f26a00c1b7ffb1c77388109e1533ba9440278c437fe7275cd2fa200c327cd00ff076731b0e4efc7e1f3d59f5dcc6e0aeaddc549d5008b29
+MISC ChangeLog 2795 SHA256 9fc9ad12e528eed7726c7c7c80e969e72fe2884b976ed5cb297f7bd75696971e SHA512 de4c81709a5df9f701599e10094c71bcdb76df2eed6224fa3e9b2fa9fbd701a8f22a1b95c14a58f5915c67efae98a06d92fdae9169e13950c5094c722f2db0b5 WHIRLPOOL 0fa1c44ea523edc8313a32243d7ef98c5a3c4fc250f502bbb2ae752360ef3265d7a6e9f6046b4912a29a1e132f18f68f1498b29924677ed43a59c68bcc8e91db
+MISC ChangeLog-2015 920 SHA256 3e226ebda59343ed7e9c269d4bf4cfc2693326b50afdd7e86a2936e5156a1678 SHA512 fef40cca29dc380fccaf17c9478fe39d94e1c9cc6e8a8657349d3eaf1ed6f97551a7fdc448b17099d84fc3213d9a021c436d0058c60d881333952b30b2f193c7 WHIRLPOOL b465774256db9bf97d701d44d0683796dbe6418e3b60057dffeec5d082b9252a3fc1ccf37222bc81375b63066245d46b3274a817e62d269f399f4e776b07d056
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
diff --git a/dev-java/mina-core/files/build.xml b/dev-java/mina-core/files/build.xml
new file mode 100644
index 000000000000..dc667782ba28
--- /dev/null
+++ b/dev-java/mina-core/files/build.xml
@@ -0,0 +1,17 @@
+<project name="slf4j-api" default="jar">
+	<target name="compile">
+		<mkdir dir="build"/>
+		<javac srcdir="." destdir="build" classpath="${gentoo.classpath}">
+		</javac>
+	</target>
+
+	<target name="jar" depends="compile">
+		<jar destfile="mina-core.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/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..e1985937d2b0
--- /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="http://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-1.1.7.ebuild b/dev-java/mina-core/mina-core-1.1.7.ebuild
new file mode 100644
index 000000000000..6c5a40da3891
--- /dev/null
+++ b/dev-java/mina-core/mina-core-1.1.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Apache MINA Project"
+HOMEPAGE="http://mina.apache.org/"
+SRC_URI="mirror://gentoo/${P}-sources.jar"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5
+	dev-java/slf4j-api"
+DEPEND=">=virtual/jdk-1.5
+	dev-java/slf4j-api
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+EANT_GENTOO_CLASSPATH="slf4j-api"
+
+src_unpack() {
+	unpack ${A}
+	cp -v "${FILESDIR}"/build.xml . || die
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc org
+}
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..ee0715525e64
--- /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="http://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/Manifest b/dev-java/minlog/Manifest
new file mode 100644
index 000000000000..172526d40711
--- /dev/null
+++ b/dev-java/minlog/Manifest
@@ -0,0 +1,5 @@
+DIST minlog-1.2.zip 19766 SHA256 cd4d58a97085acc4c3cb4d455584eb4463483d7df822d517f9b3af005e13ca22 SHA512 79c341288fc4c18ceb307011b3591e239d00a356fc78379449bbcc4d93b0355665a4425dd31a23d83c79eeebf19a591b9d3fb34d6107a4a503125dc683b4519c WHIRLPOOL e42c5c61eba879857189855f9e1ee1d3326588d701d67c7c41453e2dda2083adc192f3e6bfdb8a1be45cbd1a53438dc44e4f2356aac0b7f2c3bc178dfb1717bd
+EBUILD minlog-1.2.ebuild 494 SHA256 ee257036c5d5d9e2cd0ea6dcb5eeec24b555e632f5fa6cb3a1f0f4f712cf14f3 SHA512 c6d39530eb2ac19a33a099960e7ab22a0aac4888b4f16fb7495f766563a58833dbe025db3e49d226d81cc9355e081bc471434b0061b00ac93c146225820d1730 WHIRLPOOL f56f88858d87330e3968bfce03d8cb4b57d730cdc18835ce5d9b368e7aa6564c45e347aadb9ca6c5ad53841e76d1174dea15cdc6ed1ceda872752b93b9596a22
+MISC ChangeLog 3023 SHA256 60b75ceeb14a0fc6efa944ac834c08fd5080c2bcf81693ac7f8751fc5a284298 SHA512 4d4085feb50a0e6d63de806b92b4102703ef775416e7502d4148337e3703d5d5a8d41b753263834c2726fd321b68b325e445214ce5092f899674a0b31f6df4a8 WHIRLPOOL b0f029ff65e4b5a6ee63a9d5784f3e627598d003c601d0f350dfed9b4d111b7089a59fe8844db4132d15daa867d5227f72123e944fbcba0489acbc989ff0b655
+MISC ChangeLog-2015 585 SHA256 f56a80f7282f9bdb1ddf522681d5ae8eb9fe78d4ff430758d061a722b86e6b05 SHA512 131f2cd58a29c7714e0a44acee06cf98d2b533affdf3385f362a33058b57443c4bcb250d7e403f8696aefd926c7d7a9d887dfc92db1bae5b88813366551f0aa7 WHIRLPOOL ffba6941f8d35c103db580b5e34f022ba144cd27a8fba0305049a3b9fc83e1dae62cd2f44b942ac9db037e27a902e1194bbdc63c8ba52d0694c1c95543dfd6bd
+MISC metadata.xml 324 SHA256 d60efb1b6315fd65c82a3cd3c6cccde080dbb5bbb72f404a920f074386ba1daa SHA512 f760fad4ddc817e31066df080e17a53c44cacd3434bb5de1d1f9ec7ccf82acc1e3f2a40b2dd4ac34a31f609cd69fcbcd1555996130d24a77107978653758f444 WHIRLPOOL 13218b266b315e2af2350a5f45ee383980d24bec3057d40ddd9b18ebfe966ac9becfcf7e8388be8eb2b964def55c7ddebf98078f8d3ef15738b08fac8d96b0b5
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/Manifest b/dev-java/mockito/Manifest
new file mode 100644
index 000000000000..2470c3f03f80
--- /dev/null
+++ b/dev-java/mockito/Manifest
@@ -0,0 +1,5 @@
+DIST mockito-1.9.5.zip 6453870 SHA256 aaef6647ebded1deffa74e8b9cd5a3449eb385dbc127e1d56f0bdb59cde5c00e SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51 WHIRLPOOL 2746b67745fbeff7752137e6afae8871fd20ccfe72a3b769df4e29d051bdc9da5de90cced3418641247cd8e8e0ff8c37b84483b91bfd6625b2fad25750aeead1
+EBUILD mockito-1.9.5-r1.ebuild 844 SHA256 f1c6203c7a6b8e4a2869e4122d418e797ecea8be6d46bca2841237bc317670a7 SHA512 2caa56ec15407184643ebd9204d19c2536773c371bfad8e936012957b84f79612fc75ef96c60b0f3756a2e4643d215c058f0f91a479c187242fa40c51b96b74f WHIRLPOOL 69077f2fa9cb8a019cf2c63b4f8491d40568d91232e069783fe757ab505aab7dc5b6322ceb7998dedf8ee04e5aa85ae8ecac42180545eb404e799b56686ebecd
+MISC ChangeLog 2746 SHA256 88fc34179b89f2483dbf214d232d675ac76b4b40ebad88c5421771697d130b89 SHA512 41542786be5765b9c069d69d4e3334a943133947e0f18ca5bcabe50b53bee0e4e4b7fc934d310264f3e74d5a6fb758f11901ffb1158e478cf8fb3b605a46a433 WHIRLPOOL fb7b29d42abcc6e58c2ad6312c860ee3e55032385cc4817431e392e45d49bf92233060df1dc51bba43a2ed4c44590b680fffb55bd53990289dab916679e2ae61
+MISC ChangeLog-2015 1393 SHA256 99f3603f8581112a1428b4af045d3d8cb15ccc8b51ef1c8c24447226905e78ba SHA512 2933ab7ed6ef596c1d5315558bcc5291244e2fd85cccd667af8f9b6b0b66ed39a715ed7a665a43800c5d205aaa1bc271431ac2f2559f1a541d5366b88e293437 WHIRLPOOL 9705b12a35ead60f684b5e6d1d65cea62a7cdf8eb09423decd278cc353e2ada619d9e5db81aa1e5e176c6e7d8a38571d57061853c0742fe34ba288e1fd07bdd6
+MISC metadata.xml 368 SHA256 1c60767de312075408f2e0196745645c6d57d0cb99bcd06799b547f47c1f1a77 SHA512 371a02c769989a221b89405e852f627a4cd9953f1529b8e6890056b6ca83e2526a82752ab3ed9b36f40a3d88d460360e20762d2a4cdcba359116c036f1d7cc7b WHIRLPOOL 89abe64198678e99681fef0a548232bbb2b5604aaf48433dcf387691bc9422114c1816951aa0b2fca64ae6109ce94f1f3cbc417469b22bcbeb75ad6a20aa15bc
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/Manifest b/dev-java/mojarra/Manifest
new file mode 100644
index 000000000000..58bfcddb01eb
--- /dev/null
+++ b/dev-java/mojarra/Manifest
@@ -0,0 +1,6 @@
+AUX mojarra-2.2.12-Util.java.patch 1196 SHA256 d047c7c7f788d3898265e2824cad1b53d32d55b130d08e00338e6b45b5986b43 SHA512 b3f2f1fb0f7541eb5fae494d3a0f254553aaed7de2016f5bf8f4433e88ce9cfb59cae6d6e3e169040b77ba1ae9038beaaae2591610a71f0fc194ac6fba295732 WHIRLPOOL c3d68e52c8bd61766985130dfc5a6dcd2c2327b0a2b0abb0bae334d56102ad639ff53349303577cf91890da8c2455085b7e37645eb0bc9ba54dbfb4a05274275
+DIST javax.faces-2.2.12-sources.jar 3105808 SHA256 503c0a1c6a270429798a6507d477ee2114f0de5204c64d5660a11796c498ab61 SHA512 b2bc2ce38d72af38a4b2fdb5aec790600ca41a5d7f6340bf6be671a901c9fe664d50d9d13f021694e85e0e145a2031e2d8b61dd6d6ccebb544f2512a91ff670a WHIRLPOOL 98a5473c8c7841cf5baae4b879d2b0a9e1b64d3666b820aa7c1aeece43d3689fc8b93766c280906f19dd23d3e13436c6514b533a3d810bdb96e88d4d78666a87
+EBUILD mojarra-2.2.12-r1.ebuild 1238 SHA256 cacbb655a343b2eda07b986e30a8df32e7f2048362568bf478a7b1978a715009 SHA512 4453e29687ecd426d1df64e8e010ed4629d7ff9e6faeadbcb6daac24dfc578cd93192ab1e45443a83dfa94e5f144c2cb1fa6602be17bb3ccefbad8140526724f WHIRLPOOL 43eb78f5f8d26ff8676e614ae4f52d9da1ede2df1e22e8d4f246dfa393dbdd238ae414e6f450b3ce2713f9bfa6faff755b360a73c707dd7a033011cfa4bf8bc1
+MISC ChangeLog 4277 SHA256 1091317ab048643267bdefd5893651fa72e7b6ffacf7afcdcfeacf1bd7b22d33 SHA512 db47e22e8e24c7bacc2a74ecec4a88ebc5fd68936fe30cd9f993e2d1a303e250e59a5017472cca137a0a2bebccbe9f9e224a5cca4cc1b4ce75e07a279c245d05 WHIRLPOOL 8ec7e91d651c4ee3108e47cd9a2af0735845d4c6117803409ef3c3f30bbdac2cf2812b03841c606758e07f72d5b26bfa5fc60612682467cde9c7cf14c641d27d
+MISC ChangeLog-2015 2077 SHA256 a5dee37b84fe8fe444278d3a27fe7ed3c51f963c4aff46614debe5174b977e81 SHA512 8a04f76dd36500b6d58e3206f4245f7ec973527f6333d65f3aaf00e2404c7cbdd25ca178158733c83f27c0ecffb38ff184379da899530afcd46938dbefd48565 WHIRLPOOL 697f1605fd4e1689fafeeecd857bad157048514ab5940ec566b9db7e19bf32b5e53b504d652b60d1202f38609e4cbb6fed18e2df82cab73e533215b94d420890
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/moshi/Manifest
new file mode 100644
index 000000000000..c8a1b51ae62d
--- /dev/null
+++ b/dev-java/moshi/Manifest
@@ -0,0 +1,4 @@
+DIST moshi-parent-1.1.0.tar.gz 85572 SHA256 131e6f72d5f9052bbc4c588ed640873f7fe77efc865768b419b4c7f5652886d3 SHA512 58557f20a84f4b59f0b603b6e6dbe803285f5c066451dac72e9926ca57131b62fddd222b995dc233e1c7120fc7787fa5b2c6ddab33d0b8e69b8ea1147ca06549 WHIRLPOOL 9ccfa575c58920bd13a4926772e65ad9d2437eea9d86854b99fef540effe75cf77aad10ee35246c9cb74391e8e99029a36f2bb09894efcb5df6b43c7c8c8f039
+EBUILD moshi-1.1.0.ebuild 775 SHA256 cc66202dfdd90d3a5a43511be90ec53621df60b46ca3f13c34a5adfbbdeb7444 SHA512 cca48d24345b1319ba26bd7b116af6b952bb02445fa8f451929f4831ee00d3b06b00f321bd09d0f30826b745fe9226b07835ba94d11e9c79bef0223299b806d5 WHIRLPOOL 3711879acaef4e30850336379de1be1a84acc89d40ef6baccae8377fd5165fd1bd079ad1f22edd51726253de51bf06e7906b2d84da11a2e61cead6150872dcaf
+MISC ChangeLog 306 SHA256 1ec6dbcbff035b2997d7240e7b93edb0f7075e0eabdf38f8d07341cdc8826de0 SHA512 391740d4f88ac97586c2c9d26dae192f7816038c9690c642f36e6b46e1ead4f4cbec3ab4ba72597d0cb7babed0d0f48a7ea7be6308dfc537d2f71005f583b4f9 WHIRLPOOL 4c30ecccb9a8732405deab07ed7268369c8ea23377f97a0c945bd4751dde7fe8f15a25a715421869a4e434c992dd8688e580047a62ebe86c0273f6fc843f6601
+MISC metadata.xml 313 SHA256 06c2f28d423cef9fa86db6cf97769e5b2d30ae41b45d3aab4b3fb9a42b766d5d SHA512 32266aa32b392436df5057ece8975a6898e3093cdd247e31f12d17b6a3cae58fc39e15d9460aa7d1aff53980e2b0dfbbedd33692bd9c174ff297b1b656658694 WHIRLPOOL 79800c7a5fde96876f94ade41662e90cc4600119f44826615a814c687dc634a48dfa0a70cd4cfec29ff75ab0b1ee3944e03ffe4f0683b319f682a014767695ec
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/Manifest b/dev-java/msv/Manifest
new file mode 100644
index 000000000000..7bec104b2fd4
--- /dev/null
+++ b/dev-java/msv/Manifest
@@ -0,0 +1,5 @@
+DIST msv-core-2013.6.1-sources.jar 1011944 SHA256 5a76e0712cb97987b900eb7a7437ff0231abd8db94d3d4edd0d724c11372cffd SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a WHIRLPOOL e134144ee1daebb84749b8f6bbfb6646e3415c0de5a2e504e6d1c5257127df7ace79597c2bb216f9cd8dbaa80f394b3b02a872e7f15790932b3950cb591e3c26
+EBUILD msv-20130601.ebuild 1204 SHA256 3ed14a0c113fb3b244482476368ec4071385bf03e04148b9684a8b01a6d1801f SHA512 73dbba69f162436ccfe3c9388af4b6112f6849e4c8b51827da91f092ac6a1b2ae652c85ab8fe3574bce99e8dffd90f74dcfe4ee8d2405b187cb7987f2f75b3b3 WHIRLPOOL 9db05fc5b51324d574b1196b07ee8f3d177374b5f7e8fd41667f6da7d51e616c93dc9dc2fda9b616739eb3f5590d8129a82426ea9ffa490334b762aad39f71de
+MISC ChangeLog 3236 SHA256 0e78a193671d95337fb2be45b1c06be39739a6379956112bda96d33538c7e1e2 SHA512 3eedc22298b161b86fa7e6fcf8386b35191e376f4270e04a3891f6f541a3d1c1256b8a645249fb716ba263bba943012d180c421cff369b47b8220a96aae513e1 WHIRLPOOL a1d6e0b22800e343c3e624f4f43eb6953f20047e6c9ccc461afa59edc779f2816dfa0d5b6aa3565b8728c402b2d792942abb151cea124ee3938ae4b0c4226d83
+MISC ChangeLog-2015 4838 SHA256 3263aed8f5152500861fa3628206b17d654a8a4cbc5871678e2cfdc18deced3c SHA512 f454978b805c8a9e4e9045288b2ced0d3fe6d5e93ccb205192c6956de8487d1ea701e888c28dbe39cfde925c08d64a7f7bcd7a5f8fe1df88ec54600341fcd27d WHIRLPOOL 1d63d2733029f7c03dfdb30ebeeda7f03de19b9fbeaffd84f18c0fbeb55f5336aff3a9c677d80356683b01f738ea2a853bb6b03a133ae137e796ef51125ffc55
+MISC metadata.xml 401 SHA256 8c4260748521d6532fa8b888e0c668871eb5faefdd779b987b3acb4201dd8901 SHA512 cb176f670e860f0fb7612d313b9fe2fe1c00d5f08de531d7ef93f42204bb0dd537e6b51728b8e068cf571e24aaa7488441e0743724c8d54357f1aeee5ca10560 WHIRLPOOL bace1cf89bfca5c81d65b46af0019bbff459b721ccfb168d410b37473d477391470592cfaf02882980ff22560fb632e143a3b9b9d7f8ef68545bbe9918176c8d
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..4826b3ffa6a9
--- /dev/null
+++ b/dev-java/msv/msv-20130601.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 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 ~x86-fbsd ~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/Manifest b/dev-java/myfaces-api/Manifest
new file mode 100644
index 000000000000..fc7aa68950c9
--- /dev/null
+++ b/dev-java/myfaces-api/Manifest
@@ -0,0 +1,4 @@
+DIST myfaces-api-2.2.8-sources.jar 949466 SHA256 f06c9242146ba641282ca2493d44a22a7cfd5371bde7503e59b5733b141212cb SHA512 2c6abd6bbed3d55ff58f18e12cb97dac5232b55b320893097513fdc11c183d52082838a2bdfab035abd927179fb308502440072752cca697cb8ce084a61b3ead WHIRLPOOL aee0a37bcf3dc24c13e84fc11f4a79738a34d7234ed015c11c26ec962fa15028fd9ac2f5695e30381c6308f153f6a2fa0474bc884f6ea57db620aef5e591c1a4
+EBUILD myfaces-api-2.2.8.ebuild 859 SHA256 63f1ef1a0c88b5cd5c9cbeb4bfe65d60dd78e6c08e3dc95d2d547a5ac4aeb34f SHA512 5700abb88df9d753f6a99404b806ddc4b4cb0b7114836030b6eb395e811ed4776125d2379462ac4b580d0c9ec4a47c3cbb718de0635e6108e00cf21b086837a4 WHIRLPOOL 82daa0b409039d011b1743d18f7ffe0dfe62e25877a8c1c4b99ce27d936ee85afa0d25f7b1ea53291fcd922015b8b26b40e0055be0bab21dee571b1387d15039
+MISC ChangeLog 979 SHA256 063226b11bb5f95fed2f1d0baf5f00e5f589149350f4ac4edf9cd63f0a59041e SHA512 24d0de3e8f6fd2f17eab8a4a5334edbd9bf7ab34b806920c113bd1ff2ccaafb9ae68c535836db2f666d03de68fdbc42534f624ddc83ab7b278b82004944538a8 WHIRLPOOL cf45829c81f4cfb6af0e1e89e8a744a5b2ee8e3a3b8b773d0c00f755f4cd89aedd7f4264091afe14939217f704ab8ea81fd43860bfacd0ee661a7d7370ca6401
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/myfaces-builder-annotations/Manifest
new file mode 100644
index 000000000000..29d4900f25fb
--- /dev/null
+++ b/dev-java/myfaces-builder-annotations/Manifest
@@ -0,0 +1,4 @@
+DIST myfaces-builder-annotations-1.0.9-sources.jar 43051 SHA256 78c65366542fd91e7724aabec019e744255524b1a51db89da44386e25a76736b SHA512 09bf3f9faaaae0545544b2195c8070689431bf28497afc9e317010243617137528a61be82f47123237e114b1a7f5f174a5e2cc2190abdff8beb5188e38feec04 WHIRLPOOL f05a94714aedaf18d5bc2fdb0ca07de3464d862e0e0d70a7fb6e66b89d002857e30c68c3e0afb1938b0a2cb39e3a3c0368581938529de1a9e5e867505822ca48
+EBUILD myfaces-builder-annotations-1.0.9.ebuild 521 SHA256 b4d84bf82e3b7e36fbf293df5af1ee3231b39fd07246b58b0c3ff1b007c15ed7 SHA512 52a0bef3884068312da90cc95d147e18d308d1b065acea03a8ff99985e797ea5d19a40f4a3cc73b52bc01f17f8351dbe1ab8df184a365f3da72b1b365870e9ba WHIRLPOOL 8d7047b32a3be69e40d05ca1cd7966b4b46f8b02f51806d51546fb152be5442ca1f0b311f1655a792397612db2ed37f54b3eb64a27dbdc7076a088ca73c23de9
+MISC ChangeLog 987 SHA256 e72f9ea10ddc0c10291fa43c8badd97a447cdcd72c8d4d633459f3fe538b009c SHA512 07fc2d72943a046c1eee738442d093d9053609b0c94a71dbd9abaed17a913963258ab2d2921e7fff531cc7254dc2c35e628bd9d3e0afb81382bf987be58384b9 WHIRLPOOL c3944f581c9c899fe9d23871b16cb3baaa05ffca2f0c2de3e24f04bf2c37807b4bf89478f1a15b79e75fbe33cf1a503bcaae5a66b739b7698a62ace835bd80c6
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/nachocalendar/Manifest
new file mode 100644
index 000000000000..84652cefb571
--- /dev/null
+++ b/dev-java/nachocalendar/Manifest
@@ -0,0 +1,5 @@
+DIST nachocalendar-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe
+EBUILD nachocalendar-0.23-r1.ebuild 725 SHA256 deffc4fa95a687f67a489fc6c6b20f08f42efce5184f518839a61340d35fea1d SHA512 1393f2d591dfcaf270182c0b29cf0bbc877946592e45edcb45c91a498697067d50a7d2bf59255a786d1b2638750f1a90721667cda6a8a488b06cb42dccd52672 WHIRLPOOL 4e970c2ef56e60f740fc1c5e1b66ee0db029c51ba3ae36ff76f672c895fab244fc5b91baa2cd55c97eca0fae477a66d926c9a45bdaf7a2abaecee72fc40a86be
+MISC ChangeLog 2755 SHA256 41e231248565cd9481edb79c3972f8318a4d2ced06c93d53a6fa2a308a68c5e3 SHA512 cdea9d836240edd10d82aed4e9b0a529b192c9990ca761e033a3d69cf69f0330c41723a5bf7bae7f2128977a7e083f635c3887e4a38ba88369fe477793f7b3c4 WHIRLPOOL 7fec0c76c283f83a2537ad45644ee6d571bbba2ccb8b30d30d52f5bf4905c8402765f163c379763da04d2b1159a116daf51d70c7f7751d94be82ab21f260cab2
+MISC ChangeLog-2015 494 SHA256 4ede45ff54dce7cfcc670837b41f794629de24e88949a47fca182170b1b5fefd SHA512 fd0c07fd77235b605842153b7c8ced0a9c16e7e9d1884857182ef985b15a297c6046d3d4e240e053c82deaed9f3613aac5c4a36f9445d7ea7fc9eced1590c43e WHIRLPOOL 0f4e28b12f6e3e360a970726075fde7d10b2c6983f137abf31f69498d9224f51dcecb5d426cbc025ddbcab91ea2f34fd6894f64e4ff8bc14bf00dc48d17def79
+MISC metadata.xml 299 SHA256 dc86363adcc2c01573718c4248b4fb5f9ab72af588119831102776eee744529c SHA512 271b39c2cc289cfe33649fe9b22ac6626d5a66e7c70d1d5bcb3907efbb6a7ba2205d70932a2402b439d5cf1bf1c0880a2ff1da85c21770a1e8648f26073abac3 WHIRLPOOL daea8a2854b30fe967e63f4bef199a8b4c35dae2b98e40fb39c7c438c9a964c9741846a4722fe416ca4c807c28724576382fe69418c697e829eb1f38b4dc5eea
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/Manifest b/dev-java/nailgun/Manifest
new file mode 100644
index 000000000000..914c1c451a4c
--- /dev/null
+++ b/dev-java/nailgun/Manifest
@@ -0,0 +1,6 @@
+AUX 0.7.1-r1-Makefile.patch 584 SHA256 5c32be621e0e70568a87b18fec8d0d289b27dcd4386cda7e9e9ba98e9323cda4 SHA512 818cb35a65902cf325d06c85c4a1d896784e90cb6a770e70b3df55b8e9661c6b4d83ad46c6e8cfc99c4e6d572f1e496ccaccd514b24fc6029211b1fa2cc89de9 WHIRLPOOL 9582c72851c753b5e6a9ccdcc95f383dd1585be1a09bbd80c857573d241b7f3601ac837925f5443c57855bcfff84f56746da50902777ca2261d819aeba824863
+DIST nailgun-src-0.7.1.zip 1489813 SHA256 2942760e68fabab1afc3bc447545cb532ae7bd6e779ca4af8b3163d629076e72 SHA512 51867248179487b042f3fe93585390b972d1d95928f92fc6b342c3ae663696b251fcd074c8042c6ae129947105e2203cb256a987b46dd8499bb3964302f1ccae WHIRLPOOL 7c24f82a260eaef397fc694f5e15abfe86c2463d644366bf4d59904cf632e301ec5c9f26d0a63aff4491c196bbf3b8dfa612862e59d488eaf3af6076abacd1d8
+EBUILD nailgun-0.7.1-r1.ebuild 1613 SHA256 75d5563c346dd3addda1a6c72c8b17f7fec41393be71680683045520fad73d8e SHA512 db6298b59d6393f2cdecff18112ccf0199d01e20349e4c955a114921039991449e05e1c3ec7308f4380dd85dfeaa899e54181fbcb23f5ee4991fd48567785cfa WHIRLPOOL 9f95d02d90aea6411548f003cb41892181dea991a3ddc7ab20ed49c9c18c1e708300f1f6b0cf86827dbd9074bad1ba6376dab5aa7768e2e676a2056880bdace4
+MISC ChangeLog 2606 SHA256 c47aa4ec0c67e4567e4c618abf1c246840fe7569da8706911f96233cde9a8e68 SHA512 9905520e582f6c89b938f906af418d51d1970e153487b44f77f1a7dd0cb66555ad82997d7e10f8cec4112bd05d1b5b1800f4202097185b2ab56c4e921b2147f0 WHIRLPOOL fb5e46d71e7d3de848f722da977e99c60b18efbf457329e30fab137c057a8622fb0c653ac0baefae265780dd693e2151cc44db009fb2d25cdef20629f7772775
+MISC ChangeLog-2015 1887 SHA256 0e5276e69c93efc665255c69d8c79c5b543957178a6b15b79f6b83cb30d29514 SHA512 1abdf54212744e4b4466164efbd1ab8fdcdcc02ea205bc0a26f49016f9f9ad0e8256a2114c0d78f92190625ae230a1db6baff49f61530ac41499fa9154e38047 WHIRLPOOL 2272a7cf125c8768071b98cacbe1598caacb38874c902f7db694b862e8a0bde1757c021c4c5683da00afbd080db91d5af73e58d9692d7ae8c3ee3ce07ed14ce6
+MISC metadata.xml 628 SHA256 eac461f4dfd778d8a59eed7831ecb29fb5220c88817f319ddbd3423a40f5193b SHA512 0781b073c443cbf166cd2e080dbacd51cff3bb743311acf486b8dc17f0f15a5a65f453b256dd84a32876891fb08578f930d9d2d3448671f670ef4eed3022b85b WHIRLPOOL 869958f33bbaf9785b9b3eacad8cd14c3f4fc669b93485973e1aa2110047ca10673ad67bbaaf425948bc35808a697f1ce3aba3a4777460ab0aff60c1e60d93c2
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/Manifest b/dev-java/nanoxml/Manifest
new file mode 100644
index 000000000000..c1ebedb5c5b5
--- /dev/null
+++ b/dev-java/nanoxml/Manifest
@@ -0,0 +1,7 @@
+AUX nanoxml-2.2.3-enum.patch 9471 SHA256 43b10020a2058e4defa944157ec8c4d639d8b5d3bcdbc522d264a07f69dd3944 SHA512 9cb9f5d7482efb6f64f3c99a0b59e0820658b6eed8fbbb2e014ff08d8194942d51d64b6c1661d77774f8cb484f89b9f0bd096556c000df03ab9f0a5b21ed93f4 WHIRLPOOL 825c469ae868497da0d205c831949985b5c574093cf8dde317a887518cf31d4d9d28674f6b3cdb1205345c0e7067d5d0289b4948665ee32364639c97c1ab4f16
+AUX nanoxml-2.2.3-lite-enum.patch 2511 SHA256 8dd1e3f81d312046cb1748ba774c6985ad7e28864d76111ca06515317f999be4 SHA512 443c45e7c6995cf5cd957e379b56c8b8c6573bcbb3c6439ac9d9997107893b8400b669e9c32700ee2f2159e829be44579858c96f201d365ac6ea15238f0137ba WHIRLPOOL 0e51c0e86c47cb1b83aea967497ad0186d8206da2a6dde00b81e8735463cde626e92f4e72626857005878b983b014c52e95b2224da50bc9e4e6ee3e06417afca
+DIST nanoxml-2.2.3.tar.gz 426111 SHA256 df3bd3663b766851caffba963853383cff813695dca3e827ce6e00a920d544fa SHA512 6800b86039cb555efc05644db65c516fb242d4d081ea612969d6cc52a12ffd7571e012a7afe7962cd61c28b0ebb3b9d94af76f20013f3b4dd7d2aacdc552c6fc WHIRLPOOL 3164e5c09b2e42058da1c2c3df55512dfc75245dca7857fb46085f1a6b0a8a4360397026825a6e0f3ce66fab9c55774ad65ee9d6daf072ee9f0bae42d6509882
+EBUILD nanoxml-2.2.3-r3.ebuild 923 SHA256 1d5a5075b68b18c6ee126552b6b4beb2aa0abc14d17f559284c2bc9895ce5793 SHA512 30ef7f0a4d5011e6b78d91b2b4c7a123499a6fff4c403d61f0ff330dc49ccbc5695af9ae4daa61b481d8a576de0670e85301db41d1e344ed3c333b078b4de0fd WHIRLPOOL 3346810ae5f8251504ab03162e10a785f6ce54324807ac8201d775d7a34b036b01d304d47f30118863b09d55fc30f786467491142ff403a255972b2941f80edc
+MISC ChangeLog 3723 SHA256 c1c251896de0df20714e1af11c51d1ae4ca2327f545a6ab71489c9fdb3ea8524 SHA512 9fab2ea28007bb60acbfd5557bd8eb512743004b28fe12234a2dc812dbc79ca04d0d8f2c64abffefcf5f5b9bec19341b643e4378ddfea0df55e3e2ac51f124e8 WHIRLPOOL e672b19cbd103d901bc0a9665a737edc299318fe4598574d0180debfe04c33fdddf4123aaaea5bd76db6faf9f06366a4c115914f0dbd2db4615fbcf1e2b443c1
+MISC ChangeLog-2015 2279 SHA256 cfb4ab217bda4419ac559e22c63f327a7ea6f9cc2b6c210d8ea824e2c510cc37 SHA512 efeaec05b2ddc562b0803392a7b69c0a1d7ec6082867ab90a36947440d688fef54d9bb4ad9a3e55351ce5d58ee9200967a0a249cede2601de399e01aafaa340b WHIRLPOOL 58d66d62421e82b5af2d5b3b066051a0865d62340a5204b8921d896e17e4cd9708a68130302ee5ee1ce6179d404d9d68ba4ea89cf99ba9ebe9d9264abf7168a5
+MISC metadata.xml 313 SHA256 ae9c7f0a8ee34504d3f9a67a7f75e0789c37244003b35e5459860a589a13118e SHA512 e9b3806d0286175ade9158968346fd9dc2251dd4f4f7363bfdb147bf08b60f3088d07483971c55b2e1ccf656362d83443cea57a2a6b876a0f1c6107987ee7974 WHIRLPOOL 0332a2fcb37672fece7f4501d08be4fe34460f54fd71feb9c57fc6734bf2507032cc119f4ee37c2b9bed42f45201f03af6536b8a2fcc3ac56c86aca2fcb3e8ef
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..61226b46fe43
--- /dev/null
+++ b/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch
@@ -0,0 +1,208 @@
+--- Sources/Java/net/n3/nanoxml/XMLElement.java.orig	2016-03-04 09:21:07.908000000 +0000
++++ 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;
+             }
+--- Sources/Java/net/n3/nanoxml/NonValidator.java.orig	2016-03-04 09:36:05.247000000 +0000
++++ 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));
+       }
+    }
+--- Sources/Java/net/n3/nanoxml/XMLWriter.java.orig	2016-03-04 09:36:53.616000000 +0000
++++ 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);
+             }
+--- Sources/Java/net/n3/nanoxml/StdXMLParser.java.orig	2016-03-04 09:38:44.521000000 +0000
++++ 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..f91d14c38d6f
--- /dev/null
+++ b/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch
@@ -0,0 +1,53 @@
+--- Sources/Lite/nanoxml/XMLElement.java.orig	2016-03-04 09:16:52.339000000 +0000
++++ 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-r3.ebuild b/dev-java/nanoxml/nanoxml-2.2.3-r3.ebuild
new file mode 100644
index 000000000000..d0fe385ae93b
--- /dev/null
+++ b/dev-java/nanoxml/nanoxml-2.2.3-r3.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"
+
+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"
+IUSE=""
+
+CDEPEND="dev-java/sax:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	source? ( app-arch/zip )
+	>=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"
+)
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf Test || die
+	epatch "${PATCHES[@]}"
+}
diff --git a/dev-java/nekohtml/Manifest b/dev-java/nekohtml/Manifest
new file mode 100644
index 000000000000..43634ed555a5
--- /dev/null
+++ b/dev-java/nekohtml/Manifest
@@ -0,0 +1,6 @@
+AUX nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch 533 SHA256 9d72da5a1b4281fb83514db33c471e70dbf91c1e0c9bcdbb9e41a5049ffa2bed SHA512 21c077f13c5157928f6cdc1be45f729e05b42d5b33cae7394d0d8c1167045f27e8baab89a5aefe33b907d1c3e2146030ee54a48da6d1a3bdde6c75f729dc7937 WHIRLPOOL c15097c889a72e511d8c2e6306f35b54821a7c983a0d995aa4d11d739002f4a2bd5c1512eb1002014dd21fe80650181e3f8bfa4b1ce1370eacff39b1d22673bc
+DIST nekohtml-1.9.18.tar.gz 10471968 SHA256 fbb0dc6bdc07a1b4c4cc7ab32197f1aa431a506e33caf6cfb8130766c22475c0 SHA512 f7321ad853eb63e327ef8bada52892caf58372f11136df72f46d8a7cd6918492cc66243002955525ac05fd669b3c4389e9067421f749f99f928629cc7f88e0eb WHIRLPOOL 8b7208ba84bdce1da6fdca17548f5c8b98a85a6d39f2695ddf776508c5b0dc3a724fbe994f64c37b62a718a36e41b8dfe28c73bbb7da7c0347485ebf8b811336
+EBUILD nekohtml-1.9.18-r1.ebuild 1226 SHA256 0c833714c4bd21e8c5ad5592bc24912239c3a75a421ed3b3991d23d3aea17c63 SHA512 650cebaba5acba5ce87885c3589fe9e3f8efe4ca21e5aa96ced484667399643e6609e155cfb0adbbb59128b41cafbfd6e912d1aed6f7f56dc6d7b73d609dffe5 WHIRLPOOL b61e374d80cc854ac436b7931619a222e80c5dab58536f573c40b0743b20b4f704aeb66dcdb238e1814f8a8369ef0915e8c653da7d96d13ebfdc243525f8c711
+MISC ChangeLog 2821 SHA256 4c1fe39c9331ad621a88a9b2588276dae086e41d2a0b71c8d64ef78fb7eeff60 SHA512 2e9825f69d411d81b378038a196a416697428d4cfa180cbd7dc60cdd2cc8048da9f573fcdcf029f8bfe78cc55bbaa4b31af67f82e25cebfa4ba976e0eaa926b3 WHIRLPOOL e2da5ac0b04579748e4ad847926218bb2d0e323f6b5f4e1fc594a7571e05b5a0a12586a6075bf0af1d08cc342ed3a67f1d59198c24a302fb4dc52dd2de3483bf
+MISC ChangeLog-2015 3125 SHA256 242c26e14b4818cc9c1f8a237ddc067821d4369e22084769fd6351d6245755e5 SHA512 84dd774e4eeb743b517f72cfdbc26464a9ede26402deb223ea0de8ef6b3fcc44f0bb533ebb4aaabb59190d5e854c00044068adfb92b4387e77f65afde0799733 WHIRLPOOL 3426001b236e42e3d4d35a7c876faaca197376b6ad5601c06a21c8dcb8ee37458d6a99d994d1e209226de37996a42de14d76ffa1d9639678e6c00df23690d084
+MISC metadata.xml 314 SHA256 d1e22d0606de4838f77b87f577b98ed8c1d4d69bd83a4d94411c2564526603e6 SHA512 a8b454129fe31dd7b221ea1094a331ad78feb7cbf558e256fad7a49a28c7ceb99874504c4430c1fad04e854b25a5e1005005f3c2320eafe985ee934c758351f6 WHIRLPOOL 4c89a63dc3f939ad32ce6c58f46b8464c50af4c6cbf6c97fe765e4ed2fce072afbfa373393a3d70b25bba12405dd8cd23e66b5a48779c9b6bf215a4ad01d8ddb
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/Manifest b/dev-java/netbeans-apisupport/Manifest
new file mode 100644
index 000000000000..dad6a3d3c16d
--- /dev/null
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -0,0 +1,12 @@
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-apisupport-8.0.2.ebuild 3308 SHA256 54b018cb96d5d9b7c13321d6d0c47355e6cbaba32c437c5fcd3d8c74e0355c40 SHA512 c9aedb9cbc9493fa162de599e2691eda2e6bc8133a67ec9994381f77f10b9c0ac857c331629bc646fe2a2b5974fd6e28432b5832675dc69c0d219e4233adb051 WHIRLPOOL f2a00553d44d95b70a1d0fee4eb3bb46ee29ba2ed64659c5cb88dd203a27347f86e8d5fc59b2734119ccb4f87486189601bf85d5131fa0e2977f8cb66bff8f30
+EBUILD netbeans-apisupport-8.1.ebuild 3334 SHA256 34bda9cf21a91c604690ab61b6b80cd7313123511e1a57f429828e3b122a454b SHA512 91aadba8302ba037a4cb17bcc4f561d269d2eea3fb10e6071c44d6863667bd8db9e178b183c596ce301e7f8301e8ba433682faabd3da2538cb2fe0c3179b8527 WHIRLPOOL 4e3e4300183e652a64d19ceaca6c9d432f0f5f7e69ac57c3bcdad8359a2e69964ca318a67b041de914ab50f2633f65965bf5bc29195c0a6fee5435814aa65c49
+EBUILD netbeans-apisupport-8.2.ebuild 3010 SHA256 a23992d309a91e969deb36b9ccab6bf642f17d358930b536d14b1200446a50f8 SHA512 e2844ded0c02943a8989c2e3e8c755f804d386687bf15b126933e8aff7610faa1442f6aaee73e93486a4bac63b498692e38c92ce0db435407cdf8f30b4780ced WHIRLPOOL 5774fe64354552bc8bc19b7066c670f20bae10d16828d94213c3450f08aa9d3211a9c14004edacf545e14f5844196238f8a70a67a7e944565fe27f9a49ed6528
+MISC ChangeLog 3571 SHA256 0ea1c2de6a97712a83bba6e72f091233be9ad4224fede6166e14a0b51f946c29 SHA512 cdb05f069a0d97dd8ae42862d8373ea1f334d8c3240b1b6498751f2fa67d7cfe3797e8ed5de34f0e875014c74c66c06d11b032f5e5d2f93d8119a27a917594ba WHIRLPOOL e7465e98999d9881fdbbaaaa588b589b1053a684cf90b03aed69453a457f46cebb4d7b0068ca95895f2b2baf01037fa7b3033c8592f52f813bcc80dbd12fe924
+MISC ChangeLog-2015 4031 SHA256 7c26c9d611d0ed8e68a45d59f4190d5bed0c3b3e577f50c103cb56920f6448fc SHA512 37dfb1da17ae2e4ce31fd296eb96682b99a50e7fd92e447eb61c63f44e36cf2ee6fbd8cd3769ce1e3557daf7055a6def1d4c2d98ee12f7e247d38b06b52a0585 WHIRLPOOL 61239bcf9ce2314126bb29b95cb177e485200b5aca15c0d8f6caffe550cc49b5da36c6a18250d522c038a4526635aa0a5b254e7127ec142e125dc5197343a11c
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild
new file mode 100644
index 000000000000..3302b2a8a8f1
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~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="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-apisupport/netbeans-apisupport-8.1.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild
new file mode 100644
index 000000000000..93de8bd902ce
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~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=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-apisupport/netbeans-apisupport-8.2.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
new file mode 100644
index 000000000000..787e88b67f4d
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
@@ -0,0 +1,97 @@
+# 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 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
+
+	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
+
+	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/Manifest b/dev-java/netbeans-cnd/Manifest
new file mode 100644
index 000000000000..5097f8dbee64
--- /dev/null
+++ b/dev-java/netbeans-cnd/Manifest
@@ -0,0 +1,23 @@
+DIST 24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip 28980 SHA256 205a14a41fb7232c2a20779278ee1e303e6d3dedb3c84496b370ae397a7767b5 SHA512 0e570745cfb163cb54ac8b6b0f6feb6c76e3c414f03eab213f93637dc84471c0bb5b786af096acdd6265383474bf26db763ebda066add398efe601e5749a51b9 WHIRLPOOL 2d0042e180eba66269d4ccdf6279dcd166b4a34947406b5f7279b0017ebed27b2ea95f1565e57908e3567b303fb69d2cb5ca6504653126611ced84f103650a0c
+DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee454c52dab7af01a0c292bbbd9bd5fa62e07480d4284a34e38746aba4bb501b SHA512 222ae7d6fc8a1f5610a107264fd249180a7a865094979dd5426fb266b94e1d24ef421199cdcb923ab58577c292a183863c45a1434b4dcb35bd67dbdcde945e54 WHIRLPOOL 821c0e5e9534955ee9b4200476fa1fe65b453520551cb71a71a225bb96ac69ba6c408e9d59b5df7008ec1b8d173035e76358172cf3ebafbbd50d0971db3a8983
+DIST 43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip 38904 SHA256 d97735f723292f9fe534d0821841370ee3a14a577c3fc959078ae865c16201d4 SHA512 ae3b1865e32403c09354fe9bda5092f88bdfc9bf36c18f21dbf4cccbbb2874881aee3cadea039860a3ddc5770b9ba95201faeb13ebcdfe5a403fee12e8935852 WHIRLPOOL 8a5f7ff0b4b94054a0fcd7366d37f6cc34f3c5e90d94172447993b9bc06753e13d57fbb2d2c14fe2a4ca5b15285b5165fc7f66b6012710669878cea67c6463e8
+DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
+DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
+DIST 99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip 7930942 SHA256 ad9a64303fc4db833d2789a7d5b0be537ea7db55090189411e5778efff54a8a6 SHA512 46d91f0cbe86af186b87e6b972ecc9391f5b2a670eaf7238b60bb5399c0da40382c729338d1e2cf8ab94eb4ac64bfe9253da1cfad2ec900a87d56df4d299d707 WHIRLPOOL 52ab6b35eaa04d0e375bc4aaad43c4390021309da1956e81db6ba4fc8730da147f35eeceb8a02fa7e42e315296e8be3eb03d88d7d8987fdce30ec433ac5c407b
+DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c3d3311b8f75883f4f9280fe8d6932b154c67c9dd1bd65a49beb45e578cd1 SHA512 c42e4f0c1b7efb24a45dc375180bfc8b0e02e74e01233665d3e74bf83a182c2b0bbe8b572a8eeb993d77312f6d118777d0576adfca4ea8f4c2cfe08892155345 WHIRLPOOL 41b573c7ca4b926333f28a9329a2423955055ff716e7be03b7a6f4714e7261e57574b16a0e89b96ae744dc0a36f9a4a72f8d948b11a6b8052159d42cbd40876a
+DIST BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip 31891 SHA256 dd9105ad309b56d22ef08573ec48a5f21baa2c50f8606df9c7b6245abd9dbe72 SHA512 288229a85536a45fbae6ba5a4dc085fa2053264259f14833cd435f64191a4b2f4b93c3e9981589087ec293afbb0fc76e97d2b5312a196e3b3fed11a605ab650a WHIRLPOOL 69379d331a68e1c4eb15aa8b1ff5256c9b98d9fad4688f2d306841973b151fd22ddbca25c5388af39b487b8810a2e521ffefbbb9775cf02271626179c3810c04
+DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
+DIST E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip 179656 SHA256 33d046408ce7a59158c550c672de03dba87485e0e83ca2e408b704e7a2a60591 SHA512 748979d810751d570087dc60bc02cb5969c6f713cba87d32004c505b9a92150d518c6dcf66caca61841ca8f28c16cf3cd2a5a40b370f5dec5c9482b57bd051d8 WHIRLPOOL 12cc51c73f8511b84d4860ed8c2545e96c72477755d6027a086537187ac3c16322305a0158480498968a4f71a72ff6513d91d9f7d37ab2c38c8293dceced0da6
+DIST F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip 11747046 SHA256 a65a323506d76a048f01604da1f446944eea52eba1c5558ffdb74e10410071a6 SHA512 73f5c986f132bc898fe67c528f5a356868c7d5a0dd7e9201252b3a20a4906f3e729ce5444b33197c28a94513cbc47664a8c80aeb5c114f9a58c7065b41d414f8 WHIRLPOOL f3bed3bb4e4707a2dfbbb79a78fc0ffeb7e31e1858c389d1b312c4551f68c5864286d100b08dc9651f02a3479a85826f4ddf315ca687cb249ad4366cda9660ae
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-cnd-8.0.2.ebuild 4504 SHA256 3c841ff3f1dfc22a779ff732b12c49a8e30df481ef5315e08212549237916905 SHA512 4d4d6d4a3685d3262a4f42293eeae2b3b5c42e0dfef38fbf014a202ec9f0a5c23dd0e35fdab0f058172831313476ae1d670475364a4d12e4b0e906e8d5a09e74 WHIRLPOOL e9af8a46b6156e5d05b0e58ec069096cc95820b03a54d537eabbecb0c173a117d1bc0eebda364644e5f3475b85cbee152cedc0d94350b622a64283bcb33a51df
+EBUILD netbeans-cnd-8.1.ebuild 4740 SHA256 6cd8afc038168f97d8a595c29aa9bfa327e09eed00dff7551320111a7f8c4836 SHA512 d58aed66c39c4545a9d2b39f5d73998864accbc4112f51291f6bd582e4df96ed44bc4f2515d08f17a93dd8dcf6f7ee4f6bd7c27a1697702c37e91a03894144c0 WHIRLPOOL 8d4a6545d42a380886de7dc071339d2bd6e827a9a68261d517e746614539d80ecd6b0f9e168d03f40de802d8402900cd375ff73a174cc70b66bcc896d172ccd4
+EBUILD netbeans-cnd-8.2.ebuild 4416 SHA256 24d9322cfe545e1f56a5d3c5b65ef9d6cedba88d20dd0f00a4c689ce6d0db431 SHA512 bfac943aa83ee1ade491c83812f4cb9747289303b960335b6056a9abccb4b1f6aa53949e93308f172f073f16a717269278e3165b8e5b3a0d4a6f17f1e004eb04 WHIRLPOOL 58ce60e7d32ab13a7247d077ad23367be794319b5a2183c36af0368577d245fa021fd9edffb89c2fe182c5724b6e6621439590e0710827b838201ffb6b16f4f9
+MISC ChangeLog 3470 SHA256 3b0a47b0dec279625f91afc7015915fce885e53055227067764647a563a6a6aa SHA512 0d6a68017ee474d30bae2b5d0f62cc5daf92e047cfdefbcc1041dbb8ddd54a94e166f202eda14e57bac5a4484695aab1383215a2d5b0ab4fd8b7cc14f32cb881 WHIRLPOOL d42eebf8db9bf6b62e5cf1b42de4f0e9b41d94813648e1921b7d69a20b6577a6dbdb78c9b03965b1219acd17f80776cadbbbebfcad55607250a6f312b9168262
+MISC ChangeLog-2015 3982 SHA256 fa50598f6eca568ea17186f2bb38b74877052f4e41ff82ba9ee443a8d7659e16 SHA512 d3f881f99adae3e1f2e9e47051425158e68426b13ed79c99f8724551e22d45199c94ebee62459f7bfe638b5fffbdab5a76f92bbad2d93d1ccbe461344bd77583 WHIRLPOOL c4a666bf2f16b51ef14b5454e707c07b3d6657d5d03423bec1bad8c56720d529f923dc00432b119b80ab70a573ce2fe44bc25c2333733a8f2d176eaf72ff8566
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-8.0.2.ebuild
new file mode 100644
index 000000000000..2a48d8be29ee
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-8.0.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.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/24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.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}"/24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/2BCF2047382FB68A2F275677745C80E79B4046AB-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
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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.1.0.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
+}
+
+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-cnd/netbeans-cnd-8.1.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-8.1.ebuild
new file mode 100644
index 000000000000..c84ae80267c4
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-8.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-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/99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-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}"/99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/BB83D4F8047D608858154CB041054F5CAE35B903-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
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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.1.0.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
+}
+
+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-cnd/netbeans-cnd-8.2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
new file mode 100644
index 000000000000..f26b61f73473
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
@@ -0,0 +1,113 @@
+# 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 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
+
+	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.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/Manifest b/dev-java/netbeans-dlight/Manifest
new file mode 100644
index 000000000000..f87909a8f66b
--- /dev/null
+++ b/dev-java/netbeans-dlight/Manifest
@@ -0,0 +1,15 @@
+DIST 18E39A0D10357B72EDB76F2070E27019317792F1-fs_server-1.0.zip 474820 SHA256 4ec868376d201548ccef50cfcf77b54cfd6a9e5a33cb058da6143df662de6405 SHA512 5bc28a6ebe734279ce4999f4657c34885f91f2f44b157dbf65b3690986189961fec138631fe39274ff43762ed74860f3adc1db605f79352dfdc362d2239677a8 WHIRLPOOL af2a8d75b4255094d5a4dc4e52c3052dba6d92717864ebeebb7cbcf8c14b5bf84a3dc737ce3a3bef98bcd530f2580a534b8bb51739a264396fd189c43933b1e7
+DIST 457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-fs_server-1.0.zip 283369 SHA256 2da5ca58d9960bb19f3b573709c0f73a408cbd94a19e89abfcc261b85decf9d2 SHA512 60a742dad5967c2eb5350d62cfc39925a4413fc4dc904ebdf1e6a04849a4f659dc75ff6166189957854d1241badc0bc0925aa868509d96495f41f4d91565a545 WHIRLPOOL 27e8e1219ee65f87b4cf0a24ac9955bbf65e33d4cd2315bfc9c157b170b6b9eba1d703a72a4a1a2ae05462b6c8c99b82b1e908362d65bfc36685e2c1ccb75b5f
+DIST 51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip 453773 SHA256 9b339678aac261dd2353a4938be897eebff43c34a532263cc0c827743cd4c1b9 SHA512 ea965ed488fabe8bcb93e4b95d3c7e6f546cd8a30ec57b0268645e8270097308be9eaabeb524c4401baa78922d6a782021b46042bd44236e19ae8c94ae2e3a02 WHIRLPOOL 9044f2eb2cca1205266b065f6bf086140a33acc33b833b9e367b5f888952fa786a58bb29cf0947a863caf3c00b60fe418b8a248a06064197703d230c2374b358
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-dlight-8.0.2.ebuild 2892 SHA256 5ff3949053ff6bc6b5eba766d6293ff3e77e8bad284f0b5a4ce28b124a3146c9 SHA512 64932a2e50f5466ae6648de59dd57dac4237b32c94e45d609975c6c904b63434cda183b53d45592a4f6f621365d0e4a4489e4daccbb989b25124941a69eaa92c WHIRLPOOL 749a028fb93a4bf3b4677e3cce5f89ddbab1015c232582a258cee346e5b02e671523b7bba69c75c8da1d987c0897343a85c947f8ad6523492b9ed2f84cd0212e
+EBUILD netbeans-dlight-8.1.ebuild 2918 SHA256 fc6bbaa50cce56b616717dd175f1848d9afbec6da021d3bbe5669b4f335b4362 SHA512 8693cf04d53b2e47e6495bd47f11e070dd940d056d57db669678168995fd4b067424de6968eb5487ecdbac47570d4e5d6f0d6bdbd1bb67324e750ad0c5b3527c WHIRLPOOL 9976306ea466a44b2ae10038a7593f7e8b1b0eda2ad58bc56dcaf9b11ba54afec86d8a6a0446c717d38e6841846f1e759b9aeebd46e4389314a4c60be145ee57
+EBUILD netbeans-dlight-8.2.ebuild 2594 SHA256 90b081a8c16ff61a94b91c48fd3544b6a8a8633e41c74229178a44a62b5545d2 SHA512 ef3dbf1c870c324c9fe04b3310c97a33507064d6f24cf626f04028f7eb1fa22ad9694aea79bf03fd13b4cdcd0c45d413936970fc800f3635aed195df327ade96 WHIRLPOOL a1be8b22fea46e765cf56e41709be223c55684fce759dc7382d13805166d289f4351bcd092a6ddc76ac49464d9d593a83b38745c1e6c53880753a773ce3daec1
+MISC ChangeLog 3513 SHA256 20074d959e759f481ecc7d85cb183d5529ec7372aaf4f9b9336a1249859f019f SHA512 16b775564c1d19f684f79dd75e791a525dd49155c6cde8f9f932e342f7cad97e702d16b9b11cf51da196fdb43303d7b1ca2c3f08ec845abba1a3e4bda837a364 WHIRLPOOL 9fe867f0f70ee3da6264c923bf9adbb49a5258110497709b0a1fa03101aa0c9bd17a713d01cd3f8eb4c708d38c8246509f242cd5a9a835f2302788cf96659d74
+MISC ChangeLog-2015 3829 SHA256 828ec14a04f62d266bc79e3ca67b56808dc58f40c65f4ecec77e24cf8d206711 SHA512 cb72faea72ab04bc1847b075989af24f2be79213d9ee40d79593a72d2e0f230a115e369589eb9d25b7dae5d42e96e1e169ea8775e62b9efa384c9e86caad2d9e WHIRLPOOL cd74eb2d393dbb2442196ba0cf9ab7872b1d9cdbf72438fc5a744764c14363b82dec72de6faf71a8847da5d6f94066cbb80d75e344f9613b9543881448ed09fb
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-8.0.2.ebuild
new file mode 100644
index 000000000000..9f07aad0a1c1
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-8.0.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-fs_server-1.0.zip"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-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
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-dlight/netbeans-dlight-8.1.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-8.1.ebuild
new file mode 100644
index 000000000000..a4bd21852b2d
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-8.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-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
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-dlight/netbeans-dlight-8.2.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
new file mode 100644
index 000000000000..535be0582236
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
@@ -0,0 +1,87 @@
+# 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 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
+
+	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
+
+	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/Manifest b/dev-java/netbeans-enterprise/Manifest
new file mode 100644
index 000000000000..282aecbe103e
--- /dev/null
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -0,0 +1,45 @@
+DIST 065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar 2650526 SHA256 a6278a47d78db68718548840e1b4b7221c573c91f0225182f2e59b2e8df31c17 SHA512 070773502d8020e17b9b3ecf881a746f0a19f2781d00ba49e8869ec3dbf4166a86d5e52fc016f4c23a88a10640df7924c783def4c88cf959e4eac9eebd7a39a8 WHIRLPOOL 91771636a1ed40ce520ae001b478bbf43e3b281521d7ee40a13467dc464144512691d02c04f126190b722f8898a651f29d32d2cb9ba4f66c5a6b007b85881991
+DIST 1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar 26124 SHA256 63bca815ac560f486577855c6fecfc6607e048d45908aa21c6ade436f52f06f8 SHA512 78a2eeed3262e4105288bef7ae8653a0c669ca04d70d4064b3b73ffd2bb22a0448d9750c4081261cab17dc3a821cef7af0b06bcc29354972d306ace9e07228f7 WHIRLPOOL 2eac397f513c08645cf681260dac4984be2b12258b374fa7a5399f8b6e148fbe01730d8dd156f1bb7dc780c91a708486dfb7f47cfdbce65241b6fff408273726
+DIST 27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar 13112852 SHA256 fc89b7fcda8221dc504885585be042b408c57466bf2aba3999f9056d7c843c40 SHA512 07697423321a9726eac7e0640befcac0de76cc88dcf4245612702fd9370c2df4256552afb47f25b3b75bf9ea70c2dc0134e3cd7caaee13f510336351f7dc7c38 WHIRLPOOL 0d263b909fca0296a5f1a8774373faa7d8b53954b3dbad9f2bcc107b2fd1520a30f459c93471f520e24d8fcbebb06a904606878d0d236040181ff9df06b4974e
+DIST 33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar 699557 SHA256 0f1ef4dc9718050566e4e9a22624743b792cf157e45544491e20e24dd7d4c4f1 SHA512 9c1e79976794e71aedf598c53ab999c56c52f63c5d0dd2ba8c8f17166bb6b9642380ff5043299f5c22f9c74dfc833d222e6a17de8ddff7f00604e5ad1c1e6833 WHIRLPOOL d218243da339602eaa62225e7ea88ffd7d6c3b6cbf52104a9b60a0985b536eb7c471fb6dbcaa8c36201f5992473b1d044898037f35c48a7f291554b58dd7472b
+DIST 33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar 181041 SHA256 3ce38de51f4e24668c6d184057a8d08541f9e815d2d319d0f462f083092b29cf SHA512 b463ec2e3fc27ccaa69b50e6eb35e89d2df9bc0e6b50e2bd4419a70c4058af3f456d25bde6e625915ebc5a010824dd8efd1176f3854a5d8bbb261b6a49c38429 WHIRLPOOL 9cae01ea3456da942e9a833ab52e97bf55e25e186784ba583ccc2dc00ae3a36042576435216aea25603ffe69223f3e75adbfb8455278ba88968917a3ba79df75
+DIST 3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar 351132 SHA256 1916c5b4fde4e424097f35cda9a3bca8de4e9a2b52b90965742d43abd085688d SHA512 104c7c13e38281aa9d725d64f3363eaa32ae946bc4896a2595973b342574eaaf21166373c300808a4970e89edd38f58724a32cb1abd212fa63b227edaf060b1a WHIRLPOOL 187359df8539e07fb3825a5f8657b804123347f04f81b7db1c56d2e738ed49bd6cc1c30d69209bf479742f395b81f5ed7a0b52882dc8d73220f62bd466032ad1
+DIST 45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar 113208 SHA256 0da853418cc885ba06ce8500a2cd9799606a8b9dfd19ca3a8a5d95b65291630b SHA512 3341353caa0a1f0eeb8d15d686f86812784153f83552461396827bb1b87b0199f22a7eecb1eeb70b1bea4fefccb564a7770a1b56896186f4498ebd9b7f3cf3bc WHIRLPOOL 491e8bd622ee2f0639ff682636743f7ac17085ce223f92de7a28f0fc6d959526d26b5425318fea081154e3cce4564e2d9d7f70b31c49e07e8c0acfa166065a77
+DIST 51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar 1930692 SHA256 16e51bfb2a6ed95d600e7a541e53a42b8d39c87d23b5f0e6460dd0dffe84903e SHA512 e1e20ee7559cbbf83707829409c3f6385660db68aa5706a985dc47b2fd180edf34a4ef4b3aa429d3b5888fba70843b991129303dbe4d7f6afce67c6b32e5cdcd WHIRLPOOL 5df5b72620f44e483739dcb8b8a33e1e3d98b561359d2071fd41d201125c93c77f0ac6c51a7f756bf2288abb2f7aa85f902ff3ac96a2dcc8a1e140d7ee7c0059
+DIST 5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar 405951 SHA256 50c513e8500dc55e813fe282f84f7b4fddbe32f44bc08228e7409f9362e8ca18 SHA512 6b9e6626805d230ea944e79adffde23dc809ed2a7dea7ae2858426bea9239fe86e398fb0f76ba09f4f548857a092e58457e41d26b93bf09850b68dc5ecfafb4c WHIRLPOOL 0eebc66890cbba89fb10994271f4b45daf71743830a3875bf3d5940be1ad801fab986832792233a031597d95f67ee87e58e253a8686f7bf69151912cd25aabe8
+DIST 68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar 368265 SHA256 887e267fb35675a7f3ec5f027fb4a4e2f27f477e6effe2567e21eb1a72f7d709 SHA512 fb66409b1ef68e7e29287b0390b9e1411e9ebf88a2acc4be29c3c2d01ef49b23f961fbe238dbfbd81d16dfb007cc7326c9f1a64a65442a34fb54bbbe3a4faa9a WHIRLPOOL e2f3e6297a5b35755199a0bf7cb157075f480872122ef53de7a84722a1ed67bb2daac937493d66b5c6e58a3fa01f9d88dca899fab4e146f69c4b6772bbf7e830
+DIST 75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar 457272 SHA256 733785a50767a535feb3d6f85f2b4eda704ce933fe14c7e2701682e42feeffe9 SHA512 fd9804bd80efb1330e66771f3dcb71f99585d610a02a3482b3a429de28e91a4a9b16cf5dcccf325641dbf51a443a28ff12cb60480f71c2498ac537e8db913dde WHIRLPOOL a9de025ada074c876ef35d814911a72d56be3996579ed81666b06b3a3a7e3b1dbdcff4467d3c69508708372c7e51b26f8bfaaf8755b7a69b64aac1abe0b92c75
+DIST 8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar 2866088 SHA256 66d06459dd2213a95167d4ff34ce7dd3c83097d698582d087f04ed74c3c0fce2 SHA512 cf9e29e147605438666f0e63be9297e7a5ab8c4e7af3a2dd8f363f1a6b2b360deb1445452810d2a4e2121635a71d9939c36e66a68a6d971501ee3d6e275b782f WHIRLPOOL 0c76e8365d3b75f82176650bb273327a7c5c561b6d63264137806cd21684cd1804b97ef3902b548e965ebc1c20cbc1e3da91da849802c52e297649f4ae396aca
+DIST 9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip 4151472 SHA256 599e77902916d07d6fddfc93b072f7e3236c7d016d0e8bbd7256a1b23259fa10 SHA512 c83f67fd0e5f9610a7d758f0bb6a0108d90909d3f91034602a44cb7c573665d2c61154872f798c94ccfa6c568f5e692b9678aa6f6807f8591e94a09791acb2b0 WHIRLPOOL 79c7aa283a570cca8f118dded6f8c13eaa19ba075f723ae28cc98ba1e7b48f5708d497fccd2c19ee94843d21537dce4430e23930b7630b283698082526f02d2a
+DIST 93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip 1699050 SHA256 ce29ef11b17fe5e36304bca4383af8a4b828902f2da1486509ca909bfb93eab4 SHA512 ad472325f86ebc85fbcd8c891ec7ac726046365110318d4b9cd6922935e326d98814ed10112054ead847f354f3f98f3bcb69044c4c0507e1da5d866b661fce07 WHIRLPOOL bf4214c747a8c53b5a9b7f5ae5d6c8232c3a2f1299a19584371610ca77807741e8faf07c0d02e82254fd88d6e97e74ee3c04fbe3cb3678881d26d20d0c116e72
+DIST 99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip 2910708 SHA256 a66428f155f8540a2394fe6a036d79aef81578b5a7f70bdd8f814236702d9f32 SHA512 e192763e7b10921747f5a1ea6c1f8ed176302dbb72acd4ed1d473d0edc93766104fa3f2a0f0d31de3f8aa9f032fef1f10af6f1d12b00902bcf090af61a5484b0 WHIRLPOOL 0831a801015de329a4c27f221140e42601eb7440abef9415e109d7131ec37f767421eeb8192c05c61a6df056762469ba344f847cfadbdbb9502133ff549d2bf6
+DIST 9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip 2728179 SHA256 3358f1162cee8d118bb844cb7b1bffb4499d0377a4db6733db3b94600eb60290 SHA512 3e4f84a20cb76697e96e54b2c36d29e5696f674a9810ca1e4112b792318b9a54f928b7c22aa5ff07acc08879556faa950d147955576f30320b485405bb340cca WHIRLPOOL 4a78781b50079447fe530448fa3eb4d555d6e6643e6d34ec603eb88934823c0d722af869c4855e2afe63ddcc06f7316d9b331f44b9e992e5a2772e8ef229e3e4
+DIST A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar 52314 SHA256 53ad67e10fcc5f79f00955d57b624947163b5ecfdae85fff74c7913ea1fbed36 SHA512 ff726c7bfc9d855613b6773e78d220078855cff2c8b96f063d546301cae9ec0e21251631d2ffd84b52ae532614f13df10fc1da2d13264e0bae8818f4f69ec996 WHIRLPOOL 39e0bf0ea0fbbea0d0facb6110be9d8862d9d2902af5d365db978c320b33c0eb7dcd5234c1ae19eb7a49d27bbc4f1694f73d585c419633f06863667cec9205b2
+DIST B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar 1315115 SHA256 d1e9c082e8fdde71917a655959e3c3b41fc3664e215b37740e74cdc3e40d2444 SHA512 5f3fd68121c7080dbd932110a6ad695cb0a860aac23a585707f23bb48727f341dee82732f279d3b580a7969b1ca255ed48d40965e29eef488154965d253c114a WHIRLPOOL efab056e211db44e8d44268bc13252fb918419f38863df3a9d9772d32f53c87373311615a058e9b03d421e96e5fcd01f94e9cd92378b76bd4b7435476e51881a
+DIST B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar 22020 SHA256 852bbffd68780d711465d051a5474aecce2849c1eb027447c57235ae5d3bfe1a SHA512 89076160994f4bfa8e270eae1e6b5745ebafb98aae945e2ed8be6ff2a717002bc7879b4ed77f3ff28e9611476eb1ec5dc58e378da1cee87bbc363f32eb9ea6c5 WHIRLPOOL 16e0f09094c309e536d3a95e6de4407e0d1914fff6728129bd4cb3d114e5667c29bf64b9a54b11db801fe9067fe752b6be62c8cd327f4954f62ac930e5b19dc8
+DIST B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip 1801252 SHA256 a1cfd1d66f6c7089f3b3702781d339d68fa27947e3e38040608bbc446a77bf23 SHA512 d02b4d2ff052de35f957e8093f31f55d27dd6f00d0fca035fe6f2f9c0990ce4a03709ec3273878a326937c44d4d580ead666f94a0649e1dc9e00133b5f001ca1 WHIRLPOOL b9fd092d27be47a25e0a841b73d754482f79c5ab20b5164260f3cf2d956d0b6bc055fa6661ef6ebabf0e3be5a735e61f1c838a3acfdc82e76699e3dddcfe9283
+DIST BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar 169152 SHA256 127021c5efc22dae771652397f107ab38ea08ea88ecbebba0b6fd2149fd6acbc SHA512 9d9b00cb1c1ae0effea11d17b941987d222c0a5f9b54a9f8a60bae1b4e0ce5edfeb57305207d315609c9788454fe32614463a4fce3a0d8c9cbf1c86866496a78 WHIRLPOOL cf85799941e5c43b8f872f1212055035131331371fffdf2f95089be0ee66919c8358ae58ea16c3543c163d8d2494bb206806b48b74c1bdf8c652a64c15628334
+DIST C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip 5700763 SHA256 de31f292e3a5e20e9b1524b64eb9ee369d5e4e99de0612b35267c2b3fd80bdb8 SHA512 c4bfe64dca6c5d12ba76fc67b01748bc0d44d31c4954cde9b3150d2b0693bd4c6a01e2bc12186b310590f4fd9921bef42b103c9292273de32731b76744025c0e WHIRLPOOL f0e7fd4cd0cef49da2c470f3f60f8206549ff43b45e3319b6b0bdb460041da71b49d0643b10593ebe82ec1518741dcdae073f681c1e5c5eefa1717e39a839151
+DIST D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar 46337 SHA256 15a5842aed6eab892233da14f42fa8e94cab3aa2198d94d32bdf1481f97fb4d6 SHA512 be846932b4942a69acf0f4bed41a02c98f05c9247103518366a4c69ba051e6513c4142b831430dfdf3b3c5178aed981e4924e5ce765bd459670889942b544d1c WHIRLPOOL 0306a7754aac907fabd6c6d8978da4bb84552a2241132ed2c47216504f82caf1f67f70f10239c99edaa18a93bd2c21d6624ca9240356fbf3dd19caf2e42a4f30
+DIST D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar 979616 SHA256 a045eac0ff80c5c0fd29b680599f27598abff16b1e6c9df46ce962a4e0b1390e SHA512 3f69f0a8827cd58cb53e9a1e25fb816760b91d441286f0534a0cb2f7a07f83d8ec1a50f8bdf6fe3b489bf66bdb8ac363d9f5c6fecb6fae8ff704f1a42b0aeab6 WHIRLPOOL 1c87f307ea96d6526b7d4b9916ad0a258dbd206bd712faef7a08a791fedd401a734077ef3cf7615f817c8031758d17d5ac65317d0421f5e38b4321cfe89e8793
+DIST D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar 21631 SHA256 7fc569141b2cb6acb1497db768d3bc0548d3f19823dc753cea512f8125a475b6 SHA512 6c2e3cfbe53a2888b962cc17811afd0aac285591bba94b9850c6733ae841cd5ceff5588e33d1ae3f292e314050bac5576366c0d78a2260dd30738d1ae68b035b WHIRLPOOL 20d98562c4d0b43dc3dac71ca92be6907c9dc7e51ba503ef8e8e7f8ae697a61f4eb80148896a2fa5283ccc8bb8ca8d024845930a6f4e9b60b5ae6a8b8eeafb8e
+DIST E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar 40812 SHA256 fcd7b4e8d2d95695ada27987dd35d52468248801cadf3a603d969ac29a99dd8c SHA512 97856b5ef08a1b0f2bbd2a25421f364a35c005b0bd9270058b38c19fde1baf311af5bdf8c9c472f2d8e0ed2c4096e493319b3b1d2479f9a9fed7a86c69213869 WHIRLPOOL d54f4762953d4f43a41959b2850a7802522a8a4e62ec852829c24a510184193583bfc03741904e38888e3378c42c20dac53b420db992015e4d4fe96988f569a0
+DIST EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar 105613 SHA256 47a602c750eebebf967031748b85d14c0c19a9a1a80c0cd7d1505eae9d70a6df SHA512 291358cfe1ea240e70ec190f7dbe9541bf5e0c3d11c774948eb4f45d6ceb1c11f7fee366152bcccd1c60747a6edf8049be5f09e40cc43f0ee0a22f5fbf02e9ac WHIRLPOOL 929108059a97e8547408db5f24e476cdab0927c1013837e0bdfa4d5dde551c4ca95b23aa8d3a1e11ace2ae682cb609c3dfd9ad693a4b4276b5a21d9dfdfb20ab
+DIST EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar 930427 SHA256 7f1621299e3e47638571a4fffda5c33bf2b80d6b4cb1cae52e0f6b85d7ac343a SHA512 178efcf9dd9cfdc6185128b62ffb3fffac7cb5755127e9af9b8c70a3932fbae06404cb281b0b768dbf43c552aeea78d7b6532f02278eebc1a213707ce0f192a4 WHIRLPOOL b5666a7cad8501de766b587e35672e61563642315ca4f40a835ea0097869922f16d488c5d03e1298f1257cb7432c75100dca97d6ac6001e983257a9b83ff2d42
+DIST F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip 14764137 SHA256 a2ee96b922c73ca4597710145bc7563da10950d53f064412f9d412c6f5a4603c SHA512 a6a1ac748e3b419e414b34b5014cdbc1ff3d53fd02160484e683f7237042d73d87c524c3d1293f311282997ddb688b5dca534abb594232ef16d9af758aec1415 WHIRLPOOL 7004a06565b30274e8b6041020281df4108011f7127d6acd00439fc856bae21d3edb839f03eda73d844b6004636328b8829988c95d2130c64c8018e88b05add4
+DIST F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar 32522 SHA256 f8fe158caa6c220bbc2d94da08773af101909da02ff61725392b7c603dd693e0 SHA512 c78db8068fc7e6aa67f747bd474372f4c2133099f732ff0c1d7a7f17661968f2f4f3ead43301e74a1c9e892861cf485df35246b40aa6810afbe908ed5a7639a6 WHIRLPOOL 808bd3064fd4b528abfd5f26246809fd5d0c7e830d23950592047252622ceb7773cb10ba774453ae72fa87d729044828f3a325db0d6388f943a10ddbb4f7380d
+DIST F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip 57110 SHA256 fd191029e59405a3eedfeed81cfc0aab4e4f44c3d7ff39417a1975cedf12866a SHA512 e5aeeb3c41904ae293bf9186c68b6ad2033a39e48c0f2de4e3dfc3c89a6d3ffada54cd98576b0759cd8a104ddb57180b5860ec52a36d81d5f0cb3f04338abf83 WHIRLPOOL 0586211752a7e6e899a3af64d85b0e795ca3a34afe723b5c0bec8d582a7de4d52d3d765b037678cb2957b1957093e6e23fe4fb057903bb777bf55743a13ef0a8
+DIST FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip 5025064 SHA256 7233497b97430016cd84dfcea79907c5c00f44fff09d448070d2b9799aea4592 SHA512 8624cb07f939d36b7528343b7e3690427578089de7a1b46ed30d576b69002df6f1ffb5878e9c40624dfe8ccf898b7a0be056333184b51d26d3eadb073f58241c WHIRLPOOL 065950e0f5f0e08489f8a38148f99cbe0eb1194b21f4725ef9c4ca9e8deb5ab202851f91e0808c5251d31160a0c3df5779edfe8038e54f62e83a6a98aca424e3
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15068 SHA256 ac72a6f9c4c859a2f90d775b65e4fc349d0d71db02d43cf6980bc7f48990bd91 SHA512 26b8b896d297c0d44cfbc3841289d9ba55346e16cbba0ef056ae1e543185740b1759bdb7bb176ccc7b448a3c11199a2fb04a767b0f4b9b3e1c1c13f26c762373 WHIRLPOOL b7e7683d86c2eb80419745c8d5b77d8a170df071868e73ba07393b4494566a94e64f3ed4e4e6aca1021d3c91ac2b7df65d35d3217956a5fc2115c2ae93469342
+EBUILD netbeans-enterprise-8.1-r1.ebuild 15884 SHA256 4533b950a170868c65b2bfb4642cd4a568ea6cfde9c3c5fafae62d7df43039f3 SHA512 6d40b8806450cea5b5909d43ab545f2e3fd55b0530ce8a6ed39515e1187ceb6ab160eaec179d45253b93639bcf419d080e1c862328d4c88af3a911b1255314eb WHIRLPOOL c4878ec0f4214b581b67ebc188a64ea132fdc2ca4574dc52cdb7c2dad0ea05aff313a0dc0b103bcfa37870b79070a725d4654b270895930bf1f8b61b087bd37f
+EBUILD netbeans-enterprise-8.2-r1.ebuild 15452 SHA256 5512a3ddbef67d75048e0409ad488789f88a52284a9249d0b4faf477a5baf97d SHA512 9796d2a201cab8f0640ecfcc9f35b48f9304e999da28fc823dd32ae64e3257818d9e75e68ae4b6ad9bf0dcfbcec16641c78cb83a9ab2804367e4a59e7cffc1ec WHIRLPOOL 0d9b1c956d67f866abbead3e8bdb4e1f6b06993ccab95496b0be9c475137bce047a68bc5d0ed44c5bfc69555c0128300fc44cb3873b12832711d1fe8ed28853d
+EBUILD netbeans-enterprise-8.2.ebuild 15451 SHA256 7f1593107c12f25f5b77ce9071993b471f350947ac0769c9c6cf56113c90ce45 SHA512 dea1500109898946c8209a38f1dfeb05f35cb5d61e9cee138b73302a74e29cae1603bcc4850baa4512c1551a0642924f5cdf056f0bc505a1837bbe11d991a1a9 WHIRLPOOL f7733a28c517dbd2c01b6ec9dabebea889a5c6b8fe39c631260f27145709885c9bce015fa832217b80e9201edb90ab15ba3288628fefbfe73c5b74bbb6ff5a8c
+MISC ChangeLog 4738 SHA256 c0974e9ecbd4117cf096dbd6db83b42232037aa3bba15b92806bcc240eae9ca1 SHA512 95215b083d03e25e18726ca9f182a49cdf33f5ee219563fbfcabcef25daf1d6f73a51c575ebc9ae88218b3403175fe428996ceef614416b9806be85ecd016853 WHIRLPOOL abee9a9756d68b63027a97d951d233a48f10abb92fcd8b449eb18fd6f69fc2a0a926872218f1dc2542b715649716fdde1bf831df05d8784fd2a23e1d5855e141
+MISC ChangeLog-2015 4031 SHA256 745c5cb5eac548e10092d43c5f04ccbe5001c3c6d4d0e79a5543160619ba871b SHA512 8cf0fd58d2a1c5ee2f50c6d5e8b73dd437a02b01751f67ccd1d1811f804e6511a4b71ab2f9ec129a4479b861c8fcdf5ed638d7fcb8efada5940e06a7c0c55184 WHIRLPOOL b9dfd4354f4e8857711b251aa01a2268cc00663ff676a06e5fff936efed85c501b60cfff106abec10ab71b047b60e9b919faebd144c9b7ef99def2d7fc398ede
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2-r1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild
new file mode 100644
index 000000000000..aabb34b5b477
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.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/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.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-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~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"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jsr181:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/antlr:0[java(+)]
+	dev-java/bsf:2.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/jakarta-oro:2.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"
+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.0.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}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.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
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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 --build-only --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.10.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
+}
+
+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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-fileupload-1.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild
new file mode 100644
index 000000000000..45680a5d0146
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-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-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~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"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jsr181:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/antlr:0[java(+)]
+	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:14
+	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.1-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
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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 --build-only --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
+}
+
+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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-fileupload-1.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm cglib-2.2.0-b21.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.0-b21.jar || die
+	rm guava-14.0.1.jar && dosym /usr/share/guava-14/lib/guava.jar ${instdir}/guava-14.0.1.jar || die
+	rm org.osgi.core-4.2.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/org.osgi.core-4.2.0.jar || die
+	rm persistence-api-1.0.jar && dosym /usr/share/glassfish-persistence/lib/glassfish-persistence.jar ${instdir}/persistence-api-1.0.jar || die
+	rm validation-api-1.1.0.Final.jar && dosym /usr/share/validation-api-1.0/lib/validation-api.jar ${instdir}/validation-api-1.1.0.Final.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}
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..e0a8af40db80
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
@@ -0,0 +1,252 @@
+# 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 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
+
+	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 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-enterprise/netbeans-enterprise-8.2.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild
new file mode 100644
index 000000000000..deec28d78b6c
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild
@@ -0,0 +1,252 @@
+# 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 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:14
+	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
+
+	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 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-14 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/Manifest b/dev-java/netbeans-ergonomics/Manifest
new file mode 100644
index 000000000000..9640097b691c
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -0,0 +1,12 @@
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-ergonomics-8.0.2.ebuild 2837 SHA256 de8867487b517a65de2ef80aa531c41ecc2298eabb5714dcb9675e958d084f23 SHA512 389cf895d6b09ad3a1797aaea255340f7c4ee866660699a0350bf99135861b3cea83ba0d46fb8ee48c9269b1723d9043666a9e4b2273d68990f8574bd07bb240 WHIRLPOOL 2a79069b9410e4f3f5c64fe33dce3a88c02c30b4840f98147e0984725b984bd372d4300c25edd9ad4cfb44b70075c161766fe7a3d33e7a6fac25b8924c5d6f62
+EBUILD netbeans-ergonomics-8.1.ebuild 2863 SHA256 0f3704373f717678f3dada9964931c7a9f01ffc22cc6fc69c7f284e2d54ba8c7 SHA512 ce52423fcc9bb0521474f9b10cda240d721e9d89a6f16314d99cbd599a09f8303ff1f460a0b01e64f14ed9fa3348fcdb75ee7d724bd17ebcd9d7ffb7eb4890a1 WHIRLPOOL 194f04ba6f90d0eba8e08b1cf97e4ef1c3b54b11b6039a17595cf1ad275f3afdd2856d20d6af911edd32cc253d996d24798fec34e4d77a5e8ee42d5123ac0425
+EBUILD netbeans-ergonomics-8.2.ebuild 2539 SHA256 cd38fc292986748ceb25d8958fd65fa519d8abaf6bac1d8b9f27641f3fb5b646 SHA512 23405528f0aa14e982dbd08a8aefc4b9ba4b865fe2f63bb38c95319597151231a1f9bd9e25937026b794dc2472141755db2c43d558425f86c2f3ba52ae373ada WHIRLPOOL 07468d8bc9ea7e26c9498f22e2f6fbc0a7f24256998c59d7342ac0f70766a4574640acb1e4ec80ea68c5509b9f4f72e037e85eb236d422471d4e2c23818d684f
+MISC ChangeLog 3571 SHA256 6f8f6a10bf145cb02b8f571bd03582cc0902b6e81f1cb1c649fe378062d8a8bf SHA512 5795f53489d75b950ca01daeca04e86118472fff493bae0c275575be1e82474521366344bfdb1d2ccceb269c913a0dce0619e9ef68ab54c1326b458e560fb6d5 WHIRLPOOL 91624008e35ddc7aab6e1428975a56addf6fb508e6fc0222f608097a0bd817fcba121a14c563dc5bdddfa11a28957afbc6faa40ce7f37711b32d61551b530e29
+MISC ChangeLog-2015 4031 SHA256 cbd5e8eefe9e40be9c1e9625a36e056936bd3295e066e7de152b0023434bb645 SHA512 4c078eb208f7ae793fe6301aa9d59e9b8067a08b74407203d2b61099bcc87887ea4a6cd002baa936139b92fd528f23a2951b0ce4b5fdb09429f4f098ee4a02ff WHIRLPOOL 2e9612205a00033659bae7ab8de010b3302c1ab3a44548b0f45165bd59fc1c6c13ff1d3db0dfa83d986f623a8ed9d8bc2b2086d676a6b9060a1da0fa507a9dbf
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.0.2.ebuild
new file mode 100644
index 000000000000..fae2cb560c58
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.0.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-ergonomics/netbeans-ergonomics-8.1.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.1.ebuild
new file mode 100644
index 000000000000..9293c5089699
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-ergonomics/netbeans-ergonomics-8.2.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
new file mode 100644
index 000000000000..865d19cbb6dd
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
@@ -0,0 +1,87 @@
+# 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 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
+
+	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
+
+	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/Manifest b/dev-java/netbeans-extide/Manifest
new file mode 100644
index 000000000000..6bbcc3af7d25
--- /dev/null
+++ b/dev-java/netbeans-extide/Manifest
@@ -0,0 +1,16 @@
+DIST 22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip 2318445 SHA256 9d251f217f0f39c098d4fa576d77c720f8039b43becb15d88912d9c3fdcd2c3e SHA512 c696b7984a663257210b03bb9a7d4a8da8a53d7e727de068558380b14c0f17aefe8cfe310c0b96f277010756b277f500629db3c9d9a1fcf38f5113708d8dbd34 WHIRLPOOL a8e55e84ee661eb951dec065cf0f2ac6f19720a30bbe8432c95a56d531fdd2bb48a8359946fc8a1bc8d789a568bfed87bcdee04efdc86be58a518434616d6641
+DIST 545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip 99139 SHA256 5d01703f77b598b0bc1fa026d6f48b7364457afe441c997b39c3969fedc078e9 SHA512 045d0bf82a498b7b222fca4cdf826443f2507f2594d857296b57e16f1475e6b892bfd8d21720a5d25a65d09e6b7bf8f051abca9ce55f030c748d0ad46cbfd7f7 WHIRLPOOL 06ab1ed1ca736eb6fefc47287a0b4140b980d3767bdaf719a32501d3cba876fc6c9d03c8822a3e5b67e5fbd02d6ebb19d360f666d1856087ce48408f8774a08d
+DIST 95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip 95179 SHA256 040359927e4e0e77f28649de1618a5170200c31b00b5f4ac53fb5a06dfeee886 SHA512 977c9cd7c91c3ccce4d8bd9bafe6302c99bae2bc8e53ab1776602ba1e61770ac1a68c1109aeb6d609126a1916b3f4d961d2574a7d6b8a280262878e022c5edb5 WHIRLPOOL e1671f868a0da75d31408e1a91ebeaaa4ed03f40bc2a8040ba8e5d4b1ffe0dc71e2874d96240df0d0c9170bd0f12fca25a565504ba91462422f9f4de65a51208
+DIST BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip 2341753 SHA256 d643c2f579f13c9a4220df6243e2669349f7fd52ef10595aa7602af558067c8f SHA512 024b1458f74ae977f5864b543b39417205203f27ff94518aa61ee4c7336c887dc5704b71909fd2b6286c3a29a9ee0aeb86aafc32f741c7650adcacc8374f62ca WHIRLPOOL 6843d000325f46cbf6c3fa9c5b09ea37785c6bb7ad3f8438d186e60ea96822325e2f5a22485653f0e242afb1d8fcac5804d629cd549d6a07b319996f4ec822c7
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-extide-8.0.2.ebuild 3301 SHA256 62670f02b3d01166b90a8eb2495d2cfd76cb784573459b3ed0dfea0820f0af44 SHA512 36c21a7a5e1411a2cdfd7ac236181e01ae3e03fee56c211b76b6de5a85a9eae7145b1cb250e49670c331300e84b2c36ee3c06a112bba4cf2c892e694108243ae WHIRLPOOL 9c64299a85d75209353459c5c2fe5bcec0b76530ba542dca6a0f9e380b3149488b8b94c410dd17be1697daf91786cb78a116893582092b0043ac00c118467a93
+EBUILD netbeans-extide-8.1.ebuild 3327 SHA256 eff1469e20586a413e9041a398ae378598a8a447d09b06620e6ce059b311e28d SHA512 53e373045aa1af7874de343d9ee4c62f91e89eaf2717ceaeea459b97f91b754be905109ebeaa4aaea554a7bba84e626b35cec52b531b1d6f0a0824d1f3c09227 WHIRLPOOL 023fab3fa6b532bdc7439a013058e821863216fbd5410e3e2a2e06ecf48ea974aaa8b1628ac55234217326b48ab0513532a2e2aceb49d66aacefd5bdc31050d3
+EBUILD netbeans-extide-8.2.ebuild 3003 SHA256 44e726f35b3f60bd96d98299e6d4dbdc54de2ee4a8cf67e2b47956ad007ef1d5 SHA512 bcf4fdfd89802534a3cb0db402bcdd9e03e497b5c5dd27f73c68eece6402d9c14aa892efafac6b64b741d7f4fbbef7d0d20dc395fcfa4a37eaaba1e3459a6cf3 WHIRLPOOL 84c1f178e03eb4a972d31094c597d8b1404be059aa1375768923c2f426d6fdd0f841de2bcb6c9ae60af3014f7d2312c28fb3a6f11ee6f883e77febcd8388e7c3
+MISC ChangeLog 3513 SHA256 be5a3f603d5eba31f97ebabcf8d45a78395e878e63423d293d885624c821c4dd SHA512 7bbb546f96ac0f7fff755c554e347e3da294dbdb7a7d9f8d39406c5af0019a04f45df9adb1351b9fd015e1c9d992cba6dcfa583054a7f8e7111c59d9429e3a98 WHIRLPOOL b93853866aa696f08a32ec5eaa61c04bc21aeabee16e756dfb95c0578d6d0df26ab5e8ceb4e9b082b5f87708204f94f1969f2db54f079fe3f61ee084e657ca20
+MISC ChangeLog-2015 1173 SHA256 277bf459f38175c8c93687575e3dcb7fad09998310277b3ac094c178ee170b70 SHA512 6c5df9bd83f84abc353b172091482db4664daf01c9b4f0ed6351392fd396cfd3e1e2f0e9d720a19432218f73e62c3fc90cc6982c67cf58af785e31654b508cf9 WHIRLPOOL e4bb6d59825843baf9ca0257de117d45866c280d53608eb754cbc6a769a075bb7edb723a32d607eb6015f561f68083325a02a361b809f3364c5d3d8839657318
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-extide/netbeans-extide-8.0.2.ebuild
new file mode 100644
index 000000000000..1c48cdec328a
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-8.0.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
+	http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	dev-java/javahelp:0
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	ln -s "${DISTDIR}"/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip o.apache.tools.ant.module/external/ant-misc-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-extide/netbeans-extide-8.1.ebuild b/dev-java/netbeans-extide/netbeans-extide-8.1.ebuild
new file mode 100644
index 000000000000..5b7be36186ad
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-8.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
+	http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/javahelp:0
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	ln -s "${DISTDIR}"/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip o.apache.tools.ant.module/external/ant-misc-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-extide/netbeans-extide-8.2.ebuild b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
new file mode 100644
index 000000000000..548164d33300
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
@@ -0,0 +1,94 @@
+# 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 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
+
+	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
+
+	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/Manifest b/dev-java/netbeans-groovy/Manifest
new file mode 100644
index 000000000000..fce5d11c86e8
--- /dev/null
+++ b/dev-java/netbeans-groovy/Manifest
@@ -0,0 +1,14 @@
+DIST 01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar 6997394 SHA256 6e836dd0bf1fe34756d53ebef564f8c4300ad686676f983f9e155845ba0a2db8 SHA512 44d66a51338c478a08092160d483c005cedc275f238d2521748d8af95fbb11920b818d7ea3780545658e76aeb25f900e6188cbc09277ca4726b90ada5d883653 WHIRLPOOL 281d30291271da983dd8f5de7d632a02de4a562fef243928219b06f4a11ae0933737f8fb40e737e35f0e971212bcf25a0620320fe95137126bdd43f9df607b4f
+DIST C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar 6375081 SHA256 ea7ea80731b683f542ff99acba90abd07fb9a6c6219d0bbb5e24cac9e0dc62f5 SHA512 c2c4c9fb490e92f237d0febc87b4139fccd5a44ee577b1bc24fbcdfa7e783cdce341d2a27fa23baefdc5d31bbb4471fa38d89212c75c1bad4b71558efa1e4b60 WHIRLPOOL b08ea1aee6c00338b935b873053376ee954e24fabff8ca8a5a955d83ec834b4e94a4484880ca9d153e121995c242b8f932fa9f5d0a653624e9e4ae2ef864649e
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-groovy-8.0.2.ebuild 3340 SHA256 f0bf556d6005a31decc79d3a4bf00116dd4291101f9c0d81ffa0788f0ba902f7 SHA512 a6199777834d1bfe7f0eb7e6139ba32b1aa74d1e1ec47182766865d1f2a6aab5e4088a024c33a7db4ba8d2658eed1281ffde88e4ea979ba41cb620a8f8281b14 WHIRLPOOL 213ea0e473088a6adfcae9a42ae24838af3860694af6ad49382c99420f96b04575ef2ba60297329c859507a084178012856c8cca84e762c544288dcab3346b8c
+EBUILD netbeans-groovy-8.1.ebuild 3366 SHA256 3b16e353b59063eeedbabc3158af08f5b8cbfa8dda28a072b4a0c41027f67f5f SHA512 1bb662e5b0d02e52b7600788d304228f049bfef5867c241bec7e10516dd4396c83954f2a000169df25c7abced2fcaf493060efb765a331397b1786c69df0f8ef WHIRLPOOL 4a7a65e350ab4b029ae4c623b239a192968fac801465583d641079c127c898a6db63e55f8b521869f05fb16000dc863d1d6e8627868d2458d6e1b843dceb2a32
+EBUILD netbeans-groovy-8.2.ebuild 3042 SHA256 2c720349a11fa4c6c6f3eb57a5a311e821e190acb939d4658a36aac4f5182f12 SHA512 cb06b806c059bbe55121627a23ba5cac47fdc7a89aa4ca24a2948065c328ee03135f73ec9634019e855e5c808d79d28f3eee617ba39fef5994e4931914c37772 WHIRLPOOL 205d3ecfea6706dfafe4ac34db7e074565a708fe314669b0c6720109e9b1bab59aba03a8f141b5e3196a71301842d43b45db7ced83c2be9f11f16fe6a97d4075
+MISC ChangeLog 3513 SHA256 9cfbd43b3b27979237a4e4d69cb47e36ada43a92adf3f164e26123dfb3e3df92 SHA512 3d60ba7971f54b48647a788ca65a6d23fb0ce16b617c26b6ddad9431b3dd94dd1515da3b4116bd2ca166202a3cf9850ca1655b73fd9e6d0779d286ff4de4caab WHIRLPOOL 0457204c7f6159b1fa6d78d899f9f12ef97f7b9272a7f6b6f47c456de076cbbe2fc96e211dea64baddf2db96869ac423957745590f19a4868ccc3c416f694a1d
+MISC ChangeLog-2015 3829 SHA256 0e98c01b542fc619da02a3fa1bda531b4f739b39ae478b8d245b292186f46ec1 SHA512 76e9134d99f44821fed89c09f7a002b026473b2f3248ffa6d7679d17e30d0e19c0a241f7e7714fc7a7636864c97418afde9aac0743bc836ca43342faa3ae7e66 WHIRLPOOL 2de02e937233676cc1fb48b8c3e3af312cf1b34635aa367a4632868cccb4ce9e776f949f27ca424ff6b6d5aafe610cb65de4d750a5f5518ef3875c8a0e7979b3
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-8.0.2.ebuild
new file mode 100644
index 000000000000..201018b640de
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-8.0.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar libs.groovy/external/groovy-all-2.1.7.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-groovy/netbeans-groovy-8.1.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-8.1.ebuild
new file mode 100644
index 000000000000..69dabf711417
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-8.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar libs.groovy/external/groovy-all-2.1.7.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-groovy/netbeans-groovy-8.2.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
new file mode 100644
index 000000000000..2277c2b9b5ff
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
@@ -0,0 +1,97 @@
+# 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 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
+
+	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
+
+	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/Manifest b/dev-java/netbeans-harness/Manifest
new file mode 100644
index 000000000000..6f9d70e0b397
--- /dev/null
+++ b/dev-java/netbeans-harness/Manifest
@@ -0,0 +1,17 @@
+DIST 20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar 61713 SHA256 38bf23ed74459460f3f0b91735455e9b74d406c72612b6aef7278161db119545 SHA512 2d06db5267ac5d8fd227819014177f0d5cc345583628f1ff2fff89f180a4269936a136af0b4649cf43603b0adab6ce3e3f525ef2033537c6f035b558c356d900 WHIRLPOOL acd74c6edad1c0e74d6475aecd0a00d2b0760bde5a76b9846b466ac03087d814a9bbb1c0b4ab3f2bc29a25c465fe1875f6a45e544c7468c4d60793795c37dd37
+DIST 49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip 579550 SHA256 e173ba926f93e89bbb9c76bd2190b01e0af2d2b3223d2c78b4ed5bdaebbd78a0 SHA512 3de7720a392813cbbbc73a6ce2a745e10054c0888df61b1e623bf327f8a4584a9eaa07303fc41d01d2088fd6c868e7273c6355d23839dfaa9009d1f672520d58 WHIRLPOOL b6e2a6ca1bcea47dcff7d8a9ea043a5b76834bde9d9f715d5d3eb52211e5c0d8a9d0575c326fa2f1d4d2a5dd93bccdcaf20af45788e7e3032829ac85a83b64da
+DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 SHA256 18050686d2da634f3612a8100c405eb092dc06d86b8917c6b945d096daf49f94 SHA512 5a0089c36c35ffa2c243cbaee376a246dbfd3dd3f170fa233946b6134f9c80dda610f2900e8bbd1553c3e8bdd3b5548145c881745acc720ec1e059d8252b8399 WHIRLPOOL b01f2a78d653aea3f7a2369a66bef0ccda6026a38efe8f52616eed75df8ef80852ba509a4319ba183ab08d9141a138cde48addd910199f47b2ada7bfc5b24efb
+DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 SHA256 8c6fa603283582893aed25c247a4748eab38f3e6ce9c59f31b2bb8f3f217a317 SHA512 ffad7d45643015d178cdb1b5bb075f0232470f5f7b82acd87d3dbf88e2034aed04fa9fadadbf7831d3c57fe0c4bc9684d841aebaa8a99ba1d6c1f6cb13f80359 WHIRLPOOL c4df551c83984a2b5cfbe60363ff4d9de2b88f87ed4dcf9b8b91615c62cfe04274736ca29186b8541bc11b1cda8c79ddfd07f3ebcfd146664d9f1c46954696ea
+DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 SHA256 5ed65a118b90400886ff4debb29a6e2f82a440bd18e7045c8653d5cb3178616b SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065 WHIRLPOOL 50d3a6534a31b6d8c6c62d580f4fc56f4df52e79f3acf7297ab7deff87f0b7d4a436cd97706ff9fba24aea797a3efb60d501f4f734f7c607b0cbff4c7e9899bc
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-harness-8.0.2.ebuild 4049 SHA256 2f82f99166164242ae84ac7a1c6bca4ea9703c41c21d0f8ff33d6ffc45d432f2 SHA512 e7d3e9a47ba51123b5ec143871946dd484b637e85f54931f0485f9a3ba1741aa5a948919f17b789673a8376261caae18f3f2a67090048b33968228974952009c WHIRLPOOL c9099ae19bc74c3d881a4abea3b589a2c976d5f55c5e1a5cdb9a14b32c4825c679a1d270a156964309aa003d3c0112d0f8dff2dbc5a95969f5c2ba859c161f34
+EBUILD netbeans-harness-8.1.ebuild 4075 SHA256 905eb2945f5a17fee8c0502c77f557a13fdbe95ca6ad72d7b3f83517a051e30f SHA512 844bb37058ec0c3f54800b216029e88be30e499cff1655f81505d2a4517c80dd6448e22edf4f64e4a728ee0236e718b14411250f2682fa97271efd67cdab9b06 WHIRLPOOL a28a8231aa7e9f761d025c042c1b7f2c1950347cd62341e788a715d6dba5e3e6c62468125c60b089cee347f7c6bbf19acc4a4c1f6f2907a95a82dbe7adeac05d
+EBUILD netbeans-harness-8.2.ebuild 3752 SHA256 03bef62fcd2e18c5c0a652863eebb3027afab895a7f1b4fbca10db23b2f50f81 SHA512 d59934baf3b6438267634fc669cc8db7b61d7755ba508c0a4e60e40376b550a4993b8ec243f81e4c80916f5d483db6d78f93864c100290c2e876960102e38b12 WHIRLPOOL f568a6320be7bb48af035634e19d5d1e66a3c667ffc5e13ff2067af89d0a7c19bc59b610b6301e0473c805cda7e9def2edd0faa5719802620aa427466ccec63a
+MISC ChangeLog 3532 SHA256 f6b7cfc6bba078035abf9114062b6399371cc7a08d1151928d9fffe7e9642dfc SHA512 6f82eceff9e8d0b3b30010e3a91588f64047d89f15e34c32fcfb67a248a1554d40e22ff74b28b8170359b00b11863ded5e96c5792a9b549d6cb240a71f033d7f WHIRLPOOL 23a109820e18b594b0231ffc226c5cb586768040f5b710bf5c57a2a56d85eaad1a3481b3227b8f44e7f579df901f28696d60161d5b6214c0227e7ce1733784a8
+MISC ChangeLog-2015 3877 SHA256 fdf3d6bec24f7c621c00ce5348358ba6d63b756c94dbfc7bcf6dc51759002882 SHA512 094385d35e2022821c4fc8d62fc373aba6a2de2df115dc8a029c8b89c59c7e8208c5f868e3caa0e34d7cf320e0437ee3a7177200ccc06d3e9955cc98fcf7d6f2 WHIRLPOOL 06179eba4a330f6652e02fdde46bcb907f384886a72ef39f695627d016ee00ef69e1749af7f3ec80867db069509e8980028e4c5693b4c6225abbdf7ccd2cadee
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-harness/netbeans-harness-8.0.2.ebuild
new file mode 100644
index 000000000000..c9995def9e3f
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-8.0.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.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-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	dev-java/javahelp:0"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	>=dev-java/junit-4.4:4"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.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
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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.10.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
+}
+
+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=${INSTALL_DIR}/antlib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}
diff --git a/dev-java/netbeans-harness/netbeans-harness-8.1.ebuild b/dev-java/netbeans-harness/netbeans-harness-8.1.ebuild
new file mode 100644
index 000000000000..757d7cbbabce
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-8.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-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-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	dev-java/javahelp:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	>=dev-java/junit-4.4:4"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-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
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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=${INSTALL_DIR}/antlib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}
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..179b86fbee1a
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
@@ -0,0 +1,100 @@
+# 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 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
+
+	epatch 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/Manifest b/dev-java/netbeans-ide/Manifest
new file mode 100644
index 000000000000..7b0a9e8ca50e
--- /dev/null
+++ b/dev-java/netbeans-ide/Manifest
@@ -0,0 +1,154 @@
+DIST 010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar 161749 SHA256 c2796b7d2b374f82ae6e4b89cab5b27fcd075c01829e10efe184a2fe5e8749a4 SHA512 4a3c60974562aa45b11341b610abdaa22de6af183c19c1c01df63afa107b53e6d0079f19ae36bf1acb2e4428996aa2c349acc2442a0a25124929da53b07739e5 WHIRLPOOL 51dc17ad690383ed1211fbaddebc654c6393e20451f4a4eadbb55d93d31987eb4f5bd0d479a690aec447e89f83c0c40a075104163cfe68141dda18eab910ddd5
+DIST 01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar 359397 SHA256 be4ac5528670780ca9aee398494700e04815b690f6d26525d8aae0b3d577a5fe SHA512 6d2b99eb7385a1112edf99b9b4b1bf0840c561e77d0cc80c111f43fd66d232f4012eeb287d2592a78a3a7646cf930c91e628cc8e40d14e4abeeabaeac78a9b28 WHIRLPOOL 91f3a204cf90ae43075fe9c4270fa41ad8d0412726f3a48c6c3ad221bbc5935d9b720df013d02ae1c8b11ec1a1a557ea8f28db8a8db71867b8b178aac7874d13
+DIST 036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar 9592 SHA256 ba7c2994f13c5455b2a9e0526e582320a2d08e886965b8c95ade1b1c615164a1 SHA512 5c1b54d5b0f5f146895a35e7cae50fa41f63b19ed0a5e68b80c2a47b14b380286c8382a56d6729f0f50e0db82eb7db92a449a9bfc46b5cda83b0d4c9f9b86057 WHIRLPOOL fe858c7725b496e7313108a47b19683a7d143ba5b7f9bbabc69d284421233aee9104b5f811aad41bf156fe2ddd033e899254c34dba454038918be9e91b1a8e64
+DIST 0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar 22838 SHA256 f1d2dfa51076a11fb2214a33a8c67cd0a306fc47eccff2fce718234d40ede6c1 SHA512 2e795089c801bfcfe1ff9dac29f848aad4f040d62eae86e1593334f938a0a9919cc3da1753cd7da17784d53253b3ba2d34bcb154fc8edc38abb1f70db4c3e82f WHIRLPOOL 892c932257fd04a6a52184d5285f250f4d4fcce10a0d4bb126dd33815b7f397b881fba7ccc8ba0eb8cd520621df30206ea5d112be468ef934db6cb6c881afc17
+DIST 0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar 284220 SHA256 50f11b09f877c294d56f24463f47d28f929cf5044f648661c0f0cfbae9a2f49c SHA512 4a5a3dbe4941c645e2cca068cca5c1882cfe988b02e7cd981d1e51784900767d1deab0e0e0566f559c9fcabb4a180e436d5bb948902d4f4106f37360466afb42 WHIRLPOOL ca4b4168dae89471eb3a93bc0067667c3e81cb5be12f7efa6995363e4f5f43480e2284f970a1faa485972a6badcfd6473c5471a717929485af88a64016d85e90
+DIST 0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar 150954 SHA256 ee222dace05fb8737015549c600873a378e8301e315b2e38c3ecdb479fd930e4 SHA512 8d75e496200fffd6847c5e2cd0ff9f05cda8f32e9973c13b177d3c102c87a6ac0d430f45ac3a4cd3c0804ffd0968c8edfcbcabd37c2df630ae79e39b0a918dfa WHIRLPOOL 452c245dd5b142d4f3a33d172e07606c14504a612eb811519c10390399a68b785eb3bf6cff8742169e03f010e7f1cee4d89226e7f4cb3222b83ac09538384659
+DIST 0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar 106105 SHA256 524dbc2e366f78198f1a73c34f748e1b3ae99cea51144b86440e714e59966df1 SHA512 9326c63e3140c6643b35ce6577f1180a118e77b32c58692a2679353f871dd9e6370a61f7fc5c05cb2b839ea74c8659125443b20e288aa8bbeca0a4889958b02c WHIRLPOOL 27e3344cf0a7f9fb1e013320cc7ca7b81b2a670af4350746cb930baf7798a6314c2a5ef5eb23bea89a4428bfd043caec1ec5967ad68f00763325ecb52f098a50
+DIST 105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar 63304 SHA256 ba13782c94df1fe0781e98126a0bb53386a648224f85c8e6346566fcbf8cbd5b SHA512 47740926f159a260d12880b1fdc03c9583524e478dbd085c4e353c791be0fe84e52d0bd2b8b675d5d4a1439c95067f416ffa2452c26376b865e6474f393448ef WHIRLPOOL 078251311547ccea46f87ff7507b994e79de11db987c4dea3104e93fa0d536dd59eb545ebb823948d5a70999b18bf995524accc7578abb3111c7ff9754d2ee79
+DIST 11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar 82072 SHA256 69a649764da634a6fd30d3d4e0d0e2ad330e1836e5ba0eb04c6494459014cfd4 SHA512 b213dff423d636429fceec190664d4493c94ea828361d4b6296c5bfd796bc33662d56a3b36423ca7c3c712e21c69bcdcc42dab33a9c88de29651f07539b8c645 WHIRLPOOL 2629d0190a1f5a331e731c74b60fc37422aed5874a887dac6db2088f4edb5a01e19eb1c2f93cca665599eca0244281a7f03ec37e15bdd1de8da4c8daba655eca
+DIST 136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar 46335 SHA256 695258f8e819d274fba3356c035ddfe12a39464a770e7b0a9bee30ad45233d01 SHA512 bd51d73f0afe58a6ce61566427b46dfdfe877aff401233fb5c58f9bce4b0e7fe8c30bffb16595bca1af6bf36cf9c2f4f1f3c841419c506b1484f5566658a818f WHIRLPOOL 7475afda3af8e12113ee19d87ba6f3098dc2a737661fcb6d095c4067c5efc83e0219daf5991b5ce52db9232365b54165e4273bcc68b0d7a3c825f0e44fbf89f1
+DIST 15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar 2280092 SHA256 d56a7b3aaf8aae9caf3538edd726a543bffbfc9103e91b90f32466741b53bece SHA512 ee03fe59cc16815012bc84e79b18be571ffc0700419c33824682bf4e5ad708addb58bd401469452c526faf6a3e025213bfb9e57e961761fb635241bc7e1e8c9c WHIRLPOOL 39aa68c4f90b176064328ecab4ef638a8e049bdedb4e2c1d54e627caf432df30b727210cb2fe05cd02373659cf55d11963f7796fe651f411221ef5ba966c9280
+DIST 1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar 82875 SHA256 ff835966ecf297be4440f12ef386368ebf67f3dfdaf67a8b5659b83f81c0431b SHA512 093aef080bdb72a6c5b38d4d6906ad1d51fdc5454ec99989205cd47fa011caaf469a58a8d9f3e3ae3c8bbf4389bca55a6a2e09998846084e5261abce6913e430 WHIRLPOOL 316a10e7e20c6f32de6fcf28a975822f69f6d1dd8f3753ae961dfd09be128c0214d1f1608f523caa1c8c6c7af70d2b58611fc265a5140af030ab1bb1f00d3a5d
+DIST 16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar 17771 SHA256 488faae36e1e47c5e349e940a9327be01941d6fe3c1073b76ef6b5b235b5fd00 SHA512 fe7d7855893db867d75ab75f15c128ecba54fab48b15ad541dc042588a96dd965b1278331f114e55b853e0764c0291823acb73f5e2a48eeeaf2f8a985222d82e WHIRLPOOL aed1bf518c8ac74ec35bf10c98fc884eff012cc204ebb4ada464af239fccf2b26f5242073801645456dfb338e2cc1896c939d1271349845d5641a10e01caebff
+DIST 17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar 6106359 SHA256 9fe6cf2832611312462eb2e6683ceb6498997d25e7de4b7639937b8aa38a456e SHA512 c2bd8b7369e627a32300800ccff909698fb98a1dc6e97b722cae40ed7ac8f9ad806a1a5c46d243d9c4123c5309ccc3ec5ccbf942e237b5dcac09750400f1ba50 WHIRLPOOL 1a54cba63b564f8700d563320db4cf5ae79bd2c44c0b74aed91aa7e06173d488e7b3e3038c5993b201364042c025510bfa7e159a9f8c669ca7efa5e7642d98cb
+DIST 19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar 121404 SHA256 51d2484ea7077a10df7b932f8eafe503b5f299b5c6b186d78ebdb12905828e5f SHA512 9e6c2ec92f4e2ae48f73ed8a83ed0e7b5097f4e4afc22a9f30bda56d06e272570f6dc77ed8c62f1ef254e7d94b1463e9735fea11325490da7cca4981cadefa48 WHIRLPOOL 8d43115a28b3e644967a238afb1a85b0cf7aa34d7c660d571c53dddcbfaad5259dc9153efbbdbc09a62bd2e45aa0ebedcc8492bc9047dbdef36dbabeaf72f4bd
+DIST 1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar 39517 SHA256 e02cb20f11208d78e62d08c5b5910bc502a4c4a5ca72432dbbdf33dc7064d578 SHA512 71df29acfc15724586d01a5590785404a0c71b794eed27f161ed946a47e7d7192d374388ab779d2d51b8dd777f1811fe5301e441f7f14c8d5f71890bdc48e9eb WHIRLPOOL 4e07f1b4211e725fb709329bbf3404a9a45f15d8e50626adbe8d5187868b77e87adf286bedc472d0749a13bf2b75a0afd2d13066e1b1220b29590b49a27be37d
+DIST 1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar 376801 SHA256 9eef4f5c8a3fd617e718b8fb90354d6e5a0871d7ed3b246f0db01311cb0f7c7a SHA512 e21f9f0c5ebe342ec2effa9a3a99404cfbef5e6fe99ff761274dce16af95a0d6ca3c2ea9af928d2538b11ab3aa17ffbc360a1d69f787d2ffea4e7b3544188bf9 WHIRLPOOL 1347011b54f33d03dc699be266bc5b1dbbb6917db541d596bb927d1287794637ebc415c49ce44727a4fc3a6ce89f705f73380c272b3034e2e8e232d0a9d4e03c
+DIST 20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar 62050 SHA256 eb91ad9757701994efc5518d7fecb1d5eedf5a96e165cb644c578b4918ea6de2 SHA512 d38d8675481e3881490f825bfa02da4ca64bed62d06ec75e8ae386d40f4827f8a65c0442edad990069303a03667e8aba9143cea877774458c791d2561a66977c WHIRLPOOL f3eb1b567e192dc96a945e1c333cc52e2ad16ea6fea741ebec678c179540853caacccf4be56c93969990755aa372e148aff9d2d052a79466bfc2e063463c40be
+DIST 23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip 401328 SHA256 c0b63e8b5f246574ce5571e1fbc6b716b68a9e64bf9433800a61777e5ccaf3e2 SHA512 e76ae7f1cb6679bc69534ca9d24dc72f545f8e8fd849f57f746cbc73762729bd872f79c524e2dfd3f481d9d9cbe60a08bd85f383e843ccd39bcbf777db786e9f WHIRLPOOL a53f65f3017cc8619b570e563fbac4185fdc0d52c451386c35dabfa7f23f02544c8493e3d0b9bb4de332cc60858a3b87fe95bba76c5e3149ed9e91e61631da49
+DIST 244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar 17184 SHA256 90949ac61aac971dddb9252044ad5d927caf5c2626f0f1c8ec777a5a380e9ec9 SHA512 a441cb77ac764769695e819a4a10c3ec58491a380489897e5589eed94839c15f9c793a23e35bfe2d9e7bde40e4cb104bbf633a7142b54b3fe1870a246c848173 WHIRLPOOL dddebe6574a0945939d4c9c576d378a68d25b1962b03a502240b42d82feef3ff699413ccbb871443e79aa7197ccf619018021397d0c17c07313e435caeb4258d
+DIST 24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar 69218 SHA256 ae22c39cc6f0ab95a34da6a9190734d1b05ad16c1ee8f3db72ccf96390a2aea4 SHA512 b071d3d50443a64bb09a860acd9e18f298ef94f4b264f243b31baaadd0c22bd8d0bd90e1878001d414f3cc888fbe139480fdb838ada90a4b095fd7ecc00e3437 WHIRLPOOL 01e541548ce737ad0f9f2cf58e739f542579c84770ecb70aa25ec64e13f6ba872d901f9cbc8bba00a3bc6b040d7bbf01e93b661f58eeda9c089f6e057f546ada
+DIST 24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar 192528 SHA256 14a00bf150c00853ad66bcdca91e446410df1014b2843727eb8249b609ba6d01 SHA512 eee56bdcc0cdfb94914a0e5e075c45a768b7e449f894363e15c5f106bb0038b57be0d3ba802a36038a70a848a09271d90aac118fd6e9c6f422391afed21ebf86 WHIRLPOOL a8ad7690c8615ffef9dee07a2ee63bba2f52119122ddfdd4e90111fcd95988985a069d226556f0378a895d0ede2160b575cd8e66005430d34647ef04f4ba9a68
+DIST 2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip 1530055 SHA256 d36f70cc23578d357ee41f289b43fb76bd78b19b90e8866674061e33acd6326a SHA512 86f6254f45f7cd4cf90fe94f5fdea0bdabe7b547e4e4cff91f27e58ada0fdd17a4ee2f9dcf1983be468da5fd452664e09d0fc759507344f7861b28a317d95792 WHIRLPOOL 757e709747f953cf8ec32eaa0e07fbb8ae2ec81d9bb45dc7d4fd9574e0592a2af80c66b3e00b7f218d34526c7ff3c3ca6f2d9d14e9569eb9a3366ba61b1f0ff0
+DIST 278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar 1895059 SHA256 b2b04a201eed74af319754153edbcf5c2fb14dc30edf7e6638252364033730db SHA512 6201aefdf8396cae3a1f8366207c8dd4761179ae1971cb582286fbbbd64137a6caabae2277be1dc74d28f833161ac6e82a503147ccc417eaaaecbbbe01010847 WHIRLPOOL 12543231830d939e92994cb8ab838a56b5f762733495f637f70b5f3cbfe75d4ad6702d1de36e3fbe56f2841d5bf387f14f6be01d515f7b2dbb986f7e83e44b80
+DIST 27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip 428971 SHA256 e8a264a9f8951347bd133033e29790964773b74ecac2e924acfdac332aaa89e1 SHA512 02b724efadfa66260780e641396f2cf96347769b328b291cbf914ae1363e26324a1a887a583f5ed6b3f23f1d704283e5142e3fa46987b6978af06ccd6880a265 WHIRLPOOL 2376a650fee7737e4f6e8698449ecf756639c4e6edd4a95261846cb93cb4e8f7de4bb1272651b8e956a6a95806e733b7db56634f19b86bf72b9013e9a22e079c
+DIST 2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip 133018 SHA256 1e88d9f872628863c4b17a546582d0d51cff792a964456d2819a0dee709964c1 SHA512 360f7f57e0472f6b53337408cbc068619f83aa286fc7a5a7a84c6a451d2ba1ecd7b516741263737e11295169abcd5f1911ae0e0a68b51be93b871ae252cd99de WHIRLPOOL 499239d4a09620a6450f06eca4608bded7225b696a7b67f9ac34be3347f329a82e36a192c85717fb0ee155d9ade8fc39ae000923d83a91b6ca89f2f1bb13912e
+DIST 2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar 72071 SHA256 780ffe033581d7624c66cb0e13f31d46d9d7a3bbac3cb7c2ef23407797a85c95 SHA512 15ec2a804f2110b800ad6738e1bd030fc67bd9597632b5f5e79da17f53cfd59f34ba804971566183f2edf1d362e616c43c638bf1ea420dbf2f6bee4c65866f26 WHIRLPOOL bd134245e16ead0ecc21dd8b4d600aa7955a117754e024af61456e1efd9c6065ad4ae0c181608729e67c9edfb362f5722d0ced56f676fbd615955b4919012f98
+DIST 2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar 12471 SHA256 14db2413c87355b06b5f3a7d14ce046f1a9aebf95d4e6b2dd36f3f39ac367196 SHA512 493939ed187c114ad7607160a9d460304fbb760a8c5fd80016f0454bbb6c9022734f1f433843a6de1181a839e2e08f7a79df78e1945262929a5d05339f91d7a9 WHIRLPOOL 62ef6316424efcb32b30e4fda994d8ebdfc828b153979efb0334e18dd602842c06e507906b054063e228f6afa7569635a42231fd34f88dd30a4af22ed5fb62e0
+DIST 3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip 270250 SHA256 246cd067e04f499117a3d71f8505617c3740445948f727e4d85beb1e8f4e1d8d SHA512 963422b8f498824b880b3f61aaed3aca41e3b3ee81e2710564293c4a694907d187722bdae4b7ab9d7bb98e69cfac99726e269c2fab1f96d56c96f3a097d23ecf WHIRLPOOL 88d859656157133edbacd756e2c567afcc40ddc2844d05450138de9cad656c6f56e0be8b4e8a6448f3ed760674ea1b4a4b69361599825d9b483b2645fa8d95ec
+DIST 3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip 14667 SHA256 05c20527749f4817e036c2105209318ef42dbec79d34db739bf3a6cfa061b57e SHA512 c391d2bdabe047127a0be9ae622afabb32fef086a4941bd50918bd140e84dc79097cdae018e74c661c957146e08fabed4e8b0270f9b27caee92c0831dc3aea1e WHIRLPOOL d07aa54a5d6555ffb7d0a4d0b6ad691a73e138ab527b616127b7a37bdc094470908f89a77f46204dde3c317a216688ffd57641419cf7bc17284d7077c71ec0ed
+DIST 387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar 1106410 SHA256 2c522a693651bdcfbc43767149e4c224b516df3ab835159621af9e0071330cb0 SHA512 51076f5933ba9923d7004b2b205e68f88a564b77c168935a1e96ad9deffb19b9182685bd368d0e0ebb3ec28f0e45a61fb555ff7eaf2acc748f8786136a91ed28 WHIRLPOOL 16ed29e8b00e87838ab4aded0e3c9085b9dda2eee47997ab1fc042781ed83537b092abda41d0dd31b6a8b8edf851da8cfd6041df072e4f5833a4541c1002ba4a
+DIST 3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar 7847 SHA256 74c3a3c4e51ee45e61c8ded069f7a0f8056389b2a93cc62667ec2227be7fd14a SHA512 d1dab33fdf498628fedfafdbe008988df3c079b4de40c4895e9a9aee4f74019d43f8fef85d397c7a48e9db67f7a7bf365b83447a9a674a6aa123c5daad792252 WHIRLPOOL d6cdb838c9d205c5df55e6fd8ad10971b6dd5513d29fd3ee82da19aa6b4382c4ea3be365f9fb214b5776dbce109eec313a63ec9af40ba76636014c676421f523
+DIST 3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar 106303 SHA256 98ea64373e378a43f0f247f2d24b691b1ccfb210ac0f94e1362246999440a24a SHA512 dc566142e7573eaa24d183087dd931baffc16a146976359c516adeb6a5ba29c2770f751fca909dd672758f8c072c472932796e0d652236ffef83230e40f4c046 WHIRLPOOL 97f43040f58d16918720ee76fbc7038a87996324c339f438314a347dc69aabf66e9cc23526fc1211fbdde30a5fee6eeeb87a48d7cb38992a5f001a692262ccb2
+DIST 4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip 1251427 SHA256 3b85a7d98e119a1f1993a2154889314df59397c16237c90b007b9d0427cde434 SHA512 9024dce01e26947a9b57009f8ba73e38ead50660c9fca4f327f4e9f0bd170758f9adca075b878066e91419fb8903074b7ebb716aad5fecace2b2885f7b2a57ff WHIRLPOOL 1ce4f27b1d2c7cd77ed65f878886a4e25dc51e7c3133f6739b56c071a5ef37ae99b568f2c1f75423b0b1de392e39efbc0e6e89f731f809c9e38e4bd23fc19220
+DIST 483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar 594732 SHA256 0131ee193a5eaaa2837f8be26e932256cf310b97ebb975b721f6e79ce29eedca SHA512 84a110da6cbbafc38bd1d15c88fcf28793175c906d8a273fe9bab014348bcfa68eab01d8d821c27275278d4b4f4c083356032eaf779e8d9fd537f39d30e03069 WHIRLPOOL 322853d2c5da5a33afad2e9f8254ba399b80e0b417506be77edd963a4a065e7d75bddb073c9d6c5a3613a27b72dcee835eb1bb5631521098c635d62bb70d72ab
+DIST 49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar 20417 SHA256 919308457780ea0d905765659715394fce357f58529e0e97986302a652eb487d SHA512 cc011b389cd93c30453a25cf10f7c32bf5967f2411b2a854633bcdaef6c5949b2e4abc8bfb4e252519c90215656c2c4c72934324db9a61d82b039c43e64e00a2 WHIRLPOOL 3a76663ef0c18b60a70b1f385cbcc202fefd8dadd873fe5af94aa32b91896c508766f4b30bc9f54dbfe70b723308c586e1e5f22398bbe1a3f984902981a7a2f0
+DIST 4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar 84793 SHA256 1ee4a742b37818e1bd8c6933f4150439f21d283424067731bf1f44e674a2ce9c SHA512 193fa461f0bf438ee472a738aa29411af5ebeb8f757a3533db8553318ada5770a21b831696ac32dd1576f38d1f83b01ee8b6d1e0f4f23a52d27cd097b1a02a70 WHIRLPOOL 09a4aa03e01e14471f839296bd7aa8d9a06b19c31fec594be5d864b6a27a3703674471c942ae608fa221b79b98221d20ca2167c8a0ffe3e19f2263e147f43ade
+DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
+DIST 4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar 96271 SHA256 f87ba6bf5b25036b324efb1ee611f90f4fb8713375efd1e7d34ac4c9c6f62515 SHA512 ce5cef3b016e6a4353f6eda2f1b672f4f9369d1b2674bef01710c9a285dfab476c1a9d3a9a48023c54e88dcada40049f02fe7c16f5e9fe3e7ad90763c504bae2 WHIRLPOOL 9649759d0a3c158d0f3001e960db1fd7852b00833e1b8da23cd513d10d8d3ad87a9fc06a2b6343ae9d444cbff70248d63edfb4a32ab7254a9011f916d6957f82
+DIST 4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar 454045 SHA256 b2b787575a661911d5e42b7eedadbbb4276e3c7399a303f599668230f8855684 SHA512 dc990c8ccc65825f69244cca1cb37bbd947026da1f5e28229be28c58d82326a37d411e26691d7818a0024aaf8a957311229e72cc6afc3c700559756f067fa7ee WHIRLPOOL 96d39c73424cd231ab2033ff5fbe0f17128ff28136b8605f1faf7d2df9dcb235057bed903d86cf9d1ada60f0dbf6ea1c261b7f1708432f1d236a643efd1e9345
+DIST 4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar 3778995 SHA256 db07fac55e4d689ab4e4107c67679aff116788f488caf35980bfcf7792641651 SHA512 3d9f273fbf1187c69f88a8d5741841f9b6ac0edeb8dd9df0610390bc4f7bbafc63d872621e26c5093dcb792986657ae2d0f691caedd249f7b861d0a552134d58 WHIRLPOOL 7704b47754260e085a1fcfc2a03389e25e7896d4c64babc7b663b510c7eb4dd3289b7e0e8a8f65fc5093eeb8a6e5517ace9d1111083fcc937501555395baced7
+DIST 50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar 37606 SHA256 58358c9e5ecc72ab83ed44b3ec3e95b93302a1337f5885c7055debfce1855a32 SHA512 3cc7744b9a99a3ac9930ea9bd4f8c319bd05838624384dadc22a16ae49490b16fa55b7e18079d5bf845cf45fae4b0144403ec210b71f9c9afc5391bf27825c50 WHIRLPOOL 17ffc2bf97e59cdab5e584578862a13fbca297a950f049ded39de768c808a776d75a15bc7676c932626ed3bbba83f80103e65863fb9187da89cbaf7ac77eaaa1
+DIST 531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar 36658 SHA256 9ef04c1391e6ecc2e3909da3dec67762973582b1868254bec4ad54e6fbccd2dc SHA512 0a1e63b993c863edfe323b3954b57aaa306bb4a57eabd53ff3ca14e0986895340f4746fe2cdd2fa9bbe6ee479bc7cab537fe5fda5f200cdcb8e9c1018b37dde2 WHIRLPOOL 54f0c2c78a5a5c216734b618e34e484921b3ddfec46b7347c061d343c24a83bc2118ba2061833bd18d2ef7cede7b3f063c31207191c79dda6c4a4ac82cad6ef6
+DIST 53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip 4326311 SHA256 973bef3f019ec6b7416385f04c12c6723aa0e3f56a78b4b07a1e93c608c491f3 SHA512 7e82ec998a5a4d75dbec4578686d96d0a35007a9e6ad64fc3b0c7017195a345b4c290080c9e59b15d931d371427b6ac4396ed3e6d25400bf94d488620a5bf814 WHIRLPOOL c44029ecec06162090774bb9e597fa2fe829f5d4743a663a6548d63e5a533dd5009a42785ed6d6cc7b202b15132b19f6bc0900a579e8beedc844e6cf2ad9de13
+DIST 54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar 184236 SHA256 44d773e8e3ee3d8674b56817bb57b1fd253a2f3ad1385c8007c986349d90e3b7 SHA512 7e27d8dfe0732b73fd1540d01f03d25d053698d84378173447355370dbcb60b7712f150d89b2c9812ecf5a8c98873b5c9ed7ec439289223c9f858a3c8184aa07 WHIRLPOOL 88eeda5e9a993136ba84b4353ff8e5bf9484924963687eec946bd7f68c6b596ea3a80c80a704c03b7ebec22f3c1df1cc52f706ff5ee0185bd635c6bf954a3b54
+DIST 5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar 262880 SHA256 692094ca77705073e741eab891cf7626c3dca7a33890bd466743cb77d88186f9 SHA512 b464f7ab0b40e2d8b74faea161fea7d164ce07e66f63fc9e52d9394b0662e392f1b45d11e4c5fcc9378dbb4f06230d4e1dfb64ac153a00803b7c02408dfeaf92 WHIRLPOOL 6e9c89e577ed4fd5ed278f72829757fb5e58445125e5db46819db160b760318d6c9adb8e0d006d1a3557634e389aab71d2addd3f43bc4dfe93af5cd33c6fe1bb
+DIST 5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar 95460 SHA256 6e06091853ca7325ad37f2e15bc779ad1be6905df37262fd8b73542805fa3721 SHA512 e436bdfb4e9ae0b6e0be52fe76439213cb685749b14d03d7d844c4515394aaaf4b4e85e6fbc9e00c401afd71ded5de7c9dda0088379c3b8564c1d73c709ae445 WHIRLPOOL f76a73be4860db6aa570c904bc740b4d2e57f0ba1f8d942dc1cd4c2926c823bf97dfa2550c160253da1e1c1376c369cec3e6b7a7dfaf7b14b741e52610877fa3
+DIST 5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar 14867985 SHA256 34965cccff7a320a50d4750dd81093bb7e2b68c32ab349721f24993353d05509 SHA512 f753f748564abec974d236190511222523957fc0ec91b18155d926844eaa5c9aa63053cb155c85f562b9558e164214aef11c74c30aca123a352a02e2cb4e5a31 WHIRLPOOL c5df15f4a86e293a4ceae96f6d75b6e6684f2a443c38f3ff3bbfd414b995452675b80148fe39c6c0ef5d23a8d2b627c7f71124b74a0dc9c5c4ceb15274da42f0
+DIST 5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar 674877 SHA256 ebb76d0679f67261f2e8cc75f8efc0a653ba317115bb2519dfb6ac712378fc7a SHA512 61c24ff2c2286339b08cb5d749482d45bcc8e51b6821adccc715a9ebbd86a9810726d5889ff8e5ac2a7b0136fe23e7476483f593b54786c1799ecf623e904824 WHIRLPOOL 51d545abdb82060de205f3b00465e537128ac30e5095478ee29214ad2c550bbb4e85f3a37ae16b42ac1218c2ce4fe7c11de6f282054fc2a4776b01f56cc04697
+DIST 64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar 43312 SHA256 d3e98121d8a35cc94dc582287feb11f6864efda43492c83fbbad26a81ca08758 SHA512 89827a65cb27ec3cbd66892028eb4d1d3422cb5ba059bb26e288e75504c5445db21c6ac6725a18903a0beb3191824f96caf284515aee7381908d8074732b7bc0 WHIRLPOOL 12939e463a81dad2517061f44a7fe638a3db55b91db1882feabdf37ee2171a7db36b8df630c4f2ffeacec030f9835722e3f5da22aecc9d1d34f2669d03e8e121
+DIST 6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar 70526 SHA256 2c207b8ac6c4bdeacfb4e3f86617ca801f1c22305f82cc98872c0df9c1e6b146 SHA512 2d71e727988fb2045288954979627e1464f5fd812bc996b79f0dd1f25eee8bee189cde4282a88ab36782f05a64da14b9126e93e3e6e0e1a22afb35915d0edf8f WHIRLPOOL 6d492211c37fde820a51243f63d7fdce64f52f4c5623995b3ad71b2a7bbd6f70912d5f6ba280e3b73a910432a234aa7b6920cfb2f785746f79456d02285c21b5
+DIST 6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar 33833 SHA256 aad0143bc78f1e8d63cafd9fd267a232278f9183515435baedf8286fe5d77cb9 SHA512 fa1a9fefc90f4050d70ab79c6fc80cb7611835803fa5fc95d8bf1ec9de7b47f0cb620ab18387f239cf22ef97df08c4749eacaec336021b5f5250668b6d51211e WHIRLPOOL 3406378440e1ea1ec6fc9cae9acef7b2c58660c38b8fa189254bcb038bc7cc2251a9f5749e5e3bbad6cfbdd7cf4121d63a37bbc0f7c74fbc392fec3090c0392b
+DIST 6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar 30203 SHA256 f929629b5289cd7f67a3b04ca0d4a95b649bd949f553967a21915567ef9b5663 SHA512 46680aabc3530479e97ab8731dfa48b29dd75eaa6f15820df97f9efea0b57409d887557c7f182a01d1b55c04b5f198832d1b7b02ae6a68a659c84f84e8218e8a WHIRLPOOL e72b8cb9c22893cce4b2e26b3fc9ffc281b6506080f0c3056841f887ed2b6de40bbf573452ee6855897a58b5a68dc6a21e58c586dc159632f7b6eedfc86f1839
+DIST 6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar 85186 SHA256 d30d817a22b6dd75b15b6b2af10c71751f334eaf9cd8cf39b3fc6965a4856e58 SHA512 cbfd1f0f46017f59ffb1da2e6dd0cb601895a692b2adb5473ddcb83cbdc060fd15cef7c5fccf582b526f088a8f8f88cadb1557e1b58b60537b51505d6cda702e WHIRLPOOL 7ff2c0b18b0427f9f3f71db3ad204671d17c3e8761d904ecb37b1efbe849ad6b58346a56fdabe7dc8092b4111763d56808ea682e3d9d1f7c61d6c2576e382525
+DIST 6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar 2049845 SHA256 f6f9415729b3e700289d895d9a3d658e23bb25cc72b7087ed83c4cfc4c027076 SHA512 3348b71375e83e630c8741c2e0c0e95386ec76675055b20ffecf6dba75263b1ed203193561307878073331a01684bee3f65248f2b106c52e39cdf4971d0b3e99 WHIRLPOOL 0564d4ab425fac7b1dd18159562a187ea3e1d6ac0709341e0ad9551446ea870ff97c24bfc7c742df83a46c73e3868c1d1c6c93191c3577818520b86c9af70898
+DIST 7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar 91961 SHA256 6da47b0a00d62966e0a8456e516c8afe74e761b3d9eb0008efd7635cfdc0080a SHA512 26aa2c4f8a00bb504291054e651d6b12d44aeac8abe3325c61a18047d800df9718e8d9367db1576e02408c0fe9c2c9a6e1a707983d8c9c2e9dcf7ddb6c1101b7 WHIRLPOOL 65f09d5ea0a10f549d2c3f387970a0b6ef0383ff10aa837ef794987ff07de6da883cc1fde2966ab5734ceef96eb3cd719d80e7d1a54d906c5b390de460086be0
+DIST 71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar 99570 SHA256 55f9cf74e16ddadcb212afbb73bfd4b9b3dcb47eba79a48421cede9b303bce3f SHA512 5056a55f5ad60e14d7f585288e70da9db87676520a4d81996f7b3deb34b5214cdf519b448a2202193b3b8672a7b2e86345ac28a451723d50678560439c4a8127 WHIRLPOOL 23a97603fd1dd817bdf1786196611c8af35ada3911c14a057b0cc4bd91f432f230ba96783af930547fbe0444236a84d30789846c5679a107005a8c027328213f
+DIST 74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar 79244 SHA256 e9390a423de0d65746c0fc22661614e25f047eafff94b20081a96ccab4bef7d0 SHA512 a810eeb91b0319c15075f25b86a3be30db6dc24040b1461acbf178a922f02ef1039a47f145b2db287744e4efb6b6840550e1384e80eac6db641edac9d544c8c5 WHIRLPOOL 8eb5fc2a1e6964442b124a0379291c00582910dbe83320500d1a03d26f69ae9761ddb63c34317aa7b22d29d32885fc595b81dc52069065428a6745a3aacf0680
+DIST 75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar 77276 SHA256 c3758fbaea25595d616d97115d99647792f67f0caeca075831ee0d0c8f3f9f7a SHA512 bf457f0fc5f69b0b0cb1d923cfe80bdeb8950d4a5a7cc6ab45ba44918c3152b2e27da6eb8d7a85df3aa99945a028e75686ab71a7f8d829dff6d388c4df390965 WHIRLPOOL a57d2d5b63a9b5b06c4c856250a58f46d3f80e5b2c7778ff649abe1e43391df2fd67c6d82a5eae6909bf664f66d502fe65a3c0efae6d762becaa3ba6c096097f
+DIST 75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar 457272 SHA256 733785a50767a535feb3d6f85f2b4eda704ce933fe14c7e2701682e42feeffe9 SHA512 fd9804bd80efb1330e66771f3dcb71f99585d610a02a3482b3a429de28e91a4a9b16cf5dcccf325641dbf51a443a28ff12cb60480f71c2498ac537e8db913dde WHIRLPOOL a9de025ada074c876ef35d814911a72d56be3996579ed81666b06b3a3a7e3b1dbdcff4467d3c69508708372c7e51b26f8bfaaf8755b7a69b64aac1abe0b92c75
+DIST 76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar 1002694 SHA256 86458af0b124c8883a1d82faf42325388ebc1e205893101c1697a98906771787 SHA512 920c64a4302a50a106ae18716dd18858bdb1e490c6b498e6795b78b481f77936deb3c37224dc6e8e6f29de546624cfb3dacb0574511db50ee2dc60f57573e99a WHIRLPOOL 71e894c2384f15974da002bac08c5a10c4278ee939cc8d2708619e99acdb8054491261c12d9387a8dc46ca1061f7bd039158c9a7b0712ece4e2d5b0829f5370a
+DIST 78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar 105624 SHA256 32b046de57df2f4887fc5a2c343740d9d12c7fe17541e2cede73cfa4ccbc2436 SHA512 928f6887576e4b28c161fc5e7fe83046b0ac1cce3beb3d8f9731bfc2b6c1ba76c9ba63cc8e71219bec6c8ec4a3848391a18c4fc406e48c1a2c5232bedfb3546a WHIRLPOOL 0bc33dc8f8902180a301318800a1a1f30ffb6f0c2e56c5ba0f62cbd0ddad75b095d8a014559848b94323cb92f0a38106b2eca4064464b6b7c32fe43ddc2c69b8
+DIST 7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip 10012 SHA256 aeea41466b7044a8ebc4ddbe508a9f232b063e05ef98c4c0e7c7610796b4c795 SHA512 5fec29796ac076b6df5b83736dc6384ac93349d36093e522266b2f6facd129fd9957989fd4619422743fe01860f00d818de00e6a66a23037ff27ce071b8862e4 WHIRLPOOL 3d59c471199e7d817e5f0705b2cdfcaa4fbc010dc8d32251f30c0af4e607cf4402a28ea097310c563264024e79e252983c2f94a6743c081c9e1087df9afa8a7c
+DIST 7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar 1905798 SHA256 72f4db876d540c5acae7c6e9404f444be886c06adf719705cb4342d8a954abf0 SHA512 0fdb8d76790c76e79a1c81f86a787e0bda22706d3ecc86cc177fce00f76086954513ae06af76adeec01fbcf7cce909cd1abcbaad00e0043fa8d769e0fbede85f WHIRLPOOL 22051ee3e7b7f12e5f34aef2fc4b4e563d2ed85ae7d5b256505a4dec790b8fecfd2222aa80379519dfddac97e3e10022c018e82b8832eeb8e98cab2dd12a8eef
+DIST 820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar 33914 SHA256 9beeb950a037fc63b75d947194e27fb9bf65f43c2583a7c4841442b8521fc236 SHA512 4ea2783e7c9229aa1865ef6d7019f6c00605b8e428b5f806ea6c34d0b0c6c8d378db1b2c4fb7ea92e54d7c0e8fe9c6afdb7702340aaf464e98fbe2f0788ec25b WHIRLPOOL b3fbdade0b85794464094b871c2eb8d2af645d7f6ce166843b3e869a3ee2052153f51f263f13a21ac292f1a8a2874716d54a113e6a8adadad805cf45e0a2af29
+DIST 825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar 74937 SHA256 caf4a869805830b4583296e1e49f73eb2a31d61232d7f9b3f9123b265895ced1 SHA512 7530f6f9b5d0b6ef5948aaee7864bb9a562de361a6c6473428d994c364a82107e3fe2b1bb7e25da25124c2003b2f0d2d650ae481680a7dc4c3e7497499bd1690 WHIRLPOOL 03781d91495390d986d8c9350ff490633376861aea35bfb7e0c9a925b7a06b720918d62bc751d64d2417854224c63e6c70d716849bfefd44af4eddc00744e8e3
+DIST 8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar 6023995 SHA256 972c837b86b595db78382dac5cedfe7a7b02420163bb3a5da2bf562266aab365 SHA512 cfa56c5420e8e09dd3c4e7cf995db4c01a7511afe50f03ee7a9ebcbf95cb9c18dde3fbb82116b6d51310d332781f214752d1767bd6e20825e41221bfd16f7b3d WHIRLPOOL ce23f967a24c0c06d7e2e9b751f42cf63c5644f34cc84099fc16326252aa10d29f1fcf62b2d241428c60652944cd6feb459795fd00c91aefb19c84c33bbca5d8
+DIST 83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip 7658677 SHA256 d77790fc4ee117759ddd2f7b1765c50745b8aa59a60c80f433f43f98c45c0621 SHA512 c3498a99f46fe79c78382840d6f6ae07a2a7aef469fa39ad39f2d3c7083045d1e85d72700de8f35a2f35fc74022f6a28f77ea2553b41cca11995d8a28e50966c WHIRLPOOL 359f5352b52661e306e198800d3f8366e82fcb53bf7ae74fa63eb6865c19d01f94e22dda111db5a1bab72df4b36e07fab2471f21f7447b131149e4d128a69537
+DIST 84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar 18218 SHA256 54bb878778d5f874eda1ac32dfcf76654e7e360b04efb08080c21f0012f5b84d SHA512 2e5e204b969bd7b6aa4cd60b61817063095612120eaf51f39d4b148a9cb43f3df8e5626290a8ef983566c196157b9ed359837813818d01769e68bd35c23b15c2 WHIRLPOOL dc9635f1d764614e8487ded0fa467a3bb04159b09ec68089d8c731ff7320bc6de0b1654ade671c723983d77ae9181570b54a0db16aed9c40c405645037cf3329
+DIST 886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar 8266 SHA256 a187dd97be412fd220fea5cd430e8cf45a107e92614f1ffe046afc5d2ef1c045 SHA512 59241a6fece05560a88227b4d12e72cd573b721dfe6aa916f0f8db04c2f697ee7d1b8ade84f4163e5fe40a9b277ec5be9640b3c5a445c769e0668f06a97e4a96 WHIRLPOOL d35146440a1b009005e253b516f8a0ef35ec5b7c6e9b26ab97aa914bf334e97d9d5b1ec13b6041cf178d9ba4366d720be2b6dc4cd2abd7f97d855ab29d1ca848
+DIST 89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar 332198 SHA256 96d26cffa955b2c1bda6c3b061603d771fea6e2da7eec1c18af223706f9b5603 SHA512 8139337bafdae44804416fce5fa6d2f981ac6cea41888866b5447163e6492f39f0a8892edd018360122ccafbb7d199bb65ab70ab3f1d6a7a643d9c279a772287 WHIRLPOOL 8687d96799339966c4af72cd2dfeea4767a14b46934c452c973f8a596ebfbe42124a3c4d29531d0a99ccd69f822d873d924ebe8efa70cae8a4c8fe1d9c90c157
+DIST 8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar 5687830 SHA256 56172ac5995c4fbcf9fa627f2e417ad58486c715bbbbec12375d06de1776475f SHA512 0083ace06bb3ff2db246f0fbad7fd28f8cfd33c6550dfe9ff8a1591ad6fb4dd9812d4955c98227325e596fc92f3853840b2fdba128e28cfc5765b2db3f17186c WHIRLPOOL 95d9802b678488e65c85cf4ac05eb918335d61cb890adca3ad41ffd47917d62db1db82479446b0fb339dc5c8f494d30da64a81e976a1804ff990aaf0128b53db
+DIST 8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar 77059 SHA256 2f99aac686a0a7580ec0486034fa6bb3c6faea89208ff9396344160c43581112 SHA512 0d3068dea8832c116095c31eaeb1ce826a8886d2251d37bbe6ec6168df9deea9f9cccef4fc102dbd16159e11b2b023d14273b9b896f0ea4490d3333cb736cd87 WHIRLPOOL e6c1e0d0bd62ab06291d0e3a30b793cc6a49a973d5af942566bc9f9645b8c60522c680903715c339616673d67849fce1cc642364d8ec0f01cf2601bd51403e67
+DIST 8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar 275808 SHA256 14c0fa1a105982dc22abc2861f28d3117575511e8afdf6886af468c3de51304e SHA512 71d1c245e2833440e9df20ee0d15d64fdeb5e5fa8eb832afa5813ee3528575178d9b851b65520806863d9aea9623b172198c040823aaa5fb73ec56f4d8ff0045 WHIRLPOOL f7c0b0ad0d5360321fd12a0dc3335597c822818b6b311a4f304a6b8c4001936417e943e8d7ea8fb8012628be2371387fbca34e83038f20d669fd05f980154cc8
+DIST 8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar 48913 SHA256 648fb4788079f319dbfcaaa207656a58894b86bfd1ad608d1b915e2682d609b8 SHA512 602514630ed327d834302071bef8286721e174c970e9f9db83f358ee8c75ffd3f713ab1555c87d437ba7100d57d9d12d1eae3efb7f4f6d726d00812dd86cd3ab WHIRLPOOL f755af533389681e9d54747c7818d3a2fb4015ae4c68dbb3d3d6b0d09f96636dcd263c51b6498fb08a6d928086e12fc051f91c9d7e9093b01cdb032bebcaba83
+DIST 8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar 96879 SHA256 1c0c86469cd3b928fda138d6bc0a69cdca3969a7a91c5483db84e657dc91336a SHA512 4ffe3dec5c140d15ecdcc5473659889c4f830ca5847ff301078fdfca8b724c29537680c9685da4109efc6d8561ce2f9d9deeb58536a5fa33f7049646f17c7716 WHIRLPOOL 8aded91af9ef54cdc2d463a95d5d0911e00759df89bd09e5d4a8986e28f323a25a4d34c778721defb8dd8ada20e5c21705b4748022b27ad55762610aa9024c12
+DIST 8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar 98051 SHA256 44a727d765c92ff87e936531e26407e050a4df659950b7c721f7bbce75b5fe37 SHA512 d5af6d069e31c4e207c342d4808ff7ae83a8bb5a1b51dd5aa3382c11a5268c4705ba27b479e4e1ac0a977eb30ea942c2b1477586374e4b10d909473591f50557 WHIRLPOOL 6897a92a8ad55ece8b30aa49c14fdc65759acf79801d726920c91b93c814941a1786dbf81db2e103694cb122a72bcaf00e5e967b5a570384b993a6a30c96ee31
+DIST 901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip 912288 SHA256 747aae4b1055f3690019794d1fee2dae9a1446d0a06d5c1d3125959f87a1cf58 SHA512 d4dc458485065a1a66b2453d54e2229e3d65fcdfc4b1ce1735e1c1528883c45bf570fb7cd07f0bfed40967ca696542113164f92f7316c81e387979f13e8e170d WHIRLPOOL ac7b10c0d31f5333baba287cac0e3ddf5f7545c0cfd4e9ac89779216d182c7ed014f08d0254b17c60c8b805e55f572ae288c0e43c2e2d3d7b4cbca2d9af2e25b
+DIST 9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar 17558 SHA256 88154ba9c36e96a91c57a095faecb1ec47d2d719adab63cf4b0badf1fb61f65f SHA512 442a0ac2aaf374330465a38095904deb211f08a26f4d29a66b3ecf3092208059015206ef469d700082ce4b3fc43b186d6698bdc33e2e6e753836b8c76ab0a8c2 WHIRLPOOL b62f8925ab8b987ba66792faec36a5005b2a91f640fa0745ff309460ba185002d510a9112da2b1df5397c4045039510e74d74fb1c23f0e8f97e97d6023133838
+DIST 9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar 96151 SHA256 ddc8c97ced2ab764fad852c7eea13b7b4b24be81dd0359ec46cc5daa407907b3 SHA512 76bdf219668cc82fabfb2fcd8ae91bccdcb86a97328b7aec1a461bd325813ea5d721b645f5baba062fc8a100a4c0711dc2afb4989d0b3acf041d1e119e7d0435 WHIRLPOOL a300a071b74a70c1de7e6f30eff8798564cd61f830c1f25a0802a021953a017e2564b09f13892c1652c85bb6a6f693e13f37d0056190e3911d6713ee34b836e5
+DIST 98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar 212767 SHA256 3a927e615f0b521ea10e051d38030cc50a7cd2bc8f716b959050c178792b6e82 SHA512 4bc5a2c5b7a630340543141c399ad6d01a18f063e85623098455b9acc81a98fddd3fd58afcf9f5763d6c0d993b231bb2894ed5aa4665742a6ea8a4608d7a4d67 WHIRLPOOL f1a98da2eaf39ac033e0745f0096187ba5207fe57df4161873abf0e289c350267b2149be0c0f9d450cf4a38ca6d4ef516635ccf809c5023d08929aa8f5d72dea
+DIST 997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip 133018 SHA256 a23589a51a7c4fefd6a0b744a635e1ae59c471646baf6e231c5ea2815fa17b7a SHA512 fa9673fb00294bf76567218d885ac7179732cedc7a7602fa7c730e39fc3f3b57811f1db90011e7af1fa29c179caa1df6b3c6f49e72dd1329d3390e428a4ba169 WHIRLPOOL 3b89a9f4795a7213be0045c402459f69e67eb09edf79485efde3e445a354fa9f93851ea7be08e50ecd9cc40fad09b240f54145d5bdf4f79e95fd911373400357
+DIST 9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar 84573 SHA256 8d2d7d433b9d65b80f8bcb9d8ff24824f0c157a5586e4f4fa7168dd0dd341d6d SHA512 4003a15c1d83b0c27a26415323ef2af264db79106cae2b64736db3896473e7bce5089bc34d791dd98c72f95051dc813c345e5f58894004479d17597781a1e612 WHIRLPOOL d408defc631a20c471f976875bf488877e782239ba216c4c6fb252e8821e1f1123bc89fc23bb0e81709a98dffd026c0b01d4f848e0974f9d1f4acd0efda5405a
+DIST 9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar 85218 SHA256 39c030cd896948dd2fab237c5d4f0880975a3434ce388ce8a53d5b21e4d3a63f SHA512 befd36f53cda3aca48cee66fb3043afe160141c43fd1fde8da6848438ae71eb6c02d2c47e8635c7461445908879a71fa8fece2a616b17c30356e9f30bbca13ec WHIRLPOOL f72990576c6f7e527b8b826e58e8113efe7350cf313f46acc599af834f53125fd0e0771916f7e8ef6064756a90c5eeac5bd673b38cfdcd50d1d2c0f6848e2572
+DIST 9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar 4173 SHA256 4f44c481f47ed1ca0d1ca474a42785995401125e9bb39685553f8c2fae0f6d2b SHA512 8955e24831394afa5dce25485d25b0bf06d53b50b7ae1e7e347ca7c3844aa3768854551b7ca0da3fe08d68a08386579cc013539dd53e69cb1407e19211b658a6 WHIRLPOOL a37dd30d4a76fb73abcc99cc6b840f49d8201ba3f954315de8e09b98f1c89766237d2496b6eb292582097f0bf1eaa38e8533151ce52ed6094a51a2d08065ec7e
+DIST A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar 82845 SHA256 6b28a2106b96d5d097336a0ac5a4c00f3c0f19aa0b946b2f075ecf15aa50bb17 SHA512 2e16efaf5d37b4136d30664a93141457ccd1580a0675c5795e1d6bf3d26d4e6c9763ecd66aeceb0cba63c4c0423fd054995cf41a3dcd00f88192a64cc88ca90d WHIRLPOOL dee73abd512453353446d49b57250a51179034f013f2ea8121b2013ec55093747b32af6e71dc1447c3f075dcb9255e54dc61f3f4b23d5e6d080a2c55afce8314
+DIST A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar 190101 SHA256 4333ace938017979a402f497f6535aad9784ab726463c6232a79c0246f57c9ed SHA512 181f172c0b9604c64b4ceecb07036ac2af93ea6435829b98ebdb79df71019dace03904964d6fa3a22bd9e3c2940ea1f633f63ca5799ad2980ab156da96ca618b WHIRLPOOL 03c6b61fabeacadfd2230b97643927f5b7f7440d408b2a44b37edede88530056b007db83031536c381972a60617b0fbd03ae4fd9d5335f59f576b0b42be9f047
+DIST A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar 356070 SHA256 62f56f395f672165f253d1d06fa98c1241220317b4b59012dfd46fd77e75c505 SHA512 5496f339422490ee9e9072b54f37cebfaaf014b727c5e0ca4f17c6221159db12bdcd9b7c8c37e73141b9870496d5964a96e35de36e47245d09b811b7bb245ce3 WHIRLPOOL 09901a68652217415fc9325006650dedf77e41a4cc308e88ea64003ef5029416b02c2b4c569232790a32892d5a1270cf13867f7bb4a6a0dab2e62a9b5b3ad19b
+DIST A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar 98517 SHA256 8038a594bc7be5da485e56fff17a53a1608a453b46a8c48543f391ac8da8dbcf SHA512 df957e248da888c0e694d5a6136b55c9f57529d56cd7fb223d3bec4c1caec39ef42c9a6519e74dd5833047e9f1472e6bdc07d4a0bc72880ca06be823450331ab WHIRLPOOL 8d2e10143af98fa8f0211c9ea8b9e5eb9b63a764e6c0df22f95f803639d0a8159f8f7c08a8df0432bea94942f0da738cea4a38fbb4636e70ee8f9f3f8ca7a500
+DIST A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip 10071 SHA256 d4803bf165603f9aa566c19e70fd27f89dc5e5626546b881d4f741a19f7cb969 SHA512 49d2f3b0ec16b5dc1c3b461c1154636698211880376facb1165afc13816f88f625d76055008b9c88e603d5dc55246c52b4ec8cb26667d41a7a27372ccd917d42 WHIRLPOOL 25eae3982cabc6d9774a26d803b60a07a21a2908829aac807609f88645f1d3e93a0b02567f82189c295a6437bf53a91b83938ba5cf4a1e8311b48a4a7bd7bf72
+DIST A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar 98448 SHA256 1f13fa64ddc18275827f979ad3dac8fc49bd1c9c3144708cbda12502cb0a138d SHA512 db0588025b7383c2e37262321dd254f6c8330a96bab8ee19ddb72f7e7daa43ad8cb570c3d9ad97f141ce1e4671d87753a22cad383e66feb98e6b383d82c05058 WHIRLPOOL a926e102ceb1dded9ed73a9cf46f8349969c02081c510f0dbc1ba7d551d3223b4e9866baad4c2e56d344e7adab2e71e7e69298e6b66425545fa594b29252e457
+DIST A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar 109043 SHA256 a7f713593007813bf07d19bd1df9f81c86c0719e9a0bb2ef1b98b78313fc940d SHA512 a1cc0feb2805e08d49229a20cc4423bb52d6800aab3f65723a28ed7d3429455a3f6ef80daaabad7aa89bfb70e4d3c362b268401e636505d1c89bfa7baf871d94 WHIRLPOOL f65a7272e27c16d11313945a241f1b62e5144db32449d1e7a9fe4733a9bc19f37868271458841930b3376149bcb57b4126907845794e8d4f09cfe3fcae0d9328
+DIST A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar 263515 SHA256 9d57ba7cdd807346f20d3eb63e48b95caeb28ecb0fd43bc705332d8fc8c32126 SHA512 e7119eff27beb1405a35515860ee1708dfbff77f4ffdf5547d6f188a6ad93ae0f27a39ff5084c65a9ba657576e7b1ab564199888fd8c6732c567e4ba6292a29f WHIRLPOOL 46816dac02fb160b11fe69b2a3f1ea4890b5cef2204dff4af4913a70704285f5ace636a7b43cddfb688269e6ee8bced5c4072c9544813ffccac8dd14be55a2f1
+DIST AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar 83249 SHA256 0e17d97a214c48b80862a9d67fced2278923a87dd54e85cdd77c039e44f87fdf SHA512 c2a498cd1e45e5bc815d24370cd3abb1c46a8165fa4b1d57493fe1e24c727c74570ac203fbf23a8ac8c25d121f52450d61d0386dd69a45597dba42736509b9a5 WHIRLPOOL c4759110596f72d7b7541c5915daf17e212215f6377959d99e38c0e655a96ab1b0af1f054c5f919c242ec67a1221b468cb76c7784701ead52bcebe2cf263d796
+DIST ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar 250812 SHA256 36973ee0366af03f63580a450749d99c9d67d997e9aa877edce4aaadfece7b80 SHA512 303be274fdea65dbb4e322b28dec1e2235d77f6ecefb48c5e85abd9724cfd651c0b50dce4718b7f900e653b050558814bce3644c2cd84a4a267c4a6c45c3e085 WHIRLPOOL eeef4cb475667b328e839967b02f073fed93f444fbf84f0a684ceccc0a4d6773ee387fc46535a72514d41dcdf95db16325f36c6f114a49e82aefbc275a6e1db1
+DIST AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar 94946 SHA256 bae5656f8c0eaae5c4a5ea3320bec918d3ce44697f21ce4ddb9f016196238840 SHA512 b6f5e88c0414a5f3f2c03bfe93e694cb0274f1d6ea7a2d7e9a4cc6bacdf2379033b188d0ef6603790418d9f7a9469ac8056110f7036717deccf5dcbbb3c4e54c WHIRLPOOL df6787e044808418afcc38ac311b0ac61b2a1c2ab89eb02291c9fd049409df254f6329d9e69b9748a245e0c5506cd04a82e053e4ab12d2d0e90bfa8ec3f9fc7c
+DIST B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar 90859 SHA256 b3b421fd586c67e0c7f04b879ad527a8a295de222392ded6e68c62b9af669d11 SHA512 8ad97ed698a2dc6a8fe94dcafa142a3794a1497b7c67497c9d7345fdbbc41fe58a7181e5e38be186a988c5b70cbaa97a16f79299982da414c176b1e07bddaa2d WHIRLPOOL 989f8209bd9369330f4cdba8cdce15f9242c02b3ffa0c8a3a7e2981b77f5186b5e9905f84cb162a045201c31baad9607c8d36064201d630339ae0a5128e0f646
+DIST B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar 91069 SHA256 b0be6467c50f5e4a25621b6bca0a71c58cb7d4e6d621f2b0c4e68f201d5f3716 SHA512 7d7ab2c32c79895ae78a54c27ae2aabc1ac5c36513f92b568c3e09369851285a848c0bd93bbfc1b9353f861889169972e336b470c0330bde81f9c5705e201d2d WHIRLPOOL 2ae21f664ee1685051d34273e38bd7f6edb4f8488706279026c40ad882d80a6c8a02d78bd16ea3011d5c6bf2b4a9aab62324514187cf0673d43e10228d1a8b88
+DIST B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar 415360 SHA256 08e4927041f40b649f1c7b3007ea7ed26343832d527243ef9e84c5e1e714806b SHA512 b402fe59dfcb283b82222527fb25830439249b4645eca4943c2f3cbced2ba725410d21348eb2c14f79eb972cd8acc08a016dbb89bfb5ae0ffd936620aff8b77f WHIRLPOOL f579a99ac56c82bea3db9ae410cfb76f0a5964253fbeb1fdc556cc790ee1e69a95da29d328dcddff9bd9533bef48fc84c52baea52093e13cf3106bb26a2447b5
+DIST B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar 75182 SHA256 73ccd0337d09f122923ea316709fb8ea1d78ad125b69c6533d367534c6f40ca0 SHA512 fa50a0158d1e0c32453f9a19c2ff0d3431447e1ea5399cdbb0db607718f847c17a692a5ed573c916af50790a0ef01bac27ed5101c42c12a27dd0aa1561185a28 WHIRLPOOL 14fd059614a1d6cb0374214b2b4e4670e0a96e41b60b1dde32959450ead56c6121e320dd21964d35e2cd39fdb4ad9e89f2fd9872b5fd64ba4b4b5dfb44d9c702
+DIST B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar 1855307 SHA256 87c41cb4f4b0a3eef52c95bb7ffe336bad3cae489feb1bd967cab1db84e09377 SHA512 6de9c15374c83625d08eecd7cc1a95bb8dcfeb1f144246709b955178461bb344ffe9a8abeda01c77ba4c9cd0fe8074bdbee5196087d5ea1d548f14fdb27941c7 WHIRLPOOL 176d7fe2afe0e97be0849a720802983bf801249fec20f20ad7dface52804aabc52c2f96f04d61ec4e9844af45847f525993cdc6a3f6e7a18cce584d7170e2b7b
+DIST B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar 103974 SHA256 bf30e8fba29938d17aaf8f09697abc370f44adadf7bb6eb51e0211dfa12b84c6 SHA512 7644f75ac0ea9b0caeeb0657e9d05624c61d86660c3a9b33bf04ffc58b8e7c21adf74443e52fecdf434458b32ceabcc0f9919ad5671b2f526a02d7160e2c6570 WHIRLPOOL 122d90bb497911cbd7b9896d3b79ab3248b2a8a3d765235458128454f028039143999c683339ec36927c5137bf90d6e11429b64497e8c314e3ad0cd82f7eac71
+DIST BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar 77903 SHA256 52bf777bc26627923e56d28d0089962cb1c953b1266113745e5974a7b40b83b3 SHA512 b1e2ac5dfce90d9d8c7a8ad0a9ab2a7e8d5d5e7c7dd64a565ed564f90243940e577fa1d2618301f12f9f69393339f6b9a4d3e93e16cad65f4a7103bc4c3e6929 WHIRLPOOL c32b0f5a1696c00be4787a5fc95eb225b7885795c76387b5307aa92ca773b80c35401304c7cc69d134bffed580eaaf6db589b86f38d004dc9f747d6ba0e772fd
+DIST C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar 1487304 SHA256 5bc8bb080fdf3ef968485ae90f7877fbcfc05b2cfe4753824acb5a36a1ee2036 SHA512 7c1bec8fc317a13a0353ae95320bf57afb81997e4bcf484b365ad12940c4eeed2e414ec01ded4d9b6bcb4239d59baaf78e2b51829fbd28dd034d768193d87a7d WHIRLPOOL d93252d0c59913213cedd26adefcf9834ab45be5fbcde2a3406c7af74fab31d73ff422a49695911cfcee3e2247e9dfea872eba66b4901c35315f644983c40f7f
+DIST C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar 90597 SHA256 497ffbcae6d078d60f5f4b58f1183c969017bcd5ef36dce3e28bc9c5816d6006 SHA512 f885dbab5f03508ca4d144558f8db5b855d643cf037e7c136b5a814826613204c7e22c8f77d3e696e1cec28fdef3b84230f132344829996c5a123716476d7bbd WHIRLPOOL ba621c752a6ba520cc410a81e32150254610669f9d1296ad12e96d8245c1a780b1ce89a401fa160d73a987d6f3ca9914b875651c209bfc362b1513735e108d1d
+DIST C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar 3476101 SHA256 80784f12a5fe3d459af3c577cc58b7a8aca59000263ce4ee190319332b4f7941 SHA512 6b363137fd38afa1e860749ffbac3909ab921c45de657ea4eee8cdae58726a822be6d9beb15c3e8a4928e28ea1d52d2d53c39d85ef068547ca3dc669f2874fcf WHIRLPOOL 0a7da8651a9f4101089ecfe39100b3e6b7cb4bcc34f28062da4864459b9a300ee6314eefb19255133625ed1242f387537edb5f9ab4107aca0ab81e70c1879dd2
+DIST C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip 272104 SHA256 953d0058c729948f3220a852d72757b30364537a409796a36d1fb91f5b1471e7 SHA512 b0a6e0123862b048ddf91efd032c684fd395e32986752aceb98637c686c5d01c4c877850b74badd512019f026f14e7bf7923b7f0eb42fc89394f94d8c8745180 WHIRLPOOL 9e665d533c14b67d94dee5ecbd6b0c994873256e0ae9e526f199df352badc317db9935314e55afa0a51e843b019b81ce107faa16a125c0a448f66be9bbda77ce
+DIST C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar 72036 SHA256 0247352fa4efbb0194705a60a0494bf01db7a4045ea41252980566d029ae41ca SHA512 4694642dfa9d4f993b928d653c509812f604bdcd721e690c3150e8c27b73a028c6cc5d63d92d21b9d61fc88672039e8b0cee3cce5f3f83b75d081bbc121d048f WHIRLPOOL 6fcb1ddafe5a57c510e05628f53e83efccaf6a0ae3a2ba0764d246dc84f042f88477163319eee29592cb29e8bfe338ee40dee270da96915596a1bda047be732c
+DIST C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar 170502 SHA256 a18562ad3f2766d38c687883158a00f6670e2ce2773c63c1def8b28118d07835 SHA512 9e08442c20537cd5ef788f623792e83429e9a534bf14d1c48c8031393f25c96fcbf2cd87ff9a37eac6908bd4fb2a4bc478fad95f38779d773e1ecd842d5807aa WHIRLPOOL 20f1e80e239aca57e1655a7b0fadfb9108ec5487736d25e8e39e47983c03815afa32e37beefe7e385b6275d42cb553581ec25ac6842648629bf966372706d214
+DIST C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar 18627 SHA256 a8fdf6cc2afb7e11c7ddc28cc8e7242e7678c65186a78429b81a0bffec9a200f SHA512 378028472842c9c8b029da44ae27b55dba7b3018ec15dff874798530792a03d4f4949ac644f6a172e7b47702b748fde0e652c9089f51a3f6a03c06ff2b356f8c WHIRLPOOL ba5960542254d4e11290811000bf010e1716d71698942be6f27dac3fdf5ed6a3956ef8280891ba975cb5ee896229305db15430a5e7c021776546317a04990c35
+DIST C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip 205743 SHA256 d8188e5dbebbc90dc08a65013fa3b1535efb919ed739d7d0e9e7d927cfe7d796 SHA512 17555962d99e880478083f2eedb65e5e07288d23f541971161e433768928b19f9864592bdd5a06c789cf35e7b1faa18296ae0832fc5d38f6e6531d754b12e816 WHIRLPOOL 23f84b52112ca62d05ee391e4c0aa46319ca92bb19f4a5856868374ee266f1670b753530c317fe9ed0fe9b10a57f60aa24b17e922155c6aebb759608240c8e92
+DIST CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar 280983 SHA256 b35ad597f17a6f221575df2f729a9de8f70390509e047680771e713bad713fb9 SHA512 680c2072b301cdf19bcb3525a5292874d4903dd1cd0fd83b9affb46354894cea4a2fe192414da5c82ed125063365b8a1f1a8f23849e8ed7e4a2378e8a9249ea9 WHIRLPOOL 2d8b07f197426a7178599d8596b5a743934905d7b4d4fe2dc01943d4083077e75895951f7b945479fc0a6881436be3f0fe7583f92c8377df2a440c93a513b1a2
+DIST CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar 173932 SHA256 a6272f7efbe804e5914c7cefb4584b116b80e34f72b70eca776c1fa7cb56e00f SHA512 ea250574f64567fa6873c5e420e7d77ea6b77586555ddb3425c9feec2fa7a4bf221ce6408cd7d2b15ef4ed06ed0edd823129d74cfbfdcbe2cc3b37326aed835d WHIRLPOOL 579bcef1bbd52b8b0b391fea6db79c209400a9619501739e5cb48f321d146bab2d8ee6e7e0b5dd094e3d6d096b48dda6ac4af924ca83d54ce6a7a5f418cd6866
+DIST CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar 406767 SHA256 4525fe21d3889dcc8b8b4edf17310e7b361696fcee2006349464aac794b535e0 SHA512 1d8b502956520c98bf9084cc63dc1e926e8061b5fc01931d6fca67274edf1c4f7d8524e942a0f911baaa95a3cc285212a938a67fd92899630ecbcfaa10072321 WHIRLPOOL c052dc3c571dc07e5421ef2e2d60015e23c1c2641d3f07ac2c3a438290aa6e138ea1f85370f5ac2d300ec5bb4939fbcef87fdd24890f380260307113287b6d96
+DIST CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar 250793 SHA256 cfbcb0db40e6b06f638ac44ab076a88dc7c10fa9b3390825dd366894314f3f3e SHA512 5802e166d9d5a543c243edb8da35cfa32c0d492802e0810f96b877f8b581c3046c9250b790ce8a10c92c442039b6a60f17f17e491333bfd0db90270f522890d4 WHIRLPOOL 4cf80f38ff63e072581cd3c77222cd376f5502d150571a55fafb67af96ad59296c98e64860e96c9cb19488cd7880e5caecd2c6dbfa13134c14b510d2d4551b31
+DIST D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar 91192 SHA256 7773cf51c1ca92e52bd4565198194ef4f005fca565b32596cc732d4b6e072943 SHA512 b9345b5ae4581169783652af7b1975cf6a67b2bef645251ee10b47d7b6e89c1516acfa0599a507ba57e95a5a82afdcb32321a2e17abc2e1ee5545f24b112deaa WHIRLPOOL 167e3fdb36e5045d326166b639b915e68510c0e1624172baa10f131f29d2a7f3e4d71808fc2082cb3e83e9f513bf2fd83974adc0824b71c0511833fed846641f
+DIST D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar 63557 SHA256 8db5158b094a8841fd21d15d9e20be975785b539cb8d349dc5b39f170c3055db SHA512 b1db7cfe17a592d49e3e751ab48533236f397ddb453f3d0232232d723d0ed0204d46dee7ced39d0611a18fdcb9b4531001142770cb2dcc1973588f3c845d866e WHIRLPOOL f443fee929a1170851c739a4d1059a277757aad2508e7af08f88510d9ba38e2095f9f7731b280871e4e5bb2074448c387e3f2274158827f315f0f803a8bcf980
+DIST D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar 434027 SHA256 0f27e304afffa14dae2932fb16588846f1f8b78b11e9bc5562ebb40c6c33c237 SHA512 f0758b9bce6ddef27f8bd60cce8ed9b4874b45307a64d9b9ff6a62519fde5b19733c3c236686bde4a1d87a94e7a2dfc08cc8d03bd3bb28a6b297bd40a8272fd4 WHIRLPOOL ef9c2a9751ceec4108a9523f29d7401bcdc6cb79f6cfb9d2a55b2b2d3236764da3606fc128a469ee03a6800f1d03aaec59934910a112813d6101686238e135b8
+DIST D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar 124303 SHA256 365d5bdef863bdc5104784da6c67cc4cac399f9a87e6d5a60a8471945a14a02c SHA512 97af2b5023748d8ac63c0aafba06073cbac9a30919e53fe8fa628822de54bdc5602770736fd32fc1e8dccf0e1fef8d826a1322ba6e2eded6ca830115f1c0394b WHIRLPOOL 924ebfa72c4d2cfa4b26fdcde7b57d122b39a3b663d8d94ef53abdfb40465502cd16a979de3b8e11834b98569eefdc9329cfe07f19c85abb98e2f4af42ba9725
+DIST D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar 290305 SHA256 5a66f5d12058cdaddf6f945b419c3b2f7fcddbd5e6d3a933ccbebaad569452c7 SHA512 ea583899ebb31f7f55ba5f4e53008bdf8a2e79d472741f288d6b26b259aad788e0c67b197dba5445cc5c269ef9872c6c11b023212482ac7b0a160c777e7be597 WHIRLPOOL 54b52d3946db645db2e9ce608c965abf780e3cf282bb7c4b4ea715905a3ecb148399c62015fa50b8cd098692ab9392f18f8e17340553242829b4a98955235627
+DIST D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar 69186 SHA256 c320feb4e66a0dc0eec284221bb7f09b2f45663f898c690aeb3c716ef6cb5141 SHA512 99fbe678c6f20ad52a59aca159d2eb89c3a670f80453f909c6c9f713a4624b70d0f95b2797596e9a7618d6f1b28e5fd10afb6ce6c02d30b1ef8f98d5fb47d50f WHIRLPOOL 662521c298f3a90ae18c02a4eddd4056312a1aec2742a7d7cdffd8cc62637388ada5bc32d44e7212d600a264c84a588e46058f8a7401030c6694e32a7c5eacdf
+DIST DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip 14667 SHA256 0d4a6b1ae84eceb988a393cbf1d85af8401cf132f3e99841195b053eed0e8a08 SHA512 1197d81fbbf3de667e3679a51ba5531bcddcc72e2d4834342db4e589f73bfb49ec600bf1156aad4711e751fbf0761ae3e2e560ab8573f3251abd8d79add04472 WHIRLPOOL 2751f47077decbb8b9ca7799c9b79787a84a170d7ba4a7dd770feaba13728c2e2415591585be822c38fd73d89dcd8cae8e2d432a4313fcf5855a4301f40ad8b4
+DIST DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar 267958 SHA256 21db36632578cc6c20bccf21717258fca0b1c4e0e1e89e84e9aed75e1859eff5 SHA512 09a6a7ff2d3ffb2d2ad1ee5d110ce8a52c0a3ec1b723312f9537ffa0f82df811153c5e3c99690b4460176ce722698b634dcf25f6adfac024a62df9cd38aeb2fd WHIRLPOOL 9cd2b546c3c8a436107906181fe3e822bf943e75249095a3714685a72e235065aac00feb74ffe1becc4ba5e6f8ef1287a3ba2a40e7b3eb1f278ef36f484dd749
+DIST DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar 90677 SHA256 8cff54c32925017b8898cfac5aa349961834227d5dfb0ea971b6e82303c427dc SHA512 337cb1964ef9561261a8725592a3c279bab78ead882f87ede3be80f60ddcc3431f927e38a56ba2c14b008aaf00ac8b91316bfe6eafd34eb004fc3cc66b160eff WHIRLPOOL 7a38ae999be046a6194d7a3abee70919e3b1363e6d4d957047ec4d60bd62320f8bc65be6301eb1dddb35b410e5fe1a213be1353f95276869052cf11389d9ad63
+DIST DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar 250816 SHA256 86b9af61b44f4c0d92152e9584a8dfec24d04cf06e66ab471b4ffc08fa90b7d3 SHA512 dbbc4a0869013c48bf7e6243cd790b6f2b140fbe1cfdbd3c210d2df39db78cab1b350c5153125e0b1ee1ed37450e1b3077a1db975a3abf1154019447b64c6c9c WHIRLPOOL 471d3575c3d1dea29c691d5f86fb357311a611496ae134053783e7aaa7c51aa730692a1176af1473b3fc2a0c9c9abccfac825c765c5c7424a5c9e0ac3a1d3e32
+DIST E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar 69180 SHA256 d01eb1dfeb6806c34f957035252855e76da791d1e2f273db24a40a511e87c7d9 SHA512 3a2ee75681c54ad11048fcd9c06678c4088c32f29896a4851e037beb5ec70977898d1d3935cc731479b881765de80cb1cb77098dafccce948bb623e723534320 WHIRLPOOL d6daa7e39cfdb9c86d16a8f5c39e548b700f7ee03fbd656506a4788b19ee1ee6247b745ec40dfa526662859befd2412ffb682ba0df80bae8d0c111e7f91537ef
+DIST E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar 34300 SHA256 3a26446f2721cd5a91f15e8a6ab0100a8b7abd5784d971bc43f7835c9d0594bf SHA512 f9433d2169d3eb7c4cbb3492f99b328516ed1529d0bacf34614281cc60b5bab0357de9a7b1da635464c22dbb6fa4ad90da4c358a1d231b85619bf3dfee456f3b WHIRLPOOL ec925c7645ead7ec746291be9f000a2af93a84956a98302c75db679eca03e52c24181f27337cc7bc18a9d69c3db7682daad62df5f29ad859c14101c8d05f4b9d
+DIST E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar 64754 SHA256 baad38de06ef30af744bdedece7ac1c4d2150fd88ad6b2a4e6ccf290aed4344b SHA512 279acfaec08b440491be18ad9b5f80a6b02e9a3b828c14fa7dc82cb87df6eafdf239a02970c7fcb2883eceea0cf73cf1f093517ce40823ed17e193f260c2dca6 WHIRLPOOL f4fd3995ddf58744d2748af693010288f590421eeaf394387bec7f18c588fba8bc5565ae32704147f3014253d981edd9495e59e73cbf0146c440e87967f9f913
+DIST ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar 125146 SHA256 fc499deb9153610f735f75817f1c177978d27a95a18e03d7d3849cfcb35abfc4 SHA512 5b77ad69e116393560ff0e4514b514e0c0be5796a237458b09981a92b270a36892feb96293954e983221b2800a49ca693e30592ee69f391b67174cfc3ff107c2 WHIRLPOOL 9295543c60a6899b982cb3d5c4390c5c841f6a02980c84429f3648478eb5d7ed360d412b35e5106828d5a925491fca1e3ad250a7f2d1886b3a86804303e4e527
+DIST ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar 2172168 SHA256 7a34575770eebc60a5476616e3676a6cb6f2975c78c415e2a6014ac724ba5783 SHA512 47d9a7526c3c039b3793750f537fee19b645b1293b574fd1939ee058d8fdeb8ad956e0e0aa36b5d4b527e9cace51b71aefa6c8fdf40acbf611606a162d878f58 WHIRLPOOL 0973179c307798322b28225087ee08fa31d0d0b4629afb1384ad1effc41b752ab19c35a359181c99f9ac6c947be850c11d2a8da5d46691cc0702b22ac962ea8f
+DIST EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar 761996 SHA256 df7463424e3560f5e8c8003e1816c0a6ea6e84673921ca5af05b90b0892b3c97 SHA512 4923bbfcd0531d6807debc9ac0d8a1e10576eb2ed8a224ccb3bbba7e4f172d97b1d41f708398943b1298db15335fdd8919f1c8d9ba0ceb2170f7bf935cb7e470 WHIRLPOOL 755ff43f93d09733c6c4e41938e777d86273b5be8a475e4b32e1766bb0ee01c523ccd24197af9e133401cd15a4be08b72b34eae54c2645f434ca8065f51bbc05
+DIST F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar 85149 SHA256 0d675e14a674f3a6db2440771db9763f5dcd5a735902a0041e909e3d78040c8a SHA512 5c6a05ab098f9d594aa7ca0fc6efe27c5ae6cd1b108e6afff86251e6071bcb2cf64164aa081020c79e83426ba6aab2a9af05b43ccd1f572b9ba4d32c0273d8e5 WHIRLPOOL 148996e8859cdc3bf239f3d0eef583a51b01b0f76c21bc846202d6fbb7e22477944a444a9996a739775a80c7aed1e56a4a89ba37d479c0bdeb0bbefd724eafc7
+DIST F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar 91110 SHA256 4dd06a9bc277469afde3a1c969362cb7a4a27c10f0b69b2d57bee71579a06db8 SHA512 bb91d3675c5a9fcf86631ef40c0c97bd14869d73864b46d82ba585208b17fc20ca9830ecc327ad3d3d55746015a297d3ef34de97edb381afdb790336438a202e WHIRLPOOL bf5d18c5b64895a93f1702522d7a079efa735f971b604aed32908f8c020da3cfc56a8abf30de31b87bfab7d846dc78fbb7689144c90e236e3b9d9ad6f4a080a0
+DIST F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar 142009 SHA256 3e986bea88f686401b10c9fc635cb4bb2b6e56654ae9d4cb014fa97775ec395d SHA512 55135126a1c66a149dab0962a584de04f604e5db4749f6607deb0bb9411b15b26c9ad70e37a09d1efd185dc70194515d62198fc7640ba13c3923d07a2ab58cf3 WHIRLPOOL c9f6955a57c372b594bb8792670976f40b6c4c8c67740d20a1faff324f09bf1c79b66776b60e97f470b83846694854bfb354cb43f7772494f15170e4a98d0566
+DIST F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar 1077617 SHA256 20e68ea3ae1d239913b87f6ae800c9338053f438a8e5c2225b1fcd0ea48fffb9 SHA512 c7faa01d25b323f63604f17602c62cdf3cec9fce542cf51c0666d6042db37efb9ac0296da0244a83ff4738ec44c2a67ba6a2550e0acbf621ad83a9b7db56ebe0 WHIRLPOOL a712ab19ced51550d251db7e245b0619c8e67c84f06006532296f65f1fa9b88ce8c4a7b85a7a10c22d5eef151142d7160a91219b778d7523d172ef92f7058452
+DIST F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar 112469 SHA256 18de394b5cdbcbaa4d8d15a4a73988b6537bbc816c10d9922ba13775cb422653 SHA512 fef26f0d527df962ddaaeccc6b709d887bbd14b26dabd413f14a1f6dbd3fd58932042c5087345cee3d7b1ef4e8dc186e238eeed5831935c35994893dfdfa1908 WHIRLPOOL c2cb5daffc0ecbb180033d458126675aec21ddbd7c7ca7a901f4883a57bfe7ff99a3a72c86a5b658e51128f2521a6858d78bd9015dbc0f80089aaf8a89c2f0d5
+DIST F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar 6599 SHA256 84f986ff0a223cc6922f3ef76e97e71391689579be958ed09b37771477f0080e SHA512 862e3d9b2609df8888a2ab9569234f190583aed6bf553c8009921dd5a3c521f268c8cd91005371a5de6d1f561d6a22113c125d94fe78d18e6d4543246f0ef3d7 WHIRLPOOL cb4509690874beb6d6ddc468e6ed71c351a32bf1d88288066e48ba0316f56c5faf47052bcdac1bca1c178559d28938165fab969723e7d596cbb8093f947653ab
+DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 SHA256 bc323866c2341105db83621fdaedf14a0076fcbecfe6ebd8361726e76a6fb3d7 SHA512 8add9ad7e3f2fb551c11841ad991f204dbeadf7d88cf2e10609644deaa1012095579fb32d568aa67715108062836b48d5c17fd69d5b61d33bca38ad85a617ab5 WHIRLPOOL 23e901a031122ff301518c1da2df9a98f4ddd1b13e9d2c22f0dc320c181d60d1eaca44e0f2d2b651f1ca30b6c001a3efe831d049bdc8f0f7eb8ede5b21e5bdfc
+DIST FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar 113791 SHA256 5d703c8047232ec831c94a2d293a21dbebbfd2c1eff96f62c87cfd90f8032d7b SHA512 e74c121cb5d67734df1e892b135283f77cf2f28abaac13cdfe54a7638a80a495204896f1a90037b3e693d39ed8ccb5e1c5aab162af969009fb8396fcfca38996 WHIRLPOOL 8e8f0b04b0740ce4f16ae3408382e3becb153ef6993dd635e46f59d288803b11d8b5ba2713f31b0e04f5126e5ddbf32d28fcb3832a8840f0ac72ec399b39a85e
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-ide-8.0.2-r2.ebuild 29332 SHA256 85876c29f4ee5b3dbe019754f3b5ce3c0ae002ff98339a07e6ceaa05eb42d00d SHA512 e8c5fc23f44076222e529c07776e8da79b6217f7f12017f4ee5060aaa9db66bd5a2ebede9ac4c8f8275ffb5029677bf4952365dec5b6a2aa9cfb22b5fc95bb33 WHIRLPOOL 6ff485ce0af943b36e6a7b291b91afe5c70fdbad20c6506c43c1380af1dce2587c65f559772131decf912392f68d4a51a90c2f059f2852445ecb26792f8d60ce
+EBUILD netbeans-ide-8.0.2-r3.ebuild 29331 SHA256 b3a59bb6f901bf86dd8115b77882da9ec631d8a6cf84b49ab152fec0a0c89b9f SHA512 268081c135db0c083f3861e4875dd732334f94c1b2a506d8871d55d1d07d8ab75df6b80c93d1b54cf4f1f7c57f313ef22593e1831f6ef5954ad2808c1d090939 WHIRLPOOL f844511d7f2dc072d623ae787601b5b5a723e89e0081bdf8cfbd9791ee38383cdd80df6a934d467791cba33bcc5a9f2dc90535811a5943407a7410089bccc114
+EBUILD netbeans-ide-8.1-r2.ebuild 30305 SHA256 ab490638a94079e3baa61de932ce22154464407bd4a8c3dd7e1b93cfb734aedb SHA512 e6d7d60a555a0a1d1d50374fa08e3b39b20f43796e2d2cd2de49b41a9cfe18e654a12fbc1bddbd20023ac5708f868a0ec119a90f11de541f4b118272e779ca55 WHIRLPOOL 5dd57f0ddfb5a28937b0ae7325db15ad834f23a50f6fc262bc3c6422b663c865683258c157a4eac2bd7ee060d0be94b76b777cc009f3998c195549173b47d255
+EBUILD netbeans-ide-8.1-r3.ebuild 30302 SHA256 cc2022eb076204f80ebbc145d23941965fd5f7b8d410311f6bf0ea3d6ced4a40 SHA512 bc9e2c4175e616aae15f6ff32ddfce541edcf6dc0cdc8ecf7d1cc22a6e5993f9b9a02f097e3e9adb158a35297014634529be350e75a1681ac9474feefed5ab99 WHIRLPOOL f7d88bb97d6e676743a6040f61681fa136e68fc11c0cfa0664427fca0ce5d5ae2378a849bca2082ca6700a55f98ba3f3f726180ccade4f597ead0039bab0b8bc
+EBUILD netbeans-ide-8.2-r1.ebuild 29502 SHA256 a5ef5a56bf8982e0374589d5a720522ef81016483aacdf44f92fe70d5908dc88 SHA512 c0b15cfbab11668090bdc0e9ac774c4e86d069fec544005ab921df38a929fc6ad33e797275936fed00df047648417f1c2608479e41e84d2627686f745c91670c WHIRLPOOL 2e413514c40ba3dcd0c99d8e73a6f52164a76edf38801cbb383a9484bb637a61529e54d953213516131e65fd944ed4b4fd6eb21bf4414f0212e8daf114aa0608
+EBUILD netbeans-ide-8.2.ebuild 29489 SHA256 c996bac7e743c34f451cf1bcdec55fee62ec5e16b374ecfc87eb27d8cdfac713 SHA512 815e30f56b8800b52f5efce0d272af845df730494809593ef64032cb778d6377f526c15f4ff0dfb48e66748e00528648b5cf06ba6f3601950b5e26e878101a24 WHIRLPOOL 56b219d65e4e51df8ccbfa6f0fb41c2aae4a9943fd2a1ab5876b0bd3c00584fca0478535342bd0cf19a0b3e140aa57f37dafc9dc04a7858b88ed90e0648c2dd3
+MISC ChangeLog 4574 SHA256 175e1b593c3ce378a57a337e5e089edd77d110f25982edbf80606eda9148a6ec SHA512 21062e7dde4df05965c00b50a81987ee70e3fb225c30cfda75f6f1de0caccb73eb5aff7e61f6c279a0de8dcac9d53c231add72369b86bd7ea4e46e5afa565d89 WHIRLPOOL 1c4d2e346536132ee18fcbfcfc919a9ae038d178f0f2555c2d8fc8d16fb53f679cfb97dba149be0455573855369d8aadba54510b61be658f71fa237cb2ba72ba
+MISC ChangeLog-2015 4395 SHA256 444dc2b61db813c6d2699b104f92d65563ba7dfeefca3cb09dede3288dfdf496 SHA512 c6c9c4d63be442a69759c467e5db91bfdd05e91b33b25c69f27537a7c20e20f2a82d1fe9b530f3bae2773d4c128ae30a60b2cf16f4e97a86253341b9a31ad8cf WHIRLPOOL e40df361cd0a457a961e804995dcc2d724e75276f48f1bd12016a24476a7dfed283444fc46c2543ba9a81c6c8b21caacc7c4b0256b7fc93af3c3f60f7b17ef85
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2-r2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild
new file mode 100644
index 000000000000..6701b86eb04d
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.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/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.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/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/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip
+	http://hg.netbeans.org/binaries/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip
+	http://hg.netbeans.org/binaries/A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip
+	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/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
+	http://hg.netbeans.org/binaries/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar
+	http://hg.netbeans.org/binaries/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar
+	http://hg.netbeans.org/binaries/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar
+	http://hg.netbeans.org/binaries/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar
+	http://hg.netbeans.org/binaries/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar
+	http://hg.netbeans.org/binaries/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar
+	http://hg.netbeans.org/binaries/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar
+	http://hg.netbeans.org/binaries/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar
+	http://hg.netbeans.org/binaries/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar
+	http://hg.netbeans.org/binaries/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar
+	http://hg.netbeans.org/binaries/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar
+	http://hg.netbeans.org/binaries/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar
+	http://hg.netbeans.org/binaries/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar
+	http://hg.netbeans.org/binaries/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar
+	http://hg.netbeans.org/binaries/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar
+	http://hg.netbeans.org/binaries/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar
+	http://hg.netbeans.org/binaries/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.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/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-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-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	>=dev-java/iso-relax-20050331-r4:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql: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/freemarker:2.3
+#	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/trilead-ssh2:0 in overlay
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	>=dev-java/jsch-0.1.46:0
+	dev-java/jzlib:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.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}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.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}"/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}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/C40DFDACDF892D1BA14B540B32C11B6F34659931-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}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.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}"/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}"/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || 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}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.impl/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar || die
+	ln -s "${DISTDIR}"/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101.jar || die
+	ln -s "${DISTDIR}"/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800.jar || die
+	ln -s "${DISTDIR}"/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0.jar || die
+	ln -s "${DISTDIR}"/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar || die
+	ln -s "${DISTDIR}"/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100.jar || die
+	ln -s "${DISTDIR}"/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523.jar || die
+	ln -s "${DISTDIR}"/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2.jar || die
+	ln -s "${DISTDIR}"/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar || die
+	ln -s "${DISTDIR}"/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1.jar || die
+	ln -s "${DISTDIR}"/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.4.1.201406201815-r.jar || die
+	ln -s "${DISTDIR}"/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.4.1.201406201815-r.jar || die
+	ln -s "${DISTDIR}"/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar || die
+	ln -s "${DISTDIR}"/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar || die
+	ln -s "${DISTDIR}"/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar || die
+	ln -s "${DISTDIR}"/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar || die
+	ln -s "${DISTDIR}"/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar  || die
+	ln -s "${DISTDIR}"/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.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}"/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar extexecution.impl/external/processtreekiller-1.0.2.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}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.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}"/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.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
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.impl/external/winp-1.14-patched.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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.json_simple/external json-simple json-simple.jar json-simple-1.1.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-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_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.49.jar
+	java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.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.2-1002.jdbc4.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 --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.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.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.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
+
+	java-pkg-2_src_prepare
+}
+
+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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# 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 && dosym /usr/share/icu4j-55/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/iso-relax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.0.2-r3.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r3.ebuild
new file mode 100644
index 000000000000..5afe31b62f1a
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r3.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.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/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.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/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/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip
+	http://hg.netbeans.org/binaries/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip
+	http://hg.netbeans.org/binaries/A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip
+	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/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
+	http://hg.netbeans.org/binaries/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar
+	http://hg.netbeans.org/binaries/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar
+	http://hg.netbeans.org/binaries/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar
+	http://hg.netbeans.org/binaries/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar
+	http://hg.netbeans.org/binaries/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar
+	http://hg.netbeans.org/binaries/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar
+	http://hg.netbeans.org/binaries/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar
+	http://hg.netbeans.org/binaries/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar
+	http://hg.netbeans.org/binaries/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar
+	http://hg.netbeans.org/binaries/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar
+	http://hg.netbeans.org/binaries/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar
+	http://hg.netbeans.org/binaries/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar
+	http://hg.netbeans.org/binaries/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar
+	http://hg.netbeans.org/binaries/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar
+	http://hg.netbeans.org/binaries/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar
+	http://hg.netbeans.org/binaries/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar
+	http://hg.netbeans.org/binaries/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.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/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-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-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	>=dev-java/iso-relax-20050331-r4:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql: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/freemarker:2.3
+#	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/trilead-ssh2:0 in overlay
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	>=dev-java/jsch-0.1.46:0
+	dev-java/jzlib:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.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}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.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}"/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}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/C40DFDACDF892D1BA14B540B32C11B6F34659931-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}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.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}"/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}"/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || 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}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.impl/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar || die
+	ln -s "${DISTDIR}"/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101.jar || die
+	ln -s "${DISTDIR}"/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800.jar || die
+	ln -s "${DISTDIR}"/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0.jar || die
+	ln -s "${DISTDIR}"/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar || die
+	ln -s "${DISTDIR}"/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100.jar || die
+	ln -s "${DISTDIR}"/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523.jar || die
+	ln -s "${DISTDIR}"/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2.jar || die
+	ln -s "${DISTDIR}"/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar || die
+	ln -s "${DISTDIR}"/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1.jar || die
+	ln -s "${DISTDIR}"/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.4.1.201406201815-r.jar || die
+	ln -s "${DISTDIR}"/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.4.1.201406201815-r.jar || die
+	ln -s "${DISTDIR}"/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar || die
+	ln -s "${DISTDIR}"/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar || die
+	ln -s "${DISTDIR}"/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar || die
+	ln -s "${DISTDIR}"/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar || die
+	ln -s "${DISTDIR}"/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar  || die
+	ln -s "${DISTDIR}"/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.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}"/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar extexecution.impl/external/processtreekiller-1.0.2.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}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.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}"/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.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
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.impl/external/winp-1.14-patched.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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.json_simple/external json-simple json-simple.jar json-simple-1.1.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-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_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.49.jar
+	java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.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.2-1002.jdbc4.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 --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.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.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.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
+
+	java-pkg-2_src_prepare
+}
+
+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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# 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 && dosym /usr/share/icu4j-55/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/iso-relax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/sun-jaf.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild
new file mode 100644
index 000000000000..0c09ad11c394
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.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/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	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/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.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/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-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/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/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+	http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.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/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-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-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	>=dev-java/iso-relax-20050331-r4: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/jzlib: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/freemarker:2.3
+#	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/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-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}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.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}"/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}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || 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}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.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}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-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}"/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}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-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}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-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}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-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}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-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}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-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}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-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}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-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}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-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}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-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}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-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}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-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}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-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}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar  || die
+	ln -s "${DISTDIR}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar || die
+	ln -s "${DISTDIR}"/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar extexecution.process/external/processtreekiller-1.0.5.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}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.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}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-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
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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.json_simple/external json-simple json-simple.jar json-simple-1.1.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-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_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.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.2-1002.jdbc4.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 --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.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.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.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
+
+	java-pkg-2_src_prepare
+}
+
+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=${INSTALL_DIR}/modules
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	rm com-jcraft-jzlib.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/com-jcraft-jzlib.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# 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 && dosym /usr/share/icu4j-55/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/iso-relax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.1-r3.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.1-r3.ebuild
new file mode 100644
index 000000000000..1fb8cd978362
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.1-r3.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.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/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	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/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.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/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-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/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/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+	http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.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/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-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-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	>=dev-java/iso-relax-20050331-r4: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/jzlib: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/freemarker:2.3
+#	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/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-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}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.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}"/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}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || 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}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.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}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-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}"/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}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-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}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-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}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-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}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-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}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-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}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-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}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-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}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-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}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-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}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-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}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-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}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-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}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar  || die
+	ln -s "${DISTDIR}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar || die
+	ln -s "${DISTDIR}"/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar extexecution.process/external/processtreekiller-1.0.5.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}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.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}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-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
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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.json_simple/external json-simple json-simple.jar json-simple-1.1.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-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_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.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.2-1002.jdbc4.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 --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.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.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.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
+
+	java-pkg-2_src_prepare
+}
+
+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=${INSTALL_DIR}/modules
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	rm com-jcraft-jzlib.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/com-jcraft-jzlib.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# 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 && dosym /usr/share/icu4j-55/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/iso-relax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/sun-jaf.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
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..0fb63f1ef94e
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
@@ -0,0 +1,360 @@
+# 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 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
+
+	epatch 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..6d5de68c9f5d
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
@@ -0,0 +1,360 @@
+# 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 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
+
+	epatch 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/Manifest b/dev-java/netbeans-java/Manifest
new file mode 100644
index 000000000000..3dab69965371
--- /dev/null
+++ b/dev-java/netbeans-java/Manifest
@@ -0,0 +1,48 @@
+DIST 0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar 53529 SHA256 930b2e409513be03864d7a66e22dfdf5c086725e22ba3cf57ad45ed8af02996d SHA512 406fc500e6356cb6729b89026180331c8717921e22fd0627abb799e73cd0f82c64af654b64922175f7f5514af621bd83dacae123a6078966264cc3cc753a7b5e WHIRLPOOL e088d7f55fa8be5a9e8fa2e886688f4d82549c9f12e2b8620012d567fd03347ae028a1d1b5bd70ee975cd3824c90e1b9435ac34ed7fb2f952a7ae0a2a6c29600
+DIST 29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar 1366247 SHA256 4eae7d13d7493c86df8b84b9a922dd9e8302e47ac80efcc47094344ce64de27c SHA512 06d887e5cd47b6bd86ea9e1a26c604b630285129dde43e6068d4b36f0e81c39cd91757e3323e77316e76b0fdf8c18a609bd216c7103ac8a4d947abd0ed6bab47 WHIRLPOOL 27c9f01d85f31781bc76411701ea5668644d83ec761f9d42ab93e3932cfefe5a6277429f889a6f9c68ce9efeb2cddaecb6ae8aa2c42ce8ea9b3a06305f2657c1
+DIST 2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar 227233 SHA256 7bfaa3a602bf388094c8fcfba989f0b121c0e71c6df4c3328244615a5cb24d59 SHA512 7669d2e11346b62420ab9db2e9a5a24bcea356099ae4d6f0a57c75ba168de9d24160277b8f044ca9a5f637c2591778150288a963787b6983d093ad64fac83550 WHIRLPOOL ba0f5a67dbc3a64ca0b21cb1f1a74b4e9b2d2c4d7a5f127de9940f375b70d0bc321f5ce6aa607bbe27d39dbdfd1d179b1457b5fcef65c0a0d4420e1194657192
+DIST 3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar 11763 SHA256 41706fa977afa65b9f6001b4ad1a8737502e6f2af8ebfc21ffb60042c4c913b1 SHA512 c834126f83008d75320eb33c5a752787d6ed7e96b4223aed329aabb08aad93d13d64a8be03d28f989d5f558e9233ae221e4eb9fec326df01b6be101ebab38b35 WHIRLPOOL 2b53e5857f8b3f9f3ba2acb04f623ff95aff1cb51b1edf389cbd4fe38d4f464d5f212e613f08103399e701158b36b1c9057f93fdd51b76517806f401ed4e0839
+DIST 3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar 45718 SHA256 18a77f915276751b01ed8e7feaf344e78f5ea62bf53b7bb6a821a22865165044 SHA512 1abad0ebdb35d8fd4eec1350ac497cc6a372239aea9eb6c45a94265f46e4e5c2458fe5e4d0e1e067effc9ba8629451abf169bb4820274484f9c2404271b21727 WHIRLPOOL 7aeb90a8661d8eaa2ee2a5953932e3b829187554bf605bb5e55abb42edb82ff13a6e4b4acb8f3615a74961f044ebaf19343e3d403a476a019890cadeead73dd5
+DIST 4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar 2259008 SHA256 058d3ee2b7f6916502524ace23d6695a06abce7a00378ca457c63e65f45de759 SHA512 058d88fad0522a9fdae80552eecfa743cd771c7325b630762d13c1456f5f51024c6e88111d3e92ed97c69cc1013cc3d2e81332b94063113fc025951f871bf881 WHIRLPOOL d1f61fa4fe98efa7c81e5849f83636e9a798816db8f43156098781ebb95012e0f9707b562a2620eb006c72ce8e911357f3bdbafc68a9d3a2e032f7a978e8f13f
+DIST 562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar 23838 SHA256 0c05ac203cfc63f1a6d59dea84d915220e18e8e37a57cfbb317e769f992f3e8f SHA512 a39da963b1e0c0111870bc3989e10c70dd136c0276099b48cadc70706f76b0b2ba1ece6df67c05bf8e26a4638b19b28b454df6c23ed5a9d4936d3cc5506ec4b1 WHIRLPOOL 88043adc7057b68647d9205782e46a2d7824533b9a46366e7949459e88fd2ac7be6dcd1bc1c7371e071c7efc5fcf6d3956c211f97932cee0e0a4f47c58db6983
+DIST 5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar 3046788 SHA256 7bb24641b0a4886d0787858685696dba109c245561fecb34b4f99aca42db13fe SHA512 600640efc8be0dba0081eb3969688936caf57c50dc1967e94471d8ec35d0361e62aa73d3d9546271a80fe3fa8e3bdda365616d2a6ed309dc6fa3ff84f31680ed WHIRLPOOL 292a7324adbf3f41e67a138f8be0bdfa1515c3f0995cb31e7152bfd71417b1501ad4ba5f69689fee05a816e71f9e4732c8e49b3cae2e11abf056e3a30adadedc
+DIST 5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar 162126 SHA256 227c4888011550cad0aed4c07e187b9f8e873c01558a08f014d288987415a9a9 SHA512 de26d1e19a625adb040b6aa870762ecf8f1ffdfb2c82f58cc7a82f1a029249862dcfd39b6a995f63f04d9b36ef23a8ba8518c9cff1b5e2242e6ad5268790b5ba WHIRLPOOL 20dff7b96369cda98dace4dc38f7e013de9ccf7119047183f936bd58e1d8c6154fa913f906dd1996d8e989d16a4e92502aacf937f730a8b63728208b96455a7f
+DIST 5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar 187846 SHA256 40a7cdedd5a9724b07dadfb3e4e8cc71d6117052f59f13badd1bbf60370e45fd SHA512 548dcb27bc8aa61f17573e0e9896c361466a5d226b8e6b0d5f9a0181d17ce61ad5d137caa268c33da17e8541978427c3faa34be99d96817d09f22277f99dfda2 WHIRLPOOL 4cc8b27be4c5c9715b4103b7022290f9b84a554070de088035a1b80024c5540a456b04a3a80902ff345b1aa5d5b200157b3016b6023e7b62b6a0b1c80caa481f
+DIST 694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip 5870668 SHA256 91370093a4dcf8fc434f06039da0ca1a359530c665da110a97e0e2fe3ea84028 SHA512 49a0854318678ec52641babca57bbf57ce8d67825dc9b0565df77b8fc6bc90a2b02a3ace7dce737de49de2eb7d1f2885ca901350e8826a63c4dd5381f03fcaa6 WHIRLPOOL afbd6831d26e66b9a318e2ed060b2147a51493be68ec8c97ebaa6b38808bf55d52ad54ad20f520299d471cd461bcfcd70a48142035a51ed9732c37c075f3a970
+DIST 7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip 5678488 SHA256 368284af56e08cbd0c4a696663ce6f484eeddf4d710a14066da470ac9ee2709b SHA512 d49f22b3ce2bd49f3ddfc35f86c0c21accd45a07b710b0787560b9969e40700d408a25e8e02d10f0d937ce642cbcab222d4e8fa28bd442e34c768b63e5583b41 WHIRLPOOL ec07b768abdbe9aa8608c36aa6bb4641dc18bdfd21d93974f82ddb9074b1f03da17fd043a6bfbfb98a8715c8ba16b5fc2585e9b0d47119a6573fb0b446ae9487
+DIST 839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar 136324 SHA256 3f74c7c7b9c924769cf3c5b4d52d21aa63e9a2ccbf16f5d26c30ebb31b99699d SHA512 c75746a1b82ef2c7ae13a33f06ec82292934e4348ead4a57d0e6b356ba79903e4658d031dd347e1e2c627288de6585c125a70e0f1d47a696db1eb967cbc36da3 WHIRLPOOL e34c8337c9cf7f43d8d219471b12beca1c7cf2bf9a310ee2dce49fc35bf819d47bbeb92ffeb7bf45bca640a987ce8d5337505938b44e83537a078478d8737f79
+DIST 84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip 4599034 SHA256 0a4a0c3e24bfe028a7741950347086e5aa49d8ed1fa59cff5c74c23f28bf8685 SHA512 5058624cadecf56182afe021b94b4ef10375b217000155a30d6f16d24286e985d472deaf47271a8239c15b5941a412b58c918e5f0684f5045690be322e0acc5d WHIRLPOOL 4258ce692b381cabe0b2e345c99f0a0e6bba7e5ee7eeef2604bb1bf686d549199a270fbe9d380197d5ede660da20269fe2ec75bdb01950dd0e71b73ba096ea50
+DIST 8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar 2759394 SHA256 3dc7e0c55b5bab5daaf38344ec079ccc5a7acd672c7b539dacf8d55b377192b3 SHA512 e15bcc568f3cd6aa0ebf362f0d09e2380a4e02dd67a6a62970c8614bcaedb9d043828d99bca12c207010116dcc062129adc7e87d73170002e2ea9b147170b5c4 WHIRLPOOL 13cf4685bf778014bc347e2550266cde8d2d43051f295c6a2c3bbf7e6259caafcec3e9bd717070972b469e46bf32c5360009b061168d8834c8c595911f616970
+DIST 8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip 266314 SHA256 36c3189a2d495bc713bfeac0eaf05612fe90d8df6c3c20d943bea38d290cd375 SHA512 f08cf953e56966a239d3ff31adc1b3ad74aac76207c4f92d860b13a2ddfbc6cb9ebe8223959ebebbdc6eb8f358a170ff8de544e58bf72a7c12eb101c32b02f46 WHIRLPOOL f3734e3b036eb9e8407478c9b27f86b616506db89d6b7411b531679e89db62f69b0434c490d9c2b1656887d1d8ce2bfa2f6464821a19e0b2b67a12a9da11414e
+DIST 91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip 6377019 SHA256 4257d1d0586bffbd66dcf3bd97913b0ec0e82f9f8dfb9cc4d3c74f0d82960240 SHA512 b43fce0d1e39985395b3f161908d52a3c7eb4b1d70b9f0485cde5b782c2ef861594e1f49d71059cbab8fb71d5fbdeabbdb9c40866b9596bc8677359b79876c99 WHIRLPOOL dbb3a33546aebded4fef949a54d02380e1d202d09923e52e3f3d3dd8feb8ec77dc5f997d815e271d3afa649a3f445943f365233d04a63673fd1b06baf0e919de
+DIST 9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar 1539086 SHA256 cef4436bae85c31417443284f736e321511cd1615268103378a9bf00b1df036d SHA512 cf8c1218f59a20e4bff22a1b179299e632258dbab92992b6600f1af3ddba1ffd10daa709e758deade56f37dc34245bff23a0789b0d57c97805767a1639602653 WHIRLPOOL 56fe9714058c7d661fb39e4d80becf17c799a9083c1a236da65446897e3c1e81c2773923b7a50dd4b3ad396b182731c750484da14965d1ee263c74d051884882
+DIST A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip 675425 SHA256 088464e2a7e6650b6f57434087ebe8f48947a3d343986741d79ca6bb23624b67 SHA512 bff8f89e96ae7b5cf22bbdbcbf95c1b6c789626a4f3f972a7216c3a545b3f85a67950c022f19c36edefb8e3fa605968b31e267166922dfb46fdd56bc16e4bd7e WHIRLPOOL 13cc312ba143fed133394d054d8a2b4f086d0dc9f5a5da3bebd83a62c30109bd16c6da5619ee6f0c4d66160280f6659685730f98e46063686aca4d4df8ef9fdb
+DIST A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar 89171 SHA256 377b2ddcb7c902daf5dd3d22a1ff5b8da4ad6f7fd6c5e5da4731d17a8d935534 SHA512 b66922bb86a5eb787a76714a6bf2c2adfd8469ea9c3031d9b5970373f71a2349b1e8156213397b9119cc9510e48905b181388744bf2189e04e18922023dacb12 WHIRLPOOL 9a5c93989dd79f803e050189d5cf1e741f0a2a1514b848fcbd51ee868125533a816525738f491da1f0915050343b73f7f8b58e4fe35230610a20b13475143663
+DIST A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip 19717645 SHA256 618aa42390667bd4cf2343edfe134f5665d9815379ec311c3c776c9dbd21831d SHA512 160fa0353baa9b31090432053a2d602fdffa663fe1f83ad79de4788ed74d3e5938d0bba0ef28ff4a946e6bc99c3a629b3fc8ff7d44ada98348fee816cb39b42e WHIRLPOOL 23408ae921b1712584eef8d51678547cf24ce3db75743524cbb046511cac60f162ab46e4c3b65e639d9c8b3f2463b674791f491d6e377ef69207ef701b7dbc09
+DIST B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar 173819 SHA256 4f2dbc36ec77519df339846cf5333e874d6f147f5d46ccdfabb18af34ee3bd5b SHA512 ccd48f9fe445b669763428dace1a02d5820a33d872c952d3a74608f868ca225c017999ae15857ed544799d467068b759d216121ba79d3288f323aa2cffb95fa8 WHIRLPOOL 02e8556df81839b0b90c912b9e22c22c9f10c54ee0aabda4768eaf6956f7e3e29c9b24a46e20bb264f2ea186c1642ec7baeb375b2a8951737543ac16e73f9260
+DIST B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar 2259343 SHA256 551a7c1bfacb60eebe7eb5b004b69f546840cc3fca82f44431e4ac6215163f39 SHA512 67b973d2a3d52fba14ec2d285f4c2f0b0490be04d73c38918c2657f7fc257656f793e1e4eaa9221579ed93cd3ec1ce0c120f5b4fbc86582b95308c1f8b64fb79 WHIRLPOOL ae6e765a49e0cf8284a3496005a571f96ba730133c220ea77b8d19520a8579e4ac4879f1218ec38c0210c56add19ead8b3a4d104613c9788387213ce8561c8cf
+DIST BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar 56032 SHA256 817762baeabb24daf8a41a9716e31f85a7659147d09264a499f4d35b0fe04115 SHA512 c84d4066b9519cf2c00d5d4f054865693cd1665e5db3b30f6e77b44a7c0d3055cc40a1641b805ea38d2294e2cab1a27fab85035950ff0d94960a4de185bcc76b WHIRLPOOL aae6bc05d3b441443b9f0d80e65fde81614b0206eee5714f4e51ceaa0adb778758a5d65efb3a4963111f3b258753e0154447914a5586251883d22b0c1e09f9f3
+DIST BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar 11429 SHA256 bf363540ede1db9782511d5ddcfcc6871d5026946ba4d214061ca992f064e128 SHA512 f7a69e5622153a3f6568a7b28b753ab0d19adea6c34a265b5efeaf95a9961dd0af711d0719956e0859fa3c63a1c06237381c35f20fb14e1fc9d9894f09f3522a WHIRLPOOL 4d223e3c256956d05ebf7d5e58ae3276027f0ff2effa8b54a3a8badf480029e19b8cb1b880139bde75167d886daaa6bc9c1d27c68d3b5bab01babbe607f56b54
+DIST CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar 10121 SHA256 c229a949b35bacebe798971b05b1fa6bdee4e923fcc08f02a7ae0a71fc6de4c7 SHA512 22333aab9419fafc86544492d384683a14c7f5feb313d9555f424ed4db46dd82c5a53b74b6e41221cf7d48d640145a63a653b4a05575df8ab2a2fba1b85815fa WHIRLPOOL 18dbad03b5cbcaa76ab528b2af074f566b3cd0a786e3e8bf2b56b8e0e265461fc15527a41e013f8685d1c824f48e28607833f30e02143a09be360574be38f3d3
+DIST CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar 8632395 SHA256 67d175c1858005308ae9a02ff85c0bc7efc9a2a3c058a6838d51769f417f5247 SHA512 56559a40532fa42775a92d82296a86033a587116870d8201dd42f07e29990a28de5b1547e3fb59ddedadfe6b4fc3dd109b108cc65cf7b253ac1b0fbb9cc03fcc WHIRLPOOL fc40cf8d49919d3ef38f6c3473736f56ee5ac1d4db848681536c3bd3532cb112e9490e76c1ef7b15d88b2ab87ed54e58dbf1227c173a3256194b5887d37f8a84
+DIST D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip 84706 SHA256 214c8f6da105d8bcc4583f3f160d94fa4a8ec266c4fea4b5e12929a6386fec3a SHA512 5dd4270d3514f448f2d1533b099dbe64aab97c21e89066c467a3332d354f0675e27f6ed5ca1b23c01a2222c8e1ad261c374ae6549b9323951763b7a542a386f5 WHIRLPOOL 88a6357f335bd50d3cf3608cee0228b0c99b4b20a962e2dcd68b83c3fdd49b113618342f87cb8b758ad18612efdff0128876ae9018eeba5b682cd8267f97f8fb
+DIST D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar 120575 SHA256 51945be4ed200cfc439d2db986bdcc184ecdfec5d0880a8c2854f88dcf20df0b SHA512 788bb5e115a77e12e9329db70e0b6edca185ebd5e30a8178f451da3a8492acba8c89848873acff224868772f464f17bd9eccc9130638d49c95593edd697d3dd2 WHIRLPOOL 9026c59ae69df71d205278a2cd7aeae24c72d74f1356bbf7d3dbe2fcceddb02948a94a87d4f7e6d710a5cc4e642d0de38d16690fff830d10b8372bcbecdd86b5
+DIST E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar 173813 SHA256 39fa3597e77942f589e299942e4d5f25ae04f699edfe6bd9135d5f425845649b SHA512 ca940f40881ff5a908fafc80f6aa90866d58c54189bfc073a2559ee76496f3127df920abda5d9c7aacf9a54cda693884127c1e3f696d4fc8367351313c900cc5 WHIRLPOOL fae1db760f988f4e2886d8a2f9b2384a194bf8b579825971466a21ec4fa4971a6e4e56b477ba0b61e2e034777af6c49c66d4425734cd6f9db4aca15041b384f6
+DIST E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar 227553 SHA256 2884a6c80cb647199c9edf9d00c5b709502aa63092279b93b9a50ba1578bfc32 SHA512 5ff83f5925fa4250ecb46e08f7f064ccf5d637bff14edadf16abbcd0d6a6203cedd07a64cc5718656249d18b17a1016f7152094da3f8ed13fdbee9afbdfcd926 WHIRLPOOL d80fbd65b3aefa48361b4bafaf179e8076caf97cc7b2a4b5f7437a14f30ea568aa86b699fb2dcc1fb6a4042b131702c87e37d8cf04591f8669414b89d0acc185
+DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 SHA256 5f41fe1ef8a7607bafbc04baa7814aecaf72b90a6fa796adec0846f50f8ac7f0 SHA512 0a65813cf76e997b362a0ce48ec55ac180907a7af6062c6f86f96448775164c2bf67c147920f2bfa6a8eb24c14046acf66d0ee9a5481bd7b9b251774a86a7db6 WHIRLPOOL edd56a338e08e788a307849794387069a60b1873a3a8fa29e1e7045fbf8a2f1ff175e68579df3789fdf6af8f7f94de2430560a89de48d64c22e76b1fe95b6505
+DIST FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar 2766800 SHA256 cd65bd26b26b7823fc8a00ec84d951532403f8c665f114ac7704ec5f9b90af22 SHA512 164a438eb6b55534037705505cb3adda39dc4e813535f0108ff6cf65e9f39db58069a22678c2484a22e2da1b1d70063b5a56e55f8c56a51f8d9953c1791c17ec WHIRLPOOL e551a60bc8d10869fe35c558dff3d3249f18922ebc32ea9a170b468e025762fe31d154a6dd1239c390c70c9cbd70639a98532492b108d9acf69e07419a818f6e
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-java-8.0.2-r5.ebuild 13330 SHA256 572951549a9ed5612cf7ff1ed902aef9cd601c251d896d9bb1d5742771b5783c SHA512 bf75a399b5c9515fea1913720a71c796c1010a2d4cf439b3865d6b8255b4dce43a5f6fb0895fe43f262a9365dd7eb7ef796935911465b6788d80b917a4a63018 WHIRLPOOL f7ee8ecef4904de2cb5e664c7c849ed6fedd843f720049317390831348b97f6cdf22c5043f16bb48b79117f09702c9badc9e206fd63ca3e6f45cab50225bdddf
+EBUILD netbeans-java-8.0.2-r6.ebuild 13352 SHA256 844777b7f609be6d5064dc27645d53e4d9585b2bcd6faf6c7d99d0e8bd68fd89 SHA512 96b0fd5d0931d0b4fc152aef4cdb472304921d522cfdd80aa1d27ecb50c4fc74f8b406ac52d6f4c498237c4a67099373c27b6417f8cf19f5f367c34becc0e055 WHIRLPOOL be6f7ab03dee8139f5e9e965141efd30ddd7449b32802af334932d77ceb99a196edfd0f1703100105b27979364cce4b6b6debf6c96baf9933cf78d01b85b57cf
+EBUILD netbeans-java-8.1-r2.ebuild 14810 SHA256 7a2422b1f9ca7114d5c57badba4521f100f8155ad343b0a6c33181074c3a93d9 SHA512 947233cafb92870e73220864acf8f46add0ace047183132c7afdb092ef1c988989f8c46bb5d551b61d70f35e77a16a97fea477df0b312687375a595ac1b39945 WHIRLPOOL f8cd56409866310db867a19c453f2257aa1438fd633ff5587a9d31f22db321bf4126d2661e4de7b5b8ac304ba7f5ac0d7e1b30a607b4fd7edc385f0f3ab360c3
+EBUILD netbeans-java-8.1-r3.ebuild 14832 SHA256 240f2ad91bf57fd193cc017c1fb10a09f05d0776ef9306618af2a588bb3f1425 SHA512 03f70df6bb90c61b9f5a194b0352673059ee941246b6a5ad2b5d351b1fa857b268e283c7bd2a6057ddb3c70232b0e0a72319ee2c06225b62463354e8b85a2f25 WHIRLPOOL 00ee2af02c185f6c3a6a79ae5cb457a807d507f1840698246cde007e502efb7d6cd73342667138bfd410b2e6adca2cceff1dce1b74999297d0e93b0e14a79357
+EBUILD netbeans-java-8.2-r1.ebuild 15304 SHA256 ed3ff1d5bb42b1173e8333867574fe96f7fc1fe048fba74d854eff1718d5cb42 SHA512 c08f766179e97b6866c137b51216f9d9115304cebfe3d7cdb64b9b804a396125e32c0f313150edf41ecc08e37049a3dfad2a546f2417e2d98d7bb02b26ef6547 WHIRLPOOL 10412cdd88f6740aab811a396be2bef9fbe2c733e8a3d1b7179b22e4ba7374c1e659cde384dfd7b9bc401c76ef03d2d08f2e432f38138ace4a31710aa3e4200d
+EBUILD netbeans-java-8.2.ebuild 15282 SHA256 334361c59cc8b6a9a3e4f934565bed91f92b48b1011f5432a9c1d9fff320cc25 SHA512 d89f60bf78b3ae17c820dee321c282bc3e12c2e04674852cd2c19da82f61af627ccbb6540257f85432ae950e20f0e30bc4e7b8528dbb7bc808d7605224c97a0f WHIRLPOOL 0080afeae7e9cff1701663abc84ad8951b2e3842315f759484e67f30df9f0d95cc1c21e6e970b138b47f4486c271b7a0eacada8b529b2a9fa1f2de5ac2576854
+MISC ChangeLog 4985 SHA256 be70e57eb32425dffb7544c83a454b80bb5c7c445e5b9574023ddbff4e72bccb SHA512 172b676aa4a1325c7f9377ba36fe5bd25839345f7d029c1050c2963eed7ff5a3d1674c5606d204ca27f6bd1bcd627f9497fef8a138be725ae58a6755d07e1367 WHIRLPOOL 4eb4b8dfeb8426e8cd6700f848839733a6330fc942b8e8112920e0e1f49c8201a9dea92b0fe3336f68565291fdbd86a850cc794ae52183e9781087b9453a0d65
+MISC ChangeLog-2015 5473 SHA256 517226d6b36840eae48ee8fd7120a9e11d5324c080eedc8adb01afefde3ead51 SHA512 43d674cf6aaf0effc21bb6a38fcb16b8b44173f48241594b326e3855c3f2f7ccd787b3495ea619879ea285838037ca6aa79a1bfa5e092ed43b043c0f45ef0860 WHIRLPOOL 57012511ec3331e429ab574c9bc0385566f886feec8f789179c762b6dbf7d31fcd61ae97ef8ec7e6447865c64231abbcfca01dbe481abc2c7b791cc77c2a1680
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2-r5.ebuild b/dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild
new file mode 100644
index 000000000000..e503634d6709
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+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.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	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/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.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/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/8BDE88C9512D8783E64788F32A50E4CCBC48485E-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"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~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="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java(+)]
+	dev-java/c3p0:0
+	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/saaj:0
+	dev-java/stax-ex: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"
+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.0.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || 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}"/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar maven.indexer/external/indexer-core-5.1.1.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}"/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.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
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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.10.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
+}
+
+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=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	local dinstdir="${D}/${instdir}"
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
diff --git a/dev-java/netbeans-java/netbeans-java-8.0.2-r6.ebuild b/dev-java/netbeans-java/netbeans-java-8.0.2-r6.ebuild
new file mode 100644
index 000000000000..140e2aec0abd
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-8.0.2-r6.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+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.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	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/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.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/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/8BDE88C9512D8783E64788F32A50E4CCBC48485E-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"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~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="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java(+)]
+	dev-java/c3p0:0
+	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/saaj:0
+	dev-java/stax-ex: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"
+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.0.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || 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}"/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar maven.indexer/external/indexer-core-5.1.1.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}"/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.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
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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.10.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
+}
+
+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=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	local dinstdir="${D}/${instdir}"
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/glassfish-transaction-api.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
diff --git a/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild b/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild
new file mode 100644
index 000000000000..372d97c7c6dc
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+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.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	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/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.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/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~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=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java(+)]
+	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.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || 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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-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}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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=/${INSTALL_DIR}/maven/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	local dinstdir="${D}/${instdir}"
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
+	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
+	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
diff --git a/dev-java/netbeans-java/netbeans-java-8.1-r3.ebuild b/dev-java/netbeans-java/netbeans-java-8.1-r3.ebuild
new file mode 100644
index 000000000000..8afa2cc57ec6
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-8.1-r3.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+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.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	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/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.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/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~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=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java(+)]
+	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.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || 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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-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}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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=/${INSTALL_DIR}/maven/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	local dinstdir="${D}/${instdir}"
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/glassfish-transaction-api.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
+	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
+	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
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..175fe1c8942e
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-8.2.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 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/Manifest b/dev-java/netbeans-javacard/Manifest
new file mode 100644
index 000000000000..0b94e86de0c5
--- /dev/null
+++ b/dev-java/netbeans-javacard/Manifest
@@ -0,0 +1,15 @@
+DIST 33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar 60835 SHA256 9d41bd3ff80ab7b6084e2a49fe185419c18748287a02bba2902b9cc94b6339d3 SHA512 119bfd0c03d8508251c1b70fb2ffaa2c096dbf12ee4558c689b81b33724d88ce03c7805dc473e806f49c0a400a9fd586e1d3c96a3362fa26a962144bc92e4abe WHIRLPOOL 9689bc30dd0f4442380da657805a0e971cda6625a2c1fc6c65d6f1c227ac4a35175fd46a876d8f6e1d2ce749842edaec94a167b32827bd5662329f41307ed6d8
+DIST 6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip 7788619 SHA256 86c9576a56b9f994be663224b0505c1f61f8945d401bec63c70dd78c74fb91fe SHA512 4c61ac191ff528466d7112b7d162596ce6d636484bce84c1781f92e2c865592df8919ad410a1053a418710920815d7f04792b25275c5304a2b9107b5420bf792 WHIRLPOOL 02c0a966f33026e2a454718d8f616f12b67da34aeaa37a114425340a6375d3e12f402247e15d2fd32ae09eda89029089cd6122b4e2ba92ffe0575405ecafdbae
+DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 SHA256 d2379466134f239b9dd723f021976e3d2ade9624296d3d4a6d3241beeecfc6ba SHA512 52601718cefae5570412b801999b5d6799ff6425d6a090323c6dac80248598b21f8ecf09c31e6a7f73f6ca7de9e99bdd3e79f539d96c5e1192fd2958766d212c WHIRLPOOL 448f084f425ec8f11922731fc76dc2a16cac8acc21aeb07244722d6f1b7bf7272b875f2b31d396c9f216a23f048698c03258219a7ce097576225f7d05f7bec14
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-javacard-8.0.2.ebuild 4900 SHA256 d9cb33d30c1c5329840fbe883473491c9fccad4e72705c9e230be13b67136cb1 SHA512 e38d1efee38c49b94eba57cbcbced29c4c26580005d66be37444eebe378dcd3ccf1f3f280ec28d0fb78583f4915d569922b9b4f5520d69e7319bfed8765219f4 WHIRLPOOL 7f7ef398c0d28c119e044124830aca64e93bc77ddfe6aa1ec0ad91593178c30e9d4283c415cd3770981e294733436f5fa7948e82cc9112d199ef4109a9aea949
+EBUILD netbeans-javacard-8.1.ebuild 4926 SHA256 84102167a164e4900429004deda30fc96104eb057f81e3b409a6818a61d08187 SHA512 31434e8d423382f46c9df48e7fb3e41e687c4f99f11c991d966a6b4cff244c08836c5cd54d1f8e451fe24497187ebe2e49bee24ddc096a8b1b877a3e27b367bc WHIRLPOOL 1a3874955d5decbd865deba1b7d2aaf42211de209500d4f23b04baed043481a6448fefaf2083e8046d24a18337d55e91fdaab9fadc1cb47d6b580a42705f6fb2
+EBUILD netbeans-javacard-8.2.ebuild 4597 SHA256 216af6a9d058708a36a2ea3f39b8c114dc9787c74f61ef4c2c1d4cc7dba3680d SHA512 2d0731bc6c1776b17a16ed8b3ed38407ec214dd477d25e225d104d16380e0bbf516494fd546e3dbb44d5fb52ccf387e2eef5817c505b69f1aecf00f8c082ae32 WHIRLPOOL a942bbafcda9030a4006b92e68a77ea4973c8bc51040cc96289daca81e99b884054ae7edb86a8073b382c5513b8c958b607c131960fb1ed5a7a38e8cefea5b69
+MISC ChangeLog 3545 SHA256 d443335f2c25098bfa0251218ce74c3a51385b6dc9b998f9ae2996367eff8177 SHA512 cae358bb2db3a175c06d558d6063a5f822c81dc17bcde0c180778c3beaf6b72af221d373d9f179d2b60937d455171f59b540539b1af9e9011fc28dba6e91f818 WHIRLPOOL 35316513fffc199173c2c5fa080acddbd41a7a6a1a44aceaf1c1d8c35ec841fa33ef0ae81f944a8030b6b32e35505b9ce1ce40528fbe3da2bef1f7d8b04d08ae
+MISC ChangeLog-2015 3929 SHA256 0c976c564b5f55ed58948115c321e2b280b168b946bfed0c1e9da34c9419327d SHA512 7326b6e358e4a91dded1da056a5e24f25391f32ab6dc425a2ada1434e936474fe15fb7c67a7a23d06a4642fb14dbc30e07344fad6d64ef82df7666e53da15a69 WHIRLPOOL ca85da6cd28235c56b2ede8310cb8e7b37acf3b52e92e458706fd1d490e44097f56a438ac76c135bd84464c90fa8e3714c69d41b93b3346a47cbc4b2bc61c888
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-8.0.2.ebuild
new file mode 100644
index 000000000000..1ea84176a946
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-8.0.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.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-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.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
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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=${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	rm asm-all-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-all-3.1.jar || die
+	rm bcel-5.2.jar && dosym /usr/share/bcel/lib/bcel.jar ${instdir}/bcel-5.2.jar || die
+	rm commons-cli-1.0.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.0.jar || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-httpclient-3.0.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.jar || die
+	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-8.1.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-8.1.ebuild
new file mode 100644
index 000000000000..5260b7df5a95
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-8.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-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-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-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
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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=${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	rm asm-all-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-all-3.1.jar || die
+	rm bcel-5.2.jar && dosym /usr/share/bcel/lib/bcel.jar ${instdir}/bcel-5.2.jar || die
+	rm commons-cli-1.0.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.0.jar || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-httpclient-3.0.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.jar || die
+	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}
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..f0be557f92b8
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
@@ -0,0 +1,120 @@
+# 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 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
+
+	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
+
+	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/Manifest b/dev-java/netbeans-javadoc/Manifest
new file mode 100644
index 000000000000..040f32ba8c51
--- /dev/null
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -0,0 +1,14 @@
+DIST 22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip 2318445 SHA256 9d251f217f0f39c098d4fa576d77c720f8039b43becb15d88912d9c3fdcd2c3e SHA512 c696b7984a663257210b03bb9a7d4a8da8a53d7e727de068558380b14c0f17aefe8cfe310c0b96f277010756b277f500629db3c9d9a1fcf38f5113708d8dbd34 WHIRLPOOL a8e55e84ee661eb951dec065cf0f2ac6f19720a30bbe8432c95a56d531fdd2bb48a8359946fc8a1bc8d789a568bfed87bcdee04efdc86be58a518434616d6641
+DIST BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip 2341753 SHA256 d643c2f579f13c9a4220df6243e2669349f7fd52ef10595aa7602af558067c8f SHA512 024b1458f74ae977f5864b543b39417205203f27ff94518aa61ee4c7336c887dc5704b71909fd2b6286c3a29a9ee0aeb86aafc32f741c7650adcacc8374f62ca WHIRLPOOL 6843d000325f46cbf6c3fa9c5b09ea37785c6bb7ad3f8438d186e60ea96822325e2f5a22485653f0e242afb1d8fcac5804d629cd549d6a07b319996f4ec822c7
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-javadoc-8.0.2.ebuild 5987 SHA256 32f2e0034d89729a27b174612b35f120a0b30a705eed180524971758677f3877 SHA512 ad5d9c663a7095fca3582f755918c28a87dfd35400460cd9796f31e37b6b84af83ab6438642ed2e22e426e35b482006b727e77eb3ab3294c70360554c5409ba4 WHIRLPOOL bb6a542bd8b64e27983d2f06e99bb4405dd44ffa27175ce46db7a59d208edd6467a14f99212761756603e438491997afeccbae62d0a65362d1f794b9df4f63a5
+EBUILD netbeans-javadoc-8.1.ebuild 6243 SHA256 b4166fef9471a2b8933d871b27ca3dee24d1cf1f02337b599556b45d77df33f1 SHA512 86bab004146f05dc573c5d4f9f87f9ba7137e01bb344e793ba2f628517af62f96878952ec3e1a99887ab0cee404bc5e326f2e20c997ab8c2445a4760f3700bab WHIRLPOOL 5f7a45518778db8342f1410ae30620fb0316e578c1aa942a56f838b94da569618f7d47a46e6648ff535103a3290d2b03f0fa5657edc585231f7437c4e4f1d55a
+EBUILD netbeans-javadoc-8.2.ebuild 5940 SHA256 b47e514db1db3a143f054f3f71e870f211b6a194bc3b2adae85512500ee51443 SHA512 e977fadc36971140cad10206051e54d149fea8026c993a5c1cdb9e64313e94717f1429310b61c2f8846e8ca715f5a3065384bed56756c0a55a1e3204f87a9b75 WHIRLPOOL d220d1d796b0150f24e9c5e7bcb7ae4dba8805c60dd04993733a265827f262870701b5054f1f51960a5ed588349b19b764d10f02e1859e1493ca755409f299c1
+MISC ChangeLog 3526 SHA256 de92fc1a032873b859728eae52bcbe1c64a18db610ef3f376bf5abb81f8ecf8f SHA512 96956c960df325b16c2763cf7819d695dcf3afe62994c62e6447642a7996497a0715dbd731f782e444258cce60d78de0eb57af13c9d3c36e251bb5a0310e0fc4 WHIRLPOOL e83204b54db8d2c24d21ffe46d42b16fa841aaa3dc43806aac89330f7aeb65f799406fc66cc86bf046ed052b4ad7ba2ff2f4b00b74beb532417b9d6a27bdf643
+MISC ChangeLog-2015 3992 SHA256 d58203ea02b4ee78ebc5a24f9e7c2cb5a1ffb4cf9b7dffc943b54e1ef3e524cd SHA512 7986044d652f23f658d03f4065b1bc48ea840837694733019b0e9f4d81867350fb2390d752d2c6924795b53da2d6e80bea6a09b23674cd7cc500b1858a7fded9 WHIRLPOOL bfd549eed6995ca8cc741196adf1dff8970c703c8a3ec7bc7ac3bc7fedad8dd76fcda7f7068eb1e33127fcb2776d4215d2c6a1541b3aed7753abc81e0af56b2b
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-8.0.2.ebuild
new file mode 100644
index 000000000000..917fe8ec1741
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.0.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+DEPEND="virtual/jdk:1.7
+	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"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.0.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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.10.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
+}
+
+src_compile() {
+	eant -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -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-javadoc/netbeans-javadoc-8.1.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
new file mode 100644
index 000000000000..168ea5741496
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-classpath-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.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-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/Manifest b/dev-java/netbeans-javafx/Manifest
new file mode 100644
index 000000000000..ac23fa865a0f
--- /dev/null
+++ b/dev-java/netbeans-javafx/Manifest
@@ -0,0 +1,20 @@
+DIST 0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar 132323 SHA256 e3591d9a40c8829eca5f12a12513f3919be4b07923b0aabad1ba4b9f472d79d1 SHA512 4aacd1a1bf7a177e496d604af5d55a05efeeb3c3d2aa6ebe7606bab9278980dc7ef37ef6debb405bf71bf4d4907b8ad2792a7a224987f2ca02fe7fa1be6808d4 WHIRLPOOL 23406d70f15bf7ddcda79a86985b9978a3b72fafcab6e8e3c665cf0958cc07aa095e9a857e5d9c097de52fe6d2bc4f0216f7cb50d4984d83e14d9fad1eba3e53
+DIST 20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar 61713 SHA256 38bf23ed74459460f3f0b91735455e9b74d406c72612b6aef7278161db119545 SHA512 2d06db5267ac5d8fd227819014177f0d5cc345583628f1ff2fff89f180a4269936a136af0b4649cf43603b0adab6ce3e3f525ef2033537c6f035b558c356d900 WHIRLPOOL acd74c6edad1c0e74d6475aecd0a00d2b0760bde5a76b9846b466ac03087d814a9bbb1c0b4ab3f2bc29a25c465fe1875f6a45e544c7468c4d60793795c37dd37
+DIST 49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip 579550 SHA256 e173ba926f93e89bbb9c76bd2190b01e0af2d2b3223d2c78b4ed5bdaebbd78a0 SHA512 3de7720a392813cbbbc73a6ce2a745e10054c0888df61b1e623bf327f8a4584a9eaa07303fc41d01d2088fd6c868e7273c6355d23839dfaa9009d1f672520d58 WHIRLPOOL b6e2a6ca1bcea47dcff7d8a9ea043a5b76834bde9d9f715d5d3eb52211e5c0d8a9d0575c326fa2f1d4d2a5dd93bccdcaf20af45788e7e3032829ac85a83b64da
+DIST 5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar 187846 SHA256 40a7cdedd5a9724b07dadfb3e4e8cc71d6117052f59f13badd1bbf60370e45fd SHA512 548dcb27bc8aa61f17573e0e9896c361466a5d226b8e6b0d5f9a0181d17ce61ad5d137caa268c33da17e8541978427c3faa34be99d96817d09f22277f99dfda2 WHIRLPOOL 4cc8b27be4c5c9715b4103b7022290f9b84a554070de088035a1b80024c5540a456b04a3a80902ff345b1aa5d5b200157b3016b6023e7b62b6a0b1c80caa481f
+DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 SHA256 18050686d2da634f3612a8100c405eb092dc06d86b8917c6b945d096daf49f94 SHA512 5a0089c36c35ffa2c243cbaee376a246dbfd3dd3f170fa233946b6134f9c80dda610f2900e8bbd1553c3e8bdd3b5548145c881745acc720ec1e059d8252b8399 WHIRLPOOL b01f2a78d653aea3f7a2369a66bef0ccda6026a38efe8f52616eed75df8ef80852ba509a4319ba183ab08d9141a138cde48addd910199f47b2ada7bfc5b24efb
+DIST B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar 173819 SHA256 4f2dbc36ec77519df339846cf5333e874d6f147f5d46ccdfabb18af34ee3bd5b SHA512 ccd48f9fe445b669763428dace1a02d5820a33d872c952d3a74608f868ca225c017999ae15857ed544799d467068b759d216121ba79d3288f323aa2cffb95fa8 WHIRLPOOL 02e8556df81839b0b90c912b9e22c22c9f10c54ee0aabda4768eaf6956f7e3e29c9b24a46e20bb264f2ea186c1642ec7baeb375b2a8951737543ac16e73f9260
+DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 SHA256 8c6fa603283582893aed25c247a4748eab38f3e6ce9c59f31b2bb8f3f217a317 SHA512 ffad7d45643015d178cdb1b5bb075f0232470f5f7b82acd87d3dbf88e2034aed04fa9fadadbf7831d3c57fe0c4bc9684d841aebaa8a99ba1d6c1f6cb13f80359 WHIRLPOOL c4df551c83984a2b5cfbe60363ff4d9de2b88f87ed4dcf9b8b91615c62cfe04274736ca29186b8541bc11b1cda8c79ddfd07f3ebcfd146664d9f1c46954696ea
+DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 SHA256 5ed65a118b90400886ff4debb29a6e2f82a440bd18e7045c8653d5cb3178616b SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065 WHIRLPOOL 50d3a6534a31b6d8c6c62d580f4fc56f4df52e79f3acf7297ab7deff87f0b7d4a436cd97706ff9fba24aea797a3efb60d501f4f734f7c607b0cbff4c7e9899bc
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-javafx-8.0.2.ebuild 4641 SHA256 7e66008e68383a22b8b9dbeeb62d45f2c3b500200913e761f9257ac69fd9bebd SHA512 fd76f6d64909e7c86c30f35f09275d926aedcf9c107f1b0beb8ca46dcbac0b8fc506740d6499fe2be17d1a0a2f346635e42443a00671536dbf7c4c28d17467ed WHIRLPOOL 5df263cfdb5c60699b8cbf3ddc168505c487c75efb3fb21276b11012d05e3dd5398754686935b1ae18b90d3a57bda840002b5329b0c483f1cfbc6afab4942279
+EBUILD netbeans-javafx-8.1.ebuild 4667 SHA256 fddc0d045f964317d71d164e020bc7bb699389b376bf3105cb733e4389aa59d0 SHA512 5272a95e419bb9f5ab0a61b55c933c87686dd1335ecdb515f7a4867db3218a27eff31641aedcc1d08dabd3d9ea6e5546cee13a9c7958097402c5a941a3ff9e8b WHIRLPOOL a92800ce3cace7fb3359bf7486009b56bf415f434793fbc8cd13df03562c5ca60fc08b81842e73fb3faced4593f473ad7a8bc8991914d2ab2748f6bb6fe7ad7b
+EBUILD netbeans-javafx-8.2.ebuild 4343 SHA256 ba72874b863a57abf5b1486ac109039800fd416c0adb916a27f8703e14ccf5c7 SHA512 c5a5a06446883660cb5b97c719e34e41ac4fce1576d2f942998ea4915052d1b42217b5365ac2cb3b3ed462fcefac0d338dd3fad3232ae76868dc70256ced63d4 WHIRLPOOL 7f0c38da08b8b9484ccd8edadd320b774d01b9765cde21e05206451e148074910d9241fcdc93ac7457a98ec90c3d5cc9cf0ba2af93cb0b719d4c0435089e3bb7
+MISC ChangeLog 3513 SHA256 6ed4515e3280e3a658f14d3f996d147c7f0291823354e6a1ec7353cac6c3670e SHA512 ce2034f4fe8bea32bb3e1b476b14e3f4ca680472b04c58fed53cddad28d5a6dab4e2bdce386f6c7aa8f9367a4b75f45082deb2ae2d8ab34c50f92c9631d7a2dc WHIRLPOOL 37a14f8644539bac91f5090c2ba9f6a96b2e3c702c604e373bc34f79caa6dd157b9f5620926396ccf478104859788ef16487b1110322c98043297c148a263818
+MISC ChangeLog-2015 2753 SHA256 a7c06008d2d3d1b4b6b10e4555188976691a086af6640f4c60d550da70fc00c1 SHA512 a6660b3744e7d360ec7ba2f5d1705e917ca9a9489b3aef37bd5d2aefc52d60dafe7070a0ea3467c34bacb492e92dffb6367a0d901c6c07c146dfb7569ca28bc2 WHIRLPOOL e4f099254828f727fdd5aa7480c2af59254460b322859f397a0f7ad64fa7edc546ef675070add841e6e76dbc644171c8ee120ceb1280a95344b4ca60feaff5ba
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.0.2.ebuild
new file mode 100644
index 000000000000..ab35715ec593
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-8.0.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.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/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.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}"/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-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
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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.10.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
+}
+
+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-javafx/netbeans-javafx-8.1.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.1.ebuild
new file mode 100644
index 000000000000..dde08281d395
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-8.1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-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/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-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
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-javafx/netbeans-javafx-8.2.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
new file mode 100644
index 000000000000..4e35c021f66b
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
@@ -0,0 +1,110 @@
+# 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 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
+
+	epatch 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/Manifest b/dev-java/netbeans-mobility/Manifest
new file mode 100644
index 000000000000..23de77676ae5
--- /dev/null
+++ b/dev-java/netbeans-mobility/Manifest
@@ -0,0 +1,12 @@
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-mobility-8.0.2.ebuild 4336 SHA256 16b075d689bb6e69a7a506df8e30b7889f021092e84905e8095528c41cc29982 SHA512 eaf14bad9937bc9ba8beff59288fdedf06e98212748c3e829194a7d4aa9b6607198b8270a87c9d032cf9887731ccc37ebb53048e25e240ab38cf9e23bc30c631 WHIRLPOOL 39a81d3da7754264edef411e40ce2c90e257009088c97e60c97c0aa1d528734ecfbc3b969dc03bcf16f60b1b5eacad31360045537ed891c8d8b30461034d6c06
+EBUILD netbeans-mobility-8.1.ebuild 4362 SHA256 f5134fd8b049eb1ff4e93342677af3a96cbd3c25ec5801ce9eaf949d859b10d7 SHA512 836f53543f8f0e28aee93fd367c15598d3782a06eac87d5e7510bd09916710983dc6f9675ab2b50c6ea1ed29b54d4058486351ddf8e9496b22d0c8b99862b7d2 WHIRLPOOL f0e84781363cdc64943625d0bc71bd83fde08da24b0217773106c44e50b3c12bf8bda03eac69bbaa74d0dac9c94e1ed2bd338efd6a3cc776a7b4c7f43e41c48d
+EBUILD netbeans-mobility-8.2.ebuild 4038 SHA256 c54b7b9d9926267487baf37e9f1a610d85c6835cadb2d21be5ea7782261e3bbe SHA512 3513d901337d40f7022135428bdb47342965e983066f57d8e05eb623fed7d2ee32226d7c38da7d03f349cb1d53f2ba05e3b7d0e59aadbc2341173c8f9be59384 WHIRLPOOL 82de0efb7348b3e824edd41944f8a640e4d954956ba36404c58deaec6322181ddf803f63f730081957ea7154a9383ffafea37d564e197d8bb1449cfde2ec4a5a
+MISC ChangeLog 3545 SHA256 42f8d55a95b4161e36be91beac13972e59e638c6542dea2e35a19f8aadc54b6b SHA512 d6bfa225c46105494211479282e9bc2cc2b0ae4f6da3f21fc86e2441ec2de615b5e8a439d21bdba0d4e9054a92e95dfa475f693b54a5b30107926653c1515589 WHIRLPOOL d5dfb0faede6ba87159f8a39eeb98b3295af6d3ebd873b6102f3cf9284a141e3fc1a8e9f5666b5a3081feed5a88a6a0666b082dd9337c2baa024a0bd887a9289
+MISC ChangeLog-2015 3929 SHA256 f875addf5c40d01c93fac1199a7a78662a7171829bb940f21e95c2fb9dd63be5 SHA512 0ef39d00bdc0c8b167efed98ac9e58bcaa0cf054870571d5ef5304a94ad21cc12a49ef2de79786e92809d436a76bfa5ce3cde656551c9be55bd2dc0a6bef09e6 WHIRLPOOL 4135c5a3a2a5824fe9ea96f56c8516c291eaf5c2fbf93c1145dd5610a8effe73caf2c925ce850b32aef0d395994e754345a3c0d0027e54aaf67e057655c81ad0
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-8.0.2.ebuild
new file mode 100644
index 000000000000..e2e7a1c03fec
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-8.0.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~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="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-mobility/netbeans-mobility-8.1.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-8.1.ebuild
new file mode 100644
index 000000000000..497711c850e4
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-8.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~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=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-mobility/netbeans-mobility-8.2.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
new file mode 100644
index 000000000000..c2c95b3be78e
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
@@ -0,0 +1,112 @@
+# 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 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
+
+	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
+
+	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/Manifest b/dev-java/netbeans-nb/Manifest
new file mode 100644
index 000000000000..e8af7cc88356
--- /dev/null
+++ b/dev-java/netbeans-nb/Manifest
@@ -0,0 +1,15 @@
+AUX 7.2/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6 SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 WHIRLPOOL bf9a183d7d42af9b5270151e6e6d44ff9079d2c8f0b80f9e9ac4018c8e8002e27de9afca1c57ba91d588aaaab60c194b059599f76a9d2e8b4ccf3b55022cc44f
+AUX 8.0/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6 SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 WHIRLPOOL bf9a183d7d42af9b5270151e6e6d44ff9079d2c8f0b80f9e9ac4018c8e8002e27de9afca1c57ba91d588aaaab60c194b059599f76a9d2e8b4ccf3b55022cc44f
+DIST netbeans-7.0.png 20011 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a SHA512 67bc2673f3e770bbde10587e68890c3091ef38a850cdf48ca73e4c1a288246e1f757fd4ef1c7b052b6137f31fa6044c9bf3ea5a2a9e0ceaede132c106a746113 WHIRLPOOL ef41b010f5c5b2023152c9eb4390c40716025f1162dae68f6c65fc642f1732494f70b086a032599c696d053b963e4edc1220a3c1212ede6209c27fecb1ffe5fa
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-nb-8.0.2.ebuild 4922 SHA256 6f1407adc45ab6d7b204907119b137ef7e3b8f509756471e32f547184444b5a0 SHA512 d46012bffe919cbf3c768a090e4b1a66e93d1cb9aebe41ff084de0e303c4a53e62ad15c184ee1263efc7326efea9463846961c41bd218d1eedaa7357190ccee8 WHIRLPOOL b61cea9aa16f76cf54f3c20820ee747534734d3760c9144bb089029adfa03c1e0e04632b97d6223519b8ca2cc86619d7bfca91445d5b8afc8476982266c9dc07
+EBUILD netbeans-nb-8.1.ebuild 4062 SHA256 572e1e3c3e56a6a031c6663b11bbd0c73b907f18c1423b6c8d11d6e5604ec07b SHA512 926e714bdd51afcb0ea8c5ee8ebb5e17ddb4001b015fa3cb90feafca5aac7cd709e38e69bd976f051e2fe5d69abb78af0f4fb142e4c4ec8a73f34a6597da7be2 WHIRLPOOL cd4b03768ec692d83774eda9910480742b95e42fe92cc8f64d85b4f428226cefd4d5bb1502ce7e179b2875d49012ea43b2acc11fb075809382c9de9a4952fe16
+EBUILD netbeans-nb-8.2.ebuild 3738 SHA256 2dd0320894b39be74c74b6cb5afb4aa8e41a749241354d67621e4276f9173c15 SHA512 26a0943335e05cfceac532ea0feecd0a1fe741cb898d9fa46356f898b9b56f08bceac5bec4d4599f5338ac7d0490b2f92567ab8dc914206ae1b4682ca5f683b3 WHIRLPOOL 35ce0134de8f26eada7fab1d071e5a73bbffbbc4438ff130392d782b3c7c2607ea867cecf9b281b3dfda14f2d4fbebe2e476ca7d01d984f2077cc8426597d438
+MISC ChangeLog 3529 SHA256 53eb1b33f00eae9b81b6d55fa74ab0463c65bc552a999a734621d2cdff79ca51 SHA512 6692fe361914204d7426f959ad068fa0e45da00ff8bd21bcc00caa70dd2c71bdcdd6193797583a3bbfdfc8daa7d8cbd578881cd6945ff946127a9c48a7eae4dd WHIRLPOOL a76c9a1e64ede9ef6fb820f4c46d0bf4f2711144a557dd48d0deead990e7fbe401a515137e3fae7f0fbeaf0f8004cf31553272bfbbb6d0b5d52f504127a7db2d
+MISC ChangeLog-2015 4319 SHA256 3ea595001b0742b1969fbd5cbb5df9daabb1a9541e8856d4c4a4d7a9cfe46ace SHA512 cbe5c1dfef3a1464c8c3b8e25b805bd373ac54aa1128f0c88a4561ed62fb69351750ee1ae6b0eb3ca803c699ca7ca13510fe84bbded3efc411f2f19a44fbbdb0 WHIRLPOOL ab21108eade861a95357fd6e0c7823c5f489a7adfb25e02788f32d24bf9a527c141bdcdb7b606232bd1f842513700b27eb1d655de5806701b1c3fbc09887b5f9
+MISC metadata.xml 487 SHA256 6bde8ce12366190a06d47a858c48f89b2eccf095b9f2f8e0771cb5aa8d7d04e1 SHA512 3adb6a12417f68d9c6807560509bcc4e7f803b5f65229131a9958ebef55ec1d11bc3950db909a8ce0e6c691f95ca889167f9dc94871cf67ccb6293e5fbb34543 WHIRLPOOL 8d3c7d442637c70ff9386a6bb22026b404adbcddc9ccaca20c6238657d4432fce3f03d2052f045eaa49b1dd1c13670da9bd9f0898d9bc5f7f3433a7e758c3131
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..198410c3e01b
--- /dev/null
+++ b/dev-java/netbeans-nb/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="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Å ulc</name>
+</maintainer>
+<maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+<use>
+  <flag name="keychain">Automatically starts keychain on netbeans start and loads
+  specified keys so Netbeans can use them.</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-java/netbeans-nb/netbeans-nb-8.0.2.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.0.2.ebuild
new file mode 100644
index 000000000000..0127e902ae39
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-8.0.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE="keychain"
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	keychain? (
+		net-misc/keychain:0
+		net-misc/x11-ssh-askpass:0
+	)"
+
+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"
+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.0.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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
+}
+
+pkg_postinst() {
+	if use keychain ; then
+		einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
+		einfo "your keys while connecting to ssh protected repositories. If you want to load some"
+		einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
+		einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
+		einfo "each key on single line, for example:"
+		einfo "id_dsa"
+		einfo "id_dsa_gentoo"
+		einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
+		einfo "for key password (only this time and never again). You can find more information"
+		einfo "about keychain at https://wiki.gentoo.org/wiki/Keychain"
+	fi
+}
diff --git a/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild
new file mode 100644
index 000000000000..9406f3fc0ef1
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-nb/netbeans-nb-8.2.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
new file mode 100644
index 000000000000..490cca860c9a
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
@@ -0,0 +1,114 @@
+# 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 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
+
+	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
+
+	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/Manifest b/dev-java/netbeans-php/Manifest
new file mode 100644
index 000000000000..e0077a0601c1
--- /dev/null
+++ b/dev-java/netbeans-php/Manifest
@@ -0,0 +1,17 @@
+DIST 0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip 38814 SHA256 b49d6683562098839b7303da877242d0c017ae217db5c442cce33cf1559e733f SHA512 75773b7067a0ec98263bdd2e9fdda77ae05e415b19b12e828ca92085266380f19980ffcdfdfac5a7f284fd2292b3af47ee93938b034f77397d8ade129fec6076 WHIRLPOOL 9a6080379a2c30d6add51c141b8126abc786c2e060a32ed0e377503002a6a1087b99605fae0dfe30bcf60f43fcef65fff4fc30858e15488f932c9b7caef224e9
+DIST 3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip 4593 SHA256 156a35bf95b0353f05e91f1f8f591b5f8124d99cbdf380e32d03f07f889f2146 SHA512 66efd8c6f586c501e19d0b1f04ab212c955ffbd67bf489a9c60b37e0f93733c75b86b01462cf78ba8877b4baff723659d9753458aeb8a0150fbddd4d81ab1b01 WHIRLPOOL 70e28e715335b3119c2c18f3b8736869d7aba4c08555ef5b20a5151eeaf79a8d4c4d94a20a283fa219a7d336c91fed84c86a7424b7a571d152e1fa2e59b37a86
+DIST 472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip 510273 SHA256 a80b6270be0c471513ffc7c50033c0d1ea1783873aeb9d6838d15629a85efd4f SHA512 d28f46ff8cc1874108a9a2ef37b6e41b40df27cd36eb976e23d75ac2fac36dcd08f8a18a26d62126bd982724e747cdc9c344f8c25cf3cbeeec9194e0d4412341 WHIRLPOOL 39293580116637a761ecdce11297794d7c68e277c0c0d55e7946e9ca88d05706c464675fa45ef57334245d734fed3c4cf59c3824d9389145277b98263964abb7
+DIST 73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip 569711 SHA256 882dae2bc8063feedced946c364cf1f79b331090d78621a17353962c20f39359 SHA512 294c3ab28382476e08851293468c014212b50773c87aef478647dc60efec4979e7b82d513b779d52b51251fa9ae223e4b37cec4073386c3e768892a474e7abb1 WHIRLPOOL 1a2530a579c95796f14909d04007c276141fd5ca80153190b1888242c93afefa92588604ac5e64714df519e871a191d1ec97b1a7aedf979d59e9a2dc7572d971
+DIST BFB982F9B33E2F1A1766C212C8208793F9B7E77C-phpsigfiles.zip 555036 SHA256 283bb0d36a480408874f19e9d3394f48bb95478328c43aede9c6a32bf865cc2c SHA512 fbd5dc93d03a193f33d94cb88e319fb8585f862633c5a26d6e09cee61cdac77dab847ded4fe060b09746f6f55d42e3544014b54e37ebbe15c8102cafe0e46659 WHIRLPOOL 1065b0154e03f395d2524e477d3462e8d21e65e6daaed34ff698cdff8edd998b8ca33647c236364d7005eea5d3ef94cf29bdd6a96b57318dcd14a42b9790a0a1
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-php-8.0.2.ebuild 4341 SHA256 237a39b11fd19cf0968beaed74ec5a6209c3dcc728eb362219339e7caf887611 SHA512 604bba6f92ea75646f34b6a7081dce8e67030b66040de752963742599e5ab1ea2a27e7e1a90663bf0b35a24af76e78f568ef3534abad74fa57f88de6b11df85f WHIRLPOOL 6ea5a93f2e54285ab3dd0e507b69c012080b6d3d5736588790223dbfb92cbb5cd7d26eaacc65a85f7ca985880cbfed4e7135b7f31cfb8d655511f0c4c46c6436
+EBUILD netbeans-php-8.1.ebuild 4367 SHA256 bc454c119a1389894985a3c609f0f68e0f72c7be45b9931d1802f414c4d76e9a SHA512 eb5c70fc40d0d941c86a6323e22da806886fab8440040094809171b5e4d031acb73572a444081700770b859c20711726c42cf1fb9a4c3cfcb50b3c934f1c3102 WHIRLPOOL ad2a0754af7ad59f3df87c831473672b1e3431d8c0742499ff0a43224a62d5e6c7a94a091c62c57dfb5a958381e0f82aa8daf4fedba60ac130aec4f9cb6d650c
+EBUILD netbeans-php-8.2.ebuild 4044 SHA256 8830957382315ef9339475e3c0f411d535abba37464f64423839dabe40e47428 SHA512 3d816ee6ae286b10692bb4b88f46df3150f2288a83e6652666f5beb3f6d212acc9148a32447f00865a6cd288050e02900e72d588736b77ecb5b5b45579c4596d WHIRLPOOL 69226e4a890b9be6aff4297a59d869b2d7507d24e723775b6ff206d37877505886c266ba2475a4d15b92394bcb2da51a4ad563880ee31b45fbdd138aa3160850
+MISC ChangeLog 3470 SHA256 8dddd93968a7d6cff8bf5ea2cb2f48944e2607fb9a8be0716f6fc74128a5b054 SHA512 9f5cf13d728a343cd1b80106f55cbf2c2c7fdaca29deed05b9749c37fe5c7d9bdaa85ddb0198fb9331ac07fdac59f348f1419b50d2afa5dee32dfd899ee9daf2 WHIRLPOOL 6b6088ff89c47e57c5c3a88abad124434c8c1afb9f0d60d90a78a9d21faff099e9584f1c8f95a323b60cd9531d7f6b8c2eea7dd09be22ade06b9204a72952adf
+MISC ChangeLog-2015 3657 SHA256 86c50fb738507a9b772e7054be8a45beea891d898af8f701b449d61eeb4b2bf1 SHA512 39de3024929bce4147b075546861c093bff25f87cf5c178b9b97528e18eac78810b84249465cc08c086aeefd5cc073fd3ea0418197b0e49fde3172422c7bf9ee WHIRLPOOL 177a8a1c27aa69d9991872ab3d93908940d0889eeaf16270499a83421004368fec2aaff9703e95708491a9e2b901b786914deca8981c7248b168b2315a1ca09f
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-php/netbeans-php-8.0.2.ebuild
new file mode 100644
index 000000000000..5ba98bd4220e
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-8.0.2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~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="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.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}"/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-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
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm java-cup-11a.jar && dosym /usr/share/javacup/lib/javacup.jar ${instdir}/java-cup-11a.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}
diff --git a/dev-java/netbeans-php/netbeans-php-8.1.ebuild b/dev-java/netbeans-php/netbeans-php-8.1.ebuild
new file mode 100644
index 000000000000..b3fe8d4ca50e
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-8.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~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=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-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}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-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
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm java-cup-11a.jar && dosym /usr/share/javacup/lib/javacup.jar ${instdir}/java-cup-11a.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}
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..29a09553b8b3
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
@@ -0,0 +1,113 @@
+# 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 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
+
+	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.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/Manifest b/dev-java/netbeans-platform/Manifest
new file mode 100644
index 000000000000..3460a0b4df02
--- /dev/null
+++ b/dev-java/netbeans-platform/Manifest
@@ -0,0 +1,38 @@
+DIST 068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar 66508 SHA256 f91fd63a87fe119f2c3adfe021de416a6748c53af3399d6c4a6ef132a7ddd219 SHA512 9abc9d3ad65344007d5869767e519b9cfd3f55498d6e821333a39912e988d17e24a3e4b4858f917d66d81b2ad3cd97b87e49efa7985f0568e4edccfc055b129d WHIRLPOOL 76f5e62918a7c057bf1ec74289ef13354d1f1e823335089f27326fd251346408d3c7d4c6e33109b105b92caa8bccf6f7ecf7d6fb5c2e2b382b183e2ddf373025
+DIST 10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar 26101 SHA256 af95400dcdd6c730d68b6219ed83e620a405a9f9eedbb3acfd8b7ae0ca718cb8 SHA512 be6587de5ba44b05a4912658cff0dff15c20ee984462b441d6f8088a2d6a991f1c070ee78fe75ed35ad406d11c615a08a1b40b3b729cf7b3508c60ded1ad3caf WHIRLPOOL 24665234fd09a7c79a59c75cbcac6f8e4de227056334639d22fb41f30eb1229eaeaa0b2e11c6f856ac09d1939f8ce9235e3d9f5ddd86f5c670a38a790e4d648e
+DIST 1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar 529233 SHA256 a61000572baa9e216f035b56dc4f2b4119328e8858af5d523af84b356d7857e0 SHA512 55f88f204cafd6968a952d6d08286220a569f678915446aca2b49bfe3bb7e2de6935d5ce834ef55363209d8f23be7d2275cc517a2ce837b75e5e5a6551e9ba9e WHIRLPOOL 4cba5cb7078c4b24ceec00a54aef36898ca288643c6b85c360b271b2a914e516f298bc489f9e78477411c9ecdaa17f3262381d02b360d4309dc5b9308523b7e7
+DIST 1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip 77859 SHA256 1503657e36d02befc5433a57f1134209f98f3d193ea30c9ac0553814a8590a21 SHA512 15834d5448da80be539259e902ffa678a3b94293ffec221ad1e6238f0abd2dd2b588b8c06165f7e89796e96a6660c3166aad13112d34eebbed29163b52074b56 WHIRLPOOL 274c0cf5fa7d44701d7ea82b34758d6fceada1fe88bbea34058a468d350e1661c76f07e7ee0edc6b0c34113f7afc4540f2345e2d1bf6bf577969a305362d4227
+DIST 24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar 26106 SHA256 c174ff56ad6c9c9a43da65ef6af3089d06589e3bdce9fd0a46a0a62dce090b3d SHA512 144ce397daeb28dcab232d80ee652851b545b6a98849594352340d7a5044b28c96142b72ea5c3dfab6e0f63fbbd36c6e0404c5cfa43408048ccd550d415456eb WHIRLPOOL ec025825f612aa44e7f8f9c1e3a8b30c21f3c3b13980043e9187b58aefae1a0024b0db5e25e1d4eaa307585d22f1bd32fcc688d5daa5438ad079464c47593c5f
+DIST 2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar 241636 SHA256 94ecde163b4ca3a42425cd830c79197f22d0d1336d471ced6a8a83b07acbf7c8 SHA512 346746e19ca24e7489ba7bb283cefa47d2df33e6795e9e275bdc269dc312537264c24537b2128246cca8a4c2053a73e4172c6d0b9f16450e227d9aa895e9c730 WHIRLPOOL beb6125f81acbe80b6249d2b857a0759a876bba677466af6d1b71b54dffe33272d3d8e98953a49e2acf502fc27d60c31eef442e19f5f63a17a3d5190c27e6b69
+DIST 5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar 67500 SHA256 5007956e1d36eea9f093996ddc6d9bcf7fc06dad12dd61c48031294162f4a63b SHA512 d87ca1d527b87a47266593bdc0e58f4aa4adb6a04869a342657940e8a442b58a60c08831e27202b9628b996c16bc4635a0985c8d3126962e5d7f2dde049515df WHIRLPOOL 441fe868d8eb3bd6d8020961e1343313fa3b739205d01832c77fd04e40194603f62001295b8c75f606292d26a6e15cd80ddf2bf9796fd944b22f441fad7e8231
+DIST 6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar 9109 SHA256 9dd9b6cfcd4fef1018ac5f0581727157fcc22eb4e208e410488c99e0120bff27 SHA512 883d2428460ab3728e60259fa74b5dd6cb0ef168eb54becb10ad0a289a29e518273917daaed64a7d8f8c61033a8dd56a160ea922be4e8df396823d00910b9c52 WHIRLPOOL 27bb3a958cc742c91ee451d3fa2e85fba5c045647f91a35917ba4cfbc08d2cd178af88966e215ec9f41ddae7b6b99623d82cc4fb165abc748459a6a1e56e2d42
+DIST 771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar 45895 SHA256 d1a6747ecb6c0dcef784a52bb7acc774d3ca55f1c28e5c98f0c18006fbab11ea SHA512 5ea1efe94544f52aa9ac1492929c0342140df12cde399610faff719ad71f3740621834868876bc622f983c237a880df792ec6817bd0c7fd3ad6edc02320584ad WHIRLPOOL 0b68ac44c64d98614aa896158211f7c39d8c7164126d74f6d3071072675d47fd09c7114e567814ea7093aa95bc3d35c5b8c36bde21e840b5c4d1c3923f9adda4
+DIST 78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar 14733 SHA256 125d1cc1df883470c74f396c23630276ace89ab42fb363166a4248c2ddc1487c SHA512 ac034c2b06ab448ce797c9eeea302895fe70bb9661e9a60d5aac7f0e5f1e5a120763b23f369e7fa061231a176177dc9893789ecb60dd987e5c13eedf6af66ad8 WHIRLPOOL a0d65040a60cf1d4c0cfbbd9c261961d8daf10d3fc10fbf131c642110fa0d0c00e1abe2f72263b61346fac8d21b467bacd65599bed466c900fc655ab3433bfb2
+DIST 7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar 58919 SHA256 f30fa9a4f16215bc5d467abef55e1a3814fba7499a42cf46607fad26daf427e3 SHA512 b0169453140a1a8149393581ed3910c6e6423fc80ec8542b7de9de9610c44553ba2bc8ff3a296d172657e2e418d85c9bddc5f1e55cc4c3eae85276d0b5d06233 WHIRLPOOL 55e0f0f943f93bf9eeb5121e65076cfd2e5cd592b752f41db7ecf4a76b494c7d250baa2cc48e4880261821a253065600ee127f1aa648fa31bbd56606fdb45f55
+DIST 7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar 59464 SHA256 de08b475f31fbfc8b278646f1e682525e0859bbd3a6beebbca5073352dbe48e2 SHA512 dddc4e304ea53bead46d2a5d4485ce51447380003d16aab999fee799e98b9aab281e2d9426b2a41274a4c2fea98bd3a2470594c753c10748db3e3c20f5abecbf WHIRLPOOL 96016e7eb2ae730d018d388a1f41afe5243b6c2b4b5c1fbf2a407b722b317f6660afde6bf56d5f513be467bd9cd375eaeedc3fb26fd570c4d26130af464280e9
+DIST 8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar 10706 SHA256 e48b4a3429196bae0de1966304c6821ea62015bd32f634933b63510875310f97 SHA512 eaee1e783b83cde0d9fc86b895388a2efd07bbc032a7e0781ff698a75c7a7e8c308ed8fdcc0a5730a65d2dcf57698d8c9add6753d09884671888cc69839fbd03 WHIRLPOOL ece6aca595880a49342a4d11f5f5bbd21d9bbcceec5e473da7cbf7583328f9333aefa735133d78858b7cffcfb2f6701953a6a6af5ff4df6c05f2ef6e2b6640df
+DIST 941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar 937942 SHA256 84354aa70f995a7ff3c96b144c49b7fe90a0c6e21f818fd23b17f75b17fd1ca9 SHA512 bea8b53fc64cc3fbab1646a9235e7a9d98ffc7311277ea6a53485364462fce1b4bc9645d9f0bb6f072ee32ca730f963f7cad5c43cad052b1df7fad6245c90177 WHIRLPOOL 457ab0e25ca4ace03b91dc7feeb970a8d83f23495f06c0bb15b6c3eceae74f4ab7862aad57e2e8b0109b8cced52bd826a6ede6b31a5437cb341e9809085ee8bd
+DIST 972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar 234898 SHA256 d80c97da091ccc495479980aca82bb9ade3c3239fbc60b5f3840440ed3fe785d SHA512 889ebf198602afd574774ea3f41898f497d7f9af8e9a6397f6555d6fa7ac690e6e7e2e869e181636528f7a5b32204866e53250f6ce790d05763fcea4c8649d16 WHIRLPOOL 47cd43dd5732fe6a773ed50047af2786dd3d4ba712ae5f70c1f80571e835fbbdef68ee90ef3dde9d8e10a0e983f213656acbe287d7d6262c8a0bd0925799d35b
+DIST 989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar 9110 SHA256 116d1e95f47b9e6416070a10f00183924223f006ecc41f05ff7609605223edca SHA512 0b9cc9e8b77def8d9cc76b41c4225079edaac1e3e83d8b4b67b7d8f12b9132d42547ab89bd907ca46a6187f119afb6e1f2a7b2ab22e5928669e61f2f9b0e6515 WHIRLPOOL 386b6cb43831781be94e9ab2cc2c781302c36e55392012bb28fe17682bd356f96ffe56b9229b28a98e308070dbd6857efa036e3168aaaf4c17150306e366e5fd
+DIST A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar 14974 SHA256 e699d8cbcbc2679a42cd80667b16ae4917fd885dcbc0fdd4baa75716e8f8b6de SHA512 7b52a1ad7d32ed98b9bdcc8fe4e179a781cd36b10aa87c3ea60e9fc30f27dd914a1fb94cf09d96b66c2dfb4e4f0811b01febcd746c3316155905f29eeed6abee WHIRLPOOL ba89b226bd591de2a1399bfa2df8271f3c3a6e578c84fd6aa63ea2d287ca7abb33af201eb1255f44b51e040ad98a33d007d7840c89658d3d25169350e2ba86bd
+DIST A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar 86050 SHA256 fbbda04975d9d1a58245da34348b3acda92906f941e3bbeec300d455bbfac77f SHA512 871f8c565afc02a301cd696709df5c132a430691a322db3bb64486b3064396c525b4c73f1214639b79ada947671909ff644ba7f8de1b790e32508c8a7b9aa710 WHIRLPOOL ce9118204472f70eec544bc48b257c856492561da9dd7b5c436149e57cb803b5b107308cb494729592dd55b2619fdf0c758d51ca0459e213a322952c87fe53c6
+DIST AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar 903720 SHA256 f3c0ef4a908848eec98c923cd3251a5c99b5946bee3697f9d22c889192812480 SHA512 84cde632392c370c32d14e7d3f81c655956b2d1ca12b8e5638f6580e34922a9d521b3bc40faec31f96021b03f217988ec685f46757e2e9c28769654306ecc212 WHIRLPOOL 9176b6c49685432617bc35068a2f924059514f710429b2985aede2e9b3c02b8c6cf7f34d8ed04f86a6d4651fe6fca108a3eb8aa3e850dc7f78247d6027083dc7
+DIST AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip 388369 SHA256 8dc5a546c2dea5169aa31234a940035f628d561252ff82c835ec8fe28d5f14c4 SHA512 2a7938d152d101416ce2d06bce39e07d670189450a723cb298d23a1c6613c49569c6774fb160081b08f22e644e71b27787a4eb9173856cfb3d56b05bca9b95e4 WHIRLPOOL c12861342b306704f55709b2452e9fb664065f355d4e8407d8e7564c8c89725a60aa2b9d254f00cefd40af62742193b516547e7b1989651a12daf21c77ca3339
+DIST B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar 1392395 SHA256 bdddeb459d260a1ef05b38a5bcf55495411c047c90a7790171a6ef54380fba45 SHA512 183874456aefd6c76f490fe28a0df092719787d2772593753d019a04fd83b566db964303fedd4f1d62f203f6cac9d2470c1e52733694d1e464a6abd727d2df61 WHIRLPOOL 5794acfd955018a9d00bbcd405493df78588b7860c599769862dbb8458fd17214efbaa5f6bec784392f6c62408132889874c3b8cb78b7eea49946c456bafd2cf
+DIST BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar 10702 SHA256 773e5aa7a42e46f0ec7e3fb71f7a457c7d6123ec0a1354ae82a5949b59f38428 SHA512 8e054e4b207a30495718ffd0cc01a0654de1eed4a7ec37d0a23a68aa6a8af1fd215d0660d6d6957e39298866a3e0bdbcea6fd329269ec97bc4141548c814bfc3 WHIRLPOOL 6a9fa93c5c9c5c71d12654505b4cff4e12264c443ce8ef180ccca5e3253adbdf88bffdb91fc19877ad5bb2405ae51687c42bcd2eeb071ddc384d0315c342f87e
+DIST CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar 10718 SHA256 276233b4e339122dae57450b6189f520d44168c01aef607f1095beb16cbad913 SHA512 e679b73200a4cd33bb8ef575aa2d79cab29a0e97d042abf7db9576e247ac720effde1c314636719dbf5133fe9d00457865d1209ae15a3022d931a448f0c0758b WHIRLPOOL 96d2b22fbe1f6fa88ca8555306ac344c773dd7f26e91d05e7229e704163a630af250c26b0c6eedf1c912cf9bad8c36b2299806d9649b28d0fc2bf542f2e1162c
+DIST D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar 106018 SHA256 50caf7f7b40c5f444e1a97b982d9a54c7098706f180a92be8ca22d67391e9407 SHA512 d7465d9ee58ba91facdbd911f38993788ca54865da64e5322fd29d399fc8e4b2680bb7c2575ebe421e7a247bb32a5fa5075527c0b3cc0b783a4dc2599b193a86 WHIRLPOOL 65bd9eaa2c18a83ac5242936cb182ee62b6ed2f1381346892bdbfbaabb12d9838203baeb2a9e7ccc41534a3b9e9b08273fb63652d02a78f633a0f5510f2041f9
+DIST E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar 1333309 SHA256 7da1f152b349a9167c7ac8d7e6adbb0ea2f5fe319be2e82c80d18b33265a0fc4 SHA512 db6581b3e208470ced2ea5c367160dcb9470a1858926da46eaad6011d5a9feb273038467f75e57a375376ad947b3c1ecb4e5ea6a2fd88096eda84e1232b2eaef WHIRLPOOL 90f19b85218cfe869028be95b90e2394541a5d761186599ed6ec4a62b207b4e32b9ef292a992b894359b318bff10b764cc481b2e1652df7548dd6fa451c8cd65
+DIST F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar 99610 SHA256 2ca5e00b2a44c9c9a2c1f7f9354ce7680d3908894bccc8468956866c1f8e8ba3 SHA512 ea0a2aa2a93c96321c67cdb871ccde933e03258ad99abaa2d00ce3128a9a88f111766222b0d76fa1a2a585c9bd155371aa1385d9c3b48f429d98c7723ff3bf15 WHIRLPOOL 1a9cfa2f5bdac6717e721f9f16494901c24ac5695924e91fb1895fdd3bd601056c855c49c9362c5cd45f697d55fa246766377ca5e968587936a13052aeb203fe
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-platform-8.0.2.ebuild 5400 SHA256 75fd5d3d62314b004b37e248bedad2bde03520fdce53d8853eb4e18fd87fae5d SHA512 84e0adb1d81ead4d940d16ca64a6fa146ef33499c98989099b56191bd6477e3586dc90f7ec8106bec9bb538b235ec21a8fe3f39b630a6e336b22747d25ac83b6 WHIRLPOOL d597489000222d7309d1fa0801584e755e36f67c0235668797b70abb6da60993b63d4a1b0389a056533032e6868e26fb718aa3a80510c0b213e2eac3a99be7c8
+EBUILD netbeans-platform-8.1.ebuild 9316 SHA256 d692693c6fda102cf35c6e19edbd7bb5b138b0c2c249e4d4424045f45a3ee1fd SHA512 ac16afa55fb7a2587f2c5a18a2993b5bcc3f24261b418a6fa278fefb0def59d118711027687c2049e2573e2b6350a2d2931e35399543e933933ea19b7497869a WHIRLPOOL 5fe0d2ea3ff17aa66c8ba0e82805a462c6de2f7ac45b88b955d6503ccf1e8e06ee5c521571e88b3ca3b22282344c22b05d08d5b1e4e505762f9f5bae4d12fadd
+EBUILD netbeans-platform-8.2.ebuild 9165 SHA256 7b9ceda83c33fe10a31f9f997a48bdd289797e164fdff1468335c620cf50e71c SHA512 5a9f7e5489d7cf6331bd49e6f8959a023a1329816b0853a229e24c10bace76676a53e509b04411d19b405d892cead1190ee5b9f507a3e4ffa63908c6003df1cd WHIRLPOOL 24e96d51b684044eb4694c91c5b47578dac24344bdffdab9f3fabbb048857bd82461d00ad3c0b3aad0a8f431ab2b1bbead9f162078be9f6a87808efba81711c7
+MISC ChangeLog 3703 SHA256 a8a1931166348a7be4bf1d113a6029d3e85c57c0c2cc70e2be341c866a09a1db SHA512 2ca00cf6708884ee0d953331f963ee8527f23c2f5de18b18d5a748ead38da61660ef0feb8b8643256c1c2a8a344a4896933652fa0ce411f4e137f19a9c018908 WHIRLPOOL 045865ae6ba6794eb0fead55c112a504a4dea345ba4fe86866ce0f612f165fa92336446a6cdbab25d981ab1359753b5ce96edc0c8ce757f72f384584924779d3
+MISC ChangeLog-2015 4258 SHA256 bea17f6a4a63aaff0a5aadbfd4a597a99be14185651a01124a794b9a454a13ac SHA512 d9363aca761b97dd3e5e508dd364d7d12b8e72c2fe9b61cf6773be9321a5849ea91a7e80e7e06ac614b60c633891e5f2e91b106e1a73cb2f2b10b9b06cfb6f42 WHIRLPOOL c6db3fce9d4745a226be1174a22357c8e95204d234af6891de8283afb4f7e5c2a0f49e6e352bbb28d92ea4ff6cbe69477ea9df6a6be677b2371fba7c42325b05
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-platform/netbeans-platform-8.0.2.ebuild
new file mode 100644
index 000000000000..510c11d07237
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-8.0.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	>=dev-java/osgi-core-api-5:0
+	dev-java/swing-layout:1[source]"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${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.platform -Dext.binaries.downloaded=true -Djava.awt.headless=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.0.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.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}"/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar libs.testng/external/testng-6.8.1-dist.jar || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || 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.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.1.0.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.1.0.jar
+	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 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-2_src_prepare
+}
+
+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/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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
+	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
+	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}
diff --git a/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild b/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
new file mode 100644
index 000000000000..1fd716df8ff6
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-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/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar
+	http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar
+	http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar
+	http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar
+	http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar
+	http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar
+	http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar
+	http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-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"
+LICENSE="|| ( CDDL GPL-2-with-classpath-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="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${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.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.1-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}"/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar o.n.html.ko4j/external/ko4j-1.2.3.jar || die
+	ln -s "${DISTDIR}"/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar net.java.html/external/net.java.html-1.2.3.jar || die
+	ln -s "${DISTDIR}"/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar net.java.html.boot/external/net.java.html.boot-1.2.3.jar || die
+	ln -s "${DISTDIR}"/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.2.3.jar || die
+	ln -s "${DISTDIR}"/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.2.3.jar || die
+	ln -s "${DISTDIR}"/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar net.java.html.geo/external/net.java.html.geo-1.2.3.jar || die
+	ln -s "${DISTDIR}"/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar net.java.html.json/external/net.java.html.json-1.2.3.jar || die
+	ln -s "${DISTDIR}"/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar net.java.html.sound/external/net.java.html.sound-1.2.3.jar || die
+	ln -s "${DISTDIR}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-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
+	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.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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 libs.jna.platform/external jna platform.jar jna-platform-4.1.0.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.1.0.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
+}
+
+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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm hamcrest-core-1.3.jar && dosym /usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar ${instdir}/hamcrest-core-1.3.jar || die
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
+	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
+	rm junit-4.12.jar && dosym /usr/share/junit-4/lib/junit.jar ${instdir}/junit-4.12.jar || die
+	rm osgi.cmpn-4.2.jar && dosym /usr/share/osgi-compendium/lib/osgi-compendium.jar ${instdir}/osgi.cmpn-4.2.jar || die
+	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	rm testng-6.8.1-dist.jar && dosym /usr/share/testng/lib/testng.jar ${instdir}/testng-6.8.1-dist.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}
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/Manifest b/dev-java/netbeans-profiler/Manifest
new file mode 100644
index 000000000000..7a123fb99fdb
--- /dev/null
+++ b/dev-java/netbeans-profiler/Manifest
@@ -0,0 +1,12 @@
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-profiler-8.0.2.ebuild 3396 SHA256 db44c0edd89b3d57d318c0e9d380711ffaf0ae40da05f52922762305d0a44908 SHA512 0a328ab3eac3a3fbf57e7346a5c660d0565a868dec65b5cfa8004fce610cf2b8b37f159ae01263ec2088b1b942359bc53dcc5accf340ec06d31b22664e8bf991 WHIRLPOOL 78b36676b8b21721404f0f0aaa24f05926c86fb7a332ab781c51b92f4723a5d6fdd55ad3e09f6fac7611e994a6da8d29849bf28288777880d35bb2125a69e2a0
+EBUILD netbeans-profiler-8.1.ebuild 3422 SHA256 9c8d5a7fbbd58c05dfdfe2d52577b9b97844e226527286ed78de5cbc4ebde801 SHA512 f9d59ffe000bc7b69d39d6783a187eba710ea6c4554b023e52ca4161202d7a630f2adc28980202a58f7bd2feb6d3cd29059056635039202a6197024f47f93e94 WHIRLPOOL b43b065da2f15f8eb279d6fea1de0b23f7fb13fae034adb4d03a4f3d93017551af2580560cd2a881f74ad013a0e09b3a338ea086ad8f16b6c1c239882aad299c
+EBUILD netbeans-profiler-8.2.ebuild 3098 SHA256 5176a3d0a6d12a0890d461dec66088b4efc0aabd9bc1fac1cdcbf666996d02ff SHA512 4bbb984e5b5b2371ebd2ab4a5bae067a3bde0038042e18f6bd0b4918defbd836eaaf21516e6286c41d4988513feca61caf5acbcf06e70f38a014c941b38d3c87 WHIRLPOOL def59a36762c5df1ce17e420d3388fab8018a507bf28b988a7c7f672a6c2b5cf4efb60493433ea5d4fdacda7bf841bfd30035863edb9137486a115932f12c39a
+MISC ChangeLog 3545 SHA256 606eace2954661b40938ac2656c0b98d2791c04fbc46d3c7b5dc9eab4c391e78 SHA512 17e79643e5daa58d93ffeedb1070908176179af58fca89627ef9230e2f43c0660c63da1b7f56ff23d5b0bb084ae1d3a7fed0f907f734ceecbbe2c60d114f9ce1 WHIRLPOOL a98d7c097801df250371aa2daeba810e8ea38283741a979dbd11884c5eb282bc2a1f6efe6d710a0719328f4548c24790836c53c7753c833bfaa216a12b6beb24
+MISC ChangeLog-2015 4033 SHA256 36d6f73e2b206e41ee46282df7148ba88ea4062dbd83af2285d71d7e4425151c SHA512 aeafe55bd5c622573decad02fffed138aa81fb388e9efed063c86c71bbf75280b69b487242144585d6049be15cd346b08a8f5b955a74d8e0e26bab0d38c8add4 WHIRLPOOL 1a3ce9055fbe42173704f858b02a0be02be5d0436cfba15095aaf6f88312e95127c28eacc198c4fc5c7717e4145e22e0374966a584923f1898a14fd23d63ae15
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-8.0.2.ebuild
new file mode 100644
index 000000000000..bb417f365e09
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-8.0.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+# Binary files needed for remote profiling
+QA_PREBUILT="usr/share/netbeans-profiler-${SLOT}/lib/deployed/*"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-profiler/netbeans-profiler-8.1.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-8.1.ebuild
new file mode 100644
index 000000000000..4b1cf8c0fadf
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-8.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# Binary files needed for remote profiling
+QA_PREBUILT="usr/share/netbeans-profiler-${SLOT}/lib/deployed/*"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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-profiler/netbeans-profiler-8.2.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
new file mode 100644
index 000000000000..c4a13c6a1883
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
@@ -0,0 +1,107 @@
+# 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 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
+
+	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
+
+	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/Manifest b/dev-java/netbeans-webcommon/Manifest
new file mode 100644
index 000000000000..968030878efb
--- /dev/null
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -0,0 +1,31 @@
+DIST 08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar 15474 SHA256 e084148590cdacdd2fc9db9bb0e8a86f46df56b3213121534e42829c5a1f917f SHA512 91ecd525f39d4e664269cb6886b1e5545561203da9631dce9efdc77a46cb9d442f88e90030c7ac9c1c9e3561b8a4ffc1d949239a50a689963a4370de8832090c WHIRLPOOL f3db920768f72ce0e5cfc8601dfdc32dc1171c6036b36c6fd4d47bedcf9602cdc51bcba5b56aec9881c9ff035c8f76f42aba714e4c607201dfd75a969e511ddb
+DIST 0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib 10084 SHA256 565fdfd5e965eb34b54569f3d204d2ea42356055d5f18f43c849034d15ae4b26 SHA512 dd6de26e2f5978449ec353ea32ad7239af89478a184d408159f60bade144c69ec1e741e53239b4122b586a26ff5751ba3b318d6ff4e30ebdab075d229ee24c73 WHIRLPOOL 300677f8126a7e6a0c0ec31d0da3c835e4c5dc73e0f53884128fa2d964b11557e176dd5afcad35692110590e539e1ac45dcda7a5aefbc7759606b826cd2ba912
+DIST 1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip 1972629 SHA256 40dad59b5d33aacb51811a3dac29ddceccb71b695b40f4023f06922fb4191362 SHA512 d1a8f73cf7c2c5ec6f1501086a64b7b52148b485811a7557a49f1609ad15e9ba46c9c2545a1d3bd01e551406d97e374d9e88a6ef5ba5a89d51b006b4e6763df6 WHIRLPOOL 353f0bcf1d0f533630a05d4b01ec4ad584c11972ab3bbb0bc35a1a75b0b760e24c74eeb453d4544db04cc691c91e579cb51a2383a0f2ae1242cb4eec5a3372ff
+DIST 20317762D93542637CD2C6123B836C8DA267DE9D-cdnjs.zip 5225948 SHA256 a3b1ff2204bdd30a269ef4ff073c3ea8600367efe9c975b5eed9b4448d6a3957 SHA512 414dd6a37125d591974dd673e3a7f7d5d315ee5eb910fd354b08212b6341b48eb9962b24d6cff984e15ad0837904babe4032eb6b3c903bc16567e6b0dba54785 WHIRLPOOL 93d618a19c84ec6bad12cb799ca45bcffdf498d5cff892b8e6453a1762d817a0554c03700bf5b355dd1139d4bb148b9f99b06eafecf9022aa3e131c0bfd256ff
+DIST 2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib 159252 SHA256 4c6771d72ca7aaaf8278e9dabc2f713a16ee455f953cc3ce1bd04a396248e252 SHA512 c6767db80e8003c9d533d2acdd60877497461944148d406da68aa18ebe5164c266883d223343f118240d7f48523ff21afc16d9b5959e7740174447add8c933d4 WHIRLPOOL 013c665af56d15e0fb6f1a7d765ca736cf531f7fb0c5c7021c1f26288abefa7a32fb9c39d784f777cd081a7527c886b32aa390cb0e593905babb36e579f2e1a9
+DIST 2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip 133018 SHA256 1e88d9f872628863c4b17a546582d0d51cff792a964456d2819a0dee709964c1 SHA512 360f7f57e0472f6b53337408cbc068619f83aa286fc7a5a7a84c6a451d2ba1ecd7b516741263737e11295169abcd5f1911ae0e0a68b51be93b871ae252cd99de WHIRLPOOL 499239d4a09620a6450f06eca4608bded7225b696a7b67f9ac34be3347f329a82e36a192c85717fb0ee155d9ade8fc39ae000923d83a91b6ca89f2f1bb13912e
+DIST 480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib 70604 SHA256 fd2cc57322d63f9b567447bc0e7094fc0eb7d4e6ae56700974f525d025dbffe7 SHA512 95fe392982d78bab0770f4b6dab48ca490d0b93de386835e87be8521cc2828bb9fc793aa3a7be3a786dedbd30523a65e3fab84b555d0aff2b7b952e73187e186 WHIRLPOOL 3108f55488ab215452815cb0e02bd2c131ee8d890f129296213681e6df7432971a2725bd57c87294ba4adb3bf9e8d63b85a0182ac00df1eb83eff29fa8cdee78
+DIST 59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar 60912 SHA256 1b8d534aafa93bb60db4a0d2da9ad8e75c6e47fd2cae6b6048229376df21a4bb SHA512 4fdab86bb7471b4ace1d41e68463a567d9b1c817961c9aa6b1462e02dbf0d4ff647d3a08a35c13929c79b2a189d4a646041c6c569a6f8bec88d668422a40a4a0 WHIRLPOOL b9a4e58cf445251d3f2fed537b029283b329bd327a770b83117cc0bb05f733e560779206d5cf2d3619fa94b13460ddb36782cbcf455e2fceea28a2cbdcb4a751
+DIST 7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip 10012 SHA256 aeea41466b7044a8ebc4ddbe508a9f232b063e05ef98c4c0e7c7610796b4c795 SHA512 5fec29796ac076b6df5b83736dc6384ac93349d36093e522266b2f6facd129fd9957989fd4619422743fe01860f00d818de00e6a66a23037ff27ce071b8862e4 WHIRLPOOL 3d59c471199e7d817e5f0705b2cdfcaa4fbc010dc8d32251f30c0af4e607cf4402a28ea097310c563264024e79e252983c2f94a6743c081c9e1087df9afa8a7c
+DIST 7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim 72664 SHA256 affb03622da4c950db1dc5cee8d3ec8f30894571a1f4677142d64809b00454d6 SHA512 6dfa8f474073cf46c3a08ff3fe78d2bf2444e4ec6d17c779f3171d964bb0c5837ded5c8a4b16bbe08ac14508e335845f5e39d6a0d57679602482de8e30c3bcd3 WHIRLPOOL 6942cdb9d4717cff3212da2640617ae53a5bc88e257d6fc67f0e7cf7f078d53cfcf9dcd7b7a5666d865ba75a0c5477970e3110891cae8ef3e1f4d80a4660cb65
+DIST 7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar 278471 SHA256 ff359d533fbfcbb7afe6c2c8c25157f2a621fd7d8727e0fc8a54061682eb411d SHA512 fe228b770fa390b8b470282c1ff09bfa80d006e78d555842bbd1cd1230fb80420b8ebc5ae8fc75a063dfceac5080ede0144f13c43048c95e540fec244672e2c0 WHIRLPOOL c9f8fea359809f57280d90b25041efa67cd281dd4b9722d2de6389c4b4c65ea8a2a56dccda4f169adb9ff87b7fccabcf5e04f8e4a140b072937adc5503675d20
+DIST 81483881778F37D0495C07323E445361084CA1DB-ios-sim 102548 SHA256 eeecd2d1ec484095f1d1d354212bfaf28578ec26588b42cff0f987f4a8b5023f SHA512 a1255952d7558552ddc25cb4e880429c7d7251dc6ccafda4380c688c8e4398f6274b41003b31fd445cee5811ede02f0c46417fd323983a412fd1bf7429034589 WHIRLPOOL 3930f1c1e17b63f3a0216de6dcfe0ed7eacd0df7ead08dcad8bbfcfec588e8b26788e72e7f0185595e577479451aa150ce7ec275610432f7dd365770544e918a
+DIST 9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib 10084 SHA256 862445bab777d39a227ab422dbd5dca457adefb35fcdbb036318e3bb11e303f2 SHA512 29949fed6bb31ec878416fae691dea24425c3785ccc717ef5b86ced9bacb87d8c698d74485474b39a66e61c0d05b41045059444805808b90a904a5b306fa3012 WHIRLPOOL 19a56da07d776c61ee688c0d1c03536cc4604b63ed2d17c408a283758153c9cc2c8fc00d39728ad78d2a3dba7906d0910ed5c5941e7fc7098e8528504c42a8b7
+DIST 9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib 159252 SHA256 052a881362a6d99e7b5a8c70531d4f70d15706e4b16570d0ff363f1a24e2130e SHA512 71d8d0c7b6ed247f705815c9e21cf9224c9c724c33cf6172ee864b5fb1807c4f2504e9b23e03c2636e5acaff89a09313b9e1d0bb3bf0ec9a26c16598abe98376 WHIRLPOOL fb85a22a37b265f3c630d5fed48b9f0a00fa41310c4a5c6702b6b93075b59c130da15e3ca4cc60f5615f1ba1c92d48009b9e4949053315bea6b790ee44babbfb
+DIST C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib 29404 SHA256 8e9a93c247c814e597e6cda3102d0cfc540d6692bab44ce5fe069269eb64c2c8 SHA512 c7ffc8890d7c605a6815edb34fe9b5578fa42b9111d2b40ddb128917ae04066292303c3cd11223d2e79526bc4b2f25025e1eee1449e60dc90ca98ffb11cc70ba WHIRLPOOL 652f0da52d04d35a11e828f0b85356780f39215a61ff72a9ddbe9493d5c940c2a72ac5f1ae9de830d6afd684f5f34f1cd53d90609e656095b2f26860e4f5a283
+DIST C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip 32928 SHA256 97442d0827a10745f607db2fc1471cc0cdf860add3eeb15d113f3b94ee343d1c SHA512 055810e141e29ef139bd6bcb0578d2f4790dc43ef6e4fd044f26a59c69ab6fe8af8ac9cb39b336e74bc3235d6a5de6aa7ca93b797c508ed8061c20b5d4588f6b WHIRLPOOL 202a4c5941a557af634d2d00ed1a1de5a2724a14b841e686a5619e9b711be32a1f0b3bfa08875e44c63137e9bff56f091c8a4c7241d5a26ba651283dde445e33
+DIST CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip 2179489 SHA256 9e60b24c8cd7930d04517872e5926dffd761f06501b14caabd9456eba5f882c0 SHA512 bafbf999c1e64da8a4b72896514d1b9e6dca2dc5fb4d66dbd62fb5a986348faa42834da7960db4cd1455104f0d0dd0eaf6e56edd47affefdbc903a2320110da6 WHIRLPOOL 4a05b2eabf3688729d4a7f77c4b18fb6de4d2c88a1f206ec6a49094826a3fcfb9c5eae5947b9d8461e284c10743c7bd35c909caeba896b4f7bb1d1aaeb3c7d91
+DIST D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib 29404 SHA256 692d95da66fbbe01d59ff23b20ad576aea4901017dca125b3f3cf67c49a8bdac SHA512 cf3df4552032065ee4dcfa5b2ef95e8fba27bee353211f3c05bb152c2e0c160b482911d5bf2acf668cf501825e184eb015bea3030edc89d2380dfd69282e310d WHIRLPOOL 970c9ea93e62aa9ef51fe1defee95d6da7a014b04725a113dfebea3abea9affb4fcea40661195e8994ff0783d9ef57131b3dfdfaf97dc8bb450da08fbc583e26
+DIST D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip 912402 SHA256 2fd1ecfc79700868afbf5915bc6196185eb66dae30c721b131bf41d732391f9c SHA512 0bc0a65bb7b6d78a003634027c93d842e2f1d928fcfedc9b12db4b508752b06931429a4a580a08b5fd5e666e4f3a208aed86eb21e81377973b43cb77b48cf4ce WHIRLPOOL 611461579d65306a303a58dcfde5a547a544750a7f77a82983dce741fff8fcf7ff259f2c201966cf1f9e1fb2e7ded4afe551ec9b04d707c0c92314074b0f378f
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-webcommon-8.0.2.ebuild 4717 SHA256 bf32bfc433ce8b381e1f3ba0a10cc3cb07a9be995644b42850bd62656153c35e SHA512 98c9f53426d5c48b9b4ea65e31899571d8751380437f5fc7ad5c774cb4c01f8b5ceb2fe95edab3e57391c567598c8e6509abd425ff9d81725adc10f7b2b5b71e WHIRLPOOL 344507a7e0349b882d7809839285c3c69fc1f675a9943d15e0ff65907262b345499ac511ec3513798c7823c4d0fbbb8748758df66dfaef43253196a9a9d5a779
+EBUILD netbeans-webcommon-8.1.ebuild 4941 SHA256 5f9894dfea4d1706b00b82ff6162f2d80c613f6667aa90bea208c991d19f4335 SHA512 e9e24d149041232209be5080367fa0aee0712d7722c82fda3c84b38ec59cf5764c53a9b7ad143015a0b918878115055669a465e5ae1c83d37be34bf69e3215c1 WHIRLPOOL 8993a4ec61a8631bcd26697e61b10b90334515f8b04c6bb9fdfd7fe4d073614da250d385c81b9c9153bf36e427d6493a17a8e7023f2ad964145b6b220071ee53
+EBUILD netbeans-webcommon-8.2.ebuild 5868 SHA256 467ba66212d2d6920aa72e29ffc9504e786a2db4e9dcc544b508b15ce2fbbe1c SHA512 aaf5e6b49180411c393d19a64b7a171e7bb907320e740ab26d72701e1daf46131fd3de17d220a2100c74503b8f21629822638f7ce2f72bde27cd1fa5ae68e173 WHIRLPOOL a2b9ded59f5aadde703ef7b5d9cb6438038ac6d615a20c221892b757ee39f181fd23c8d59362f7cf0b183264b3335aac45ce85a3572f990b7594e1e6dc35cfb2
+MISC ChangeLog 3558 SHA256 6bceae5e8120a0e0e37f89573e9d05a27f612863be582ee05b9f356b9903bb6f SHA512 821827a9a7b448943f1396369902de16b639c49037c4f672e19efeec900c9cdf7b7a6212ae345b658fb00070423db49066a88f777207d7bef60fd2eb68037e53 WHIRLPOOL a8ebd52325538cd5b934a7d66fa4c252d13e8ee8a5cd2ead499810ffffd82d06233034bc3dd8cdc33391b7ecd482a2662d669a7f32b7981cc488b1afd2d30a03
+MISC ChangeLog-2015 1826 SHA256 45cc333a921604e8a0cb7701f30593ccb8ad7ff91b2429bfed519c4ae2ea1a0e SHA512 ca024b1dd8eb36e4397088c2cfef8c4479e1d72d015edea256b1472169b585552914e14bf02c0f1bd473689fe5965e1e0f2c2af5dd11e8b52412848e44ae1288 WHIRLPOOL 81ceb1fa62ff6f6878e3d90a031c3a86b3f4197462b3acad63df96ffddd0d28af623996c2bd6af30330309eae297a4c3ed3013ea6af8503dd4bf57025ed18b4f
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-8.0.2.ebuild
new file mode 100644
index 000000000000..b420078e2adb
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-8.0.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/20317762D93542637CD2C6123B836C8DA267DE9D-cdnjs.zip
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/81483881778F37D0495C07323E445361084CA1DB-ios-sim
+	http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-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/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/20317762D93542637CD2C6123B836C8DA267DE9D-cdnjs.zip web.clientproject.api/external/cdnjs.zip || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/81483881778F37D0495C07323E445361084CA1DB-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/9F0D0D95F57E73C0110FA023813A4F9756D543B1-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}"/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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-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
+}
+
+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-webcommon/netbeans-webcommon-8.1.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-8.1.ebuild
new file mode 100644
index 000000000000..72804457a501
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-8.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-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/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	dev-java/commons-compress:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || 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}"/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/9F0D0D95F57E73C0110FA023813A4F9756D543B1-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}"/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	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-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
+}
+
+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
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-compress-1.8.1.jar  && dosym /usr/share/commons-compress/lib/commons-compress.jar ${instdir}/commons-compress-1.8.1.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}
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..0cca60b3b7ee
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
@@ -0,0 +1,118 @@
+# 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 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
+
+	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.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/Manifest b/dev-java/netbeans-websvccommon/Manifest
new file mode 100644
index 000000000000..612719e4b67e
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -0,0 +1,12 @@
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
+EBUILD netbeans-websvccommon-8.0.2.ebuild 2645 SHA256 b0fdc69ad53d13abea0f7597e623f1126055f4ebbc719eeeed52524ffdfb7dd8 SHA512 abcb56a88a536811fd168a3bd43f7a8c24a0728177427edbae1d7d134ad9ebfa83cee3016827ecffc51f3d267f50871e3213d6f80b67114444c161b2eb786211 WHIRLPOOL fd4c91004500d630a63bde01d3c9d5e1c99eb54d3761b5ed0e24b9753146aca5175525277b982283342799393212a5e9ff6aacc5b29d990572a0ca2d9d46c47f
+EBUILD netbeans-websvccommon-8.1.ebuild 2671 SHA256 412da9cdac3b96d19a05a7b556061062bbd8d067bded73370405cf37db435e38 SHA512 7b83e1890c53d8816efb9304c77e90bcecb65920349fb2b4bdb84843daa9c4b71d20f9bfea9e84e220064818348def5aa01c0957c18d00981747e3d9298a3d8a WHIRLPOOL c155b778c23b19e4b26d009598b572d909bf85ce5c20bccef4f02dbc8002cb23e79af3bafed17a29a2ec6227906977328c9f65fe22ee16644dcf38de1917e686
+EBUILD netbeans-websvccommon-8.2.ebuild 2347 SHA256 1296bb991b7a44f79d332be8c4ec6b38ed3f7c85d8a8618532c9bd053daa7aaa SHA512 a86aa006fc5006f3ffa538eedec5839eaa7d3c6878e06e5c03b7458313bab252b49513a8e82167e1624c5a66e40518e16653483aa53f16d7ba052de9cbf2e1b8 WHIRLPOOL b34f166c07d06cd9889fe88e1dc02543524a5901e6d7271f3e9ec8327a7488d84cc05de3661a57c265f91812412104d9adcb7777084480dad099b77767f70b59
+MISC ChangeLog 3597 SHA256 96c990cf9214bef05d9f1d4cb2d85007bd201c3f8416203acd55adcd741fc491 SHA512 8b9ace0a801fe3d9ca01734b9102383f18a56af2063838c4350a660ca0d32a606206da8fa5babfbeb7be4a6857227f45521253f8e61710bfebc38de4559a63ea WHIRLPOOL 67a5b55b3087d21e6bd324a99ca272f37d2a9672aaa1ee2d543e1dc2a1db90727d93afbbf978c64414c224ee137956fce225a18e3c0ca05a9f1a53f4cc679f6e
+MISC ChangeLog-2015 4436 SHA256 5f8676927c84199a40c7cb15e9c5861d5af1d110dac2f7209c34f2e4723b6cb4 SHA512 67c2b38cdcae119032415aabf1b62dde133a818707f7614b1424bb3f51dbd20ed90ea369ffd625c0696ccd4265e4f23a4fe2eb840949440584e52a2bcc8e267e WHIRLPOOL 08f609265b59bd5caca5d6e61e2ca77072642fafebb38a4ae6fb9303142fc2b257a7d950041eb4de8c95a1e465b984ce3fde91583b2b574d9d1f77249d6a3e6a
+MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
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.0.2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild
new file mode 100644
index 000000000000..033ca7cb96a5
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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"
+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.0.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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/netbeans-websvccommon/netbeans-websvccommon-8.1.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.1.ebuild
new file mode 100644
index 000000000000..3f04c29bf6fd
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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.1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	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
+}
+
+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/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
new file mode 100644
index 000000000000..f288a9052ec8
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
@@ -0,0 +1,80 @@
+# 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 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
+
+	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
+
+	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/Manifest b/dev-java/netty-buffer/Manifest
new file mode 100644
index 000000000000..fd512bb341ed
--- /dev/null
+++ b/dev-java/netty-buffer/Manifest
@@ -0,0 +1,8 @@
+AUX netty-buffer-4.0.21-build.xml 9693 SHA256 8264038de9030beacebe1a884da458250da08c0c5d21712c0f01cad417225c9b SHA512 5b082802b6f7c7e619ba053757ede64f0ffa18c3002205207d2d129464aa89f5b52c20133299e280ea937e821a42e525e7885d773f56f0c8000726b56753fbf9 WHIRLPOOL 626b4116cc91d12c237dda8de29d7ae873544e78a3f7f5f6f8bee8e15cfd3292ccfcf611b399c9981c4219ebad3f56de51aa9a1cb6d4de147b970ea39d164d9d
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
+DIST netty-4.0.36.Final.tar.gz 1267617 SHA256 c37c139dd662331612bb29dcb8f708dd23ecd7c0a14730292cf525bfa48e96d8 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6 WHIRLPOOL 535e29762344f3ad7a3d6c7da9df2b56ddb170d184397150dc17c87fe3bee358d7e76e57e6ab88df2acc374be995b119158a368bcc59a069fc45bedf517034fc
+EBUILD netty-buffer-4.0.21.ebuild 1292 SHA256 9dcc4a912574894de2488338a99da8d86ac0f17d78ea7c416cb7f6f86d9b5205 SHA512 51df749a4f546b5bc0e717d6b279397c8c5d1a9045392aea75cd84c89752b49aa0d25003b4cd0742c08980b7c554eec051ff0c78cee3ade65edd15d99e20ec42 WHIRLPOOL fcd8d07361b475a0d8ff30733e5e0f4b89e1543b9db876814417e4dde2ba4cf9acf5ce171e9abdcd90e06876e876ff691752bf14cac39f93b138800f2997236f
+EBUILD netty-buffer-4.0.36.ebuild 1233 SHA256 eaeb78054db1dc2b153f08656011119b0bfcaf10893944891b817846e3c4f899 SHA512 efb521ff910efe81d47ffa700fab5c3031686d00b229906325f532f463fa9039c584a78e823aada5c60951389afb83373e292a3c27db73a6a20ffb13276e90d8 WHIRLPOOL 382a3fa6fa70e4e962f46e3921fd4ee286b4969de679f393949438ef0f102dae1bc1c764c613b349f9a0216af75b4000d49d732f3386d7a9f64d91138a4575c5
+MISC ChangeLog 3969 SHA256 cdbb96220eb7b4dd7c4e58a0be13145404d07c620c0f56595f36d51effde158b SHA512 48a579d92fd51a8435ae185f609f7f1a5d91aa62ba8646605e98ec776c4a46e1a3e30c3f5d90d417e3cb1344c4fa549176af234911a49a42eeea66a735a0c5dd WHIRLPOOL a8bc2516b8a74ad53f96e9d0f35d241c3998ade9fd7c3a08bc5434fa446518b4dce0d43ef8be8f00886305690230b9835acbbe1242717afe54a2614b1e2f1eb0
+MISC ChangeLog-2015 1086 SHA256 2744867f85bc2699131bdf8db9f1de092ee3ceb004ceaeca4b97dbf40b73f151 SHA512 9a39aa2b48fa842f9b526a767fcf2f0e37f73b66652ac44eec56ed5e06e1227ddc5d228f7f56f323f3882c77d9e82a58ae543d8d5726cb396a6076b27f31f4d1 WHIRLPOOL 72430ea79f13dd6f87a3c3a78e909033996216958592685bcb9d19ad400b02e552706529da304de2d030fe96359494f042d56e2dab7f97a7f05291590274c3e7
+MISC metadata.xml 322 SHA256 2d65611c4957f6ad48177f32abe97fa1dee2d645cd1e34870082798fd75251b7 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c WHIRLPOOL d25431788cca3ee36307f6fa8d8accab341a32621b89ccbf83cded1fd58d47e3c0184dd8fa890b62b752eea2088e12d15fc61198a16e1c8f749a53f9b11dede1
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-http/Manifest b/dev-java/netty-codec-http/Manifest
new file mode 100644
index 000000000000..7be012b78a05
--- /dev/null
+++ b/dev-java/netty-codec-http/Manifest
@@ -0,0 +1,4 @@
+DIST netty-4.0.36.Final.tar.gz 1267617 SHA256 c37c139dd662331612bb29dcb8f708dd23ecd7c0a14730292cf525bfa48e96d8 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6 WHIRLPOOL 535e29762344f3ad7a3d6c7da9df2b56ddb170d184397150dc17c87fe3bee358d7e76e57e6ab88df2acc374be995b119158a368bcc59a069fc45bedf517034fc
+EBUILD netty-codec-http-4.0.36.ebuild 1667 SHA256 d6682922d003b43a846c6b9b4c87bb41a1423bc0c1a5d92572559496bff71307 SHA512 fd8762b237b31d48ea4945f52fc5399e0957d6619e23e61d553afa9660caa1bbd5671fda2a4d9d59a3325736ece2f64af6d6b979af21e4fbacb67248ec0851f9 WHIRLPOOL 370faf01224bad7f86d3d29954579ea388fa8db1edc990aad192b042a3e91ffbac8157187ea91a0339b8530a976025f3061cd70a616df57a6a0f0745cf6fcef0
+MISC ChangeLog 341 SHA256 321a76bbef61fc05fe2a258f2a176a45b1650831df5beddf93a4d08858da7a4e SHA512 39607230448d1d987abd5c3615d4fce1e39eb0e9c6875d7b7ecb74d0c3175f40f9ec1367cc4d5f34a05c69f8ca89b68935b3e37c4a370aa03ecbac70121c394c WHIRLPOOL 964520bacf25d3e208ba39ab80e1d25ed5f4ec0cb0e772948ee7cbe340fc3d755c9e74f258428e2df07e737a835982dac4b34941142ee1cefb67d79cac3e977d
+MISC metadata.xml 322 SHA256 2d65611c4957f6ad48177f32abe97fa1dee2d645cd1e34870082798fd75251b7 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c WHIRLPOOL d25431788cca3ee36307f6fa8d8accab341a32621b89ccbf83cded1fd58d47e3c0184dd8fa890b62b752eea2088e12d15fc61198a16e1c8f749a53f9b11dede1
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..7304fd15fa56
--- /dev/null
+++ b/dev-java/netty-codec/Manifest
@@ -0,0 +1,5 @@
+DIST netty-4.0.36.Final.tar.gz 1267617 SHA256 c37c139dd662331612bb29dcb8f708dd23ecd7c0a14730292cf525bfa48e96d8 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6 WHIRLPOOL 535e29762344f3ad7a3d6c7da9df2b56ddb170d184397150dc17c87fe3bee358d7e76e57e6ab88df2acc374be995b119158a368bcc59a069fc45bedf517034fc
+EBUILD netty-codec-4.0.36.ebuild 1565 SHA256 23782f9470f34b2c36d17bbc2a27bf82a413048b16f141c9981c88cbf0bf3a3c SHA512 ca21f4d16aa37dd8a7a129feed5cadf0ac5bb60c1fc703259057d914150d1e4cf5ddb799c372375ce22a6dfe6e59c5d1a078a474be27a3b17e1dcdf5f4150cdf WHIRLPOOL f8748debaf00319e9963f749fbdfddde28e428cc135ea214dfd845e6023b145a3b81ca867a3c8957530177b417b4713dee4fbe29d5f7702e16f0db67825b3e75
+MISC ChangeLog 3874 SHA256 74da9edcb055222eaa5d7aac8ab2066bdabd59d53788f3f3b155214f355969c5 SHA512 486178261ec4d14c1419a0b6fb698984066eae6379ca2b08531425003c46cda5bc64ba6deab8d397ab31c66848d5a9df173c7366485602c4a69a0ae82b249263 WHIRLPOOL 8600c60b39acfa6475c27829e1c810a6a21ac3f425fce04167a8d7b1219857b0930ddacdc2afae68fc992ab4432a69af2ca041e217e89c81fc450e61b4987338
+MISC ChangeLog-2015 885 SHA256 b7a559c0449d34030f8256c50dd40a5cc965095dfdcfa4d4bf5cda59a046a0e3 SHA512 055ab2795cab348f68683ed832246385791c58caa9de4d70a35589f1c24f523a7488d001de207c19a437362298444a2e51f02c4965cb77ac5df1a1ec5e2e21c5 WHIRLPOOL 75eef7d2008030fa1bcacde496d05a91c22c157912f1c645745a734ad4c61c888202822e74ced2f93151e6096c066e4d1117752384eb07bfb8d1cf999eb609fe
+MISC metadata.xml 322 SHA256 2d65611c4957f6ad48177f32abe97fa1dee2d645cd1e34870082798fd75251b7 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c WHIRLPOOL d25431788cca3ee36307f6fa8d8accab341a32621b89ccbf83cded1fd58d47e3c0184dd8fa890b62b752eea2088e12d15fc61198a16e1c8f749a53f9b11dede1
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/Manifest b/dev-java/netty-common/Manifest
new file mode 100644
index 000000000000..a19359464b07
--- /dev/null
+++ b/dev-java/netty-common/Manifest
@@ -0,0 +1,7 @@
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
+DIST netty-4.0.36.Final.tar.gz 1267617 SHA256 c37c139dd662331612bb29dcb8f708dd23ecd7c0a14730292cf525bfa48e96d8 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6 WHIRLPOOL 535e29762344f3ad7a3d6c7da9df2b56ddb170d184397150dc17c87fe3bee358d7e76e57e6ab88df2acc374be995b119158a368bcc59a069fc45bedf517034fc
+EBUILD netty-common-4.0.21.ebuild 1077 SHA256 5e1eec9bb955155cd9bc063b7c9d6cfea5a2e1e0b5701266c8f201b1b0412af9 SHA512 72a988bc64b7177345fe084746da732deb64391caef03bceae7dea6eedbe23061d2b9e362c6fe265ca8524b43386aff12c3f262f5885f8c34a70cdd6f2bbac22 WHIRLPOOL c726c7f69c9b49f20f300c3840887e468db0be8c9c6078f276f1912cd429740ae6559be29ed1fa7d0c25e7d6787bd648c29045cd0458d11773bde435f23fb804
+EBUILD netty-common-4.0.36.ebuild 1575 SHA256 2ee7e0dbb09ef9cc4397cbf4ef99eb45ad958d042e32bdcd52fd44ebd16252d7 SHA512 bbf723c2f46f15ec93c4a7e3de363709c40b1baf6601defbdd74db230a63f7a49a0e452ab96e71e9d45e1879aa8498c83bf1fc30ceadf213b9112b2519f8e0de WHIRLPOOL 369da70734f76c7a300a54848d24f0bc2045fabbc651ebe0840cbe9a837140cfaabf9b1471142c8d98fe01220bd859f25d3060c5bbe1e844d76bdeff241cf709
+MISC ChangeLog 4124 SHA256 25f9c4126f079f1d41ff5a0a3d60718247f6b8099cbf36e8f1dd58552ccc321d SHA512 ffb930016c4f6fe62aa33171cc691ed7bece3765f4e3bf391a0f48950559da1319a3381087d8a8965b82370f63173cdd9194263fd3f88246db99e4dee607791c WHIRLPOOL 74374ab66c0ed183268da4fe91756144bd4f7d617cfa56fef3bf5b2194bf82ecb7ae8c819d070cc404264e9740219659ba70b306229026c73f3f44e53307f5cf
+MISC ChangeLog-2015 1366 SHA256 42363f681732237636781c4e416d4ed16e137be722e803cbfbecfce0956f21a0 SHA512 92d78595a11fac6571ff62587faeb348046228574e8551a5e686ed333a279ca210005aa6f8e32ee045d3e19fcde1f3aac214bc4ffebb5e1dfc58d5b41fc58072 WHIRLPOOL 0197a9320b46651902ff2bd04a0dc96cb0fb3e6d2c5abbabc941b05abc3ef6474596faa6876e7e000bb8dc0466b5385ba1aa61e089ad5bba03c7802668616c8e
+MISC metadata.xml 322 SHA256 2d65611c4957f6ad48177f32abe97fa1dee2d645cd1e34870082798fd75251b7 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c WHIRLPOOL d25431788cca3ee36307f6fa8d8accab341a32621b89ccbf83cded1fd58d47e3c0184dd8fa890b62b752eea2088e12d15fc61198a16e1c8f749a53f9b11dede1
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/Manifest b/dev-java/netty-handler/Manifest
new file mode 100644
index 000000000000..282f1c2573cc
--- /dev/null
+++ b/dev-java/netty-handler/Manifest
@@ -0,0 +1,5 @@
+DIST netty-4.0.36.Final.tar.gz 1267617 SHA256 c37c139dd662331612bb29dcb8f708dd23ecd7c0a14730292cf525bfa48e96d8 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6 WHIRLPOOL 535e29762344f3ad7a3d6c7da9df2b56ddb170d184397150dc17c87fe3bee358d7e76e57e6ab88df2acc374be995b119158a368bcc59a069fc45bedf517034fc
+EBUILD netty-handler-4.0.36.ebuild 1707 SHA256 0450c63cdb814aa14cf47fc3ec4cc00ecd5228566dcc1af3e93119d518838306 SHA512 04e1047b637a53389058e5f21c47eaa871b4d792e980a9b1a166a610614e823dfc263080dd7c3de1c29446fedf2bd2558c056c7ae73ed5f79a73b1b6d419d77a WHIRLPOOL 124eec4cd59a4f49bda6fd3fbd9e49b21723888ec01541b04acb228da5248d44b466a1da5d984a9e8ab5ad8db44d57291d4385fc832906e30465ecdb434e97a0
+MISC ChangeLog 2862 SHA256 49094e00f9bd2c7efcf9e07391ffefdec5dda87f92a1c5625b00684bd02a581c SHA512 5448ae21c81b712ddb88f161bb438560dbc686b0f21ce5e7d75265668ff4f7d5b4d68842299513106b7922fb173f4dd5615fea777cb7bb8a2f8e808f48222b7e WHIRLPOOL 465a9c7d2ae1f2ee27e8bb6f0c8682c683c46b72daa4de94f29c70d2346bb225755dfa80ebf4e71c4865c6de22c80cbe0665711e1c5ea679285586686ced9276
+MISC ChangeLog-2015 684 SHA256 7634162044bf6b0d8580721098c426c427dd420aebb0ae5dccf13793f5d817f6 SHA512 6c9b8b112edf23b2b76ea05a74686f16a42907ee40c7d387fd84f3c49798505a08acfb52e9947b0f2a07dad547ea9aceef91028e7e3bf803c6bc8fe8e2aa86a5 WHIRLPOOL a9af308d47be7a15c6ac1fb3d485abc2bad6af08785a1f21b9377c0ef9031f9c267d5ff953a184d4f2863b3799640e12102e2e32bb300b5429d8dcf68b36d948
+MISC metadata.xml 322 SHA256 2d65611c4957f6ad48177f32abe97fa1dee2d645cd1e34870082798fd75251b7 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c WHIRLPOOL d25431788cca3ee36307f6fa8d8accab341a32621b89ccbf83cded1fd58d47e3c0184dd8fa890b62b752eea2088e12d15fc61198a16e1c8f749a53f9b11dede1
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/Manifest b/dev-java/netty-tcnative/Manifest
new file mode 100644
index 000000000000..68af2928dd87
--- /dev/null
+++ b/dev-java/netty-tcnative/Manifest
@@ -0,0 +1,4 @@
+DIST netty-tcnative-1.1.33.Fork15.tar.gz 186153 SHA256 660b5729fd9b858ba5a1df70099190e080d5fb2b0ec122b260125b42cfb6fa36 SHA512 592c70a926473a4903b704be920aac1a4fd5a032a8d821a77800b6922b374cb28decf496a65ef62867c027dbac93f0e563e9bb4ecf6659bc70cc33663bb979f5 WHIRLPOOL 40ae659bd638362bc6ad67678f99fde907ec139b696c90577bf6d8136265a029adf568a2c48980f36e8a4f46ca9087bcd09ef59467245fc0c498bf9ca3bf2fe1
+EBUILD netty-tcnative-1.1.33.15.ebuild 1657 SHA256 4aea8b35177509f7ed6eb82e402a8e381aa7a799499c71f3ca7ffb8fa290b982 SHA512 4a533c530136e2eb72bd6070515490e4a49898b1742ce8d986a367140ebba978c0d619727270d7a13a5aa9ee9ec4c19008d87447b8c7853045793cc2791eee20 WHIRLPOOL 3a3777c49a3dde333e04dbeb56ebca1daf8448a963cb45d7f9f8b4c1a21ed539f440a0c001404f01fba08bdbc817139897563e523a7fb315bf889ce978520819
+MISC ChangeLog 362 SHA256 89a9e9682d25c7fc56d91434184903fc12bf8075dce31359d57eee16eedfaf19 SHA512 ff5009b0cd20f08a89560bbb08666340f035a8023c4e5d02909651d6b95a91d09aec65a5044de127a57fd20aba03e4829bff906c726c2ffd6fa7e0bca06f8bce WHIRLPOOL 2335f3ffe9479c334c46da343e0b246090751d2607d1853c0acb68d3e4bc2bbc729b830a5961631bce0dc8fca80d4c3b29d9138099fd15214e04e0506b794d1e
+MISC metadata.xml 321 SHA256 e5185f8ee7da15bc79fa9cd03938323062432bd6cef1b9e6072f21b8ff4179ed SHA512 cafd11002a29f2a3f485ea8c2abc2c338811c0c9e9f6fe416f089d545971b44dbd6490cdbf9c9f3be75fb1fbad56c533d9d3e6141721027545b6e1ae31bdddd5 WHIRLPOOL 9163354554d00c6fa8b4377f0bb388f744c687f64bbda25656afad609ffd306cd19a15ea9e4754538ef9cf4dfc128200b75ad86d0307ae27bdd8a4a3708bbc6d
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/Manifest b/dev-java/netty-transport/Manifest
new file mode 100644
index 000000000000..f868b593f9f0
--- /dev/null
+++ b/dev-java/netty-transport/Manifest
@@ -0,0 +1,8 @@
+AUX netty-transport-4.0.21-build.xml 9699 SHA256 297851b5676e5a0673e5b2980362ee1cf335d0d084df3617603c54f4a5688ec3 SHA512 1b63c011bd15c0fc0f2bcfa68b8ef969f178071eb2f9041a8812a08d9c7c871e85f16ebe049ed425fe4064df8149066ccab8bf12b32f6d5bc7e80e18a51b29a9 WHIRLPOOL 0e1c98b8d5d48e0a0084a39575a513b4da6c7bf901c3d9d41e0c642665282a80cf3e9704c82fd9893ecc815851cc0edef23bb1cc34e1ce517fbd1c4388979b86
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
+DIST netty-4.0.36.Final.tar.gz 1267617 SHA256 c37c139dd662331612bb29dcb8f708dd23ecd7c0a14730292cf525bfa48e96d8 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6 WHIRLPOOL 535e29762344f3ad7a3d6c7da9df2b56ddb170d184397150dc17c87fe3bee358d7e76e57e6ab88df2acc374be995b119158a368bcc59a069fc45bedf517034fc
+EBUILD netty-transport-4.0.21-r1.ebuild 1109 SHA256 57a5a25f0a3fa1cccecfb39c6d568173a782168da175d74bbdc8333ef72efc21 SHA512 a0cd74bee02353cdccae2eecf70cc75f5bb99059dc2760c6db5dbc5aaf16673da8225ee95f569703c01f2a9a3f1248ee43379843ed7cc94904e5b4badaab0454 WHIRLPOOL fc76c3ac03e636ef68273b392eccd897097e22cad50fb26fd7667bd255c30fdeb8f5a65885180dd2a211982b816ac6cd379a46da6515460d9017f2a91296fc2d
+EBUILD netty-transport-4.0.36.ebuild 1687 SHA256 95bbe8e2efdf5b8c4387692bd2a1eb98af578b5aa7b83fc139ba79f357d5d2d4 SHA512 2da281117fdf8b031d13c5ec5b580930414a17fd5d4c5f587dbd10dac2b89d5d1e7ca8b1e55e460b342ecebbe02301d622fff30b585db0b3f57014a18b9b3fcf WHIRLPOOL f439fbf6dd931d7b63f853c9e42d96e51d1e217c5610b964db34d73058240ed0295ca6b74c8638e69dd3d7f42e88f079361d12d3842d7fb2670c2e2c2b0aba20
+MISC ChangeLog 4140 SHA256 badaadbec9ee347ad586c09bef01e8e409b0b11447c819d6e595640df6354ab1 SHA512 6fcb17d8bf0db2b40a52db5b77f26e3a3e314df653301f97f6e2c6e0725388bb2f52e6a908e3cad2aa8337d2093feecc4230e9643d69772fbf2ca44cc9c3aa09 WHIRLPOOL bcd65456b0c301651ab4fbfbb9346bf38d73249ef7c9ba68c030a5b3c27d12529ee55ddf62d774ac03a930f23954aed6bdd02c1438023edb2156e2afcd97e015
+MISC ChangeLog-2015 1640 SHA256 b5155fd02d2c0d0679897ea9b6474fc99b0fc8b6d87cc4c673f774dd459cae7c SHA512 5894b2c763467c25e8aa4aa1760d8d965c88127cb96597a64463027fbe16582107f5a9b63a32ee305568e0422080c6693c5fa2a1ede14170ddfefba8979b5680 WHIRLPOOL 5c7f4c406ce5f257cf8194dd3bc292a84cd920777e58489e2f724520c7694e9d68533f16c40f9ac9a4bc8fc9ff19634ba186b008c77f6adeda1bd68374a83c05
+MISC metadata.xml 322 SHA256 2d65611c4957f6ad48177f32abe97fa1dee2d645cd1e34870082798fd75251b7 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c WHIRLPOOL d25431788cca3ee36307f6fa8d8accab341a32621b89ccbf83cded1fd58d47e3c0184dd8fa890b62b752eea2088e12d15fc61198a16e1c8f749a53f9b11dede1
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/Manifest b/dev-java/neuroph/Manifest
new file mode 100644
index 000000000000..70f355bbdf8b
--- /dev/null
+++ b/dev-java/neuroph/Manifest
@@ -0,0 +1,9 @@
+DIST neuroph_2.3.1_nb.zip 8006436 SHA256 d5158425f9637340365f3125d5a477215593400c6c9741ad287ff4270c19b738 SHA512 50977d407e45c11d7a9154d434a84fac5386b55c542b91cefd27e4b147a10fdaa0903446ec4e6ceeaad139013ef78a81125f783ff2fae9f0bc6661813dfe48c8 WHIRLPOOL df5beab7f34a4eab260a931823a134e6c8ae5c4f1dbac2e6e33268e8a64335461df558196c32e538266f6f507078510b32d71619fde5d41836558fb5d2597845
+DIST neuroph_2.3_nb.zip 8257618 SHA256 b126485f212e16f8c0162b35dcbbb25eb66da1ae1523bc5bd420d8bd82cf0faa SHA512 f2d6c87862435fe5217259842b3d9829780fe82dc87a682bc3ce38ecb708968b2458bf2d8631daeba209ccb9ca8e7c74fd1e5dd3c6ca606cf8b9ce4ea23db485 WHIRLPOOL 60366565c900deb2034e0d2d6527b23339486ebbe81ec203622be3bcea50b6dfe3ab001f2c0c82733f599aaaff60c812231f4742883506729a62a15fdc5bcdd9
+DIST neuroph_2.4_nb.zip 20050658 SHA256 798ab215448f99d4d4ee7be7f55d5d1c65a41ec3e23ddca7fcc43401a12a3773 SHA512 9c675f0d2194c5c1b822af8adffd8120f97962d22eb8e99561cfc78f2d87bb76e73d335c1c8ee5278964f3717bfde41c8ae91527e78efca63f5914529ae6d61a WHIRLPOOL 34c2a37b558c71d64426142102895254174af03d046efa9a2e83155fe5a0b3e816811694864547f67f41e8a6668bde1ad230f42394450f95dfc5f36751bb1ad4
+EBUILD neuroph-2.3.1.ebuild 863 SHA256 9552a56c265a253fb05cf1668d3dd7d1cd6985c0263aafe6d5c4ea75be698226 SHA512 ebc35a11c54f11f5d1c9189e9715a163829a5bff116856ea7500b990b636659f4a8c8055120772fff1466c0a87e6348f883a8130235b4055c2b4e1326a7147ae WHIRLPOOL b6dbeee9bf0ffedca1ccf1ff24f47337ce23f92e7f1b9b024c3c0ae6db6f9ab625cf33a674a781ae67ab753f0673219d47db31601ae29874ea8e37672fa8956b
+EBUILD neuroph-2.3.ebuild 863 SHA256 9552a56c265a253fb05cf1668d3dd7d1cd6985c0263aafe6d5c4ea75be698226 SHA512 ebc35a11c54f11f5d1c9189e9715a163829a5bff116856ea7500b990b636659f4a8c8055120772fff1466c0a87e6348f883a8130235b4055c2b4e1326a7147ae WHIRLPOOL b6dbeee9bf0ffedca1ccf1ff24f47337ce23f92e7f1b9b024c3c0ae6db6f9ab625cf33a674a781ae67ab753f0673219d47db31601ae29874ea8e37672fa8956b
+EBUILD neuroph-2.4.ebuild 856 SHA256 14a0a27d0c5e270e40c05821c356e51282e95e918328f503b131f995b35241cb SHA512 7ed88d6a86a1ca147fde7bb06c655d6193b0ef9b9a12d588bfaa53af361e821debf5a4fcca71fbfefbf9694d382d550dde9a5dec4c4bb66c72f5a7d3fe7f9c23 WHIRLPOOL 71b699c56073c181ec9a716d552333683dc3af7f5359fdce2203fb0bd0b04ce3a26ce1641c0c4922c466ce028af70b04a1c4325ead3fc07ffe5ee77d037c82fb
+MISC ChangeLog 2523 SHA256 b82eea36b57297ab1b696dd6f8404ef1950348cda11ca5e6aef77bf678fbc728 SHA512 486d0a6838372a8179839d03fa29ef5df0b344b7600cf30946735552048b546b589f7007de36cbd154ab88cc4b1cff0b0b83994d20fa29eb6214c24c9fbc8d9f WHIRLPOOL af470ad4f41c14aa2fe684505275f0a408c3fda38d95fa007d4a824ccf71a2b2a57c2a4bf23053d983a1e9b43b720c04a51e00bbd57fc4b52e56bcaf5e799d01
+MISC ChangeLog-2015 2289 SHA256 db5e57d8cb18ac2375e3c24ba641930c51ed0020456f5f98ef827f32445f2c38 SHA512 cde585f8da0b895448306249e1d6b1120f65b01e2b92d81b6eefc37608dbc49153ee5ef04a5fe3d06029ea6737e8b0eff2b9f659b4d0c90494bbd69f51053c25 WHIRLPOOL 02e0025a00ec66a07df71372e7df931dc6f04f5365651759c1bd6ae4e3f0cdfbc6ae13910e2eb4f9f3ec6f34823a0a29707fed4db9fd0b6278cb784fdeb78f0f
+MISC metadata.xml 313 SHA256 93ea59445146147e901605abfb9805044b675bc9c6cb92b2f3a12bed386fa3cb SHA512 a59f20c8be206fd5d02ae1e83919ce976d4b7503167ff41864d294fb92e692beed71a1c55ca76732f30b988393ef7559c3529bf44c186ceee6cf5be76125e39f WHIRLPOOL 9bc2b24bdd281d4fa78fe5a5932f74513dcdde8e0d630c4b1fb67dd1a57366ebdac14422d658cb46e85e98d5541fdee7ce0b4cbdf1a98ef1ba1a0fd66fac988f
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/Manifest b/dev-java/objenesis/Manifest
new file mode 100644
index 000000000000..7bb736c9daa0
--- /dev/null
+++ b/dev-java/objenesis/Manifest
@@ -0,0 +1,5 @@
+DIST objenesis-1.3-bin.zip 287452 SHA256 42599550f4f222522e90ff7677c506c5c85590bc5f5e07b6e3b075a171c1eb91 SHA512 48f838e00cfe0d12c6c73fb3d1d8482ccd8de71742a86c3afbba832c6b73e1f7b1604f8c209386e00f7751cd568e9ef4d61b543db66c927f3d61f9e6ee0a4193 WHIRLPOOL ab452111d5865a52164e26de9bc6a7669b879b1538ac5dc9884ee73853da10d152594c8c4c7fc367de6916608d8e5984ae8a3b5ee06db82377d394adafd0223c
+EBUILD objenesis-1.3.ebuild 639 SHA256 0f5a0e68b9bc4a85f39207c4e871a02688e55dc1965fadf16b7a6af83f1e0ec6 SHA512 877de6af0b05a03fac261968c07b766ef4b1ffe8bcef8b8e467a5c03d0c523d066c54cc3b8a20f39484a9e79145d5ce0ab4421bd18e1371885dc1775b0701c78 WHIRLPOOL 6d1ee18329a054b56f4032487ccb8c5256d27fd1db6688d6e1998ecbe7448b5d5186cf7e9fd752f4d303d1d55e85e9929612dd9fa91adc43f4d0c62d9aea7e48
+MISC ChangeLog 3123 SHA256 0b93fd4c722642ae657235cfbff7d8d8c8b26ad2b6904571e8747106f32fa1c1 SHA512 709703bed5f351665d775cfb033faf0e8679f1b2f0d2e7379582db08632ae8117c58758685e4573e10ea5bb9393d70042b44318b8cf7f321300a9f080cfcf87d WHIRLPOOL 3de5f842cf7e7523cd74a1138d7550ba5eb5f52beae293a661af642d2538f9e81df4ad4b8336c26ff2c6c7d4c58addccf6c674966e39b6382d13110a84a25d26
+MISC ChangeLog-2015 1052 SHA256 28ff58e4423fbb2fd017d6730c961db01f230f03313a7eb325a437c603a80bc0 SHA512 3f8d8d0a5886c9eb7d995e9d49b7d1aa0de5080705a335991a999c0eee3f91368e27ef9bec10502c110c44a6db2e7143f6cb9fe8112d4c64b1b985fb100f96fd WHIRLPOOL 08cb8e7df8fa3efef4460abab7e151869b8be02b4efd0771c8d3a229e08431c34d7490ec0344b4aebcb2789e31c12b64b0ef84a409d25f5a8a8bf6ba02defc65
+MISC metadata.xml 315 SHA256 1de4dbcf35ed122ca4102ccceb83fac0ae582b41dc6fbdee22caa104857d59ba SHA512 21adb506d9c4eb3d989497eccc9ae6d052753e880afa8b7800dc86d54128173b288c1788579f1d8e1be4acf7b03a1fee2e15ade6551241062e8a908ae9a6c7ed WHIRLPOOL dc1bbacdcc32d827ac260ea18f4f55cf75ae0c7668407fffdc1736778ce280afaa691007786f7a4e081b62da9009875cbf69148a4a95418749d9e2de65017699
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/Manifest b/dev-java/odfdom/Manifest
new file mode 100644
index 000000000000..fb562a5c7202
--- /dev/null
+++ b/dev-java/odfdom/Manifest
@@ -0,0 +1,6 @@
+AUX build-0.8.6.xml 11328 SHA256 ed8145817949c8a58f41cc2f06879ef113c80a0b6586390f2f3524ef838bb376 SHA512 6db30e3cf5b154e07bba0374beed2781c0aceb4000d73d1e44c9041f876c2aad3510f9d07d7838c7d427755819cb7e57907843a52140755bfdf8818bb15664ef WHIRLPOOL 7f2db1f7a2dadff382f79c9234837be772b8bdf332cf1bc33ef192e554c3f585cce165ade0136f8acd5c5eb1704335c6443e2a9c045f8d20606f1c59e180017f
+DIST odfdom-0.8.6-sources.zip 33171275 SHA256 fcb5ecefd07081073b50c023e2b49090400e8d152d5f06ea93c87f5db012bfd2 SHA512 7b71d55da01d604d89c5e0c7b9efcfd67e926db6807c885cb34cb9bd2e1fb1dc4a38d8e75967e08913b7ab1dcd85e7165d561fd3585a3d0c63df35a1a12c44e0 WHIRLPOOL b14ec321387b96b0df96d78a204e999548e671b023750efbdbbaae633babbee54a924dd9a20bb6c1e1888aa9c397cd9d0ea8946c8109767ab0918ef0e085ff7d
+EBUILD odfdom-0.8.6-r1.ebuild 1730 SHA256 f6ee1e89159027fd40a17f7af7de4f4c21bce75857c3e36ca7fe146e93dd4eaf SHA512 6349b4eabb9839eb89249475bb9fda23bdf4605b3c7fdbb14ef1f71c8fe7b5e8a00cd26df8325c13be0acf33c0847c00ae727b327b7855818dc7a1a730401d7d WHIRLPOOL 49f58732acc68b59d9c2813b038b8860f83451ecc5b9debde45d694fe45e78b21f3a26cb0a312cabfcde9910674dd943528b35ab0a74d3e94150c9fbaafa25c9
+MISC ChangeLog 2847 SHA256 3a1b0a62958781ec7dffb25a2e9ccac260b9bafb5c816b8c0930633aa925299a SHA512 9a3e688ae1a1963222890d5407ad0f86f5316b3b240084884a0a49ecffcf2ba352584138952960fa0928f774088c5fda04c0e3c97a753544b097227fe5777852 WHIRLPOOL ce657e31f59ee11c043046fff111f38a5738444b13cce586d546abe70471e77a1f99a2ff11392573b4b27030841ddad56a23e105e9cb946af5478fcd50979125
+MISC ChangeLog-2015 1107 SHA256 e3ca8ecb12c29863445d1916e9c83f41f435c31f0c5a8a3bd8376046b8f2208a SHA512 e6c0cf8519d59bd6505e5a9b29e0b3e76b20ae7ba392d486730a406290f6df1a4f0f956165642a725411e6324b9038ad3207c297acad8e36bbf01d320d01f2d3 WHIRLPOOL d1d55799a3a614611601b5c86a22579ea8b473fe7f6d9dfc6e114df5a51f58ced7f0b827bab8e4201c464f1c5e89324c6341892218885a496a294be0c42a2cf8
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/offo-hyphenation/Manifest
new file mode 100644
index 000000000000..4dd94802bc2b
--- /dev/null
+++ b/dev-java/offo-hyphenation/Manifest
@@ -0,0 +1,5 @@
+DIST offo-hyphenation_v2.0.zip 858046 SHA256 79d341820583aa5b77ee00dc7da59bfafb92adceb88c7a1922fe300a90a22c4e SHA512 8a907a38dcb54ef1578973293efa2fcd771e3c77faedd537381f04f6f543b3f04ff8b8f96fb692274e9fe9cbdb2d3d8e5c7b29caae412271d9d8c023c079421b WHIRLPOOL 58e39e8caa8ef2dae2bdd715ceb8bd5a5b4c5879d61404558ebabeb4ee4256b6a1e0ee6932e0e81d6162bb65a8fbf8e70a5683df102851d764df3dfae98c1bb7
+EBUILD offo-hyphenation-2.0.ebuild 995 SHA256 ab659001e87bbbb4158e66491461a82bd6a87a129aa561a3e9d92f1f1bbee167 SHA512 cc62e89925ef5cc9a91652b76639388837ad7b884af805d4e53c92b6bb1b95131182b82bd295658619aa3b537528a0b31da14dc2080cf53ab809a69dcea27cd3 WHIRLPOOL 6ef4871825f9d58f7a482a7f829c9f3320e4a313b725ebe14ac3c625fd84d205873e82360e6b307aa959a92364042ec5defd0557c0b216bd87a5b4d2022e01e4
+MISC ChangeLog 3271 SHA256 10f8b56b0840bec6e9a0ee55a5eb2ab552b5ef28b0cf3789af7a78ae80f31e4e SHA512 038ec1b4eb59cb142813ffbdb1bd36275a6417ddd37afab1d252276f045e3bd70da0f53ec85f348d75f9c5065051d88042e8c7af5451b1abd879979bce610d47 WHIRLPOOL e33ec8849bfa181a424b2f6aeec4bff0ac053eb4b20480bd9988b74e2d98763cf2deaeb0d6088511919bb8d80c6e3e8eb3a8d8729f5174bc6925e21aedfa5897
+MISC ChangeLog-2015 1506 SHA256 3523d9a7bb5b6f2604bee51ad35c89652dabbfcba401491c65c30c56d25e2cd9 SHA512 779624813c4675450007b967d7787dff7b30fdeacc016fbc754760734e8103b8f986c0f27ce09cd28470349b7cd97ae7be82bca1e517755eebe69d57e938dc67 WHIRLPOOL 8db02a6ee3933380d217be0ca9ed7421b7f7f4b8482fe8b7712088690ad7b428cacaba1b45b217026925a4ada74d0f719bf32f08d985ece1086fc2d769a6dd4f
+MISC metadata.xml 310 SHA256 7417920b68da7ee19db951dee727ab05f1923d4e7fffef79df17c4770d07f925 SHA512 1f1c8172b99df046c63f3b23e7a0331954433fa05dfd106b8e97d5f6039635f378714ae49ddaf8b58a4512d3d1789b3df5798570619f5f241bbf564f4c5e6a03 WHIRLPOOL abb12a8af0a738bfcc3b1879f06bc7cd0af7b577bb0182f10e9739ec3fec570d6812ff8e13d09e6222eb7a09e7c18f964fd32783bcd23bafff02f973cb385b6f
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/Manifest b/dev-java/ognl/Manifest
new file mode 100644
index 000000000000..5f4825c5c97c
--- /dev/null
+++ b/dev-java/ognl/Manifest
@@ -0,0 +1,6 @@
+DIST OGNL_3_0_8.tar.gz 3564389 SHA256 e32d78c88985fc8f2c9ab5fb208d7dc22593dea32ed959b46b1d9101b99127d3 SHA512 79ca457077f344da16677e56f8e0ae809d2af85015e1c4bc17a3eef4dd25c01738fdbcac8a9397b83251b48164404df161d60e20d43868e1ff32e9bb388ef4b6 WHIRLPOOL a5e21dcccc4bfc424412abf94c48a3f45ba541a9e25bd0c7c4dc11869cac7051f586e5883011d03c75187fcd432195b526cfb53e3a300fbe2f84f5b4cd67e12a
+DIST osbuild.xml 5939 SHA256 b56534bfdceabe54f4c446d7ee3718dc373523aa368d83206723300fa6931726 SHA512 6b66b7b27073fd6b707b71fb2da7017602edd85de52e767ecb8d8931fdd96811b04d9ec0ac9ec1cb32daf03d43610f760471959cf7211b1921a92d5f5a070416 WHIRLPOOL d8b355472c773a4e180d8efa2c0ecbf55a1233432f8af6c21f9fc8e02012db9780f923af6c3383a343126f4753ce7a62316fdda6a393b5aceb822fe52b64f233
+EBUILD ognl-3.0.8.ebuild 1081 SHA256 882b248c6f5cf347bc1e7b48a6117a2482776ecaa0bbc47243a8766a933c92f0 SHA512 f352879f869a3f89d251db0a49813f93e339618518e017cecae299d18805d4b3e9aeaddfc017cd74416f886ca6511aa0701a4bbfa56d6a663c85ef164ad73381 WHIRLPOOL cf1893aae86544520c3bc5422713f708ebfdc784fb5545bdeb21bf293a33a87f39714a1892d6dfe40b7911086a91570716a067db480ac2c9d5f306fa2dab5612
+MISC ChangeLog 3129 SHA256 f99a903f37257388dd8ebbd984ba50cad4d3e2d70eb09a0cf10778631eaeb80e SHA512 eb637cd1a1e34abd97243e7f5d88e2576aa6d94bb39ae5d9abda7160dbbc26c4035ed20f827ea408d84167e67053f67ccd58795514fdbc9b2206cb94eed0c302 WHIRLPOOL 39ed30a3d453221cbbfa795be704301603b58606994374879319bf91b37fbd3177981f38a99ed0187afed9c30d6c6dc01caa7b7df9711d403e33c7b82d6c42fe
+MISC ChangeLog-2015 2237 SHA256 79b6906929a6af4078ae1df1201f2590c34679ff0930d79088f71939d55469b2 SHA512 e3cb315f035efdd637891a56568b174a0235d5f1821212888d4ecfdc3183267d29f5c4e6197f03a0179070aa3d097e56525c94a48eb4ad92abb89a6b9c06b1f9 WHIRLPOOL 1f0842c0813adc67bc2abe1a6c28955c6be69ab20791e85641823c16c3439c153aace8bc0db2f494a209b34fe9531b50f3bb0496110724e1d2c6f1eecbe86281
+MISC metadata.xml 324 SHA256 75222a00a05b2c0635f86c5d5e69c1c10243540469613e651399de4c4593a224 SHA512 e62a903e93f2d3464fc2b0b88bf77486976daa9be56d96e2beff0490daf5c8530b449076e6151420f65a421ec0ddee6b8a5b13a28e9f884c0f5f70cbb4790bb7 WHIRLPOOL 75007610e5f47c2d394432c1a13567464ece0f0ee4ae9a9d3a06b27e6026692e7ecc4efd678aae2fe07defc995ebb89bab8dfde881ebc4ac600d9d01d3b5eeed
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/Manifest b/dev-java/okio/Manifest
new file mode 100644
index 000000000000..e75bcc83413d
--- /dev/null
+++ b/dev-java/okio/Manifest
@@ -0,0 +1,5 @@
+AUX okio-remove-maven-animal-jre.patch 1631 SHA256 d3269bc77e6adcc84d67b65adcd2d9bc6d5839e39262ebee6c2089312365fbcb SHA512 5bd6cacf2ca9cf51ee7b80fc5deead8174fb579dc3a8422f65b7af80492f37d24ccad4605896f0653984852db89c2ca9ce0b78bd0ea2630ad8c71e1808b9a3f7 WHIRLPOOL f846cacfdb13a27e4b0fc1bbac23cedda06cd19a0639bb763ef7909f1ac5a319e67702619405a3bb9382e6b3dc684cdb5a0307f2a065e3356dff588127b1b0f6
+DIST okio-1.11.0.zip 147483 SHA256 fe75d35e819e38ecf17717c6d461e6ad82ad2ee7d8f2251047389b4acc16b56e SHA512 c8f440284d683a04e3d75d6f6715e229c06caad5e7f2bc544348703cdfbd8fe5bfb19f0c316ea4cfb473a933b03bda2277de8c0b7c956b143cc04826e61cf0b6 WHIRLPOOL 39a77a7572f1996b42c10c4e158e841917234fca5e6309ef8815f90c20338c86bc457a8e469af9cd91c5953000e7df661c4c9a3d3004f72404392f0108a98034
+EBUILD okio-1.11.0.ebuild 754 SHA256 9a80772ee168e289c63c9315d038378e0a61ca0bdcdd9b8fe79d8cb3267e2070 SHA512 405fb52d98b0b3b044d1e92ce3c6cca8654ea1816b6149a4b9bfe9a76943994e6f8d3975e985127cbf76395bf59acd3297ed5d1217c198d1fcdfd08b4ce01544 WHIRLPOOL 7e7898a1fc8ce1d039180fa691f8da37e53be547fdc970cf1aefeb87bb70350870f0b5f64224e75cbd865d8dab2023554cf77cb6fbabdd881a375a83f42adfef
+MISC ChangeLog 350 SHA256 484799ce8c96010f052298372bdcfcd24fdb2965fae2e64809d227432a15d68b SHA512 a3cb1358398637e9e68beb28f7dda90c01fecba139ec4509a0c2a743138fefca3c0d140cad814aaa92c7397bd021542b95c32951c85de6428a49d8d19d0c0b57 WHIRLPOOL 59b96b5af913f4058b09cb9ade5b4596a5f91d16ca9a0a7c88a8cc0d437e70548c19f6ce1717024e970e5883c9808e8e27ff1c894facc4f045a85bbd0367f4e7
+MISC metadata.xml 312 SHA256 6c549d6c0996e7c727be6f404dfc3a3019123d7379a7a6d32a197c49b7e1a247 SHA512 595713b72b25fddd2950c667f082fef0ce861354c44a878efcaf721abdb8761c2496a9b975c21824cfebdea6d9d4fc39560c2f8747a868ccbf08b49ff7dbbb25 WHIRLPOOL a0198039a3f3bb15dfa457a4c3d203ace25355cb8242e9420b261477e5002aae7a2245f6726d0ad85f8f46ae95a0090d1803df64f63d24ec06a44d96b115f199
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/Manifest b/dev-java/opencsv/Manifest
new file mode 100644
index 000000000000..444fe9c958e1
--- /dev/null
+++ b/dev-java/opencsv/Manifest
@@ -0,0 +1,5 @@
+DIST opencsv-2.3.tar.gz 280510 SHA256 04ebc52af08b20e18c193f194ea9d169a7737403b2376f1707d858dbd4e7950d SHA512 3831cb9c5aaf8b19ed6895406e7358ddb6b30cba1876b42daeab41230d83bd532b9db53c073960413a385222ca889f1aae14404fd46143aa28ee05b3d1019106 WHIRLPOOL 069c1bf477c04f0ad6db927e7179c0dc29104c48e179f0fcf8e4c42b0de2e83e3e3ab5fd80ebbd8e13e12cacfbe231097b675e99ecb0ef1610277dbc9a9c927a
+EBUILD opencsv-2.3.ebuild 640 SHA256 bd83b75f8f829b04572aae574463f948a3a22d8ba8007fa503a81531fc454c91 SHA512 0aa7ba6d05c454b13b78dcb137b8cf499ac412f78bbf2c2eee72af64044ae4f0fa65eb5387d6aaafebcd1dd8a1ce91edd727e74d4534811129034ed1c51d8053 WHIRLPOOL 591fe616c628d06a7538e2b869c99d20b5862ba0e778e0c0fa0619ffc62c66244e72316a2a9ea5834fc42a4be669d56468d4c9f50c9198c9b82cba805bbe0297
+MISC ChangeLog 2963 SHA256 7b7d4c8b62ad58d080f44ce06d358a30035c1a28b3b26b3ef9fd43d81538d80b SHA512 4b7d8d34796365374478cf4d7b3dfb12a99bf0a695c9fe35f497b91d441c7048940ed654cfc81386bd3a7503a6348bc23fcfe802eadf23bfc1024af3c086591f WHIRLPOOL cf6ea18771257687c1b97c4ab281253a2671c9bcb2dbf23c33564d55a1c6496d917b7ef3a4521fe1c41b42b469726ff3b6a04f703a7f4ffcf7ff70aa0c2f4d04
+MISC ChangeLog-2015 468 SHA256 fa8f36620911a712abac8c3f4b91a603a6b92786dc344d4bdb4604d2abd2faaf SHA512 8d332d96495d9db9a7735aab2370bd1052dace532308fc10900149536b525e3265bb2ec696b497f7a74a4cad0116db71916bd66f0ca33d5e0bd73707505cc541 WHIRLPOOL c52ca0be4974ba7da6df22d1ae62c5f052560c58945b8e9e2f8d03db1d4329fdc87dc059e1c4e4838cfb0afecc795c3ec5032a7ff252206a57b5836b133afd6a
+MISC metadata.xml 313 SHA256 53e2a9fce15ffe284cc341dad84e022b10bc403db75d97bbd430e9c570724254 SHA512 93d704c946f02479abc1d89604df715f49c01906f9e119859f90289cd6027e0a9498b2f62d30db47a62936716f45a031868805da4eaa39934dd2a9ad4223a8e2 WHIRLPOOL 0d264028082dd77c1148ea4373d7d37f082ceb863e21fde6327e1ff608bf160c470ae4b683f875763d6f456d0e4b43be2e35718e4a21b8b6df1dd66fdb8d0e59
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/Manifest b/dev-java/oracle-javamail/Manifest
new file mode 100644
index 000000000000..396590d740cc
--- /dev/null
+++ b/dev-java/oracle-javamail/Manifest
@@ -0,0 +1,9 @@
+DIST javamail-1.5.2-src.zip 1573447 SHA256 76efde22a38a021baa99087be1878787bf5e72ceb684b1bc33eb260a8ddcbdd5 SHA512 9d2ae8c38a8e7464023219dac13df95a34cab52a5ff9f19015ea0dde73a838f49ae006c9dc1538eeb978844af7ac962ce3b22d89f0f9ccda684141f7b52840bc WHIRLPOOL 6c438c6569cbd689eeaa8398301b5481956443ccb9f2112891bce5e97d1a792e0176e8fb395cbadd4175e87c253db833760aff96ea61654dad3d478d386fbf7b
+DIST oracle-javamail-1.5.5.zip 1794428 SHA256 33d0b71714931b586bbb61367fd6491f7c100b9ddca597a62e51e5d5ac308bd8 SHA512 20eb12e757d00ceedbf45c43ddc1b6fe1155e79766e5843fbb8fd58c3ad91305edb07351b4ff9ed411aaffe977e9e4f287ac16b88ac55541f6f4f93c1c81a58a WHIRLPOOL 363c62731b924ed8f48a60382ccb853789c1d0645ef77f1fe9370283d58acb3e74aa311e7e72512f80f97598c33050426865178a93d22aaf882c19581af8c241
+DIST oracle-javamail-1.5.6.zip 1812631 SHA256 6754e4c3f3f2a50fc4bc9c6f4e041dd91dc99a716d38bceeac0f5327e2bf73f5 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2 WHIRLPOOL 2326783c932d65dab63cc2cb839164c761b25fcba91746182149bf06a59c19c616987a308bbe885a462e4a41014cc822898d4569b2c3ffbca0ccc5c396996f11
+EBUILD oracle-javamail-1.5.2.ebuild 1278 SHA256 db1fdf624a393746cf9203fa68387f82ba4f9d3b7e7a91c7df89005455b47e1a SHA512 af7b7b766cdf0f87085deb22ed4622a2f73bb8ae20ae9469bd3642abe517dd8a7a8bd2847fc6a6aa432421df5cdec552932aac0bb50763946b425386f2b58496 WHIRLPOOL 402f3f1e01c0562fe34f66050c6213342095a7e3dea6d10c23fc40cf4f38d81bad64f8c74ae0c622552f20c7eb537074f3cf265ec9136deb8b107abdc2b304c1
+EBUILD oracle-javamail-1.5.5.ebuild 1293 SHA256 2611a8aeb0aae28a5300287304379279a237b8c6ba1407794ee5fb9a164c655b SHA512 c94902f1a3d9bbbeab1a8addf7ef5ed316c7b98cb5e4a227759c2dbeb239c3afa8503816e260b28c15d4850d6df1d0322adb090c8cb3865a5e250fbdf2897c75 WHIRLPOOL c334d7bed4875f7d499eed13d7149b7ea6b042a3265b57db26c174e2bcb61f801f716d24a49c44fecefc587f5baa8fa51f53b0a20ee94f5d897ad220d6d16a39
+EBUILD oracle-javamail-1.5.6.ebuild 1300 SHA256 7f1dc27b22f0b3c9a2cada1f1d77896765897acff0f60ffb4a706e4114d3025f SHA512 4cdc24a2ba002cf05f795b3769518934f220cedc572e980443a613d0b1c93c8936798ed6f45cf8b623b17a56149ddc9023ef378a8275800b9cc77d9d50f7885e WHIRLPOOL 0ca068ed23917cfa79f9e45e27d013e01669f553ab6b3008c874c1382f21cded8a163a84a79fa7e30967d1e0eec93bcf9573431ecc0e860080bb89e8ede617d5
+MISC ChangeLog 3506 SHA256 345c86510a1687bd7c3f41335945339406370e72e8f425e00fd5b5901c9d478b SHA512 db229fd7b13bece6537c5f8cbe7ea11e680b7956e6eb1bc2ec3aa718e01c7cb9002c2dc6980fd1971572cbb630cd2c2a045056b0b9985752dcb412bcfad25c4f WHIRLPOOL 0083938080390c32437788747d4d6e8a44881adb9976478b03a1abdc61481c908595c6d986dd7feb04a62463bae9e1c655650b0742ba82494fc6b0bef9d59ce5
+MISC ChangeLog-2015 625 SHA256 a1e3db220a0b2ca70335f006275ed0cbf26ed54e52c5ec3047c05c79e50c26af SHA512 5185cbf649de2fa8ba0a11a3598e6018fd7e6e0e7094335e038fa1e7858bc3e07000900d508fe6f38aac32a69ce9198471b6475c99b58b955bb77d28deb1fad1 WHIRLPOOL b04dcac8390a5ad9b2f2c052fe47d6ce2b0a7badc20018cea3c53add2d729f9ee24db338cb5e5df9d2161c50360e2508615802a70d5cb6c36380f510841b48cf
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..6275061a6978
--- /dev/null
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
@@ -0,0 +1,44 @@
+# 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="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-fbsd ~x86-fbsd ~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..73f38b732f1f
--- /dev/null
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
@@ -0,0 +1,44 @@
+# 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="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-fbsd ~x86-fbsd ~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..e56f6f60aed3
--- /dev/null
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
@@ -0,0 +1,44 @@
+# 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="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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/oracle-jdk-bin/Manifest
new file mode 100644
index 000000000000..4e9dca7f149d
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -0,0 +1,21 @@
+AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
+AUX oracle-jdk-bin.env.sh 833 SHA256 cef5b8196f18b4c7bd195fbe5084dde6e38b693accfc68859f48cb1460bee4fb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8 WHIRLPOOL 0fa41d4b45e7b85628feffb55a8ca5ccb99c8a3e8d59907e42947135ac5cbc39564e609be7901e321ec5a0de8f0b6705e02333a771fa738434774cd198c32770
+DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
+DIST jdk-8u144-linux-arm32-vfp-hflt-demos.tar.gz 10431600 SHA256 b113da60e5b0d30e58723a1bd56d46d25767b6c893910ab8bad08f43e463ee86 SHA512 36bc18b6d8d028fc9737803cdf913378c7501aede301c6013567f7eff1b326f44381522a3c5c38869799df6ef4aa4d83912332c3787a305fe6cfe6746a0f906b WHIRLPOOL 8f9da8cdee641320ee86c130db0010bbfc0823cc8e1ecf68e4698d7470b709251c8af56a617ffe3bdd567b77de5a3c0c29caefb8d52a75799d533316cf42ac13
+DIST jdk-8u144-linux-arm32-vfp-hflt.tar.gz 81674263 SHA256 cbbd390e19ab4c473e05f60602ce2804db25e4e35be5ab95f4f1a2aeb5b72383 SHA512 673a2ec7704a921db19e904bf8e8594b003b855de5cecab4419c502b235156a28262643ac235401c96014792897bbc1a51f78ced30e09439628ecd16d841377c WHIRLPOOL feb03cf10b692edf0b94cd46a1fb9cca9e9b1361efb1786d492a52c3ace889c3f294a163ec8bd617be87525957b62d6f1a1383b815ec65b732b70b6a327c5793
+DIST jdk-8u144-linux-arm64-vfp-hflt-demos.tar.gz 10427473 SHA256 ec66001b2f6a6814c4cf6d28f7c59ee5d335cbf50d8a3557c5e9eb46adf09630 SHA512 cbe861d234ca95e542c38ac72a1d84cd36ed895f4c72fbc45e1d4e5e4e73dd10f4b28f2bddb86a9b848b0edf304cc18b8e9b605ac1b94a1d35117fc75dd00748 WHIRLPOOL 39567c138d9c099a7c0e0b642a550d4ad9b53e533520601a1dec0d51a9bff45aa9afe5b31b1b015db8648b2648a609f9e284036b2db98f145b57c5a3a477e43f
+DIST jdk-8u144-linux-arm64-vfp-hflt.tar.gz 78463505 SHA256 bbcf4a0805f9bcead32fd988b74cee61ef6ad90e6d1b4e0dce432ac3fd8e0168 SHA512 42d3db36d7adf5461024202260b940d824c58c35edeb89b7be6f98147f1d556e95ee2f37b35c4468fd4d175f3381ce5bda9d9c2f730d054a7b8e669b469e18d0 WHIRLPOOL 7a0d15c8c5512de0cce0deade9b5f87f505e351c903d04152e860261f4d790e8e656aeb0740bfa9f69f0c2b80fc55a701d8f49ed3d7e1edfcb5293e95a22504e
+DIST jdk-8u144-linux-i586-demos.tar.gz 55071167 SHA256 3e8f02f32b129d681f5f2a0178373d750f4c2352acf55785fdca70c8f9aaf595 SHA512 4f3d5f8ecd56a7955e30cfea12dea4dadad0e955c3b160fddec59e759a9a6653bcb009bccae289fa022dba931fcede8a98d18770a8c18cc49d9da4f8ea0980d6 WHIRLPOOL aed2d4bdcebbaa0ae4adfd3e4eb000ef1499fef1ccc76f4bf00ce63fe5f695777fc3e8c2fd75b852fde8cfa1b06cb5c41c870b802074ec38f6512d296a67da96
+DIST jdk-8u144-linux-i586.tar.gz 188157665 SHA256 624c090647629394ef0ee08d9d8ac5d3d5a9a60fa245fefb2eb417c36c7cb7c4 SHA512 06e08a512af60bafdf3220ab916461c3bac61a3cac19877e9dd0c004c28168243c5f92f3104da1dcfd5eae98e882b224929f72692603455815c0ce8615f5ae9c WHIRLPOOL 79859bb345787155935885b872b6f072b68e81fb0008661344502d461ffd7aac88fe4cc9a2ff03f241ffcd41c0880907cd5353bcaf2f5bf7112dde1057209f85
+DIST jdk-8u144-linux-x64-demos.tar.gz 55093539 SHA256 67fcbd3b54aea3791d10eb3cd74a8fe42c286f0854b6a984b768f9c9c7513ffc SHA512 7f49d29e323237f0144e00883634779809bf41ab0b50875a3a36020521f716149cb38db522763a56249d34a1c3ee6f778b6ecf45b06b492064cc1fce854f9d24 WHIRLPOOL 74db7026f97ed61134313ed6b853d609684e7316d68b3f4880e12fadd9c6d267e79c0b8e10f69fb3f21af29d910cf2ab423b7c23a5f80dfce51389832bdc1aae
+DIST jdk-8u144-linux-x64.tar.gz 185515842 SHA256 e8a341ce566f32c3d06f6d0f0eeea9a0f434f538d22af949ae58bc86f2eeaae4 SHA512 e84bd22105586b4f1cb770942755c3b4ee7e2ca2a94bf0e7d48e5d44586a103dd28432664fd84b260b8bf1d64a1e9dbf49549f194e7202015e603865f4ae1e69 WHIRLPOOL 832b2b2b4790a9ed7499192248f30c9e56d357d52549c39314f992c3757b69ba9cc725356966ad0229c4053b63a56362a26d1a9b2f447c00b5f3d927e1926d8f
+DIST jdk-8u144-macosx-x64.dmg 237607747 SHA256 2450b35e10295ccf3fb1596bdea6f8f5670f7200ae3ac592eb6a54cc030cf94b SHA512 7eab6126044e230bebb1a5817b046bd64d3f57a3dbd3efc6c77411008b2aff7d4bee190906cb19a5ed330a8220b8b6dc47c9fc193eaa9a3c1f74ebbffcee0d6f WHIRLPOOL 7477673f2380a22b8ae9a7381d6b86611c0fbb32a3d94d81247d86924599b2317a7d598521aea51a729a9f553b7e4065799bd935fb0a3c0f53732cd448dcd5f6
+DIST jdk-8u144-macosx-x86_64-demos.zip 55667110 SHA256 d665713ddca2d771a56cef17fe16b9972ad6fed3fe716b18b690cbd8e0e99475 SHA512 252138155cce08eb8c68f1b3e10c621edca1292d69a69d3022bd32d45cb6c2095329cc3ece375124bdd1774e9e7dbae5f47a608f457a0655e2408614965c36bf WHIRLPOOL 86fa1e5b99c1beff5e7f6dd139629bd2f49700e8975be50c88f44d66bc5124bebfa42b487329e805aa79819f339405247750f6c55691af0c748ecdb555c0bf87
+DIST jdk-8u144-solaris-amd64-demos.tar.gz 9765361 SHA256 33f76fb0bec3f554aeb15c02e84c52cdeec77ac72f99f5247cee07035c7779b3 SHA512 a22e58c8a905d87e25184ea020c24dfe8afa4aa314093135643926ecbc734ca06ee58efbfffefc7dcbd013dbf0023ab515448fd48d4a731b656e2f47d22b98cb WHIRLPOOL 82cf282ecbb064567c96f4ee81560588d71e257504eb6b926d6fee8b114781eb5e3881035b250db2436b0a2579bb47309fb51e89f946f61c5b5e27e727749f33
+DIST jdk-8u144-solaris-sparcv9-demos.tar.gz 9793649 SHA256 ceea29533ceb76ed1ee7f65b5935ef0fc53b0afee7c5f4ddb08d4face3b0838e SHA512 ba14fe455acc52f2f6da0c3d419d491f3a3123c7a0f80ce4d130e68a0492e7509e34709ca5921c6f266c468ba085f78d203d8018f1d9df26982e3d2dea72c1c5 WHIRLPOOL 5fe028f3959d2337416f8cb3b9b101dbba4ec42db18abec7641cac3133da44d0938f0429d43be3e2c159957fe5c351a6db81d6b08fddb55cb5abf7ef36e1885c
+DIST jdk-8u144-solaris-sparcv9.tar.gz 103999213 SHA256 fe8e6d12cac940569c5b2270d2d40ed57d6a0861d15d512e4d1cbc55277a2d2d SHA512 0a9ed86237ec253c009f68a3d6832610595623437d25d68c157ef2b5d59e0556acbe229be7b9a1713565b76604bd15474d2ce50ab7c593bf568226e9c1f6f6c7 WHIRLPOOL 24cee16e12c622cc675226842c28211b9d1a7e6079e0e0c0721e7f2cc2fe822e033ffbd405f7d509b5068531d7b9ce525a6628ee4cc3642400f33f7d8f86a8c3
+DIST jdk-8u144-solaris-x64.tar.gz 101700929 SHA256 9eea0096784e6c876aae6918bf4692096bd738200e717da09b4471bd1e706cf1 SHA512 fcd65f556d8565a29d4b7d3d5dec5c52c669c64db536c8ab01749f1f320232e8d42ba3d7012802033d9d7344b9abddd52140e345e4f95a025f00069901726f6b WHIRLPOOL f3ddd659003c5f2d39112132050bc441630c73208900babed8c1ec814c3d73271f8774e9411c8fc3e2eeae31f5312d6731520963c82f1c148d461eab0a355972
+EBUILD oracle-jdk-bin-1.8.0.144.ebuild 11217 SHA256 7d38b9ce9b427217e4eb72114fb47e4ba2abcaf0f85a8681710aa620e3e76c2b SHA512 1f43ffdd08c0e41940f6bd5a535a01f8ba41173bfdaf04f501eb89d05df32c3b8f06fcf78d656836c4ba5f64472e9e31f04224c87f9b47c97d78e61abc2b1ede WHIRLPOOL 5f79d1cc41f28e5c5df2b8211fcacf58764e047d4cc15b8ae0dbc1d69e546f37479ccaaf096075407e2716413c372dd8f598ed6c82e303e0f3b596ba943f62ed
+MISC ChangeLog 13800 SHA256 3649ca9854afa818a93a26b740810cfcb6ce7f5aea15edb3b55cf52a8a3939cb SHA512 cf6f333bd218ed574b9916d02354999de051c0fb8a5882c750b75f83e55593a6d72e218ffb1f8cca59b222df04e8501608d4bdeb6e3489fe021a063fd8f49cb2 WHIRLPOOL 6f1bc3d6a22ffc0eb389e4639f7da0066fa676f726d236aea08db38bb2a7969d55a7de2ca36d821ed7fefef69958f6d766f6bf2ea1770dc9e1c8b4978a230083
+MISC ChangeLog-2015 17787 SHA256 37e99da4dfec1171c0701781550ce770f4efa1b32d5af9424bea788b1bbc3139 SHA512 99879d5ef9201cd716ab2f427a2d0e51c33ad255f49b0b995c7b4a128cefb8dcf7af43915ef593672b67cf8d9691fa94af7355d982893465d6e913599f5fcc1c WHIRLPOOL c3a6bde6dbaea52bb0c84d874460742c84341da0239c43ef36e7a58542b854d55c12157ba9b4746444d3128ce149254dcd7ffd80c28457ad5f5a44a9db936a40
+MISC metadata.xml 947 SHA256 381e51e4a062f891dc9df4efc6e8b0e95fcf6ea735b7b5d886f8e8cc2241e8bb SHA512 e75227c3209a5b85ac0d8f3e0f26752bbe88eca1575e00e75be80beedd65b78765a420fefe33571c6ac90412cf1b3db5768f75e8d6e478714d4f177f100fd815 WHIRLPOOL aecb59d7c2554db8493fa01c1fefe639649d064a42b86e97803fee9206fc81391f93317e96de75921d086e1170f1818df334a17d157d0fbdbc19d7ee4feeaf9b
diff --git a/dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties b/dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties
new file mode 100644
index 000000000000..43cb5eed0c47
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.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.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..165190f3d7ec
--- /dev/null
+++ b/dev-java/oracle-jdk-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 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="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.144.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.144.ebuild
new file mode 100644
index 000000000000..1e25bc987cec
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.144.ebuild
@@ -0,0 +1,355 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+# This is a list of archs supported by this update.
+# Currently arm comes and goes.
+AT_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
+
+# Sometimes some or all of the demos are missing, this is to not have to rewrite half
+# the ebuild when it happens.
+DEMOS_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
+
+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}"
+
+AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
+AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
+AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
+AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
+AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
+
+DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
+DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
+DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_x64_solaris="jdk-${MY_PV}-solaris-amd64-demos.tar.gz"
+DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
+DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+for d in "${AT_AVAILABLE[@]}"; do
+	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
+	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
+		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
+	fi
+	SRC_URI+=" )"
+done
+unset d
+SRC_URI+=" jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.8"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+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
+	jce? ( app-arch/unzip )
+	examples? ( x64-macos? ( app-arch/unzip ) )"
+
+S="${WORKDIR}/jdk"
+
+check_tarballs_available() {
+	local uri=$1; shift
+	local dl= unavailable=
+	for dl in "${@}" ; do
+		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
+	done
+
+	if [[ -n "${unavailable}" ]] ; then
+		if [[ -z ${_check_tarballs_available_once} ]] ; then
+			einfo
+			einfo "Oracle requires you to download the needed files manually after"
+			einfo "accepting their license through a javascript capable web browser."
+			einfo
+			_check_tarballs_available_once=1
+		fi
+		einfo "Download the following files:"
+		for dl in ${unavailable}; do
+			einfo "  ${dl}"
+		done
+		einfo "at '${uri}'"
+		einfo "and move them to '${DISTDIR}'"
+		einfo
+		einfo "If the above mentioned urls do not point to the correct version anymore,"
+		einfo "please download the files from Oracle's java download archive:"
+		einfo
+		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
+		einfo
+	fi
+}
+
+pkg_nofetch() {
+	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+	fi
+	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
+	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		pushd "${T}" > /dev/null || die
+		mkdir dmgmount || die
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount || die
+		printf -v update "%02d" $(get_version_component_range 4) || die
+		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg || die
+		hdiutil detach "${T}"/dmgmount || die
+		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv || die
+		mv Contents/Home "${WORKDIR}"/jdk${MY_PV} || die
+		popd > /dev/null || die
+		use jce && unpack "${JCE_FILE}"
+	else
+		default
+	fi
+
+	# Upstream is changing their versioning scheme every release around 1.8.0.*;
+	# to stop having to change it over and over again, just wildcard match and
+	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
+	mv "${WORKDIR}"/jdk* "${S}" || die
+}
+
+src_prepare() {
+	if use jce ; then
+		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
+	fi
+
+	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.*)
+	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
+
+	# Packaged as dev-util/visualvm but some users prefer this version.
+	use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
+
+	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 && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
+		cp -pPR demo sample "${ddest}" || die
+	fi
+
+	if use jce ; then
+		dodir "${dest}"/jre/lib/security/strong-jce
+		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		mv "${ddest}"/jre/lib/security/local_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/jre/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin ; then
+		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
+		cp -v src.zip "${ddest}" || die
+
+		if use javafx ; then
+			cp -v javafx-src.zip "${ddest}" || die
+		fi
+	fi
+
+	if [[ -d jre/lib/desktop ]] ; then
+		# Install desktop file for the Java Control Panel.
+		# Using ${PN}-${SLOT} to prevent file collision with jre and or
+		# other slots.  make_desktop_entry can't be used as ${P} would
+		# end up in filename.
+		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+			sun-jcontrol-${PN}-${SLOT}.png || die
+		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+			-e "s#Application;##" \
+			-e "/Encoding/d" \
+			jre/lib/desktop/applications/sun_java.desktop \
+			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+	fi
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.* || die
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/jre/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# This needs to be done before CDS - #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
+		# Fix miscellaneous install_name issues.
+		local lib
+		for lib in decora_sse glass prism_{common,es2,sw} ; do
+			lib=lib${lib}.dylib
+			einfo "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
+				"${ddest}"/jre/lib/${lib} || die
+		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_postinst() {
+	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
+}
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
new file mode 100644
index 000000000000..e2edb93607e2
--- /dev/null
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -0,0 +1,9 @@
+AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
+AUX oracle-jre-bin.env.sh 785 SHA256 77cc6b99e02f7f2837b649d002129d3a1ef90ac047afaebbcdb2925e5895e747 SHA512 fee30a728d97822e0189e6687ac285e72270207d43ae2859159cbd212b3897cfa153aa27f66b06ee704ac24637f2d88b579c3aedc4026fd8508d59622e68b0e6 WHIRLPOOL fa163eedb0139bbe01644739609b7678ca6050c890233c5d5deed7e0810714d529e033bc5615f634a2d60b49365d9981a928c05c1a699a6a0c8996b296c98249
+DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
+DIST jre-8u144-linux-i586.tar.gz 78658631 SHA256 9ac5b0d6cda9279a4959a6eb635d849d745a37dafc24666539d1c8f7d76ab77a SHA512 038e367fb00007e6b0f70ed3e48f318cfcb4144ef88b3a33d6c152cb186ede43622bc5d2fb40b39c695fdbe1fa735ab97f501a6ad0ed0a6cf48b286cc08e9ceb WHIRLPOOL 0bac95fc572bb1466b3f69c7e3dd03a77611366bc7c8076eb2feac41ecfde9a4aea6bb60b52b9db1dc0ec2bffcf553abe4ac4b1ffd28f7f3e1b6b71cd8ffc2fb
+DIST jre-8u144-linux-x64.tar.gz 75922776 SHA256 4e6e11aad54ae3c716a5607ee88d81f3f1e8b5b23ee474b0272dba351ee9f28a SHA512 fba5a5f5959746cb76a71847f5c6e3142816940d18c0022c0baf59611d43b24fae1052eeb217f09e840b5c393118260fb99dd38d1db7e74bb07ab0c34c2e1d60 WHIRLPOOL ac1921780076ff7ab5be5b942d5be0bab7fe12c027f1564b91734086d14c5a0da6b66d137034d7ee0318c4f72cb843013488591d1066a5f55c66dd4f53561a6f
+EBUILD oracle-jre-bin-1.8.0.144.ebuild 7192 SHA256 42b4605835176fc8e924d3b57688daaff1ab892c9e39ff0fcd6e9f5a867c7cd8 SHA512 8fb779937cb7cf443ca8c22230e98e5f2116ce8b5e6616239ee52f6f615c1c8f348dfcb96b5ff2cbde12885f1765a8049c265e3190776f3e7fb0ccc38d4eae5b WHIRLPOOL bff60b6fce8bcf801cb900edaa8fbaa5555df58a85a6eb6d56955b926187151663b6ee68fe44cf6555496aecc8a2b28e1c0862794417229324d1f5a0418c227d
+MISC ChangeLog 11392 SHA256 39a831c8202ef166f0d803392aaf33a5a6601418ca79f8ecaa6c83b68d9502a7 SHA512 0ddcfde062ed95e4a63eab563ea82e8d3056ecae7a6846932cebc632678ecd67471642f4855034eeeff1576309d7980f0b29a5ef7258b403803e39cf581d0ec5 WHIRLPOOL c35c02a9ec841f374ee9ab380945c7a9fb3368a9383191e20e0ec790b16a68d704641be1c5793a25fcd6a91803ea6039ce34d194851fa8ce8238832d2d8375c6
+MISC ChangeLog-2015 14832 SHA256 8c74c97192cc9a77e2b2b78a095c8dc32cf08bf6237e2258d5cd130ed763d2fa SHA512 f48a6130827e7069f75f02aaf80121b8c0b7610dfff47b23e99e373222dd6cfcd45281efa5ec7e9a216af5d6119b261585a3071d21d3cb0156acfaf240017d20 WHIRLPOOL ddc5ae2510ec21d4ab0e197a6bfef8d84f803312bcb8a95df409f8bbbd3cc2e8f7f004bbe54419c2841386ae67fe5651645cb326f590f95c7cd34d04d1beab78
+MISC metadata.xml 743 SHA256 d3a8894bd17fccb6162d8d164bae71ca97c90f60ff1ecc64cc414d1daf7d15c0 SHA512 31515728907e1fdc96fe6a27f62585c528370a544a306b4a3a26cf86d8a248211e3852e4a532d9a59be0e534393e6f11bd46df39b439084eb1234d7a6bea4d42 WHIRLPOOL 92faa7971ee6177414168ce1c8a12c9af87653e30f51b98d2d0a16e63f7d35fbb3467a83547f0c59a7f3665aee9ed915a806539b4b0501babb3e8de210b28207
diff --git a/dev-java/oracle-jre-bin/files/fontconfig.Gentoo.properties b/dev-java/oracle-jre-bin/files/fontconfig.Gentoo.properties
new file mode 100644
index 000000000000..43cb5eed0c47
--- /dev/null
+++ b/dev-java/oracle-jre-bin/files/fontconfig.Gentoo.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.env.sh b/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh
new file mode 100644
index 000000000000..eaf356787d8d
--- /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:\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin:\${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..edb6ab75a53c
--- /dev/null
+++ b/dev-java/oracle-jre-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="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="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.144.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.144.ebuild
new file mode 100644
index 000000000000..0829cfb55ff3
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.144.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URIs need updating when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+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}"
+
+AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
+AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	amd64? ( ${AT_amd64} )
+	x86? ( ${AT_x86} )
+	jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.8"
+KEYWORDS="amd64 x86"
+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
+	jce? ( app-arch/unzip )"
+
+S="${WORKDIR}/jre"
+
+pkg_nofetch() {
+	local AT_ARCH="AT_${ARCH}"
+	local AT="${!AT_ARCH}"
+
+	einfo "Please download '${AT}' from:"
+	einfo "'${JRE_URI}'"
+	einfo "and move it to '${DISTDIR}'"
+
+	if use jce; then
+		einfo "Also download '${JCE_FILE}' from:"
+		einfo "'${JCE_URI}'"
+		einfo "and move it to '${DISTDIR}'"
+	fi
+
+	einfo
+	einfo "If the above mentioned urls do not point to the correct version anymore,"
+	einfo "please download the files from Oracle's java download archive:"
+	einfo
+	einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR"
+	einfo
+
+}
+
+src_unpack() {
+	default
+
+	# Upstream is changing their versioning scheme every release around 1.8.0.*;
+	# to stop having to change it over and over again, just wildcard match and
+	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
+	mv "${WORKDIR}"/jre* "${S}" || die
+}
+
+src_prepare() {
+	if use jce ; then
+		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
+	fi
+
+	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.*)
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/*/libavplugin* || die
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR	bin lib man "${ddest}" || die
+
+	if use jce ; then
+		dodir ${dest}/lib/security/strong-jce
+		mv "${ddest}"/lib/security/US_export_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		mv "${ddest}"/lib/security/local_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/lib/security/US_export_policy.jar
+		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin ; then
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	# Install desktop file for the Java Control Panel.
+	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
+	# make_desktop_entry can't be used as ${P} would end up in filename.
+	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+		sun-jcontrol-${PN}-${SLOT}.png || die
+	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
+		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+		-e "s#Application;##" \
+		-e "/Encoding/d" \
+		lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/lib/fontconfig.* || die
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# This needs to be done before CDS - #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_postinst() {
+	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
+}
diff --git a/dev-java/osgi-compendium/Manifest b/dev-java/osgi-compendium/Manifest
new file mode 100644
index 000000000000..43eab5940ad9
--- /dev/null
+++ b/dev-java/osgi-compendium/Manifest
@@ -0,0 +1,5 @@
+DIST osgi.cmpn-4.3.1.jar 741615 SHA256 d73af7676eb25236057598907ae40c7542b6a8dcdd5b9a0001552fb4b2134bbe SHA512 803e929b4b7cfee13a3ffa2c60ad03775afd8409c972bf26e3f79abc590466c2d885bdc339d9af2a3e8fda9cdf082d23a298362ac37935b0ede0719dee27e9f9 WHIRLPOOL d24c488ed334bd634b1b5349e433274af5534a442c7a934b1f891279f4e9269459d84aed2bcdc96f268ae4ea8d25b49dcaf70e12d6c344899dbe0279c6148ab9
+EBUILD osgi-compendium-4.3.1.ebuild 837 SHA256 64c0dbbf4016de468c64825b3ea7f0f4ce7bbb89c61961485cc30aec369490ef SHA512 cff2849dc1d4c9c853b47b28c5b7f0056f0ba94f518a72cf3b7d5f6be3d9cc6b18c4033c7efc5d13c753f9da82de305e4c98b8a15774f8ae0e2426d0611f36df WHIRLPOOL 30ca730262e86d7e7a0ef374e48ff1fc36554e5932a2ee5e9c975e9659a46b88769424285e86b6eb7c917d5fed646f070c675d72daa453b80ab8c43fb90f1ce8
+MISC ChangeLog 2710 SHA256 a1d7f166efbc9b4ceb1f7e7795d91ab1396947b92b3550a308feb4e38399401a SHA512 1c777af75303a23be55bd385876065789e62c69bae594e00790e5ea57b7ee9e9d79e203359ec0098ef32520f59daa1ef1a8e6eaae031bb56243e1fe930a62c4b WHIRLPOOL 233a4bc2103da85f243006ec999923ad5d14ab5e6f8f7cd791d9525760d8fcf72d05b5b7ee8a5251016cb6015453d3a8312b3ab7a44cc102af2cd96999e97547
+MISC ChangeLog-2015 918 SHA256 1796be865cc762f59b6af2489a36f71873b68b53a2687ce40bcf0a361a68e726 SHA512 e5b42f610a282445cd5a454feaeef6e62d103b2bd1667315b7c6a20ae015e1f6ae4adb26aa3bd429774472ef38639f47fc67e5aa26c8a49886dffde08d86c655 WHIRLPOOL 9d88c4d0e6767b4ab88d3e392b0894666a83dd7d6732f10eb6fa0fd699cda4e9af2a4c6029c8eb63bbea07dc4e564432f7c1314650c31633b7f32c02749f751c
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/osgi-core-api/Manifest
new file mode 100644
index 000000000000..1fca3a67f675
--- /dev/null
+++ b/dev-java/osgi-core-api/Manifest
@@ -0,0 +1,6 @@
+DIST osgi.core-5.0.0.jar 418232 SHA256 22fe6c64753a0479fb450bcb740ea5e51747cca2e1aabb8a582d50c02c3eec94 SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3 WHIRLPOOL 9164e08ccd6f079898d0dedd33df1ea1f76f3ed4e65fe9205d17e72e6d8f6e5820fbab7a0bbe9633efa85f9ff4a9045813ea9d193dc110f5b6bd7d67a98b621c
+EBUILD osgi-core-api-5.0.0-r1.ebuild 565 SHA256 5f196f636d26c8faabc3bf915ea9320cda812d5542685e67d11ddd37b9aedd24 SHA512 1560c4e2a2b1bb690f05c51cb0a4cbfc5e5e7651dc09392a7810e799812f1be1f266531c1674d74f2418d46001308480c6ebc37168fbdb0c89c12ccc26924ff0 WHIRLPOOL da140af86f8be8fa40dd791c4c78d794e1ab762a5fc4cd815ae0608d2034ca25fff7f3b7d4d6da59e8085e2b2253f4a51a80bb694b66e714be6f14ad55e3bc33
+EBUILD osgi-core-api-5.0.0.ebuild 562 SHA256 9ddc7fe268f6493659223365b7c93a0f98d5741239450e83a7d4cf92b64d23ef SHA512 1b62a12d5c66b1a67ce1560441745ccc288db9a39c40676f87aa753f387977f0560c624241b546acc4cc2f136449b0cfbc4679b7f18b9c607a41f8bbb7bb1837 WHIRLPOOL 5c2377b7d0c8042df3fbe42140a32b8a46e9cf3c23ce9af4041a3098d4c2e24281f0b94344e08a40462c53e47b1db367c8ecffdb45023e3ff7553e40ba7552c2
+MISC ChangeLog 3577 SHA256 178f9178c218aa1b1cf1a753bf5029cd71c977b2975b85444672ff7ead69d8b1 SHA512 beea871b8508af716123851d788bd491238f63729805d6d48a25b2fc25568e8c8f619dab7926c4ee38e538c486945a508bde0a37859615c66d23f0af5292d541 WHIRLPOOL 3a4f2e73b7ef3d2a61b839fa45e0e1ab2d2f140fb473d66a9e87409874adc61faef82d056be46290915cb22e5f5245795448e4c2331f1961ccfd3e40c2a5e16f
+MISC ChangeLog-2015 1784 SHA256 9c4ea255288bcfc1bc9dd9dae38959b0a835b12a13a65c5579731dc59c4311ab SHA512 23d6906b78e150d1e1d45ea5cbe6094ec30bff55fdeee38df1076a113e67f688baafe7d58372cd8dcff24445e0290ac648e3a28ea1f7feca6c60132d76b06024 WHIRLPOOL f644ab5cef60a92aa790b1df57fb96ba0cb184fca2aa2f582d02defff02b097b8e6dd37d3ed096f91c0ff61764d27d38cb685d4c6406ac457a3827fd0bec9a7c
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..8ab9968af27e
--- /dev/null
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.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 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.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/Manifest b/dev-java/osgi-enterprise-api/Manifest
new file mode 100644
index 000000000000..0a9d5fa3aebb
--- /dev/null
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -0,0 +1,5 @@
+DIST osgi.enterprise-5.0.0.jar 479506 SHA256 2ad77a87fbd53e6e719bccfe4bb71bf9e409c104e7c2b500a9a59859faf85e4f SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144 WHIRLPOOL cfc9117632bcb7cdef03bc484beee374429ea665a049f079d7a649d16a56369e976a9d80469a7db2124d02e00ea2ffe11faecf52623abe66cf0241a9bd12028e
+EBUILD osgi-enterprise-api-5.0.0.ebuild 1045 SHA256 e1d26d0cb932c86a8409e653d4c008636c8d75e0b8c68ee79b7d84de932cae4a SHA512 c72d78a9262839e70109ff7a893864467261e711a66e7343d354078fc30d015cc71d9e933a5bdbb7df19046ef00c9161b65f2d869cbadfaf839a06e14a020041 WHIRLPOOL 5e4445971770474818556577e317c9f92abc43182d2d99be04c1a88756b5e59cc3a2a62411d8f12413c03360885dfb2849f387fdbed07275b615565e36d4d6e3
+MISC ChangeLog 2856 SHA256 23e3280f1c96bcb9f7c43a49ca1f05c52796c053c04c1eded6ac7d39357df43a SHA512 f2788f14f842e16c7ea480875fbf6fcdf0ca41ac0eff1a49cb60a709b1644b2368340c5696d411d0b13e3c93476a7c180793ab7b3130312003cfd95eb3407702 WHIRLPOOL 469591602ba1881b00da779cc657524f8ed1153994f23a314f838676828c1369bec155a442a53caf77fe51498297a8637abca184123d7ca25c5b8dcca2eda692
+MISC ChangeLog-2015 970 SHA256 9252434928c30aaa0bc62021d4db085280bf4852569b1640f0218a10b34184ea SHA512 def55a62d463297ea6b856dfa515130f6a4de444b44f70d29f14cce1e3b2ed6515872bed805e25cd6074ebe3c2f1950ae7120157474c2096ea8f222b3b47f761 WHIRLPOOL dc66548c446f7b9ee21a4fdb05df70da468f840455e43dc4605311331729c4ab0487516248da0f3bf8596a73a2374db3a7d4af4a928bac5031890acece50d735
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/osgi-foundation/Manifest
new file mode 100644
index 000000000000..f43311b985b4
--- /dev/null
+++ b/dev-java/osgi-foundation/Manifest
@@ -0,0 +1,6 @@
+AUX osgi-foundation-1.2.0-build.xml 9886 SHA256 935d373fa3820fad30d6df1356a861b60453a4041f03c59407264b2543f99230 SHA512 5f106bd612a65033e35beb4fb635d07199e10b69e692db5949424ecf7a8baf2bd6af0f35898bd465334356333d82d5c4941ef6ce7ce16c3939f425f4e58c6fcc WHIRLPOOL 617e92e6545a2192846c341cbd917f51d0d05a87c411e450ebe85a04cbd1cc8bfe3f94cadd8e0fb32148539ab241a6ed993deac2274e5c2054a85a6aba3c402c
+DIST osgi-foundation-1.2.0.tar.xz 45176 SHA256 0f460df58caa1335b6eaa238068c725ff8ef823de83bd2ee65534d2757ad058c SHA512 6523dd6b4cd8205aa3359fae4640ff6b17a1944aec6bf23acf0d6e4eb33839a9b9049e8df0c55a4f35013b40b1df2391a53ed68df682a317c35dca504e9b996b WHIRLPOOL c43abe51b4f8ec743e8dc0c073c519c08a1499f1538bd3804c29eafe916385379f66dceb6202e7f061061bdbe082df93502dd051106cfb9896040125acad71b5
+EBUILD osgi-foundation-1.2.0-r1.ebuild 634 SHA256 1fbccfb2593ed4e86fa0d955e6fd4e27bb1bb174ff450c3df7b7b84d9ab9a06e SHA512 1d19329f42a1dd4be69e250c31c7eea04facc05e03d1fe6a96ad5de43eeb2433fc5c82115c2b19818b6a4e063856c15143302fd0546ab8bc5b0ce95b5b2e3f2c WHIRLPOOL 899c774e4920182c3676043a96d2e5cddad91c944db9001e33049a9346b17cf03bbe71efa72d2389c3f2d30330d6e6174eecf61eaa062c7fd352948da91ffcba
+MISC ChangeLog 2534 SHA256 6964036fd6d35eec4473d70e94c627ddca8df69c6e9f8821826dfc4a3039b6bc SHA512 f963a31101e9737a64d70393cc4cb8f0562ef4a90588df729a1835553127a80d6c245bdc46eba03429b841d6e3e72c9a05787993884a219e12899cd00ddc4152 WHIRLPOOL be90a93e81ac186d7ee1991bb1d45b1db5e28631b358e538462c015504dbccbc013f11c0d9f0ee2499a6375d100e55a988b77a0a9640e4b35f2ddaa83360e492
+MISC ChangeLog-2015 1179 SHA256 adc9f67b4c079d12bbe8339f922eff2561d678f1458c29299fda91b7580b8d25 SHA512 bc88cbcc06f26830e6fd29199a92086749800c6f393ba8e21425cf4d736d01bf56f9a6c4672142dcbcfe6aea5bab8943f439e31e9684e88ce5befa58ecf4b683 WHIRLPOOL 3d3e20b0f083db22d2079b1d619185cb503c3167996838e30c1fcc5e2fd512eab3b390fd7a321ea4a83abca1f7daae542568584185747e4a159e5d32294237d6
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/osgi-obr/Manifest
new file mode 100644
index 000000000000..4fc411bfeadb
--- /dev/null
+++ b/dev-java/osgi-obr/Manifest
@@ -0,0 +1,6 @@
+AUX osgi-obr-1.0.2-build.xml 10866 SHA256 f5f51075e1f39da0e5580d918f9cfc55912938e611dcb54031564cf391a040b9 SHA512 4c9fb92e0f5f36dbf02d749b74f58fb15a9ab5617ba84eed3b0a80941e874bdf6b391b7ddf44cbcf62d8cbd9b5b22655db0795e2cf3c9167e9cc15f668417ebd WHIRLPOOL bebf68fb9291900bb57f74d22821b7a588c58d814808f77a1bd303ea77d2b150fb6fde9e25757bfa55e1c1705fc60ed8d2d99e095053fd78dc0d3cbf89d9e371
+DIST org.osgi.service.obr-1.0.2-project.tar.gz 7939 SHA256 2be4c016dd95d5411e13472b5e50ab75039de4384b26ae0d28308511e702c510 SHA512 2af278c6309f8e2fd64c86c5e28a32935ee88e43489b2ca89be94bd2b996acbfcbf93a439f4e3c5f61d5d98df8d0897485982cd749f57d80574a3eb1fbb8ad21 WHIRLPOOL 51d1cc62662eacca789987414258d54909491f853ae84fb95d8bf71ee77f0e50aef4ae19e5004bd0a15a62dc2dbeba34c4caa96f3c7e8ceb8e52e00f5b9b142b
+EBUILD osgi-obr-1.0.2.ebuild 768 SHA256 2faadc309537702e12aa1af85c8bdc34343537120af9f863a3761b9835fe19b3 SHA512 a42ef99f5e739569270a6ad5a4d767517fae926c29e1e62cb81945a4489cd516c5ad749123bff010e13055635cd7bd2785b795396611a2b423d620dce99306f1 WHIRLPOOL f0d1151a59d8858903c387a19e683e38bef052478094ce7bb8ff6014aaacdea71a996fc8126eccc32b40dad6cebf92996cde9fbb66ec975098491e87dbc20d96
+MISC ChangeLog 2652 SHA256 c7e9622bd923ba6ca602d8d0b1ca10f5ee08de278ea3002da9c21fb6e9916701 SHA512 418a55c9c1fe3205d1eca56c8d89447e5087ffa2efa6b763d8b56dc4650de0f0d2d9544f3975aa1acc89131df590d6e002da0a145504c215cb42ea489d69e608 WHIRLPOOL 7e58c9b1c210456de10ea9fcbaa3a6f384c5487630990691beb791a8dcc8c3a1b5e89f40db0d26478e8b9b21cb261b147a001daf73caa08a714c7b6c1af2bf36
+MISC ChangeLog-2015 514 SHA256 fa1d29da5e8cc1117bf873b7c95ad502971c59a881874a122fc42bb244895e12 SHA512 a8632da6156dba13a8ef05f32dc4bf3783c379a3ae1da3f6dc15068ef39c89df4cce1ce43da2f06bcddb5244520ee69c9ae08ec00d0fef0adc202e54f35723b7 WHIRLPOOL 7bc5965bd8002a0139a254f58f04f66c78f84dcd1878447c85827ebd02b2e149f0dec7a530f02d5c3665ee90aaa421e01694b629b41404cd45b1d317f07722bb
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/pat/Manifest
new file mode 100644
index 000000000000..02474c3edbab
--- /dev/null
+++ b/dev-java/pat/Manifest
@@ -0,0 +1,5 @@
+DIST pat-1.5.3.jar 135452 SHA256 6a64747899e0fc82f607e4da7d330d74d3f527c01cd8f2d605bb87c9be3f0367 SHA512 4c62906a9f236351f8de457198e746229c48dc983275a95546815fe5af0083a54e204226abaf71ef01cf407c8be34f8e5594f65b126d45ff3e4ba75630ccdabe WHIRLPOOL c3c7d6f159ff670847e634bc58b808dc41bb66a7e9fa33cd204771c109d3f0972d37c7cbfac468efb55915b747238486adaac7cd4dc3ac51ddaa0a1feb7f4b46
+EBUILD pat-1.5.3-r1.ebuild 602 SHA256 b80a35b39d3e8137cc518d77bfedf6b83473aabd5b94cc783bd58fedf73f18d1 SHA512 03b54b1291f148bb18cd9c812fe0bd8dc428a17a7092e19bba52f82039f02712e366839f9375a4f103e102af0ef9223c4dae22219068ac7fd194820bb6f7ac64 WHIRLPOOL 69dbc3b744675beadd23fea90244852aa62cb84fd92ae0d31726d0a5169fea27a232259fb196960cceaab12fd11bc0f3dc28e12da0612baa4d91050cdf58eaf9
+MISC ChangeLog 2831 SHA256 1b66269d978a78ea874acfd95bde4ab28f516389c8681e43a9be022eb39e96d9 SHA512 d6038bf73e16c4c87220d324013b823a8ad6cc3eb603f7dbe8dc0098beb71b447249b0f61ed0b9dac83d697255513c604ee45bf2bb006e29da63d4d73e899a7d WHIRLPOOL b7257fb47fc082fca93b26436f4a7cdf21b5a46ce56959749cd48d914cf246a7c232e5b0b3ead041f903c6f2b00612f3677f85489ad1efc2abd986525a1bd2bb
+MISC ChangeLog-2015 700 SHA256 b5579c8d90e9d52ec39b2530277ec7fc9740de4d95e2188ead2d5f39d11732ec SHA512 ccec3bd4df89a0ac2a8e1cf3baee1039295940d2a5e95e0cc3c99d4899f986c588c11bd7f12d3b23356a0f5dbc09faa5f91073f5b5288eeca688ec39f35e6bbe WHIRLPOOL 40722c4c0ff55fcd9a5ec0faf6517945be0759d942568f042b8ec74c4660f5a76316e1f5e8ef83d80c1bad84fb2cf35a0364e6866109ecf2a8a461b78c73c633
+MISC metadata.xml 378 SHA256 3ca451a8c74f0f0bba1cad83a07857e92c6ecaaec82c5cbe43be7f2afa0b2517 SHA512 0d49a8cd2b00fbba9c006ceee45537e4c1dcfa5a361df41aa6ea759e00e2949885b38febf3d11664be5a0690e3a6c0a56d0fb13183b219b99a39c4844aa5c408 WHIRLPOOL 17660bdfcdea4e7b86fbc841eb09645c43361dab8466b2e5847640ba7f2c7921b31816d1aee63154898d2e8963d4f3b124c7931a57dcdc5ab62f85b51fe976c4
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..adbf49105f3f
--- /dev/null
+++ b/dev-java/pat/pat-1.5.3-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="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/Manifest b/dev-java/pdf-renderer/Manifest
new file mode 100644
index 000000000000..fe053a82f0b8
--- /dev/null
+++ b/dev-java/pdf-renderer/Manifest
@@ -0,0 +1,7 @@
+DIST PDFRenderer-full-0.9.1.zip 3877379 SHA256 29b194cbcb24edaa35b9d4de2a75d4c68acc0e0fc4c1c0fd2649c78e127e609f SHA512 a678b7f89068890a00317a84557c659b4401450a94d8f7776df652715891a4c41ab138dbfd35093197848635e44ca2e3a114465a6049e746df87ab668ea74a17 WHIRLPOOL 73865bec54d7a10cd9343ea5f332bd0162f85aa4089376688fc046822a961b956caf52a69ab374723540e7ca62a16c86fb348bbd89bdf1fe8da43b88efe5f7c9
+DIST pdf-renderer-1.0.5-sources.jar 1736806 SHA256 5693245c5c2649fa53d4819fa9bc7f0ba5eb01dd4ea0c0b59fc60aae95b93e85 SHA512 086355441df0d59306839de3097d1e557870435dcb4ee878d4e7f3f46352a103ecfc1da4055f107c2c53a61f815f985f3e1e176dc9f99634afd58cf1faca940b WHIRLPOOL a218c9622f3e8c33e6b2478ce7d693aa2288afadfa1afa08cd28006820985a983fa4fd83079aa1dd37c69a645159befbe9083db5f7ef754e3e91ec5dbd8836ea
+EBUILD pdf-renderer-0.9.1.ebuild 775 SHA256 76dda13f611793824399b9d90c35c15d89f507c5eb199a8dd076371950a78538 SHA512 27aa46678a3f31242ca0658a89a1f09bcca494fe77f1c9118224e621c7cefd40384ba6a2aed688e36506f6d354cfb9e15c38f477d26ce0cd7def19792b6bebc3 WHIRLPOOL c2c5bfe83d7021a285ae7bcc470fe5427ab12a7f7effcddeb4e2d77f70d8201c9bb3e38f3cb45b4919830b3895b19b773fc86c25c832a91c9fd240d3a88785ce
+EBUILD pdf-renderer-1.0.5.ebuild 509 SHA256 441efe6049635700b26e3b4ec6aa14afa26ea6fb47a33e7735a15aa9006389e6 SHA512 186043909b93ca9ff85798522a0684e855743041b3a24a8596d651a422f947e176da0c9c550785a1448a3fed12f5646b7a20ee412447cfcf3efe8c839a31cafd WHIRLPOOL ff4ca6a3ee2f52f9ce117223d4410326703f632e6bffbe9feeeaa404ae65c9cb3f27335857ed3dcdaf45cd951c965fe9065d10b84e1153aea962d5cd08d0a28f
+MISC ChangeLog 2647 SHA256 85cae5c74d7cc00e3f12e1848c0400fa645e4d6fc84e76bbcf31eb9c44b36615 SHA512 b2c803ff056ff4147cbcef3386448154adfa8da24e1058d5ba7bf0e7fb49bcf93f24d9539a525b0053645767ce9ad8673515690c83ee919a7c58ccee62686ac4 WHIRLPOOL ff8437e028e6943317f7c7b74af648d40d93fc0accaac44aa2ae5427fc4a5032c2259825cad640c343fe0e2291845e75880664eba10d250f0852d711fee6a0a2
+MISC ChangeLog-2015 2288 SHA256 13f535c5669b666a8cf50bb797f2c062bfbccba1ba2474febd3d5ff14345d3d3 SHA512 bee175c1bfb8839fd58818e816fae619390f699d8cb74ebfd259361490f58de4c510550acc501ca86154fcc392a2b163792b55b5dfce2d2b23f37db0ec0be825 WHIRLPOOL afcbc71a9d47a0cf28f243b66377372d7370f52c1a62e8f3619e985aaeeef69aee32d785e3ae724799ec881417b3eb090f91c76435e393c19b56c6c3b7bbf6f6
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/pdfbox/Manifest
new file mode 100644
index 000000000000..1f8028efad90
--- /dev/null
+++ b/dev-java/pdfbox/Manifest
@@ -0,0 +1,6 @@
+DIST pcfi-2010.08.09.jar 6731455 SHA256 a787fb2a842de7bd5ee4fa13c4808aa6793380dde0219560b50054f6ca25c77c SHA512 067394ddac4a48ba8ac94b03f907d0faf98a91be658689a34eb85fdce49515582426f6a1fa433bfa87ca417ce3a6fa3aa89d89126a36176d8e04f3359c36d10b WHIRLPOOL fa9e9b6b2cc45f749101726c8fb7a4c7719d78448122c465b60696cd5be1a2a27bc65f549429d5a74c79bc74aaed39b3c0a8dfe02ec569303b96faa818410e73
+DIST pdfbox-1.8.11-src.zip 11026359 SHA256 160a2d058325845234eaa6b5ae23535b9226aadb4e570a1a76f7106a00653b1b SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1 WHIRLPOOL 9f43dff9921283d074b332ef08a34b56d58fca3624b6c263029554998b0595bb8815ad91e31c7cdee17a95db0807cb88c579ec1b1f9ab724ded3f50382220880
+EBUILD pdfbox-1.8.11.ebuild 2079 SHA256 4c925b95dd4b0baefee15a0b9c95bad515ba1c1b31a10ce1c7602d032decdef8 SHA512 249af8e8327b87210e5919f7504978a9a258214accf957644e1a7803a7132b75532882a0ab87e19d35a7d7523eb5ecede5396657f55444f7874bda7b6d322ba8 WHIRLPOOL 173d15968bcd5af9ecfdbbdadcb470a26fab4886beae86546032b958ff7ab32dced735337132e76a4c7d05c0d74cd891be582db84ac36bd128ecc0d829420a98
+MISC ChangeLog 4586 SHA256 f7a1274971e6b008539302c19eae138bb4f0e709e6f4e226941866594c9abc47 SHA512 f48f83fa6a5d99a64e1f60050b75344b982a5033c9227e5e74fbe839603d58326bb5bf72f5c6779f423d37e627a052d2476e447fa6d94c8553feefa085f36fe9 WHIRLPOOL 909a6115f9de37855a99cb1f8ae852258c2931ac488a251b22272288ce2a541cb024f7b90b0417d97100463a40c31ee6b83fa9600371fb445efbe14df4454854
+MISC ChangeLog-2015 4168 SHA256 5ebab9072ac629cbd1930de3a1b92161a42ceea2f72bc165b729cfc23acc94bc SHA512 054ce6c1e108d01049837a9b0532962c77f242703ba1aa417ae704ca9103fffd78d51b4ce2827adba2e8ec3e04160d294af3b98700650fea9f69cd7bd19eb933 WHIRLPOOL d4db79232d25edd5077984ea7adcf4eb6312636af02824367748a35f211d91229676397e8ab1e6d08ec21892018eb2827a0c0a473a6f8f113c9cab7f1d5f0e42
+MISC metadata.xml 639 SHA256 cc0c9a782fa9fc462b0bd97953282c4e4e3f161bf2ab5b4d1be57e7b853534e8 SHA512 2850f6439820beeb7cc1da7e97dc7e9cad690425e3b525450920f978b77c6f32c69374276d89f427d33e52e7a83326430382f205ed1ce7a2dcc0c7f68ca1bcd1 WHIRLPOOL 99ebb5d16527958f9c8ba149dcda1e37189581d0d96ee1f3d9102846e49a74033cb23c67ac5a0b927e319cf4b75c55b9aadc75c2f825ecb541090af5316ec46e
diff --git a/dev-java/pdfbox/metadata.xml b/dev-java/pdfbox/metadata.xml
new file mode 100644
index 000000000000..82ef400a70ab
--- /dev/null
+++ b/dev-java/pdfbox/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 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/Manifest b/dev-java/piccolo/Manifest
new file mode 100644
index 000000000000..9fb350dedb69
--- /dev/null
+++ b/dev-java/piccolo/Manifest
@@ -0,0 +1,5 @@
+DIST piccolo-1.04-src.zip 252316 SHA256 75a8f729c98e3b8015fdd044776cf5c4555ddcee6577a72c1ffa63cc17111ade SHA512 fa0809e8d9eb43713144bdf193975c62344269bc1b24d12159c98c98776de4633c95234bbbb023d445e00786903fcd9b49d37053f03d8d6a1e2c84b93668f947 WHIRLPOOL 2568255ab0f69d7852a435444213bc1867c255478ba7eedc6373f2e4ce6625d16dd116693b1027726a3823be716d552221b1f1c4191c0d907b2db92be58dcd79
+EBUILD piccolo-1.04.ebuild 638 SHA256 9031fed5de62e76ddb747966a2612f39356fc489eee859666b6dd35ac06267b1 SHA512 8940b9a289161a4046073d7bb99a25d4d271f760a09c1625642caceeea4df923756f583fbbe14a5ea92bcdd31552b92c470b806aabf2005e2f3a1ec403c9b9c0 WHIRLPOOL 67119be1b04a33e5df702c280937d8ca93259d7527bd61b73cb0deee2816a94061ed521dbb778ddd3484c9a70cc5dd0ee582063d93f9952ade204f2c622de2ea
+MISC ChangeLog 2760 SHA256 41606cfda622b7181cc796e3baaf44afd3344b2ca419f5ae104d652ab8b220ad SHA512 7bb036704b5d717f21849ad3d7412ee74fc8ae951642eda12d91c11277da52e168195178bf9d6d3305fa5bd86c7345e7cc35c69e8c36e8bbceb00d879a5ca97f WHIRLPOOL 71d2924b9731e37c905c9926f182d621e802473d7930e313c27e2c3751b625b263850543050c3c8cfe0241c09fe55e79ad980193471a743d29cbec0fefa07c70
+MISC ChangeLog-2015 661 SHA256 e9392a6195c9fc84ce8b47d3adc68c37fc08c301de3db3068ba2c9fe70e81426 SHA512 f186dcfaad57b037a331e302c20a1a7c23e869a495dac66248d72f59fc0098922405e46306715a7e9edac1505b99d89006db4da05b920fab994660b5f6d145d4 WHIRLPOOL ce058001dae6bb65ca0651e11fa9d8dda0fb30c4bd97a6afe99429364e9f276e6318f4f62fa93376118420adda05e97e98911f38c79137619e787b7167ebb8c9
+MISC metadata.xml 313 SHA256 0361f4c3926aedafe58971f36362aec966b7094d9b5e1fb58cd945651700501a SHA512 31a0f248b18f09266f4a977db5af5bc4d7a5869042d77840f227a4aa1d14abbcafa3668bd0c8eae70e22817582b6d2dce444268f4bf77421a646a4bde165c9ed WHIRLPOOL 64bfd0a4656eacd8a0017a8b3bdbc47eed32b8edb4c9599f199fe895cb2bdbb4e1085b81af4d1b7d1b323dd60ab53f87bcf1bad0c649532148cf1bc5262ade22
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/Manifest b/dev-java/piccolo2d/Manifest
new file mode 100644
index 000000000000..4cf26d258339
--- /dev/null
+++ b/dev-java/piccolo2d/Manifest
@@ -0,0 +1,5 @@
+DIST piccolo2d-3.0.zip 786064 SHA256 acfc9a8b6baf12a22d1307a0fd0dfa8abb160bd1aef7cade63158d65ba939b33 SHA512 c57d0e86ea36e662027559c63c8e300629361849d4526d9271ea1ed3c8d55296ab1fab846c7a475c5d831fc6330052fa897ba8d3f89a196bca752a7ae802aa2a WHIRLPOOL 547ee6e23986f0cee9c5c65819c6da910a1e6931f5961d8e417476b0c62346fbb647b498fd63db28bdfe92248cd3e9f3b856f18741690486ff1ff1d552f4d628
+EBUILD piccolo2d-3.0-r1.ebuild 1112 SHA256 00ad6cdfa3624907850da2f8e96317d1dc5518e8ce4a6ca7edcfce9f2607fdb4 SHA512 2f64269113b317883de2a7ebc5659a479610d53e57ff8384c025dd6062414cda7f977fa533df4adc0d27ee754d0ceb456c4093856304c0a07995ad4d26291e43 WHIRLPOOL 36000e37aad6b53803057f20142f5b96a868098df60ea12c3cd7bae533dc2033a8f707f0ff3478c5bfb6d24612deaf2234f7737f227845ffb8d702836b02a855
+MISC ChangeLog 4369 SHA256 da703e5b586a4399a93af95f4caa1d1fbc5bef3354231a8515916344f94c5325 SHA512 f61ab2ec91d06a1efd17f06472047daec9e5f50862199311be413fc701abeeb2b43404901c1bffcd7eef892cf5d909e1ff474ee4bdba62c927b74bbd8950c3ae WHIRLPOOL 453a02616141f0c9a68bd95ed1599c9e8942afaebb5ef4054108aea1a7440d32bbbaff7ef82bd6160cae92c006c400c338549d6c02a26ab4413bcc8cca689397
+MISC ChangeLog-2015 1524 SHA256 49c8d3dbe8ecbac516d527ea55140e1fbd3805e194ac806be5d6c3cd8c3e1400 SHA512 7f80f2145dad17149f47a08265ae2e9b39ae3ebdc5a866c4a960f25f02cdb510acaf41b5d73074029569f422c4b743410794956ba2cac5d1dfed23513e4394cd WHIRLPOOL 1ea670adbc80d0c255502d9c6b5d9bbe07b775953112db9fe103b439fa8b36f5171f6a225a719c6549da37793106bee17500c791da5ae28d5b687765e183e763
+MISC metadata.xml 379 SHA256 9225acd0699f7f69b8e2f56c785ce3c6c6d55b24583a65c51b81918123d3ff08 SHA512 dd13d25a0d532e7246cdc32b6e058dc9fa3979d4d28e459ecde801b103ca8e40cf9f154208c9ee364379f2f6c6059011269a75d658d68b207e7d013c7d0bdf02 WHIRLPOOL 7242b59a452b9f1269cd6a7c3c2e1e405473b42d14855ae439ba4c5e9ac882910744f6f609ca7ad1031a937c87784c55757c6c69d5c4de78eef0c059b1bcbe00
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/Manifest b/dev-java/picocontainer/Manifest
new file mode 100644
index 000000000000..d09aca555f95
--- /dev/null
+++ b/dev-java/picocontainer/Manifest
@@ -0,0 +1,5 @@
+DIST picocontainer-1.1-src.tar.gz 83564 SHA256 c1463cbaceaa1eae718d271035653a61a19232f3a20e831bd5d016963ef6091e SHA512 adee3e5f46cc8f9a57db1c3e08b4730430daf92c090413ce061576c272b0a1a8bad94281a7a0bd4bdfa8fec8ca051bd15560d0a0fb0ca65cee39ea5ff1b15777 WHIRLPOOL 1ac06f7845c47b7fb238fb83702ccd80f35d5ade3d465e9928e60731d3488df96604f5756d9ea0c61c08b1ec35e3d3e9341ead9aeb50f46f825447d911370244
+EBUILD picocontainer-1.1-r1.ebuild 1218 SHA256 fb2d32e232ef486ffcd6ebb5ea6fb9a129d02f659ba99d5fbcdeb548f91100f2 SHA512 e6b890299abaaae9bfadefa1c60e4ab2b524a005a9dff5ca4cbb338f575068c555015ffac48b7352b0861724afb5f5b14994394bf639739c83dfdace45b2d538 WHIRLPOOL 3352ef404dad4d48f3b27597ff3c4a8607b82a951d3e5b926d4192375f7edcc02017699c357ffc445d20fba692f270db17a36f476baa8d2875b75bd2272ca482
+MISC ChangeLog 2592 SHA256 cc8a7c3cc53e3642c4a2cb6610fea5c699fc2a1a65a794eb97c788825b1f4443 SHA512 70a8948bf818e2f0182fb1e61cb1713618bdd5157814b0972d160ad224bd60f3a0e7b30951bc1bb19e3078bccaefad6aba5817658897cd0136e74aa7354c8a84 WHIRLPOOL 9e74dab813324156c4cc94e74e9b93a32830fd63673ebb4ff10185dddf7e39face20023e1fd4c4bd8ae6a36f76439de271a32e5eb017dd68377799757e082547
+MISC ChangeLog-2015 3994 SHA256 f59751c4c752949d84912a52fde78503de6814973824479bba8ff6430edc5ceb SHA512 a5699bf280f80790e39db787254fce20220914caf47e8e944c353542789a7fc34bafdcaa31ac0e3f4b61c0e851d1314247edf5413551aa28fb0e39091f7b5cc6 WHIRLPOOL c4905a6c0fefed5a5a181611100fa2ca3f701797469bb9dc5fecc93dbbaac95ba1ec8dc49aba34a85a65c2337d5ab19fb0dae0c6e19e70e0a105af09e53e5946
+MISC metadata.xml 628 SHA256 b27ab430265db52ebc01c52c315d208447172e395cf31865f710cb323f563ab5 SHA512 24a5b116cc43b3dbefa809f4ba45c50b08f5a3f8ad2db6a93fa8618e2f9dee6b1a09163d03b036f3ecad5f7f475748fac05c6ab213d61031942b9a0e24ba3cab WHIRLPOOL ffd62a8962c93d5de6ba5418f7dc89a8e3c77b56325861d8d4c0df6577769d00d80ce193269547827aa424bf54610baf4de5775852ff8e41557d128ca0c4ffb1
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..6f655fab8660
--- /dev/null
+++ b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/dev-java/plexus-classworlds/Manifest
new file mode 100644
index 000000000000..376a2676d782
--- /dev/null
+++ b/dev-java/plexus-classworlds/Manifest
@@ -0,0 +1,6 @@
+AUX 2.2.3-build.xml 5712 SHA256 bb369b89cbb27b4e1ff1b7636559341f7c9063a81383a4e6f289ae4a1ac8e540 SHA512 575a086222b4cb9728b36c7a8d9eb64e73438023a0a83b94549962d88aea9591fb847c7d866a830e991bff296d66bf9ebd79c5a93922f040c9d5ce432fbc78cc WHIRLPOOL 31d4a4468039ad0f89c8b214da55f906c904abec19af1d6f56b585715c90f26ba1e0cdd45fcb4846cb1410f76dee6cab7f39713f5ff7bc0796d5c553c6de31ae
+DIST plexus-classworlds-2.2.3.tar.bz2 41744 SHA256 fda8ce2db126e3d21f09103818810795924c7c023132b1a6c59179927242013a SHA512 d5f3d3dac4df569b91ddea9265b14a2459b0ecd4ac3e4547cbac341f50d18238071a7a560d9771a9f8724c59225ea7fa8645ed72c5a00a684519a46a024c3c61 WHIRLPOOL ccd9b9e8f94d39635338169a258b4abb5fff798f32da7166b3d4123ff3aa3ad5ed986618bd6c122b456736cdd207df79a965e258330a2820142208b9e54c490f
+EBUILD plexus-classworlds-2.2.3.ebuild 923 SHA256 9f0d689de292c092b469e678572210dd378c11a3b55e5e3cd83c911021c5322b SHA512 d2e80f0e3f7d9e69a505a7c4b8e73fc244a29aa4d51b7716fa734ad2f4a82842f1c32a5b69dfb82c6aeac8457cdd8c80d4ea8e8ed26b0f35c4ca759c26dc87ff WHIRLPOOL d8599eeb87b79162c11aad9997ac15ae4c65c8dab95b50ab6dcf142bf089a3678501a838b1bc90c40b1bbb90a47079497c25fa1ce436cd76cda856c4d2d7d148
+MISC ChangeLog 2912 SHA256 e7f2e995b7ac2d846e8a1d7362df5d86ea03065e4dce5939fea334d5263aca53 SHA512 0f2c6b3540d6e2ac56431f228d55db54914d8fd7bced98f9ceecf4ec307b457be1b5445af79737549e5cc3a0f356585da1aa7a7e6433551d33f68048699b1987 WHIRLPOOL f114240d7f5f13e59fa2faa98346e2c8b0f109d2b48450a5d72b6b5587c237434b1c766ccfd23795e99c7162930491a4fe968ed9c3eeebab68cdedd0875c1600
+MISC ChangeLog-2015 481 SHA256 b78a18231166a4deb66817a2cfea3e85f39159c6a89b457725669de0020ef5ae SHA512 dccce69eefbca1be5ab519115d5aa865fde7598a5c5568ef601865fe8989c615cc19e74226f69d7bcd1b28a1a75cd478055c778904ab271e750e106fea7bb401 WHIRLPOOL aa3ff2a6e4f521479ac71073e2c6b35bea042a9832b6d048380f8d863d3d92125ef18582f06e56a567cbd1086fdc098f7c425b412beedf496fe96291aa97f364
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/portletapi/Manifest
new file mode 100644
index 000000000000..40f56aac81de
--- /dev/null
+++ b/dev-java/portletapi/Manifest
@@ -0,0 +1,7 @@
+DIST portletapi-1.0.tar.gz 212229 SHA256 bd5e0b0e43286d0cf81d6c8896de39e879c587e19de9b0f8b14e2d86eead9be4 SHA512 e47da8672be075036989774c90d7a512f7354e090eab3685af90295f07c2842d37a858665a5a2aa3b378e0172c65cbc520180f89e4f08673baeaf19105c0661b WHIRLPOOL 1a3f3100d53247fd084df85c2ca464623e03c48bcd654b7ccb45345fc86ed19b63fa243460f0083957791e2dad57aa975147a9082f24e44aaab434ed986cfa53
+DIST portletapi-2.0.jar 124636 SHA256 bdba11e796e1370317e2587523925836edfb59cde438759210718fbe1d72694a SHA512 cf02030850d746b19b85bb3aa204fa7602af47fdda70d5be4c317dea01939abce96915d08186ac876b3081cd8023687e9c4bcef6f4f9a28e8a3456eaa56c8d8f WHIRLPOOL e5892a6dc6407cf1583d6b43c26d7e6a97531ed9cb42e30306638c8acd725e7df09bea744688fa2a3f8a74bd0b189a388cfd1be387fa354184565063f167c457
+EBUILD portletapi-1.0-r1.ebuild 477 SHA256 360f99e86900d75dca13634d3a5380372000198ac74e72ecfed86bab96f59307 SHA512 0c1b36f17562560dc533bbdbe4f5822e1ac0e2488d535abec2c0a441029d5afc51ec3869c55b2615993c0369a01f9e5fdf3270044a3e9c608a50217c997e6821 WHIRLPOOL 4fd2f4dc7633c5629cb3cd65e988768ddf52d1ea7d1a6c53cd6b1cae188216860e10bad9c6962ce1215fc0601c332f89c6747922a9be217e532fee59f3cefad5
+EBUILD portletapi-2.0-r1.ebuild 764 SHA256 bdeb0d4945c0df1d29517156a5bbf67c9a2828f773acb8a6bee0f4d64347ea31 SHA512 9aef2dccde8c2d03f2b1a5f218a9901f7f8d52df1187501fa74c1c18b9517ddcda613114cf56961eb8559ae1c090ceeb99f2e8113b04ddd5f84d15a22481e1a7 WHIRLPOOL 742eeb48713be75b0cb45b27363528e025ee16f270856024b720a7ab2fa86d119f880dd2622e7f296f51d9d9783586c2421a5f662e3f1c5d602197318df893fc
+MISC ChangeLog 4422 SHA256 cbf232e4df6cca10743b9991b90a1a1aadeb449be45166be9e423b4700f7b784 SHA512 d635a865bd73e775e824afa6de2b0b36912c89f16c73e27c2a5a08dd7643b3a39679ff3c79e1b1cf3e64b551ce57b8ab5973bf30d0f345be242ce382152a45d8 WHIRLPOOL 57b70d3a2340d7033f01be517ab08dff0bec132fedf8f820378ca86bdc0fa4bdfa13ce8a499fa645ade31ca26dd003c235dcce1a4fb79da6f802c252a1c5af94
+MISC ChangeLog-2015 1671 SHA256 aee482e71519d0ade52b590165f965f2011bb47d77d20bafe9d376f645b89426 SHA512 67b03ad4ece3da0e6e04c36e0cad09aaf76b2f58f3b404af6fb784efb5ee03dce9553426709321440bc35f25818f12e19c86b984d8c7d16ee25df9c79bdff6c8 WHIRLPOOL 014192ace449bb01b054c729ba80b3d09badff54b7a3e9124a15898b96a4405ab872b22e7fcbfe203a86dbfa30ddb8f7f76fc35ebab7ffa6236277ac69020f9d
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..6e17bbd0b0b6
--- /dev/null
+++ b/dev-java/portletapi/portletapi-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="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 ~x86-fbsd"
+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/Manifest b/dev-java/prefuse/Manifest
new file mode 100644
index 000000000000..d10d4c3651ee
--- /dev/null
+++ b/dev-java/prefuse/Manifest
@@ -0,0 +1,5 @@
+DIST prefuse-beta-20071021.zip 4334966 SHA256 c816d4182c31e23ecb63470ea009a70dfedc76dc8e3a0af8f240867047526b2d SHA512 289386d4614d5f04ac3dbe0bb0be41186540e278b36089a8dfd8f1accd813b229d85a1a36fb05f15d204b77c22e6e41eefa259cff42d8f26680574c6dec7e983 WHIRLPOOL b41d4688bac272756f0860e90e7d66ee72cc078562417698c2c51b1233d10c7b15070f26c38d60648fd4ba796e8530f54a166a89a74271f5e24d59e307efdfe0
+EBUILD prefuse-20071021_beta.ebuild 1084 SHA256 bfa1460355d37e669c8e9519768fd35fedfb84e73dc6e5da408a67b235f52c89 SHA512 95deec2580c5f9a925d9a2e8ed516f794c74c5d89948083e2bc6278e45352f7bc928c20d240630f0d9ace0d7e2ae2af031d9c50c7a21c52d1329866f8ac7cf17 WHIRLPOOL 745a4c70e3e2931f0f94d358bdce8f2bc7ca7cda1e35874de7e389b7b3d3f159cb2a30c67806761e631d1e44b42bd011c116019bc16497cd4d66a8ef0e81aca8
+MISC ChangeLog 2591 SHA256 5cea5b0010439751d7b42703e8e80a18134cddc45de7a080dbe1f15ebeb677e4 SHA512 76d4838ebf21a7767676f4a5a15132b7fcdb8de6bf3afc35af9688ee7b898531cff7125514fe9a44fc8dda6996b4fbdb44206c38ce55e61f8da6ee54fe4e5757 WHIRLPOOL 5592ce9b7ac27285406a0f2828e7b4f8be9fee71141650075dee22328154b6ab037b0c3396a21e4cd98adfe0c4d09baf2e015f2972bbd68e44abae1b6e26718a
+MISC ChangeLog-2015 3296 SHA256 36c477c160475f2c088ba790c29388f78d8d7690a1e5f6db1e62219a934a5789 SHA512 be8b85e9da99c67717c498927bd292f9d3cbd4838560f179ca02f5476f1d6f01bd0242ddd23415cab4a1f281cd45549eddd55b7387c92070fad3f4b77d22430a WHIRLPOOL 6db24a7473836fd9d97e64e4869ea4cd6dc05b971153d9fb02b0efcc66e30bc699f87b0c930d68ec910ea04ada68bd80626aa376036b43f8a5d5f1c09eb47144
+MISC metadata.xml 463 SHA256 648d84b5f513a7705c6df7457be3fba3a8da6786ae45d15e0f04ad2508577c4d SHA512 b3a36d44af155a6e546a49b098a2ceeca3885716c558fec5a4e15dc9f08f0e0dc5dfa4f8c723802d58b3ef3959e6199609eb8ac5cf538cb5435f8c56a19a0a42 WHIRLPOOL f99b95f597ce7b6b412c374e3bb029dcb022d1f903dc246ea1a60d464229b809abf61954d46baf0266357e231444c949564e7af279564834fce562b76d6a73bc
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..b0cee2e06355
--- /dev/null
+++ b/dev-java/prefuse/prefuse-20071021_beta.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 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 ~x86-fbsd"
+
+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/Manifest b/dev-java/proguard/Manifest
new file mode 100644
index 000000000000..b03517be0cae
--- /dev/null
+++ b/dev-java/proguard/Manifest
@@ -0,0 +1,11 @@
+DIST proguard4.5.tar.gz 1827325 SHA256 ccd621c0560817c252d999c66e1c975f307758e928104c14be02ec311e107e4e SHA512 bf1d9c29a4b3e1ba8062632b0f7f97e8f8d3dd2fbfbdc4bbbe98fa76151721fa45b22a1d99890654c557f3a1b87b45038d4882c0cb192b907ec2c65f4e7429fa WHIRLPOOL 0783643bd69f8d972d7a469300fb61f1e06868ee434d1eaf4769bd71d0b9f4d56ef348906857cfdc8b5e20deae6596bb1c7ba9c10cd593b40715e49381fce61d
+DIST proguard4.7.tar.gz 1902321 SHA256 ea2c245257d59957ce8dee9476b9595ac99c0a9c5194d739a3a800af5fac99e7 SHA512 cbf3e5ddb11a37af169cd563ffc04e554b925e99ff4f3797626e286ac40554577f2715050b46f5d1a9599de97cb62090b39798ea0aa006273d91cf8217e9e60b WHIRLPOOL 55723ae601ea02ffa27644977499c3c81b3491534a90506884b3eb68ccab87e8e1191d15fd3729871e4276b65f0f8e24a54a05b2527e27f5f906fef00227dba1
+DIST proguard4.8.tar.gz 1914047 SHA256 84db4aef4235ad312e221ae95485d7848fc468db66699f1b155d89c5036374f6 SHA512 f06c98c784a71fa9e2c137c6bc4c062dfcf2eeaa28653b909b475226cf133fb67821128a3fb6ab0702807cd229330da8b64e810d9078d0b7510083453feffa10 WHIRLPOOL 5372e1100a90a28dd195ae3893adbbf2222e686fead0a8f032777795cb3f0c39c3e4f407bdc8176ac9c42d70c85fade0bae23351595849204cc2753f04a15bb4
+DIST proguard5.2.1.tar.gz 2160584 SHA256 162fb2816212c6a7a195884a01ff826920919e97f57914a5b00bdf7641fc00f6 SHA512 7c2735860d689f9002e40e7a5304eb61f8fb8abc1da36ea62fa32541cdf2e655bb2d27814e2b8137d29a1ab02a57c57961491612ea8e735788fdea719e6239be WHIRLPOOL 841a3a35a47b0252734270ed1da0c5d046a18ca159a446ebbe18405c4508d4bca1c245e1ec89c475aa62f0adc646ee1f99583b2e7943db6ec70568328f5f53f8
+EBUILD proguard-4.5.ebuild 1599 SHA256 9135091ce11ca01005f1c5f20cb6d5b51eabb85939d986171589bef9fe73c713 SHA512 2229c1315356dd711481f5dad218cc87184658caf2cfd79f350c4c22a076567c1e94c990a7100f4c52006e309afdbdf471c98838176ddcd3c8f1d5321cbbbe35 WHIRLPOOL 70f4b18edb06a91966b0340592512ed027e085d67920d38864a179555a11a65e1a9e499d4984aa2a3accbf88653abc81aec5ecf31f747aa54fc0dbe9d5d3cb4c
+EBUILD proguard-4.7.ebuild 1601 SHA256 6a22ec2cf6ed421abcb6512c5448ac4dc4dc24725c7745f04df35d2e578bf65b SHA512 2a4edffb0e4de3322c5bb302d0a3084997ca89f75f49cea897c6ca0c22f7176c5c3653f898ac9bc1a52f6fdbbc59556f9c2ae00d34eb41b3dc7c7ff3f40d192d WHIRLPOOL 9fb7451f0a380f3c7b1f1d4ee96b19b515037e42426ed31adb7d6236b3532d2a6638c023be6f60704191a86d266ba3a06941e1a401cf534e799d26ccbc35fbf6
+EBUILD proguard-4.8.ebuild 1595 SHA256 5212098996eb87c9dd8283fb0221a4d5a8359aaa66e91dfe03990aea90c4ac22 SHA512 cbd5029257f5e2484dfdaa279f13bbfa458084b40c74c8366c02b17da589443d60badf5f4ec8dea947ef8f7ad3236bd1da3bb41b36298a95053690cf366135e6 WHIRLPOOL 8de7d38a9e92cfbb59eda284df519ad995349ce22bb2e78aea58cd69135512a477756791e79f8a943136ca02322742e591bfb71003bcd2171f5cfedf4b1d6253
+EBUILD proguard-5.2.1.ebuild 1592 SHA256 cc3c8cfcb57af81d6a0472e8952f7bc8dee73c2fdcc6653993df3e3e18d3a3f2 SHA512 92b4199a3c734e1a3870d470a59d087421217bc304d07aa686e3e226c0950e8a586b08849126335d393f88b985daca1f1f1e40042d96daff73e80e618b480664 WHIRLPOOL f955417adf858ab8460d292f7fb6924c9fb184049d8506d61ac35e82a7fe01e53791a0ed19843dde6fdf71a9ff7e2395b4524414dc2a5f635e03af6c6575f705
+MISC ChangeLog 2582 SHA256 9809a06dab1bb08d4d3449db0d93fa5d635d85f8b67bbc7d8c3731852134ece9 SHA512 3d02a7097d475ff86012bfd860445934943b3f7b572d25837c5f40c57f56811707e7b3c2e1c17c16da026b82dd55244f20163a63b8569f572b93289f1cd5546d WHIRLPOOL 9cda6278ef6b7cd79426eaa207cea77197579b637080e6bcc53070c1f57e8ae65b7be057356261262944bfe4b3f62cfe49346663e1763f724391a72f55836c18
+MISC ChangeLog-2015 4167 SHA256 e33a27c87d3134ce867a1ecc1833c99dd08652c40c3dc348048e6103d257fae8 SHA512 7b7b401ac14df7582feef32d795ac6ce39d0d7eb6965f5cf5156e8d984246012199bc0249c7d544062fc904e231b349e7da028919e23de18f03a920612238855 WHIRLPOOL 3bbc52c51b7ffe805e1397ef030658faa144f5de357f29589f9f1ddf350ee39b38e1ce143e1e9eb80ff95e7f59814ba5a532b71a2705dd36a102b5ab051d00c2
+MISC metadata.xml 470 SHA256 2dd74426c758b7afa07b10fc4b64bb4a6abf97d2210d8d500a90f0340399ec86 SHA512 41a6f95762fe034432e6c02a20bf37a25f27e8a3edfc8b07d4506115526865e22a594582ca1d7ddc2f22ccc8b1fea59f66edb5209cab5f0c38553dc0f70a96f9 WHIRLPOOL a4cbd6072ac0ae619dbe31e2e66412fe22dd7dc1b3ab623a7e917a10027d4bb129f3f59c350dd5f7fa84d0d248c2a9f86bcd50412c2ba63532968ea1e6f7b0e4
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..5591f87e982d
--- /dev/null
+++ b/dev-java/proguard/proguard-4.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 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 ~x86-fbsd"
+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.7.ebuild b/dev-java/proguard/proguard-4.7.ebuild
new file mode 100644
index 000000000000..439692179911
--- /dev/null
+++ b/dev-java/proguard/proguard-4.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 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 ~x86-fbsd"
+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..5a91d3ffce7d
--- /dev/null
+++ b/dev-java/proguard/proguard-4.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 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 ~x86-fbsd"
+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..c7e674619b0d
--- /dev/null
+++ b/dev-java/proguard/proguard-5.2.1.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
+
+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 ~x86-fbsd"
+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/Manifest b/dev-java/protobuf-java/Manifest
new file mode 100644
index 000000000000..8a1206988c35
--- /dev/null
+++ b/dev-java/protobuf-java/Manifest
@@ -0,0 +1,12 @@
+DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 SHA256 494726c9a6a45a20cd085795a26e4f05627e9b3b1fa5ab21a8b0edc5db8173dc SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b WHIRLPOOL d35dca8e402741e4d30c9c787f5927c7fe7f22619ddb3ca20d302c27fbeb929cecd55cc7e6785b28acb76c89893d2baf7fce3f685a3f186006e1e30a2901ae1b
+DIST protobuf-3.0.2.tar.gz 3917853 SHA256 b700647e11556b643ccddffd1f41d8cb7704ed02090af54cc517d44d912d11c1 SHA512 28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2 WHIRLPOOL 5c70def13be5e61d9405a24fdfc1efe9caee0b63c87f74e12f3d121801ecdc410e142eab80d8d4b49ebfe0c4f3cd13b2d77a17ec303978fec317265991a1f5a8
+DIST protobuf-3.1.0.tar.gz 4051503 SHA256 0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7 SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a WHIRLPOOL b8a0bee9ff549c8da45c2b56b12aafbed5807959cdb11b3888a0f30fd0d6df83a72f3c6ef9e266522754b8901792f65235a6e81a8b0f74cee15d59ecbe6dee68
+DIST protobuf-3.3.0.tar.gz 4336596 SHA256 94c414775f275d876e5e0e4a276527d155ab2d0da45eed6b7734301c330be36e SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636 WHIRLPOOL 4c18120ad784234ebb5308c0f3a2f3814d77f2fc906407f48285f3ba8f84af8e15defa4e7edf2d2e77cf22316df338b3f5bc0c6ca11c7a4fb951105c3aa7d7d4
+DIST protobuf-3.4.1.tar.gz 4490100 SHA256 8e0236242106e680b4f9f576cc44b8cd711e948b20a9fc07769b0a20ceab9cc4 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34 WHIRLPOOL c53dc76155bcfeee11720b08c7d508a35274f2387d6f8a61149565bc72d5539ad598600ad692f01ac7a0ea102d66659f4d516f994c419c56c4420ce69659646b
+EBUILD protobuf-java-3.0.0_beta3_p1.ebuild 2137 SHA256 ff52077a55be635598ffa0244bc6465811047c156cdaa85461946627fd25b030 SHA512 dab6d0ae27b18777a305d0921757acb92727d17fce7d8c17eeff1cc09298f85f3fa6f39bb51bd6a531b462060fecf20d691e417ec33cd181f0bbda665baf8e3b WHIRLPOOL 4d6e2769725050f3227845cd9be9b8b6265719256cad67588310ec8686612c02cc0eaf0300271538a5e89ba56a7877edab0bae94f3305215e466fac420ae4ee8
+EBUILD protobuf-java-3.0.2.ebuild 2150 SHA256 bbdc681d2580ec7e523c17f7e80d265c612dfc379bf098470c657b0e5a7fe356 SHA512 a8b0ad7f72a64e9fe13ff7a8b64f04660f16865c35f6af6c58f81c1b2b13aa5388135685e6a506dc1c0a5edc8c6a8ec6968735d1c8710f3ad6acb8cb2c95286b WHIRLPOOL bd5a27f6a144e2f3e6cbcdc2ad0ba5d5b3fd19e67a71ce2fb9601bfc3c41a369029b185ce5a517d48aa14d07bd030b37aa5e12e4bcbc2f3e3b525cfd4a36dda9
+EBUILD protobuf-java-3.1.0.ebuild 2149 SHA256 814ebdaa7cb1add9a5d4590b2302d52b0961fcd3bea4e38bc8c0ec873b962b71 SHA512 4d01e00433eccc3b3e6dd084775851e54365a1822cac12f3fc324e6112a6b399a42ef057f3d40504a2ac7ea954eaa6e520023c048b36196d46e7073fc98d542b WHIRLPOOL 66596e62f7b2a5bdd8ea14263ac9f89c276a52cb5c2f2b01c4ab09584c7d7d91076e7c7562c605667fde786043d113923583359eab54dae26d7d76b56963d51e
+EBUILD protobuf-java-3.3.0.ebuild 2153 SHA256 1af7de8052fac27212cea0684102933933e62d651b59ac23f0a89a643d9d841e SHA512 1895a3f22215ce2cf3c57fcdc94375f3e18801499ff51ca1374ff2af15b821e8207b3c50267b4f9748aca5ddb85106c087e692120a2bec3e7c315f5ae942ddb2 WHIRLPOOL ad2d936dc040889dc1ef34895e27e9c901cde4f57123647d4dc0e76efa4805abc55dc8b9ec622b741e30570e77e19914828f28bf1e5e81f930b2c07789ea2856
+EBUILD protobuf-java-3.4.1.ebuild 2094 SHA256 2c8617d7f1875595e81982e99a1a73ab16128944a90e05c05d0108e74532a05e SHA512 c2646fff280006c14db9fc3fca89375137723d7fe3001b7a76825963af5e822cadc32e99fe66540f6471f99757800158a04bb0607169f17b970763c33333e38c WHIRLPOOL e349a91906f713c0ab76bfda310bf5d55b8605fbe87d800c90f559d191f364e92283ea281cc57173d054c3effa75de9acdba246bf3fdaec1abe915c9baf52959
+MISC ChangeLog 1584 SHA256 d066f866c7ebdc89f317a03456ad0203af36e258f9f1873f1a955c5ab06d7269 SHA512 01e7f00bc845445595ddd5598b3a8ebb7eb9abc7ee2acdebeb8585312c7bfc8223fc6e1b375d634144f5641cbf6fedb8f6fa60372c4dac081015044ea5e375c2 WHIRLPOOL bc85f5691b76674ca88b3b9c23bfe187a73d61c6278fb23966e10590c0d75ce13fef98cbd90a8dc992e45922953971dc1ac1eae5065966bbe0d56cb5b8aa79fd
+MISC metadata.xml 830 SHA256 175c08bf011a802d7042b94a00f5873d44696f1198dc9790b5402f708a0e7b01 SHA512 c3bb9123a6a8cd46290cfff426b3305970eab0faaccc367526d9f888a590f2cb3e7d628e7bcbbfdf8862761906b037d450a271c8ae5cb2edcd5ab8d572d43cee WHIRLPOOL 12c6481e617017fcec11ba6c79a7da13894d25e0a414f78933aef036e9706d252ebb3504b08fa86c6f4dd9888763de015c9ca4f83cf3edebd93180fd238d7b72
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
new file mode 100644
index 000000000000..7106f60f89b5
--- /dev/null
+++ b/dev-java/protobuf-java/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+<maintainer type='person'>
+	<email>vapier@gentoo.org</email>
+</maintainer>
+<maintainer type='person'>
+	<email>tomboy64@sina.cn</email>
+</maintainer>
+<maintainer type='project'>
+	<email>java@gentoo.org</email>
+	<name>Gentoo Java Project</name>
+</maintainer>
+<maintainer type='project'>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Gentoo Proxy Maintainers Project</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 major 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.0.0_beta3_p1.ebuild b/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
new file mode 100644
index 000000000000..605460511993
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
@@ -0,0 +1,67 @@
+# 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
+
+MY_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10b3"
+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 depend 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-3"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+S="${WORKDIR}/protobuf-${MY_PV}"
+
+src_prepare() {
+	epatch_user
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	pushd "${S}/java" >/dev/null || die
+	einfo "Compiling Java library ..."
+	/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
+		/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.0.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
new file mode 100644
index 000000000000..f774a37f4ff3
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
@@ -0,0 +1,68 @@
+# 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_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+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-3"
+
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${MY_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.1.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
new file mode 100644
index 000000000000..c864a4a94932
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
@@ -0,0 +1,68 @@
+# 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_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/11"
+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-3"
+
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${MY_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.3.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild
new file mode 100644
index 000000000000..31b8a5d0896a
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild
@@ -0,0 +1,68 @@
+# 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_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/13"
+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-${MY_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.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/qdox/Manifest b/dev-java/qdox/Manifest
new file mode 100644
index 000000000000..cdcbdd02f1a7
--- /dev/null
+++ b/dev-java/qdox/Manifest
@@ -0,0 +1,8 @@
+AUX jflex-1.6.1.patch 680 SHA256 aa7fc2512460d7b7b46a026a632ba6452b118acea541556628466aee84bba85f SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081 WHIRLPOOL 50dbc986a3018940934a7da5ab681ec110b41a64a7750dde2a9ef447435fe3b03ee68a7efe7eddaa49f67bba5efe8438bd9b0bc13b92ee08c88056d28f73d790
+DIST qdox-1.12.1.tar.gz 519833 SHA256 6c716c013b27d79eff31de59ab69b734d6744c32548549aaf3e6875915172565 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5 WHIRLPOOL 3e828d430637b18a8c91d273bb26b5ccf26f0f2556639b0af9ed3527eb28bb29de4d2dc8caaf07a0bbadef4001564db67eba63f0440d30e3b83da8f5e209bb41
+DIST qdox-1.6.3-sources.jar 63731 SHA256 7ddb3a75c1ab415c631ae39660679630653bbbed84895e5ed4b4775ce5327846 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965 WHIRLPOOL a57aecd3ccf7537af450dc54da65eb9b49b87b461b5929e36c49f5f40a5344fd84625afda47f6ea2860d65a200b34b7abc751ba377ad4404de4f9ca8a55bc36d
+EBUILD qdox-1.12.1-r1.ebuild 2202 SHA256 060c64921072303cc9d753c6dc2bdc1bf7f9f9cd00b3a947d533fdaf33464b38 SHA512 f1fbaf2e3136f5e96dd5c0721c94116fd66d1e134e4a72fc30d3f354a4ebc7387d7ad90fb58a4e981573cdb43514a68cd9bad892d651c82aebfc290521b7473b WHIRLPOOL abee7525be7afb8bbbbabe508232f00640ec6b068b259f1edb4799b711284c9f055d95d082026169fd342b53f1409685bcdbd2e2c644fc5d4b4719d21619def2
+EBUILD qdox-1.6.3.ebuild 1319 SHA256 d59f8edfa0322b0d1024b9578d97fa8bec7921206c8b896a2b891d8ffc0d0964 SHA512 d3ae1db0c4ccf4df92c3e4bd1fa3175ef8b4a7f0b71dc3e93c5caa604a4dc63d9e1ce40ecbfa008bcf0ffac99a84e21fe7ff02dfc2f33e67490fe7a089fbd8bf WHIRLPOOL 3318a88eaf5ece31ea64ccc1d9b41e789547e09103cbe1e01679ed9f75109929907a41aac99ab8ac66b97686b14a70d57b4653fd5cb302cd1a11dfc182ed3c82
+MISC ChangeLog 4260 SHA256 11dc3dff6207c1498e93ad961d8019e720d7c85327bfc005f556d233e6ca238e SHA512 f184f876676c9fcfb215f923777f461a1c10a055d15a0e93fcdcf22e756fe2e82f81541d25db7b06b5f8ec6707dbbaaaee3ed9603691d0c7051a49a7f5008ea9 WHIRLPOOL 214474cbff0c084591c735e8f43bb29f3eeccf7af0445e2fe701a19abbd905ac9835ff49704e210ab3905e322e04d19d86c170cbe02a21d890223add8e6b1174
+MISC ChangeLog-2015 6331 SHA256 390c056a0f01ce2c54f9a5c5e6077ba703e264c087d82d41c1baf0504a3140d8 SHA512 660417894cd04acd0c38f692ad056fbb01961ae704c79cda9636cce0acb278ab49d1438dfd48eb9bb75ee4bd46958fa84a4e20956566e33aa3f50dc09cde3714 WHIRLPOOL 8f92c9371e5086afae13b7788020857d92c7dcfec3a933c00d4617e2faea78fa1f276256c97c65cbce6ea773bf5bef1b2e29d4f7f5f38f69c24d6e53faf0190f
+MISC metadata.xml 606 SHA256 bfce02d4abed2381720afc4ba72fdac177393e3767581f9f9ced7958fc586a12 SHA512 2c6bbf38e605e7a4f854bed151230d6a61d470238dfa54f8b09334ad66090807f72e371aae55286ec75b6cacf6a7ebac60438c4134a22ef090fb2fb8aead0ee5 WHIRLPOOL 51d45c37b4020aa7b2303597ad773a02e848f54fa41a4525657623ab112df3b149f35213fe3f631ff8f7d763e622dde0526eaf9b9310f045da6cea7df4a62172
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..60d5c915d495
--- /dev/null
+++ b/dev-java/qdox/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>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</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..55d7edd511d1
--- /dev/null
+++ b/dev-java/qdox/qdox-1.12.1-r1.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"
+
+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 ~amd64-fbsd ~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..595e0e62b25a
--- /dev/null
+++ b/dev-java/qdox/qdox-1.6.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/radeox/Manifest
new file mode 100644
index 000000000000..110550f89172
--- /dev/null
+++ b/dev-java/radeox/Manifest
@@ -0,0 +1,5 @@
+DIST radeox-1.0-BETA-2-src.tgz 1720998 SHA256 3a0a38cfd82d84dde518f4347bfd8ad487e4993f7f99dfe5eefe4df7c3497045 SHA512 57e746e2cb3f6a39ab0e7e7171c4c47325712a61235a9622205d5f069cb4f82492ebec8482eb674619c9d58699a501461c863a97119ca674a337af5a331389d2 WHIRLPOOL 08e366dea85f64f36a7628dbf5abc5b62eaea1cfd4a01cdef2ee9258cbc19949051b2dc34c620adbe72dccae74bb352762256aefe08ffbf49692e7acddea0386
+EBUILD radeox-1.0_beta2-r1.ebuild 1097 SHA256 2e680eb136a0560740ac18bb4a4980e2ec66eeb0f5b7320fda8101d1c2800a20 SHA512 d27aa4d3847bd4d6b01cc4aee579328eb2a268b2c7dd80a1b2206e097c0b158604251b46d4a580747f45a42a5857a26cdfc48988455ec78ebbf02dc69f26af78 WHIRLPOOL 93932b277ce725814e162f90c90705f66f0f5cd50bc5d8321b490edf3da2de955e58e986631b5ad93feee3d8d3d78da5d746b4bbeaee09db17b99b7fe784e1ca
+MISC ChangeLog 2975 SHA256 d725c4558eeb12a3e7ce6ca2ea9873288a077ae675225348c47c091c362e56b0 SHA512 946379cc406dc161c0f55d46bca1406d9d1bfd54342ef891a0789797eb476aebb63ecce3b4f87c60eea6c27c189fde00efcdd0f9765dae380789b3baa7b39569 WHIRLPOOL d1e8bbb0838b3489cad3dce90d422b0f68137f08215d6942dca1872a52feed122426de2215d51776b9d02eeb042ba4356815a384432f5e5d0a01629572a3db79
+MISC ChangeLog-2015 2063 SHA256 1c8fa8ed35953eb50791cc893b7ffb5beabbb5ef65aea68eeadb0d0d5e9010ca SHA512 2a08c422e0fa99593bc4944dbc5f97053b7a3062c9d3ba5d1968fbe7bc8af145cb98d187734cd4c098327ccaa2f67e1999afe4f27cbec0e929a71d6ac635c2a8 WHIRLPOOL 7e3940126b72f9b8d7b8c892e825f961ba006f7db378bb703ce77091d6a7ee03b2e1a8e2e8199671ba5dd5d4f5292d23a69d28fe4177c4d92afb460aa60ce400
+MISC metadata.xml 655 SHA256 ddd9cddbc935fc4d312021fcdb5312cf2c4a1364fd4fa24da95b5f1940261b69 SHA512 71964076f4e7cda88973c4f51c28f40df3400be100b322da00f811b68755ec2a4008bc4fb61dde3babdfa6a06d6c55b0e17addd86ee9f40a695c20ff9a4cfe96 WHIRLPOOL 024b26d71d1cfa4162f6b81bd1523b095987f9902e681e311aa61112e8722c792831a8d5dabbefbd5276b4f73329aefec1702404a8d80523fea5b185464de928
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..6c0f069442cd
--- /dev/null
+++ b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/dev-java/rat/Manifest
new file mode 100644
index 000000000000..8978a5452cd1
--- /dev/null
+++ b/dev-java/rat/Manifest
@@ -0,0 +1,5 @@
+DIST apache-rat-core-0.11-sources.jar 124710 SHA256 22fbef361d39b2cb8f36d830afe15d5592bd0ac6fda29b6bbb1314b7bfb5b35d SHA512 1f75e6830bffa7b1a2410aa421a548a4c78db6686c8f940471e38d1bb455201cbfd797be3bb5da027966ee39bb93e7c7b393e3d7ff330866235fafffe1ee6991 WHIRLPOOL 047d337a69eb135c8aeaadf051c1979d257d1442455a56e87b889e3a413c1b5e47c7a4e8053ec9b871b1e98c15eac81ae3cc038b36ba1a7cca530a63a0ec3ee7
+DIST apache-rat-tasks-0.11-sources.jar 17602 SHA256 c2bc9b978eb3cb6fde38165d2eedd4e70a84edbb70df8521e04cb07662aace0f SHA512 54430fd7f8c227fe9fa14bbd44adc1222e8b7de0bbc5a5b861f4df773f5db0fdaf80b6ab327e17cdf57af54447d13f3431e8cdf86728af6f8a84e85c89376565 WHIRLPOOL 55d01e4426c50cadc5db7031eb709cd9669baaf1121de4433458faaa86c882c81e4313c9611c115c86854bfd922449eca33027da031316e8e1fa0867ca946249
+EBUILD rat-0.11.ebuild 1094 SHA256 4cf1580a8849f776d30882c8d72059fe171832aa541522199251441671711985 SHA512 cc665ba195edf8b8b67b9a67e2ed0e677788edc9924336f943621ecdd469caaa5fe1bf521a90fade4aa336dff6bffcb83409565daed4e31ae097a475a22ee837 WHIRLPOOL 35e0279a9408eb887b781a30ec94a0134bedadf433d218df2a5e1ae562d6f6d1a7b82ceea4e528cc2019b431122dac2d08d42e7cf257a862e0f0da84b8214eb1
+MISC ChangeLog 866 SHA256 c1c3a59d8da7b0197b5d6ebb90b6fd52b26025c01bcbd1ca4b2bd9b0097348ec SHA512 3a26542203e1c5c2863784f425c0f594efea260aaf986ce43b884f9f6a478ae594dc2d0ce936911a4936ee4f3c7798ed4b5840713db23f05019cb2032ec9a8e2 WHIRLPOOL 5d14fb90bfae1cc5f7d3f58729bb602816162dff97aa7f1d62a47413e4e907bd1f46cd75f56fce7bc6404a10b807c525240c1bed6550bb02072e24612ea42230
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/reflectasm/Manifest
new file mode 100644
index 000000000000..305f0648fc9d
--- /dev/null
+++ b/dev-java/reflectasm/Manifest
@@ -0,0 +1,7 @@
+DIST reflectasm-1.11.0.zip 273527 SHA256 e57d09f74a28be5df01c920efdee3c503a3020d98c378cdf09184f918c1052d2 SHA512 c012c6c7e859a9056478b15ae679db0597605ef04f95dead8c8a9751c3626d305acbf6b92597945419ef7d43e7a92550030001de25c6f8992483468d8222831a WHIRLPOOL 39f74b73de2148bd3658f80c1f2148e2b714680b3a6a35cde226371162cfb44d97799e9361836c1ab98fd075b8bba2d08ad5b787c7f69815cace789f190ea5b1
+DIST reflectasm-1.11.1.zip 273930 SHA256 cb9549b5f6b8d7f10419e564c3e34e0939284ad1f9ea97def1c9ed56c6ae3bcf SHA512 6b50e7d9d908363c30b2ccecdc2912b04b1a659b258acba2c46be72d8a8c4c58ec37e907a16304a6a3e8539c1dd436b14c999bfc65834b5d5aaa767ef041987b WHIRLPOOL 7e9b7d2dc9b517708b04dda7f517d97f424e3fd362f5a8b36c2922266085dc98b25f872d265a9abb2aef367c11cb6e28fd6c949b9ef20047cee3b446b6abc961
+EBUILD reflectasm-1.11.0.ebuild 643 SHA256 c61a223046bc36bbbe59e9cd7613a81328f8b2616583a9f28629c0c718670d15 SHA512 fc254e74e3a3738bec30c2991e27731e447015624bf72b44801e6d6f612f88c6fb3effda743a2d8244889fbedba4463091d8ced3fa90ac382bb33d6e3b447cc7 WHIRLPOOL b8c4d3db595ee25800a79365720e970344479a9d6d84dd7d0acb7bd7dcfedf7b1eb6b8cc0eaef9c5f2bd16a80d57b1a8d5594f7a0b83c5fb29c5f3fe491d5469
+EBUILD reflectasm-1.11.1.ebuild 646 SHA256 7e077eed47cc34b0a1a19edb8354ada10b395eb8d4b54f2976eb90d2e72f8ca6 SHA512 25fe37ce8ef44ce5d02d6b667406b7efb720fbe32cfeb66df4343f5e752c2be2f7ecae599ce08682e2fa1576e1899c4c9be1da6d88980b9038b4effbef664ccb WHIRLPOOL 2f0f65497188716b5cffd390f896839c9ef7b6b1de3a3ab3b9d5164864da3ea8e04966bbc6db2ef02f2465846f5f4a6fcfd901fb1c7d0339d6d9af8a18452b43
+MISC ChangeLog 3699 SHA256 460e1397fe59f16ccdc274543b12681af53f833d5c54edce9e434da1e01af691 SHA512 ff4255933a066b337e404e0526aabe9815b8646893281db5617c63236bd0f84768e66f190debf5e10a5b826eb701ebc5579940a61ea289ae13f07719d409c10d WHIRLPOOL 0a9cf184ce3fc620623fa84024a8f00629304c2755598f94dee661ad4fb63e1da3d68b32d1d6525ace54ac649dd07fb604a68d788070775cd0b5e8ae0e8be22e
+MISC ChangeLog-2015 816 SHA256 17aa078c587e38f11500be9c40cb639573b611dd794cd3eb9bad3057602a3d42 SHA512 205c60fe56a22eeef325631bcd0bda10e4b9a59d2aa42430967440ddd2ad407b061c4c8fdbc5099eb5a21a84948bf2e0148d3679b213a851f0e18254e9844554 WHIRLPOOL fbe2411070a4df2aad862312a053bd0cf242ea067d1e5a1dbf6344c920ec0120552750473d8be9f465cdab04ad3afd790e4837093850751346c1d93b355a9d5e
+MISC metadata.xml 328 SHA256 f10e1d6ae1766945dd7ac868a675a52ea0a44f82b1b1c9c3b44ab0faac2e7190 SHA512 cad762e1f009e64cded3bea7ecd16deec28b2432c3b5e4e22572710d118052ceccb2d507c288f168b1a0551df9521bf0c52322caaf8e95f7d772897badafa954 WHIRLPOOL a4a80df6a1dd513119321ffd914251a2bef3c4fbc40cc5ac067c9b7d895acbfeae52edd6f1baa207be4aa95f85a2c188e3fa8f4403c013cb5e210236080014d1
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/Manifest b/dev-java/reflections/Manifest
new file mode 100644
index 000000000000..e4cbf386dd6c
--- /dev/null
+++ b/dev-java/reflections/Manifest
@@ -0,0 +1,5 @@
+DIST reflections-0.9.10-sources.jar 53049 SHA256 f091c3849f559d5e698d2b3aff5cdb009dc89d4304575657e3cb50373f6bd2bd SHA512 940b80ed43aa900177e6c3551980eafe10f7ea16a1e5c0d24fc8c1e29f1e0155aae83e24f60af10f9743449ed38d2d3b211f3668fafbd95a6a2cb9c5581f56bf WHIRLPOOL 10cb09e9281ac5f091a2a3ced1757a57a6eeb8eb0875a234e8f0b27bd169181adf8a91d026c8f9056a362e6744b7e4d38d2dfcf2a91fca4343ccdf054468cf9a
+EBUILD reflections-0.9.10-r1.ebuild 710 SHA256 ca03c48b2c0187206c11d099d0910e7164a3c03e88c6bcf4370857e686f5217f SHA512 fe11da9fc5ff0ba4565279056fb80caa5b5c99fb6c02c593d51fcbf38c782d9d15b851650ca058af949c0e9efadd5f432d15180f4822c2f80e3ac845227d29cb WHIRLPOOL b56cc4ed514b879615832b808949772fe249e7ff9dbd8745c4e27b7fb22f0eaa910c31dd5b7220357d951c3dd62224d83714a34c05e9f6576796d9c69a8fa0e9
+MISC ChangeLog 3366 SHA256 30ed6b26e2ce53cf61ce8221b7691431f39b121a82ba02b44f159a6f70cec161 SHA512 e734ee829471153aad4584ac5e67583c2246e84fb3803ffb43c46383ed8898244efbd7d50aca66899d2b34601578a275d439bf0e8d27608ff7545ed952aa0734 WHIRLPOOL 9905d6d29df5c9a51a0258e203416e0a21839ef138d5fbbb00d0c230114951ad16f9fe393dbd52007e49b9da544e0bbffdeaa5798f5b582eb929f8bf12b548e9
+MISC ChangeLog-2015 401 SHA256 343cff45c5013b6dde315a94007615e2d9d1685750f7bd4642d2f85cb140d4a9 SHA512 da266ac9211ac1ef57a1d45c422329a8add095d73de7ea319705aba06d6a2f488565d218128788037caeedfa12eafead9310a705206dd4fe17a22430f0083642 WHIRLPOOL acf26d416ac58531630df7297d3866941277c3474dbde88b48b2d80c35cab9e91abd70d1c0df40145bdf6ae2b1f2edd64763db4f43bf22193eaba68653330219
+MISC metadata.xml 526 SHA256 694e80381f0eeb591044ca54b5460ba149b9b6f1498cf71e3ce5dc20bfca75f7 SHA512 9627a7b711bc69d1175ebcc1cefe5a1241c3de4ca833d6f0778f8264d65a5835d8b9ed8efa7d1e98400299c02772e02e6528acccbd9c7c5bc59f13d530ef2e4a WHIRLPOOL 56c154be89a9e6ae73e4b5e510892ebdd35a89967d9bd85f869ea3e30133913819d8a09bf079663daafd178d653f3fe665179754e5b6ca79ea997ff371895dc5
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/Manifest b/dev-java/relaxng-datatype/Manifest
new file mode 100644
index 000000000000..cd7b0ef0def6
--- /dev/null
+++ b/dev-java/relaxng-datatype/Manifest
@@ -0,0 +1,5 @@
+DIST relaxng-datatype-1.0.zip 74033 SHA256 7be15d1beb7faf895d5a7abff793ba324c4753d319236f40941ee63949f65eb2 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79 WHIRLPOOL 27ddc5d44c7a6f0c792fdfc4db4cd2c38751c4ace170422bd9cb9a528725c07f4ba896b75d165c5a8c6c1e2517403468f6d1425441adee0982ecaf934e15cab1
+EBUILD relaxng-datatype-1.0-r2.ebuild 785 SHA256 45920349e66e3ee85e0b17f0fb8f01be50c6e3bc0443d097cf3d5aa8e6a0abc7 SHA512 c6aa6ccdfe69f31e88de93d8b30d0556c7dc2812152bca26e775bf04ff9fbabb7363878713b6a11be4a276d0500ba708e4bc22293813e28f91eb1bccb5003203 WHIRLPOOL 47d8a2dfd0439de7809e7421fca70349d7d4896e9fcc53a41181dc092fd930302199bff0d7a5c7b11867ae0b15149cb4e74aa374e084f8e58b25ae163c8ab06f
+MISC ChangeLog 2653 SHA256 0e5817eed06c3e21cc7ccd547a1f7d51b1c96ef0067e915956cadfd5153e204b SHA512 e28d9840293ca912fb9f3b3d31915f42872353b8a9ae711eb9463c18ddd26f22e1752ad7e9f2b44428af6c6a2a36282283be281fb816afdfeac19ab5789113da WHIRLPOOL d42789bb816a94702ada4ac7c8f5205362bb12ad0f02127f77c7caf4a79ddc3f3099a38d63acc9faadc5913d0013903fc69581302780c0b3e712cabab79b2716
+MISC ChangeLog-2015 3480 SHA256 91cf74615db0c32d005a8e8daf2867382e989364f1277d8dadafc1b61f1a4b29 SHA512 22c9f7bac40bdc946e471d509b1bee27a2c97853058a4df98abe00c8f178c8e598826c7815ca1c0000abf44b0d03dbe0390d50d37084f0277fcd7060767c5f31 WHIRLPOOL ddd434001d9de6f489c6887f92883732465164a805d6235cb3e6078512ca13683c26da010e159fbf29c8be20f754ddbd2e6dd70a6256eda354cd13fa33695727
+MISC metadata.xml 313 SHA256 0fb939f73e420b9e360fefd165e50da41740e2ec09fd52235917e6e4dab74d90 SHA512 97bbf1c308f5f2436f0c24dac17f5219cc71a8e9882037f9bf59689f75524521ea42c63989491779ca59fd2878e2c478779ed6945fcf2eab661f28be3d9e2a4b WHIRLPOOL 3ff4c973ce84ef2074cc300217dd8f1f0676038c711f576e8facce7986ba26929a08f326c63910ac09b1d3dd15a10bf0df68ce3da89b8ffc405270086ac3d820
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..40d14fb69f17
--- /dev/null
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.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"
+
+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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/relaxngcc/Manifest
new file mode 100644
index 000000000000..3608ace6a8de
--- /dev/null
+++ b/dev-java/relaxngcc/Manifest
@@ -0,0 +1,8 @@
+AUX 1.12-fix-jdk-1.7-enum.patch 925 SHA256 df6984bae7a4c0e16ccef300c2a94f4893615edd78a6104d880718250328e41a SHA512 5a459bdd6d4d9f173f4e0cd7f23476ef5655f5918cc291eda43c0b847ad190f81d10db55bb76126804dc84efe5122335c11849577130aae09c5e73ca801c5a40 WHIRLPOOL 48e6c98923fd96ab05aef5af7957c090723f607f732c16c2d1ad673e550b32c49130846bb541ed8f19eacf7618f6ed3fdb467f3fc329ff2d24e2675f98762936
+AUX build.xml-1.12-r1 1052 SHA256 bf13c856573e64f28caf5890f68823b5b849db7d353ae429ca99fd338da17312 SHA512 cd0412dd263ac0e933216bdb99cdb3f45e0ff58f0c836d62a6bbaf57a3cc984980dd76ec9c7791c8719cdb56e80991ab4a5f716919570321169cfeeb8b191854 WHIRLPOOL 166fca0347bde307ae5dea8dbf105c515c30a67259b2bafafd4809db4f34ff56ba345b7203bcba70de965d62a9d9854efcb673118e486cd808d957a6d421cefa
+AUX relaxngcc-1.12-SwitchBlockInfo.java.patch 509 SHA256 84b3de478d3716442bee497350dc0223431282500416de44e1b1cd7404d1649a SHA512 d9e8fbf64b588a66a44af5a768adad5099f970a8c705898928a73704e6e809f5ba7a8d851bf4ed356dc47c0b0a0a4674583daf87e0271a7edf171e529886f815 WHIRLPOOL dfa36e2357cefe37cdd466f279cfb373a67ff7e0061e46339dba5f35b5e8413fce2053f0f8ff93f6d263c46387458add11384ffaf8720b4654610dfe837cd091
+DIST relaxngcc-20031218.zip 2162036 SHA256 b6a3e797e8a4d6389ecfca5d7c0218ca22966b893e8fcf5a9b6cd7a417d27f30 SHA512 df797243c095e79e9018d8f17deb3963631128718428ff325af6910e285e649f27c270b63101f2b5833ddde23814c54a662397000f433f8a32cea30917760d4b WHIRLPOOL e476fec6c65775e2552a60856ee0e32ada9df0301580f1f8e9deb604532dbbe9ca7c165c72d69226930d84f0b5529ac9a6c6f790d7dcc35400686a31848eed92
+EBUILD relaxngcc-1.12-r3.ebuild 1394 SHA256 506096024ba51899c8cc4dee49a7f6562020ed9ba17b599048c2a419184b699a SHA512 adc8a2c10004ee9343fa325ccfbf85896fddbf5abbb8c5b820b963445895f68dae80d693aa91240656a5ab3ad0dc1d8a5ef08434f4fd6ad1ac1f2761e96a29b7 WHIRLPOOL bef02b9d42af201498474dfbb5a2133a77753cdea6c4673f8ce9c6088e6663fc6af59e0589461750e30f7226aac03b6ce715ee947132e9342d9c242c220dca32
+MISC ChangeLog 3599 SHA256 88d9594797ee8377252dc350783e093743bfbb519b2548e4b4328584f29c8917 SHA512 b05cac79f0c76befd6105afcb3510587bb82849d26fe370888981bcf3e727533e794f6f9c57329ed1d25ccc33d9c1dd99c72ccf8c6d428a6ec0ad2c958a98065 WHIRLPOOL e8e767f1bd3f8152894b79229132f77cb10527ec1eb0b9df1f31150ba869ef4fb20e38b8632ef47b333554bacb7447e9759d5eba56b602d2bf63ae8bfa71620d
+MISC ChangeLog-2015 2783 SHA256 d31e7e319a5f8bf64a74310c39db0ee4b900c45943a88e19686478ec4cc9d04f SHA512 1c605bcd1a45e586c6cca08852e30d7b5e6eb95603e8f5bd2b2478b4f93fee08717d1a119b61283f2781c0c071be3de514ca0269ec7e38253e4e508cdf6090e5 WHIRLPOOL b706c6ee022288c3327a2f807cdac2aae8525ab64b80727d0855bcf86f4b67cc56f30a245bdb240740e41b6d2b867f03e710aab0c121a4c545e62903d449c035
+MISC metadata.xml 315 SHA256 408b598349cf61b6a1a1ee1f9a4de689afef9b1ddc5db8b9a99e3afaf514a873 SHA512 3fd8f24dacd7aae0d04568ce951c8d9559e0c25dc52f7713136d3f4398c14873ff8420e0d12f858d3006397e9539a7278a21ec85cd549ee1aad516063738caa3 WHIRLPOOL 6190b801519a460356dc6cee7c0ca934a7610c0e18a7dca1c1e44de6988fe759ba2b11c160680c6ace1908f49a1935e4e9c12e2fd180d3a7a6120f14ac7332a3
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..dacdd1feb4fb
--- /dev/null
+++ b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
@@ -0,0 +1,73 @@
+# 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
+
+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 ~x86-fbsd"
+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/Manifest b/dev-java/resin-servlet-api/Manifest
new file mode 100644
index 000000000000..cec62663fe75
--- /dev/null
+++ b/dev-java/resin-servlet-api/Manifest
@@ -0,0 +1,17 @@
+DIST resin-3.0.25-src.zip 10690692 SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc SHA512 f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057 WHIRLPOOL a05b431e3fc5c0cf2309681689e4a228b6234254898aec0927e7fd2ecb46ff149166b8097d3878877e08b2937f70e82d1aabc70143d2b4c45f2abc640a47a4ba
+DIST resin-3.1.12-src.zip 13579367 SHA256 b2e5b3573a369944c243ebc1b6c6439a681d52efb9416af1177a263234fbea95 SHA512 5d348482175962e4e0401437fa69ce3c7569e514ab7b02ef236937686cfb5185b5cef2deef831d510cf458a41d786457041f579d551c9f1f1aab49829015ff6f WHIRLPOOL e8210528c025bfe7a75279cea4e346a3b948c121d763fe6ef0e6c5cd90b2b476957abe2616bb79687987c0afa4016178d3bcf5e2e910ffab4736399288fda13c
+DIST resin-4.0.26-src.zip 17879008 SHA256 0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e SHA512 aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512 WHIRLPOOL a536b28cad14219ce5c8aaa791a859d21539176b6f729072483e6278fa9b45de2bb367d6696225c1bafe0148c86c3bb0e46ec81595222160aa742ffdf9d5674c
+DIST resin-4.0.27-src.zip 17990178 SHA256 33f5bd76b88a1009de108cef40a522186b5a3f250de7e9856fe50a7715344665 SHA512 ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53 WHIRLPOOL 6ef3ea21bacf7409676d4114cebe0466aa613ca71d54612197573e899891762ada1fd14510458b3407d56ef6f61539ee99db5bf239e2b88e9a3ab033568942aa
+DIST resin-4.0.44-src.zip 40342346 SHA256 dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512 bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8 WHIRLPOOL bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa
+DIST resin-4.0.46-src.zip 40400255 SHA256 e762506c432dc12f5100903993220b7ace6ff98ce1ed2c17a53737d04f47ebcf SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f WHIRLPOOL a3d12e09e2596a1e705d4cd1b1870e411080ca6371411574e7830d48ec0058463944fded005e94fc929a0635403cba27d78fc379bf1f222b0e953828ae280238
+DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035 WHIRLPOOL ea9eb10d1359d898021a781bdf947811d3500092a3489759202251713b776b5c2c20bfde112be5a108358cb470f0c3aa4cc2a4d54695c406fc2b3c3d18ad7a54
+DIST resin-gentoo-patches-3.1.12.tar.bz2 1618 SHA256 de44915936848374adb975ca3f0dca3560d75c64b385b451e95e6813a3405ffd SHA512 12dfd508765c46a9c9ca782e1b63def2989a3d2e025b3e8a7b15e5b389976aeba898e1659044a737156d953c0eaca9a4a461a9c71dc601aaaeddac8cd5da03ea WHIRLPOOL 43785f6d225f74626c6a769e4eedf0873aa794f02780defbe0815d77771934646d6f849302ab829a81cf4babad0acad2f7fc4458f1d80ba0c3fbdd9292a0f90b
+EBUILD resin-servlet-api-3.0.25.ebuild 865 SHA256 0ec24fe38a0afa302d5e1329e575f92edb02d224eb029b47b5a6663c093d3019 SHA512 83efdc313c63c98eb07c8a2ef130f69aff349b4e39619c08c89816933f4ee9d6aff18f8df6b97734e28069d4b36c2fdc705fedce77ef141aa3811c8bdc61743f WHIRLPOOL 574836e06bcad0d4306fddf58dd6685bc145b65e9205d42d3aa7f2fa8e838aa1eec86d931dda11a1604422113542c51427d2ae862e023410c2e85561d6b84ef2
+EBUILD resin-servlet-api-3.1.12.ebuild 1113 SHA256 d722899e375e5c9857960f592df05de6a0378d83c8c27d6161b192b148f58109 SHA512 9f7237ab1f29c1d69c7e2a9675f5bc36329fba26ecf91f6541e47af4b9c7a7ef535dafc8b212254dc779eb4e314481a023c1548a15200033f4ba8e7435fae418 WHIRLPOOL 8ade0eb1bb84fdbe1042a1e8bf89c8c67bfb63f68e6400ecd17048b44af8a34bbe54ad1d5ff5e77f100597f223b470727d8e2b3573d72730a2bf5761b6653c60
+EBUILD resin-servlet-api-4.0.26.ebuild 1149 SHA256 e8053624c2261573de45bebc0d48e2772a2dd15669c9544f6095b03369be34af SHA512 65d3dfdf04d29209e444731386deabb71d3ede67e9fed1dbc4fef04fed06adc7735f502046d21d8b765ba446f1cdd24d205f6886296a06d16482de777b94b59f WHIRLPOOL 98e3c67d9d53d6bdfe0829f1a972d385cf7caf6ea76b5ef2c69ac69d7e55dfb64dad67a4b3be0a0d78d65e1c3933f8f76f7d8f8a23651d3f92d179da028811de
+EBUILD resin-servlet-api-4.0.27.ebuild 1140 SHA256 c3ca831c248c02f4da38bb34cd77a3bc83ecca89bdff615b40cececd5379477a SHA512 a78f61f8f57a2de6c0a39fa48d1131f5436eb40003d13f888514de7ddc24c506729d69695861f1b37b21fded24f87dd2182787ff180fc059462846d07d73a73d WHIRLPOOL 526f2fbcebb0fe0986aa50df1fbcbaca62652252183a8babf1137d3f102ccbe94c37972ac416f5f3950e0181128179b7ea155ed7b3f529973879e6419278b407
+EBUILD resin-servlet-api-4.0.44.ebuild 1140 SHA256 380add46b38b516917aabede8e0764be673b3aa9289bac800764a3819adf945c SHA512 ef3ca9ae3752deea865286cce0977e91fc31d73edf2e09f5cef8acfcd710d00a7884d77d32fd7545f74822c15256084fb10a9bb9667b4c9e1409fe98ee698f1a WHIRLPOOL d65384e00f4b3b74649cb5a6ac492d5a51b4215231feeea54ba46d62906beeb7727f038ebc314293a6ceced2af6acf8add1ffb7f32707e3b8b73f01247ffc4c7
+EBUILD resin-servlet-api-4.0.46.ebuild 1140 SHA256 380add46b38b516917aabede8e0764be673b3aa9289bac800764a3819adf945c SHA512 ef3ca9ae3752deea865286cce0977e91fc31d73edf2e09f5cef8acfcd710d00a7884d77d32fd7545f74822c15256084fb10a9bb9667b4c9e1409fe98ee698f1a WHIRLPOOL d65384e00f4b3b74649cb5a6ac492d5a51b4215231feeea54ba46d62906beeb7727f038ebc314293a6ceced2af6acf8add1ffb7f32707e3b8b73f01247ffc4c7
+MISC ChangeLog 4372 SHA256 f08f024dcebac5df7f70e0efb2a77ed1de475e6762251baa568de5f4579239f6 SHA512 b51d45715486291323658bf456b097d06dffa9e139cb92e7ca5ab47373d8b38dd1cd1ce5370fc8a1b249b3336273ef017648850a6b5a4aaa3bcfee4362aa3def WHIRLPOOL f6b61f57d7e726df45194511f90db09565cb8f31d1a0c5550007ed9c97d17552291a7c2d9b5767a676b53f54ff86b65a0cbf16e2eebcd20ecbf27e4af24b1686
+MISC ChangeLog-2015 10782 SHA256 030d66e993d9d3e5e229af58a0f32637e191bd53cfe19a60a8f3ddb9f0ec05e7 SHA512 519cbb0e42fc4d2bf820bba1a640ddc538c733405c056723db4a6615c6127d4ac66c351b41743662283492fc97f6ac3f6f1e1f076dc282ca96bafd499375ee37 WHIRLPOOL bca6449284d5343df1460c8bb78e11208c78db85e182ac56e98896f6082e8e03f4250acf5c3dd062d081995a8e718ce13c8e7d2475176f07878e21e17c4780de
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..a876cc7bf73c
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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..6397acb28a97
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 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 ~x86-fbsd"
+
+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.26.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
new file mode 100644
index 000000000000..96588c8a848a
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 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 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 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/resin-${PV}"
+
+src_unpack() {
+	unpack ${A}
+
+	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.27.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
new file mode 100644
index 000000000000..a065f54990a3
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.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="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 ~x86-fbsd"
+
+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.44.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
new file mode 100644
index 000000000000..3b3bcabcd85d
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.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="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 ~x86-fbsd"
+
+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..3b3bcabcd85d
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.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="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 ~x86-fbsd"
+
+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/Manifest b/dev-java/rhino/Manifest
new file mode 100644
index 000000000000..ca46b351ba55
--- /dev/null
+++ b/dev-java/rhino/Manifest
@@ -0,0 +1,6 @@
+AUX rhino-1.7.7-testsrc-build.xml.patch 1414 SHA256 b47039364188c26900d838ed4bd5f6887ca5059f9d35eab87d60f798675c30a4 SHA512 f7fa8d77a584399e6049414ed46b138c14f984148b6dda6e20e376c4312295728de24f31331d20c2b1dc62f81c8d9bd8732227ad64fcf430f2ba721b8de490fe WHIRLPOOL 15754728010b5db04e11bbc743c4eb0bca07214a19b33ed44d40747a1017549c5a18d4b16fe9f301e0d69044ec3b0d3aeb77fcab1d27bd10966d69db79e4cbdd
+DIST Rhino1_7_7_RELEASE.zip 6059127 SHA256 0ef505aee093c690025c4484ce108b6e735e05baa3181bb56fdec4cb6b8b0107 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e WHIRLPOOL 0f54840077e46a6ac31e23784b3c13881a774356df14274fc9ffdf93eb3d7b92e8666630d8e51494931819a609a971bb6744cf961c2c168bb94b4e42d3eb0896
+EBUILD rhino-1.7.7-r1.ebuild 2052 SHA256 ba00e8aa2dbbd09baeef22dbc97bd58fb21a39b967d5e502ba3c66df326a651b SHA512 0a4e9beb1503b80e8ee801ced0e4a94f94a871179f19ee7c6a7242e02a097336a2a13ba798e182bb43fb4beaa727d3e05de6d18734490bb604e7855938d975bd WHIRLPOOL 27e777000c73687421d4ca710ce3c9e4473bfabfa5e02444da22242da0b6bca229df531e8c2ff0c669ea5cb80ce2cdc75c45c94030d8d23ca567b54d9cf88a44
+MISC ChangeLog 4135 SHA256 22c5316a23ead58fb6a1e08c878d5b84d8c8bece0cdc24dddb2026773a2de53d SHA512 8d603be3a47bc09897f2d1472071dffae911ec6aeff40afb618f2939959f8a04543ac4d16a5c13d715e4ddb1c8b1ca105cafe56fb6a97bdd18f0d538f52aff43 WHIRLPOOL 00e43216b21acf4eb35268bb19c273cbb86c81afba0fd91002f66c18de7701b8ffaed0d4067dc84ee26aeff895cf3d4b35fcca67b9a3a5cb60dd27c3b73a4b0c
+MISC ChangeLog-2015 10767 SHA256 d1c9c9c97319b6621a2c209537463a7f68cc95f37ef4b640e24a1122ac76e269 SHA512 0f6f373a9f3b7a089d55b79d2d661e6402d82dcb88c0ccbee8ca11a72ce0427b1e349c3c5240817aa8f3c13f330096e0b5d36026973ec23fb397865bf386b7d0 WHIRLPOOL cb483f529aca0b523ab1d6f777c2525d52c1f0bc665ea99563546606da8f44963f1eb849e7de463703b87ad14f5901806b5f39c85afdf0fa8df8f02cabd90068
+MISC metadata.xml 509 SHA256 4ae22fcf5140a3e7426aa4bfe2e06508c67df386fb9d38451715b6b8ff8b83a1 SHA512 73d3c55306da2299fb537dda46cd2551db5913d130bf069ef24b5481a233f84a164338aa31b37dbbcd351d4de2d90d7411d93010d531815977ebed73646d41cd WHIRLPOOL 27bee6bcc842034c0e37e4f40d62896c7e07e183eb192678ded27a2efe893445eb2dba7c8353a96f02288bf9d24b985365f71a69141c2420b2151d6ab3983a72
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/Manifest b/dev-java/rngom/Manifest
new file mode 100644
index 000000000000..4bdc36133ff0
--- /dev/null
+++ b/dev-java/rngom/Manifest
@@ -0,0 +1,5 @@
+DIST rngom-20100718.jar 196334 SHA256 e0744ec61d2a8ede4004e520f54747f828d812c2907c1b2dc0eb4f93070f3dc9 SHA512 af634a3b30b726c9567bb2108dc9c041a60e2de4b395bf1efcca43060d22927896d10bf69b852a3e70b331659803f4dba074392f4be7de6cbdbc210ce90e25cb WHIRLPOOL 18a80fbe4d0f0d16c4bfaf12b6c5e228ffdad0848968a682b00ba956a2ae37e7fb03dae2ad17dae34e92564f667097ade26756f55757cf82ad1a78cf0ab62fa7
+EBUILD rngom-20100718-r1.ebuild 1272 SHA256 0b54e79f72c614c9d45ad3af0858526f823c94b53b108f17a2dd4774bc40eea1 SHA512 d7cb4860af50e9e1c2b0ddb6b47beda964e04f1122035d64a3170a1328025d4298c76eab4ccbdb3142a0350b605cc4b2bcde507dabe947e5adee13c259e88488 WHIRLPOOL 98d877a5c7817f5620fd781eb930ab4dd550175457089bb9a345193d83c8cc19b421288eec44ffada1ad800484365f3e94eba86ad16321b7985dd6c2ebdd9962
+MISC ChangeLog 3504 SHA256 6ff371ba8bd9b818cf94988ac8424591ab232ea683a4b0984021686a30ac0740 SHA512 7ce68dce0efce35881a3ed3238c4a4a7b26199da6a2e7e290c412fed18720d18483165147b0be91ebfcb288c8c5d204b44c30e9c2ec83253c51f82e276bdbd34 WHIRLPOOL ecb9ed998aba19fd61613a2550a6bc6caf5dd99e484c28c2f104219147dedde0251e2187fc4f5e751fdba882bb124f3c0b7f58c079f469a7107411b1e31a072c
+MISC ChangeLog-2015 1394 SHA256 9e0e54dc90d3d1a18dc6c4fb40e0d8baac9c1625fa886704443c6be08ff115b0 SHA512 1fc110eb1a111a82a93f91fb1dd168d4de554606f94ce2d8f4136ce335f403f359142752741a87f8ab8e3a32d54725b954360802cb4c2d20ed72522967b4fb08 WHIRLPOOL 40fad44a31b20f112fc741341c16f28ee7a29bc6fba587a6149ef511940235aa94c55c704308a797d8b64f5983488bcfbc4b181a773f3164a340c4fe73827206
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/rome/Manifest
new file mode 100644
index 000000000000..dcd4514d5263
--- /dev/null
+++ b/dev-java/rome/Manifest
@@ -0,0 +1,6 @@
+AUX rome-0.9-build.xml-test-upstream.patch 527 SHA256 fc1771d6487d4f37c0f60ac33f50f6d9caa6a4e1b8db82a457e2f9fe1f6e40dd SHA512 bdbe4232e443228cb64be2f108ec021a9e8654e28c1c9a50f2bf453cb62d090cbfa47df1a0df14e01780c8b8c460331b45a4a974e121ac3d4ee93b82beca0781 WHIRLPOOL 0f1408c68c085b59269b659f4f7e9e642243c5bb1441d1089459d149f9975527a3eb11326f392e84f8299d65cdef17452ee380736fabc9bfeba0778bd840d452
+DIST rome-0.9.zip 248755 SHA256 c8e8674de5b204d02ce8b5e33fa5f848f23ee4e4746c60ebc7ccf52a1ac97a4f SHA512 d4bc9945e2b77bdc38eca609ec353379c279cd700d8d85220a1723d1b019da2c18bd93ff98b062e519e7d87f2d2b6853f373fc7178cec0f83b34af45fce5f3ff WHIRLPOOL 69554087947fec155478d5d8cd820976a878d1055dfbeebcb567893c2e943ae89f247dd578ad94d6c88cba2ee8d3faa7fac05556790157f7e2e95ed1cd752404
+EBUILD rome-0.9-r3.ebuild 956 SHA256 027055af4350d868c84ab9bc34394457c7692c7b1fe34ab90ea54a33aa127bc0 SHA512 438b68bab99ecf29b493e74201017f9f4e4a5ce3747c86f7bf737b9481e68237192366bad2785ac14b85e2ac558a63662e43c5f26d96b9eafc6d777374fdf637 WHIRLPOOL b04c5adcbfdb97835ec268a137c386e107f42a4bb12118548e4117dd003d671e580b7162d4961f17a885bf5e10dc8b9f5ad90059b76233c82ad3b2a4d2f48cce
+MISC ChangeLog 3760 SHA256 024b3589adbc51aaf7d1990111bd637a1cb2632757ba6d3c8d330457232a5713 SHA512 31d0ce7c2e63c93069e88eca5949a5811596a20cdfb185caf78c8ebe537216ae6462e5268dceb89ab81eb0affed24159c1c498994b0d7081cd482acb6464e894 WHIRLPOOL 912d5cf7e70fe62aea2877991cc761d6f75b7eda0702178bf45f20d95c4ae627645ac0fa63b22df8e56da4c39b1ae0563b6e0c033de5448cea1bb81af6efdec2
+MISC ChangeLog-2015 1128 SHA256 e439ed6b0bd626e1025605e80881ef51389a08588f34ddde75ad0fb1f0460324 SHA512 c871d8c719b06cfa0437f93a2adc13a9c0a591d0650e309768532134a4d07d8343784f14422d501f00e9796126ded91629ce5d0a126a5b1b1d0a68200ea19095 WHIRLPOOL 35d0cb452d7adc2ddfea734ff854947279c4ec2c21c8621ade2d79ae06e036f114ddfab4da7f4e79d1fd35b537b2c0e8e1e9b185072380a1394015cee4d04e91
+MISC metadata.xml 214 SHA256 8e5c772f056babed2e7e25acc12ab79a32dc6a670548468aab55a9e1a8e5b848 SHA512 d2b6ecfbbd79440de1909d9f195e5d4a6f9886b685ac1e6d7a1db39b8925b29942fac2998cde06040c921f2cc9ef2cbfbf836b60e191d894b00f75628476b1f7 WHIRLPOOL a6545983d0a39cfcee27a2628897a5a59ee0daefe93ccb53968cbf386db1dda3b41851ed1ba61406ae5e5c17cf94b6f88a5b479a838064c99406a93f91ca7628
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/Manifest b/dev-java/rundoc/Manifest
new file mode 100644
index 000000000000..a70352d1183d
--- /dev/null
+++ b/dev-java/rundoc/Manifest
@@ -0,0 +1,5 @@
+DIST rundoc-0.11.zip 47013 SHA256 54cfc962032578d07ffc0a057f1659a8f8585b6da8935288475842f1bed1d647 SHA512 d16aef5455ac2c6bbae16e4a12df798eca88e9c15225af8dc28edfa0b88b73ca6119ca22c6c4319665fef1203b986f1401029318fb094fe30fe985497fb1c269 WHIRLPOOL 993146a53478d151689a01c2ffedcc81b2ec8649b5914804999c8d621f10b1a5f8d80634e861b214e065b90ab84b4a8a617ce76844a5b5896035f12f4a698c68
+EBUILD rundoc-0.11-r1.ebuild 724 SHA256 f8395c0162564d21ec0a6b78cc012ff4d8d80ff992e6ef1b67720747e8bc1f96 SHA512 60f602e0be62c6133d6fc8f509827bf0edb5778c7dcc8eea1c9ed4ebf2f88f23c7561e26912e54e9edbf27a89801ceeca2a9090b1042392a575e89c0f66fa818 WHIRLPOOL f0e4f651ab5e187d333eef92b0d0d236e54ecad6891774423c995111b1a5ad3701ba385b53e61d858195fd90709dcf882a457b2b5d1a3666cbd2d069a94ed859
+MISC ChangeLog 3086 SHA256 2ebe75349eed4fdbf60505125043d31b0dcda3b5c03d1d19cb2a6a1b2ead6899 SHA512 9c9699e9944c09f036445b6dc84452ec87b938534d6911e77d159905e8352ca14950850146955e0d95fb0c37329c0f4d794fceac8d23e93f08f746118c69ca1b WHIRLPOOL d67c09f7add5fab1449b5b0283402f4ee5d0aeafb1f33942d9ab6596f82a7367b7da520d49239eef1dd7f89abd00468918700bcb2416b2f9182eafed304be9af
+MISC ChangeLog-2015 1507 SHA256 8b712408140785e46323f55da7ec073597c2862d9a0115dfcea05111a0387662 SHA512 6ea363ec30f7732cecbce661e56844cda002fa76cd014c67bc370267062b97a5761c4a5a73158b22170a0108ab8c3a88140cf81970ee5fc5b748c453b9dccf98 WHIRLPOOL fb834202bc29523cf1bd9c6c5f109fac24f1f37b37e6ed0af612df7862c42ffee4c9f0273ad244dd0929147af3a1a4732c5c735e24581cf64fb188ed652b5b99
+MISC metadata.xml 533 SHA256 1b5c84a935eb400dcd178cdefd859819a0d7e22983868b3da67665cecc4c3d39 SHA512 ffee15d0c974e775c7698764cf1fb97c6c5876dd0b2f5ef549a88488055930885ae0aad12b8f74add87effa2f617cc45626a1fbacf118941097d1c7d129601f8 WHIRLPOOL 1be395615541fb517eea940cdf1159cadfd99b448343f987fe7ad7b31cdda041da5c22f8c8f48a423eddf545efbfa7ecd2884f2229451fb22fbe5240465b9fae
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/Manifest b/dev-java/rxtx/Manifest
new file mode 100644
index 000000000000..f5149e37e9bb
--- /dev/null
+++ b/dev-java/rxtx/Manifest
@@ -0,0 +1,11 @@
+AUX lockfiled.xinetd 202 SHA256 5016c083c1eee98483e16187b79e762db43b50b4177c7420196a91ed64bfe940 SHA512 5ad71db04f2cc44348572876079b9548a3aafb84aa53aa6f6d422468c54911cc149cae94743d86eaf7dc62a1cc1479b95893dfa0909367778f20e1ad72b99fea WHIRLPOOL c894b61844caa86d457b6d272be40f8ee937e0a93b8248d5a7d2854c3cb532e467dbcda7520644a3c24f663f4e1342fd9dc2066751e1adcd587eb951bf1c7ac9
+AUX rxtx-2.1-7r2-lfd.diff 497 SHA256 83bedeb80858fa7671c102cca3d8f95e59046a081f9da1213efafacd0371322b SHA512 fd06c021ad496036556f979e783864d6d88d1a0c039396eefacc569d66e6942b08b246970be640c73c0c2d209aa0c3247db61bdc19a99066789d4f4d0e4d390e WHIRLPOOL 7cdbf784881b0bb0ad8f763cd18e5ab28c2ffffd613c2c9f4442c74b70bf9dea792b46675e1e245e66ce4d2f7731b3e30c5a972569607a54a12c5d516eee14eb
+AUX rxtx-2.1-7r2-nouts.diff 3583 SHA256 bdea39bd623d71ebffd0412476f7b9cd680c7e61ab546bda06dfa517bf175faf SHA512 c7c6c11785089d321ee9680f4b67c590fe0c3cc0f031196eb71831ef7f319867fb156912c0c934a751d5d9e97774d6c26cab5c710055e919e97bcf39a789787d WHIRLPOOL b1833639e1aa63ec3c27980db0dd51d57b307af715b8fdcb7632fdb22db4c7f94868bf351287a8b21000299edaef065add8636ab8ded9baa3ac276caa629ca4f
+AUX rxtx-2.2_pre2-add-ttyACM.patch 328 SHA256 81263de05372827743ba3373dc43190494defebee390dd91a24ad4d68aaae699 SHA512 c81ae4e3f6fe09722709b6a9ae09fd3a300c9ef94641a3aa9f821b6fd4e4c28f15e9f672d2bfe6b51715f9e6b2caa5f637be20a76027cb31098062f60a0b0d0f WHIRLPOOL 6a7cac82b92b84bc07f7e95ac9c6b763382790eb0e30f1a866a31d4b7e50619582b037e5a58f9242031e5e52fd83c07c5833c8672e48b85c5b2ae2fe6e257bf6
+AUX rxtx-2.2_pre2-limits.patch 272 SHA256 1a0a0a21744ef3845f6aab19d24d6a31f3ca3e84654ae7cac4bca65f7c7d15a6 SHA512 0e4d5b8e622515c75613aeb8c5e4fc1786f1c05ef2619b65c4b1060776933172479957b9f9a15195c79f10c90a1802956eac32cd60939b9b0a15540901e62180 WHIRLPOOL a94f77f91d060e05cf222cb3e5c63dc6e97747c37afc5929e26e35950acd6d89937aae64c4c3975615a621a91cae84baf324794030c93a16f89c83570c5f7b1f
+DIST rxtx-2.2pre2.zip 1491209 SHA256 3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880495b03 SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514 WHIRLPOOL 0c2893c016ae99f918ca3605c83d18ec2b9ea0022628562a36859eaa20001ce6cfa15d7e77b80ee32e259f162ee1512b026a9965ec1402ae35ebed4b473796fc
+EBUILD rxtx-2.2_pre2-r1.ebuild 2227 SHA256 120a2d718e31212f05c7a59c5889451363730d8f0555e92009eb65492838846b SHA512 4a97e69b8601c3ec5ced216f3236c5e564fe2edc91f813ac0a620bd602b07bbc15d471c6f10c3d05d4a6720e12d914d0236e228723ad74f607f7a46dec6e6c1d WHIRLPOOL 40c69246300593e8d15aaf181dbd9eeea364eac900de77ea2eef54ac0e2e15f37de7ed7b83ad4f18c5efda8413bd9b7d49fd20b1eda03f78fb841a2d2aa03926
+EBUILD rxtx-2.2_pre2.ebuild 2300 SHA256 eb3156f366668bee8670163a97c325a066d2b9b95827a0b7847c801c78bbd954 SHA512 04eea992fa9f8553ecd4fa8eef777db949996bfae176ed8f23e575034d334c1eff3ebb783452899edefbabae459ac04e5c59ca41fadb78ff530ce90d4191ed70 WHIRLPOOL 19ec78ec5bc531548273b97753847a052b9ecbc699c537ab9dc23d8e62549eb5dc44274f4327d1a36ba307e592ba131cfd3c82eb3b607f374f49e9e1c8cf5538
+MISC ChangeLog 3469 SHA256 3dfb6d1e399186ea1b85e8b5dd4ae2d0eb4cdb0fee4f4c0a1e89d12c3357dd43 SHA512 d4f1f9c6e88badd13e29780f6c602d7be1f4bcf3b05945ce13f8ab11ca7c6daf0dbc1da95ea8cc3d658893b7e792c3c4d805b380cc6b2fcfe66cbbd553f27cac WHIRLPOOL 6a734239805c0086242ce66acf0317a11a2e88bd7fe157a1a9915cf1c12a53e8ae8a58d22087982facafaf34ecce3610237e273ab34b9b681af0d5fcc320af86
+MISC ChangeLog-2015 3520 SHA256 d7968e045b80c0267ff3d1c06460b5525b1af7b279a38351f231b532d4c75375 SHA512 56862b254bcb5d5d465ab8871f111a30045d5299249a82b09a410ead095ac3e2bb32fcdc75740ec169c16f60ecb5a37df4f4da980415a9d9c51fe287a1ee65b1 WHIRLPOOL a57d555bc6b554f20e5d8ba7b4f78fe3579cdc9183e713a014d2ed6f3b1e5a32c5041b8ec3416eca3a501c33703d7abbc46afc10d6712988fcf705dd5327600f
+MISC metadata.xml 333 SHA256 b69834e25b6815850f05fccd906a66aabc268f68ddbe0dad15e31c48b9716835 SHA512 fa687c6a61c8be4e5b80f14b9eb6ef7637f9de649e3c35dd81f81096c1bbafe67ee5979c551d958422fdbff1ebb08b43a1630d9cbdf283e56c4ea5aca1cd3ac7 WHIRLPOOL e167e62beb5ed8195b7b5aa7602794d630de426c34cd0daa21805e1b5de7c9744a12e5d75855cd5167018bf59e98130248b91f896846cb6495a471f42d3c1430
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/Manifest b/dev-java/saaj/Manifest
new file mode 100644
index 000000000000..0977fb42d7b3
--- /dev/null
+++ b/dev-java/saaj/Manifest
@@ -0,0 +1,6 @@
+AUX saaj-1.3.19-java-5-bootclasspath.patch 502 SHA256 20defaf2378634b1f0223d8b571a709e844e70d8ff4f245c179a265acd491b7e SHA512 8477fac7d1a33b0ac7fc365c0eb385597cc0ae5cb65bc6ad45ebfb70a023b343adafbfbcf71cd226e14f4e282eee5654a5b0d310703aa4386b4238a4c55f0bd1 WHIRLPOOL 3a8109364ede6a35990e85828b48d3864924d2a27fed1638c8cc69ab20ad1f2d4cc639add50bbf148255c2371360a7d5bf29a752d4d5d1a72f57b8391eaf71d7
+DIST saaj-1.3.19.tar.bz2 2266558 SHA256 d498d621a9798e503dae9728cf39d50a585e7704ffab2feb61ed769534f05f43 SHA512 12a439e296117abeac5de4694f2efec74c7f2b15cd86cb8759bfba6867f68dfe6c2f5b86ac2f8884eb86dddb3221e19f6c47c976cbcedcebe28570b51280ef71 WHIRLPOOL 746f1cc0ec5a3840165c94cab406ef72089b952276370c3e82aced4b21d482f89edcbe88f6feca44fe9854267930d11429e83d650b3f8ba7b94e58e88aae4ce6
+EBUILD saaj-1.3.19-r2.ebuild 1685 SHA256 5f00e2e252e16f9470fd7e03992c15676d495e2215077abe2cfe7ed2fc9044a7 SHA512 9614381b2c50d876cd637762286ccb59e89763e49a151cdd0b052a342f44c5ee12e81c42983143644bcf73b1f5809beb798112b6727fcba81eb149b55b9026ad WHIRLPOOL 078b3fd13a7b9bbeb3e3d26d5e08c78fe4578fcb8bb5884384c68344158970e5632ff9761d1e107e48e687399ebc8f09fd33c50295aa70b0ec0531a4229f39ff
+MISC ChangeLog 2760 SHA256 e321dfe550c096a8c0e94d03dc93e4ccd6a67925cf5b48d4263a0a273ad3c2b8 SHA512 14a390d10637707719245432a5a990f7814df6450711f10317e3095fc232dff5772bd27b5b1e2d92ca51618be7d67263532f9d1c10a98978b0d83516a1b326ab WHIRLPOOL e09175ffbfe27e0132d44c27b4cc7e019311f6c2ac4a04c1b022de6fd1415b90f247ce04c8ff1fbc1cd406f5c67acee866fb0d300df8d8e4e0138736269b85ff
+MISC ChangeLog-2015 2752 SHA256 b08677c3974a5ffe187f505d308431bbf6d7f456c93bbd9443898b97ebecfedc SHA512 b43513e7fb9d9751096475071c63ea4147b1a8dbcedb22b56d264efc6dada70fe54530b47c668bde071c5c00bb7f8cdf51af9fb59fc3eea60cce485da3c71204 WHIRLPOOL 3d7c57c36041933b43cd18c6cec37a27cffbd032611a23d64a7541bf3b58304e6abc79a097636b4f7f48a4556957d88d9a952de8be3b30cf2ebf4b05f2acaa43
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..e5ce1011c0eb
--- /dev/null
+++ b/dev-java/saaj/saaj-1.3.19-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 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 ~x86-fbsd"
+
+# 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-anttask/Manifest b/dev-java/sablecc-anttask/Manifest
new file mode 100644
index 000000000000..7a2b3886c3f6
--- /dev/null
+++ b/dev-java/sablecc-anttask/Manifest
@@ -0,0 +1,5 @@
+DIST sablecc-anttask-1.1.0.tar.gz 14045 SHA256 1225ad44f093c6ad73132e599f9294abd20cbfb51c7cf53eadcf96cb14945235 SHA512 23e8f3e911660549fd5bd6bcec4c97c58138fbc478bb958695b9b5327cf3da6985830d1c7a8db45516e2f708f7a9405921342b2a05bdce31c39c71569d62059d WHIRLPOOL cda4247e9ae789e742d4a084b8ac7d6e51bdab3b9f7dbacfc8799fd75b2318f3e544f490630016343782ec1139b41a4c5f124da651c6356d9b1f1422f4a1a7f7
+EBUILD sablecc-anttask-1.1.0-r2.ebuild 578 SHA256 736c8d3a69651a68c6cc832722d6138e4d6e452c5f0cf5725b13d1808f42419e SHA512 a05ca9cc7c5b76e562f4e4c015f375333caff8a99ca712e4f64a2b01e649be734a0f216000c1e2bc9d2183d104c722785f69e1e7bc6f6af4113b582576b0d9e4 WHIRLPOOL 2fdeca825d9cdbe1243631822182087cbdd91322aac582788cfadf7f22730765d7e0142528298d432bb2eac3dd0374ab5c1f690c05e50d07ad0f165e92ed0ea8
+MISC ChangeLog 3009 SHA256 99c35ce9d3edc43fe21f4d5e74def670d2f085ae2cd2a3fdd4cbb83b820305d4 SHA512 72a741c1b74bf7ce4566866dbc6281d22f724e894677c3031b727779677fd4335cd1975906e50c67cc0b391e0165c725b665eb7c4e27e07bdefc90957dc71441 WHIRLPOOL 800ae4097c463e1b9efc2b774f324699335fb596e51ffbccff757e5bfecd4c9a7492af63833bc29c574b430132cc3353ee217d81b888e549bcb788957fa6e67a
+MISC ChangeLog-2015 1767 SHA256 d953c3f4853a6f211032aff68b10f19ad2cf7d1093be922cadde1abdec5796ed SHA512 b2e526d7323ac0053aa4992aad0056fd351a6ebfbec392b949c7d98e6fbf18ab8487810aec1a845db6efcdf862c063a3a1fd4ca37e5388081bc0afb3b35ebf4c WHIRLPOOL ddefefbb03ae4f8a0b11ff7d603f636284a5aa95739eb29d54f67538c0d9a16684023b6cd4428da68d28f21bbc564030aba8c8a1df4a8fc8a98dbc6cbb02c2d0
+MISC metadata.xml 313 SHA256 81adc3fde9145b15d7970827db688a29767a296d3d87ff58554b3e3d71424ebf SHA512 352f5ed232f1b73b569c9b6a2615117b943994684b0f66e49b6255eb29b7717caca435d95488462bcd59dbfdc77b1b0562eef28bbb8b46c50c8498ab64a6e06a WHIRLPOOL b0f4b36241855ba655430bd6c77909673ea9e346bc314dd21981ee6930c23358403419cced3dc6b045b2335e2e62c662eedde75a2c12edc46daad4571ac02e02
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..5d51d354c934
--- /dev/null
+++ b/dev-java/sablecc/Manifest
@@ -0,0 +1,5 @@
+DIST sablecc-3.7.tar.gz 556985 SHA256 665e25207832246449dcd3e5d1fff4dec77b0db27378a3de528bca2ecbd680f0 SHA512 c53212ae10afc546796a46b8f1d731d3337c1fe184f12a285686b1f876b207a6cddcd789876d5c9d6b378583065bbb8ca7b5c3797d88b4eea3609ffe9a9c8f71 WHIRLPOOL bae77590d9a9afe017d0a797edfd1fe67b4fc099b4cc9bf654d57d3101d97f601cf4df849c28fbf0047ff888df2b285421fbc4556c942cb77da56ea07e7ab2ce
+EBUILD sablecc-3.7-r1.ebuild 685 SHA256 818d96cf3a1dd90a802f5cdd9422bd228ea96732d4c8f26554a49164c19b1f63 SHA512 f1d215525598e7800b2d8900cf07514ec39a8d68fcc28415adb24091a10e5283ba0d771613fcb43d8df145c084fa3e73fcbc97733f2df297d90e40b2c5f36a41 WHIRLPOOL 97af1a827bda83591f49df1c68d0d400fcf32f3c25d0bb944a7d7085d3b8faf2489a091d0574bb1bcdee86ec0717d28556ad6249418cf19bc27c865952c8bb91
+MISC ChangeLog 3296 SHA256 939afd2df9c7f58ab5f0e30d70e6ef789b7ccd2f6f3702dd09ee1a072ac8359e SHA512 0cee9fa8876fa5e3e06770fe9b837ddfb8ab9dafb4a6cdd8c6e23eb5d352a465170899961a484bb35c6721c0f2245d94a6895270619a6bf6d656a81c9a6fca88 WHIRLPOOL 8751c5be3ef3f6d260703eb34756b7c6e43d7b1c32df027515f81cc8c39c1ddb93be847649e759fd4836d26e0f8a56f7a3108fe8e4c8d7ec2ff8f698eccd7c7f
+MISC ChangeLog-2015 3010 SHA256 1367a54d4baed1157245fc87ff905c37393ec8dc2eada4efcf84fc0702d1ea28 SHA512 50747d9dd6c1f6d3a05c5f7f4391dd96fd9e9e3f8385f4f94edece5111e71bea4c7cffc47fc62757daa252c32abfc49ba23791c3dceadc120d7189a15817be4d WHIRLPOOL 6b1ad0c4e9360ef72dc5f99ac3e718a7127e166281f539287d6d971ad91dbba58fbcecf158dab53bf6784c2835eb043a7542d0ee93056288becaa8c80f6c1074
+MISC metadata.xml 313 SHA256 81adc3fde9145b15d7970827db688a29767a296d3d87ff58554b3e3d71424ebf SHA512 352f5ed232f1b73b569c9b6a2615117b943994684b0f66e49b6255eb29b7717caca435d95488462bcd59dbfdc77b1b0562eef28bbb8b46c50c8498ab64a6e06a WHIRLPOOL b0f4b36241855ba655430bd6c77909673ea9e346bc314dd21981ee6930c23358403419cced3dc6b045b2335e2e62c662eedde75a2c12edc46daad4571ac02e02
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/Manifest b/dev-java/sac/Manifest
new file mode 100644
index 000000000000..b84a6051f199
--- /dev/null
+++ b/dev-java/sac/Manifest
@@ -0,0 +1,5 @@
+DIST sac-1.3.zip 163617 SHA256 a228cae0e4c0cbefc7087cd1e17c0e8f91ee648949c6f0b9854c22f7ad1557b6 SHA512 e179d2e672f1e9e134c4bec92742410bcf2c5d423e5d236856bb53e849d7fcdb2bb09518796d30862685a9ab2344bfeea9b4c7f3c3dd4a1007c8056e120c87b9 WHIRLPOOL 306315955e0fd94e11d601e8de04c6acee104b3a8662b4d10fe3c336aff940af6ef10037c6117c218ece03cd042abf02c061daed40568087009db15bfa352086
+EBUILD sac-1.3-r2.ebuild 562 SHA256 0db4cda07ea569036a481362f079bc5909d542810d4c778977d3d9b793973353 SHA512 2bcaf8dde6695b5aa684016768309e6a68a6cbb22fd2bb126d8165fdd3caf3d5796b50068a71ed5f1ab4b5833c8975f56ab58e2c98447c7b5a145550e36ded1e WHIRLPOOL ca6df79b2ece0a9133989a681a1903db6d0e80c27105b431eba0e685ed4aa8239a9b721866d4dbbf1992469fb7e85487dc5802a7123515d3dbe8ab04b77378d8
+MISC ChangeLog 3640 SHA256 fe7d24af9547c7772fced4adbf6d72f426f21f60d99bb397d8d958148732af42 SHA512 cdcc51a408d86f505b7ead7a900beb7e823ba8b5b4bf19177c058db4a1df3397b39b10fe925f4cb0412f7f34b393491933ec8498421fe3601f6325934e0e89c9 WHIRLPOOL 5b06b6182f22dd312e7d44d8438542c79ccee071d86d773ce39c1ee13d142c51b8977ca6413308bb0bb630b84ef5628d52e367136d5acdc75b7efa88ff81ee43
+MISC ChangeLog-2015 1661 SHA256 dfbaea3316e05708d591e4e30dad71ee8a7cee562ae62247d843e86bfab8bf5f SHA512 88552388322b86bae27cb159462e37892dc391de555b99019331fd5150518431af83967fa22c7528bac46f2fe36c552ba109dcdd27b0f36e69f84a944633edc6 WHIRLPOOL 79da74e0c97766121d3c7898ccf49b06aee93b60f1989cb7b3ccc0ac09264a09cdb1c3099fddf8721646fa19b756d041c0d701809feb3f1c38d44bf4ad605ecd
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/sat4j-core/Manifest b/dev-java/sat4j-core/Manifest
new file mode 100644
index 000000000000..d3bcaead0b46
--- /dev/null
+++ b/dev-java/sat4j-core/Manifest
@@ -0,0 +1,9 @@
+DIST sat4j-core-2.2.0-build.xml 9458 SHA256 f0d05ae4fa0485b0dacc3627120b6d7053e24356127a12733a95f85f30bca2d8 SHA512 ab09e0773adaf578e87503373b6156d42430270472c07159ad8246ae6c2f20c02447776c1b925fb0d4eaeed6dd3f7c3b0f36a5a410f0e22d2594b9b4deeb4d7a WHIRLPOOL b57e3e77a74b9205fec29a57ea4ce13b34d7f8891e01b3b7a928b2f009f49e58ca2c41f258bf34019f8e57f0e243bed8be26f9c4f0070458ebd7330351cffe55
+DIST sat4j-core-2.3.1-build.xml 9458 SHA256 f0d05ae4fa0485b0dacc3627120b6d7053e24356127a12733a95f85f30bca2d8 SHA512 ab09e0773adaf578e87503373b6156d42430270472c07159ad8246ae6c2f20c02447776c1b925fb0d4eaeed6dd3f7c3b0f36a5a410f0e22d2594b9b4deeb4d7a WHIRLPOOL b57e3e77a74b9205fec29a57ea4ce13b34d7f8891e01b3b7a928b2f009f49e58ca2c41f258bf34019f8e57f0e243bed8be26f9c4f0070458ebd7330351cffe55
+DIST sat4j-core-v20100623.zip 383901 SHA256 9a331a640102ab9b4ff11bb7153d364eeedbdab0d19464d887c57636c3236a60 SHA512 60020df4cb07a1498c3e77463b9f940a65de98de995d9f3cc0308133e264d891de4d835bf4dd28c09da34b758e4edf4a28b661805ab85028a4cb6a519e128276 WHIRLPOOL b74a1107580de0cfeba15e90f76cbea8c534816ac7131f74605c1f928055f0b085a089048578484f07b1a2d72b0e8b44a61e67b4bb2a60d6d15481524d3b7cf4
+DIST sat4j-core-v20111030.zip 443396 SHA256 d6c72afb5bccaa00a437cc5a65514c5caa8feae2cd7881415a1b6ea0dbfbcb51 SHA512 bb54221f70b99fb32786e37b6ab58e78cb353d8b614b76c7ef8898d0f0b2ec94f800e13f58712f994644cef24bcdc30a8ee76a513ca01db94ddb9fbff06e1550 WHIRLPOOL 87534eb3caed49bc9ecef38d96c0135d4fe57842d26bac9e3314aaf0b9b7e76047cbda06f768ea18191cb5712b782e97f3cccc8749c96264bdc73fd440579e2e
+EBUILD sat4j-core-2.2.0.ebuild 1385 SHA256 a698489544fc8847225125f435d15a18c88ee8bbef8aec20461d51e488a8897e SHA512 36ae4e71af98bad416020af6bbfa9eb42341271a2498890788323f44cc4ed3c00c82867ee558d9b945e828269d73ca7245fa1bdff53a8bc1ce997483f8f56c48 WHIRLPOOL 7714671cdf893d747a78739307f78baa1caef06ecdda9f9030b5bd3fc7fa69a48ea1d6a2e25682b6814b0f9154941e4674e01138ce4e8f8538b89a3edc05bd69
+EBUILD sat4j-core-2.3.1-r1.ebuild 1387 SHA256 40233726e192c3d3fa8d482f79a7bec579a040774728028b58a899dec6ecb447 SHA512 0ac619c5b750b8e33872cc83756be62e7c160cb1886e578bf4e683e6bb217678149bb6aa75041baef5e92d2e145152d5569de77d0449138beb1e675cf1b7dab9 WHIRLPOOL e4260c46a9f60d99d6fb1506fd1b6a52863d77e4928688e739215dc6396a9db85aa9608907e0da3806a3f585b841d821423b461d2706fe2735f95f553cd1ed43
+MISC ChangeLog 2893 SHA256 3440cb8a15e73929c68ddcc098a33cec4df1834fccac1b4f73c5ef154aac753d SHA512 2487b0c050fea010a251aaa859be43153e2431b3fbc5641d4d4dbd3594a43d05c6abbdf11e312189f90396cfa47c5cf1386c83c2723be6b512fd3c12dad10375 WHIRLPOOL f312e0cf7f9102ae9db9cadf16048238cf1226c9fe5b8830e014c6b909cb8d4aa6c62c5cef8fa7a3cf4c40a1d24618e5cbf69df4aad9267559032fb78e01fac2
+MISC ChangeLog-2015 2151 SHA256 4207857445cbef7d81859f96a99e4b6ae0e24a6ca92703f41fd205c1e8bf6b51 SHA512 45689ad666c8c3349e6264d38f13c64678db5b8b1ca5ac935938f8ac888e189fff8d98b4e892febaf3f16ffcbe6c358d6d4822a62abc7a17296199ad0841d325 WHIRLPOOL 81dcf65212a1fc2fe96c282b7208920fc180eaaf5e618d034c5824114f77efdfe108d45c3f2c9676de0c61ad224624d95449dd09a5c8282932affa4008a30b41
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/sat4j-pseudo/Manifest
new file mode 100644
index 000000000000..73705238e4fe
--- /dev/null
+++ b/dev-java/sat4j-pseudo/Manifest
@@ -0,0 +1,9 @@
+DIST sat4j-pb-v20100623.zip 487925 SHA256 58f6afd05c3bdc81314bf34ef606e2323a27ef8a942312fc88fce757afbdf8dd SHA512 6aba2438070a3060fc26229fee1e30f8cfd37f2699c2ba28c4b7071fde2ad9be6ad22138b0e6beb7409b7eb57d3c44733c440ba2cf0ea36c7ea068e411a1a2e8 WHIRLPOOL 345ea01f5b5051a860c89e9bb77becbcd4b81997d688acc5363ee32006144331dd46e8ea557c3c8a191d077f5c1cd439034b8933e3670b8f470546227857e423
+DIST sat4j-pb-v20111030.zip 650535 SHA256 79ea72ef37fde854177345c4f02f9efc123f60590b183c61b1799ad7b28825fd SHA512 ee27501e8c4efb3cf960278fdca0111442e14edcf303ffb9adea2c0e6b5dc7dce2df0304ea1aa05a1b00000478f9283230c7594325195be557a7bb459250fd9a WHIRLPOOL 430a9acc193bd88f41e4fbc0e2361fb8bfaf384ea7a7f3cd1a65b74dbb0131e172d0c98f84751c4d11134a7133b9e3babbf4ce589b5d7db3339c4e828aa9e1e1
+DIST sat4j-pseudo-2.2.0-build.xml 9458 SHA256 f0d05ae4fa0485b0dacc3627120b6d7053e24356127a12733a95f85f30bca2d8 SHA512 ab09e0773adaf578e87503373b6156d42430270472c07159ad8246ae6c2f20c02447776c1b925fb0d4eaeed6dd3f7c3b0f36a5a410f0e22d2594b9b4deeb4d7a WHIRLPOOL b57e3e77a74b9205fec29a57ea4ce13b34d7f8891e01b3b7a928b2f009f49e58ca2c41f258bf34019f8e57f0e243bed8be26f9c4f0070458ebd7330351cffe55
+DIST sat4j-pseudo-2.3.1-build.xml 9458 SHA256 f0d05ae4fa0485b0dacc3627120b6d7053e24356127a12733a95f85f30bca2d8 SHA512 ab09e0773adaf578e87503373b6156d42430270472c07159ad8246ae6c2f20c02447776c1b925fb0d4eaeed6dd3f7c3b0f36a5a410f0e22d2594b9b4deeb4d7a WHIRLPOOL b57e3e77a74b9205fec29a57ea4ce13b34d7f8891e01b3b7a928b2f009f49e58ca2c41f258bf34019f8e57f0e243bed8be26f9c4f0070458ebd7330351cffe55
+EBUILD sat4j-pseudo-2.2.0.ebuild 1594 SHA256 0ca1ab62302d749e9e5fb5675eb8bc8ec1f54ee185d1166840ca50f0a5d51fbb SHA512 73cf62efcedbddc0b1d6972d7a02773c56dd07dfc2cfecc908ba017c78e6ea3b561c152c2da0ec271f6440c1174c8da6d7e0aad052eaf4789c578fd63abef199 WHIRLPOOL b660a2ca77699d9b5902d57295097158081f69b7ee8cd6af22f0f9abbc7f5cd94ebd0ba39a05c39a474e6d351040f7be594ab0f0d89530675dc9b8edddf0ab6e
+EBUILD sat4j-pseudo-2.3.1.ebuild 1602 SHA256 bcb2fac51cefa0f98ff107a29dfd9573b1bc6cdc748f157bfc99f15327f466e6 SHA512 e8b614d0f90ed58492743a11b1843de6c6baa72120cff41ea055b41c186d400fe5ea6ed5c169e564dba952f2636aa1e5835fa6c3558bd1c8e28c4e243e72e2e2 WHIRLPOOL fbb3e7138837d39a267ff1e539284c37a75e16135d42ed40109c6ea2f4604dc11f6a05e264cf36045252992cfbc1a3427bab72c16c9380bbedc9341a6e2709dc
+MISC ChangeLog 2897 SHA256 84c1194014b785565646f6b6972a056111434910bd837a6bd1583c995d7b385e SHA512 92138af3c672d93ec81c9763a4086afdc8c10420df15eeccac89f4c4fcf57e329ab6e1e794011d291d5875d971d077fde8c6796fdad77ac7847f6844e7008970 WHIRLPOOL b9364f3abba8fdacb3478af8e6d7a7d3ed4d15157575895e96f23ec7137ebf6893cd316991cab1c338960c77f57c4469d1b00e12dea7cacb70fc159cb830fc34
+MISC ChangeLog-2015 1944 SHA256 d3b80648eaaa5f099aacd4811725eebde7b698f7508f7d566f5ec3a0a993ba9b SHA512 cbd155c153956d7c0ee1bada2d9de6e89764d1ed1e176607197f1a8a11b68fa1ac8a6189b4049bc7e2ab17301e03de1c6904aa776256cff5ffcb0ee63116a0f8 WHIRLPOOL e1ec739681c599e46953e864de07caedab41cf88dc9145a2bb4952f2698249ec862e9daf0b9f9b091d392b16eff6712a4c85e5f87c8c355ec7afc007175a310d
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/sax/Manifest
new file mode 100644
index 000000000000..ae7bdc055607
--- /dev/null
+++ b/dev-java/sax/Manifest
@@ -0,0 +1,6 @@
+DIST sax-2.2.1.zip 372488 SHA256 f9221ba55b3b753cf900ef64dc588a1d6b2716f63440b0f1ab55fe9deb418272 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648 WHIRLPOOL 5822d3aba16ccb8bde702f3817090d931c01b6bbb83fc4abf521d3a369599bc4a88707e37db6ef9abb074ddd0119b4b845d7d8c12e6eacd93f382f0acc01d9f2
+EBUILD sax-2.2.1-r3.ebuild 654 SHA256 724eeee91f6a7892acc5a008b5f3adfb8f84bfd5cd158c242b21c43432cf3ec0 SHA512 6babd40896bced648113deaa9772af0711f719ba74a7e6cbd65702aab505c1516df7fcd794658c91923cbc23884ca8b333a51defe23ed3c86bae0efe9f2f446c WHIRLPOOL b3c3d1adaaede1e86bc2da87f68decdd2d6e0bc8437b3b20181682a779f6768c3b1169ff5b4da1fb29b8f5954b6949b040a57dc902ed0c497bec595e1b65f27a
+EBUILD sax-2.2.1-r4.ebuild 697 SHA256 00216084f46458f7b8ae420879ff42dc208b91b4b3ed96cebcde61c9ee4cea38 SHA512 4ed2c205b9ec79829535b6fcb3ec512374a1fccb5f0b196428fa14efdc5a3c3273d53ab75c711e089851dc7c5df3e93b5800b480b1877819930daa1c0e415a2a WHIRLPOOL 457b07ed97bd1c367f7fcf0b04320a30f66dc2a3346d9be1c507d6d437f5ee776ae256224b5fdafd89faad0791aa2c2f88852fb5dea6070495535205d3bcabb2
+MISC ChangeLog 2741 SHA256 6d9696b4aaf08afce18379970cfa0f7fdd30e7b05abfe8d8a8e759918715dc22 SHA512 32806e04fa71026754403445adcdf04dd2ba5c9f0f7faec46261b5b83833c06e62c40036166ce49db1ae15eb5fafe2a0a1dbd85d7234c024d1df9096add688d6 WHIRLPOOL d1e5a7bf17183c85c0fe695879b12a9b11b13cbc3352e4649029bf9ecfedc5237e0cb5b46f38154313853b431c39295669b239d6869a633139518ded01bf0bc4
+MISC ChangeLog-2015 2535 SHA256 9a2518613049c367c7e1578465812385d86c80a2650f83c24f75866cabc3bc9e SHA512 288e2b205c79361d1a19562202291eaa357e95c5a2f1191262f716131bf2d5bd1d223f4d6aa04138388aa24835f47dd5dd8144ecf09e42fabe602187e6d055be WHIRLPOOL 0a341661baa4fb9171cde86c5290619ef0e902a92916a13fc4dfbc89c2804975be19ad4992f0168eba75230aff080db50d0063dc7a78d30c8ca2db7dde5858ae
+MISC metadata.xml 309 SHA256 cf8c2046ffff95fba7240a8a6d17e25ada3436186758bbede540bd8f0ca4a1fd SHA512 f1412e1a93a748dd318a3238af4f0438d9b84762586bde5c3071e73fa0fd247e45f2e398e07f290059b487ea20866247f1df42a897b99e0001d52015d355db76 WHIRLPOOL 68400afa513c40dfe3e4769bcd79ac68bbd5162b5f906560baf3547ba6029a8037dc109515047b20952d582db0cc1bd104045f26d81e1bfabd286981071aeb32
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..a458aa9f5dd1
--- /dev/null
+++ b/dev-java/sax/sax-2.2.1-r3.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"
+
+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 ~x86-fbsd ~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..2142cba424fd
--- /dev/null
+++ b/dev-java/sax/sax-2.2.1-r4.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 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 ~x86-fbsd ~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/Manifest b/dev-java/saxon/Manifest
new file mode 100644
index 000000000000..2b05df40ebbb
--- /dev/null
+++ b/dev-java/saxon/Manifest
@@ -0,0 +1,12 @@
+AUX 9.2-build.xml 2061 SHA256 b319aec150c2ce260518e41eec4e8b164f0f49793f86a00f96b962cfe9fc60d2 SHA512 9e7c02427041df22a7a5eddc6d9e709635493d079efaba66a9da6320af961d933176105028f8a96fef8f84599724829d582ff64d061d70364f048ed39308e67c WHIRLPOOL cc45db5c1ec871599ddd33dd6a818665cb512052497f09863f202d68153ea3cb5f0a0e7aa0a40edd01369b4502af151e7ccad291c8b3bfef3f9edfa94e7b254d
+AUX 9.2-edition.properties 74 SHA256 b520d14d6e7f6180efac9b992b598653a025a077e919bdbedc35c4165b78af3c SHA512 2c95fc288bb35f68819edc95e8ce30f921b17196123ee7ce0c9908d210e8758c51204bc7dd222d6b7e4803dceb331bcd83120622fa2bcb6587d150a0f479ca02 WHIRLPOOL 5bb0b03a6fcdaa9e8590d0a6b474bfec6be272ab9faaae39f4164b6e8a0bafa918c09b2f1b7b8942c2351e6037de03e93512dbf934ab87185bc2060ea0ede0f4
+AUX build-6.5.5.xml 2087 SHA256 2037c4ac4840dbafedd3a7321840c2f2691784cb26241b1daa76332325b98279 SHA512 581a6fbd4af73849caa2a288efe9680f01163b56d8ab3c2f8739afcf07b72ba616ee9ea5456a1f7739ecfb38f4ae4d76f57fa3f99ce022551984568f36a6531b WHIRLPOOL fb9d0c77fdc89082376e43bbdbf45d7c4a6e06f52520ecb1e7a5814bbd72c43a74cd7c4678e435d3497781ce34cb4d0055df98d6b1d97a5a3b7383bc0a3ab1b3
+AUX build-8.4b.xml 4213 SHA256 8539556510bd074cb18780c7790b26ebc2a7780b24a11662fee4b8ee34f8e787 SHA512 7eb3c3136debefae6a66abfc0a199db403e72b397c5a7b0f0b2c30f6f697ffb828dbf7d9f3ac1c08d1965aa70c556eea10de0cb2adaada1ee46648e8f0075912 WHIRLPOOL 28524badce8398782a7444b8d9d56357cc74c5799d0098a246935a89b3b0e537e2f8993760c13de74b97a92eb5190d3104e2d6a236446e96e9be662b2a62b760
+DIST saxon6-5-5.zip 3346162 SHA256 a76806dda554edc844601d0ec0fb3d2a10a2f397eabf3569dfb44b628363afc4 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a WHIRLPOOL 11bd5242e2c82ac7467561946a0b3b35e53af48962906739136ce97561ca38fd950011a1f4a65cd597d2279af244c7b474707017108296c8deaee8fcecde7652
+DIST saxonhe9-2-0-6source.zip 2942625 SHA256 4f15659cf8bb537b4b20f63cf060bf56f39453ab520fa912b2e9fe87e90a972e SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e WHIRLPOOL ca1b5b8f2f70eb72259b8128606830adebc6f6eed8c5c6ff9f222a672556ff8f73219960758480366004b656100e017bfdebad7f4dc60afc9cb3ab6793fa9364
+EBUILD saxon-6.5.5-r2.ebuild 867 SHA256 91384306d4f19114f49563462c0626ba0a11ee8c95728e42bf818f52845f524a SHA512 a8a6978c47998380b6c7ec09f7102584007aedd829cd95d0ff629d2df9062c5eb46ceecff88b2bb0fa575907810fb21fa14dc1253ff0da3f9962687935f53df1 WHIRLPOOL 0d3a059d67d730933dfe6d1dfb057d400dbed0bf7274cee0e63e9c568a5ead04502e6084aa4d7ba7da79d32bbb67986d9ae14d808917d3e516b13653628a1b86
+EBUILD saxon-9.2.0.6-r1.ebuild 2197 SHA256 8f50f9023431c08dbb881c94ba54d3758cc18ebe34e704d91c3f2961479ce674 SHA512 b2ec3ef58bc895f3aa42eaaa23d033e3f5186cbaf1078d931160071bdcb4fc2bbab3edcde16ece9fc341b108060d76bf96082e961ff4d9ea95c8ee7863208b9d WHIRLPOOL 8f8ed395c87d8be73cea8049aaf2f257ebd2db2427229d44b5caca6776844ccf886be463cdcbcadcc558e75453e50925f079c43fa0a9077d38252dbc09ef4783
+EBUILD saxon-9.2.0.6.ebuild 2201 SHA256 2c63897465ce56d5030a7c9f01bd968cedb19e102dcf372fc1659ee3c8ca1131 SHA512 ff42010f65d63fbdb5e584cc409dd455e956376835eb3336731781b2a39b31080d7c24d852b0b9d9c95743b3dfae067dcfe936420475884deb464922ce66b2c4 WHIRLPOOL e59d77793ca070e02eba1dabaea54b2c2c584f8bed83ca043c80dd049106030f2941bd5ce2aad061b45effa5dc899c80e9c9411b9afa38406a37eb74e7fdea74
+MISC ChangeLog 3500 SHA256 bdc83bc159daf99e431754c8b5f2e89fdac4a55d84261c312b000999046af4f1 SHA512 18475062f7cb6344431e2ba01266117477868862b3e1d68c2b5e31a4cc4e75689b3b99f644ea931b40b78c6e634d204b6f1b880f5b36aa991e94ada2e056039b WHIRLPOOL 117efb6530659608ebe1b4da1789a17005aada8639508fdd7ed80a28824f846655b24ca2042c7c091bd35f18a2936f85198bf47c52f1197c35e7d987f7f2edf6
+MISC ChangeLog-2015 5242 SHA256 f9ac6dd3a71814066208c1b697d08ef60f4ac7551b0870aec6392891536de928 SHA512 9b3435b7ff0f307a99ce6e733b88a4d0e39c2e079095b46230c43d26035de5f5c92cd87f14fd9542cb45463c05c3677f0ce1260fe2fe2bd86ad036deeeeeb2bb WHIRLPOOL 2008087b5de32bc7d7ba40f0d345d4cbd9267d1ee5e13a8a1342818a2c002be2a8e6f7536f0426cbc2e46bb8698d228693368c664c60cf56b559089b7b0aeb68
+MISC metadata.xml 311 SHA256 114b0d85d54aa436bbc74a30494f4e41199e89f6edf127df09a9d20383678888 SHA512 2fc12b71b9e977a095610f8f784f19252d44e31442cc5d5ce513f601a2394f4bf491fc9065de88bbf45afe7b8f1ca33ea907e31aa26875f48846856f1bf51126 WHIRLPOOL 2c5c113db14567a1a835a993d09b7b41e682c67bb3758e63965a861f23c2ddcc6bc6d2057096433e8f8d62b121274f531b182cf98ac6e1b4eea608d8e90275c2
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/files/build-6.5.5.xml b/dev-java/saxon/files/build-6.5.5.xml
new file mode 100644
index 000000000000..bb866d07642a
--- /dev/null
+++ b/dev-java/saxon/files/build-6.5.5.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!---
+   @author: Saleem Abdulrasool <compnerd@gentoo.org>
+   @date: 5/9/2005
+   @revision: 1.0_alpha
+
+   @notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
+-->
+
+<project name="Gentoo_Builder" default="jar" basedir=".">
+   <property name="src" value="src"/>
+   <property name="build" value="build"/>
+   <property name="dist" value="dist"/>
+
+   <property name="project.name" value="saxon6.5"/>
+   <property name="pkg" value="${package.name}"/>
+   <property name="all.jar" value="${project.name}.jar"/>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+	<path id="lib.classpath">
+		<fileset dir="lib">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
+
+
+   <target name="init">
+      <tstamp/>
+      <mkdir dir="${build}"/>
+      <mkdir dir="${dist}"/>
+      <mkdir dir="${dist}/doc"/>
+   </target>
+
+   <target name="compile" depends="init">
+      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <move file="${src}/META-INF" tofile="${build}/META-INF"/>
+      <manifest file="${build}/META-INF/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+  
+   <target name="jar-saxon6.5" depends="compile,manifest">
+      <jar jarfile="${dist}/${all.jar}" manifest="${build}/META-INF/MANIFEST.MF">
+         <fileset dir="${build}">
+			<include name="com/**"/>
+			<include name="javax/**"/>
+			<include name="org/**"/>
+			<include name="META-INF/services/javax.xml.transform.TransformerFactory"/>
+         </fileset>
+      </jar>
+   </target>
+
+   <target name="jar" depends="jar-saxon6.5"/>
+
+   <target name="javadoc" depends="compile">
+      <javadoc destdir="${dist}/doc/api" classpathref="lib.classpath">
+      	<fileset dir="${src}"/>
+      </javadoc>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/saxon/files/build-8.4b.xml b/dev-java/saxon/files/build-8.4b.xml
new file mode 100644
index 000000000000..a3b6ebafbec7
--- /dev/null
+++ b/dev-java/saxon/files/build-8.4b.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!---
+   @author: Saleem Abdulrasool <compnerd@gentoo.org>
+   @date: 5/9/2005
+   @revision: 1.0_alpha
+
+   @notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
+-->
+
+<project name="Gentoo_Builder" default="jar" basedir=".">
+   <property name="src" value="src"/>
+   <property name="build" value="build"/>
+   <property name="dist" value="dist"/>
+
+   <property name="project.name" value="saxon8"/>
+   <property name="pkg" value="${package.name}"/>
+   <property name="all.jar" value="${project.name}.jar"/>
+   <property name="dom.jar" value="${project.name}-dom.jar"/>
+   <property name="jdom.jar" value="${project.name}-jdom.jar"/>
+   <property name="sql.jar" value="${project.name}-sql.jar"/>
+   <property name="xom.jar" value="${project.name}-xom.jar"/>
+   <property name="xpath.jar" value="${project.name}-xpath.jar"/>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+	<path id="lib.classpath">
+		<fileset dir="lib">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
+
+
+   <target name="init">
+      <tstamp/>
+      <mkdir dir="${build}"/>
+	  <mkdir dir="${build}/META-INF/services"/>
+      <mkdir dir="${dist}"/>
+      <mkdir dir="${dist}/doc"/>
+   </target>
+
+   <target name="compile" depends="init">
+      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="manifest" depends="init">
+	   <manifest file="${build}/META-INF/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+	  <echo file="${build}/META-INF/services/javax.xml.xpath.XPathFactory" message="net.sf.saxon.xpath.XPathFactory"/>
+	  <echo file="${build}/META-INF/services/javax.xml.transform.TransformerFactory" message="net.sf.saxon.transform.TransformerFactoryImpl"/>
+   </target>
+   
+   <target name="jar-saxon8" depends="compile,manifest">
+      <jar jarfile="${dist}/${all.jar}" manifest="${build}/META-INF/MANIFEST.MF">
+         <fileset dir="${build}">
+			 <include name="net/sf/saxon/**"/>
+			 <include name="META-INF/services/javax.xml.transform.TransformFactory"/>
+			 <exclude name="**/dom/**"/>
+			 <exclude name="**/jdom/**"/>
+			 <exclude name="**/sql/**"/>
+			 <exclude name="**/xom/**"/>
+			 <exclude name="**/xpath/**"/>
+		 </fileset>
+		 <manifest>
+			 <attribute name="Main-Class" value="net.sf.saxon.Transform" />
+		 </manifest>
+	  </jar>
+   </target>
+
+   <target name="jar-saxon8-dom" depends="compile,manifest">
+		<jar jarfile="${dist}/${dom.jar}" manifest="${build}/META-INF/MANIFEST.MF">
+		   <fileset dir="${build}">
+				<include name="net/sf/saxon/dom/**"/>
+			</fileset>
+		</jar>
+   </target>
+
+	<target name="jar-saxon8-jdom" depends="compile,manifest">
+		<jar jarfile="${dist}/${jdom.jar}" manifest="${build}/META-INF/MANIFEST.MF">
+			<fileset dir="${build}">
+				<include name="net/sf/saxon/jdom/**"/>
+			</fileset>
+		</jar>
+	</target>
+
+   <target name="jar-saxon8-sql" depends="compile,manifest">
+	   <jar jarfile="${dist}/${sql.jar}" manifest="${build}/META-INF/MANIFEST.MF">
+			<fileset dir="${build}">
+				<include name="net/sf/saxon/jdom/**"/>
+			</fileset>
+		</jar>
+   </target>
+
+	<target name="jar-saxon8-xom" depends="compile,manifest">
+		<jar jarfile="${dist}/${xom.jar}" manifest="${build}/META-INF/MANIFEST.MF">
+			<fileset dir="${build}">
+				<include name="net/sf/saxon/xom/**"/>
+			</fileset>
+		</jar>
+	</target>
+
+	<target name="jar-saxon8-xpath" depends="compile,manifest">
+		<jar jarfile="${dist}/${xpath.jar}" manifest="${build}/META-INF/MANIFEST.MF">
+			<fileset dir="${build}">
+				<include name="net/sf/saxon/xpath/**"/>
+				<include name="META-INF/services/javax.xml.xpath.XPathFactory"/>
+			</fileset>
+		</jar>
+	</target>
+
+   <target name="jar" depends="jar-saxon8,jar-saxon8-dom,jar-saxon8-jdom,jar-saxon8-sql,jar-saxon8-xom,jar-saxon8-xpath"/>
+
+   <target name="javadoc" depends="compile">
+      <javadoc destdir="${dist}/doc/api" classpathref="lib.classpath">
+      	<fileset dir="${src}"/>
+      </javadoc>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
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-r1.ebuild b/dev-java/saxon/saxon-9.2.0.6-r1.ebuild
new file mode 100644
index 000000000000..149209c055b8
--- /dev/null
+++ b/dev-java/saxon/saxon-9.2.0.6-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+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 ~x86-fbsd"
+
+IUSE=""
+
+# virtual/jdk slot for external javadoc
+JDK_VER="6"
+# dev-java/jdom slot for external javadoc
+JDOM_VER="0"
+# dev-java/dom4j slot
+DOM4J_VER="1"
+
+CDEPEND="dev-java/ant-core
+	dev-java/dom4j:${DOM4J_VER}
+	dev-java/jdom:${JDOM_VER}
+	dev-java/xom"
+RDEPEND=">=virtual/jre-1.${JDK_VER}
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.${JDK_VER}
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+# prepare eclass variables
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+
+src_unpack() {
+	unpack ${A}
+
+	### fedora-inspired remove
+
+	# deadNET
+	rm -rv net/sf/saxon/dotnet
+
+	# Depends on XQJ (javax.xml.xquery)
+	rm -rv net/sf/saxon/xqj
+
+	# This requires a EE edition feature (com.saxonica.xsltextn)
+	rm -v net/sf/saxon/option/sql/SQLElementFactory.java
+}
+
+java_prepare() {
+	# <major>.<minor> version
+	local version="$(get_version_component_range 1-2)"
+
+	# generate build.xml with external javadoc links
+	sed -e "s:@JDK@:${JDK_VER}:" \
+		-e "s:@JDOM@:${JDOM_VER}:" \
+		< "${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"
+}
+
+src_compile() {
+	local gcp="$(java-pkg_getjars dom4j-${DOM4J_VER},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/saxon/saxon-9.2.0.6.ebuild b/dev-java/saxon/saxon-9.2.0.6.ebuild
new file mode 100644
index 000000000000..715fbbf14830
--- /dev/null
+++ b/dev-java/saxon/saxon-9.2.0.6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+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 ppc64 x86 ~x86-fbsd"
+
+IUSE=""
+
+# virtual/jdk slot for external javadoc
+JDK_VER="6"
+# dev-java/jdom slot for external javadoc
+JDOM_VER="1.0"
+# dev-java/dom4j slot
+DOM4J_VER="1"
+
+CDEPEND="dev-java/ant-core
+	dev-java/dom4j:${DOM4J_VER}
+	dev-java/jdom:${JDOM_VER}
+	dev-java/xom"
+RDEPEND=">=virtual/jre-1.${JDK_VER}
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.${JDK_VER}
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+# prepare eclass variables
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+
+src_unpack() {
+	unpack ${A}
+
+	### fedora-inspired remove
+
+	# deadNET
+	rm -rv net/sf/saxon/dotnet
+
+	# Depends on XQJ (javax.xml.xquery)
+	rm -rv net/sf/saxon/xqj
+
+	# This requires a EE edition feature (com.saxonica.xsltextn)
+	rm -v net/sf/saxon/option/sql/SQLElementFactory.java
+}
+
+java_prepare() {
+	# <major>.<minor> version
+	local version="$(get_version_component_range 1-2)"
+
+	# generate build.xml with external javadoc links
+	sed -e "s:@JDK@:${JDK_VER}:" \
+		-e "s:@JDOM@:${JDOM_VER}:" \
+		< "${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"
+}
+
+src_compile() {
+	local gcp="$(java-pkg_getjars dom4j-${DOM4J_VER},jdom-${JDOM_VER},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/Manifest b/dev-java/saxpath/Manifest
new file mode 100644
index 000000000000..25dfd1628cd9
--- /dev/null
+++ b/dev-java/saxpath/Manifest
@@ -0,0 +1,5 @@
+DIST saxpath-1.0.jar 36257 SHA256 2177b43d45b3ddbebb5f9a94f6558b12119409e12f515f7184c6870929d6fa50 SHA512 53e7781ea3efc1e16a839c9137fe7ab683e7a9e40283f0f5aa7afc1de75c4dc366a91a93ae5f256fc24e78fd3a4dcdcde6631bfa0d926b7dd0ddacd5c240ca96 WHIRLPOOL f43b84bf3d0e3adb8d936c80b981232b720b22808828bd3bf3b4eb68dcbc02cee98f791cc137955bffa4fe04a01d55566a31edbc8a2dd60786a2f883ddbaafc2
+EBUILD saxpath-1.0-r3.ebuild 556 SHA256 af9115d7b749ce2a1e56bddc89759b3073170cd8f4cddfa93acb1cf0dc620431 SHA512 cadfef1cffed4433275ccd5e61624a8e63ac093c903b803d21b36c639ef98adbb1d1b5c7e170b090916b12407507825141204577695f85dbd6efe0bd0a22850b WHIRLPOOL f915a5646caddfc1ad5b1dd32bd476fd3986b50368082c5571ca24ea3b19689243cce6acf2c38c38ef74ec3c14c7391d03364e35eb7f85b8c98e31b63e69c4de
+MISC ChangeLog 2588 SHA256 4ddbc543cd82103fa7bf31cc720a3837e00067f491ec788209b030ab6b0f3724 SHA512 fd06548ff49bcf22e9595a5f5bcda87d7de8aeb20e2c816215a5aedde0937a200ae7e23ae4d6244c3fa77e117fc465c6167cfaaaa043726855aa5962463767de WHIRLPOOL 06fafbecd1159109af0683fb706994f755ea2642ac4e1afbfd90fee74c416c50551286723e50320b8cf59ae14a9a39db67b09d0d11eaa1568fe14ab3b39d83ee
+MISC ChangeLog-2015 4510 SHA256 751ad4c930dff7cd172115c6ca0cc05a9f6a2dfb4f8cfea87ed7d20ce934df46 SHA512 56d8d8c034658c8576c60d5916a05c1eb1871a362c1011cf6ac6733f545919da00494c857785ea577ea9900dc63f49634cb3ba41daea606d37bb20f7ba0b2ac5 WHIRLPOOL 8a693ffdabb9d9b819d8b0e6019f48e55c2efb7c1e2b6353a948cba400aed489f7b2eb0a963f9b06de20199e16852019faa7523b969fb8fe3e01333350412d70
+MISC metadata.xml 313 SHA256 69b2f0adf68ae051a83767a466825ee82beb738d32eacd441e6ed81b931e689a SHA512 bab31add81d5d0086ccb56af2b48076f31966c1cf671e0ab42eb055c6a28d20840f5693c2370fc03fa5768dbe95903ec18e9b0c07df357fa51a3e54da52bc835 WHIRLPOOL 89ebf9bc37ea5276838ce1f4941f73ffe4dba878539ee2f0592e6f1dd40d6462ae4fe8c4459c6b6c15527afc300c1593750d52d303189357a98e2ba53d8eb570
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..b86849e3ea2b
--- /dev/null
+++ b/dev-java/saxpath/saxpath-1.0-r3.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="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 ~x86-fbsd ~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/Manifest b/dev-java/sblim-cim-client/Manifest
new file mode 100644
index 000000000000..a420c01a16c4
--- /dev/null
+++ b/dev-java/sblim-cim-client/Manifest
@@ -0,0 +1,7 @@
+AUX 2.2.1-no-network-tests.patch 2189 SHA256 84ddf29cdab0b05c7c8ef78e8f73fc40355e8b3e4282b66decaf48cbb78a9c9b SHA512 bc3834d913d168c66a71d993d1673dfcac2c752860c08f74f13defd51cf73298675d357d503ae4af2064e158123e4f04b37ea4590bd16d859a91323112875160 WHIRLPOOL 0ce5218da7c9be58a156e7c9e0d42af21c037de5b043a26ed72e49e5edf433d1eb66c8e6cac8d906e8dbea8c8476afd47af42db190f949c8b35ac7a14d5464c3
+DIST sblim-cim-client2-2.2.1-src.zip 1082959 SHA256 ef1abcd69716f18ff54e588e35aa8d8f0a5da00acd77d8e0f56ce616bdc7f81b SHA512 b7e1f56b87fa24c97d8b3e97261195ff04ce13839e72f4b8824daa8b9854158ba10c0bddd16e0650197125510d68adf6f4458089d132278510e10bd2b25b4aa7 WHIRLPOOL 770958a98cf85dfedddf0766fbef0db6b5cbfefbceb97f66140c804a446ffc48fede4751cbfca06f710ec4a9f60bfde3477dd1e179504f0b15415a447ddc9c15
+EBUILD sblim-cim-client-2.2.1-r1.ebuild 968 SHA256 c672f4f3f798a29f7a49b57e5bda05d64bdd09765b9b200c34ecf59ab5ea2812 SHA512 619ea7d2d9c2b6bfdedf545a725d0974a01204a92c18e777cabdebc969a5ad197fe6c14a15f3e822421dfa699358578fdcde88b563f396a2f5a8cf4430314731 WHIRLPOOL daef6fc4e1f0491c8edfac23896bca0301091088d05f1589704cddf050d4eb2555f38c601fb5c2e200f169cbc30a2593ff7eb31580a35809416e4aad25e5e6aa
+EBUILD sblim-cim-client-2.2.1.ebuild 890 SHA256 c03a6a386c5874b83e5e93c67186174e1d0e5ef1e143209d875213a3656f196f SHA512 27a228fc5eeb7a2341d0abeb65124153c21377514949580835304b27fe636056dbe76df08110f8ba646e9303a6b898dea475d6f7f8cb45e5cc3b7bb790d0f9d7 WHIRLPOOL 2100f4f33ac7394051e2db09397e7742352b10204f3c91361dad99ae9fe1a645db9af46c4e5e330006bb2f19068b7bb617a83b031982caf770029ac8b6dd45c3
+MISC ChangeLog 2569 SHA256 7d97fd2cdb8ca17fcee1d7344afdcd84a7e13f4db0862ef4d5fa268830aae777 SHA512 42cac4f71f340788060d834d39cba69d411092beefc09d12972a5611810614ceb0a32f7d192ca792310ffeda171d0f066b130def8f70aa145d15ba1bde0197d3 WHIRLPOOL ff643bd9aa9a9097fdeec775f6fd5975c63a4fd50f3c1e904218abf2fb9814154f496cbcf757a245b31439bbbaed2eb38c6bf68acecf180baf558e83d522ec24
+MISC ChangeLog-2015 1516 SHA256 fe81844b239a50e4327ea1799bd4fbb47b5c2661555de81d50230faf52625e92 SHA512 9edf20001949318d76e526311602f8d30bd3ecbb5645b0426f0eb186e558a695771e5d15464a8742508f065c72b86f98b8e466f132cb7b892a5065dc25630cef WHIRLPOOL 6e7bd2eefbc72f43cf9a578ecffed2faed63da472176f097fa31a5f75c4528a4ce543d5393ee68b6bb00aed31b22c2ee7966cd6c672260f91c05503d17bbf5a0
+MISC metadata.xml 703 SHA256 8bb0b25e9c52c50ca36deca28d10c8adec177778f4cde2400a65535c0d888a2a SHA512 d996c78d3aa8277228e40299790e6f85974764633a07f9a43e41b477069b01f64d71dee7b5690f03eb4032fb7b9d361252fb3c99af3e4b67471a8d0915707062 WHIRLPOOL a1c01dceb1419bd638e2c98a1d708d12288e754e51e17684b5690c1a50cfb04993147eadb552e203a6eaca084eff3c05917c5b3499d2c9ed84060216aa87ace4
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..cbe5489d1931
--- /dev/null
+++ b/dev-java/sblim-cim-client/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="person">
+		<email>jieryn@gmail.com</email>
+		<name>jieryn</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 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-bin/Manifest b/dev-java/sbt-bin/Manifest
new file mode 100644
index 000000000000..f7d6e28e4b25
--- /dev/null
+++ b/dev-java/sbt-bin/Manifest
@@ -0,0 +1,14 @@
+DIST sbt-0.12.4.tgz 980711 SHA256 5907af5a3db5e9090024c91e8b6189cd2143841b08c4688542a2efbc9023ac1a SHA512 0f8d67d8bcdfe2c7fad04e663cb626e302fc42ba7675376c97f22a73cbf21f40fde08078f2a74a723b9a5d0a24177c7b551e65942a4f73237d27ba8ea18b0add WHIRLPOOL 67db0d133b9a4812da6bce43ac5f82ca01f4c305b539deb92cccc0d6a9be8e3655dfc55a99293e78d1a8731e8534ed47bbe31b5092fea37bc47905685c0cee5c
+DIST sbt-0.13.15.tgz 60301163 SHA256 b6e073d7c201741dcca92cfdd1dd3cd76c42a47dc9d8c8ead8df7117deed7aef SHA512 9e8a4f92970b96ddb93c0f6d9bfb394bc10648511e65d2f3e7637c580877c91acfa0e5f73fc11b9992dab6b5c142ead314609f47c2aac3eb6da11d879f3da8a8 WHIRLPOOL 1df8914b682da0f8ca019953259c883cc7f737397eb2330ca8b81e594b485d0a931929a0ab0b2dc8609190593a30338e53f6fbef50bd28d9da4ec54e02d90075
+DIST sbt-0.13.6.tgz 1066241 SHA256 5564024afbcb107e9a476c7e3be77bb50347580ce6c8a889cacfc84135835d55 SHA512 428f6e597f34d3eba94f19dd83334a1b188ae24300eda508fac597197b11e9850163c30552917c42c647470faab328663e96274536dc9f3a4df8355aa4f9d976 WHIRLPOOL e3df653c304c96d9321f661a398759e5cb2afaf7f78dab52765daa9b4e2597568538b82a192c3de8f0aebb1d7b767e53fb41998d7992bad489f757caef3e59ba
+DIST sbt-0.13.7.tgz 1058904 SHA256 019ac98231a7159ce75a6b4b2c6b5ec8c968bd2fca0e25d356ea17bbe416fdc3 SHA512 6022ed88b2d25f947ab068b7971e51fdcf8df77cea3d0a03eceff6df4442f013fd13cbeda11cdfcc35cc23ee85e1661986c53921f48d4350e2fa8bf0ae5f3e1f WHIRLPOOL b708ffd47e821a17207f7e3e3ccb29af3eb0d5ab3b866034b034d73ef0ca7e211724055069825cc333770e8bc02cf0f660f0e1098d79fe8377e733d8d90729b7
+DIST sbt-0.13.8.tgz 1059183 SHA256 f481c5db5b9e5ef35d87be9cd30a917e363812d67f218b25ae0c9e66078417dd SHA512 79479308c631b78b71196dfe4f8b26bd9b75727272c17432fce5ddd61a0dcaf4e261dd1eb9a8376b1e7a836ba6d84917819d181c35d19b543360d803193286d8 WHIRLPOOL 0b2f29e7f9030a923e1c68f4f2d7d546b949c237ff81d9b44097b3899540c0ca9adecd6177d66edd69387c01e37022556c60be8d1c526b1dc9ee6a48866930ba
+DIST sbt-0.13.9.tgz 1049367 SHA256 148f2801f2993773de6f8859fe0e6520fcabe649d66bb316e13aff8b2fd7f504 SHA512 cf0deb1a5a07ce3690a831a2ee0f499a5c904cd9a9038873ab78773717a12ce4dec668e00c3dd6b89e7919357c32b26ff97a78613de5c6252b495bc7fdc763f3 WHIRLPOOL 6b29d1ae7ea7b643a23f05e3014727c8bbbb7a65b2ed5a41861edef45be2f062b7652e9e9c17107f6e4647d236835b6d39f31a8be96aaf5eab42792c6467afd7
+EBUILD sbt-bin-0.12.4.ebuild 849 SHA256 d0d5b563c51d30937471da83910e9336acfb86efd60d1e102f3d39a8108fdeb4 SHA512 40d41b76d2d43a14f2464b3aed43e35c9bf8f911bc9ae35a30de54e272a07bba40087783790c6a3278318b7a270eb650cb0094869963d84049205d2e93543572 WHIRLPOOL f5a1bd89f6f5ad60275e269f3787e075ba9e8f59429688d51e33d244ac4cd808b11267a5dcd3c3e3b8ea3ffb630776e4c66a32f4886c15a4204675f6c0163933
+EBUILD sbt-bin-0.13.15.ebuild 860 SHA256 be65cc83dd9d548dd57c0572fc2f743032236d1e12a7a705a80f045ce03bb661 SHA512 e40c7aef79aa1ea5105602eead76c26d9762e4fc3fe93dfee009f254bfe65bc58678c90251dbf7fef9713354a8fad34db6b318a677ddd14847ad9ebaba49df3a WHIRLPOOL 2a7e3db32c83f445c370bb7aade2eb4e9fc039476cbc32ceb5a0a1fbbf222e465207d2ccb930218597bd3595a29e8f0ae6e1532217191e1a97ed9b7b22b3eaac
+EBUILD sbt-bin-0.13.6.ebuild 849 SHA256 d0d5b563c51d30937471da83910e9336acfb86efd60d1e102f3d39a8108fdeb4 SHA512 40d41b76d2d43a14f2464b3aed43e35c9bf8f911bc9ae35a30de54e272a07bba40087783790c6a3278318b7a270eb650cb0094869963d84049205d2e93543572 WHIRLPOOL f5a1bd89f6f5ad60275e269f3787e075ba9e8f59429688d51e33d244ac4cd808b11267a5dcd3c3e3b8ea3ffb630776e4c66a32f4886c15a4204675f6c0163933
+EBUILD sbt-bin-0.13.7.ebuild 849 SHA256 d0d5b563c51d30937471da83910e9336acfb86efd60d1e102f3d39a8108fdeb4 SHA512 40d41b76d2d43a14f2464b3aed43e35c9bf8f911bc9ae35a30de54e272a07bba40087783790c6a3278318b7a270eb650cb0094869963d84049205d2e93543572 WHIRLPOOL f5a1bd89f6f5ad60275e269f3787e075ba9e8f59429688d51e33d244ac4cd808b11267a5dcd3c3e3b8ea3ffb630776e4c66a32f4886c15a4204675f6c0163933
+EBUILD sbt-bin-0.13.8.ebuild 849 SHA256 d0d5b563c51d30937471da83910e9336acfb86efd60d1e102f3d39a8108fdeb4 SHA512 40d41b76d2d43a14f2464b3aed43e35c9bf8f911bc9ae35a30de54e272a07bba40087783790c6a3278318b7a270eb650cb0094869963d84049205d2e93543572 WHIRLPOOL f5a1bd89f6f5ad60275e269f3787e075ba9e8f59429688d51e33d244ac4cd808b11267a5dcd3c3e3b8ea3ffb630776e4c66a32f4886c15a4204675f6c0163933
+EBUILD sbt-bin-0.13.9.ebuild 849 SHA256 d0d5b563c51d30937471da83910e9336acfb86efd60d1e102f3d39a8108fdeb4 SHA512 40d41b76d2d43a14f2464b3aed43e35c9bf8f911bc9ae35a30de54e272a07bba40087783790c6a3278318b7a270eb650cb0094869963d84049205d2e93543572 WHIRLPOOL f5a1bd89f6f5ad60275e269f3787e075ba9e8f59429688d51e33d244ac4cd808b11267a5dcd3c3e3b8ea3ffb630776e4c66a32f4886c15a4204675f6c0163933
+MISC ChangeLog 2056 SHA256 240771a641d6b323f1e19398b82ddb870713e6e5f795a2f28c7d636607e1353b SHA512 5aead926042a892e6adbc9989fdd2dcd8eb8eee31b2bbb97202ecab911318849fcf921d79eb01b9da252801e8308c9ad299740f337c92eb2dc9eda8bfbdafc0f WHIRLPOOL bde03c3a23e9de59ecf071a38bcc8b814a6c2760cd79726f84bff56b3a0cd84dc9be7cffe74f6c75f8da689912229ff92d98880799a2fe2b148adbce34d94171
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..09992eb8f5f3
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 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="http://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..f058123e44bc
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-0.13.15.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 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="http://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..09992eb8f5f3
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 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="http://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..09992eb8f5f3
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 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="http://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..09992eb8f5f3
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 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="http://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..09992eb8f5f3
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 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="http://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/Manifest b/dev-java/sbt/Manifest
new file mode 100644
index 000000000000..42d8c4b09b9d
--- /dev/null
+++ b/dev-java/sbt/Manifest
@@ -0,0 +1,29 @@
+DIST sbt-0.13.10_rc2-gentoo-binary.tar.bz2 66131831 SHA256 863cf71b32439e452e1d5400a8ec1ac06a9c29852c7eafb79ce9ce2b1288a321 SHA512 1b25c47fa01462bdbd1a88d5b441226ba8261f83a4ef6ce2832c5e752cd90e8eacf6f0272505f2e5330f1e9b3bedb71e4d83da81952e08d8144a52e22dc26008 WHIRLPOOL b300931a4b516f7aa4f5984ea17e9d2d022e52dd4d4468b777b8b88c949d22c2eb9702c3883ef0a9eff6fd52542668c2ba041d4f12ab56603c6fcfe444d9c9bb
+DIST sbt-0.13.10_rc2-ivy2-deps.tar.bz2 139970194 SHA256 b3ef28fbc330d8b8218712a4ff6ad11a3ed67c618b99df1845edb17d67e5ca3a SHA512 e7023798a303e37b282fe08590516031f7952d4df6d2aa4792c727e9d50000e1e1c4f9e97d656abc32f84f8b0df9b2de7e15e29bb2c7ed648efcad8ae432cff4 WHIRLPOOL 48860777b2ffabbdf33800a3897727b91e7487430138177b39174276506bcef2b4c810c1858bfa158ee83953d4de8e61085022037518fbb733339b5e7c0a4801
+DIST sbt-0.13.10_rc2-sbt-deps.tar.bz2 38778951 SHA256 f2be26d49010fa521b4a0e9a112c465107838f5250883de4bc132926ccd685fa SHA512 c929562d18e2e5032d502556a960b25fa707c2893172425c2c3b5365a86ccd63729ce8795f12fd1aced5b39267f6db4b8e9d0c1eaf00ba20b071fac9044157f8 WHIRLPOOL b75096e0b2429a104b548e601e06fc5b3e452bda39d4fc434d8f98137275899a5c40ac2bb528324dd621eef4aa17e952648c9698cc4eeedd6e8aeb391509db16
+DIST sbt-0.13.10_rc2-src.tar.bz2 35017169 SHA256 c34051649a8c998a98d5ff401e622d6c3e54fc15b6e1aeac7e223c5ff8ce54aa SHA512 7e734fdecc631cc0307c09e6706b761dd55d1cb6a03aa29a0cd5826d86bfa44dde29ebc05bca7f947351a6b6510caef51d0c3df2b07d60895b41f074c319d1b8 WHIRLPOOL de34b47a87af7f77a2ee00230901cf21015312359f29cff8689692b7c9d2f148a8233224a3b5b488c63a55cde695b0928000938e6608c1437e4be2287ddc026d
+DIST sbt-0.13.10_rc2-test-deps.tar.bz2 266656 SHA256 62d0ed5b43898a42696f8b148e933d70871c2f75bf3f6b20ac39cea00b327f17 SHA512 7e30459f010eb9c8ffba8e8e4da90bcb7d03cdd4347e63d0207a9bf9b9ddeb38b68d2798c98452ea81bcddc9973e287066603ce06ebadf56c006f25e76fdb57d WHIRLPOOL e4c06db36cc2b0e4417a81c961bc470caa169e358734ab7f7b71103547286704e6cfd104fe342afd7df0270300073a695ee35342944e25a65e96bd036bb5a953
+DIST sbt-0.13.11-gentoo-binary.tar.bz2 144170371 SHA256 ca13e6d5751de14ac0fe3542f80c42c3dc74fabd3f897455b8f93391ab465f08 SHA512 705f8a5e3065ee6d88ca0044a1e0b55856e4cf167172fc3102503ff28b0992bc918da9ab8541320474abe7dd4956d2a0d33df1709894bace225993e32b85b667 WHIRLPOOL 0b94e74ebb827d9517d621606321e8fd0ca72c74b6f40776248e1bbcdf64e328c3bf83ece4c37adbbdaadb273f0951275a21d278ea3307e904a76c44809b4321
+DIST sbt-0.13.11-ivy2-deps.tar.bz2 139796284 SHA256 d8ad25a99e1dd8ebbc29955844543a1cee8bbd845cca9bb4fa92b62c27673a29 SHA512 e431e00884dbf58ca911d64da726b41b8aeae9987ae2725705c9c45b4601162e45d310f933e4214cf8a4d21ba9e7207365d9ba352cbe1511ce09f59cd33da033 WHIRLPOOL b56ba91892ee2dbb1d9d9609ffd8417184e291fa8c03f8a115757301c412a8d141a17ae315ac916067bab5b49d74f16cb82da497c8790c212f3ccc068721e24f
+DIST sbt-0.13.11-sbt-deps.tar.bz2 38783848 SHA256 c2059a2513cbee50afe506d1fb0511b384df99757273d941b136e5bb3155ca7e SHA512 53020538eac11d6ae268436987d98093f017f421750496080908fad36eb9148a4cce41ab1a231ff1a35868c5c07cc8e338f1793fc91d044802b3e95b900e9cc8 WHIRLPOOL 0e4617b728536be9adfcf683b1575a522c5c0f073098c7f685003f0a340bfc4fff06031252016227b8af38f666296185815508b89bb7e82334276e55c707e16e
+DIST sbt-0.13.11-src.tar.bz2 35163092 SHA256 1b987725b4e57d6139b02c9d43b18d6ec43880681cccdfca3a29c803e79f6494 SHA512 95065c452fbbf2a206ad8d8518f083abe608e8bad1075848fa7a4ad797e8a10e4127823cdb8502f4d9bd0eb01867298af7d69895eb1470bf71deba354871dd86 WHIRLPOOL 652ba691ea2dccf6eb22ea2b43d9b96e15597cb8ce2325eacd912752a60854f982e1a6fec8c049e144042c10e98b888a66b3fe923c63447ef46e6582786e4a81
+DIST sbt-0.13.13-gentoo-binary.tar.xz 58011476 SHA256 5d24c07945c713e265e40634b5e4bf8ff34ecfed2e87df1f5f65e8d907b4a268 SHA512 9763b67ac4838e6ccac1848c17a03608bed61669671a10c93afc4c81d6dad06a3463ac4e4a9b7b3fb91325df5df6e0148847669d482e3cacf4fde957c110ccc1 WHIRLPOOL c1b30ccc325a11b9886de9c0d2ffcd71acd7b15a352faea20e7c8cd2ae0a2a7b7a933f7b795a417f6a64837912a2b287b5e3e91e1c428ce604c708c3549362f3
+DIST sbt-0.13.13-ivy2-deps.tar.xz 121677604 SHA256 71dc4487a7fb203750230fb7ddbda5b2b12dad6d1e9f2ed5d2bec36df962799b SHA512 3301447a563e9a83431bb67a6281a6045630669012f1cc5cdde7a2cbae3f7db75f87abed003ecf8243fd230e2adea2ba3666468358ae29c51e346940235f5ed5 WHIRLPOOL a6e66fb56e85b923142cf2fdb9867fe8f75200db01285c5e7f32f391573bf39c68be7f022f80eb679b15442c4425e87111878d0c93e8ddc0e7d4dca1f11eb909
+DIST sbt-0.13.13-sbt-deps.tar.xz 34750700 SHA256 a5897a610393c0d2004badbf82ebd40469f85f29b5d29f6a3d76b8ecfbe73776 SHA512 0bfd35a6926545da7340f7ee72e420121f2bb2f83d98d420b7f65b465d207b1b30a48788914e7b1fdf575a4fee870f2632b0717f1a7a2c19e2f2d5794d08b4da WHIRLPOOL 6b1b70b705ea613074a111e7a6cfbc2b31fd91645701f0018120ced4bd678c71e8a785922ece74111648d6ada89bfe714a4e95cb9b513fb409349967ed60d779
+DIST sbt-0.13.13-src.tar.xz 35911028 SHA256 1344e49fe870f755ab872f51368f9d939a0076e24c03bd1f7f600e10db8210be SHA512 351f18108a23014ee7ffd5c4713f390728fb98b742efdc139e094e64df7800f399d088600d245631635b0f6f4cb69c6cd327aafa3b0bf8a233fcbf0cb4ac5702 WHIRLPOOL 7998c7e95bd9c85c3b25a2c9ea584cab7651508e90e30304ede1744ca56d41d25b2b095e397c3af52025683e6cf3fb54b6992f438545f3fc8d5afc54308c33d2
+DIST sbt-0.13.8-gentoo-binary.tar.bz2 1048674 SHA256 4a2b22c9d9fbe922d5a5336d88ca21f18b2545850fec16485c824aee43df53e1 SHA512 9a5707601387d604b746ea21145a3c7735dd4b6d36541111b47519b66e5abc929ecc96ff52e144ed39a3db947204a1956e19394a1848e3fd8904f9a98ec24816 WHIRLPOOL 4fb1bde15ab57260a25b0a4a1634122af2e2b9d6cd35d3a9c693d9bba6c398bee489f05bf29a763a60d7a04f54823bdd9fc54ec5a2809900b28f890930649fc7
+DIST sbt-0.13.8-ivy2-deps.tar.bz2 124672043 SHA256 565ba7434316a3ab2f61f58b4bc57317e5c2ae7c9ee95061c39cfddd5767a355 SHA512 47b2f235b7d5883086f8246265e9081a50dcdaede43550a1c0de1c85a9ebf24b47e1331b662aa5c0faebaf22a37849ffb2c1f25a7592c461e62f582984ad4b70 WHIRLPOOL f92b2cd087d51f0ae31d5ac93d1dca7214ace6df8c06b050287007f05697e81ac14758368730e6df45043ba80167b9581e636b0364d5ba3a5c7352fafd7e5007
+DIST sbt-0.13.8-sbt-deps.tar.bz2 88352931 SHA256 d0eab3858f389e201277d1ead68352172830b17dd8343f09e0e63e4880a5e20e SHA512 a6e886f5f18821c26df28a2e8cf2773b4841854fc1bd4dfa43924089966020da5affd635da96a8e13efc7c06be6a5bf53697ca91f5fbf41efcdf8dda00e8428d WHIRLPOOL 54744676b33b11ffb350b5a543986efd5cd629594ce4bac5154a78df233619a92a2a4842659acf9c15533e764d24333183372f136b3b1f7463bbe55347c41b8f
+DIST sbt-0.13.8-src.tar.bz2 32766054 SHA256 5225864c54e5718dc68cfcd554a7215bd028947d61ed9522e2ad9d0a19cbdd83 SHA512 f6c834c6294c957e8d5b89a3a616f23a980cca1f882695d09a6e0080d1013227ba3bac86942b39c13e49fb6ac9fb72c3478df24ec8549b8b9812ea352932fff8 WHIRLPOOL 5054578505fe35b6c5f269c72b921920cf232a1efed18da5cd1833457d46f4e4342988be46539001b4dcfcfc6c807785915f4d0791af939dc83018ffcc03effe
+DIST sbt-0.13.8-test-deps.tar.bz2 40704285 SHA256 7cb252d69b5868905e0592df7ef9a83ce09f75cb10a72bc9dcd649286bb524a3 SHA512 a79ea9c81abc436168f04f674ffef4fee6f7c7a5dede5a3060e2e2bd9a9863dd5f1c7b31c02f3823fb5a67b2bb43c44d306efb59468f625e4db277cface47cd0 WHIRLPOOL 268ea150c5ca2fe1988317e0616262de814e2aa7213f64b99baf389c3e67e2093a04765ac27f08bd585fe33c77d9dd8c7a0ba8d3bd77d937d9a7260dab72c23a
+DIST sbt-launch-0.13.11.jar 1210231 SHA256 c63ade35a7a7aa0d8e3bdc7c2353ce79b045083cfabf6bc6fab88584f6100bc1 SHA512 9db3d3e953e4246b09ce2265b76463b6000c6d1c9d1328eb0deb1b67e9c955816ef67f6aeaeca22dc46e27cc71ba833545ab39c5351b8230609c021ca9e818b9 WHIRLPOOL 6650144da7aef195779c4d23c594fee9c7f79e7b2758bb2c98c83732f75656b0143ec73023a98677201502a813c0e37bbec48cebbc6fe520484ec6bd53fb4019
+DIST sbt-launch-0.13.13.jar 1210231 SHA256 9cd7d56eabfb15b5fe68c39116c4cfe6379b5b260d63086d4f5c69fa62521c13 SHA512 78e7ce21c610e83a532b04491e13d53b4193205328adce473252d523fe0ca0f3892dba900f01ff6e28d94a17c3ba1ebbe7d85fd6ce9900c48263bc4816da37ef WHIRLPOOL 20e0cd1bd836cee2b4aaee8af8d1e29812211dc5e9ecda4b058a64c26c607c7645285949751f84ea95e68cee2bfaa4cce14b14c2d602e40d9db967bf8a094217
+DIST sbt-launch-0.13.7.jar 1208385 SHA256 6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158 SHA512 ddc62dd85b552a7157ae0c19d0161d77a929adeb4ea81042a3a38c3d979e32674b9174aef47d458e9a7c8ea7942c08f1a7177b9bc739f7cd9e0484aef9915204 WHIRLPOOL 63841a401739aa3eab24632fcec41dc5c186502f4b80fe782106a0c6448b1da2321bf2a7a0b0f83473f7c073cce2ac8f5f85440d955acc191a73bd95200cb2cf
+DIST sbt-launch-0.13.9.jar 1210236 SHA256 4fddf384322c8aa02671ab89e229ab1e703613eee350e3af6c7790916d43f96d SHA512 c447e7be5b18689e4821dbde699fba230214a34059aa38441dcff13938d3cb351f1bd4266d99a2dcd40a80a7c623a14483755a461417750ab60635ab73c2fdde WHIRLPOOL 61806d9140b9b64b8a60f5f6a0e5d16bb6b16e643185b874780af0b3b32a9e62311d86e4a3fc3526735eb590a1a98f00881e60789c5b079521da660aea319171
+EBUILD sbt-0.13.10_rc2.ebuild 5639 SHA256 a488b56497bcc9966a64d9b890842925bae0d2dd1d740d6297e142611e376b91 SHA512 429e16201fed1cad1eb5bcfcfd7dcb309efb9e7d57c0f5c31a27910b736be6115dd261d783393ea8e7bad76cd7748c0a56e75a1550521ae4290adb7040c07ba1 WHIRLPOOL ad3e5afb1d9e26725804da325ce290102b402662eb2914f2b624ecca133ed10c05e2bb1dbbc2df5074768ef22637a9e3335b663892a7220c6bf87499949db708
+EBUILD sbt-0.13.11.ebuild 5724 SHA256 7d9f5d9ad83130f5fe1a554e9cf58583a6614f802f6357cc20ddc8bc18e5380d SHA512 08b8c6312c176192240eaad221e3bc8e4d0bff3eaf5f09f5cbb7e1127a44d19cc29852fd38d7c6c841c9a3425f324f4be7f159070791755415c7672e7086f8ef WHIRLPOOL dc6f1ab186af47215002ad53bfa8e099ab25d77a713ecaad85cbc90589849774530aaae15f3b5a85d6e5d5b7c33577e12e46a43699639a7e84b8c8f544cd470c
+EBUILD sbt-0.13.13.ebuild 5722 SHA256 f8b260c01e9b03ca76f5d1db26295af693dac568ea009485c6ee0bf90dd01dad SHA512 5f15598ae5313acfb0acd547467e6d7d3a5d4a1f234cf98069f189b1f4626ac3748181520db50db98898aa6729b7be5386659db445d314b5d9080adf8b47df79 WHIRLPOOL f1ab630bae02203c2cb9d21bdfe27f90a599de74efea524870082a78a651b803eaa1116fe5ed7c497eab481648c47a75b35d14dd3cf12b3eceabac9757ccdbc5
+EBUILD sbt-0.13.8-r1.ebuild 5203 SHA256 e26e2bf47571187cd4865f72a40765bf768ae6033b34cc85f16f316ec73e6cf2 SHA512 43dda65ca2fbc150b7c9120093384e187e3933321d162cd3dccf300eed8935abb340c105de9069fe4552d45d6edb7ab06a3e8434afa309f0d9b78dd6b9028f33 WHIRLPOOL b6399335d06072d607e1a6c7e689c900a30e7536b1b8bffa90c454da6857403d751fcd52d8d8bb84d815259de6636a521a1f827eb5594fbcbd1c17246ff65f1b
+MISC ChangeLog 4113 SHA256 f281e266498997f6ce2cf0015ac400cee62c547489ad9caaceef3e801f34409b SHA512 195f7c790abfd59759080556fe9dc79258f902e5d7fc8210aa3813631aa2eab5c8d0d861a8a11fcce7303e4eb7fed09e9237cc67411815f6ad00b2bb4200a3c4 WHIRLPOOL 778b3082afc485d5712edbf2a0aeda9f1d7adf1f6e6b9bf5ed2498d64a43834b8252f4fdb0c808e76178dcd3bfbfd6bf96d691a8813ecf70dc52d56e59c02437
+MISC ChangeLog-2015 738 SHA256 9e90757fa035dc535fa93e078bcfb9f76a730cb420f3c0a230b4575b0366c0bd SHA512 23b6ceaf069cf83a1634673d5636b7fca05a79a11e39d55e00f7c68efc80dae2fc1e3c0702a976bb18ef35aae49de99fed16defc14d4cd4fa0fc6a9d12385c94 WHIRLPOOL dd24694a3fb9d0ac63a064df400649ac0361de4ec8152026594b6641378f2e787d716a351011641b858d4a4ceec343856ed51ec2c548af5ffb616a5adf17de8a
+MISC metadata.xml 525 SHA256 38081651756a9f3b6e9fab49c4d56b6b0db4317d061b3eb1b01ffde7a6806d9d SHA512 53269c8f362ba0415988cfb9889a7af2c67a6788d85fbe4d9008fbed1cc0a3d3bddc2a6049c6d0ba23c28e3ad2d65f240a9085ceaccc5d55d4387e4dd90c5505 WHIRLPOOL 2f906596d590e73bcbd68619c8469a69965e08f62a65e5abf45b361116aa6bf715569699d4bc938cc1bb83cae241f50299482cfb8ea8665d4e5a44511776e077
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.10_rc2.ebuild b/dev-java/sbt/sbt-0.13.10_rc2.ebuild
new file mode 100644
index 000000000000..1c85cdff4025
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.10_rc2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
+inherit eutils java-pkg-2 # git-r3
+
+MY_PV="0.13.10-RC2"
+
+L_PN="sbt-launch"
+L_P="${L_PN}-${MY_PV}"
+
+B_PV="0.13.9"
+BL_P="${L_PN}-${B_PV}"
+B_P="${PN}-${B_PV}"
+
+SV="2.10"
+
+DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well"
+HOMEPAGE="http://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.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
+	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${MY_PV}/${L_PN}.jar -> ${BL_P}.jar
+)
+binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
+"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary"
+
+DEPEND="virtual/jdk:1.7
+	>=dev-lang/scala-2.10.6:${SV}"
+RDEPEND=">=virtual/jre-1.7
+	dev-lang/scala:*"
+
+# test hangs or fails
+RESTRICT="test"
+
+# Note: to bump sbt, some things to try are:
+# 1. Create the sbt src snapshot:
+# git clone https://github.com/sbt/sbt.git sbt-0.13.10_rc2
+# cd sbt-0.13.10_rc2
+# git checkout v0.13.10-RC2
+# cd ..
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-src.tar.bz2 \
+# sbt-0.13.10_rc2
+# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
+# https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
+# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
+# 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 (with jdk 1.6):
+# cd to ${S}
+# export EROOT=/
+# export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.10_rc2/work'
+# export SV="2.10"
+# export B_P=sbt-0.13.10_rc2
+# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+# sbt compile
+# cd ${WORKDIR}
+# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
+# 6. cd ${WORKDIR}
+# tar -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-ivy2-deps.tar.bz2 .ivy2
+# tar -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-sbt-deps.tar.bz2 .sbt
+# Uncomment the sbt publishLocal line in src_compile.
+# 7. It downloads 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.  Note: src_test creates some files in ${WORKDIR}/.m2 which are can
+# hopefully be ignored. As root:
+# cd ${S}
+# ${S}/sbt-0.13.10_rc2 test
+# cd ${WORKDIR}
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-test-deps.tar.bz2 \
+# $(find .ivy2 .sbt -uid 0 -type f -print)
+# 8. Create the binary
+# cd $WORDKIR
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-gentoo-binary.tar.bz2 \
+# sbt-0.13.10_rc2 .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
+}
+
+java_prepare() {
+	if ! use binary; then
+		mkdir "${WORKDIR}/${B_P}" || die
+		cp -p "${DISTDIR}/${BL_P}.jar" "${WORKDIR}/${B_P}/${L_PN}.jar" || die
+		cat <<- EOF > "${WORKDIR}/${B_P}/sbt"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${B_P}/sbt-launch.jar" "\$@"
+		EOF
+		cat <<- EOF > "${S}/${P}"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${S}/launch/target/sbt-launch.jar" "\$@"
+		EOF
+		chmod u+x "${WORKDIR}/${B_P}/sbt" "${S}/${P}" || die
+		local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
+		local SFV="${SCALA_PVR/-*}"
+		sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n  scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
+			-i "${S}/build.sbt" || die
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+		einfo "=== sbt compile ..."
+		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true compile || die
+		einfo "=== sbt publishLocal ..."
+		cat <<- EOF | "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true || die
+			set every javaVersionPrefix in javaVersionCheck := Some("1.7")
+			publishLocal
+		EOF
+	fi
+}
+
+src_test() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${S}:${PATH}"
+		"${S}/${P}" -Dsbt.log.noformat=true test || die
+	fi
+}
+
+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)
+	java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+}
diff --git a/dev-java/sbt/sbt-0.13.11.ebuild b/dev-java/sbt/sbt-0.13.11.ebuild
new file mode 100644
index 000000000000..e1157a8118a7
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.11.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
+inherit eutils java-pkg-2 # git-r3
+
+MY_PV="0.13.11"
+
+L_PN="sbt-launch"
+L_P="${L_PN}-${MY_PV}"
+
+SV="2.10"
+
+DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well"
+HOMEPAGE="http://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.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
+	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${MY_PV}/${L_PN}.jar -> ${L_P}.jar
+)
+binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
+"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary"
+
+DEPEND=">=virtual/jdk-1.7
+	>=dev-lang/scala-2.10.6:${SV}"
+RDEPEND=">=virtual/jre-1.7
+	dev-lang/scala:*"
+
+# test hangs or fails
+RESTRICT="test"
+
+# Note: to bump sbt, some things to try are:
+# 1. Create the sbt src snapshot:
+# git clone https://github.com/sbt/sbt.git sbt-0.13.11
+# cd sbt-0.13.11
+# git checkout v0.13.11
+# cd ..
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-src.tar.bz2 \
+# sbt-0.13.11
+# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
+# https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
+# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
+# 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 (with jdk 1.6):
+# cd to ${S}
+# export EROOT=/
+# export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.11/work'
+# export SV="2.10"
+# export L_P=sbt-0.13.11
+# 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}
+# tar -cjf /usr/portage/distfiles/sbt-0.13.11-ivy2-deps.tar.bz2 .ivy2
+# tar -cjf /usr/portage/distfiles/sbt-0.13.11-sbt-deps.tar.bz2 .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.  Note: src_test creates some files in ${WORKDIR}/.m2 which are can
+# hopefully be ignored. As root:
+# cd ${S}
+# ${S}/sbt-0.13.11 test
+# cd ${WORKDIR}
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-test-deps.tar.bz2 \
+# $(find .ivy2 .sbt -uid 0 -type f -print)
+# Note: It might not download anything in src_test, in which case sbt-0.13.11-test-deps.tar.bz2
+# is not required.
+# 8. Create the binary
+# cd $WORDKIR
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-gentoo-binary.tar.bz2 \
+# sbt-0.13.11 .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
+}
+
+java_prepare() {
+	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 -XX:MaxPermSize=512M"
+			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 -XX:MaxPermSize=512M"
+			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
+		local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
+		local SFV="${SCALA_PVR/-*}"
+		sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n  scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
+			-i "${S}/build.sbt" || die
+	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() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${S}:${PATH}"
+		"${S}/${P}" -Dsbt.log.noformat=true test || die
+	fi
+}
+
+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_current-vm-matches "1.7" && ja+=" -XX:MaxPermSize=512M"
+	java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "${ja}"
+}
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..f881129e9bef
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.13.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2016 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="http://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/sbt/sbt-0.13.8-r1.ebuild b/dev-java/sbt/sbt-0.13.8-r1.ebuild
new file mode 100644
index 000000000000..6e8a7e3062ca
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.8-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# 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}"
+
+B_PV="0.13.7"
+BL_P="${L_PN}-${B_PV}"
+B_P="${PN}-${B_PV}"
+
+SV="2.10"
+
+# creating the sbt src snapshot:
+# git clone https://github.com/sbt/sbt.git sbt-0.13.8
+# cd sbt-0.13.8
+# git checkout v0.13.8
+# cd ..
+# tar --owner=portage --group=portage -cjf sbt-0.13.8-src.tar.bz2 sbt-0.13.8
+
+# creating the binary:
+# cd $WORDKIR
+# tar -cjf sbt-0.13.8-gentoo-binary.tar.bz2 sbt-0.13.8/sbt-launch/target/sbt-launch.jar
+
+DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well"
+HOMEPAGE="http://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.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
+	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${BL_P}.jar
+)
+binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary"
+
+DEPEND="=virtual/jdk-1.7*
+	>=dev-lang/scala-2.10.4-r1:${SV}"
+RDEPEND=">=virtual/jre-1.7
+	dev-lang/scala:*"
+
+# test hangs or fails
+RESTRICT="test"
+
+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
+}
+
+java_prepare() {
+	if ! use binary; then
+		# Note: to bump sbt, some things to try are:
+		# 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+		# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
+		# https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2 from SRC_URI
+		# 2. Comment the sbt publishLocal line in src_compile.
+		# 3. try:
+		# FEATURES='noclean -test' emerge -v 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.
+		# 4. If some of the downloads fail, it might be necessary to run the sbt compile
+		# again manually to obtain all the dependencies, if so (with jdk 1.6):
+		# cd to ${S}
+		# export EROOT=/
+		# export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.8/work'
+		# export SV="2.10"
+		# export B_P=sbt-0.13.7
+		# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+		# sbt compile
+		# cd ${WORKDIR}
+		# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
+		# 5. cd ${WORKDIR}
+		# tar -cjf sbt-0.13.8-ivy2-deps.tar.bz2 .ivy2
+		# tar -cjf sbt-0.13.8-sbt-deps.tar.bz2 .sbt
+		# 6. It downloads 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.  Note: src_test creates some files in ${WORKDIR}/.m2 which are can
+		# hopefully be ignored. As root:
+		# cd ${S}
+		# sbt test
+		# cd ${WORKDIR}
+		# find .ivy2 .sbt -uid 0 -print
+		# Then add those files to sbt-0.13.8-ivy2-test-deps.tar.bz2 except the files in the directories
+		# .ivy2/local
+		# .ivy2/cache/org.scala-sbt
+		# Something like:
+		# tar --owner=portage --group=portage -cjf sbt-0.13.8-test-deps.tar.bz2 <list of files as described above>
+		# 7. Undo the earlier temporary edits to the ebuild.
+
+		mkdir "${WORKDIR}/${B_P}" || die
+		cp -p "${DISTDIR}/${BL_P}.jar" "${WORKDIR}/${B_P}/${L_PN}.jar" || die
+		cat <<- EOF > "${WORKDIR}/${B_P}/sbt"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${B_P}/sbt-launch.jar" "\$@"
+		EOF
+		chmod u+x "${WORKDIR}/${B_P}/sbt" || die
+		local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
+		local SFV="${SCALA_PVR/-*}"
+		sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n  scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
+			-i "${S}/build.sbt" || die
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+		einfo "=== sbt compile ..."
+		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true compile || die
+		einfo "=== sbt publishLocal ..."
+		cat <<- EOF | "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true || die
+			set every javaVersionPrefix in javaVersionCheck := Some("1.7")
+			publishLocal
+		EOF
+	fi
+}
+
+src_test() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true test || die
+	fi
+}
+
+src_install() {
+	if ! use binary; then
+		pushd sbt-launch/target || die
+		mv ${L_P}.jar ${L_PN}.jar || die
+		popd
+	fi
+	java-pkg_dojar sbt-launch/target/${L_PN}.jar
+	java-pkg_dolauncher sbt --main xsbt.boot.Boot --java_args "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+}
diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
new file mode 100644
index 000000000000..bd29a4be11ec
--- /dev/null
+++ b/dev-java/servletapi/Manifest
@@ -0,0 +1,9 @@
+DIST apache-tomcat-5.5.20-src.tar.gz 4796377 SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 SHA512 1efab4625067ee423cd517b565b2d368bf3e19fd5fddedcb87644bdc5fc213cc7617e62438fd8da19d9dff99e13c5d6d9185f12849f7ce42efad52ff2d4df5f5 WHIRLPOOL cc51ba272acd86b817caad22637bb8b48b40c114cf0a0f99fc6ef4e2b7723123468c117f32a92dff42b0234c4359eb583b8dccc61ee889dcc5232f30f4c8224d
+DIST servletapi-2.2-20021101.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
+DIST servletapi-2.3-20021101.tar.gz 127874 SHA256 1f73439d3d0f6e95e24d4226c10829c1622a86911a346d93ceefed5035a6caee SHA512 a09a5e0cd7b8c557fca983646dc49284350ff9cac7a288013c6c4c7582923d1b16d6e6b68c73e74bc06fad628ab81da95e201106643b8f6564f984a9587bd03d WHIRLPOOL c365c77736ff27669335152928b9fde2288dc994a03a7f04af27aa3bd9462e7be3e3b89a3f0ac070a4bccc18d852086fd8c137471c86cab4812abc70f5e79036
+EBUILD servletapi-2.2-r3.ebuild 874 SHA256 5a317e8f8132737823b002f25287fea5d5def783ff3583172c72d9899d656520 SHA512 7dd16250131c84424a81bd038e86956af8c871ca12fe77b335e2d328858fd5f30f138c5f2c7a93d2b797641a8af7459e6f401b37a914927818ddd9f132f16f67 WHIRLPOOL 6c3442bf3ce33d754e13a42666038820b024f6ddbf85dfefdd8550fa4d1b46c319f79849bb5b2636152a791299b545b0283b2622b5e34de7e66c3e4d138c2998
+EBUILD servletapi-2.3-r3.ebuild 755 SHA256 55af712391716b24235c98f5ece3e2fd7660d193a7fe3b38605d2bd80e06646e SHA512 c47fa89bab9b9c65be375b99f19fb5467907806c4363609e4b443ce7e836fdaa1a9e183c970a8c4dfae738d7c392523371b1dcca03f3b49d876bc66d15e318fc WHIRLPOOL fabd6e3976ea317849092856cf99a219a7a7dfa3d1ade82e291c4b2a8f64fa210736a7659dd7043d804e7999f06ea5b317fa804e1337f6d15239f7d97d6b62df
+EBUILD servletapi-2.4-r5.ebuild 1261 SHA256 9d5e77d2bed84585a0bb4401f0f2911097d399eeeb715b40357bf6365354e180 SHA512 4e00cc80f7ef0e92922ba2bfb89fa7c5225e97ef41288e0ba096078363c8c06894b343fa98d4cdc050cc7ef8a4b9e210da441992c304aaef11a7806433176966 WHIRLPOOL def3f808fb7cad1aa29d95fd53c88e955237a44ddae001a355c3ae141ebb3f013e562990b77a66edf61d6b431cb203717339d326510e2d2856bb9022dcada1b9
+MISC ChangeLog 2756 SHA256 388917ec4b19c3994d2ad6b18cd09c10c3c057bd4c8e5ffd81f4e9a4bd2e72f9 SHA512 bc36a0d3caef7b6d924ac91e2cb033de12391a556bd2844ef00058cce57116eb55bf759abaadc53b99d53418e186572c9307443c07ed01b4cbebbe1ea693a13c WHIRLPOOL e5aa4097595a548e6135d5b769bb58565d3a2ca39ada4bf7f96109d3d3c9708d32a606762564a542bae2eb366d5bf2ca519e8b0409e47c801da411a75491e99d
+MISC ChangeLog-2015 10471 SHA256 c6332533fb28e06a764a78d152f3d0e7c528f9ac61b12d48ebeee3d91f55b5c4 SHA512 a657b7ee74a643d5c07937b7cb57d18caceaefc10927a6f7b0ff899bb40c95c29bf8291cc0a44d7b59a6099d9aaed70b5c54cf4d2ee9a49e4936a886b164f218 WHIRLPOOL 053fcc592d2b30f69daf8f64ff3a62a86ebef3f2a232106e9ab49c389fd70a303a6ad72b6c9ca0445702ab7ddbf8c72030abb3387b484440dd4466422400c467
+MISC metadata.xml 343 SHA256 62c7a4ea1333a9631a516e6cd02f524ede7f3d7ad467feeca0777ed556d8a298 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3 WHIRLPOOL b923a685ccba79b4ef25d2e64341112df472bbc31c281179947929d3075f652d3490f0a2fdf3963e2ad83b73b19d808574e9e7b7816b0a3e8b7694534dfe66a1
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..32c3fbd50eee
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.2-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd ~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.3-r3.ebuild b/dev-java/servletapi/servletapi-2.3-r3.ebuild
new file mode 100644
index 000000000000..5f11bf552500
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.3-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd ~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.4-r5.ebuild b/dev-java/servletapi/servletapi-2.4-r5.ebuild
new file mode 100644
index 000000000000..0537d0b2a61d
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.4-r5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd ~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/shared-objects/Manifest b/dev-java/shared-objects/Manifest
new file mode 100644
index 000000000000..56efaae7ede7
--- /dev/null
+++ b/dev-java/shared-objects/Manifest
@@ -0,0 +1,5 @@
+DIST shared-objects-1.4.tar.gz 45304 SHA256 dc4cbfb58b9ffd097a2fe663a333b32c76c87814eb6b3e8277b76ba6c8d1c4f1 SHA512 f051458244a88e44c249167bfad0f88f0efa971fdadc578efcb83ff5ea805356fc68250bb4511ec181b5a062b4aba69463f212e913cf96ba98bdd3966e219f39 WHIRLPOOL c0910f4e635f01b3194c06dbd6dfd0ac0b39be66c34a97fbe023bd316653160eef7997764b8d04c05fb1f77e3349e2fc7de904e47a5957966f74f150f56069ec
+EBUILD shared-objects-1.4-r4.ebuild 598 SHA256 73fc18bd52380a1e9900562d86a8dc799cea27fab3beeaba31484bf5e7464271 SHA512 f7d35ec52d9309c761c467a497b3b4eef18aa30f030b0ea31bbaeaeeb167fe444e9bf118b97c8ddaa85adbe62df8a6d5e27dc1d486a171e60b7303245a51a90a WHIRLPOOL 5b575acb3fda84b01530e6f1fe808b5483e1cddddb271e47c1eeba1526ce4369df28ff3728d7d05a4d84feddea1c527a363041b778253ea00d5142c686081bf0
+MISC ChangeLog 3728 SHA256 d98320714befa7cbf7744b1f71cbc451be3d63a25a4af1c021112472cd1c8321 SHA512 f0ec0c480093917a8531a2000cc1c72d4b6d7f7b979da9dbd3a669023e27f0f9c11d2ab6aa30633d3577b9228dce2b19dad98dd27dcd585df11e2caf1c9e1b75 WHIRLPOOL 919e829f4493c75b1325efaa698ebb604d8aac294825f29430e0efcc6ed6e7c29023547224552789c8ba944fb084e787b1ed82eaf39049793a0891589dde0b98
+MISC ChangeLog-2015 1961 SHA256 b775368b671b3fe9b411b6d121593bd5946c006b673c7bd3b74d036549a4b87e SHA512 ad60128babf2a8379cac10ffcaad16d3823ab651d57abfbc7b33ccc5ab3f4c2d9ea1fca0d0f773c90556f52dc9d4e9f2212f4bedfc60aa6872cf45cc6b991394 WHIRLPOOL b2829dc7127af6f9c78186cb770577f9b4bb287b30cb4e45bfb0fa8c8df306c8e08dff1649826fa6fdb329d98369517cadf83b6f70baa0d520cf016ad2d77bd6
+MISC metadata.xml 353 SHA256 6cd29408840b9b60c13e728f3645cf0bef8cf472a26995388556e493e41cccdf SHA512 400b92deb52a44c66bca90bbc8bba37a66f803a611ac740cfd087769543372ea9a2861732f1a894219ac7ca98dc11919989a49d5afef05def23f7b9266f74f33 WHIRLPOOL fd19a5a123f6d6df01ca84c184af0521edf293e85af8b94a05bc0276d74fe23717494ab3db330ce97a080c82a73d3d9709b661019ac7635b2fc10754f228ae0f
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/Manifest b/dev-java/simplyhtml/Manifest
new file mode 100644
index 000000000000..57f3d0f794ba
--- /dev/null
+++ b/dev-java/simplyhtml/Manifest
@@ -0,0 +1,5 @@
+DIST SimplyHTML_src_0_13_1.tar.gz 473258 SHA256 34ad16951e1165261e81f1a23ba6791e8391888749b19429d7f067e3ca1300dd SHA512 e37140ef7461f2c741f43ce14518e224cb41ddb42c4d396f8f934476a5fbbe4d121950dc3186ba1ae603068e81832a92240e99cd25d3778574c0d3f370d501ac WHIRLPOOL 3f29e95d3b5369507f5e769501b01084667125f1a4744f24275168cc417c1d7ab48f6f5e4ea9f1ef17c933a94d868b9de79562ae8bc6db72b16da0bb03474ea8
+EBUILD simplyhtml-0.13.1-r1.ebuild 1251 SHA256 c1a713cd9cf7352d5a63b43640dac56ac7a2b8b50e304eb9e7169a3bc9ce0494 SHA512 c812b88a0ec17a6773090f39db390423ed0c61d13cb49a7073338065d445b7f83add4629612561be0a67b28cb5726a84d651bdda9733947c2024fbde64d521a8 WHIRLPOOL b47b772a00669d62b84472af1e5e718ddc9bc033a0c3c0d72a97869e9da815d1d514ca2200a39982b084d60f27a2abfe1195a42bfb4e5d16c8ce88f6efbdf852
+MISC ChangeLog 3288 SHA256 9697d140c2cd89b159949b4a5f5555aa4bd1b3f73776927987e2e28f943ac7ec SHA512 c59f3abbb5038bd0b073dd3dce579c45b13ac6da2dc2d4db8aeb904a4b444016d485fa2883c30b8e98d21fb4ae72afde58fcbb0fb9a16aedf72ba6f5ae7e94fd WHIRLPOOL cb86b09df6863842f53637e855aa8a59e519ea251817810264356bff7b09321e048445f02e4d90b78cabe7b79b157b7e8dac4e59aad816f6894633cdd65aee9b
+MISC ChangeLog-2015 3307 SHA256 eed6f6074e00d45a8b6965b59cbb140edb556d9efbc1bc60cad912abd012d873 SHA512 1f766242ce16d913e6a8327713b4c132b06fec152abec0143a4bda9875b78cbe8adfefaba22e66304858339792af60bcebcb643cf968c6d96c5613bbf2dbea4e WHIRLPOOL 270bca9e07cd991b1afdaeefa24f8934f1aa91da731ba43d4ecd20ff61b853885e958cf3ecd7ef5641401b5c5c847f98231985776d21e85a8bdfb29cef6be2d5
+MISC metadata.xml 316 SHA256 697e30150071fd5e0ee9d04299b64154b326b46e0ad3b90347eee7d8ac7d39e0 SHA512 00e41e5c4ed97928aa67e96c81ef04305929bad8454b0d5608a73da37c6c90e1421c20627c95d8f280e4bcde27e640ed454521a0fa5376035cf7021d09e4a4ea WHIRLPOOL abb382b724c63e6054daba0976f4da6d102447eac8fa2e9afb2f837fdef00f3485efbf52089df69c79ef18e1c6fcccb51647c47952ef193f1d2bdf0dcb97328b
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/Manifest b/dev-java/sjsxp/Manifest
new file mode 100644
index 000000000000..554ffa7c3a79
--- /dev/null
+++ b/dev-java/sjsxp/Manifest
@@ -0,0 +1,5 @@
+DIST sjsxp-1.0.1.tar.bz2 414706 SHA256 3ed146a4726f701ab72c11017655a69471fc1c77a9e668756d7150893f879501 SHA512 0e8e8841d87400f9978b8e053f3658f14f2c1b85007bc431681c6489ae78972cd892021821b00a37ba06098ba1bdf6954a3c294cddbb69e5cdb7936f4736daa5 WHIRLPOOL 56dd5745bdaf15e671a0d0c6fa35da145a237fe4a21b23276393b374fcfe1c61d6051f24876f21302a8da17e5174977f0873a8eb332279eae51264de486d35da
+EBUILD sjsxp-1.0.1-r3.ebuild 641 SHA256 8ad5cf3aa9c3e05a522543e2ab6841117abddccd4e17149b63af6a5921e588e0 SHA512 f528f1466ca5c58006cc6529023f687758e163bb726752e056e2b038c8b1e8804aecc39a520e3ec65e4c64a440a51c0fb96f91a48b348079d06236dd9df215ac WHIRLPOOL e3a0b5e2b93a2b94bda656cf974a2b00d9b20a4f3911d3ccb256a3ca22d7462d72bfda2c7c27db9528e55e8be1685db34e6b26597595bd77919566cf0d877923
+MISC ChangeLog 3523 SHA256 2c1ac36e19f906f2be6496b4109a4873d2d9454d9f6b4fd0b70a4eb3bcdc9673 SHA512 26de53f649c21d8aed31e5bd38554b29fd394d5f9b44689365daf38c450e2afb7aada3b5d870c1ffbd109f1337e960b78b05c66c759748cdfa0f6fd865f0600a WHIRLPOOL 286260bb7bfc7b1f05f6a445fc4ff3216ad65b4f3aebd44238a9564d221dc2e7d2893e1c5ca8b1f65096b2898cd5cf53e1d119abcc7a9de4af035e2a4cbb224f
+MISC ChangeLog-2015 1598 SHA256 c93e21e0e3bc739525e396963de4b43b5d055b4e894bed5b4313e617a8d200b1 SHA512 8ea3769db379c8d8b73b335e2e168d567f4b579888b208e923573277351962be0265ed7cdba58dc6dd3dbea4d0c08736b682b2d0229d7efbc9756255ef020eab WHIRLPOOL 81d62e56e08c5681f2b0f7915aa01bd94d8dda8937186dbb38dd58975fea712f738bacd0409eb4606d73c6798fd876f74979afb810ca0423fac81b609d79521f
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..0f84096e5059
--- /dev/null
+++ b/dev-java/sjsxp/sjsxp-1.0.1-r3.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="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 ~x86-fbsd"
+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/Manifest b/dev-java/skinlf/Manifest
new file mode 100644
index 000000000000..71b9b94acaa2
--- /dev/null
+++ b/dev-java/skinlf/Manifest
@@ -0,0 +1,8 @@
+AUX skinlf-6.7-build.xml 10712 SHA256 85dd7092c1756b3e70e95c2c2fd36745b22634fa38410a0f9ee53fe3f7983e93 SHA512 0d4ecaabdcab41095bdf94388a92812095ae40afd81229d093183926ee4ff29672c98bda8c7dc549a692c26ba238751f623eafb8727f9214759d0ea4ee9bf45c WHIRLPOOL 2dea2336cb2fc957f8ed6cb0f1904c27590a2f7f7d6fee1d38e40f0482256c1aebadb4bcbedd2788f5f8a31c4e6ec8a81111a5507cf5e947a41bb37bfec5b4e5
+AUX skinlf-6.7-common.xml 5452 SHA256 a6ea18e7187684e86797ca51f45c0224f44433184f0473afbb32b08cadc95732 SHA512 0703e8b463d62355aabba1705d7c05aeb8c700c3a494d3898c356f781172dd09e777d1357ddeb0225753b85242f2d15052733c73c5656f263875570a3c4d896d WHIRLPOOL 5fa41df4b12e66a0840074c50436c45dda822e2b88d9c794a3b9e81df5c4eb655586fa0132662b91c97d8292d45fb36a2b536af2ac1c29c3005d83801742738f
+AUX skinlf-6.7-image-utils-without-jimi.patch 2935 SHA256 9bf37bf2a74b04a1228cbae1741baf9ecd2df00530214e8848e73ce45c0567c0 SHA512 b05e63e4decb26e325c3a902d8f1391c0026c41114146462fa1cb87e9ff5431941a69615da96751689c8f3ff10fb31f277711b355778c621a7a3d38bfecba033 WHIRLPOOL 9b24f1e3b38d766a2ebd2d60920c96063cec968e9ca085fcda80fb95efcaab57a8faeb75a4bfb8e641410025489d6b8448ad958f99a0c17a545d9e18bb357154
+DIST skinlf-6.7-20060722.zip 827174 SHA256 3d31ffbe1fa1325049cb94e675971a2b8d89ae24558cb173e7e4e1f926dd7daa SHA512 e4df9c6a85b5bbdbd40af177595641a5ad55a5cb16e5a31217fb3f5badd25727e4b48fa78ba2374f4eb55224068807b5bd6df9fba7f2418b7b810b25cf2043b6 WHIRLPOOL f1ba8c9408fc77fd1d68a5c2b7834ed0f1c79dbaa3095e015f95464da0a852a892e3f40635b86dde14f6af314902f88be3e6218f313a9722d76037fa6a944bba
+EBUILD skinlf-6.7-r1.ebuild 1384 SHA256 e1d57c8aa984fb6aaa0c00a106bc7ff77459906c758eb874f880b3419e8f7746 SHA512 7aea3626973965005d19bfa764af9acf73525cb547357d72c64883d5d0c9d402d250cdd1b48d748101366b773cf873e5037eb6d1660cc19e9d6b0cc71eb68988 WHIRLPOOL ecf655a876602e5739be0f1567d6266c67f3f83fa590bf191417c63d689a385e0a87bf94811c72b3c2eb6765532cf15c867c93c656931240b61b5aaf062e7d23
+MISC ChangeLog 3588 SHA256 a26ba4952b52f2cbd85f16ac1e7b1086083f8d427b98732935b1261a2088aaf4 SHA512 9bd3eba34aaf126da5104c3c8867d11fcea1cb67a1a859cf0e67ef241d710b31495a0badee781ed93ddce24d870005feda54ce43fe585afd48428a9ee4f4d9ea WHIRLPOOL ec67bf658114a5054208f04525419591db4f92c4ba705fdef5e2a19cdf005e64f5112dcc5ae5b30f294c74e6036ab4a526a23179dc5c704b1f525e2dc1f03b4e
+MISC ChangeLog-2015 2054 SHA256 e66aed332635181c535ac02d4fc59209244a076a13510d9402e4aee56dd34d88 SHA512 f437a794f1bb2b08bfcfc5c121009b5cc5e65bbd3b35751d595457784ae37f532da90d3a552ac31e3634f5581cf1ac43b0eb97005b931b368587419f5bf67f2b WHIRLPOOL feac50540b6c88253885626a61e25474c60cb57dac102b2ee06993c9e5a6d150ef0b925e1a88cec0ac791890caec1ecc73441b296de0273e2e19de9418141605
+MISC metadata.xml 230 SHA256 fe2634b9f9502d3a74784a61fbcf092f7be0a2104fd575ec60c4d32344ec228f SHA512 476218dbd8032db6ef1b9ff1fe425808b717eb4b19668ffd21fea661bed536104bfb0c0766fd98de7c99be9677af6b17a5209ee70c7e9568e814bc6ed85d6a3e WHIRLPOOL f5bc97b89483f9badf9bcb1aeece3606b57468012f4912f8c250f3959d9510079bab84dcf31163bac299066dc282bf4464dd1cb8a712640ce9ee53032013b1ae
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/Manifest b/dev-java/slf4j-api/Manifest
new file mode 100644
index 000000000000..532a98c88098
--- /dev/null
+++ b/dev-java/slf4j-api/Manifest
@@ -0,0 +1,6 @@
+AUX 1.7.7-build.xml 8474 SHA256 23daa094dad53a112e0c4a7e2e16dd895755336c84f4314443cae2d76a0b877f SHA512 9810581760b885c9d0cd8c99da566a8d144b2e612a9a66401a9cf9e9868135bca1d8b98b5e5a237acf0d65029ba6e510bbab85c03e36742f3b1ba15380852d95 WHIRLPOOL 6c25a7f6247348fb0222b4b6202bb34b56c5bd6d8592536dbbe424c6406ae24ded2ab3669b09e1abafe3c0eefa07760c19274d1254856488095c987701f657b8
+DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
+EBUILD slf4j-api-1.7.7.ebuild 996 SHA256 cc21e972073f328427d2f021c5d231e7c7509d8a3f9ce75e2540e26f9ed4baca SHA512 b3b8a8c1bb37c1a4326ff58c3628a3bcfd1fcf985be3840eb3254c1b63212c7e8607371ed991781743e875c7982662aa870894ae4438de1694f113dab0bf4d58 WHIRLPOOL b6e8d3091d0baa6ceeb33f047c6e631bedb697f540ca96e2d4013246cf3bc84b34edf053e996025875d8cb44ab269946bd15070e49f01b938733790bdccfd7fe
+MISC ChangeLog 3576 SHA256 efad3198fcf2ac25b7b885ca94e12d609e041db91a9da2ce6574b0f12e7c2e8c SHA512 83690813617e16373e508c6363986b2c2246ca19e5f6a05a19625b05b7acff3b3401791e631097f79e48f9c243ba5f03b4ba4166de86ae972f85e7c3212b5e07 WHIRLPOOL e50616086df40e4d221ba7190cd838f19e34e7b9ade63bc6e4b7abd33d4b3b032037071f444dbe3092825ee3d2385ec4996f8f885169a48735e170f5ffb2168c
+MISC ChangeLog-2015 3414 SHA256 0597cffcfa42fbf555227b513896e95ac4cd856b3c619b69ecfd424fbff1af8d SHA512 71999b0d8f3a67e41a16d32a638126a636a8287778b1467c8085d7af7d094a3aba5f504bdd9cd3bfb998b0a9f9bbc404653261e93e426a3a1d770db2e49634eb WHIRLPOOL 5d1d87b0c7d0826309904ad4379c9ffa8524b7777014a8b22d38e2bdd0fc089a44e5700e37c6a3d2ec5346a1969e1580d0837c3c7e4447fd0a1811c0161f5c74
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/slf4j-ext/Manifest
new file mode 100644
index 000000000000..d80bfca4c528
--- /dev/null
+++ b/dev-java/slf4j-ext/Manifest
@@ -0,0 +1,9 @@
+AUX 1.7.5-build.xml 4262 SHA256 945877106a05b339fb0e5c9cfc89ba6e55ed7eb3331b6ebcc50a50d25be9fdd0 SHA512 06b9f3342928c58b10b0dfc70b1f990209da58e14b6293b2d7b7add6db0463698b473d33c305d2469dc96f3d9c8b5cac98e931ddbdcc2c100c82a30c26fa6547 WHIRLPOOL 2eba85bac9f9ac337e2700b0d0a7d5ba17f737025295ab04757cba71e7d4e21093d981a233190c298ec053a9d3e5ac6be302ae1f41c390f3b8871166f4d026ec
+AUX 1.7.7-build.xml 4262 SHA256 945877106a05b339fb0e5c9cfc89ba6e55ed7eb3331b6ebcc50a50d25be9fdd0 SHA512 06b9f3342928c58b10b0dfc70b1f990209da58e14b6293b2d7b7add6db0463698b473d33c305d2469dc96f3d9c8b5cac98e931ddbdcc2c100c82a30c26fa6547 WHIRLPOOL 2eba85bac9f9ac337e2700b0d0a7d5ba17f737025295ab04757cba71e7d4e21093d981a233190c298ec053a9d3e5ac6be302ae1f41c390f3b8871166f4d026ec
+DIST slf4j-1.7.5.tar.gz 2862186 SHA256 e83f1f22f22dabce0a78bd8191fb2d6fab71dc9dc4c8bfbd7939a87b1237c92e SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7 WHIRLPOOL 4a396c81b50b186d8e582f30331f7d0a21c85bb2cc293bdc8eff8a8bc49ae7382b6b37e1b3f585d0f14e716b1b889ac17ae1acdc03799b93180539e488170820
+DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
+EBUILD slf4j-ext-1.7.5.ebuild 1129 SHA256 c81b484fe6731b2f3ab431802079c2b74e4cea1ae00f0ab1e50d0f5f77ee987f SHA512 9a4d0f93acf858157d59207d6f1e5fc9678a2ec24056743fe57d9d89c3fdda2908cfe125763d05f9b0dde5cfbf8218e01058d71f020117757515d9ab20e47de2 WHIRLPOOL 8b7a4aa4213514c359823d482598dd0c0264115d2d334d826c35f31afc950526e80e985a505e243799096181336494656dfa038218b5f9a54e0c0d08944f8cf5
+EBUILD slf4j-ext-1.7.7.ebuild 1133 SHA256 f97325ee34355a634ef181cea055af1bcf81d8a158d09a2c01bcba7adfcc1112 SHA512 bf5435e1cca6dc861477cf81489753e59b470694e85d21351abb44ab2d1f9133997e2d896f005b50d50cccaabe4524a8efa0ee4f1f7c952077423635d8aa0e7c WHIRLPOOL a8e1a8b48deed15379af7d2da7989d2bef9d178437250d9307366734712c6184f834632bd4f570786b27b2cfe231a44f735dd9a54510657607166dbc0a649ba1
+MISC ChangeLog 3642 SHA256 ff72f4fabdfadd96612f74d8e8ebcc4dfd8bc91830446e12386d289318ef4ed5 SHA512 a69dd502976534bb54a29ca74d38ad10325e9b2203b9b2a8e5859aa2a82a7777a0acf8844adb14da60a37d35099c391163fe4d3de19d299ae54ea4f87e4a6c2c WHIRLPOOL f8a33b2dc263393e0244d9a435d5888b8822e9aed49d9c2701241bbecf1dd8b7dd30a642ebcb2cab641e0c28f296260485d119f8229fe70c4c42e7d4a4f35152
+MISC ChangeLog-2015 395 SHA256 fcc0cc9694418e644760cda0431a8e975357b3e1bf3eaa8fa36da78e41a000c9 SHA512 c42cf67d86cd15adc18692f99b47ee40163052128da31fa9438420b2e90106bbfeb7f0b724ccb1419f0a7b7070b95f9cfe12fe2ab7900032ca04328e7086ad18 WHIRLPOOL 34e821dd0c00515426e0bb6cbbcfe669ca4f32a54e8233426aaf270949441a04f94ea6a22f0b37adf12ff8f0f18bb7401854e940638f5b8d11cb79179133605a
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/slf4j-log4j12/Manifest
new file mode 100644
index 000000000000..3cc055f2e238
--- /dev/null
+++ b/dev-java/slf4j-log4j12/Manifest
@@ -0,0 +1,6 @@
+AUX slf4j-log4j12-1.7.7-maven-build.xml 10522 SHA256 291cd2f4afcd7a6d7a1e762137a6590385c0658118d645a7430def53373bf1d9 SHA512 169e6b50e5ec5e44047dae2be9144e1626e2a5e95a0fb92c61e01164804433887e7e8b1c0108ef3bcc7dbbadeff9eab86c85977572a80825bdb5ac2914d65ce9 WHIRLPOOL 097b0a38f307e4ee59305975b1ee233e75dfb926ffe2068ae095691169de50e66c56c37a0c30609f142073d0f6ac08aff7920270f332640440bca20b2a5ec441
+DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
+EBUILD slf4j-log4j12-1.7.7.ebuild 1169 SHA256 0b6824b05e35f42f9de3fe03b0671f592dc4f0b28fd1f178f4d0a5f527312f1c SHA512 047fc8d5551d0539045aa406c218c4104de000e3b63659075a62879074e7f8caa8a922b8b5fe4c2b29da48e9308c9d925915d63bf9d28e08e95e7a0b7bcd6164 WHIRLPOOL fb2004d85f0c6ed37b218e9a123e1b720b289b1479711a40f0f06addbfe987eb63f14b9be687b89806ea603126f7ba7d1dde8fb9250d6d91329a3a33d993eb07
+MISC ChangeLog 3460 SHA256 dfc2e64dc6abec16269488971d421cdfbf4ab088ca15b5b1992893a920b01e22 SHA512 5e4fd472010c6c499c6378d29c147a37ae56de0352a15aa0360169161ce4e5b758c9727e98c5ce4cd9089393d1be3c2492846ee79893a8c5b3bed2113c8f2f59 WHIRLPOOL 411ba0755fc38bd97b510c82a91b29c7c0afdb503474f27e2fd8662fd76338cb89f03d9dd27569abeb75c196409a4fb7894f98760b4cf5f8eb4d03a0acd865be
+MISC ChangeLog-2015 722 SHA256 cc942688e1a11fa7d1b555f09da70877fc8bdf5caad1787232899ff55367a55d SHA512 eba38ff7c4b45cb237ddd5658a6ce247aba24b907a5adeb19dd3f92d1d8ffc60443a46759045f90fdd5c8f8b222d2000a1b8d2f9cb04f0c171cdcaa4a2fe7ceb WHIRLPOOL 9cf3b0b5334a83270d3f55e4490e04d9a9684c3afaeacbf41f678a7e51352049ccffb24c6fad0c2b77c4a97506648a8815f9b268934060e9ac6af0f0d4c22a73
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/slf4j-nop/Manifest
new file mode 100644
index 000000000000..5ffa2077ee1c
--- /dev/null
+++ b/dev-java/slf4j-nop/Manifest
@@ -0,0 +1,6 @@
+AUX 1.7.7-build.xml 4261 SHA256 edae0f478143823af89da515d450afc84821e8e559aaf3d85ced91638826ab3a SHA512 dc29b7acbc159eb592417a9457875d9f7c33ac21df87885f6a3faa8047f68550f16f2b8a24f5b8efaa123b1c8507ec6cd9d61ed154aff0406bdb008d62132120 WHIRLPOOL c6320db995428ee294356ba99cd0bdd51d5f3765db06dc0bf6127e7dc1fe8935e32caecc7751b8c103617a3361a3893119f64ec78051170b763aacfec455ffed
+DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
+EBUILD slf4j-nop-1.7.7.ebuild 1080 SHA256 aa83198474a41a237fa9229d20e5958753b72d79e35d148dc158f1bc7f271ca8 SHA512 d2436dcb4b5118743c425445d56a16073d0c68322fdf57262643119e84592ab9f0a2439a6308f3e6edd6d521284fb4722cf39f2678b2d877fb57048152b32b75 WHIRLPOOL 8b94965ffea77c623f8c8fbf341dac5360a7f83a669a1a9dcc54cabad55e266248a547558b75889590c74f19f9cefe1a2a2b0d36d96cb788ebebb71bbf94eedb
+MISC ChangeLog 3375 SHA256 5c7378b13968d7cd22d7e62dca9cfb105b4d20c0ac43cbcf8f30b0ce9e93b73a SHA512 ecbab44c527ccfe30c0a77cec562a6167448c27e609fdd5d60da78bde4b552ad357b54e498a764a5ca643e62ed52ed49329d66b8ccb994ac8e26b8e7358a47a7 WHIRLPOOL 0fa8f92f16002c072aa9a4bd886556989051f723899b958ce5ca3881b690be5b4fc5140cac1e84fbb7fe38113da2418dfd09efe232e05ef8cc7d22ee08c4e312
+MISC ChangeLog-2015 1960 SHA256 95267ad1ac964d02ca40fec64049d5cca4abb4c9e84c146fc1b5c4577535e04a SHA512 9caf8c24b1cecaaa6bd8cc1cb20511e14736c8bf161e37e532bb8801c3b79a73eefd4438ef0345ed7f3f5f09792f6a1ceba20d133aac75c20df8176891014ca2 WHIRLPOOL e4b9da0adf0be913e72e8f1324f56099b00b305516f77dfd187f137d4c531279c14f8b42acfa48c12da0f5e9c86a9b056fa13c144fafc67b9ca3bc63a0f3295e
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/slf4j-simple/Manifest
new file mode 100644
index 000000000000..d25adaa4ac40
--- /dev/null
+++ b/dev-java/slf4j-simple/Manifest
@@ -0,0 +1,6 @@
+AUX 1.7.7-build.xml 8491 SHA256 19d312b9a29fbeb90b1ff3055ec83cb8f2024b9a71b16884bc10d3ac6b01579b SHA512 8961b303c86000433af761d448c016c13d105d99547e67ace24bdb2f9f95427bdf4a0d4e02fdaefced1a574d2968f9af7e4429e33fb85d1ceb8439036c888917 WHIRLPOOL 8bcfef2d4fc47559e1716eaa65deb1d181d2f091467e54e0843684e9d64523e8450b16bbdae37c016d93ba8d22087b9bfb6a301f5e5683413b1d3a9db4d8391c
+DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
+EBUILD slf4j-simple-1.7.7.ebuild 1096 SHA256 e17fa6f1746d196f96b725df3cf73a31ff104af9c752da1200086c00d826ec99 SHA512 25ae34e58d5e134d327038934c4d582355bdc38e4b3da505999997118e829e016fbdac201168981691262f61f98b19141db8521b60a95db1f39d4c45708edb64 WHIRLPOOL ebc486aa55f20d43f8cb6b44b4e5377aba7988147404f7a7a2bbdd604b16cc1755bca513bcf7039fe9b89218d5b199b6992ac7010b394bc6e9d304c62f2e99ad
+MISC ChangeLog 4116 SHA256 25bb75fb92f58a9c0c191a416d2507e749b30404adfe97df850217d4fb445f5e SHA512 99d6f24475229b1371720f43e01f166dd85acb90494f4f40ca6bb29ada1de712e434450c8da02442074491b72d194e5d48cdb2fa476134680d60245eb1ef1583 WHIRLPOOL 7d041fcb7f9979dc55c3b1556c18b932743b36b39b49f2811a9aa3f537de01a35af5b7bac1e9dc672306e25ddb7d0fb49c9df160169f77fd9ed9f34427501a7d
+MISC ChangeLog-2015 721 SHA256 f456bc883361f6364c39b1ecb1dcf542169444eb16213bb4d1a375f8c1e52fdf SHA512 adcf302fc64e92313a934be270ef2ff845bd776a927619ca0f93b5a669c7988318391b8f76a1f10706b13dd179d21ba6ca97227b5c65cb38c74478d681104a01 WHIRLPOOL 294a1c0823142ee3ebf083034aa798c2980f150f9cb97e97212c50bc8ad3bc8c1b274a5c50b71f4f67f3a625e36c42bb07d0b766c733bc3bf8b252758807f127
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/smack/Manifest
new file mode 100644
index 000000000000..77e8e5d4bff4
--- /dev/null
+++ b/dev-java/smack/Manifest
@@ -0,0 +1,5 @@
+DIST smack-dev-2.2.1.tar.gz 4052596 SHA256 8706d0c2fb72a94f3a8c33e720f49fb3ec5179ddd7df87d484f86a775b176814 SHA512 a6f6f70a61dec69ec2f3c82544f83100bf4ef39aa657ed7a8ce635be8484d3ed2cb539961286482ccc9f607520e0646e14668a17b4004ae6bd157b3d894146f0 WHIRLPOOL e75b979afe34f060b84d687f501e9f028fd97d3693647d346ae81bc9dd468819249931fa34d1145b781d875e65e9a83c6d60f6c477e961f9df9c6a4a8d1949d6
+EBUILD smack-2.2.1.ebuild 1075 SHA256 d6c8f62fa21167df4dc30dbd8e2bac1ad9ea94a7547d4c90bf5c3a82627b8548 SHA512 37aa4c56a4c3aa0e9e01fdd078afdb36ea9a4d54072b7f95a82ca277ce7e04da84402d697cc33a7e4f4a1778009c7a029c42360a9c0813f6d889343df4e74e9a WHIRLPOOL 53f9aa8229591fa363a6d32f1789bb69d89cb68f2cf4c1a1ce75307c8577bba264bba2c8fed7a6457e3dc9490252dc81ff491a98c6a31dbf1b7588274d21a7b6
+MISC ChangeLog 2557 SHA256 4a368d4f61298100b6127d1ff7a05af318f14af8ba82e3863fe50da98335ec26 SHA512 4dd2e1a3f8496ffa2f8fc0787455607bcf7e8a973fbd0b98bb832a379c4836a06c3a0c8f1a96de653ca45dc4a92c17265313d4899dba7bc5f64288164dcd1fee WHIRLPOOL e7a37b46f72983d7e335a03fb655794703fc90f8db2da089e59977b4c6be0e9b261aa0467eed4f099c8636f162de8ae59138da8f6eca81e981efdebdf213ca22
+MISC ChangeLog-2015 849 SHA256 adc50729d1061c13e1b6e5a347a2643743d1ed9347b517386bbf77dd79f1547b SHA512 4d7388d417df6590b820b1576937fa9ecd08700f7301b1a06c17297d249b355d786283abbd35f03aa1f5484c57db8a5e8de96553d78672b3a06afe1d13e0fb67 WHIRLPOOL a4eaf946e206345f4a8cc8bfd9b9c8b25d3bc4781e3113f5a2e57f8c19ae60f66f4defcdab8d69332c55bc3875cef0893efcee2f6b04ee31dc2c669e06d242e7
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..db08399d82ab
--- /dev/null
+++ b/dev-java/smack/smack-2.2.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/dev-java/snakeyaml/Manifest
new file mode 100644
index 000000000000..953a1b2570fe
--- /dev/null
+++ b/dev-java/snakeyaml/Manifest
@@ -0,0 +1,5 @@
+DIST snakeyaml-1.16.tar.bz2 234954 SHA256 cc85e6c5e21ce16b84d2d8f73e145ce285a9f6e73b34fd22ed7859ff6ab1a4eb SHA512 77ef0b1fa2ebe7ab1618745c407436ac6965159e29e1271b0d571006b967bcd94658eb3a8047180ea7c3160eb66ecbac1f24414537a24a81c11fb735ce65e3a4 WHIRLPOOL 68e898d6142d7fa3c5a801e6772f1cbd4caf173f1ba84c4244a11d92b6d6d180e69df9fba2ce9c63337df90baa492851728dccd00201fd5c8abc640ec6e28d72
+EBUILD snakeyaml-1.16.ebuild 1306 SHA256 bdf03c198fbf207301765be5affe3e5dfbf148923b7c5a688c9d4a1222a8061d SHA512 c01f82279a4990f1d6a23790d5c3eb69ffe996836fd1c594cc30bc72612398187b7ff2b8643e4593a79cdb9142ccfb536f6980e1d1818da0b57edbe5bed8f746 WHIRLPOOL 5c5bb6b2815f5179ec27eb41cd415d73b547f3d1b859dc6ca471e96ab36f7f635fc28c4f52179b3b94308f43a207650b9a5d3b14caea92bedf700e95b10875aa
+MISC ChangeLog 4760 SHA256 13df2c43dbd528107c28a9f667a970e34c5437644000f2262a8c54175bd2669b SHA512 a79c4464fea9c23a3943775b819b149d53636b55d6cafa42f30ea70c89b610a4c4bde15847b6a16d1c3e7c85cda3abf6392b4039d7979d4ffa4067cf43b3c093 WHIRLPOOL 5535cfa828653b469adf25e15f5d5a88e36f45d49fa38323d6229604b2ff55445dad0849f3f9f002891430c57eb458523e05a99fd5e024bc526aa70d7e2f80b8
+MISC ChangeLog-2015 1034 SHA256 ea8edf2a26197d20064016eeaf181e66965b66b0452b6f453a43e6db04a7bb3e SHA512 91f7172b3932926778879459d5ec6bd106fb29ccb4805f0b2007d00022a74202057d09b0e9644299a9e99785aa97e8250055d62d4231fde067fa735543b7615b WHIRLPOOL e46f444c9ceac5ac54f4f31a458ee29d85f2bf6981003c8e4df12762c1248b32903e057faf4acb653e8628b3b05e598afdf9fc5980e232cf1051625a590262e3
+MISC metadata.xml 320 SHA256 26be08ac182ce0d41828c0e2cef4d5ff99b2d983e4c0658efd8cf5c30e93fa24 SHA512 149372d821a11d3dfce7ec38ddb98c9b5b5e64c513fdd1e27b74dce17f398eec6d24b5a61ad62fb5e6e0ee31f206f1ed005db953f5f2358177f1a1d56420d5cc WHIRLPOOL 93b79f420ed8a86c1905dd3c25a0b59ec396ba62df540e890fe4a0bf10eab45078dbed2f0dbfc91d827d33cfcdb8de1c6e2acdc3a322f493f17386ccfc261560
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/Manifest b/dev-java/snappy/Manifest
new file mode 100644
index 000000000000..6eaef731b7de
--- /dev/null
+++ b/dev-java/snappy/Manifest
@@ -0,0 +1,12 @@
+AUX 1.0.3_rc3-gentoo.patch 407 SHA256 aa8d95e15fe66d7d8bf86450316739424dc4a4e76d702c78708fdc9db5ac79c4 SHA512 026299b83596c93618c92dc5d1b02cd982e179fc9a65ddedcf482fdbd63c9a3a8fbe85e76590fc1dc67183c6dd332226ab7868e777e63dbf930d92b53a444c7e WHIRLPOOL e7d07b68ac7499583351ee369d03e5455695b99acffca0f4b2e966501fbbcb0b0642c1f00c817af0545b55fe0d892cc9ff6e01646103281202051af77a31f89a
+AUX 1.0.3_rc3-unbundle-snappy.patch 1823 SHA256 691fe347820cf019873ef5e3050b46c6808a5d05c912d897f80972574cddea08 SHA512 ddc823700111bf2f8635c6ec7291ad3665506fd24d9e5263bc46681cfd3d34e604397848a9b78929107d7de3bae0c3802bc8bb642dbac1f4984565d04cb71115 WHIRLPOOL e339a6273c70d2d143a2b0cdcd4b9ee9072098645bc9c6d913605252b1175029a65d6f341427e928ae5271b8b3be3909c6f2356f95ce6bc57ad44584ef5e9156
+AUX 1.1.0.1-gentoo.patch 407 SHA256 69eb60e428c7436031e06f2e5797198afd4c3aab33558af49dc1c263a2e1ec88 SHA512 0e12de9c8b1c86791b43565312a12c50036cd501c5eea5bf45a09408121b99d79f58a1047acd26202afbac246f1264dfa86da785705f83f9db1356d824c9e40f WHIRLPOOL 64d7ed837aeae5d90ef2b36fc5e591c6782611db9771cc9f57e585860eca650efcf726deebc43afedf018036bb93c3bff474c0a59ce9e06605a16087e3138053
+AUX 1.1.0.1-unbundle-snappy.patch 1780 SHA256 3ae923778eca79b59e31886c6f6d4eb290f8c413e7a33647f4fedc8dd6884175 SHA512 75553615c0d6c5a24c14820b09021c225c89fcf2c680eabb27957cf45f3796344745f546939d0b98d78aca192c3cd23bfe7836f6f1c7a0b03748f084579b65df WHIRLPOOL faeadb3d2b3dc55f881f78b4492b97925aab5bc818eeb29a667c697f3be7100ed05daf24f305bcbae05ebb71b0983828f58f16f96c0e24c6be710d1fe36d5e0c
+AUX 1.x-build.xml 8496 SHA256 12134ec63ad7d73c59e338a3f0231698af8841131d32611d4bfe0b31599d62b3 SHA512 ed47379879bab5cbaa4111616c3cca526725e4fa3d8d42da72d19a21738cc42826e37756a181e6d541f27aa4abe7f2353be90c51f4d89d04413501e6ccdb4cb0 WHIRLPOOL 7dd0ab415fd67681d0523fbdd5705d77c5225f6a4e20ad223d56f4aba780deb572715e832c671a93364dfd6659022a57e33c91936de0330e26552ab89b09c3ad
+DIST snappy-java-1.0.3_rc3.tar.gz 5466748 SHA256 43e977ea09bf22e65d8a2ac3ba51f0dd5b3fb6e750bb5330980cc71631ed1a22 SHA512 eae4551d929f951be204218926cdea773a337ad584bd6fe49083526430a4e1ea80b395a627ecebc861232d36d2ec9034f2ebccac885da13e93fb74846298ba64 WHIRLPOOL 48e166ed6a297122eeef883402cd74f6995d34b922af70464b390ac11a6e91fbb5497e4e07a932233f8e69f714f987340b79e985bca42e6bd11bab075672745d
+DIST snappy-java-1.1.0.1.tar.gz 4909520 SHA256 b37636927766e649d811c6b6874360641e86a2839f23c60e460da9c3a5d74dbc SHA512 32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e WHIRLPOOL 5d088cf6ec11512745b0a2d7b454e1a4155794d0045c5dfa8e42c9d2a99e538208880f52a3a908f5ee95f97e7c9ea68f35b2a1950e4275d27b39654b8914cf11
+EBUILD snappy-1.0.3_rc3.ebuild 1451 SHA256 85fb86cc74aeeb650550cb820908695fca087ada4db1b0cd58556b4d2fe76d1b SHA512 268de9c4e6a5edbd07cb48dab62da2120187d359e16496457859a7e2772c1add9236c4b4bec3d64f28153b9a7db0d90594d2d3aac8e871e048c7373e4b09f271 WHIRLPOOL eaf51810fe970fb8c81b24701e759d39666c502762b49cc0fadf0a19d480da80e808306d84469240aab86bfdf72c540f23d6c022bf8eec6884f60d3cccb585d8
+EBUILD snappy-1.1.0.1.ebuild 1466 SHA256 d5b18ff95f9bce3063bf1f55ad27f3bfcb6e8177142ffd0f8638a53bd6352604 SHA512 ce574f4a7f8fe94d7bc72206b1330645249c7f538adb573a5a289d39475c4c05f38aeece92004a9dbb586511b2729fcfae977b99567476a5f756c24cab256d55 WHIRLPOOL b4de5fbd213d808675bd9e8d5c5697453a2f122f0313953196b3dec0c488f0f290b79ccf03c0938a9b647f9fbc2ed89316a131f6ce7a44a89ab3a8ce233630b4
+MISC ChangeLog 3045 SHA256 c9653a247ca2c58a84aa87f96a85f40d85ae227cac98f2d9eb0db81b3613fcd3 SHA512 d5b573377ab953268293c4055b713afa3e546d341687e15f4c767e46c139a9dee81f6fca970430f8790c3bf8a4fa2d8d942be725fdfb68e66e00ff5ccd0e6908 WHIRLPOOL 99197e9ac03045eed1ab199dcdab35cf4d7fed7008a4c7ce16b66bb9fc8a39cb0c69218c8dbeee78ac5cda0ad7c5226b9b0430c9c33a04db9dd07f7512f53636
+MISC ChangeLog-2015 695 SHA256 e2b026616a3323201fb66a05fcee2b0a9f46ea9932e70f19b38967f01670f797 SHA512 21b410fef3ecec62b7197e148b217023ed14728fb9ee889c499ca2f28246c9656d12f2e83f93cf7546ddceb28aec75f20dfb2e5729bed662fd4899dbc6df024f WHIRLPOOL 51cc79f35bc42f957eb3ab606ca4798d5f803eff59fd836d250491369a2aad259ac15c42ad3ac71030e5568ea75448d89b87850cb03839684b976ab9f01f85ee
+MISC metadata.xml 319 SHA256 f8aea86f679f1866d4ca0cadca2ca6cd4264de51a702820b4b1483642f2ed233 SHA512 c652d81b9f2400efd81da0f61ed764ef80873e16b5e04d6c5689ec7633f34f83065edc2f2a7f7fd0443770e281befb5700c3416ea0aa74c548a85e337a9fed6e WHIRLPOOL f3ce2869be81e90bdd2fcf51498a17dc2192fbd2bf067db717faed7cb0dbc05407c7eae663231c3574201874d332d991404cc911c224d8e632135d91a62d5571
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/Manifest b/dev-java/snip/Manifest
new file mode 100644
index 000000000000..9420b57ff2ec
--- /dev/null
+++ b/dev-java/snip/Manifest
@@ -0,0 +1,5 @@
+DIST snip-0.11.zip 56801 SHA256 c5fc7c7c006ce4821cf143d94da29d99e7b6c25db8d3295dc72702bf05f89f33 SHA512 43ded00e411247c69882494cec1ee5322a0be273982ee37b2501d143259686f6d5f52c99b430ebad96d799aa42bb240b4a5130cba0b3fc47d21c70513e97ba93 WHIRLPOOL 145927ae16a5b067c41ac78c8e388bbf884d0c0feb7a6f53e6cd410cf51ebb744acf40f5f15c16bfe9056614dd312fd662f6e4cca3d430246ea55d3f4837ad41
+EBUILD snip-0.11-r1.ebuild 724 SHA256 f8395c0162564d21ec0a6b78cc012ff4d8d80ff992e6ef1b67720747e8bc1f96 SHA512 60f602e0be62c6133d6fc8f509827bf0edb5778c7dcc8eea1c9ed4ebf2f88f23c7561e26912e54e9edbf27a89801ceeca2a9090b1042392a575e89c0f66fa818 WHIRLPOOL f0e4f651ab5e187d333eef92b0d0d236e54ecad6891774423c995111b1a5ad3701ba385b53e61d858195fd90709dcf882a457b2b5d1a3666cbd2d069a94ed859
+MISC ChangeLog 3140 SHA256 9c4a29e6c826c3b09a2b10594d9012cbc185982b69a10cc5ef3cca0b9bbb4918 SHA512 a7c6287e1859f4e3f74c2fca60bd3677e87a4084980212b3f070f121ce7f81180dd07dac58d2afaf33a3045d76c77da7a9bb88f235854d576918d0ceea63dc8d WHIRLPOOL 1b4b0d0563947849460ac67cc992620af991cca98248d5c293316821582d0d098d1c75734c3e38a0716d84b45f859ace563bdb5d25d0e65ed3374ec3e29df69d
+MISC ChangeLog-2015 1346 SHA256 c13d2159901f08d0557c3d0fe962682d5d8d0dfe3782998c4f28572c1c4d4338 SHA512 621301ea392d52944cc49dcf22793859a521a960beb394f21c3eb5a0b82ae9680dafacfafdb4dbc0d3a2d0603045b9b9180381db8d0ef506bb3398299c587ced WHIRLPOOL 4b7a185adbae9a71aa4f9f1846247fa3ddf991e216abe75a20097ce22c015408b128f8faaf5b5fb496d00e055a7452787a1dcb5f608ad32b7c4ad13857599b97
+MISC metadata.xml 638 SHA256 4acca4b79bf78644efaa3fe3cc3e43db9590844e017eb5e14fd25eef2d0917a3 SHA512 198940a6ae7c17c2833b429e6003ecd0821b8d687a568b3f487fd4d3bf616556814b07481954e0abdeddccf411101ed3351bbe29e28e0b0e4f6024b3abd2d1c4 WHIRLPOOL 5ff6a4844997625306ca3231c36ef59b1ce26f3d1024f63624516bed16319dd08ad66c594db927d903a9ed79377e79b7d2d61fe9da27394c44472c417e7d5717
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/Manifest b/dev-java/spice-jndikit/Manifest
new file mode 100644
index 000000000000..1279a6bbce2f
--- /dev/null
+++ b/dev-java/spice-jndikit/Manifest
@@ -0,0 +1,7 @@
+DIST spice-jndikit-1.2-src.tar.gz 23084 SHA256 3001e72223786e25a132ce8c41ff5e1d9fd8826e98122d5b73517aefd908e11a SHA512 bdb508eac32c8dac05be45553a6877e214dce4135c9ae96b95764254df4c0e57f2a7be3905301b096f140014e04e4fe6b517b7757553de26d73a513f7ff06244 WHIRLPOOL 62206bd937c9a7d9660ebda84782edcd08e331e48e389135a7b708999166ab122ce318aeac14386bbd091407c24a0096c14b72f42a073413b21a2bc65086cc3b
+DIST spice-jndikit-1.4.zip 55185 SHA256 74bc8619ed53219c7498cb7ef180098fad8fdd0b9ab62ba201a903cc3438bdcc SHA512 798a1671cf79a9ecf7777a2b5b6caa0074dcca97cecb445c8dad9a44144cc71fed312f7a13d4b7e12f09eb23b0525b38bca62d67866db76f03ceb5a7a0501501 WHIRLPOOL b3d3236a37a037d8c6f51dc8940b9539f73d1803a5c935b0bd9a625afc443b54c9c737a96a49b08c123fe48800023f8d821b4345b374829c171e7136cf16f186
+EBUILD spice-jndikit-1.2.ebuild 1105 SHA256 cfd4e59e29f80752b4f295528f124692baea43fd4e45cc4ae47bdc5c0985ada6 SHA512 ebb2fe080801bd9e0e12e1fe7f8761331e992ff48a035867f54dcf1a63301eb95f65baceb3320fd292a4e031fa3500b14309413d60fe983f71e34ae54fb970a2 WHIRLPOOL 2ba7ec1054992ccf55ef5a95c6dfcbc6ba1c8680a169c39b6ea25cbfa3d0a3081f514440e1ce240ccb9f12a4b6b038dae7e04307d8041a9e5db5bd6c7e43e415
+EBUILD spice-jndikit-1.4.ebuild 868 SHA256 d0c82fc66c86706d4376904eb64bb69bc4e4cfd82fc2be148819bf2044589375 SHA512 c42bbb64c7e51c2f34aaf7d09c3f9a958f75acb85364f6b5e3e9f316f2aa4c57ac7feb70388fd3a6992d362b112fc57c8f4d1d01c873997cb756329e89c9011a WHIRLPOOL f443c0aecdad5d2fe24b05e6fd0ea9e03d5b5a3c6a5dd5d5e12c307241bcc9ef58c36b25b88a106f97dc1ed2f09d3ba617976ac215f2000712090bec60f0fe0a
+MISC ChangeLog 2621 SHA256 93d20e366f9eea3513dc0dd420ae9ab4ffc567ccccbd55972857531d7732986a SHA512 901767ab4abc22a8cb3ed12630751d9d666214e1123bcae0f39764d839ff9a9cad37751beb4f675290fde751620e462f3bff9b8715458355e5ccd92db8be58e7 WHIRLPOOL c309ee42108140d1fee51014b904805bfa04fc6f82c76ef5322140f87e675fbc4c430a03655abc1d588cf09d08262170c7569489e473266c70c3c4508b0a9fa5
+MISC ChangeLog-2015 889 SHA256 ed9e247fe4cacca8174110d2bd4750bf7e48b7a9ff9931d60a84b17193205468 SHA512 74781afdfc24f99b5d24b822d2d264604f0563d2dd729a1c7b9f1daa7f52364ef2e1e84acea0587f21ec4d2627ed074c5afc737c808e077fbfd637cfee557ae5 WHIRLPOOL 56176a726726e793f43c3174fffa4456a7e93249e3cbf68d121a6fc3be250184c747431b8ecae1b19c6c71500c47017b85aaaa1ff10621006640495ccfb9176f
+MISC metadata.xml 553 SHA256 466b8b0143ef9341f0c4c0d90917728232bc630e6ddf08bb18e7f82a67612862 SHA512 53926ae768029abd0e9bc1a4bd55c641c0a6547e0db60e0538bef4f020ac018ab2617cd925f1c81852e1b92d6da5f97ee792f3f400329dc750da77e533517976 WHIRLPOOL 79b633476c0d6dd8df4a43d2fa828e7412a6eb3bc261a136309553da1c4d9edf180549fe8f22f86767f602fb7facf26ae6d08ab103401b9b0c406e9fbc59815a
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.2.ebuild b/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
new file mode 100644
index 000000000000..5b5faa9594df
--- /dev/null
+++ b/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JNDI Kit is a toolkit designed to help with the construction of JNDI providers"
+HOMEPAGE="https://github.com/codehaus"
+SRC_URI="http://dist.codehaus.org/spice/distributions/${P}-src.tar.gz"
+LICENSE="Spice-1.1"
+SLOT="0"
+KEYWORDS="~x86"
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND="
+	>=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	java-ant_ignore-system-classes
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	cd target/classes
+	rmic org.codehaus.spice.jndikit.rmi.server.RMINamingProviderImpl \
+		|| die "rmic failed"
+}
+
+src_test() {
+	einfo "Tests need a network connection so they will fail without it"
+	ANT_TASKS="ant-junit" eant test -DJunit.present=true \
+		-Dgentoo.classpath="$(java-pkg_getjars --build-only junit)"
+}
+
+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/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/Manifest b/dev-java/spin/Manifest
new file mode 100644
index 000000000000..4c25057b59e7
--- /dev/null
+++ b/dev-java/spin/Manifest
@@ -0,0 +1,7 @@
+AUX 1.5-build.xml 8638 SHA256 3d12461c120fa893159383093dfe93386741a9b3df4446679215501fbe9b88df SHA512 8126661b264cac4a86dfbd646a8e88598075173479d1d952dcaa3c756793394bb50ff1bd5a57f4a4a86cad99d4b49cd5bd398ad608fb199a12adeecb64228583 WHIRLPOOL b47941c72060efce4564ca9227b4229f369fb4d45d43c9f996e2214265f9651b1325d627fcc566605071366dc6c0833590cc86537513ddc392053b52543d24c2
+AUX 1.5-maven-build.properties 673 SHA256 786fa052cb592effe0fa867f8c670665bee7b6770d6e07a8183aa82f1fd599aa SHA512 1004515f5a89a2d22409cd7553fb11767a4580d1288393516f4dc3c0efa0c149d7bc3e46fac93800e6481fc7885302730e52e9e518d6d7224a0d9220d0f3c3a2 WHIRLPOOL 18963767a383a147b3dd054e0da85a15c54d4ce828b481ee83a85ee15e4fab25f1ba16b8115affb09a89951ef077706c24f90ebd0de3d537441988c67708d979
+DIST spin-1.5-all.zip 482286 SHA256 5515bb6b6724c856e94271bc3bd11fcc0170cf37835bf5fd93026b98c6bf3594 SHA512 ce1fad3b138781359d472727b186722d6f1f23b7002dd1ada294efd80b3a9caf5de15207cdd682fcbfcafa85c63895c7dd9683fefb5ce5b09cc4115ae3733466 WHIRLPOOL f5e598f01d923cdc202e776fddcefe34abb1a312b5ec9ba68f3745431faf89fb58d9ee233b62225bd1a549ec0829a13bea126e8a3802ec78a72f9dc6ef01eb88
+EBUILD spin-1.5-r1.ebuild 1012 SHA256 b6d2fa6ba3a0444c1705fd41c5c9706d6c21732ad67c16d5ed15af741e212952 SHA512 1e5a42026101717f93dcb30384bbedc74c222f5acc34042f09630df8ea3f869d9b6731526bc7af1e377a3ba7a7319f70bfe0bd769c12a4ff72bc01e715c4a707 WHIRLPOOL 70c59b1dad76c05afae7326593d0f49c2b7e1fca682d0f54af31df522687662f66160f392269df348e548836210b65e9a62f6f2d69e2cd637e331379f5324dcc
+MISC ChangeLog 2477 SHA256 ee2fedc224db3ff727afa779d2b9df4af0231843204028f3e55819f8c671a609 SHA512 3c2848316eae01370b92a4f28417a25bd3b3938a5362a0ed15ab2acaca81cc88494c16bc958c22b17db5d68bf5fc9d971626942d51bbbc37f4b6d4c279d1ab04 WHIRLPOOL d7f29f9050dcfe81fea3443ae7911acd4e6abf49178de011af51c38d93aa5e7dbba599c67fc4c8974d318885c7e516439212ba7c18c8d54d8a3809df2ee6dea2
+MISC ChangeLog-2015 2956 SHA256 aae0a31151eb207feea61e9af63de7e6b982f56979e0090ae0d424b9f1f4c092 SHA512 283ce208fbd55b38d0a6ab6bdd1d507da52b3db747d0710d3d8f6291b0fbaf86a8b9576558de558d91e3b99b779b4c7fe7a7d4e78456642860691f55e7464727 WHIRLPOOL 56e090a63cf601286d36758fae35b714e2990a6c682c3ae642a614d49e36b191780d2d05971800e8573907403f3f8ce8a7543cc4e896d45c14a97db32e4f9e44
+MISC metadata.xml 310 SHA256 934e419bde6bed2a56f3198160b0cbb5d6b70526efad133b5471af7d2d5a4488 SHA512 4ed6297527aa1e31d6570464b166e1facdc53b2c2d89d2e062975d7230a1ea4623e90451ac25b521a0d9449fee8c27c255b23102601af1596a5998e3582ec8af WHIRLPOOL 159174232c3ba31e3a7e01a138a265a885cadfa4a550c1b5db5f4f41bb16d91ef4993aca02f703efbb8dafb5160678fe81ed525909855491936ae41d62350d3a
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/Manifest b/dev-java/spring-aop/Manifest
new file mode 100644
index 000000000000..cbc3088a888a
--- /dev/null
+++ b/dev-java/spring-aop/Manifest
@@ -0,0 +1,6 @@
+DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 SHA256 5a18b76fd55ffca6fbd8957436641287eeead9765de8fe07443fc5d52f03e043 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9 WHIRLPOOL ae8edd73bf272c3e92e07e5c341110d824703bbb8393a7f4af3ea9b0f306516a025888b2c3433ac0b7a2c3eedaf4236c3e201710e3fd77620290f5c6e28891c7
+DIST spring-framework-3.2.4.tar.gz 8925304 SHA256 0e0ad9631ea17a90fd8bc2565a7fb5b29ad12c1bf9ec9582f77019b5b041d08d SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b WHIRLPOOL f3dba92202402a676d8ad37c0b80d3a7616eecd780477ff21865305e2e2e5048b525ad9d14d36c0c0def96da305e3067e02617e10b949600ba819612f9edf48b
+EBUILD spring-aop-3.2.4.ebuild 1652 SHA256 5a339070ebc95a0fdd7049ac508fd49b805a7d6d9c2dd4235b8cdffdbb552a16 SHA512 6be489c83a2b077d3d82ef3428adef9974b2740c61e676b735280616db4e07fcca2a6513bb47e396972403eb116bfe40b04963a8101216f37ecfb1d4c2c8d58f WHIRLPOOL 1cbe4f86f339dc673275516590c3e48268a4038e45cfe08d0bef0a75d013b0efa14433ce34ddbb5513fb3d3ab4a8a97db383edadecea768b20141497ef3609ac
+MISC ChangeLog 2856 SHA256 03892c291665844b1d2cf126741d58bb9191f002d0eab6a6770c1fd95426672a SHA512 7dde91d704fb918832e27806c551439040d4136d5e5b892e774627e8716e12d31600b3448a37e60c679c80df8056590203c392b631dd89ececf3e36d4e5ccf8a WHIRLPOOL 933350a286fe9cf048ef911f4736595a7bbd25b2819c320908674e3721d0d556cfea768dadb709bf0868267adbd1358e162a6106ad578e4989e1c9d05fca1de3
+MISC ChangeLog-2015 428 SHA256 f58815204f566d67ad8e91cf59c2cf2c1e4b55c06aacc6d7d1364861299ad043 SHA512 bb9b984cdfc2ba4b86b0c5f3ab9004cea0fb584331340ba24e463c3053f8e1f2e0fad693bcb7388e700b53106a35050e9646f05dd5df90800a42893f18345665 WHIRLPOOL 2c011a7457d82f61c774d683141e5cc1138b9661200d37c2cf3f25aa92663e8acb57251d85b72fb43f025bf50fc734f6dd4715c150ed22495cbb5346a3bf6b9c
+MISC metadata.xml 805 SHA256 41a7a1d8d31bd1082ec3fd949b8990a9ae1be44c9e75017f111876ab3153d8be SHA512 76da7349ca93ef13fb154f1531a175e9dba0536614191d9f801c157bdfdbce407eb06a7677224468dc7a19868010604bafd8db2b1348f1fce16b0bd2dd414005 WHIRLPOOL 80d72199bda19ec402b09ba9ff3ddc942f8e47b2dffc0c04f21e198a08eb0c7a49e781a7ccbd975906a3e086f75970f292e4a02e7a09f30ddf24a0a50d2427e2
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/Manifest b/dev-java/spring-beans/Manifest
new file mode 100644
index 000000000000..1197e8741ab3
--- /dev/null
+++ b/dev-java/spring-beans/Manifest
@@ -0,0 +1,6 @@
+DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 SHA256 5a18b76fd55ffca6fbd8957436641287eeead9765de8fe07443fc5d52f03e043 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9 WHIRLPOOL ae8edd73bf272c3e92e07e5c341110d824703bbb8393a7f4af3ea9b0f306516a025888b2c3433ac0b7a2c3eedaf4236c3e201710e3fd77620290f5c6e28891c7
+DIST spring-framework-3.2.4.tar.gz 8925304 SHA256 0e0ad9631ea17a90fd8bc2565a7fb5b29ad12c1bf9ec9582f77019b5b041d08d SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b WHIRLPOOL f3dba92202402a676d8ad37c0b80d3a7616eecd780477ff21865305e2e2e5048b525ad9d14d36c0c0def96da305e3067e02617e10b949600ba819612f9edf48b
+EBUILD spring-beans-3.2.4.ebuild 1548 SHA256 ccfeae366f60c79adf08798546047a0bac936d0050ac96f0a5dabb66d27c76bf SHA512 a0ca2cb7d7484c99cc3a5a91b336a2ad4a8588548fa71386c74a36bd0423e2bc71196efc8ebabeeb08b80a043a97520d4cdb44c7a29d12814fd96defa0198007 WHIRLPOOL 02fb747a62c1aa32dd6ec90b12a6d7df666fc3e83a9ff5bc7d6fa26710376d8bf15cebf23c0f87d0999aa784aa67de379f75d64fd5ae32dfa2a1cebc78daf19a
+MISC ChangeLog 2864 SHA256 b1de2e0becb723289d185125c2328a7d1c9c6d464b245807c32b1a4df637cae3 SHA512 9b38bcb14dc449b8f8acb75ec5f202b2635c4aded23b9808642b17c3eff670fb4f1eee208bdd5929eee16f6d7301f2eb65d30d9c90a2f677e27e60ee44c74df8 WHIRLPOOL a5545a7ba8350fea2ecb83011ae1ee22c3c3e9611d32e79d99f1da6c6b6fdb82b1a1f172b1a528e080ae7626b993a6f1896c73b9c0fc685bb445594c0a2c8ea0
+MISC ChangeLog-2015 632 SHA256 b307839288f0627b6c3ce5f236314d3a21c7481a829a587717faf88fadbad299 SHA512 cc70db8d5d7bc626ec088bdbae46aa578b6d8b42a86b304a725a0ee524afe8b5f1a075ed15d2ef08bb4296fd2b1169553dbbd20025f464d6070a7fda7311c932 WHIRLPOOL 309b9e3923f18a36022e8628c094020972d4dc859a6b25301cd02de369a1d1e9c5e75acde8aee1316b94108a36f71b49c71993d38b66fd2a74979f89e0be1406
+MISC metadata.xml 805 SHA256 41a7a1d8d31bd1082ec3fd949b8990a9ae1be44c9e75017f111876ab3153d8be SHA512 76da7349ca93ef13fb154f1531a175e9dba0536614191d9f801c157bdfdbce407eb06a7677224468dc7a19868010604bafd8db2b1348f1fce16b0bd2dd414005 WHIRLPOOL 80d72199bda19ec402b09ba9ff3ddc942f8e47b2dffc0c04f21e198a08eb0c7a49e781a7ccbd975906a3e086f75970f292e4a02e7a09f30ddf24a0a50d2427e2
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/Manifest b/dev-java/spring-core/Manifest
new file mode 100644
index 000000000000..e3adcde23f2a
--- /dev/null
+++ b/dev-java/spring-core/Manifest
@@ -0,0 +1,6 @@
+DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 SHA256 5a18b76fd55ffca6fbd8957436641287eeead9765de8fe07443fc5d52f03e043 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9 WHIRLPOOL ae8edd73bf272c3e92e07e5c341110d824703bbb8393a7f4af3ea9b0f306516a025888b2c3433ac0b7a2c3eedaf4236c3e201710e3fd77620290f5c6e28891c7
+DIST spring-framework-3.2.4.tar.gz 8925304 SHA256 0e0ad9631ea17a90fd8bc2565a7fb5b29ad12c1bf9ec9582f77019b5b041d08d SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b WHIRLPOOL f3dba92202402a676d8ad37c0b80d3a7616eecd780477ff21865305e2e2e5048b525ad9d14d36c0c0def96da305e3067e02617e10b949600ba819612f9edf48b
+EBUILD spring-core-3.2.4.ebuild 1944 SHA256 aeeb168d1847823785b9de7cea58b2abc7b61b710290865015e9898dba35a44f SHA512 f89c1e8261c1d62108571cb3e01da012d5c309b37be2fbe6921a50e64a023dd4326a9fb1206d44268a0a4a24c100bf46fd6830fb0dc1f30d40d753215848d300 WHIRLPOOL a9cc6b90526908133c8204a8c48c1fd7ac35d1ef24a18761cf812dbcdddb2c3e8c00ad3ee062c3c916a54539a0bd393a29de82fb66313cfea50fad297b46af78
+MISC ChangeLog 2860 SHA256 f22cc8589d2efcb1fb374af99ea28b47a3bdd511f7532cb087a563a38a15b053 SHA512 166ab97cf1be80e181194764079bb9d4a85f75ba97c3973468426da3aa8e18634911879c50cc0314a905dd8e4894b5feca71685f5d6a9fcfdf854a74f0423ea5 WHIRLPOOL b715faab16ded34c12f0e59e74824853592f709efe9f1aa16e1219ef4e6b49ce519cc1af6cde0bcb04a00aa17c6af068c4ddc1c312690efbff0f1f5c1e0d9af6
+MISC ChangeLog-2015 821 SHA256 bfb6382764dc1f0de9c2aa14bd299eb859ba1bb1b10aa0b16cd55563d8003c11 SHA512 fc18371e286a8da528420bbb10fce8b60faac44517a46169995496d79c8ab5659a1c537453fb163c7bb412ef8b31ccefa9092d822431a31a34961ac30f92c4fa WHIRLPOOL 0c84b580f3d3a62d8d9d0ed5707fabb89ba7860cb91ea349fbeec0ef77886d84e33c1ea7a0228537c1fa67e10c2ef0dfd8739eec49507c62d40f4663d90429ae
+MISC metadata.xml 805 SHA256 41a7a1d8d31bd1082ec3fd949b8990a9ae1be44c9e75017f111876ab3153d8be SHA512 76da7349ca93ef13fb154f1531a175e9dba0536614191d9f801c157bdfdbce407eb06a7677224468dc7a19868010604bafd8db2b1348f1fce16b0bd2dd414005 WHIRLPOOL 80d72199bda19ec402b09ba9ff3ddc942f8e47b2dffc0c04f21e198a08eb0c7a49e781a7ccbd975906a3e086f75970f292e4a02e7a09f30ddf24a0a50d2427e2
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/Manifest b/dev-java/spring-expression/Manifest
new file mode 100644
index 000000000000..c1fd4688bd66
--- /dev/null
+++ b/dev-java/spring-expression/Manifest
@@ -0,0 +1,6 @@
+DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 SHA256 5a18b76fd55ffca6fbd8957436641287eeead9765de8fe07443fc5d52f03e043 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9 WHIRLPOOL ae8edd73bf272c3e92e07e5c341110d824703bbb8393a7f4af3ea9b0f306516a025888b2c3433ac0b7a2c3eedaf4236c3e201710e3fd77620290f5c6e28891c7
+DIST spring-framework-3.2.4.tar.gz 8925304 SHA256 0e0ad9631ea17a90fd8bc2565a7fb5b29ad12c1bf9ec9582f77019b5b041d08d SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b WHIRLPOOL f3dba92202402a676d8ad37c0b80d3a7616eecd780477ff21865305e2e2e5048b525ad9d14d36c0c0def96da305e3067e02617e10b949600ba819612f9edf48b
+EBUILD spring-expression-3.2.4.ebuild 1420 SHA256 cecfd6c36ef1f692762c66e38374372e4dc054c3c96d03dfb87e6d9b2f4fa06a SHA512 43f276f57f682098f787f93ed2967574a2ae6fda6b2981cdad9242e521f47da6de949a15c184624031cfc42e1842a9162b90ce7141c8b9bedd6e0cac71b8bbda WHIRLPOOL e9333a2e36e4306b98a996ddcce85158a64da7d3ae827e1738dd5549ba3a691b495a20e11ca059365725657cfdd557d9352233db557b7ac382776390fb0272d2
+MISC ChangeLog 2884 SHA256 a02e95d3ac0063c72eb8465d3c34c58cb9a251dacee4bb6641fdab04ab97cd90 SHA512 f97dcf41fd60559403be2dcfc50aeb3fe1901431637b240b4c161e1f42ea7052c132fa60984324e985161df493fd002579a46460bab11d60b5e97322493dc825 WHIRLPOOL c6b1df7b690772e0a1f870b3a74df997665ba728b664a01073cdf314211363824f5d5553462638e403de33ce0bc7b14eb7e4c4c46e88fc8965887c22b0da5682
+MISC ChangeLog-2015 431 SHA256 4f839d9e6b8e65889876c8050457b8903e980f8fb2784caa03b95444e503ef0e SHA512 1d638c67b8390f0ce7f427e7fcdb1705bb7732aeee98ad5ebc62ab6c4e4e5e477323eefd952644ac77742371c6ace65a666db57b5210b6310dab058eb164076c WHIRLPOOL 644c61863513aae9d99ac06f79de344b2809148e6560933b9e45c8a59a644c5f0929d41e6998f9987d1362873d4685757f0bf8c483b91e3d90a56ab2d7316bb7
+MISC metadata.xml 805 SHA256 41a7a1d8d31bd1082ec3fd949b8990a9ae1be44c9e75017f111876ab3153d8be SHA512 76da7349ca93ef13fb154f1531a175e9dba0536614191d9f801c157bdfdbce407eb06a7677224468dc7a19868010604bafd8db2b1348f1fce16b0bd2dd414005 WHIRLPOOL 80d72199bda19ec402b09ba9ff3ddc942f8e47b2dffc0c04f21e198a08eb0c7a49e781a7ccbd975906a3e086f75970f292e4a02e7a09f30ddf24a0a50d2427e2
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/Manifest b/dev-java/spring-instrument/Manifest
new file mode 100644
index 000000000000..bef03c591372
--- /dev/null
+++ b/dev-java/spring-instrument/Manifest
@@ -0,0 +1,7 @@
+AUX spring-instrument-3.2.4-build.xml 4010 SHA256 3d475c75e248ba5d9bdfa256eab740fbccea5926af4556c04a03eb2083e8551f SHA512 1c92972268d7889c568942abf40fb202c05c9a7ca14c34162212f54ec73ebd5160acedd99d96dcf576480afda88d82d57dc79ee087eabed321dd7f81e5a7ac32 WHIRLPOOL 7057e80bf6b74cf9d31f179142876fa105d97ddf39c24b1774387ea7b180c2a3942d26ffbdc2921865feb6e354beef1ebcacd0ede58d62541156cb56e2f3ce67
+DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 SHA256 5a18b76fd55ffca6fbd8957436641287eeead9765de8fe07443fc5d52f03e043 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9 WHIRLPOOL ae8edd73bf272c3e92e07e5c341110d824703bbb8393a7f4af3ea9b0f306516a025888b2c3433ac0b7a2c3eedaf4236c3e201710e3fd77620290f5c6e28891c7
+DIST spring-framework-3.2.4.tar.gz 8925304 SHA256 0e0ad9631ea17a90fd8bc2565a7fb5b29ad12c1bf9ec9582f77019b5b041d08d SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b WHIRLPOOL f3dba92202402a676d8ad37c0b80d3a7616eecd780477ff21865305e2e2e5048b525ad9d14d36c0c0def96da305e3067e02617e10b949600ba819612f9edf48b
+EBUILD spring-instrument-3.2.4.ebuild 1498 SHA256 72676308aafeb580ad6d0580a2d3a96b216a815495c2786f715f215c2a98e24a SHA512 22f7bf12c27fbaa7042c06d76257108f5d159bc724174860c63de95262f61d90528a22baf84864c24927a7ac5d3749214796d8d9704796d21daab4c165ee5797 WHIRLPOOL 8787e2a6ed5b5f5500bb1c1fb28432d3492f29138d5f64e8eeed7cc087377312ce782f5ccd850753ba17a0df8e2ac73c9af55779a13f5022b4623a72b3e61d05
+MISC ChangeLog 2928 SHA256 fe898bd766303b6707811ff3bf9fbdf240fa78caa7154fd579ce06bdaf67d352 SHA512 a2a8f71fa4d2a619b9d2bd14590e073e41ad5ea0b529f0c0b7f164792b02a445c83ba35c6421d45ef3b307def9a7f96dd2e35613d9aef1ac65d2a51b50db1baf WHIRLPOOL 69dff18d66d907525a9445cde6a8468f714778dda9ec3aff257c740844e21758311b474695f86a42b6777ab3afeca18f30139c12944f3a5dc269d5552055205e
+MISC ChangeLog-2015 623 SHA256 c61d4b2f374bb5ccd77a60781d9030fec540ffa435b6b11e7c496b3bdc3a5c0c SHA512 00f21e3cb0c7d6b501de87ce9281a4e57fc8ebdd6e0e20453b60beaf34e63a5839a56463a638bd951ed09416ec783f0d1b341577d5988e435c3e090c59e6f6b4 WHIRLPOOL 27d24c24cbaad620575e3836ef03bb8d1ea731529d539e1bb0a3cca6237a3e469b7da1abd182c8b5a0f68340cde57cd41457ba89299bd59b0796df588012111e
+MISC metadata.xml 805 SHA256 41a7a1d8d31bd1082ec3fd949b8990a9ae1be44c9e75017f111876ab3153d8be SHA512 76da7349ca93ef13fb154f1531a175e9dba0536614191d9f801c157bdfdbce407eb06a7677224468dc7a19868010604bafd8db2b1348f1fce16b0bd2dd414005 WHIRLPOOL 80d72199bda19ec402b09ba9ff3ddc942f8e47b2dffc0c04f21e198a08eb0c7a49e781a7ccbd975906a3e086f75970f292e4a02e7a09f30ddf24a0a50d2427e2
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/Manifest b/dev-java/spymemcached/Manifest
new file mode 100644
index 000000000000..60f0278f8011
--- /dev/null
+++ b/dev-java/spymemcached/Manifest
@@ -0,0 +1,5 @@
+DIST spymemcached-2.9.1-sources.jar 305723 SHA256 ae4e650e112da383f1cd27b63cc9ec2c3a50dcdc4d61a35ca975ae90ce778ea0 SHA512 3d7b593a095094e4b564eef8112f8f9ad0e812f313b5a943e669115c1aa4662795e9321a75e030ab7bb954a810ffb92c399041ed4b29e8f703aecf80d7603614 WHIRLPOOL cf431f3cd2a8e6d4e0f9c3301071827a883310be8d33ca050ff94c2b16264d79b1df6e95e492e0e38cfa1f7e2b5dd2109c616bcde2a30815c3bb116ba893826f
+EBUILD spymemcached-2.9.1-r1.ebuild 710 SHA256 3c58cdd4b4a2a9805063a338c67f771251ddba20a1f788428ab971a3adec35d6 SHA512 771319e8fc31a81f2d5e1ee12a8018c4ab896fcb45d64041b8c623e8409d8da0dcdcf4171fcb5620da50a549eb0f66232641e3018a0d6d95035bd54ba8bd17ef WHIRLPOOL e1289992ede8aea22b1e8f05ca483fd8ca99404683cf640b9b695f7dd6809781b089f987b3c6d9322aad33143dbab53df8318eec540dbe4ce3611aafde7abea4
+MISC ChangeLog 3286 SHA256 2bc631f450415eeb9c0e737093cf9426223694af8a0f8c095f75cfe6d1d4cdb1 SHA512 448977a1f440594dfc425ebe85969e715d2c2e8929a27804e66c176eee6c202aa985b86cc0b459e41c8a26fe9697ac5000903937da8a85cb0fb4034429cc8cca WHIRLPOOL fcfd9edafd8f5ba577bf0f2926299d400ed9aeb1f87f44b2959f2e2c0d61dd81f26748eba497f6d1b25b804f6bfe82df369d0729c7efd72bce6814a8937b4fcb
+MISC ChangeLog-2015 622 SHA256 b1bc40f185b67b3ecc3931f06459d2693e9729a421aed6472c764944bfc926fe SHA512 f9bbb8a6a10d649509b279776cf7abec9cda605c600791f4667ad4910287380883d8f339e77f24bf66b250381b398b4f1e9a654d55a848ee0d630a33b00dfeee WHIRLPOOL f8696a417f48fba29381a8c4f36e504d116dcf6ed7d77533705d03df457ba3fe8ec06b7ea38a2b8cc4aea71287a34d13d0fb60d383a5d42b8a1cb12a6baed510
+MISC metadata.xml 318 SHA256 231eff0225c975a8693cbf25216889b607daf7e9b73aee0354099cb400a015ad SHA512 67100a68ab4d88b02e279fb87b835a6fef444a8893cba844d1217784379830e0d73df6625ed4fd9e782fe85d665b7ef0f3e3d178266074bfa266128667f9867e WHIRLPOOL 25fce7f370ce9d103b0ec3f34c07c98055c8567c0e92bec77f436201c2ac213fc213cc98fe118e575e57886a7e53b80cfa137e5a16fe12555eb59413fc0bb856
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/Manifest b/dev-java/squareness-jlf/Manifest
new file mode 100644
index 000000000000..b18c50117d0e
--- /dev/null
+++ b/dev-java/squareness-jlf/Manifest
@@ -0,0 +1,6 @@
+AUX build.xml 455 SHA256 dc5483ebd4fe58dec0e20cdc1a90449b7acbafe8cba8a256882ad4c599db7403 SHA512 af90575487cc91fb601e537c9e85af8d500a0f27321997af10c6f5182e95e029f954b85a29d03d18553bded6cb9bc5d505e31ffc51dc88c89f0db1b1fe95cfcb WHIRLPOOL 4992cb240f63060fc79007f141081391a38101cb6eee2ee3abeafa659fa3613b68b04ba1918ae337971fa5b12469a1691484e58269137ae8b273981111c62836
+DIST squareness_jlf_src-2.3.0.zip 67307 SHA256 a7439f1343f5f13ff3a6709728f2d2ae112097f5da6b858e7b2a4417fd530c57 SHA512 9c3d1de6f682968b2e2db37afdaa571f53857897415df04489ecac1c545ddc0a8342df94c658797979a6024e6e69bbc9a8828029ec428248848c933c9f901a71 WHIRLPOOL 883d3cb71dbd24b22ed2ad2d1b0e9bce468dd8f7ddadc5593590bf69e8680821ef2824d8775577f2c03bd86fa46a9a43cb4ff50d5402d80977737dc7471877f2
+EBUILD squareness-jlf-2.3.0-r1.ebuild 731 SHA256 53b64127df842ecc422c936070600ef935f57a2cc5030cec86795c66ed6871a0 SHA512 18900c1cbcb86da2eecf57c47d1ec9e097e463ffa2715fcdc834a4c22d2af8182cced06ae1fb9fcf17dc17c2f123bb6710c9c7728518b7508a47acad86cd5ec9 WHIRLPOOL 48db01e927a0f14beae6ffbcab0795a4cd532f0bd42e0afe554274d869b836b32d3ea74eeedad6c810f7ca29cf79eb4e404617d36b4a9b4787e298f85f420d13
+MISC ChangeLog 2472 SHA256 b42a3a5e8f4bddc67983112cc23fbf8d5407afcc2f1a376e773fe93ba89e0d77 SHA512 3a41346defcf66e9e8c7e86476745c14d9cbab392e34207752d2bde70d36b6b1832490f79fb6158f0eb9db178a075c91db1ad5e35b63ef78d81564b5aab1aa43 WHIRLPOOL 04fc65c11b655891ab960887e6671f0a1e1bea35f82ee68d33c21f12453c7cd432d824b512a32e18cd263ce0dfb9440580b804f9cf45f5d4a361afb7a9aac6ec
+MISC ChangeLog-2015 784 SHA256 4546e76e620cc36dc64afa6a07ad60fafef885c83884b82efa7456eead91549f SHA512 37fd006e216441ae84b3c8d9df3264c45b7f9347006b891e312ab4488c7f1a9ebfe4f9cf7c144a32d31b5e19b92066096f16b92390135d60ff8f70e0d06162f5 WHIRLPOOL 617a05599650d2cabe873c6fca8e28e130dd3d01a30d4e4f4a3c1c1aaf96c3dde19109fabccf0488c3986cbb414bc3c1a52b71239810883b4474eb85820e4326
+MISC metadata.xml 296 SHA256 2d2bd3fb382e702c64f029c0f4e9042ba72d12341bf819e4dbde50d7288b6b5b SHA512 f6dbd063144823d97b76ecbda9dee65e629f11b5c151da9d4cc83bce53f61307368fecf9089c1ca6e8d968068a21577d940bd3591347c023e1693480e40aae20 WHIRLPOOL 2108d2875eefec3d9195a814839aa3cc3410c9e9eef313b207b52380a4674939782bb8146dd5d15d9481f52a22d87914bc6943a71f2468efe79634c3fcdee5ab
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-ex/Manifest b/dev-java/stax-ex/Manifest
new file mode 100644
index 000000000000..76982aff5709
--- /dev/null
+++ b/dev-java/stax-ex/Manifest
@@ -0,0 +1,7 @@
+DIST stax-ex-1.0-src.tar.gz 15446 SHA256 c737665a8ead77f440ad439319a6c6bc6bfdaaa6a15022721731d2b8268889f9 SHA512 acb58c7b182c7aced70099027af8e29b03e42e11f97104a75dfcbe8fad6f989733d67d31c203a95072f04d7e008240fdba59b5abfb6c5362268e12c138204938 WHIRLPOOL bc49fcde63ed63f46069032bd9a5502be3d2298ae0d350222793fd5e7dbc6f1832f05434b788ad6ccdc13fe212cba20b14fed360420011e2cac1a11941cccb00
+DIST stax-ex-1.7.6-sources.jar 49384 SHA256 cbb9af50961e22b4f3227b96adcc130c9c4581b65cbfa7d89628643189e76e71 SHA512 74bff2e094d29f63fb718c249b7e0fc004ca00e7f374af6634484d0c96ee8f1dbfd793706906e375b473b86b34e7a2c55c1d6b65a1d1b10b0125498b9365efe0 WHIRLPOOL eb86b23ce0a0c9eb088c642fa9f4e0a41e9b624239dd0ea67eb5cba6fe3432f9edc9d1321ecbbe84678d781b82790d3b958a4e794b03b365247b4b6d3d0a1602
+EBUILD stax-ex-1.0-r5.ebuild 545 SHA256 81c3958e3e763795f983c1101a0decd8ebbb65f45388b1c2503f0f329106e13f SHA512 1bab7129ab8a672fd16107979bf7ebef62e02c73f7ba4f47985bf772788169941a5cb5ef515940c195c9fa336162544bcc0c3d19cf25ba16801e08a18b3e5a65 WHIRLPOOL d14ed0fbfff9958c397977407b9185bec23b1e1b2e41988c4a92c50181bd92f5c08f905d79ae65a8cb76b10e38223c3b5cc9301281ea16c3e5d1739407680cd7
+EBUILD stax-ex-1.7.6.ebuild 561 SHA256 c198c0defadaec608dca38b284e07cfc4db675aa1041688b80d95e0b0ee9e337 SHA512 e33678c32d4417c3006bd8e4dc186b2bd52e7e15626d7992fbf6509cabd1fea821295b47e65e62b334b4f8dd14a0cd702542f074b1f48147e0b3841f46b7c3b9 WHIRLPOOL 807cd443b4ea10d1c82e54acc667000ce071e4b69b119db297075659194e57d9f0cde6cb6efeea3c03622286e9047575ee7016701418238ee9d7ed7421bfa1bc
+MISC ChangeLog 4200 SHA256 ba3b724dae7de919c2dad54d8efc3dcd0590df6948539aaea486f488e97c43ea SHA512 bffbd68a8d909956b5fd8bf1f50ac373fa49acbd7997192def207a40524af3bffc56f92563be5800005ae555681e85fc1f072c676811355ec011e24fbc237f48 WHIRLPOOL 7dbc850db9b27caa68108694b895147736fdd52a89e648efd95233052f8b2f21db719c9270f0183ec6e23c3373c93e702a574737650c0a9c647d6a7e9ec156cb
+MISC ChangeLog-2015 2029 SHA256 2e41f5cc5aa6940d6a3d2a731d926bef3342db2906e244dcf966e6df4adc2fad SHA512 b8019f38eee2bfbb5c1ad375ca105700913402def96c72d4e92d08742ab894099fab580520d0db7929590b12564194f7459f234d7a4cbcd8cdce1152d476c769 WHIRLPOOL b287f2aa3a2be2159fced08cbe42faf98d14104488ac52bb8dc9cfd4544f2186db3382dd51a1b65081f7b293adda972e9d8249af239176a0b24b82da34b71166
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..21dc794ee4e0
--- /dev/null
+++ b/dev-java/stax-ex/stax-ex-1.0-r5.ebuild
@@ -0,0 +1,26 @@
+# 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="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 ~x86-fbsd"
+
+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..cab4dbe328d8
--- /dev/null
+++ b/dev-java/stax-ex/stax-ex-1.7.6.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="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 ~x86-fbsd"
+
+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..be33866a943f
--- /dev/null
+++ b/dev-java/stax/Manifest
@@ -0,0 +1,6 @@
+AUX 1.2.0-build-version.patch 438 SHA256 8cb71f46b4231202195537f658f296c35412a9e9e942338dc93727e8d81c5720 SHA512 f001f61d2cf0346a5e39c1b5392357e293a0f35ccee45dd3bc9b96a346f63280088572ac2b23b01637d11c8f0b888fd91687407d70d1bdd9903cdeb9a9c7028d WHIRLPOOL 3873cc3d6c06623f2c5f7f127236f5f52dd3af789e70bfd05b93bcebc39a4e7570da07e946420b594ee1379008bb047d2ca9002131db98a58540ca9ad3136279
+DIST stax-src-1.2.0.zip 310738 SHA256 c4dc2ef0be6a21dcdb5643ab89e9cb3b62f18ad213967a9ba3901b71cd97843a SHA512 41686d961c7a211ee02e9432a141ff75326414da9576608a3567ca7e154ed24ad804cd01849364a5ec8def1a6e5048197850bafd67fc5ff2b6a10307a0fec9af WHIRLPOOL 8f9aea0015acb10eaefa184700701a624ed1f45d8e7b236661663da2e3a0a8b2fb129653d08edc19344b573e537c5fb44123a6791c0141bd073aad1b8fb9a621
+EBUILD stax-1.2.0.ebuild 1205 SHA256 7f5220a2b62ebf0cdaa7620c25def6428d825e0a7fd5f18b0d64e1f66d587e29 SHA512 f2eb4163164e5dfa5fc4f321ef2e3d8803923b1116f02e8f85c61557e36ab5d021d1d8182395b25a51e147049359e2d0dfcd82760c1b1d53b67aaf077c7becd6 WHIRLPOOL 60cafdf2f92ac8db158477a4d35103de379b680113babe719c549c11b0ecb79116c76676b24c7069e141dbff1ba0649b1d924b4cff3e43fd0aee142c74c67dea
+MISC ChangeLog 2587 SHA256 b4914039517d70aac041bb5be5f4ca5ca90fda8b9959aa2fb9f5151d60de532b SHA512 08147c98441c1f1b9e846e54a707ccd8e71a2c9236c03b55dd2d35796d3654307cfcb56f18b0d35a6c72ec1c5453727d9331c0c897d154c196d711d5a4bc48c7 WHIRLPOOL e26d04bec30e2479d09a107c44ec056db3ffe8b03620b125f33b25b5606af1578b80b7dfd9d091eacf03df191864456987b54308a2e098fa49c4bf8cb100ec40
+MISC ChangeLog-2015 1082 SHA256 7ebf19b8e684d0c6cf758b9ea8bc92599acd715fd2000096a9cdb3fb3ed05edf SHA512 15c021a59d90fcb37a71b8feea304ee4ed6af607d05ace0bd7fe3a061f55bd31ddb9b5f99643ae4ad28237b10ec64b6f27f1b22e163635c556d3c4f8454c37da WHIRLPOOL ea509efd459beea5cbb3b07fdc40318cff55b7d155a00143d692ead3107192325c9606b52bab0b6b56fcd19c3e706643a3666a1a0daba5dac4769cbd6cbd596e
+MISC metadata.xml 565 SHA256 52a3ae39881f33fa45599e80a48ebce01e50d5c43e0955dae206fbd666695748 SHA512 b54fb4d000aa14a4bc583007aaf576e9cba96a17c8aed6ba1024dd925bca04a2015048490ed426522a696e614a159eeea17a587a2d6f61be8b38cb608ed06f21 WHIRLPOOL 7e34534a92b44dbe786ec9e845c82a7c8dd8cd2ff682ee66b6a9c9f205f8868b48c9c1fc8b20f879f523e12f9cb952d435cab82efbe53b2b83be3c5b99888bd9
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..97e45fdd7ba6
--- /dev/null
+++ b/dev-java/stax/stax-1.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/dev-java/stax2-api/Manifest
new file mode 100644
index 000000000000..8ed8d94edb61
--- /dev/null
+++ b/dev-java/stax2-api/Manifest
@@ -0,0 +1,6 @@
+DIST stax2-api-4.0.0.tar.gz 127125 SHA256 7872551a4d8ba75aaa25bea4709df943d90989ffb672a505f71e020aa20eacaa SHA512 a8636de873c97534fe17738efb9892d38c52a1a6adfec9502b727082f24b57dc5bfd10a67b5f5d9e196a53d7ee461978dcf8e6c306168bd1cf96a6d67c655b5b WHIRLPOOL a99dcdd266186d9ac7eda61da43cfe74a45a6396ad790029bf84593fe9dc3644c221a0e3b507a57486e8f2de0c1e9644e02946b5391f25c89887d427c0d38e5c
+EBUILD stax2-api-4.0.0-r1.ebuild 628 SHA256 276adc5c87055b57041328206546226ac9680a484066353736b3cf24640e93b2 SHA512 313eff19f4f7e33de5dc66b0482715349044422216bd23ce6ebf89e6a858d8fdcb547f573d6fd2792a208aa5e38610fdbbafe66e388ee197cad0297a0faa88a2 WHIRLPOOL 489fb95f45cab848c673a30d7117438634f422d76995e978a79b1b4791e48556b52ea97d4a76bb7fb8d537dc96f5d7f8314ada05bacc05dadf0340a84b912e19
+EBUILD stax2-api-4.0.0.ebuild 706 SHA256 be356c27e32c5bbfe8c947711ffaa02db629dad389d0341c4f1cfe79f2cf804e SHA512 ff448fdcc22f9a63efd3955b33c2241343b3799a1b4298c32dd314213c6d686f55893a17935f6c487b2a786f0a7a28ed9b557f512017c94fbf14b3f7a196466b WHIRLPOOL 8099dcf936e11b262c784c7746a62c2eeb68ea8d3eab081837839ca671bfcbcd27483f19d794b52a049a493a0ca5e7c32b5cf898efc9cbbad6550feb759d49ae
+MISC ChangeLog 3246 SHA256 3b9ce4ad3223a46747552fe87b2ce2d0c1f0f7fe7cc8b0f790a35a9ec4be9598 SHA512 d80b88d439fcb5dfdd8b497f92bd51d2e696b7cd634a540d8aa8e85946d067504b154a02f170db5cb7d75ff8695c825641e59e70c322d807df417ddd8913f254 WHIRLPOOL 91ce4936d2f97e01c386417ad5cb6fcc21fe5439bd80020496408021024563dc125521c2ce150bc3ad21e755df6676ef527d1840c25dc3be9a43fcbe8d0d6a50
+MISC ChangeLog-2015 612 SHA256 50f35d3b726b5d73fcf28dc778e710820aeaff0c373b01d3a2814cb5ff71fa56 SHA512 0eca5ca0a25506bf867f3cb7211e615ec06968f614283b67030bbbc45c014c682590e968c7354b2ea36193c90e39f68eebb348b9960d9645d8a612ab04b9072a WHIRLPOOL 144c1eb3207f197b385e464c2dcd3520450df989b3cf9c19df5ebb7cf064734ce27409d421ffdc8e7b1f3d6968dcbe78c4b742e98a588137b10375ddd49150b8
+MISC metadata.xml 490 SHA256 000e641e638eb97e18e7b7dedf0e1530880ff7b43553f2a135a4a03b5473a04d SHA512 831b369d2f9fdc3753e4951d289a3256805e5d30928225acff71d60c7e72ce5886dabc2c7c61f9aca8d3c8f31ce4f4131a7207f27423217b21a0dad75266a8cc WHIRLPOOL d20a51cb93b007e4572752121eaa4b1243d6c56ec6fc8d4f47a8992831c7e9f5b8e3966de3d1d799a3ac8ff4fa621af0af8da338d4a666a993e05759787574d7
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..e75af973571b
--- /dev/null
+++ b/dev-java/stax2-api/stax2-api-4.0.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="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/Manifest b/dev-java/stringtemplate/Manifest
new file mode 100644
index 000000000000..cd0252813b15
--- /dev/null
+++ b/dev-java/stringtemplate/Manifest
@@ -0,0 +1,10 @@
+AUX 3.2.1-test-fixes.patch 1706 SHA256 4107af29dd7f8f4dff90ef681bfdc222cf9676a1464e924045f23a38ee877cd9 SHA512 c161e28851d40e6b9615f7880f746f0a2426a1f705609cfbb10f66c1c3fc3935bc5ee6f4f76991d57e6261bba05269e3ce1eb33fe72e50e7199dab629372cee7 WHIRLPOOL 84d4357de01ba35b91786c9bcfca30f04edec253ce56d141a6afa9c5a1593aa6120ca0cc94aed082d6c817fa0973221b9b8ab35fadfa5c61e5f5959e55b93a56
+AUX 4.0.8-test-fixes.patch 1503 SHA256 de10bed98450daa0b807e49bb3ea67a0e0a054b3d36ea3ae4ca33f5fe9831168 SHA512 505bca326ae571974c6fdec1fc0d5e66066db5175960ff6dbec682f41244502e52cbd05f2e6119029954b546e52305addc14202223e4c3f2f04118c527606b4b WHIRLPOOL cb15ea4e0b8d2a3e78a2abe130422706c22e06c8e9e41d0e82afecee8c7e72d5b8d7a139bf895f579667c0553be0b4e829716f6c2ef1bc86ef6626c17f0008f5
+DIST antlr-3.5.2-complete.jar 2456317 SHA256 26ca659f47d77384f518cf2b6463892fcd4f0b0d4d8c0de2addf697e63e7326b SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1 WHIRLPOOL bdbbb081bf0aab83fa26a4a75f7f42487da688a5e3c765ea4cbd7b8c1bcb80b66e8b98bf95ee8bcd2acd60b4eacb6745f879cb899b672ea7fc4489d651a6f2e0
+DIST stringtemplate-3.2.1.tar.gz 1039803 SHA256 3a0adbb7510c2822ca515c635e1ff1469b3ac78f6d2072e48478876b9191de20 SHA512 fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714 WHIRLPOOL be77636384fdc680d856e8840abf0f629d5115c67f2085db044767847a480b3e2be70bae1d3984172561d14661ae325c677017b55183ff7d2e10ae4c9f83b40e
+DIST stringtemplate-4.0.8.tar.gz 147305 SHA256 07013e36d16968b514092b1e33cbe53f811a70a12c96e2e56c2e97a4304431df SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724 WHIRLPOOL 61562310995301cd005eb6a553f973304e166bca0b10d59a7d0877d73599a3bd26a2abf4cc7cb0ff98b61a1ef869c08f2d6933833217cac67f92d992a9a6d53d
+EBUILD stringtemplate-3.2.1-r1.ebuild 1451 SHA256 7ec6b23decbae82e7c3689999bc39a8c91fe140612671cdab3cbcfcab8d9006f SHA512 0057643878f937518d0505511b92a8342688e3dc4f910370f07e9b856041265b482abcb249ff8ed5e44e4a5e4da3e07b5727bfe5a11e36a4d3a41768c6017498 WHIRLPOOL 53a33032d92104ca85bc349c307d75c4e341dcfa04085c2b87bd5743b050f5e32bef94554ac140462213d2281259cec6683fb99d175e6692dc54dd20952d73b0
+EBUILD stringtemplate-4.0.8.ebuild 2147 SHA256 0960d73ed576becab82d8c8bd0f2f85e82b6cfc1abd3dc572a38090ce097c6d7 SHA512 5c25aa9130785faff5d1c8454401527077b403d7522128ced29c344acddff4ddab20ce5469de0aa58c4d8db18400a2511e255fe2530ab565fe1a0ce884ff0788 WHIRLPOOL ed04f105e926cd61d6f1bb623fd7c5f80cc66b7e2e347db81858a43db66b8d2bebd53a3821ae5280920640eef15bd71e86506894bbbbcd51d0317b9b8a161459
+MISC ChangeLog 4434 SHA256 38585847092715bc7377c3a9cf0113edd6ba0ae9461526293767a450a47509da SHA512 e019d10a2a55f2a172f1feaf8d05b6d18a1664e7943692efac01918d26119fa513b180fff708515a32119b42cd1b8c7ffd63cccf2c7d42f23bbf7b0acc9ca69b WHIRLPOOL a4c166831af202cadf654004aea474fbfea9246bbb6888990d50c36ae12111ec5dcafb8f5ecf6308afd3ec54093c968491a3ae41f35076ec407f3d3778bb8cef
+MISC ChangeLog-2015 2134 SHA256 61bf0c3730bb32af668f74575e164d7fca6bdf98137fc00ccdce0f5d5af21d93 SHA512 8cf2b2d3bbe24341b90982f84bcb239b0400abb1f17bcb99f3c99eb65dde19c662648a89fc2aa397ac4ec20c99d28d67a95264183eee54e50605a9b9f618ce61 WHIRLPOOL b2306f5f602408da15505698d8a9fc84c41b9ab52a4b79dc2585d983df6a46d02d621929fa014eb99a0c4b1cb1b275f714c3b7e36cad5ff04238b675119a81d5
+MISC metadata.xml 322 SHA256 d2f1553c203cf0b889d411f67de018152ca45e9b7252a310788de2a4659a66e5 SHA512 76ac99f8c99d34b533c08ae008a9eb2ac2a3b64589df3d43460c93b78c3c53c45b944837cc7f5514e90afc2117554fb545306e74a2b2bcb5c8339c656998c449 WHIRLPOOL 293fbf2f1886359ddd2dcf4a4ec3c3b0bbd53b7a9cf1cb8de5091e9298298e19e907df4d680e8d722091678ea7395c1fdb3e5e92abafaf674e36b8ffcbaa3a2f
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/Manifest b/dev-java/sun-dtdparser/Manifest
new file mode 100644
index 000000000000..03a04e9dbe87
--- /dev/null
+++ b/dev-java/sun-dtdparser/Manifest
@@ -0,0 +1,5 @@
+DIST dtd-parser-1.0-src.zip 67545 SHA256 b420d57ed98ed3d8e56198bf15e0be6b5495ea81656e8f2f00113149573a578a SHA512 7a8b2d27316121e33640ff51819e9edb362197b5af340a92e24b5fcd7cd885efdf3951e12cf5056670273eceffc17c3860b56d437c7cfb2fc12b47abcf82ecfa WHIRLPOOL cadcb0aaca8617ecbf21e474b2418b7e4dac6e99b6e0039d99332abcd4be65ba44298c7c91f6c31affcffbd5ded8676e569adf132d1c019e207403361e847f40
+EBUILD sun-dtdparser-1.0.ebuild 715 SHA256 73ec32d284f2b28fc523edded060a2063ff500a919a307b12f0cf6ca09c5c123 SHA512 d81965808a1464bade4a27f151e9da52c16571eeb517736a0327a36edccf339472f128f15f74df12dc6090742c8217460ea277c2f3d2e668d2be1832757ad8ff WHIRLPOOL 35c521e0c01e8e7bd590157fe7a75bbe9a71085678ff48d3b678212f83976bc5883723dc0292e3f4e66a1238557904e6e107748e1cb9108d4bfe443b9c5a29ed
+MISC ChangeLog 2583 SHA256 538226b1a2732f282e8f9088a4cf0c9d04c3a56f91940952e5697276a5d1cee7 SHA512 0380fa4151d9737e4c5b64af69799f1e1c8ae98ad59720b5f2dcf8cab74b3367b4529995a8e87add0a77402537919837ce84d31778a4ad0da596cb72f9650c88 WHIRLPOOL 5653d388ec7654e0fcd2c3b49fbe044f577355d09e820421e669778de7dd363d8f7b54bef8b55afc7979161e214a82fdc436321c52b4c2c3bba3e5b39eb90ac7
+MISC ChangeLog-2015 1144 SHA256 70126559542894de9ccfbc949f8e96841c75785f493fe4870dfa37876a38a637 SHA512 991769d457a40ab98f7a71c9f38a12c4934249055d95cd614fdcf1aba94227d9ddf172c01259f4136b1a20d8df43d2bb25e69c50e653da8ae2ddd703634152cd WHIRLPOOL fbc49e842969ccb14cf74b8c99bcc875b00dd835a7d0f0830f90e060eff68ca04ef5675655f0d613206c88bcbee7e529ce5aeafe82f5bfc53f9bec5fa792be57
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..90914627c53d
--- /dev/null
+++ b/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd"
+
+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/Manifest b/dev-java/sun-httpserver-bin/Manifest
new file mode 100644
index 000000000000..6b6feab9ed38
--- /dev/null
+++ b/dev-java/sun-httpserver-bin/Manifest
@@ -0,0 +1,5 @@
+DIST JAXWS2.0.1m1_source_20060817.jar 8993405 SHA256 9725cfb91cecff833055d7af45c3413ca9d1a818a4cfdb86211ed82f383f3865 SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314 WHIRLPOOL fe0727935c592b538b7042808fffa987ea5ae47554367ea0cfc91f65d765bd234713aaa142b2297988d74eec01fce9cd4bedceb0fb7b0068eb38084a1d5f5ba7
+EBUILD sun-httpserver-bin-2.0.1-r1.ebuild 742 SHA256 b3472fe62c363277922dc39d9817897e7bb2cc8242953fe2a3586b727701f769 SHA512 851047300186013999252fc0eb42c428b48291aaa1bd373f63656c286099dce45d2f66a17e45ba511201d11bd96a49efd487c0073ce425be8d277a1101672e42 WHIRLPOOL 63881917f7304e825777bee93e78e36df872acf886ebea6dba3cb6a6e2131814b62288af8101b4a84ecd56ee9bee06f91fc282b32d544dec099cb251ed76d4b1
+MISC ChangeLog 2620 SHA256 590e84c55a0c649b53c194920cb4ed04c557105227619a9160b30966c753f80f SHA512 21175f976454fb30528201a547c76b8ce6d16fab2ca81c392cf58fd932ae3302d3512e1d67094304faa8244af1d96a72c2464d4e5e5c1a53db1ca05c364dfd41 WHIRLPOOL b5798a96fc626bd1c8acbbfb67c92fc6a5f44983bb29bc850877feade41377acc522cb9591b073c25227715a87a61ecb3b18ecf4cf784699157557117507c002
+MISC ChangeLog-2015 1413 SHA256 9219133f44200cd98f3596f67b8cd4efcdbfc085d660b0fc7fe7ab8bedb5113c SHA512 9bd27e40a715db08ed9e4320ba944263f3aefa372c55d8ef64780724e8150d4119c07af98641b83a1acc27c5bd600ce51c9d856e67affeb667d4ed732897b85c WHIRLPOOL a73b45f77e910d66cced9a286b48750572b98aa11ff0422c4f2c3c80c42fa556d2926921418e371b92d346a6647c98352fcd1b506dd0e9b23de3dda4c3b369f3
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..731d5cd936ae
--- /dev/null
+++ b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 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 ~x86-fbsd"
+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/Manifest b/dev-java/sun-jacc-api/Manifest
new file mode 100644
index 000000000000..5b0b844dd04c
--- /dev/null
+++ b/dev-java/sun-jacc-api/Manifest
@@ -0,0 +1,6 @@
+AUX 20070102-jcc-api.patch 466 SHA256 878a6f7695af9cee165adb1d98b5d45fa8a6d4687e19619a88748d1eab51ed71 SHA512 763d0c0ec83e74ed1d288ff01fa1404dece9f25cff25332f944131457cbb0b24597df45221e4124edd4441504f23596ca0db63a697d2543597c70c83114f66f8 WHIRLPOOL 56e08ad3b58956b7004cce1e369f956748d1c8b2ca15a25fa7603ec26c91807beed64ad1b2c2475bfd843d12682035801fb8b22ff0bee74f7fda76a158cd7fb4
+DIST sun-jacc-api-20070102.tar.bz2 25672 SHA256 bb85f53ae3ee6a22392c855dfc99d7b1bda715749d16b94162cbafbdd066aa14 SHA512 cccc71e327fd7a947e5b2430a0733f9a22c57388c38476dd253d808a2baaf7474113f809f7f47073b9fd8d0e9f9dea81e8c7192991fb10cd975e8db29b62252b WHIRLPOOL 42e028a5e35e68b4d7099af25b7d09a19accbcc84047b749499e12363f82243bea6c639747a77beeb7695be782a03cdca4abdbd3b3c02c00a4ea38e08e198588
+EBUILD sun-jacc-api-20070102.ebuild 1067 SHA256 f9a0063e8383b902a0c52d6e6fe8af175b465fc469cb16d6ed5d7c63440cc6a9 SHA512 ec4f99f19b53d91f231d0453a87550e4b81a35d7f81cbefe657a35231fe2337897ed49cae3b2917e4322c62908fa65633bc339c81bf9edc4269cb9b860efe7e8 WHIRLPOOL 94e8529b1ad3cc8aaa996e7a3ea210d8146b9b56a4ee7b9d4f29892a1fd07fe1b99c1f925bd3c2bae623a05401506b1cb8c077d9f0b077f9db98586186be3088
+MISC ChangeLog 2479 SHA256 70c4aa04199c364cbb2ca84ab0195fbaa584105114d0004b4e21d0cc508d8fa0 SHA512 8cd556261f6453411af3a26126e25d5ec49b44d6bb6b134f898c8d53d52241a475e0572161e05c580d005a0eea0fc68ca439ac9a8d4e3d49f06ab7e689ff4800 WHIRLPOOL 290486bf6c5243ab5fd5d6ae0f1986dc762c598e151b79ca5cd3923390767b3af5902a96f542dc6ebdbc86a6c3c7c7284e74d507cfe2ef8ed8614a1a88637568
+MISC ChangeLog-2015 945 SHA256 60df71d7ef854fe3dd4500fd4e5f6919c2d59c34ecbf21bb20599a08093e1074 SHA512 5ec0a2a93c3a8aa2ac7b639c97bbf4465b594520d8d94c1a569c6a61f9cfc8e7473bfeb62973633f5a54acb7c8c7bd49d98cbe068dc820c3ce8aa93dc04ddd9e WHIRLPOOL 534106994e32ac00b4a3b2143160fa1644fc7ea9b51ff55a89a3fecaa7df19edf9aef9c3356e1806839103b82dcc1163cb5c71c875cbf607c7b1430a088140d7
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..dcf5c7a29860
--- /dev/null
+++ b/dev-java/sun-jacc-api/sun-jacc-api-20070102.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/dev-java/sun-jaf/Manifest
new file mode 100644
index 000000000000..fe17a133c0cc
--- /dev/null
+++ b/dev-java/sun-jaf/Manifest
@@ -0,0 +1,6 @@
+DIST sun-jaf-1.1.1.tar.bz2 125305 SHA256 3c61b1390a92b0116c7c43434d1a81eedfcfed7b95017110ba0d9c9ee31b731d SHA512 c7287056514324aa5feeed3d4afaf861869974dd565f7810e0161fe590f070ec894e7005ffac4dd42cf075313237027d7d7c88cbf583e28e05df361536d73001 WHIRLPOOL 2f2fcb4c0b4f649ab6f42ffdf9075b11416e4a09f75760775055ed5dbf0c0a6a633f51738011f87b257dbe552e3aefaba1269ccc8e5fb4d23883432ea08e9856
+EBUILD sun-jaf-1.1.1-r1.ebuild 628 SHA256 2d9ba7ff9e6029778a79a039bbe5df1c61b58dcfb1ba9c3b5a6a42042ceb6cfd SHA512 bf06093b19c54a0c72ca4000c215e7da868d8c55d6d408e017bca6cb7c91490f28a03b6f97e4d3ac080b17a2f207976c3c87342190caa11d1c0e0b4e20d851fe WHIRLPOOL 4e1463d6912950870d50b8319ecae99eb73161835306c5e52a3a7dc06da700aa160cb3516df541b22e4ad5bfe94a0b5ba3b73f028205f026e0a7cfe6dc5cd36c
+EBUILD sun-jaf-1.1.1.ebuild 1288 SHA256 41fae592b8b1096b023c4be38f3e8419bcee7360a760fb9b5f62bf4b57ef1d83 SHA512 49e16a402954e4c3e8dc678aefe4de66183c7bad460a73fbc097a8a12e37556c14a2ed3728b5a022d18556c40777b5a64399f21e10761359373d372684693b61 WHIRLPOOL fa760fcc64bdff6e1390e2baf44cd0c50630ba2603dfc60c004e96d77a77f1e5f0d834b6c868cf06ce97b6e7ae32f770456a0cd4ae1fc98c93ff2e06a17aa8db
+MISC ChangeLog 2565 SHA256 91ffc9bcec2bf96e54baa803dfeec98e9574190fcf5dabe63b6343ae600b32f1 SHA512 87e67d032442e818a2624338fda8dc26c676b3ebd1326f96a5413ebc05f83cdd6884f916e12c7fc74c5b3bae6e58e3c35163601423c4aff24b97ffd0d0b017c0 WHIRLPOOL 1b10bb6357bd6960b002338390750590d028f585ae00269b2934799004ed1a83803e55823cafcaee632be5a9ff5897a34761f7c7e4dec4cbf4f0dec59316d4c5
+MISC ChangeLog-2015 2293 SHA256 cfad40e1641126c26f00adeef38dba3776ff28f58b00bf6ca906920eb3c2b208 SHA512 23403006a7d1a4874b22f2747cc21355b65c099c0ce62a16540125e3fe94ae6e3df52a0fed3e44adc5baeaf36576ecb10a18b228f896d712ade257015db54a53 WHIRLPOOL 70481e1034759d70f81e7e7aaa80c2bceebbdad68c749684fd253376a185fa8aad0c72edea51591bd64df4fec2810255545e9c4005cf4e4713d29361facf4f2c
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..1f45b3b157e8
--- /dev/null
+++ b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
@@ -0,0 +1,21 @@
+# 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="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-fbsd ~x86-fbsd ~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..8750b73d4038
--- /dev/null
+++ b/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/sun-jai-bin/Manifest
new file mode 100644
index 000000000000..0a90df67fb6b
--- /dev/null
+++ b/dev-java/sun-jai-bin/Manifest
@@ -0,0 +1,7 @@
+DIST jai-1_1_3-lib-linux-amd64.tar.gz 3510451 SHA256 4bf0d26acbedc9e203059b18f8a1a7bfef0b448cb5515b8c1b530706e68eb75a SHA512 5089b696baabdea9622683aa7a3569daf724fd7fa8a4f1c95073b9e96ff5c37fc55a9e3a6fe499abafe61f5f4a109770bd27172ae6711ab7b4da3de55d8b0f56 WHIRLPOOL 2c5e603767ab27daa2f5acb8e2d01bfdaedef15f7fbe6021d33c36df46237c40a44d4f25482f1a4d316fba9d9fa1a769ff029cde49969ecf5641135541dcb0f6
+DIST jai-1_1_3-lib-linux-i586.tar.gz 3501711 SHA256 00e68ee1742f972e1602913afcf095e4ca49c17e2df1d2c0938ecb267d41f94f SHA512 bd142eea557b68d10d26a18b6b0d04e5cb42212e98268035b1b3615d6489bbc4fa07ad141fd04fc5ae3c74f1703c9ade77130cbf8a61603b4b271e3a0e06e860 WHIRLPOOL e856d67866fd3b7956819ed71f7386dd1c7be3d4d611b9c9d7a6f39382ce6dca651817e546d699e209bd37ee125fe93f3d6c7e6033336195ab9294e5c174d616
+EBUILD sun-jai-bin-1.1.3-r1.ebuild 1091 SHA256 d30b46a584e6739c22ae965b3e529dd36a8b0b544df78a93c06edb7f27588c92 SHA512 8e6b34e3756e0c1d1e7cfab5f36908c0531b97fddae93c0a0eb213bd1589ce49f7853509666c8ec7652f4bc97c1f28413a1cde03a20dd90b865924e4aad9bb9f WHIRLPOOL 959bbee8ae05e14adf16ae8ff6619f92617f497e517205000fed3182d09db97975b7a2bd1517b18b4cfc682fcd98411a90b5fde9cf817b94359403a3b8bea1aa
+EBUILD sun-jai-bin-1.1.3.ebuild 970 SHA256 aa8b2f0e814d49833fc3694b16c3e0e1c9cfdee999a750c4af0261ac20207712 SHA512 3118dfdd2f5eb8e8d8dd75e27065a420642299f2d97048ea6201299daf0db89d2b5b609d039267807d24774c5cf6a42a97f71d9f1283de0abec08ddc34bc2589 WHIRLPOOL ba238e0cd69118faaa9453104bb70e5faf690025176fedbc30b1939340c4756090f569de7fe421eb447bdb94dfb408d1d2ec708cc2e9306e1be804e219b7a569
+MISC ChangeLog 2647 SHA256 03d79070f118e1b1c0a52d1e1fe78577b8b380335a1cae618e8e41ebabd878f0 SHA512 f76dc088e83153c538b7f0c8a9ac99c429e3dc2f4fd99442d483dac890fdb5a6b60e5e2307cedb83aa01b70dbe33600a27a4a9043d87133b68f47560ecdb59bc WHIRLPOOL 7d01bf88d7873b6af1ae3ca26d521fff7d4bdbebd7a8bdb3f7d86a9ce3e2004033847ae90673171b6165d619229ce5d620c4a2bcc4e53324999feb3e76439b4d
+MISC ChangeLog-2015 4811 SHA256 4a5ab3c9616e23f4fcffb5a0defbadf414e9614e6c5028a8729e04fa3257e349 SHA512 d77e828e9cf4ad46b11142201e4159718e75b1049cee6c2b8d255f985a99ea5954fe4d016125e956192f1200f0d3cc635cd92208e86fdf329f4a26f3c446576a WHIRLPOOL 017e12e75ca82da57905abe8f6b9eb6118c4ebab247a807ce44f82db2b760e7dcc2088296a09b041eba9d719a3400adde4e28c766f7ac9d772e3dd16d293fe23
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..90eeda9d5b62
--- /dev/null
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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..72d408be0023
--- /dev/null
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd"
+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/Manifest b/dev-java/sun-java3d-bin/Manifest
new file mode 100644
index 000000000000..7511833c8b0e
--- /dev/null
+++ b/dev-java/sun-java3d-bin/Manifest
@@ -0,0 +1,12 @@
+DIST j3d-1_5_2-linux-amd64.zip 1956319 SHA256 906e84747d4993df08b765576b8ac0fd580a1062fe1bcca173ff0d060967b175 SHA512 6105b460d09f68c7a1ab289e23717016329900d1e113b516965ee3015fe47836d2165bb450c43f7fa5f7a42ff819c70581193990d153226cb41dcecb1b9c71bf WHIRLPOOL 1f40fcf75dcc5c70485e5ede6d64da43241da326d0085ae456f81662aa89ca1bb820bcb53cdf053331e82e70c18ca80b2dc7bb1f51d1886e789616274fccbfd3
+DIST j3d-1_5_2-linux-i586.zip 1956020 SHA256 264af1e73738d33ed52c56527122d7e17c3d64b19d7ed765ac235c5c4d0f9522 SHA512 1504d2dbcdc9a49be84f1a6327669764febc83f4e5c4365894b8a4bc15b14857262bc0d548b678820ad3aee8f349f2515cfa9a06dfdc0e8bb9afd50de0c4ca56 WHIRLPOOL 05dd7c6dada0bb201829017472064599d73a402d486dd5283a91a6228d6bcd6a21ecaae8d3958622674e6374e3714c5d7ac0cc37cec6286782d0004b8664e367
+DIST java3d-1_3_2-linux-amd64.zip 1241855 SHA256 e248fc43792db5a351540e7c1a7c4c594fee30d5a8e622dbd8290075becca8a8 SHA512 6781be7d5c510b9ed4fb533e58eed792ceade0245b7ace00947f6cbac711b589d787500322d3ad4e6478c61e017cf2be9c7542a59a6a0af780d9e0a06b5a5f78 WHIRLPOOL 00dac2f26e8c71df5dcbf6fda2c25434994a40d7aab8b7901c2b2805d354218563b634b82b2d957e6f642624726e3e2f8923576618f09dac1699d27d9cc88028
+DIST java3d-1_3_2-linux-i586.zip 1235329 SHA256 1fc3a02714bcfd938b5449561cee49c3ffe5f8c320591374caab4a0c2bb9f415 SHA512 5fb459ead7cfdae468017bc40cb6f8831a8fadbd27fd3c62404b9cf5ebdacef092e8a4153058731c2a004672bc69f4061b664412ed937a7b49a15ca580762839 WHIRLPOOL a9287b5b6d6f4346c736c7b707e34715b6515c0df0368848212ef82a4686d8d8374db756fcaf67b18617c42aaf6c7ab34832126650dacabd74b96c74e452dc5b
+DIST java3d-1_4_0-build5-linux-amd64.zip 1281828 SHA256 1ec9d7dc176eff6bf2c3568f452fc5b13d471d4f963090570996a635b8f8a301 SHA512 ec1074e5ad40964a80e2ec3332f67d1b7067db6aa5d99379f9e488e2c6a342b0c3d0c78aadd995bd647047efdeb0f040c8e8c7e4557a5161b6a8919fe93cff81 WHIRLPOOL 835257f8099a71cff3533a651d08af2f487ca79699e3e0165999d8b3dede75bed373a7b7f9dbf42070adce5aab87563a2338195a9b96fbf4130db16456434686
+DIST java3d-1_4_0-build5-linux-i586.zip 1274577 SHA256 e03d87159b4d2cecd48f90d1373dfc496049e41888e8a545cf5bfe94a89aa4ff SHA512 1b6b87d660b98029c8a5a2cfc9435538c89032b4318243ee5dc01629c72f8f4ea189ee383150821b291a6bbe2b3284ef7c6da6404851a8d6adfe6fea0af3ac59 WHIRLPOOL d9e73a16ccc54ac16dc5275ad67aa2fae98da8475f7c7ca54db2e68fdea751048f578a4f12ef43e06f11c50e0e2eb53cef8804623e86865b0bce0acd7ae476a6
+EBUILD sun-java3d-bin-1.3.2-r1.ebuild 1073 SHA256 2c188410c446409fe99ea511c133cd0169288362bc3a0ebb3f3843fd49928115 SHA512 662b36427f18e84228f07f6df1496f498a60fb7910e44fcb606af2d7829ad70ff09a932551d5814606c767e79686d16c44b01513f5c605c8b24c7905a3631a49 WHIRLPOOL 9c3b29f78a9daf257af7e057259a4f51ed2ed3402dc31767b63324f484ed8bf03f91670958560294eab8f355c9a63275cb45e129bd3369ea25f0a3d8bdabcbf4
+EBUILD sun-java3d-bin-1.4.0_pre5-r1.ebuild 1187 SHA256 0b91a5333f8f8420ba1b9103d61e166aa040edac32e081927c7d51addeceae38 SHA512 caa0db832ddf5d9866ca85e260926c9944c699d6247d5d4f6fa1d4fef9b7783dcaaa9b825757866c188240d28ae747944ece1b6668a58033d43d24f5cceaf631 WHIRLPOOL cd75643bc7fa3799d6bd102ae6f42d596a499bdffdcda66934810ca872a494c3537b4df5ee5ff0c225355edb6ff060d5ed9b61f78ad09c8bfc3dc6b1d73cc3b6
+EBUILD sun-java3d-bin-1.5.2.ebuild 1142 SHA256 60dfe54f13d2dfcba6845fe57891bc7799562d1e46b4842567e034ebbfb88ed3 SHA512 110605860513f90c977a00219c4f509a3415976a99ca012758e186cfe174d134efed78a8756d7c5ce704773c00ccdd97e88fa1d023f98b7823e09440390855c4 WHIRLPOOL 0597c799a3dffafb9e991d9dfd9047a856ca671e1cbce1b36752c39b0f8c774b10b4b2fa907c67b4be166670637c685a45863349da68ae0067a3d4f0e941b986
+MISC ChangeLog 2536 SHA256 17f4132bc0c182d011b3605383ab5ccf271996c617389632c5e41dd7a32b2632 SHA512 8d4bcde2f2a58206ae7d083d329bd5ec4fd970b0411f47b3430a601bec6a9f4932a431447fc8b70eb82592e98af1898713c3269e8f5dbd11dd55de08e682cea4 WHIRLPOOL 1350bc500e7be8706d8c23f335cee855bb45141a7c4d40ae54152394e8427b40b0aba68f933a7ce4f8a9f899b542bfece83365b8cda7f87173e0428300b9f914
+MISC ChangeLog-2015 2809 SHA256 04d6dab99eef97131874e184f259960647e969dc96667bb1f9634d5dae7c982f SHA512 d742c1424db440819ade73d3e0cac4f67ba9d25ea62b1f21807cb95678eeea3823692ca79f80e6263d1a9f1776bb8f174af3dff0f352a470f7b6a8e5f36f0481 WHIRLPOOL 798ffedf68bf77986ee2cf4d1de64601f18ffc930a4dd8a0a3c2164c5a5ad86000a8fd89afb70740ccc55830d679b710c95aa2c8dc550cd3888c24164a36ab71
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..88d7bc2e3d7f
--- /dev/null
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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..ca578582b69e
--- /dev/null
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/dev-java/sun-jimi/Manifest
new file mode 100644
index 000000000000..1259bb344771
--- /dev/null
+++ b/dev-java/sun-jimi/Manifest
@@ -0,0 +1,5 @@
+DIST jimi1_0.zip 3880977 SHA256 06c193de5d78f2597191963c34cf306a960f7144759337264c1c60a3b3b8a0c4 SHA512 28ae3b3044910fca80dbdf23fee5f0d050df64ef48a09c41a836f3ff78365258c747f69a958579abda68d6d6f1c6b6a3ea5e960d36f2199afdb06258a25173d5 WHIRLPOOL c9ff66c4a15eb39c30e70c47bd7c8694024e34ebba09a7a440b927f5e3da0498f4ae2b8c6ddd96e3fe18933b93cacbb9c01f63b672caef45b601e4cf0bcec4fa
+EBUILD sun-jimi-1.0-r3.ebuild 1094 SHA256 ccef7fda0c57d32f020e5c1e950f05dabb4724e62b8c2f7f4cde0fb37a5c50e6 SHA512 e67ccf0d46c4043f5183875630495d0113343fdb3b0dc9d8505d57d59ec105c0462f14b721ac7bf957e9bc177198ec1e5f6478c0d11f619c0ca9531cc2f2bebc WHIRLPOOL d69c942eeec1cdfaecafd883db82da959dc829da9de9cb46d9c4e5b96c91a37686b55dc987d36ee834ed964c6a07916fda07d0f621afb7fafddcc242145e4c85
+MISC ChangeLog 2572 SHA256 65e94b8fe9c6218d7fe6adc8b00d545c24fa173b155d68a233b1a1ed313579ed SHA512 8c6c8519bf5b8e22b3f4a517847a4962706c87ae32892f25dec6aad1fe0c79bc9c74fd4927bd2e61033e5c364c6b3077536c51aac02a746e7457db741ba9c30f WHIRLPOOL 9283b4d9222b52b0d5a773d3d0aa29707e193b5f2743393907ca5063f58a6d6d90ddd6444efd5d7ba50a88e3a9c4de3b493ecaa7117c49ec7576ca57b77f5086
+MISC ChangeLog-2015 3522 SHA256 9753fbf7bc8f71467c08451ce5c7482b046d9f62e5cd205f1cfa25f5e0637b22 SHA512 587cdd124a8d60994fef581f3457bef8c50daf3530cfa179c9fe9ce929876166af6ae9c93230e249a71676f9cc62ada25b735e3154ee7292411c0964e97e7db1 WHIRLPOOL 19e0a3188779a3a6b30a6ae00e11b17761232b31be92a5e1c02d06943e2eb2b8a57be76b503c0eefa612032e94a5dab44b409091ef7390ec1129e49c749ed179
+MISC metadata.xml 603 SHA256 b5f976c0f15182bbe2052882b8ed251609487870d41924808a0a5632752de866 SHA512 9bb4826797c652c42446acc1c40de86e79b4a96fab91b36835439794f7f1df27fb1d03d73bf6e9e6e8762cc998a3026ab04309d176e9968bc2f19423c147ce7f WHIRLPOOL 258a3a5ca60bf1f1575e53a19722a04f8c990492af3dc80e364e3a587b343e94ba5d62714c3ecb86941e842ba4e7677ff7ffbd3e4072dea81b84e4e25154f078
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/Manifest b/dev-java/sun-jms/Manifest
new file mode 100644
index 000000000000..c33af0b30e0b
--- /dev/null
+++ b/dev-java/sun-jms/Manifest
@@ -0,0 +1,5 @@
+DIST jms-1_1-fr-apidocs.zip 361922 SHA256 7091506ff106f29828bc7ef68559f054cb000f1d3b1bcda57b59666efb1ccd8f SHA512 ac2c7925b7f5bd3918f0c69a7b18dfa2a15f58243aef7cb429c0571ea218860fc146fd355c905e17310072263f64385b9010eafb1050158f42f498d7f21dfe1d WHIRLPOOL 976d869f53bd3b76b751b48ac664f0caad6b29117a9c29ce5c1469cf00c1864cfcc2da7373cc536c63ae795d616ac567f7fd0df4fe69631ab75b0252def76654
+EBUILD sun-jms-1.1-r2.ebuild 1333 SHA256 c24153503d809d267e93071d11a6519d40acf923d1b70dcd364cab856bca45d2 SHA512 d795ca9356f9328f058211a712fd99594f12f02d68c1adb28c189bdcf70ec801f8fcf76a1d74354712fd9cddb5262a33aa3b3658a9ba0267d91eafe02cdeeef4 WHIRLPOOL 0cdbdd2c8701e30e5993d9f6372590f35ad55e611e7d4a0edcc7b1d83db2fda8dc23722475e8f13aab6535734888ee3f4fabcc158e0250bd8179fc4ce6df2aed
+MISC ChangeLog 2568 SHA256 eddf6f917d45a92fc8daa162e193d19eea7083e418e74c1514ca76b21146814b SHA512 68e18f5344cfcff483f80b42e25ba4d2c6f8280f13f1e1b4085ebab45c429b2facf67250b5367bb2765b449441439f2e5654759678fa57ef42e9a1cd91afc31b WHIRLPOOL 7ff32ee3bca7c6e8672199f9e921cccde54a6fd54fffc4b621f712d12ab200fd527617e79bc4d24e66c47099734671460fffddb2c00f5f927b76cb243f322608
+MISC ChangeLog-2015 3264 SHA256 05c6526aebf4dd792f2c0ba2d6413b6783eb83d58adb740c09d6b317687a556d SHA512 013d9c98e1f2657f4e0e2fb117a7beb23ffc516eb59f7210732f14628e5ae1d5e820bf5421b83b8ada1304c597dd042442e69bbc3d303d3782f868d2a5ab10c5 WHIRLPOOL bb0c9db5016f0fa02893354380f3b5a817b123325fdd5447581c68c25a008b9d7fb43df07c58bdd216b7e285705dc0bfa1ce0ddb8cefbdafde450010980f18f1
+MISC metadata.xml 420 SHA256 460d9ea1f14650a75e4898fdbe22bb563828e056b2f6950906e467af864f9813 SHA512 60f2556340ffa7951c69e1bef1a5eda1905a02f3a1e72199c7af02225844c805fa2154ce6629b6d8bafcece22fc3d1c75349021af6932dff3ffaf952fdcb818c WHIRLPOOL bc0c4463d6e29a71740510d0d12e8f4d30f092815bf13f466e608215971628e1d1b835b80ba43521cb5e785df29627bbf4bcdd75b30ceb4a8df723a92ae6d28e
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..b6aaba4b5052
--- /dev/null
+++ b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd ~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/Manifest b/dev-java/sun-jmx/Manifest
new file mode 100644
index 000000000000..746a022b646e
--- /dev/null
+++ b/dev-java/sun-jmx/Manifest
@@ -0,0 +1,5 @@
+DIST jmx-1_2_1-ri.zip 1624569 SHA256 cd61a03be89e169c8efc994e45517a91ed42c4b3fb35c728cb04c10a2b687819 SHA512 39c933ec39f3fcc631d6d8f3aa88724bb0aa11ff62dfbac61762d07c718dff4ba1e16b1b565c7aa1ede7d616516e68d0dbe8c227db34a6d30bd8f29880c7a5d1 WHIRLPOOL 01ec4824ba27143ec0f25953ef4dcabe75036cb6208343206bb156471c334ef3fd32c137ea93e7af986b53b6d2e383f26303a18d2deafb46b21438e818e54956
+EBUILD sun-jmx-1.2.1-r3.ebuild 1271 SHA256 0b22a00ed68cd41b6762de1dc71a8beb2ab2f05c265fe22449e2dbe7af1eef33 SHA512 e4017f8d59106e954b3a379fda89f1156d020b8c6f27b82205fa46aa749d05e75a38b459df241f9225aa403afab174e9e8b51e2b411d9206849a424918f5d9c4 WHIRLPOOL 72819102a14d88479fd4b8dba1478322bd24660817a8d66e98a5f176a957e9728da6587936b071d220b0b2fb1de62741c1ff79008e7db456aabb9516ffa9cb89
+MISC ChangeLog 2574 SHA256 aa8a1c0f6efc2be7c2ccdff43afa300bb66a0908fc758d6dc652e9a245b9ec95 SHA512 47f47d53ea2304a9932f5d1054b3c4dbbc31f6efd7ee655b9d6d7082a324fdce411e72268f05734959e0f5642d1c038abdb62834962a3f4b736e9380c246fd2f WHIRLPOOL 178fd2ac8d2b0d74fdf3a4f6d3e1fc88f290cc56548f88007a52ba95971311bad143291fca93615330bb32a8bf075e5b86acb4e7b34a7ebafd5d8dd020959d8c
+MISC ChangeLog-2015 5167 SHA256 b085afc2bac74c927b930c43788ec33ef88aeffd009b30d7d9c36b1a4c90dada SHA512 9399533dd6d4295bd7bd570657fcf9d7b78feb8ff93ac9a68a46fbc2f27842a1d7f20b2d1143e98c779702938803cc8b124ad2911a5197a2bc2793851789c39d WHIRLPOOL b1bc76629bda075414fe771c775deb5d77e07505a60e260a4b35b38a6d4539c06f46dd86665943132003aa5bf1ecb2bb90413298a685e84f5fca9ad3f036e624
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..4966ca743969
--- /dev/null
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 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-fbsd ~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/Manifest b/dev-java/super-csv/Manifest
new file mode 100644
index 000000000000..017d2147e200
--- /dev/null
+++ b/dev-java/super-csv/Manifest
@@ -0,0 +1,5 @@
+AUX super-csv-2.3.1-build.xml 10120 SHA256 5427e11b768d00240bec7d2a18eb04eb443ac508859a1d72e7f6ae35e01e28a1 SHA512 c00ce7e07a0fc35de8bbe5de901eae64f42fa0d2b277ca54a4fc58474f7f57c4c091a214290acfaddac30bc8180f1a6b621aca67fe320c028f2623d87985b2c5 WHIRLPOOL a494a76611f261a54674abb845d33202b053f40fdfde9bbbb724b9bc3dac41f77e577573ac16e54d112c4670913e26cd7e5ebd73ed0db83b84190d6deb1cdbfc
+DIST super-csv-2.3.1.zip 16624601 SHA256 71cc38d393d97eb332b85214d119002bde22954d8b7c9e7382f7ea140517173d SHA512 6b418e4875e5c553572fc8fbb8fac47f5bd9647aa6261bcb5115234b0d23ed606e88b862fe3203837ed389cb2216ab707909bb6ed1cd18297b8d481973170515 WHIRLPOOL 7972c7df2e939c4353397b15cf980db623be0abb987824cf19d2f5e6933143a79a4660522ef3cb95d96ba0dce2e42aa8e40b3bc3a547a5216bc34d14e0cc9c49
+EBUILD super-csv-2.3.1.ebuild 934 SHA256 ee879047d84b4020bb3281e0ea1d3150670a69cd39f1992391fc9e8cdd799d2a SHA512 419c92da25faa1c2813e2b42c744b16a889579db5a09bc1ab01a86eda95516f33db59dd2404b14f840b6f28e557b4f44f99a591cc07186542b78829c488cd1d0 WHIRLPOOL 3e39f18265722783740e669b2460335aacf744dab1063a431f0a4e7e86957be3e721752a9485736fa63e0c73ec31185e2e0d426626de7de1082b9774f4d22280
+MISC ChangeLog 1408 SHA256 3516106779766cccceebd50ab4610e2168268770ca2ea3434300abeb951327a0 SHA512 32163837e6eca88cad42609a38195b1ead08d7e7879c4ec6f503f06cd25b4b9181d397bf1f87e6d989d1151df56c9efae795ac519e2be43427f5e5265a5f115a WHIRLPOOL 3c519761e335227313c00566fc32bf78c2b6542f288719c2b56d01c75f99575be7745ae161e8149e75d0b7a542f0ae4acb3ad9f199fcb756c86c14712186861e
+MISC metadata.xml 431 SHA256 b29f6d0f3bfc13b64498c6af45117c0a522e364292bd3b778067cec88b6587d9 SHA512 64643e48ccc8537b92b7255824e10acb0ea09d273cd7ae1ea9d8ac110eca614acbb9e34c690e238c4f11caaa6d46175807ceffe1bf841f2b87005a0395acd84e WHIRLPOOL d9aab42bc7fe0486d52f222434c0138efdaac94b7ddd722c191d6149f33d622490e3db0d803672c4959096d4a5d8f4dcb3b68bdeabeda0a5b8fa25b2884440de
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/Manifest b/dev-java/svgsalamander/Manifest
new file mode 100644
index 000000000000..b9f4d045d424
--- /dev/null
+++ b/dev-java/svgsalamander/Manifest
@@ -0,0 +1,5 @@
+DIST svgsalamander-0.0.tar.bz2 2404011 SHA256 38ecb63c6d1e0a39709b69dad8c52f89e3a861bd42ba8a71762a18c03f1276e2 SHA512 70b182d204bac88b33b1c7058c35ae8e83c4ca178829e8c136dee8e1edd9bc6e99dfbd82c8b4c8c556bea110f15dc9e38e7ee266a16cef0ef6792463bb6a8906 WHIRLPOOL 34290892d47f08fbf383e2e5236ae6fece3b0df37d1e0ac71e539e9255396594dc3291fc769eea5b08c8db79849442261599242b39ffb5640b5189cde9dce980
+EBUILD svgsalamander-0.0-r2.ebuild 1112 SHA256 e466d542bc35de580ac0c76137c3008bbfc8c91ce5fc5fad3f3e70e0d251f875 SHA512 f1a88fdea1f357bf24c25dd98b08fb1298a7fd4eebf5944a3b6964242700bd6228291ce5c7d0c394f4fa6539aa751334ce599ccd65913c5d96f37f8d46b0a28b WHIRLPOOL 824858ea9f2a62a7ceada2cdbb0cb1dfb9a8ef3f21289de3ae2f842af890c7d95281cebeddbe66ec858d007ab0f648fb5a23e5abeddd460d503fce8d4b8dc20e
+MISC ChangeLog 2952 SHA256 c57774774c63bbac5f1eacc826a4d892404c45989cdcd5547c56680acddc8896 SHA512 2220980f5cffdd8486d14e7e3b855fa088a982317fbf2d16a3d1229a9169aad7e1f73335a21845f3e330f240df89edab2ef073074f570eb5620f96e0e7b36bab WHIRLPOOL 4cd64f2e1b57e9bb336ad5b080a66fbaa9aeb48d81c1a864f335ad24c876f79b96d9b18904f49fd2f793bc699c73c62dd01849998226e51cf3c8b42547f8ff69
+MISC ChangeLog-2015 810 SHA256 79bf482f598215d6110b0d45696912524e5bed9c6c291eafc1acb4d18625ccea SHA512 84cf02e56bb2a97de19eb1d79b2216dbbbf6596fc3d0f8a9dbd5912f43ed5c1502ab09ec02adb12cd7faaeb8d6c8e85046dcf9b94e00048dfe096d139815e294 WHIRLPOOL dcc54d673d7311091a951ac20edb77a9c8afda44376d67a2aae9920486ec9889b204566a7a25cddeb1ca7f3c5dbcbf46ddc66890716035ad91f7985cc9f302a5
+MISC metadata.xml 641 SHA256 efe2f24473750a2083d990d00e43880ae85ce8292acd673933d0b556c12b2ac5 SHA512 d28f09d1bda1f31b10e69dda13cb6ce52de10e8f9df27f63273bcad31a016c8c133e31d97309f03022470957e9136c4de7c904dfa5683ef60a68c0985e9a4ed9 WHIRLPOOL f212d1ea4d1e39cadaad00d9cc530a4558b99d033e7cd823a14fd671a0618b9ac75ac8c81b09f2a7eb045fc2caafbfad89793194c8ddf1213089b4ebc930e6e0
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/Manifest b/dev-java/swarmcache/Manifest
new file mode 100644
index 000000000000..6aad8044ac66
--- /dev/null
+++ b/dev-java/swarmcache/Manifest
@@ -0,0 +1,6 @@
+DIST swarmcache-1.0_pre20050106.tar.bz2 34632 SHA256 9d34c3b20c9b227661e2aaecd4aba11bacd46d9f885cdf116cd340966081e382 SHA512 21c05d83a6e05f3c31a1785e0286d2f584375e3aa97e9fa2dd18a0aca5f3678817a6a019524e6b55c2f047547296cec83c9e108c9272401b592ea0f8338878d7 WHIRLPOOL fb30a849e0e6d894b5300a8feb9bc9a5da6792fbc72b3029407621abaf09a09ea164dba4d2d2b2932437c37322c2f66362a155b59394970c8f0dc33c642d127f
+EBUILD swarmcache-1.0_pre20050106-r1.ebuild 1012 SHA256 e431782c71277c1764766345d8f7fdbdfe4d72776a15fd971232579d1cb5f238 SHA512 c721a879525592ad6720ee15dc4334009c74a6277ad890881775672cb8f188555aed44877c0ea9490027bbc475d6d1a4549c1ecc77c5fdea47c5be346d8c3df4 WHIRLPOOL 7b60881e0b8155c0c8cf1e4a58dbbb4fa0dc98bf58ea49906773e5036b6d078be5ddf8f1ad28cf9c96bdcf7109bdb733b725be71e6dcc377dad69217cdfd14b8
+EBUILD swarmcache-1.0_pre20050106-r2.ebuild 676 SHA256 cd0cb21c2571825718853eda62c01d5f68fca35cd5ec8d65ec7c90b7e92a0a7e SHA512 0eb423f5df1cd0b84932299d2f12f6946e343ecabe52ad7be05878e40241c8f6eca3c3ff79097e09874df4dca4830cb1566f62856a5fa1f27a1769180aef8eaa WHIRLPOOL 6ffcf7025ea8dd0ccdf058de0f57298d0197a19bd4becf20f96eae5007b8c727a075418857666175291475f38a702163caf83e455c61833495028c583f11d02f
+MISC ChangeLog 3008 SHA256 fc6f3f9fbcb37e99cecbe73088a049d4cd266278c4c422a37217d5eb359f6962 SHA512 bd2e4936ed30dbd6e1880e5fbfa0d633b1ba6f78e4c7d734a676bfaf79018193f90eeafb209bec581887967c25c8d0b1f9a6df2715eaf0d45152e7bbdfc50fd1 WHIRLPOOL 1fa6e42892bcd43bb63759acac556089ca8820351a5e442fcad0ea98d5b715ada5abe54d81194c20749d4e959d3b4f9fc4b5e4b6640281522c278b2fb602a0cf
+MISC ChangeLog-2015 1734 SHA256 cd41d65af9e91a805fd0cfbb67056154fb47f20ec244f74e22914653b0dd7bfc SHA512 ded1e2791ea026e034c8e6d43f2b8724c67a28f3702355f40ddfbb62fe1c494c6517c7e3cafd1a45917860224e67e578c4b44102aafe2f73acc60f3a3047e60e WHIRLPOOL e10113b2dc8b5db617b24e14bbcedfaac61fc4f1ca0c29c546433ad122e13fa684dfd8fb392ec0a2d242e50b5e2be3e55bff2be10e2b23d47cd1d51bae3b20b6
+MISC metadata.xml 316 SHA256 ac6c0ef41fbcdb21930236755a345d3ccec08127b604186bc8b0edc8d12b528c SHA512 77c639a56c22f43f936a864153af61bfb55ddc9738a76451bc337e08371ee5947c5cee2ee41674e480a74d9d78b69054400671c329511be499250c16b35a57d9 WHIRLPOOL 7d280bffa351947297b8fdd594de3929d4c785daee7fd6e1ca26a6586a802271639eb6d60f70607b3258ad8bd8c08424ae6fdabb1dc8b0db2e62c4fddc632502
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-r1.ebuild b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild
new file mode 100644
index 000000000000..c950e60e21df
--- /dev/null
+++ b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="SwarmCache is a simple but effective distributed cache"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="http://swarmcache.sourceforge.net"
+LICENSE="LGPL-2"
+SLOT="1.0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+COMMON_DEP=">=dev-java/commons-collections-3
+	>=dev-java/commons-logging-1.0.4
+	>=dev-java/jgroups-2.2.7"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}
+	>=dev-java/ant-core-1.5"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}/lib"
+	java-pkg_jar-from commons-collections
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from jgroups
+}
+
+#Tests seem to start a server that just waits
+#src_test() {
+#	eant test
+#}
+RESTRICT="test"
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	dodoc *.txt
+	use doc && java-pkg_dojavadoc web/api
+	use source && java-pkg_dosrc src/net
+}
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..7459c425a271
--- /dev/null
+++ b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.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 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/Manifest b/dev-java/swing-layout/Manifest
new file mode 100644
index 000000000000..5099a6f23f27
--- /dev/null
+++ b/dev-java/swing-layout/Manifest
@@ -0,0 +1,5 @@
+DIST swing-layout-1.0.4-src.zip 69859 SHA256 b8169b37e4c6d2e92881e97d3023813f99c7653595e8a93e3cc6b26e5bf70351 SHA512 83fe876b7d35ba204158ea9ee7a313b330c4f0e8b0ea81b3b487e75aa5e14a00c744aa30af049d9feaafc888875ab194fe73a5838b8073852596704e36517dae WHIRLPOOL 12d02c68632dd869663e279516cb101db0c9f1747ef459dfea955d770a7c179576b5db9cd2cb53006386e6094b05a8ce1d6698a0ab0677211c3a16f83cb1349e
+EBUILD swing-layout-1.0.4-r1.ebuild 506 SHA256 07ba4eb1c92245c50bccc1d466e77903be39ff6005d87933b756ab1e5fa765d4 SHA512 17c1ec85b611fad3b8c734d1ec9298d65c95cfc3afcfc8e6db3f5e2450654a076921a4f9ba8dbe6a0c63d060e0bd04c4dfc7ba812dfda3580b7cb6859d663188 WHIRLPOOL a18fa694ab05e31ddfe2e911fa5ddafe153e02814421763556a53a250b3f95e096ae57bcead1ba83c13dbad6292b434a6cf654975fdce7f15fa37143f6f04753
+MISC ChangeLog 2852 SHA256 238443db031602d98e327c44579860ecd01f2b911fa7fa945eeaedf2ba3258c1 SHA512 9673c1f1331a9219711faa2828b6065d584aaf7b5a3c9109b9fb8d77926e1dae8e5748a24f903cfd990984f8f592ece128f8fc71d6f60b32be499116b8a11aee WHIRLPOOL 25d852f8d719f8e0c538b53bfd4c43aafb84e044a48da6d7c490aeecb00f5c770a9fa0455450b9a738c979a3260ea2692184445189d0d3d5c4a02dd83652e9f2
+MISC ChangeLog-2015 2897 SHA256 78d1365061cd33646de8be345f9541c3e8e0291650fce26f1d79889ea39c20e4 SHA512 5f792c9eeddcff9e5ff7a098c976eb8cadfe19b03ca0c92558b490f70655b47c3cc78ae7cbdd10bd162d5316f7a7b8edbfe6f10a658dec4c9f75ba476de6c299 WHIRLPOOL 085a96a13acdc6096e08fc4c21d27c3822887ab4d4a3b5045e3386e9847de260e1a7ee26f6ba4856a0b575de3037a1d5a1d7a2688f9a6f2b403c804cc96a0b3f
+MISC metadata.xml 451 SHA256 c0204e37decfea1283161a8c49e5a09a374f6aa04a48e1976788ac4048056e73 SHA512 b10da46476f60d58b851fecab6419d3677abcd1775c23aea1cedcf7ba9d1ca3cac8e5bd79ef4b038833ff060b6ec881d8ef40cf54e70e6d60c9110bd788858db WHIRLPOOL 2e809565ae9c71a69363eee4b6d95d6830ac796199b09167734c1e8c40ce283f5b459c80a3d7b7cece8b6f61654a8cf7508d19286cd4d4e4a5097d4b8fdfa69f
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-beaninfo/Manifest b/dev-java/swingx-beaninfo/Manifest
new file mode 100644
index 000000000000..0d65977c3bb0
--- /dev/null
+++ b/dev-java/swingx-beaninfo/Manifest
@@ -0,0 +1,4 @@
+DIST swingx-beaninfo-1.6.4-sources.jar 185813 SHA256 81769ffd2f844d1dfb8e0e269a7bf4d748d9ff3cda807c114354e3c04cab1afe SHA512 9461a00404c8cd1aa7c473e060c855667fedd357688ca1be5e78d6d7f56e15ff5345cf593bc03c173172a42c190c5f76682c01d226f51472f9b1757fcca52ac9 WHIRLPOOL 869eb3b266e355024f3af87eca83edd13e78fdb553337e102d0fb131011a5a395719bf8a449ca0b04622f29f4663f2bfe8bc65772662a0d3b25eeb71c4b7f43f
+EBUILD swingx-beaninfo-1.6.4.ebuild 619 SHA256 d788646d4bb868358583f96df09fc5d6dbe7d12e81e5220e57da422cfdd189e9 SHA512 d3a6a148173d59b2a156ede023be68b8cef07b1270901eb8f79c45e765186599cdcd37102b63809e2dce065c6135aa5d0a31e9c84ace7168fe8554639eec119e WHIRLPOOL 2c9d0c47d02ee21f54c806fd3eb4cccf6402508ed1ff92209b4af4c03d4bf25eea279d00d80ac7529ab9a235ace32261eac9f193639958dbd96bfc163b8c3ff9
+MISC ChangeLog 353 SHA256 e7f753106a145ed48b3d403b01d326d64a3f9ceedf01bbe72fa171d924328169 SHA512 418def0ddb82dc3669dee403fb11cce887c5d0dcfd6ae730b6c62a986efb255dec727d5b89ab0972f9e1f493a4e187469f786ef870883d3516972196d34628c0 WHIRLPOOL dabdbed4a446abb12ce1fdd4e5f7fdcfb25ec206617e7b7a0794afd62ca460b87bb97185064341659b7137c3b2fbdf411754000844c8e22553b102128439acf8
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/swingx-ws/Manifest
new file mode 100644
index 000000000000..7cd5238ece9e
--- /dev/null
+++ b/dev-java/swingx-ws/Manifest
@@ -0,0 +1,6 @@
+DIST swingx-ws-1.0-sources.jar 281598 SHA256 b90e5915f959e25ba5789fb8e48821b1f6c7e8a10d0eb28dac264465de37db13 SHA512 722f8642e3a7c7825dd44cf01eca624b1d8a6bbfa829dbd7be326b53bf9d5467f48293489bbac6466ba9e74d991caaa6c9d56f0b7a08d205133926413517ca28 WHIRLPOOL ca2b512f5ec376f774df46d7b67f9ef01bce93cb0e41057cefe374e35d2558c1a7d9ed6bc5d5de0b205e5b2732490f200d562cb59a30876659abf8579a671157
+DIST swingx-ws-2011_05_15-src.zip 7010679 SHA256 30783793463d43a2b8303324059b0783466bef5bd889a8af4797b8aa39e65cf2 SHA512 1929bcd5d615e336fbf77f5c0406a15f0b8aae1ea2167106b8efe2708bf365b39a2313d2a22b5f77ca9559b161db5c50dc18d0cc4cebfcf7a0e4e0c978d4d5da WHIRLPOOL 96551039365386a70137d35a252299479a38389c38d26fc9dbf1e57035d40b96bbaa59c14c7f23f4a9b56f828fe10eb48c76cb886f6ab35c4d0a2cf2d2287ee1
+EBUILD swingx-ws-1.0-r1.ebuild 1392 SHA256 b52400345dfceae864b82c773a7a1ac06c7d6ffce39cc8cd007132c0a6e01641 SHA512 7fba5f418d1f17920d2e5813a33692c615c028455457637e8e7ba8e9a479ceebe39500dd98ab3184291836552f0cbd3ebaf9498694b2b91519a49b905507eb16 WHIRLPOOL e3dc3cb796411d1a1da713d8a4df15eb1700e2f5d94dcf7a201daad3efdc065a79e26df18766f5c9485b6e5de1514685b3690ef98d545e114026a79a2be53029
+EBUILD swingx-ws-1.0_p20110515-r1.ebuild 1740 SHA256 a7496dd85f47a8c1264e96a22784da6a2b8c8c46e378414abd0cfd37a7f543fa SHA512 d3d3dc25a9c6e60f8d781aed453d160237b886ee5042aaa54c1fa04c74dbde3a1a2745b4fe62db8df88a795c739e2bbfac5cd4a65c32e5e627e862ac18603719 WHIRLPOOL 15ae121cf7321be9451108238891245b3979d6863eb08361e8e1548c69d7d8d80345fa28f30ac02c2373f66607797b85ee0c892cd1b59081020cefef3dee7abc
+MISC ChangeLog 1539 SHA256 63ae6edff18f7fe8c557ebfd64895da4a16b035b318304330cea1627189c6e27 SHA512 d126ddaa2e345db762234eb56f05a6c169a746f066cd3b270c32e6f3661b9534bba570c79f0d114ee3c91e4a91749281af75e8ad9534ce30b80db5deab6356ff WHIRLPOOL c1edbc8b3b83d4259ce42dc60cfac182d111e5ad9c049af0389ec8ebdaca52bfdb45231830c9a7c9f38744805330c50e9e16358ad2d568e5d0e20dbec226ef91
+MISC metadata.xml 459 SHA256 185066de9224df98ddaccddcd57369a2cac7b7a4a10431e032fd05759da8afde SHA512 ba6627622238e8d5ebfac52de63029eee448edd37a4819cc08677abd2f04601be6f29943785ff5abb16e602e919d04ec15427de0b371962cf03e1d35da6315d9 WHIRLPOOL fb1726b4eac72a5772c2d2218fcfbba7cdeca4888c051ad19f4038db485721b950d5f1945544574aa779392dc7035fcfa03b7c1901b463b5065530d253709feb
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..8d1c01d366ca
--- /dev/null
+++ b/dev-java/swingx/Manifest
@@ -0,0 +1,6 @@
+DIST swingx-all-1.6.4-sources.jar 1296323 SHA256 e6ce0e1ac0ef16776a55f32fac17a39219577437ace6fa7f1eb96e885e1a6bf5 SHA512 d58964507b3e11b74089040f07699076c84520ab46feb8cb6aeea3e0f23c0cdb14f66d2c019ff8f7f0e911599efe543a47c103f7b1fc4829a483d65458f3fb55 WHIRLPOOL 780c0e19b733a1a2b45f9c50a3de99b4b251a4bf90b3622142e6b37507ae5155f014e7e3e886c4f104638c7fea7eb667ccdaef1346dedbae529812c12323187a
+DIST swingx-mavensupport-1.6.4-sources.jar 2793 SHA256 4ca7f1a31e84e2f92581505c453c8d2236260da9ebe15e2b864416fb686b34a0 SHA512 48fde1b0367373516e549919912f08e751fc4e0f964a9f8ae86d9d93813006253782ce2097e54663dd5eb639ab82dbf59fe61defedecd64a0e36e25a14a40d45 WHIRLPOOL 217ab4b5d8014dbb3ad536d376411e47ab32b6e1f4e91bceb3d4fc58f6fff1804b035a4d080a078a59c39c0af990d7400ee7eedb18593d236f4f88effb7bd8cc
+EBUILD swingx-1.6.4.ebuild 845 SHA256 c4da9459f4b4ebc57df09e710dc3e3ca6eed23d4d57e1114f5b555d4185c85db SHA512 db538dacce74b9c619da1977e3af6ef406ad20fe3f67f2ad781543962a1eb96084ea695143a1b9c2b1095b0c876d0c1d799762eb950f6b6ed5fb252ce0fdfad9 WHIRLPOOL 0eafed2ae8ba784dc9d13b715e943415f84c9319b1b1eefbe451c782d54406393c93af5f1f12070be7c119516ef00f6740af8430e10b43db0862acd542b2d3f3
+MISC ChangeLog 2817 SHA256 4bd0faee2cb3b3ad9dd393a4730d5917fbb30baedaf238029cc3c9bf70490b34 SHA512 630bfade55b1b43fc2be28ec10990959919777c0f96c01e596b01d249356bf62b1c5acf449769299691f64adff1c3867923c3ac3a05b45df1984bd9d549e08c9 WHIRLPOOL 07f3e440143e8c062645b408a2e855476c717e8f6b09fccedffba4525b5b9e49277f3a735445b23c5fc30341a1c669aeac64df44582fcbb691068bcaa918048f
+MISC ChangeLog-2015 707 SHA256 5fdbad2800aab7f9e02c64c0ad80b7e8aff1285786ff2a454b83d26350fa2194 SHA512 41e5a9af807efca7f62d75e9679b57f7efa1352bebe5e6742fd1ea537ab58551f6db516d92067ab8d64fe46dd498c051cc2238b75b16eceb28b475c055a1b4e2 WHIRLPOOL dbf49f90c9425e50ed83b3ad4bf45f932fb3d2d460cff283bc9340d1601800c1cb1b0d1a2000b02ce9365a88785236c38937c328b979c230f1854d58977fd680
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/swt/Manifest
new file mode 100644
index 000000000000..392d44bda527
--- /dev/null
+++ b/dev-java/swt/Manifest
@@ -0,0 +1,32 @@
+AUX as-needed-and-flag-fixes-3.6.patch 7755 SHA256 4a33ab3b2f617d137977562b096c64a37600e48ceaee5e1f94f4c912efdcaaa3 SHA512 9c2061b82d0a9a10fc99500ea27192cbf74001ab48254f528f00c15ca28e56de697c3861975691d0f8e4d6079a77236a8389ba07612c98031297e3289f4bf083 WHIRLPOOL 05cc1a58c1647dba3f3b6985ffd503f8b2af74fd6e07d6ee76afcb7d16b8279dcd9a89097c4c70f1f1569065a62ca1255c551b371c74d0f095f60eac98cf8a7c
+AUX as-needed-and-flag-fixes.patch 7229 SHA256 016a810cc9649235fcab73467a056240b712d5557663b7756d4de64c939256ee SHA512 1c4d217965bd8ee9a293095dcf8abca399277a103e523610340a6f3cc25291cc53c2e89b9fed396298e5f9e7b78221df5c4bc881d65713058f029810799f8010 WHIRLPOOL c2abc3a0dfb593f8f3ab2d2f2427cc6c817367ec0c73108dff238e1110bde39c6d98b5e0adeede7d89c9296f227970db17e23893318b60f2becfb352837a69ef
+AUX build.xml 458 SHA256 bbac0fb3bf9454b81e6d27dae4ebb9538cf62f2be17adcf169538749230dc8e7 SHA512 49f3a4cc04d4d9cf0609aa97e01fa409a8f2dbb953ab3a52bc9984799d0bf4092d2a63fe665d8ba6ca0428089984b6ef47bc78900c613373ca1a7b588f6c5525 WHIRLPOOL e70d35ed0834e72c83818e346e4c40af55059de096fb6ef4c4f4927f13886e88925b9caa538306aa1ec9ece966f28782282139a60f2dbefc4aec53a0401db9a9
+AUX swt-3.5-manifest 752 SHA256 8ad9d69aa58e533cc03b9ccf3d8e0356505c357aaeb14968bf146f94d8b79be9 SHA512 7021ce5766ff50b999ad3474de00a2f19490e5eaef1f811b95d3cf01a43467de3e8e4913b668d019d59513ca54a159b50fd0bda427c4efcb3fddc522fa2925a6 WHIRLPOOL 09ba77a4ef824120624b9d6122a9eb6a39004e643b7e95f5a7f0f3e934a985f1cef86c838f5663ae4f3149f1953ceee0231e0d86ae7c3b9ab47a62ddee9a16ec
+AUX swt-3.7-manifest 750 SHA256 4c911bfa6f4def901570ca715da547c1d13766915f3244e5d6282bee8be6564f SHA512 e4f6aa5ce58cdc697c234a2a4be43de0510d3c082a2737627a35df74d378a50edc0f7d3e62221f402eed602fcdc50fa7eff969b12602189fd400e1f1580f0d8f WHIRLPOOL b84f61067d00c864f1029718b560a33fd04d76e6cae8f5aa5e5aa0da31af752494277d759d909dc4a78f5412e963c21c95125ae01ac405fd72c7a8223032f558
+AUX swt-3.7.2-gio_launch-URI-x86.patch 4287 SHA256 6108e54fe7179fbace74f29b11270516befc172ec51197da46f32241085ddd08 SHA512 c82364b7e7bc255ed592a254201346a4159789ddbf486f22c026fdefce3f0d26bc91b42535228050eee4ec9b4e7a840008b60b2c7cb98896d6b8f1d875b5bef7 WHIRLPOOL 97bf19eca86604904408e82708a602af3d653840b7f1cdca8b9959197a3454f93272f80a5c7af7f9caa42e220663741f596c5beb3cb07c363b0f2389214c264e
+AUX swt-3.7.2-gio_launch-URI.patch 4287 SHA256 9d6ab97a06c190d1229168fb85dc10577c19b9d88ce6ae216eb8d1b803ae0752 SHA512 4954c7464bb2ab7b9c23fd771d3dd49dd826d4a919d3ee85914ca8360708f26d396aaaa6564cc826fcff6ea892d916097e118c4ed0a1ed60cb8217e5c3ebf94d WHIRLPOOL 0b9e8fc03d9e7ceb69b5ba8212b943bcf99501f57827aabba53cf3b5f241b0df111bc452f91485924616b4731d8d8dae436b2690ce5d0bbee56b6b8ab8d8ecda
+AUX swt-3.8-as-needed-and-flag-fixes.patch 8852 SHA256 211bc5ba5a4592bf3d0b32966ab4d9b428b7396be36c31ca31f80d807d702547 SHA512 523dfb0c0fa2bb2c8c0647ef214465c7ebbc93a7a179b204efc46065a925170dc2659238bbb0abefc73b145322b9668340d36ff8a95fc5083890223b48d6e644 WHIRLPOOL 493b0559eb7e668b3c0a9852fd5e3b8263752f2af1c50f1522622c646bb89d3c4e286d90c231fa95b648419fa8541cfaac70e0d3b379a2b463242a9df56772d7
+AUX swt-3.8-manifest 750 SHA256 5beeddd8f5e381811e9ac50167dc8c0408773d40591f9ef44294a00595a2dcbb SHA512 ce465f77e2fc3340ccaf3ecce67697666972331f849ef196eeebfed3dd1342691a5641ec20b91bc5b480ea0acc9edf194ec9f4bc597c2778d0bd0382923d1bc5 WHIRLPOOL 17739c43c98179f6115d27eae3a41a0b5f44ef28db10eb560c19e215ee95e68addbc301e857584db39eeb4c8259f59d10b893d346803ae68e805a97db1215b2d
+AUX swt-3.8.2-gthread.patch 1225 SHA256 e7c477aba9475ce582b493b541296f8e4d28a68c8dbef8a6ad1815deb27aba89 SHA512 035ea3dda893481f67ac0447e0c7382a9761eb3ee77b65ca77038bd17117b68a2d93058c8414d9b2656ceeecde3e6ebc06c0f27e044f217fe8f44945104dcbd4 WHIRLPOOL d7e474e2ddc65db5f00ce9846a57a7a5a73760237308cd921ba6c601d6648163e75e74fd397f984dc21de1a95b8848d49ffc840f2996fbcf49a002d25ff21c5f
+AUX swt-3.8.2-libwebkit-compat.patch 1104 SHA256 fc1aef129a9859d487366f333fb2ddb41deb478e738e57c003c13bcb31d8f9a2 SHA512 f063be5652b44b776f774a8e3d7f31be3018858322cbbe8b7c2e47a18bc705c4ff751ed239699c2014a5f51785a723a2d8f4fdc9804f4fe1961c861cecbe4117 WHIRLPOOL b9065c59cf11da3724204655c6288557ff9052cea77b06c40c7c3ced0b6bbc842b29138b5816b6a5e5f4eae1ada6c896c6fb5d983a7c28c14cea2899d9e07fbb
+AUX swt-4.2-as-needed-and-flag-fixes.patch 7840 SHA256 3aed5349c3c0cf1a2e63fdd4b40d053804ecbba7a5b798de73be36f64b42fb65 SHA512 00cc50a0432bb17272a40c3606c9a5729171708af5581c861a5bfae3d1b694289de92164961bfceb841813fb9161befdc2114616556296e81401f133f07c1db1 WHIRLPOOL e9f21b6745422aa1ac74f25530f4ae829165b77c1843319a21aed59e8a7da27fdf803eaaad4acc49e5373ff7f2e7209f35bbe8cdc4ffe0e62ff576f03eb912c2
+AUX swt-4.2-manifest 739 SHA256 3c67656a0798cd6f464ce6db022fab04fa23ff3b07e7079d8c3364d950f8acc4 SHA512 f17bdc21083c70896d82d12d6918bb121db838b895d1db95dbbf9bbc0368b1b26e6b6acf5a90b709ff961f3640911111932391fa45ae898d1de8a387d17594b1 WHIRLPOOL 31f9e54ceb9640c0e3d1ac0c67bd290295a424997d8633be5d172b0467e9aac4b0b94420862864e29531ae3ef67610007729fba1b944bf22551cd8450d4326ff
+DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 SHA256 f2619f6e107eee3c55c6694df4c89e77976d2d5517b6f3c17c358602536abf28 SHA512 2d3d194d2bb4c7f0e6d5bc801d41cb6de970de78c544a7edd2f18c4ed9291f7639dbedab4594c5221e76dd559c884c6fda7f32d11d0465a2d017fe0398a33dae WHIRLPOOL 282057de0d2e23c887db96d20ff8e39a1ea1e87adde415357903323095d4439e966218390932bebd2234dfed2117a0afa93372e9088e695770cb521ff7180501
+DIST swt-3.5.2-gtk-linux-x86.zip 4881316 SHA256 00477e6fc3c913916cd980a1ec29629c5250afc52dc0fcee74b035af0360eef7 SHA512 f53226458e5404cc03475c3bb903de81efa328625b713fe97b3b418a769b0476695e437e0693b5e10fa9a356de90302d6a2d267fe5e13f172803c684db9e9c82 WHIRLPOOL 4ca8f495c6d499ed8f1f6789333a6b357978029a6138a9986b6ef309a3e60303b6399b3c288e3732b13b75eb1db45e3679a559c806113a80572b0a05a226cadd
+DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 SHA256 91f9e2d4f6ca3926252d33895aafe82ba1b72bcdb77ec71dafa20d154f5d5bc7 SHA512 f226d531002dc472852f09ce9814c8dcf7b0c4209353a5639d8b814308807df6477c4a8aa0fd49743578282e6662ca8d5c316371720dca50953ad7ec44b7c6d3 WHIRLPOOL 335ab0845f3c27d3396286f26b45583cf4b71469c3567dd2a978fa3b82af7828d02925529ec686825d283207b3e3858237664f43ab4ecb56835a84ffb066033b
+DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 SHA256 90106c1878470dfb78b665062a6a8f94c19cbb469221a37be4b7b985bed54c5e SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0 WHIRLPOOL 44b3b19b425132a615026209d1b557ab099dec441a8c2fb7aadfd90d19cd56228385e8e4f0ce09d66ebdcb9870cc5a932c1e6c6b4e3c507ca5b687b3ec6e18f4
+DIST swt-3.7.2-gtk-linux-x86.zip 5374609 SHA256 4e31f4cf5c6eac378ecaf5e261e925e82c377902c61cfdefaa38b1c3ea445183 SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426 WHIRLPOOL ff47a49df58f711c9ea9dcbc08ae6e5e78fcf11e9419a97a28a660af10172ba5b8eeff4e181794816c1b6aca9a6b3ea52b4f2cc855c0e399265a761c96b87296
+DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 SHA256 a92498e1fcd001b91a5128a414263908c876c5b74bd10c3276e08a8edd470443 SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 WHIRLPOOL 2698abf1f6f50d6712d37e7b10ee6b0442f1db43b0d78814c3ee04a3922816c9f62247c55610f539c11dfd10c4f4fcf1ab2986eec81d2555144730c95ee381dd
+DIST swt-3.8.2-gtk-linux-ppc64.zip 5933708 SHA256 af96edd43b751de4c9a1e45cc0d5d78d288a641481f8c6a2a75e4daa9c0523ab SHA512 cb9f2c7aed0b18bae6546272076c23c91d9e1a38404f0a70ddc6408047d961befe2839db177066312b82d8365bee6bcffb6e92aaa7a869ad37d9f49ab780e337 WHIRLPOOL 319ace912c06493102feb769944da5af753fab35b3e2ea0350194cec9374a2611850bf2127db397c9cb813457ca851a563d45cc847bd51c9ccf0db2505f48330
+DIST swt-3.8.2-gtk-linux-x86.zip 5558694 SHA256 d1339ae67b12cec7d82518a1e0c2ceba2637d9b5e1e429745b877b08d3450756 SHA512 afe1563e92fe9af0a58e7dbae731976991a6afacf6415ab88ebf557f99a5154169ad7103519524f71142c4160d55a9b0a9f7379b21486430318e4160e6f01c00 WHIRLPOOL d64dd28dc05b97e05a161ac50be414d011c37ea4790613d2ae9bb99cb1b4b69293741a393d5978a7c003cfa3a3c076f671e592d27e6c1fc17e944087a1e38a3f
+DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 SHA256 b4e7aeefbf1b44afe37c7850bbae3683a38b76669c007fe3e328c47aa31fa7ef SHA512 43a27cb6fc891d7da35f5fcfc6ccb689d2b2c58de70b628b1e7cf07131f0641598b627eeedafb6a8dca715a336a7fb4fb6a03bb29fea3e115a4af571b1574cf8 WHIRLPOOL 0b75a0857d9398e87bc502bdfc54beb9f4cc491170880138cfd566f590038aa98827743e013faa031ac3bdb8b3cd4c543979db15201570f8dae63094de7e52ba
+DIST swt-4.2-gtk-linux-ppc64.zip 5935799 SHA256 b853c9601ae0808634722976392319405bee53e6bc30864d0bfbf0507159d1db SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d WHIRLPOOL 8fe20ed46de94bb554205929fd142a2ac21aca543289a48cd6417f60f8a4d2d55062b7ebbda7f6712aabc6c7de8998c75c48eeffe73139c756e44e71c2ef84be
+DIST swt-4.2-gtk-linux-x86.zip 5561088 SHA256 e0e2977837c905b61219eb94544d89757ac3d01a88c3a81abff6d7446d48d9ac SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133 WHIRLPOOL ad4fd1113f6e4b2605433ac7a53aa416c29824164b97b2b3a3ceb61e6bc812108c38841b75c5ec6f9a093ed2b8a7c58bf883d701403e8399a18ccb2a8c214165
+DIST swt-4.2-gtk-linux-x86_64.zip 5867140 SHA256 f549bb8309e1523dd4d3867aaf6f0582cdbe5a504ae8aba52900fe6fdb63f336 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50 WHIRLPOOL 5f60bfe556d6551fdabe4184dfc5a4a9df250b10010d59200902017a9f9cbed379a557e5179232d05a8542d531542c3eb6d0afc57c752717dca7a9d7f4177e62
+EBUILD swt-3.5.2.ebuild 4602 SHA256 dfcf996100b1b779abd1a2dea24c00fb410763e3ce1b8b47317bd99149476412 SHA512 cdff54906b1a7cfb98ca02cde97354cbaee4b34fe76724a9d9ee7720b6565e1dc1ba930ae060eed631f9db5891f20a96da567d1324436c381b3daecc7d80ddce WHIRLPOOL be0237194098225a556bcbb0622033e5b436010901569059b407dbf2fd8ab6dbb0a4c3ad06569ccd4bc27868bf8c6ee3e7d41a01901d5855d3ed5dba830f2d65
+EBUILD swt-3.7.2-r1.ebuild 4764 SHA256 cab399644f38ea83cbffd5b8f4c7e1e3b48c73ae79e3b0afae9e6692d8a331b1 SHA512 2c11e4795f4aecd246e1128c81169fe6b3eb8283632fd4a371b7ee71a716da0469a86c8b5be9bd35ffd87eecfe87acaba95464d0ed31f2c79085a7c5562b2880 WHIRLPOOL c31bd1dbd7c7db16c6a07623d8b904565469a871f4365ce87d6ccb8be14f18c003d5fcb217f92e492054d46c150aa0a0446c8f736be5b956f2897ed9dee90c70
+EBUILD swt-3.8.2-r1.ebuild 4645 SHA256 15be392a771e8476e24228001ebf39c347df3c181908b7706ca507a1f7a4b0ea SHA512 b94a9b93af8431689e30d2e85388692a96e94b6dd624c9f2b5cf273e2edb5d24fc3994c625b098e7b1ce2be56d04a4c413b0cc374706d784daedf8d9ad76f062 WHIRLPOOL e6cd1f71bf47ec3b0325082a4be1b92f5c2b62636d071a8b6a3865f4922836e26af0eaa379264ef473416c0f2621f8d7174b7426f8d2242ff308df7076a5379e
+EBUILD swt-4.2-r2.ebuild 4839 SHA256 e75bf989a04c8eb8ed2ee4baf0b179f03e16a5f13c1e4dfaa449e7294a04cc41 SHA512 0cc9aee2f5182070e882a150dabef7e0119519348d18e786ec259c1c211d9f5a3fce05dce5f8e73e2ddca7d6889514dc28366b18f536e7fdc189bad6c1d7855f WHIRLPOOL 0d413ad28f0c576a915fc9d47b850b3b5807b9f5dcf7c2c9235d2880a89e4d5a0d8b2e0a21162dd489e4f24dfff88bcc82276206592d560fde42fffe063b40c5
+MISC ChangeLog 4918 SHA256 4fc299bc9b69da9518d2c91250667227beccaf8a9a4d8bdce1a7587b057b67c8 SHA512 5bcb7d993980fc7fbeafac06179055f611645dde2fc4d8cbce18647551f2785e3c5dc60e0269b550bb50a9648447a0ddf0e848f917c57139d5f1fec79d7c01e7 WHIRLPOOL fdc38d6fb5aa860cfba642a048f1c3e72ce12033c2c299fb3f3bed05f19cb6487b5f9e26ea48ef308bfed8ffef9b9d09b78239b45bcdeb56665716d18c146888
+MISC ChangeLog-2015 26480 SHA256 98c352fb8b2e245d8a1fbb7a17b54bf6cb3fc3f1172d413bc1c4e5e174f8e43b SHA512 3384443c195961622544ec8dffcd54c102328ec0df3872db2bed60d36f2026d0066e6c3cbbcf76c24a0380b19a0b58999cec96172991929bef873a142a2bb4ec WHIRLPOOL c7a3a96084dbb3913a317b997a7e18918fbede853db080b4ed4d036150c71344dbec3000d9befca2f2a934091aeb66933accb655127204cea5525b774a91e08b
+MISC metadata.xml 656 SHA256 6ce4e1f076c5bae081badb5d39c5b3be7d1f97aa85245b148d7ada92a57edce8 SHA512 1aa0b6b24df23fa95730ab3167ed5ad264305ee0dd73296c3816de3be9fdc965b70d84c930c21ec2baf8b4535a4fcafcd554b242dab2bf6b7fdaf75ecb3c1615 WHIRLPOOL 2ff07c0e2c8386b394d66baf3a6350c1039d2bd0120eb40801e77a89617502040db260fffed477a61e6874083c6ddc15f0855d6e81300dd4c0c88881ca4df68a
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/as-needed-and-flag-fixes.patch b/dev-java/swt/files/as-needed-and-flag-fixes.patch
new file mode 100644
index 000000000000..4cacaf61d671
--- /dev/null
+++ b/dev-java/swt/files/as-needed-and-flag-fixes.patch
@@ -0,0 +1,238 @@
+--- make_linux.mak	2009-05-24 18:38:39.000000000 +0300
++++ make_linux.mak.fixed	2009-05-24 19:38:51.000000000 +0300
+@@ -64,7 +64,7 @@
+ # Uncomment for Native Stats tool
+ #NATIVE_STATS = -DNATIVE_STATS
+ 
+-MOZILLACFLAGS = -O \
++MOZILLACFLAGS = $(CXXFLAGS) \
+ 	-DSWT_VERSION=$(SWT_VERSION) \
+ 	$(NATIVE_STATS) \
+ 	-DMOZILLA_STRICT_API=1 \
+@@ -92,15 +92,14 @@
+ 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 \
+-		-DSWT_VERSION=$(SWT_VERSION) \
++CFLAGS += -DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DLINUX -DGTK \
+ 		-I$(JAVA_HOME)/include \
+ 		-I$(JAVA_HOME)/include/linux \
+ 		-fPIC \
+ 		${SWT_PTR_CFLAGS}
+-LIBS = -shared -fPIC
++LIBS = -shared -fPIC $(LDFLAGS)
+ 
+ ifndef NO_STRIP
+ 	AWT_LIBS := $(AWT_LIBS) -s
+@@ -122,7 +121,7 @@
+ 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
+ 
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+-	$(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
++	$(CC) $(LIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
+ 
+ swt.o: swt.c swt.h
+ 	$(CC) $(CFLAGS) -c swt.c
+@@ -141,7 +140,7 @@
+ make_cairo: $(CAIRO_LIB)
+ 
+ $(CAIRO_LIB): $(CAIRO_OBJECTS)
+-	$(CC) $(LIBS) $(CAIROLIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS)
++	$(CC) $(LIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+ 
+ cairo.o: cairo.c cairo.h swt.h
+ 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+@@ -157,7 +156,7 @@
+ make_cde: $(CDE_LIB)
+ 
+ $(CDE_LIB): $(CDE_OBJECTS)
+-	$(CC) $(LIBS) $(CDE_LIBS) -o $(CDE_LIB) $(CDE_OBJECTS)
++	$(CC) $(LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
+ 
+ #
+ # AWT lib
+@@ -165,7 +164,7 @@
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-	$(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
++	$(CC) $(LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+ 
+ #
+ # Atk lib
+@@ -173,7 +172,7 @@
+ make_atk: $(ATK_LIB)
+ 
+ $(ATK_LIB): $(ATK_OBJECTS)
+-	$(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
++	$(CC) $(LIBS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+ 
+ atk.o: atk.c atk.h
+ 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -190,7 +189,7 @@
+ make_gnome: $(GNOME_LIB)
+ 
+ $(GNOME_LIB): $(GNOME_OBJECTS)
+-	$(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
++	$(CC) $(LIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
+ 
+ gnome.o: gnome.c 
+ 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+@@ -207,7 +206,7 @@
+ make_mozilla:$(MOZILLA_LIB)
+ 
+ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
++	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
+ 
+ xpcom.o: xpcom.cpp
+ 	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
+@@ -227,7 +226,7 @@
+ make_xulrunner:$(XULRUNNER_LIB)
+ 
+ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+ 
+ xpcomxul.o: xpcom.cpp
+ 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+@@ -247,7 +246,7 @@
+ make_xpcominit:$(XPCOMINIT_LIB)
+ 
+ $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+ 
+ xpcominit.o: xpcominit.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+@@ -264,7 +263,7 @@
+ make_glx: $(GLX_LIB)
+ 
+ $(GLX_LIB): $(GLX_OBJECTS)
+-	$(CC) $(LIBS) $(GLXLIBS) -o $(GLX_LIB) $(GLX_OBJECTS)
++	$(CC) $(LIBS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+ 
+ glx.o: glx.c 
+ 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
+--- make_freebsd.mak	2009-05-24 20:09:55.000000000 +0300
++++ make_freebsd.mak.fixed	2009-05-24 20:15:03.000000000 +0300
+@@ -64,7 +64,7 @@
+ # Uncomment for Native Stats tool
+ #NATIVE_STATS = -DNATIVE_STATS
+ 
+-MOZILLACFLAGS = -O \
++MOZILLACFLAGS = $(CXXFLAGS) \
+ 	-DSWT_VERSION=$(SWT_VERSION) \
+ 	$(NATIVE_STATS) \
+ 	-DMOZILLA_STRICT_API=1 \
+@@ -91,15 +91,14 @@
+ 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 \
+-		-DSWT_VERSION=$(SWT_VERSION) \
++CFLAGS += -DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DFREEBSD -DGTK \
+ 		-I$(JAVA_HOME)/include \
+ 		-I$(JAVA_HOME)/include/freebsd \
+ 		-fPIC \
+ 		${SWT_PTR_CFLAGS}
+-LIBS = -shared -fPIC
++LIBS = -shared -fPIC $(LDFLAGS)
+ 
+ ifndef NO_STRIP
+ 	AWT_LIBS := $(AWT_LIBS) -s
+@@ -121,7 +120,7 @@
+ 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
+ 
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+-	$(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
++	$(CC) $(LIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
+ 
+ swt.o: swt.c swt.h
+ 	$(CC) $(CFLAGS) -c swt.c
+@@ -140,7 +139,7 @@
+ make_cairo: $(CAIRO_LIB)
+ 
+ $(CAIRO_LIB): $(CAIRO_OBJECTS)
+-	$(CC) $(LIBS) $(CAIROLIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS)
++	$(CC) $(LIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+ 
+ cairo.o: cairo.c cairo.h swt.h
+ 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+@@ -156,7 +155,7 @@
+ make_cde: $(CDE_LIB)
+ 
+ $(CDE_LIB): $(CDE_OBJECTS)
+-	$(CC) $(LIBS) $(CDE_LIBS) -o $(CDE_LIB) $(CDE_OBJECTS)
++	$(CC) $(LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
+ 
+ #
+ # AWT lib
+@@ -164,7 +163,7 @@
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-	$(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
++	$(CC) $(LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+ 
+ #
+ # Atk lib
+@@ -172,7 +171,7 @@
+ make_atk: $(ATK_LIB)
+ 
+ $(ATK_LIB): $(ATK_OBJECTS)
+-	$(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
++	$(CC) $(LIBS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+ 
+ atk.o: atk.c atk.h
+ 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -189,7 +188,7 @@
+ make_gnome: $(GNOME_LIB)
+ 
+ $(GNOME_LIB): $(GNOME_OBJECTS)
+-	$(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
++	$(CC) $(LIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
+ 
+ gnome.o: gnome.c 
+ 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+@@ -206,7 +205,7 @@
+ make_mozilla:$(MOZILLA_LIB)
+ 
+ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
++	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
+ 
+ xpcom.o: xpcom.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
+@@ -226,7 +225,7 @@
+ make_xulrunner:$(XULRUNNER_LIB)
+ 
+ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+ 
+ xpcomxul.o: xpcom.cpp
+ 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+@@ -252,7 +251,7 @@
+ make_xpcominit:$(XPCOMINIT_LIB)
+ 
+ $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+ 
+ xpcominit.o: xpcominit.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+@@ -269,7 +268,7 @@
+ make_glx: $(GLX_LIB)
+ 
+ $(GLX_LIB): $(GLX_OBJECTS)
+-	$(CC) $(LIBS) $(GLXLIBS) -o $(GLX_LIB) $(GLX_OBJECTS)
++	$(CC) $(LIBS) -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.5-manifest b/dev-java/swt/files/swt-3.5-manifest
new file mode 100644
index 000000000000..70be33fb8ef8
--- /dev/null
+++ b/dev-java/swt/files/swt-3.5-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.5
+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.mozilla; x-internal:=true,
+ org.eclipse.swt.internal.opengl.glx; x-internal:=true
+
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-3.8.2-libwebkit-compat.patch b/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch
new file mode 100644
index 000000000000..ba537f54024e
--- /dev/null
+++ b/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch
@@ -0,0 +1,23 @@
+crash: fatal error in soup_session_feature_detach with WebKitGTK+ >= 1.11.91
+http://git.eclipse.org/c/platform/eclipse.platform.swt.git/commit/?id=b22a7d19afbe2a3811a0f8aa54c1e85d92c62a2c
+https://bugs.eclipse.org/404776
+https://bugs.gentoo.org/500570
+
+--- a/src/org/eclipse/swt/browser/WebKit.java
++++ b/src/org/eclipse/swt/browser/WebKit.java
+@@ -597,9 +597,13 @@ public void create (Composite parent, int style) {
+ 	*/
+ 	long /*int*/ session = WebKitGTK.webkit_get_default_session ();
+ 	long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ());
+-	WebKitGTK.soup_session_feature_detach (originalAuth, session);
++	if (originalAuth != 0) {
++		WebKitGTK.soup_session_feature_detach (originalAuth, session);
++	}
+ 	OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView);
+-	WebKitGTK.soup_session_feature_attach (originalAuth, session);
++	if (originalAuth != 0) {
++		WebKitGTK.soup_session_feature_attach (originalAuth, session);
++	}
+ 
+ 	/*
+ 	* Check for proxy values set as documented java properties and update the
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..3100286ec075
--- /dev/null
+++ b/dev-java/swt/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>
+		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>
+	<use>
+		<flag name="webkit">Embedded browser support via net-libs/webkit-gtk:2, replacing former xulrunner-based browser.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-java/swt/swt-3.5.2.ebuild b/dev-java/swt/swt-3.5.2.ebuild
new file mode 100644
index 000000000000..8f9fb56f021b
--- /dev/null
+++ b/dev-java/swt/swt-3.5.2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+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}-201002111343"
+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-ppc.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+
+SLOT="3.5"
+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"
+
+# Use a blocker to avoid file collisions when upgrading to the slotted version
+# We cannot use slotmove, java packages are expected to be in /usr/share/PN-SLOT
+# so this is the only way to prevent collisions
+# libXtst/xextproto is done like this due to the XTest.h move - bug #292244
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		|| ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 )
+		x11-proto/inputproto
+		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.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 || die "Failed to build AWT support"
+
+	einfo "Building SWT library"
+	${make} make_swt || die "Failed to build SWT support"
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk || die "Failed to build ATK support"
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		${make} make_gnome || die "Failed to build GNOME VFS support"
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo || die "Unable to build CAIRO support"
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx || die "Unable to build OpenGL component"
+	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/"
+
+	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}-3.5-manifest" > "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.7.2-r1.ebuild b/dev-java/swt/swt-3.7.2-r1.ebuild
new file mode 100644
index 000000000000..de15a30fd3e7
--- /dev/null
+++ b/dev-java/swt/swt-3.7.2-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2016 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 webkit"
+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
+		)
+		webkit? ( >=net-libs/webkit-gtk-1.2:2 )
+		x11-libs/libXtst"
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		>=x11-libs/libXtst-1.1.0
+		x11-proto/inputproto
+		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
+
+	if use webkit ; then
+		einfo "Building the WebKitGTK+ component"
+
+		${make} make_webkit
+	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"
+	use webkit || 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-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild
new file mode 100644
index 000000000000..e0d8a03d7f0a
--- /dev/null
+++ b/dev-java/swt/swt-3.8.2-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2017 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 webkit"
+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
+		)
+		webkit? ( >=net-libs/webkit-gtk-1.2:2 )
+		x11-libs/libXtst"
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		>=x11-libs/libXtst-1.1.0
+		x11-proto/inputproto
+		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
+	epatch "${FILESDIR}"/${P}-libwebkit-compat.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
+
+	if use webkit ; then
+		einfo "Building the WebKitGTK+ component"
+
+		${make} make_webkit
+	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"
+	use webkit || 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-r2.ebuild b/dev-java/swt/swt-4.2-r2.ebuild
new file mode 100644
index 000000000000..10d4a3a0aa38
--- /dev/null
+++ b/dev-java/swt/swt-4.2-r2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2016 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 webkit"
+
+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
+	)
+	webkit? ( >=net-libs/webkit-gtk-1.2:2 )"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	app-arch/unzip
+	virtual/pkgconfig
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/libXtst-1.1.0
+	x11-proto/inputproto"
+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
+
+	if use webkit ; then
+		einfo "Building the WebKitGTK+ component"
+
+		${make} make_webkit
+	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"
+	use webkit || 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/Manifest b/dev-java/tablelayout/Manifest
new file mode 100644
index 000000000000..d99b0f10cf99
--- /dev/null
+++ b/dev-java/tablelayout/Manifest
@@ -0,0 +1,5 @@
+DIST tablelayout.jar 112151 SHA256 8ebba0e79da329d88a7c6c33560631143f2a329fdf0554c4e04e3a3049c99390 SHA512 b6e9ef07b50165679df8338123cc636b8165ab989e71afc9d1279e257bb171675aa46cc304e65d7e301c66117149675bd987c07d6cf5b03cd1c7768144e22902 WHIRLPOOL 323b524eff60c9970c91bb8ab6c870d525f92c674841061f269712e31e6cca40f498c43d5f4d202bf54012dcedc9c715ff3e8915d0bbff61ccf335c77c1c6cd5
+EBUILD tablelayout-1.0.ebuild 693 SHA256 886fc933b9c48645eb63d9f3d49bcdee9e93c41aaf88360db0915e77e494c92c SHA512 57ca795fa25e7d05508282e9c24dea8bf5d5deeeef562615e3298eb3c42c7d483436c98f04049ee0757d989983b26037b464618dc35d715fc1b42f7fec58606c WHIRLPOOL 1c9b6e437a1f6f5983364f8291c5372eafcfebbfba6a0538b6e971c04cd61d74480e78c528173908ff8aca1224637aa6d91379a9f2486e1f3bfb3af7d77b4c9a
+MISC ChangeLog 3163 SHA256 77890d72a75431ce841906afde94fd5b8dccb37b95572d7f57afbdfc80354613 SHA512 c496c92a1c72f2cd7f3fee579172a7890b65842d757c8843333200a371b99fa873cab9ad04fbf8713ff83f2a1e1e5e9d9bfdf930b5a8706a4010af6ad76a36d3 WHIRLPOOL df0c7ae0c303b2df8306d33f688630523e0d2818e26d7963557c8bc7c58a8eec58f0e7b963a75acd7ea7f7e59e916071bfae1a4688856bf07f10761e3e4b752d
+MISC ChangeLog-2015 686 SHA256 edc9984b78cc7906453e972477171a623c66f0c5d2e97bc6de13013dfb4e5459 SHA512 53df3d52a9d26a725a10ea486408ab2b27b75c310011988de4b22fe87b40a8ec09e2e03d7b0404d4b045be401381366bba840bd3be0ab7a72dab38293a92927a WHIRLPOOL 80db6485d8845999cee55bf83f01dd02bb29c4755a1753b4ce9e56acddfb8ae434df79739aaffd2729eba23e822e3fea8cbfa4808a4803cfc8d6088861e64923
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/tagsoup/Manifest
new file mode 100644
index 000000000000..53dbde66ee49
--- /dev/null
+++ b/dev-java/tagsoup/Manifest
@@ -0,0 +1,5 @@
+DIST tagsoup-1.2.1-src.zip 222757 SHA256 fe4bb031f2c62461337afe81f8f70df463dc5edb39bd4145c002f6d10a891ece SHA512 3bb1608746270663f6ed45318457e3ee27419929411689d962cffc0ab0c32ec4b858020043be46e929014b696c753a01b49d6eea9a98f18d81fb9205e99ac0a1 WHIRLPOOL 45fd3f63d7582dbc9358874f7f15504fb2e364d7d10fb372b7c2f92791e330f0b2e297795c66b789762ee27c5d125c455dd6a0558be2bd459329fb53eba1bb4c
+EBUILD tagsoup-1.2.1.ebuild 1109 SHA256 c5a5c68c5b3b624dc26468af8cc3ac004a2ec6f62d08be8373c18791c0eb5f09 SHA512 e8d4a3a0c13c3f63280d31fc954f4028e4b77686da2fe9887598c26551918835f007397cc56e6b8c3f6e581cd4bdfed3f758bd3dd59b412403a69037157aecc3 WHIRLPOOL 2fd65646ab36585350e040d90b591ce8440e1981d615f8e34b3a28d98866a6726c5a59ae0133bd128bbfc2441bd4383773e91a74edb27794613a6b0cf6ae723f
+MISC ChangeLog 2565 SHA256 9e68022627c46dafda233b5f8f92128d5a1b0b4905fa49a1392b004d63be24b7 SHA512 087d2b4af179aed13152df920595cc78f064d11520ef6b43d684bdedf9319835126b3ff6f74c56d310febfc884929d052e0dd1656c205f8ec2ff6002653aa682 WHIRLPOOL dbfe19369644945672949ff276d9c51441b81f9de1a76ee2135916fe831f562bbdb3aa7c0ed8223f7680a344bc7e0896fc53284975ef1cd624254a81c14a2797
+MISC ChangeLog-2015 5166 SHA256 78801d9d17507bceec4b45b85b66e8112dd89eac52e72bb4948d4e22fa92e8ca SHA512 293084ab924f81804f2d082b325dbf65c01f36f0a7352672124acbfc09b26c380c35c61805275fd77f393bba043d511895457cd4366e62fe4c944e8c27dd8d19 WHIRLPOOL a798cecc4bfa91fe2b1de464913597eb11d93860e90308524918734b96475c7878f22c0bbd40c5d31c034741b6f824e2e516ee1ff283a14a8a1f47c2002c00ad
+MISC metadata.xml 501 SHA256 a6eab428a18e3b10f7459de137d49448f38b072050495a365df0cb042c376285 SHA512 e8abb4f880b76ee62dd56e0caa65868efa920f080cae9c137a9ff2646e77c2e22e5bb687e584f1b9621bb10140d6725626b01adad7df85f19ce55d80b4706ba1 WHIRLPOOL a154a77cb587adfed98fef4e974b84eb095f9f737b8287a30af45468a5d0f639ce425057620b500aa20ecb8d3406e43137481dcc03b1d31a98e5c1d36ce59d71
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..7bbcd732b623
--- /dev/null
+++ b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
@@ -0,0 +1,42 @@
+# 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="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 ~x86-fbsd ~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/Manifest b/dev-java/tapestry/Manifest
new file mode 100644
index 000000000000..0ca42b5f89cf
--- /dev/null
+++ b/dev-java/tapestry/Manifest
@@ -0,0 +1,8 @@
+AUX Version.properties 162 SHA256 a809980507a831d465f60e23f28cb41f004615e50567cf027fef76f32202b2da SHA512 f2b2c2fab2c670cd21f9b5a1ed0940d5a568230c3a0b13b59bee92310c47755c12f020454e2891c2561c978a2427677b15690ab21159ed6d79676e3e83e4622f WHIRLPOOL 415666ef5e41f293689094da3201fdb1aa19b5a4399e1d5416576daf3ec480cfd2131350066cfe6a42dda47facbd76cbbdfea74e2876150badfaa848cb636107
+AUX build.properties 1141 SHA256 326a3ca39cb42444711c4cf0d9d684f45ef894631f442e3a4681ca728f404a18 SHA512 3cfe36782bed225811884e97a2261719c6d7c82470621e54701114c0e4e18ca0ba673f5f97861840c0e822ede9dd86097d8c77aecf3a392de82cd5573049d0bc WHIRLPOOL 296c7b116efbda607fb1e10df3c46c050e8b2a42ec98f6cb31712850747d2069b878824bab3aaf58610560dce02a83b5dc2cccef4d3bc4c979e2d1fe9eeab192
+AUX common.properties 2850 SHA256 25595d00859b865b8471537b31a91ee22ffeeccf83ffe0a09bbc0dfb31bceced SHA512 a00b28fde7e90100c017238150fd7c830cacc4bc6a24e7a9bd90fbd32bd6bf8a3787a8a178f6ed78033621a47503b1517e9485ffc60d5ffbfe5752254713283b WHIRLPOOL e6da5f62dd84e51bda89ee0addbb05a5a88fb50cdce547de8e8003109b9397a366dcf19bbe9c3d6f0efe18223f205ae88b1ddc61df15b6872234cb6ffe807cdf
+DIST Tapestry-3.0.4-src.zip 1174780 SHA256 ff66bf1d4d45e80520aff4ddb08986c6b5b4059dd9bce8bd40e83a7be5643c6a SHA512 ab94cee9745fceeecbc98a27ace90567b3bc8ab880408da0a32526ba3a68b24f90daeca5d2ea0180b5693ae4fd12f01f0db98e78f176cdc0a0370b5554aa9d10 WHIRLPOOL 158c9cc6b717190d3f3e52da6f7b991a6bb33ce96708b257332ca426ba58b3f3c093949e01f54521ba67801cd533df829014bf471391448ea3b76eb49f376b69
+EBUILD tapestry-3.0.4-r2.ebuild 1659 SHA256 a9af357c6fe3101e8802ed66331adad286508bfa4fc789dc7e459a562acc3eaa SHA512 34c5834afda5d462ed8d39d7f6309fec21e8f6c1038bb633e02832ff9d353f933e829f723732f7536a911ca5134d4684f4ce493e115758b956e50aba1d4d6317 WHIRLPOOL aad9ac2c8f17f086c5e8db9c23c25ba33d0b65f31a1d08d26b7e52380309339a2d5113238c51e0173ebf63463ee9b7537191d46ab33bc12c7818590c03bedf52
+MISC ChangeLog 3582 SHA256 9e329bc44616640458af2986d61672cb2f2a5bece6be6a37bef1ae124759c85f SHA512 d42cb89cc569429705d4c6544223288a2cec99f1535243d650a9974e5285e18956d19f18ae8d555706805d98370503ada3d3c892d823cf8ca59a222a1c9d2c06 WHIRLPOOL 426e3dc4f929e0b8df07f08f18a4158b2632c72bc989b580b04e51162c4ba894666216a2e7eb264128498c9c1615826fcf36e8b9f512ee378341cf6b597b957c
+MISC ChangeLog-2015 1171 SHA256 1a3aebb2490a8e4cf8f9ec31052935ae0c1c9fb29ba1f3ecc2c118e7838d3268 SHA512 abb7a0c3caf34135085f9ae156093cc573129df4830ed4f91db65d78bd2897323c824c1fdbc84d06edc8bf4fe723f327350bf2ee349579addabc6716e6a98377 WHIRLPOOL 9209cea71ee5e3736622859af984122eb1e527cc9e72a2752c3a099d89bf62aa145d6a75ae1c09c84d8597214d593ab1de3d91084986d49d2be54dcbeb2960c5
+MISC metadata.xml 750 SHA256 854a4b6629209ec3a61546402e54b147add5bd3d0f506ca073ac967429cf6544 SHA512 65e251c97e3c5fff6f3bd40910a5ee7b2e5152a86d3638aeb870283f8e415c833da3666647fc25add19e96c0534d5fac39090646cccc9cc10a2b07f5bcc5885f WHIRLPOOL 2b9afb97ec5de2eeb8d9079c97b119d987edf9210b593bb5b66e6b9c997506fe1fc92cf86faf1a633707ab159b77a255421277f9b52c85222404f5934f2a8202
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-r2.ebuild b/dev-java/tapestry/tapestry-3.0.4-r2.ebuild
new file mode 100644
index 000000000000..db9cb0c89264
--- /dev/null
+++ b/dev-java/tapestry/tapestry-3.0.4-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 java-pkg-2 java-ant-2
+
+DESCRIPTION="Dynamic, robust, highly scalable web framework in Java"
+HOMEPAGE="http://tapestry.apache.org/"
+SRC_URI="mirror://apache/${PN}/Tapestry-${PV}-src.zip"
+
+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/servletapi:2.4"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.4"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.4"
+
+IUSE="${JAVA_PKG_IUSE}"
+
+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+=",servletapi-2.4,ognl-3.0,bsf-2.3,jakarta-oro-2.0"
+EANT_GENTOO_CLASSPATH+=",javassist-2"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+java_prepare() {
+	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/Manifest b/dev-java/telnetd/Manifest
new file mode 100644
index 000000000000..7c0ef2e504d5
--- /dev/null
+++ b/dev-java/telnetd/Manifest
@@ -0,0 +1,5 @@
+DIST telnetd-2.0.tar.gz 421949 SHA256 40cbf93b4fedb3cbc182ec8379b0ca59862a74a33400943cddff7874707330c0 SHA512 1d25d624b2f8308bee0b3fa9f2aefb1cbbf5abfa415e857ac1ed5d958c218592dc63b322afe76c50afa4b361f85903c1c469a145503bff2bde51783a45f3664f WHIRLPOOL 40710ad224229de583266e642df03f2afb94bf555c7c0b24621e9c04f22dfb7b9b82cf71c5c992b20983d2aaed12a9272dc84eebe29ddced09302e553aef69ed
+EBUILD telnetd-2.0-r1.ebuild 866 SHA256 a05a391af86c9e81efb530f57c90b4aadce41c257c5c5dccdf3f56676f71593d SHA512 d75da0b8534b33f34db5f877c0f4b2d4d9578c25bfb86a037fe11e12a52ef75f8b8bddf5c4747d60aa69c60520670bafce6da2e6576a20d3c2dc7ba05da1ff7a WHIRLPOOL 4e50f7d7ec3fab7514ca06a66dfb63f1535d5ee5d3daed0d3c846136d112dcbea7afdfe9603c9073bb660521e9a6d6b90c215a49a55e03f1d2c2586b6580469e
+MISC ChangeLog 3001 SHA256 e773a55a96954280d9d520334cc462826b269d0b6aee9df13b88105476b1c909 SHA512 56457c11f3137fafaf105fa99451f8ae4c412f19d586ad0927fc58608e302fac58b6fc5b97f52324c7db93b80e161f9738b67dadfe68e1407ec26cef34b638a5 WHIRLPOOL fa0cadd04ddcb0dcd084f8133d70c9b0224a4575972a27d44f3642ca0a88c57c46ab99809f389f20ed1532d5c83c1689108ad16f8d3a8ae88a8826e7725fefdf
+MISC ChangeLog-2015 2927 SHA256 bf5d67dd0b880ec47f399d20051e123c0580bdff03b73c999ff1a15ff101a29d SHA512 23fc90df2ce5e8f96345de392a0323a7092ef3cc3a5692867fef0db91c7a478c5dd835e59540d87ffa30747b48298fe82a93d06985b75d3450ab5def2240f22e WHIRLPOOL 58419ae550cde14a3a503bac385d2075bef91748b686641b5e7b67f06834ee38322d708139c0418c616bfdca096f35609dca43fbf8805c206af58847b1be8acf
+MISC metadata.xml 313 SHA256 1dc8188d4aaa9285a0d660d2f17d2c41b4d6a539fcbfdf0d97f98775249525f0 SHA512 751dfc198f778e080ff6f011594ddf25a6c4c3f71c03ab9fa8be3fab36937fb1dce81f891ee92e15f7acee5ea6bb53ee0bfaf7695d66dda45762426bae16fd87 WHIRLPOOL 77b28d4d02b30349c8f254306b1890c30c3ffff7d7b455975b62fc273f5e18e5b1c3a7d63f95f289fe6432901613e82ee7357c3e6c18f3544b25290c19f95381
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/Manifest b/dev-java/testng/Manifest
new file mode 100644
index 000000000000..58ecbaa115aa
--- /dev/null
+++ b/dev-java/testng/Manifest
@@ -0,0 +1,5 @@
+DIST testng-6.9.10.tar.gz 6271781 SHA256 2155f0461f6b80433781968b9465627f877ea579086cb4149ca68e5e711d8127 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e WHIRLPOOL 38ae9ac8732ee96f0c0c9f48e5e5ba1cef342ea2f866322d22064b8aca4d405318fcce8e4a1bd7ba6276645429fe3a9ec8be42a8e2065cbb0d99dc6b2a0059d7
+EBUILD testng-6.9.10.ebuild 1752 SHA256 3649fc872b58e1e07002ebf42bc30982b38d3338e4c067f39e61b9a24abdaf25 SHA512 827f51b3f53200be76d64720f02e30746091f50ea684589f1fc1df692e7712a17508fa83f3aeb1270e5063bcdfa18f93c18ea52c5411ee1461a973d73745a118 WHIRLPOOL 8c2d6b210069a39dcc87efebf7dd78c2a8b659a8342c9adca90b6e42841f73027894d9d554730eeb7741c50f2dd214cd256c4887b99c4b6f4676f9b507df6940
+MISC ChangeLog 4110 SHA256 db5a203e8ca5e555a54e02b5f04cbd3d335f8d8a00e15dca788a944606af6194 SHA512 38973691a6d5ec57df832e2ba84aee8b15f539b256a81f609f2f6328bc8fae00967a92a39a23c6f93df90da1437b8cc3d03110f073abf1603d7b6a0683653aa1 WHIRLPOOL bec49025142520dee51605892fea333980c439f7669476b3483b7895d652b067c924b04a446296c69b0f688bfe9c8f37e9b1d3f587c2ac8db32cdb9e35763200
+MISC ChangeLog-2015 1262 SHA256 a2d0b8533acecb538e23f8cb7b78e44d0d11b3c22e6f988fdc11a37357f18495 SHA512 8be9821cdef98778489c613b4964432e1edeaf763a8987c3350cd3c9f194f1983b0183e969465ae192c73a24f712679e00668bcfba90e3e7f83dc1e313629f85 WHIRLPOOL d8c72b99a88f9be7f2de2e02887cba945a1a18596a88cddde911c637cce66c0e9d6bb644df5f1273d95e6a266873c4117c606bea56f4704f50c2c95fa54660fa
+MISC metadata.xml 314 SHA256 b3164e5415960b6a76bf92fda1c1bb4b6113c5050a8c1d3120bd6243097eebf5 SHA512 dc86504b0f3aa0bcd4adf4470e7391a05eb5cead186f79b0fc35ee3dd57ca1c927454e4150463376ca37ba5396e9f75328bdb8969613457a9ddadbd5ab81cf98 WHIRLPOOL caee20cf8d53b569a9afb54b2a3af4da3c0f19e137fcaef7f7d1004a8c12c593af8c9b78f511b65ee4e2bcc7c1b1792ea1addf0fbfbbfdbe5fa235f3205bd182
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/Manifest b/dev-java/texhyphj/Manifest
new file mode 100644
index 000000000000..98c1b945276b
--- /dev/null
+++ b/dev-java/texhyphj/Manifest
@@ -0,0 +1,5 @@
+DIST texhyphj-1.1.tar.gz 118115 SHA256 4ec15d84f66a54f8e0ac6935436581b5a11e3c99d7a2809fc5819a74b50993b3 SHA512 fe410695be95ab6359e396c0694cad35baad6c8dd27ce4947ba22acaa19ed954596d40131fe1131d12ddd0ecf5f45287952221a6b9019cf25594dbb314b15beb WHIRLPOOL 4d8155913f30edcc220e7ef68d03c2f9ea14094650715fae65cfd8becb7b7ecd8e0e88116e3bd5ad6cc25cbac6e223d9c03433e27cb0629da9238e80af7e7db5
+EBUILD texhyphj-1.1.ebuild 597 SHA256 e7a8cabd4f90af2f560b2bcc38ef1cfd876e72de190f2bc48333a452a6cf31a6 SHA512 a99040e218d691cbc8c43d8df40747955e175ed723b20e83b1dc71df1bd0e362be02a0c169f37cf5d95582c1bcad16dde97880b2d785c17515f0fe04d1854ec1 WHIRLPOOL e570c99e59807c9b0784494c75d5bdcacc3b1d69f3768a578ba707aa099a2fe9658cf7f7ed1d5a75f996ad55655395882c29db0a9d1612c6c5a43836db7447b7
+MISC ChangeLog 3083 SHA256 39cd9cb6ead411006ea305187ae77e3d0e1a56ebb08e9703fa8a2551d20c0337 SHA512 1a0c738d06daae93d6800d4601598e2a916df193a45b4d33818064df7f532262227e100fd26b4cb4ce2f6d143cb3e19198f5e42677ecaf5b4ec897ff3b44d181 WHIRLPOOL c678bc076cae97b812d9288963eee367d6171a843be5201d794f6de793ca7693eefd0df358666b2022df4f00f55968ec0746374de5b42fad1826d46998eaea01
+MISC ChangeLog-2015 376 SHA256 70390ed490924c9a55fb4112548c1fd95a561a6e7b167ab8a81aadc0ec8d65f7 SHA512 12d22b900199511a0d5255579bcb1571c6fdb953e9d8d76b70b420cefc544ed3f5d0295c72ecba159085d77b4f7a188e9762038a2b3e0bfa305f14ad5a221aa2 WHIRLPOOL 91c9cba6c237e6081e6f73fdde6a112668c9adf03120fe811eddc7e1e6c436292d03cecc089cf13b3eb8c0df7ea4692a3a8610ffdc3a09ddd5c4a2efd8eba3e1
+MISC metadata.xml 314 SHA256 35fee241e87961ee65780bd0d2da2289a720db5523ef70906fcb4136369c879e SHA512 1ca9e74a5d1f1b077f12a9eb4579f46dcf9a477b959ae27da7a41e1ec20b005e4e6d973584c02b7530f9d066594a1f456a11d48d01bb8c4def9d157f468ef1ff WHIRLPOOL 246bfb5efcb1fa956c0bd3b0a2b1e30e4380746b922c37b25e787867c86454d24b8883b846920f3d5b6f03bfa2b2a38133decac093b9ff3555e878c785391fba
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/Manifest b/dev-java/tijmp/Manifest
new file mode 100644
index 000000000000..cb699a63d9bf
--- /dev/null
+++ b/dev-java/tijmp/Manifest
@@ -0,0 +1,7 @@
+AUX tijmp-0.8-respect-javacflags.patch 433 SHA256 2a76beef36a00989dfcb265e56c4e0bdecfa291b2de4107dbbe97d7cb22fa7f4 SHA512 01de85f6dd0609a85faecf398de83862dc99741d7447127ae8fbd57a16ead7b1493cee0479700e1027c45c4ee5a9561352868c2a45293f29a6e2fe8ee501f972 WHIRLPOOL 0612c0c5bcb21e75b88f7200473da4cdf39278b76c4e0fc92e7e948e16822c9b9fa279cbc5f627f72758e1d11d0b0b0eb4aae38cf1f73a9f0c6201b19ff1ef41
+AUX tijmp-jni.h.patch 1121 SHA256 dbc865934f82f713a621866eb26fa06f7dadba8b15dc3ac17d9aa499965f3f20 SHA512 3733c220c23a5c252ca088f9cc8c37780193bbbc1efe12c0f21ce5c5c9a875a43c3a4947c8bd52cb4c3ede4549ba9fdc4107d1a3207a0563813fc5b351c6e2a3 WHIRLPOOL de1065dd206697e02f5474ee5f11f88b1b809be3a28932eda53527c8afea741f442a8b28b8fb0ef1b07eec07cd539774316612bf6d80c1ce32a0f4dbaf241be1
+DIST tijmp-0.8.tar.gz 347809 SHA256 e6f0bc1e4a0fff6524154d3dac0f27f4f53761977ecc67d9ce20ced8ad6aac64 SHA512 911efd93c1548db45fcf8fd924675329aa82c6853ffe93074768646d08f80f4b076f336dba0da293d1acb084a12eb62c68803fa9408e2b64b2b82ab62db1de25 WHIRLPOOL 8982f4ad381472e7dd3d4012fc5ac4b56bfc4f7e62dd1f8830dbadb1303b2544727dfcd1c9330cde3fb11b05a0a7084e487089d46129b6563eece2b5a8730a85
+EBUILD tijmp-0.8.ebuild 1129 SHA256 80cc321f59fe6966f33affbcfa98bf9f82c1e2ba817f390329b84e4409c2c337 SHA512 ecfc77ee4f96f66b6dd32c7f613646d51e037cfc534d34a9de117a10fad57399d9a352618fcef66033f2e76c1898b6a58e088ef3a96b469786c1c648c2722727 WHIRLPOOL 9303203f1450bc25a70a471cf5ca2be31ceddfd704dd32bb69ca18f0426dd83b3e35953d93f805043c859db2db60787c31c216eea48b6d431d69f576b7690ae1
+MISC ChangeLog 2622 SHA256 c9844cdf6b73ee251a7c13efbff260893b968da774bf58abc1629c5f56969ed3 SHA512 a2fb9cbd661aad3e6c721179bb87740b90bd864a967f0e78da5076842e594709cf3136ff428c19d2dd5e60a0b74c2c34b1fcc1c794332eb257802fdb781516ea WHIRLPOOL f1c8d95dedb2b009c53320a84d8abdaa5b950e7bc49c8c9ed60c15ada8961ad25745dfafa534c3a96801d0ca4b7d470ad7b183f1f238ea529de52898e9b187a9
+MISC ChangeLog-2015 892 SHA256 d148db18176c2820e169cda6b5ad00926ddc2a26ca72956d5b09e22267dc4dc8 SHA512 fd2b516c5f1c614a31990490e32ff8b8d23f3e432659a6f250b118a0982cb82fbdd54ff826d450e82d6bf5158810d4b57267e0c8b05f659a108003f944121b74 WHIRLPOOL 05a40a47e2ea8a96aa95e709b51c0c38e9f5d3952b47d760571c76e223de6ff0d0a18be70a7ef586f8f4ae331763f0e6d060a21a79407613cca787127057dbbf
+MISC metadata.xml 481 SHA256 a8d74461dbb3fb28c1d4c406cbdacb435915d1308098407a93fc70b1f220e9c4 SHA512 52940eb0d565ae1419ea5b10d90997551cf1a9accf3ae2369b37a7afbd7e5cf0a11e0fa0afa84baeeac34d516a734b779a40ffd74f06767549ae0ad82010661e WHIRLPOOL d28bc14a748a2eddfe3daeb397be5beee5a2947936eded7150f885fa30aad8e6c2b412ef15cec7fcb0a0ce3331812c878584aaaf21577afa3f672c50a460c47d
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/Manifest b/dev-java/tomcat-jstl-compat/Manifest
new file mode 100644
index 000000000000..d10ff5dfbaad
--- /dev/null
+++ b/dev-java/tomcat-jstl-compat/Manifest
@@ -0,0 +1,6 @@
+AUX tomcat-jstl-compat-1.2.5-build.xml 8436 SHA256 fbf13a8b8513d88887bd9ce609e154a0ed9cc59de5db38967ffdc4752cd397f4 SHA512 a03eb25054c14fef478c6ed90b0c814c0bb48f39e778f225974a426fa86c39bfc53ded15dbc83ac45bf010f22b47cbf23384f96b1352f920297e680e77ebf6a2 WHIRLPOOL 4f5be3d5381046a8b6e42c06970e68099b9046e019b346f85e771e1819ede891ed8b2abc22d4488f759a25798bdda1d044301a9424bc3a07d0a438c7c0b5c92d
+DIST tomcat-jstl-compat-1.2.5.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
+EBUILD tomcat-jstl-compat-1.2.5-r1.ebuild 1449 SHA256 fd2d1ab51190303de0fd5edb781f6287613a6e19f6b273c839d53a2f93d6b5a9 SHA512 23f5bcd12b0ec8927f681a6842a8c64dfa1123e52ee8d450d89c199c707768688ddc15991dfa85b38534fc7ec90996b9db5dce0e6e2c2310a40e9584a4a8781b WHIRLPOOL 9fe71d41d015cfa62bbd595de8857c65ee0ec8dc4b933c1314ee17da02bf9037d5eead59942f65665b1ce85b5c3c8af38cdd483bc9b08e897c5a509def127443
+MISC ChangeLog 3200 SHA256 6cdf8b5cb2ce6a03f6d62ab96138a319ebc4b7268a94723f48ef91410ea520f4 SHA512 11f9a1169ff8cc836fe5df868047755df3cec7d3a50c1f5c3166d5b7b7db3ab9251b476f0e45b99072dc11453febd0fd22e013f5499714a1fb1f53c55ae5ac13 WHIRLPOOL ac8bec1569464bd349302d1905a72317dbbddb833fc1e24c90c2d855c24a64e22bd3dabaf648f84450f49060d00e241985fe5b3e0c5e2e1ffacb5a72e81d3b37
+MISC ChangeLog-2015 738 SHA256 73ed5da64c25974e27c0a59061b9f54de2c21078620d79f2bd42c75b27d4cabb SHA512 d8c742016b4dda65fff6fabe630c7ac7de5b6130e7efddc1ba9b4f37b91de623fc957cbb3b7a1ea5509c9b0fa8d2561a1f34c761d0583ff593e0019243a0c12a WHIRLPOOL 0b01a16e2f247381d58959e8b5483cd79ba5dcccb94e970f912d93cee166182601d2639c1dd47e5abdd2589be9d83690a3f3e8f5d61bde4e8349ad4fb4b92303
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/tomcat-jstl-el/Manifest
new file mode 100644
index 000000000000..48deb1f110f3
--- /dev/null
+++ b/dev-java/tomcat-jstl-el/Manifest
@@ -0,0 +1,6 @@
+AUX tomcat-jstl-el-1.2.5-build.xml 10138 SHA256 38a046f3dde4332462fe6d337c0eb3b53bd5bc14d195aeccb2bb988cffa0b083 SHA512 381bcecbf2350a0efcc85131983abc7d93c44cc8926455760922e9cf45dc8da24b24746a75355187b00956e6c050ad08d632e93258f6c9c24c8b36dd8df8d7fc WHIRLPOOL 9712d5c6051887053575a1d3d1725912054b5b3182be068e7b8108bca80392021915d1f055097b2d266b03624cc2ceb876a3ec7a8df82ef86bd2d0eb720eea6e
+DIST tomcat-jstl-el-1.2.5.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
+EBUILD tomcat-jstl-el-1.2.5-r1.ebuild 1426 SHA256 3c4d73612c552c8a1164b4f534da13ac4cffef74fa195f52ac1f3bebd2f749be SHA512 6d0d8f3bcdf2a350d974c696db3a8450fd168dfdeabdc7dfbae9e4d4f7e6c205cff800c4b0f1a16d9b6db9ad1d19b38474aa3652d3fbe962cfda9b7dd0542488 WHIRLPOOL 56d7bb98e9b56f186f1735cca62374523b0784a6ceb2de9397393744ea63caf84c0cb182256f7be43a12a3d177c23a8fb0d05165d534ad5ead4ac9683d2b99a1
+MISC ChangeLog 3164 SHA256 893ea0fb18023a36f586832b345cf6ece8f41b44c6b4f186af32387f151b82b0 SHA512 828a386ab2bb968ff58d1ae3a9cf7b0a6646b4366f47b5187c571547cb660190c510076808745be6f236ff7f3a2f73e0662ecbc7f4269796ffdfa92f23c338cc WHIRLPOOL 203101bdf0ca9f9a98e9017bafd71d291e2ff4e6eb6e4e5d4232ec519aedcaaddaa0e1e21989bdc00a703a12e1bee536fa5fac60e8870cee15e324aa408104c1
+MISC ChangeLog-2015 710 SHA256 d5287fe473ec447f0036370365e6611b68382056e28f3a9b178b77635b2c1039 SHA512 f18d9d8dec9bcffc6b947da03519d1c6d7080b47b877781e8f1e90c82193536b509ab0f3d4c48490f38779d9d1a4071e3ba09ab4bc6510c23c075c3b258dad19 WHIRLPOOL 8d8d107d11cab3a260afae799dc1fe516b50dc282ab20b1909144e6fd4cc9a7add4ee9c7d95cb9660ba1902ba685445debfac85555bc96a759632213d938b13a
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/tomcat-jstl-impl/Manifest
new file mode 100644
index 000000000000..98a8d3a522a0
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/Manifest
@@ -0,0 +1,8 @@
+AUX tomcat-jstl-impl-1.2.5-ImportSupport.patch 1141 SHA256 37b59fa8bc6effcd1ffb6dc364b0f0ce5969677e7c7674754053e8a241ef2789 SHA512 0d283548eb5ee98dc92a59084ed162c239c077f8f47e88fa48e10e9304f101085df31dcdbf045acea914e1b555c0cdabbf714741618b63030c121e13f2413382 WHIRLPOOL efe0a940f20333e6527f4d2fc6bc2bc7149c32a05a62799002091f575241f8af7d793e2d623dd10852ce080565b9dc96017445761eb21c1756de1ac6839f1435
+AUX tomcat-jstl-impl-1.2.5-SetSupport.patch 1334 SHA256 7750552bbaad5f2b519f3096906d59c1ef69f756d9cd5324a44b1aa16981d19c SHA512 1a4f969c03312a02485e1eb37b3bcc0ce0153095f163c7c776c3a10e26c7b2c909fff1f3d16c7b2e178eac190f84432f0adeb2c3eda6004d699ad7d3377f3b22 WHIRLPOOL 19c00bd763f13d47d29912d97eef21cfce448233cf74dcdeda3c87d84f6c02b693d1dbad5685eee3f3f2a58a325c849a27ec86cc399e62724ded75336dfc12c9
+AUX tomcat-jstl-impl-1.2.5-build.xml 10337 SHA256 3749d7cc6e9bda48a6f111fbe40ee04302ffd527d874ed06670f0675f4113a25 SHA512 e2ecf367a8d30f64c65bc4cf2b84bd017fe7d2dc32cf6030b25e0b0dd3533609243b71c0f7805196901e702da12feb3c5b60cc4f6859f9aa2419e1732a589e8e WHIRLPOOL 5d274d6dcf18f7710517b9c32842b9045542eea74b1b466b97fa159f8f9a785ded96df8b244d6670f1b310d229e9029be8d7a5901456e9526a1ce9a019a330b3
+DIST tomcat-jstl-impl-1.2.5.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
+EBUILD tomcat-jstl-impl-1.2.5-r1.ebuild 1738 SHA256 2007dce9cafd392edc3daac0fd1fd087054eed799df8e6b03864084f26487f33 SHA512 69944c7638fa6bafc3b1b31a1945eea649ab3b25888fe560762079377b56b7b03c5325f5509766ce21194f15417330d17b7e0eff0ad7d034cfd5b1890209b214 WHIRLPOOL b45caa8b9945c84dc0f498ad6fd9542261cfd2ee643302354fa40d784f4e450776eaccf4f191f2f13d0a861f309d9d02f72ef1eb43c801bd342e76678f0347f7
+MISC ChangeLog 3837 SHA256 a4fdbbb3723c6f87e5a14dae2fc5f604c2731ccb5533c7e25f764981a3e1dc14 SHA512 c4b422579e062e768a534a0058d79f4ebf8cf05766d1da2d165d9c524851f0401f16b57b180b20810589a7604ad8aceaaee42c6e4529fa6072613f959b16c13c WHIRLPOOL b434871757ebb42995ddf0ff7527a6d5b695b96f333e5b501813366fd5f41943c49848ce82866762488d9f8d999a4331f2562cfa464d07d2f73de562267087df
+MISC ChangeLog-2015 662 SHA256 a027d4a4695e414e0926e66cdb2dc1fd273ee068c0d775ad0d8e17d972c64078 SHA512 d59187da3549f9e0ab2009fdc643f177f6fdb6f2d5de8bc47bddbbd3643fbdc75e47829e2a3e94650358b8aca732bb9427db99922dbbaa140e067590083657e8 WHIRLPOOL 94ee5d68a3992883a6378172b79957f1341aa8e9d80c75cdffbd679520d4378f0ef61e978398eadfe70c19574f16009c20eb2cbd26cf0cd312c8ff5731227f49
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/tomcat-jstl-spec/Manifest
new file mode 100644
index 000000000000..1c51c8d0cac3
--- /dev/null
+++ b/dev-java/tomcat-jstl-spec/Manifest
@@ -0,0 +1,6 @@
+AUX tomcat-jstl-spec-1.2.5-build.xml 9490 SHA256 274ee867e9e8e2766ec0f9192260277649b8bcde1c36dc437fdf208252d4858a SHA512 7375c12b07eb3ce07e03826219f1e239a507cea6052605ceac5261ab9cfbb2c28a8d88d95ee8fb90c8172847317adccb4969ac5e8e4caf0c20f39f46ab20542e WHIRLPOOL be9265b8cd2b6fbcb874cfea1ef5154b1b6f9571f612fa2bbe1785d4cc3539a8a355fdba1e6d9f7e05785a86ee3b234b2c1b6775c912fb2b70c5489c1f6a3ad5
+DIST tomcat-jstl-spec-1.2.5.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
+EBUILD tomcat-jstl-spec-1.2.5-r1.ebuild 1337 SHA256 a86c3ad6160bfe90eeb2b9da3560119af337791ad27407c40c0cc644e9b7d595 SHA512 518f5eeb6503a1bb19fcc3959094a28a624fe79e39ee92a20967f3ab88d29872a203ce8a2b29467f0ae238bd1bc9e237b9afa30e3b844fee39618b68d96cbe30 WHIRLPOOL 736e299abefbbf4757c83e5464764188777fbd276c52a3c7a1cc44663dbb3a8f9f7d0f30e25c7688b4cfb4fa31d5a26aebceb7c928d619d87b87da51eb97893c
+MISC ChangeLog 3734 SHA256 b525094e843564590918cf5d5208a4935023b097d9ef870ffe65109cec7b5cc5 SHA512 65759b9a0fbb7e612d7a5fff5d80247b2484d46223519c6f8d7d3b8d0e1dcf6d47a2b615b3131943bba020dc9172d4e043fd21d7b0c6ca0ed6c9338d372b4984 WHIRLPOOL 5c1ee0085fdf9669b1c8ce8d449ae85f602ea9e94077554ae39b1cbd7d5904b4f1afe8e6a823c5b59dd5492c65b2fcd148b1f1ae4ecaf6dac4b23e7d37e4ab4d
+MISC ChangeLog-2015 724 SHA256 724bc5ba8de5c7e788404e15db7705454421520717b9a4697a578256cec6ffdf SHA512 8295d957fc8db6166f62894f1e7d5a274f9295fc70a93b9e2ecdb1e33a269df2f3a9d45c3ac945d4f4cbf1e17d4756ad044d50d4a3f868c3d89ba1bcd7ee174c WHIRLPOOL f71e45f0b15619135d0f2e8afb32c682d7d0af2494015cfd167ad9de4c82dcee68bc184a4bef7025774ad5c3aedc64c6006fcb2f65dca174afa9a0a4ca3852c4
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/tomcat-native/Manifest
new file mode 100644
index 000000000000..3aadbfc619fd
--- /dev/null
+++ b/dev-java/tomcat-native/Manifest
@@ -0,0 +1,15 @@
+DIST tomcat-native-1.2.10-src.tar.gz 391853 SHA256 553a796f1efb9d52a22a24636baca45ae265327f2a2d2f3169436b4012df9c35 SHA512 ab12525e031f4b0221634bde0b3af826c2231a8655032917bd09fe26075cc8b9bce7a7c5de369f525230155d50ec41ff84fb074c45ef9f34319f910e907d66a6 WHIRLPOOL f6786ec3f9d5a8f8c9fb2ec174b7da637016019453575efa2e093b77fe2bfbfae653d9ac0c1199dea6391754a8b64e8601a29ec54818f353b2e3471e9057d0d4
+DIST tomcat-native-1.2.12-src.tar.gz 399836 SHA256 e7add177c98a7f07220c306d65e182c45dbcd7501115e9ed56f1690c5472ded9 SHA512 87543ab353545563001ac339834ec5b230a139bbeb7382c0b5b269d0d00875bfc3f5a3212923ca941e0d31aa0f60c34f34310e89794a99f37aafdaf9ecca7a99 WHIRLPOOL 71c92d599f24008a137124270d0b7af8ab680754520fcc386feac51226feffda2f72f9097129f32e77ed75752ee941440603088e323f682abd86a2ad9cf67fb4
+DIST tomcat-native-1.2.14-src.tar.gz 404159 SHA256 a7f1649f7c384b2d4e6c4c96f20aea980efeba327dba874d4bc7c765b6229f5e SHA512 ddfc44f07dc4200f8ef20b5425355d2737a7510e41660002553c04e7451c48e4f54f4cfb462ed6bea1fad1ea60525a7ce3787af74e6a4b795f9dd1862b75c633 WHIRLPOOL 33b4d60a9895645b049d69c8b70105fd54ec48f1d0b14e96b1ade96973473842f4b447824d3e2b9985ec73235b72c94cf70e7a089620c3ed424cb4dc16a79db7
+DIST tomcat-native-1.2.4-src.tar.gz 387352 SHA256 29d53d4646229a839ccb71b7b3caa25c256aab1965c33cc9d140247213b9b171 SHA512 c080867510fb9006832172ee0b1997cee067c6e0275b3f9bdf94f69c14b9a02317352d9cadd8a41d366fb5f25c42f7f8af419e0b699aaa5eefee20db96559e97 WHIRLPOOL bf0acc6a78a79b51d3802fb1e1bfb0ec3e71993723a1be58c5ac14d6d24bab6e54fc9d505e4d5c0852ce335b6edc47c6b57f99055c875258fa0414a702e06fb2
+DIST tomcat-native-1.2.7-src.tar.gz 390573 SHA256 19e87bc6ea7f763bf9e6515f8c31d8e9bb3e0c1132b36769cdf32c6702723d25 SHA512 3d973d65969e52f0b7a8ea24736926e205b1e95bf80ed4a79bdfeeefb59b7494b3cb1618a0a24afcd026c946f9bf4d3d4b3800eecdf001cc50d814981edc2733 WHIRLPOOL 613cdc15c4ee7305303096fa099f553d065cc898696c09b060bc1d57522ac9c445a34ebe9883e240f9a7ab9ed77b1cb3cd492a723281bcbda2f60e0b399e2a64
+DIST tomcat-native-1.2.8-src.tar.gz 391842 SHA256 408ece0b027c8967b3aa85533c5fca642827e235b1857d28df918a4eab861d30 SHA512 4e9fde4a9fbec73813eb8a42d3ee1728b6ba64f04a007d15f89dfa7e7380af95586f843091d7691e84b84062824b3ce7a0a6c3402dfe31de352d8884652b7b83 WHIRLPOOL 6165552f88b5dab32f0046252989f5ae603b5195744d03b9348cad047af178a20766ccf1062701dafe844b65eaefadac914666e5d30104ef65c6657a3fbdf94c
+EBUILD tomcat-native-1.2.10.ebuild 1172 SHA256 893f3277a32579214c303c4dfafd3379357cf14f57740db81d67e044001cbb69 SHA512 2ea80842649784856f9c004240215595c937fe199988960642196b5e26480e28375dd897d560f4a6e2cdb23fe76ca012fc9b06c0d56030c24bbed7afac22d22a WHIRLPOOL d9f7c95dccb92f37e8874e581836289143da59119b9fc9b2298c6e377fcd700ccc63fa8484a79fd80c7d7160d15726f94a8f981e0046bd435d07233034701355
+EBUILD tomcat-native-1.2.12.ebuild 1172 SHA256 d80cb61dc958ba8104bb0888ce11add2cb99bf1551aef3aa2cd0ee7631c97a38 SHA512 9c0fb8daf47a0a19370c33fb3e11c9033a024e8c3c866151acc6d377c1e6b3d86e68e93518e6dab0e8d94ec81888ffdd3455e6174b8cef6d53b5111aec56e53e WHIRLPOOL a67706dba2d4be2f160d1cd17cf0f6243346301efd66030f3d6e94c53cfeb4afbd19567a739596009f98654f90f02edfe9e4f53721538efb64ef2083b953f7ea
+EBUILD tomcat-native-1.2.14.ebuild 1172 SHA256 d80cb61dc958ba8104bb0888ce11add2cb99bf1551aef3aa2cd0ee7631c97a38 SHA512 9c0fb8daf47a0a19370c33fb3e11c9033a024e8c3c866151acc6d377c1e6b3d86e68e93518e6dab0e8d94ec81888ffdd3455e6174b8cef6d53b5111aec56e53e WHIRLPOOL a67706dba2d4be2f160d1cd17cf0f6243346301efd66030f3d6e94c53cfeb4afbd19567a739596009f98654f90f02edfe9e4f53721538efb64ef2083b953f7ea
+EBUILD tomcat-native-1.2.4.ebuild 1170 SHA256 37bb16030a8ff7812b04b2952cc2aac14a2548dd1e35083a70406d620f053006 SHA512 3ebaca571bf98bceeb294578a0fd8048bf95dfc93838d58d23e2d4148e7b40ff899ac27a5d7284de180937c2dd53c2e30d2591c33572953e542878c72ff46f14 WHIRLPOOL d5ba90d273aa8d8947761cdb9b83181306beb7b416478a1446b0269e70607c7c502c6ec5c88dc99cfeed938c50e49c39dc570f4ab98ff1a5d4360a63ab2d2859
+EBUILD tomcat-native-1.2.7.ebuild 1172 SHA256 893f3277a32579214c303c4dfafd3379357cf14f57740db81d67e044001cbb69 SHA512 2ea80842649784856f9c004240215595c937fe199988960642196b5e26480e28375dd897d560f4a6e2cdb23fe76ca012fc9b06c0d56030c24bbed7afac22d22a WHIRLPOOL d9f7c95dccb92f37e8874e581836289143da59119b9fc9b2298c6e377fcd700ccc63fa8484a79fd80c7d7160d15726f94a8f981e0046bd435d07233034701355
+EBUILD tomcat-native-1.2.8.ebuild 1170 SHA256 dcaf32b8bc18739a2aada1b3ff1e054de9198a98b6b715789e20eff66b752acb SHA512 b31953274b0282804d1f69a10224b64a7408d358d021916ec94c9acc60afb8dec796e3d32d09191a276a852960017537171b632f8f045b3fde4a9bd0fa0812a4 WHIRLPOOL b804ee3ec3381b5735644716499bc335f5b0f0e15459d10624762af146b3a3aae58167616bdf6ce802dee4c13e79293935b158e515bd308a85902aff7f3da30f
+MISC ChangeLog 6929 SHA256 95d86d981106c6606ecabd70f5f082306de41978263349f2a0e2b700af26cdf4 SHA512 99a2581d6eabaf7b5996770063302b440f83fb4590c824a9575e62687ca6a4a0ad14423674454be707148b0b369e709a390ef6371ebd0aacb591ab4199163e71 WHIRLPOOL 5b053e0d807720f120647fa0ffa7c430ec7dde1ff8d93bafdd6b22fe2f503885d8a385da66a1650ac7f4ff7ffb49e2ccf52df0e33a0b7691676e7f0eb409ddf6
+MISC ChangeLog-2015 7720 SHA256 cf13dc8c45663bcc5a1946327d80c199e37b986ac9443f176ebd11efe02e75ae SHA512 3803e85c890bf9ad5b33b4fa4e5bfae54a215d685731ab76cddcf29802b44f830b37841f5289d3102cb9dfdc75335b2eea0c8ec64e955b9aff16706e8ced4d14 WHIRLPOOL 3511836113cb4912defd1ff0df1ffe1452596973732a2269b1ff920fdc82f08055bef0d65c1432a657dc653c494a0158bcb6fa42f2712663a15d62da6a84f26a
+MISC metadata.xml 798 SHA256 c361944adf7216c36e444513a1c164d891a7617817deea94b578a672f5903259 SHA512 4074e9797b397fe24ee0ad0c56e7ba3504212a008a2d595a96cf4495dbaec38ebbb9ac4d48a55bbcf7b28d97951dde2a2ee2eeb135419114096aa4892ccb2269 WHIRLPOOL 449b363947655c6dba2b09bd189df9df87d7c70ada5d304a84c29815740d5328e83b01b15508bec78715347a0ce8c8f7002ca5f2e907bb10102232cb8a82a2b1
diff --git a/dev-java/tomcat-native/metadata.xml b/dev-java/tomcat-native/metadata.xml
new file mode 100644
index 000000000000..ac45019bb279
--- /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.10.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.10.ebuild
new file mode 100644
index 000000000000..511f3db5d560
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.10.ebuild
@@ -0,0 +1,57 @@
+# 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="Native APR library for Tomcat"
+
+SLOT="0"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+IUSE="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"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog
+	elog " APR should be available with Tomcat, for more information"
+	elog " please see http://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.12.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.12.ebuild
new file mode 100644
index 000000000000..f361a5a91e31
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 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="http://tomcat.apache.org/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+IUSE="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"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog
+	elog " APR should be available with Tomcat, for more information"
+	elog " please see http://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.14.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.14.ebuild
new file mode 100644
index 000000000000..f361a5a91e31
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.14.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 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="http://tomcat.apache.org/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+IUSE="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"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog
+	elog " APR should be available with Tomcat, for more information"
+	elog " please see http://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.4.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild
new file mode 100644
index 000000000000..a102a0a83832
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild
@@ -0,0 +1,57 @@
+# 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="Native APR library for Tomcat"
+
+SLOT="0"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="amd64 x86"
+LICENSE="Apache-2.0"
+IUSE="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"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog
+	elog " APR should be available with Tomcat, for more information"
+	elog " please see http://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.7.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.7.ebuild
new file mode 100644
index 000000000000..511f3db5d560
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.7.ebuild
@@ -0,0 +1,57 @@
+# 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="Native APR library for Tomcat"
+
+SLOT="0"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+IUSE="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"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog
+	elog " APR should be available with Tomcat, for more information"
+	elog " please see http://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.8.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.8.ebuild
new file mode 100644
index 000000000000..484cf6a65d9e
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 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="http://tomcat.apache.org/"
+KEYWORDS="amd64 x86"
+LICENSE="Apache-2.0"
+IUSE="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"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog
+	elog " APR should be available with Tomcat, for more information"
+	elog " please see http://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-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
new file mode 100644
index 000000000000..2cb840f3f043
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -0,0 +1,37 @@
+AUX 2.5-build-r1.xml 3084 SHA256 5bc0d8b57a3b6042cb0bd6af04719d949221bb1a5f0be97c58333c1b52bb35a7 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb WHIRLPOOL 25874fed48446b0ec0d7a2ce600b0d32ae4cfd85e13fa36cad5343e660e3548f5e9a08cd32108867bceef3fb20f7c29ce3f7a2fd51e9266d3cfa5f2748107e33
+AUX 3.0-build.xml 3192 SHA256 94539ae9bb8360efcdcb3c9529a21cad7f3a744ef6491f54c8baea2a656a4a9a SHA512 fff70f29b7b8025ce10261c9afc140b0765aee35821fbbdc161872ecec4819832ed12a71bb54e9eea96ecf8418f51a11a8716b07bfdfb957dde6bc1abe8ee7e8 WHIRLPOOL b4ed25230c69d896003e53e66f17512b9c2a67ed8360207aa8ac5e3c20daa28885ddd8410b85e18b8a4fcf6ff3bf0a91eaf145500d1687db808c7f4ecc194800
+AUX 3.1-build.xml 3193 SHA256 4021d32b23fea3b34f37a2552c3021f9945d1d0f1b472319800d4e8323b15b21 SHA512 efa6753a44e7f18c04bff98b68262112ee192857a8b15899e6927de1754c25788fb551251207433f0a7cf69703e310e6f577853d6eb6f6f6e48f2a57ca4921c8 WHIRLPOOL 48424ae2709c6d9b5ea4caab2b1fd4f1d1914b7c6925b3f8aa7a2012d55f6ad1a32af7170d3bb97e9f779c8ecc6bc6e645bee26b0dba8182f9a1a057b062a603
+AUX 4.0-build.xml 3193 SHA256 4021d32b23fea3b34f37a2552c3021f9945d1d0f1b472319800d4e8323b15b21 SHA512 efa6753a44e7f18c04bff98b68262112ee192857a8b15899e6927de1754c25788fb551251207433f0a7cf69703e310e6f577853d6eb6f6f6e48f2a57ca4921c8 WHIRLPOOL 48424ae2709c6d9b5ea4caab2b1fd4f1d1914b7c6925b3f8aa7a2012d55f6ad1a32af7170d3bb97e9f779c8ecc6bc6e645bee26b0dba8182f9a1a057b062a603
+AUX jsp-api-2.0-manifest 474 SHA256 62c4ac2cef5685a2a631270034a945b1eaf774e89362486e27fd357dd928cfd0 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41 WHIRLPOOL 72e236694417c2b34d38ad3cc3fd64ffd66dffce57f7eb69de58dcf87dcde5e29c8e67ef18043e25c29ec910cf3b99b1d74daaec2147052718b752fabc07267d
+AUX servlet-api-2.4-manifest 310 SHA256 134371e8d3d0b137096e268df05751c4bcb29911d62746c70510253d6b334fd5 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca WHIRLPOOL 3ac699acb5527d6682c7960f650871b1ce370848e6a24b8c77105a47ed3afadffa4302a04cc4298e20369c8d7447c598c06d5304d121d9da2cd19caba9445d9d
+DIST apache-tomcat-4.1.36-src.tar.gz 3715200 SHA256 51f9139f10cd865fc331cf5def49faa718ab4a510790af3582b4189a48a5b951 SHA512 f2f36fbad5114c8a74154602249280226b839cbb75b2a584d6a6efbc11dcd2a5e27a67ee9b7ca2f12689cabfe1110035f95b27690ce6c304bbbb6389dfa97cd2 WHIRLPOOL 8188e2ed1aba7337b00e971e347594d897e01f6ea25d9e86e641cea4a1f2c68e4b9e594dd57f773447e81066bcb3377130c05ae7608fe9d9dc36a28bd89d515f
+DIST apache-tomcat-5.5.27-src.tar.gz 7382057 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334 SHA512 32c605aad92b7d554b9e0f28a4d3e707b3cbfc0661a969eb2479512517f8e9e8848b820132d711c41f5c0fa863028b38e1fa903e7c0205599e9e58a86ab4733a WHIRLPOOL d3bca642fd8d5ad73dadf8864ebd0a75146adc805c298d0fd5ad26ab2d4d93293a9ea83d4190e64accd3a7cd38bebc1580dcc266f9a81c4472bacb37598acef7
+DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b39f99b80683b0ee43c72751390e88dcd6114d SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519 WHIRLPOOL 25e987b58af5535914b666a5bb8691146d68b2287796ba25b8a5f792df08f55901a7ea3f419602207f7a8168302b080592bde5f4aeb67b58f40e5da00b8049ad
+DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
+DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab WHIRLPOOL 144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da
+DIST apache-tomcat-6.0.53-src.tar.gz 3522914 SHA256 0392a1d04554c91b8efc3c62becbda634de2031f0366925378047062a2098d30 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c WHIRLPOOL 1892d71346e9261afabe5a42ee961c9b61379ac17a91d98da5dda8136aedb406c57cb42ba2fa1b7e35d1cf142d7132456a065fbdf34a35452462bb7140fce675
+DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2 WHIRLPOOL 5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2
+DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b WHIRLPOOL 1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
+DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
+DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82ac9999de847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5 WHIRLPOOL eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9
+DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
+DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807 WHIRLPOOL 1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895
+DIST apache-tomcat-9.0.0.M26-src.tar.gz 5011957 SHA256 02ba2c9a3a2d78994fc14f2b304c3b3f46615538a48a9193e475b08565cb9b7e SHA512 8c25932aa244edb46eee26aa837636e78c8104ca6617cb5ba924e0e45c2f9dbcd7d196ddf69ee2f1c1b6053dda818a3b92f8f46c156f3048c46cee919fc22c13 WHIRLPOOL 11e00a6e6a5822bd4e357e375b026dd732bf33319e30dde25f11bc1b99994617be3ce6d4976870f725e56646e5ffee92acb6fc23f46b53a46ebbf6c53707ea07
+DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
+EBUILD tomcat-servlet-api-3.ebuild 851 SHA256 e4073dfbab92d608c8621117fa90ff8ce74b3c6a1529c12d95232f30d532b3e9 SHA512 bfd11aea2c322478caf3b70ea098c9f3fe060e094fd52a81e0bf89e47db33374ae6a13205c065da5e21571269ab678f65f1f0eb0385704a54a955a38f243cef0 WHIRLPOOL 830ae5df52116458235a6b7e0cbac3a632dd17fb8a43ad99b24b3d10cf6d63f59fcc48176babf1ba842c5b86af7e2586ba700d930ed7991922b724a29984962f
+EBUILD tomcat-servlet-api-4.1.36.ebuild 984 SHA256 739cb31d4539f3d96ada8f904caa6de8c0086c7e047d7213009fae00573515de SHA512 7c0ea4dac09a7d916213bc78c5b3824f0b34703810d8d6ab27fe43b2310b352dcd74a1178e607d1ef3f24af424354b6d1955013b67bd6419de4d0501e1825e63 WHIRLPOOL 7066628b3cb3240ae9fe7f423d2bca5acea810b6875cd32a38db437e36a936bcec2c6ae9f8af34ef7aa9162d77ef1d4299caff22696f0a978ff581ba98593e35
+EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1408 SHA256 db2c2302283d31e9e202b6867f5b7bf24bd09f391430a82fb624502918a7f692 SHA512 c40b0a1b9986b2a83ababe7cfee1b86da05ffbb00fc101771bdb8a90253fd57d7f80229fe833b3b259ad0388ec7bb06d393c9e1733f9113d9b3dd42a3bc70ae8 WHIRLPOOL fb1194ab981f57272404e31f2d902f569f20edaddb791a849f99067a0844e1f38e87b8f65956193cbd64d68fe9f324cc7d8c9313e0c577cb7320411af5b76e68
+EBUILD tomcat-servlet-api-5.5.34.ebuild 1422 SHA256 579f5136bdff0d94e2d26d4e806fbe328ab64d625802e0ba19bf3fad6f865f08 SHA512 1fb8fb2127817da2a6b7a3f324d57098f27dfd902538b66d7509f7bbb11c043e8e8ec3d528822e21e0780053a8276f6b0bf1d2e329f86752c923845a914b5a27 WHIRLPOOL 1585b007f35e36911ea3cf9076bce682553aa8faf8c87c19a571fa26e17476170f709e0652de0929ef29c163b95166196b8b4c414767221aec6cfd545554b996
+EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 963 SHA256 28e97c0d84f476846abfa4e91ab0113e9dc7cb851a37bd4766aeb9187e972e0e SHA512 13d4039bdaacdc91a678d67592ff6bbb407fe56955122bb8a7a5ad9368e1b848dedc14b57e0b5f9b7d583b64e553ea862d2e87e53cfbe5fe01edb394f4707dc9 WHIRLPOOL 8705bdeb09b243d0a76496c5bfd5d5efe243f99851486382d8fffb88c05a5acfd2fa51f26223df81f1fb8e8795a7864283567f4f759e576c348257ad78aa5b42
+EBUILD tomcat-servlet-api-6.0.45.ebuild 966 SHA256 dba97329db1d2296bb9981ecf4e1ac06f7ea62599fdf57025e2a048e6eba043a SHA512 c934e4d59c753eaa7dfbc6edd02344fef9d682076de0bbe8e1ff7c277ec6155f025b4362160100bbe54a38505780496e4b15a93b409c4208c6a9a60d07f8cbc2 WHIRLPOOL 9f0a84507230ca631fa5f9dc288f7835ebcc71d14e96354261d8d5bc1d45045d62d2f77685bd783af9cf07cd4ecd178219a7b1f7fea92aac025ad2257b3429a1
+EBUILD tomcat-servlet-api-6.0.53.ebuild 966 SHA256 dba97329db1d2296bb9981ecf4e1ac06f7ea62599fdf57025e2a048e6eba043a SHA512 c934e4d59c753eaa7dfbc6edd02344fef9d682076de0bbe8e1ff7c277ec6155f025b4362160100bbe54a38505780496e4b15a93b409c4208c6a9a60d07f8cbc2 WHIRLPOOL 9f0a84507230ca631fa5f9dc288f7835ebcc71d14e96354261d8d5bc1d45045d62d2f77685bd783af9cf07cd4ecd178219a7b1f7fea92aac025ad2257b3429a1
+EBUILD tomcat-servlet-api-7.0.79.ebuild 927 SHA256 5edfb1a431cb6185ba619738d19cd1290e599a69a16015eaf1ec124620079f93 SHA512 96113b7743840fed2384b5e66e5e827d8d1c964270013109477d0da876aabe77bbd8d1951402f05a3aeeb394ef32103a093f5176129fab0d5ab348cf39bc584f WHIRLPOOL 73743a06471fa91c719dcde9330cfc5549701b54d591f0f8a1393aa21259d526ee0d115efaeca503f36aa1b201991fe6f627b3ce0fd7eaa31f504805529c6c3b
+EBUILD tomcat-servlet-api-7.0.81.ebuild 928 SHA256 9b7d9abc5e90e0b87055bb87791b9d4905b90ccf5923093bde16ded77899a7ff SHA512 5212f6321c60b15ed8582ed55acf7ff4b8bd691d1dcbff847059afa20db7cd26894a3b0d0eeafa6cda6b4ccda9297900330e4182b38ff1f5a2236176b1b72b90 WHIRLPOOL 8efc93913bf6d8349d446f27dfd6c756d7d46ef507c7fef603c5c80948e13baada545bc4768242cde8885938b4ee723c2a3fedaab9078af46008208f97583572
+EBUILD tomcat-servlet-api-8.0.45.ebuild 984 SHA256 2229d012d8c674186822e3c000fbccb613dd384bba0cc21b352f3bc13b4ed125 SHA512 b637bca8b28b3f540ee616da3f514d4b391cd0845b7875d3c0ab4d737e398cc8fc6c96f94bacc505af2eb9a5ab26a20da1e4b19b9a63be51d2f2dd6aa6392736 WHIRLPOOL d578941e6f15a4c09b42f8a198ca1dce941ca3e64714e62b0e3e7fcb15ac1a2db39c2ed9fad7d534293486e7c82171fddac52d1d0dcee187f942c715315d0e94
+EBUILD tomcat-servlet-api-8.0.46.ebuild 987 SHA256 42d99f04dc3abd88003d9bb9b98009ed99d0c43c3ea0ded318e7983d611eaf33 SHA512 099a8a34aa8b90ddc7e005b3d5c65658ec3f112f68144d1ed9dd8085de62ac77472f238edfc7588a43a4f9cd598ff5c491f27cbb54192b3ad5322d6679adb945 WHIRLPOOL 0d635f1f9e3e391af6206f67ca69a6bf69b0fc6e2c126f056f6b862eaa964aba9cf9e63b33b08123a45d8bff4c067396f79a88fda542799b1b20c1828dd55e67
+EBUILD tomcat-servlet-api-8.5.11.ebuild 1026 SHA256 82596ca542bcb30282b47144458afbcd4027da26161b6182ff0bae3715e14542 SHA512 2832c7f1e4e310ba6e220f7f69529d257e77b655a82dc1cf44e1580032773d31edffdef902c99b139bd8b52b913d7aa1578af2860d5d1967332a5f6a86dff48b WHIRLPOOL 8578559ce5171e0e9b5181fab5f96f643c19ca444ac3ab1765cb0127d9ea9503668ff2d1ab606bc5095ac172b47be7ad9322a16215109bdeccf13cf81de92e0c
+EBUILD tomcat-servlet-api-8.5.20.ebuild 1033 SHA256 02888bd97fa3c2cedee2f77bbe2e63ab5bc8d426192b0b1c8ce0594a064128ae SHA512 ed93f5f5d38e9b94ad4cb2458208d73d643c768926ac346c9cb80308c3f78b7566aa0db1b039aefb17fdbb122f15b677dd5e926c63d57acd2ad4ee7f2e86c3b0 WHIRLPOOL 40e40ea0be0cc8b281efaab7a351fb04e80f9785eabbd223e567f8aa8b47c189add1891dba7c39ae22274e9df3d75596816f8bb1edb7a4e3c31e324705ba87e3
+EBUILD tomcat-servlet-api-9.0.0_alpha26.ebuild 1059 SHA256 bea2dd3172f0cdceed928f18751272b92f9883a978406587e934236e82ee8176 SHA512 e878ae24ff99c94f1f160a61b849b0ff91558810207579323ba5aa645459177c359820d7db6f3af14255f4d7d025b131d120f4e396547a73cd5510c43473303a WHIRLPOOL c38b5ce0b70c681cf1ec936684f6c226d004cdf76110bd100918cefa0b4eed793d1f66311b4de44bccc4438ac575cf59d152ed6addbad432b1a3fef8915e58b5
+MISC ChangeLog 17432 SHA256 8b6288a8095ed64e177d6cb9f5373e9a3e65a54e1e25cde51d2bd3b6e8b3b17e SHA512 140569db363b9b6310904a01902a7ae4c27fbb95c8dfda7d0afea9d9e87734c1bd05498936d01966e320608baef77f3c08efbbd3fdf262135b67543c4d2b808c WHIRLPOOL bd28e9fbe25c5f1e85503be1446349b2429cc44cd7a31a6fb3055ffea894a124f56d01258f73b2a120e9675c530c85da0ddce5e14fbb3a94c54e87f3101d6a35
+MISC ChangeLog-2015 30850 SHA256 18cfe0d4d26a564a69b143cfaf08d42730974d66f957b9567449450c41e0a548 SHA512 e434b831101df030125fdaf248eed561c6fde8f99b39cf3ceef4e792c6f63686f6e4b525175f6cc489a2539fac287e87efccb62511afc722eafa341d4de9b764 WHIRLPOOL 33db2f588bf6e4266be779c3d8f63ddb351fada11efcbc7d19197c3491ba8bec65dd75034f95b19519fe2c2c1c6e0dfcedde7a148fc53a7920b953d08a18c972
+MISC metadata.xml 343 SHA256 62c7a4ea1333a9631a516e6cd02f524ede7f3d7ad467feeca0777ed556d8a298 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3 WHIRLPOOL b923a685ccba79b4ef25d2e64341112df472bbc31c281179947929d3075f652d3490f0a2fdf3963e2ad83b73b19d808574e9e7b7816b0a3e8b7694534dfe66a1
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..e598b2041c7f
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd ~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..0e5528db2026
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd ~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..959d50adb8db
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd ~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..c4969b6bf64e
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd ~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..4aba63da9699
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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..26121ea67adf
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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..26121ea67adf
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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.79.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.79.ebuild
new file mode 100644
index 000000000000..44456ff69fe6
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.79.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 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="http://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-fbsd ~x86-fbsd ~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.81.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.81.ebuild
new file mode 100644
index 000000000000..0c0a12bf859f
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.81.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 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="http://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-fbsd ~x86-fbsd ~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.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.45.ebuild
new file mode 100644
index 000000000000..5fdc913baf1d
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.45.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="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="http://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-fbsd ~x86-fbsd ~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.46.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.46.ebuild
new file mode 100644
index 000000000000..4dfe83e0e403
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.46.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="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-fbsd ~x86-fbsd ~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.11.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild
new file mode 100644
index 000000000000..f8477cac7dfe
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.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="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="http://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 ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~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.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.20.ebuild
new file mode 100644
index 000000000000..932cd232285d
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.20.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="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="http://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-fbsd ~x86-fbsd ~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.0_alpha26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha26.ebuild
new file mode 100644
index 000000000000..4eebcff57a14
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha26.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 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_PV="${PV/_alpha/.M}"
+MY_A="apache-${PN}-${MY_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="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~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/Manifest b/dev-java/toolbar/Manifest
new file mode 100644
index 000000000000..41891369a6b0
--- /dev/null
+++ b/dev-java/toolbar/Manifest
@@ -0,0 +1,5 @@
+DIST toolbar-1.1.0.zip 72829 SHA256 4a873f7f8202e000b050d2777b78ea51410b3d5d7bc8456c111292b81d53c28e SHA512 57f4b7970beb78f979bd3970dfc528e0a26e38828dcb8a2cc81c8f886e900f81fe53ca6cae7b5cfa3ce93cc273fa2f440cb0bd720ba6052e84e9f2df1e77099e WHIRLPOOL 0d16d46392404254726070ad6fc392204f3262adeb6a4f2da0abff1e20317b476afea4ece91c5e527ffca8096bdcbbd4049ab46f6f39129f0cfa5c7ff74852b2
+EBUILD toolbar-1.1.0-r2.ebuild 566 SHA256 4955bdd3912885b95267f375f3a664e5bdb852ac07657630770edc0f704a587f SHA512 b01ebbea7010bacb83a7a3aedf86554b23849816e8ac5cdd2f3dd2e8edd5d52fcd54a373012decdf04fddc3b13793ced41d8f75a1945d7f63790adae0aa47a78 WHIRLPOOL 5b0ec699abf5141a622b936afd5b781c41765efbd1a60ffe4b564aafe6e33ceb91e4c0b1fc5c54380d1512f329cdfbf768f39a19b5c8a958fc1476050344c50c
+MISC ChangeLog 3378 SHA256 6c1efc68ca50ccd2ad0e1ae57f4827425ce9e337fd33bd512769b28c0305bf55 SHA512 39f4477ddd65466f05e57c3ecbc91f11ebe91b0be2816c854d0e3de29b6f92df75a2d2c874b0a82e817e7207d599f4762d04dade3468fa68360b6c79eaf21085 WHIRLPOOL 2feb9e100225880be2442b8cb3447154727b872d55a06619687f8f633da8ec4662c184a2335d1b9c8a34cdf3c6625df4c2cbb6eb6fff47704e80cbb688ae6e0e
+MISC ChangeLog-2015 2246 SHA256 184052051ceebbaa1da55309a94bf4a309764cf58c614809f084570a653a53f4 SHA512 992988a9f1595ac66bb294f981de7dfb551774e41723ce47c4800297deb4d6812e51f510840997d0fe5f47bc226dd4722f641bc750e43def4cdffdf20431683c WHIRLPOOL f15755501887f697a3ca56c218418f42a158391f2e5c0adbdf3832bc5e64dbfa8941198679dabbde452fb96119941320b2c2125ccadb13c4af2b33d2ce0a8056
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/touchgraph-graphlayout/Manifest
new file mode 100644
index 000000000000..ebf614c7a43c
--- /dev/null
+++ b/dev-java/touchgraph-graphlayout/Manifest
@@ -0,0 +1,5 @@
+DIST TGGL_122_jre11.zip 202777 SHA256 52651209d131f6c012a4a5735271a8f9e572d8fbbece44b643680d725da9c853 SHA512 5c638972264ada2cb91ea1667c0b770629120a01496f7834ef3e4999ad5867ff911e772ea1361e33c168d8681c6f19f46ada33ea637daf4474f66a5cc97610a5 WHIRLPOOL 89180950669d0840af937e983b56a06e58eae6105e70cfb58ae9f11e18efa18981d1e40226536612b25031dfa2c44f65b30dfee8f30083bb2226b59aed4f3957
+EBUILD touchgraph-graphlayout-1.22-r1.ebuild 639 SHA256 fc02db9aba322fa11514dc8b27a0cf9e9ac5fa0ac4069734c2ee00d2656a245c SHA512 543beb1f93c8a8c194bc900bf89a6d2d0569e200cdb9bb82a49035a5803ec6f9d38cede2aa95912a7feb6c206447f5132029dba47a642c6cd83800a7d547dcd5 WHIRLPOOL fc55ed11aceec67a5bc9ffe79fc524f236ffb19d1f124ca42995dcde8e511b7c0398c53364b39abd0eed7395ced5d47eb2eda2c2c88289a1a7d52ebbf62a2f0a
+MISC ChangeLog 3310 SHA256 17c8e840abbbe0a73e2f58172381b6f72ca91897002c767af8fbffc0e3c00fc2 SHA512 94d28bb918f829451462385b9be07575988f31956ba4c95de534c0826100982f439ba85c674af73e5fa16e9c020e756dbc4842f31c966a978d9e56e5d76695a5 WHIRLPOOL 7c27414465a47f25b3866d81746852f2aa2041724215b791e684e547b238f61507c35ad6dd3c6eb053b39c72af96be28124a56f4312c880673bb27d7600eda48
+MISC ChangeLog-2015 1110 SHA256 6de51164dcdf9b55fb54a0e90f5ca554f24c1e0c5146c2e853d1c8bec8f53ee2 SHA512 eca8173f7c657ca75523a008aa433a62eda76ed6d927b56ac4cc337327415072ab3139a75161270a24f1b8180953b7370b6b4e27a74c3166298325ed5911751a WHIRLPOOL e2af38bb1a0c432ef5896ab30dd9f823e97e6f5d22c2b675640ad7582a208eb71e6ef1bc82564155da154911fa4945e8b28278692219b0e5ce3de4137e011a51
+MISC metadata.xml 316 SHA256 1d4528a6ce8d779e083e5a6ac34dd1058c79a1d939594a270a1ed525e43aab66 SHA512 aad7058d0838227cb1bd18470dea28eeaceeb4a07a36a7cd86964ea77a7a3cebadef9af42a99fe817618f5d3f2fe7fd1703fe6752561057a5cd8fd83bddfa26b WHIRLPOOL 94240cced4648e53df1a009cbc1e5f2e4b340bcbe8eb67c575822ad6ea9020cce451130b5ddd60fa15a1e05d3387d43b31025abe9da3321a022e2d31b3620a7f
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/Manifest b/dev-java/treelayout/Manifest
new file mode 100644
index 000000000000..620c1f6b5fed
--- /dev/null
+++ b/dev-java/treelayout/Manifest
@@ -0,0 +1,4 @@
+DIST treelayout-1.0.2.tar.gz 1007086 SHA256 e5f8dbf13cc1103b7eb96d297b1f31bcbe18c685f2f3dbda0ea56cb27aa4dc16 SHA512 89a627d8ab2f248bb9b22139de0a28f310deb555f78825f29f4acfd0df7b4c212c8df241b004f8452a4be8a0f7717ee996df3eef4dd88ca905f4ad211df92655 WHIRLPOOL cadb16ed599fca669f5b584eb9bb75c9c7b3eb718927886c33e82240732c7a2c2d6d198f8dbbd4bc2552d75f1eaa298087b7b2fbc6b549db448e607631ab44d0
+EBUILD treelayout-1.0.2.ebuild 973 SHA256 d9ffe0deabd9e7680beb633f3685de549d5830d7459c8e1d52b69b7f5cb96143 SHA512 24e85b8d21357b9816190b0a28c51a131dd38d24e7916fe2beb23bbf6a9d0a3e6f4e4f252216146313b202a0088d36cbea1161fab088a67b6fab99e5bd5995b3 WHIRLPOOL fbd00f05212ea1d910db1a05b2be4c1065b42a0f86673c3182f8f7a19e0e5be574d63e2405660263bdb4ac2c7a9cd310080659a8dd6b7559fe3fdadeb0a3df85
+MISC ChangeLog 1156 SHA256 5260d5524352bf9d7074266a83c0662fcc9b69064f120fa86255c1a98b66d6a1 SHA512 c97306235e53f285578c74bbc6c77c0ef810c29ec8fb555f1ac83123a9470b94ccf27880ca29ad0916b7785702f0529ad33fcc09627d2b23d0c5ecc344fde3aa WHIRLPOOL 03220392e7d281ee56eace17a38ef91c8e2d635f218552347f9fb51c1303b3f8d2acf2d8bcc505e8a2d84b392a6885d3958bb3983b5859f024cfd38cae3dd4c3
+MISC metadata.xml 677 SHA256 4929d42ebbc68d8f031b22ee02bd8ad47452dd6a12d85d593870b0dd9c30c958 SHA512 2abe1f3836f0efbfa2d52873e93d396b496e4bf52b7b0ac2b7c1641329a7756a04295a6600473160b863dc64866dbd2d69b8443599090dd36a77dee99fc9d42b WHIRLPOOL 01a9e75b545e9fe4b309fe0dfbab257933e5c545b9b09ae31636fd5e99852fecad7b3f508268d40aff4a15294d02d7e315e5db6117abd5f28cb2c98f51dd9249
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/Manifest b/dev-java/trident/Manifest
new file mode 100644
index 000000000000..15b9fa81fbe9
--- /dev/null
+++ b/dev-java/trident/Manifest
@@ -0,0 +1,6 @@
+AUX 1.3-build.xml.patch 2112 SHA256 5dbd675b530a5a9ae963744cfa3c027aba54d273c0d9bc595ec2097834629b54 SHA512 f4790f0f7551d2734c0db2495c1dff5f6580c1734aab596fd0e419447b8c085d3ba2b4010dea972e6e3c400141d619a10baed10a2d4b8f4135e9855e9ec9b6e6 WHIRLPOOL c8d1e037d1311f27ba450a9c4b61778469a0bda7b62d627ba74d9bbdf0f45ca6b97d9d6fdcece6cefc439613701ea5194d8a5611aa2b5619d6763b8ca4bec839
+DIST trident-1.3.zip 112050 SHA256 22184d8bf04652fa439ac18723ced54e2ab8958ec339aec1778680265437314c SHA512 2ecccf80c654ad8cff6a2907d4f81409034bd5cc07542e87db7b53a646fb63ee38a472eb778f6f77f6cf1885f8dc5b85d50a6a033ab430e7e03a07000463f68b WHIRLPOOL f26ce8563d0d0a37700a7f4adfe5a966579aed7d3079fa1043bbbbf060b3f1d31fb95c30572e829b1b4f61ccb94ef1b55a5a0c641335056fa85a939f76693c38
+EBUILD trident-1.3.ebuild 998 SHA256 6176862970ddb7f49188dab57ca75829a92d914db278cb0686a930eff2e3ef00 SHA512 859285924da73f45e601a0cb9553e301f908718f79cce6ad104688fc8f9486f13324ea8cb8aaabe212184e0004671c01b9edede2ffcbc128787243159c804282 WHIRLPOOL 14cda0a7659593295a5e446adb62eed41de4b761d5c602a676bcf9fc98564d5b1ac13f7a08df4060cfcbb7c3140888f20e0b20e824e1ecb2c001e35cf684efce
+MISC ChangeLog 3034 SHA256 f8dded5f6fcf9bcf0e80447b1c36cdc75b25c9c35cbed8b5aba68a7509727ec3 SHA512 1c48c15d687cd3917920b21f86397cae4762c28b14acb01f15baa285b223eb1fc2727649c826d0f49fe950821833676d8ad5ff816b3addd1a201f4d0376c3b65 WHIRLPOOL 610a6d7e37ecd1087a12f420126dae2b7cf9eddf842d7080146351a9cd88bd6cd5902112fa4cf62ea893fc4f06ad86e83474eae6d550336861fbab6abe499ff6
+MISC ChangeLog-2015 372 SHA256 e879b95b75e600747bc2daa378b572f9b97c638e05f5cc527008b4a671bbcc58 SHA512 5c442669878e4ac696f8e9c9af2a66e690236ee063cc86bd843b01b0a633e276dd7e16317bee4bcb0a2139799cc75d29cfd482614e562486a093ce5818fb82f1 WHIRLPOOL 82819fed82c8153be8cf272ee99afa149ed0a65cec0072e412abab1c9c811c2adb47f66ecfd83a13196f0ec9ee4bb60d29fcc998d837254f15062c830f98b04b
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/trove/Manifest
new file mode 100644
index 000000000000..8abde816ff92
--- /dev/null
+++ b/dev-java/trove/Manifest
@@ -0,0 +1,10 @@
+AUX trove-3.0.2-java.io.tmpdir.patch 809 SHA256 8c9968bc9ef09003700257830f4432c6f4d6f96b2ede0cb3859d228c0da50f25 SHA512 cf174935aaa56be3aad9bf65b7973fae08f4c614f26ba761f14573d2df6ce8bc116ef651402cdaae34df903c36d3d7c254ee9c39415dbd10f8679798896530a5 WHIRLPOOL ba55c2260fc8ed9d8588c95723f08027dcf2d04c008d6be8c2a8813cbfdd8716ac4c4aaf2e0953a0d97bba7cdf2e1311d61460a897517fc769b1fa8201015360
+DIST trove-2.1.0.tar.gz 2438529 SHA256 a5929e1f93aee0c6c71df0476675875b172e797f0657bf5129cac60e047e6b6e SHA512 a0c3d71fa5bade59efcca7a65cacb90138a48d4346886a7a6e0c30f2736ef91afd532484efa73cb5b788449391433810bf6d51acac35bf28a4ceca9787d13429 WHIRLPOOL c38ea897666ee9d85302c569f506f17e2fbfe07481f3f2062c7c2c30dc02401c99e6b80312cc557cbfce4a9bf017e7a403a46dc5499b6685ecffd805bdea6ee6
+DIST trove-3.0.2.tar.gz 5880161 SHA256 24dc843223a8b547c4408e511b819552deeda81cf7d2c66409ef615ee29f2071 SHA512 27460a66bad6f206eaeae02453c94333456db5a9c566246d495fb4184d42de6033b66d1bf74060f799cf4298d531afeb9597b92da4e2963b43dd4ef072ee750b WHIRLPOOL c89ab0bf9702c7e8e8ba58605c033666cab4fdaec175788ec6c2b2219ac5722039991ce730d54ca369735934b03ede414f7f0db770aa625df3b989e75e3ddb8d
+EBUILD trove-2.1.0.ebuild 766 SHA256 67007e71589b5911d9ebb312761fe0a2061aef14d4f3798755e0981fa26e5c1e SHA512 2e38f205358597445ea8e5a9648f46de170400ff083a0cc241504a38fe33c1629ebfe0d8d0434919caaba45b21f112746692ce16961e9a99f4631b38bc3932e7 WHIRLPOOL 3d97cbb4d0f29e11238655c063ccb501821b3b0880aad28ef17e157c33c44ed9bbf669271248ca333f5f8bf6a27c97a9792f3cc9e9ed799a64249465afd6b986
+EBUILD trove-3.0.2-r1.ebuild 871 SHA256 708ad26143c57a3384d23d9d77c4e8d44739092ffd06a988e9357f617ebbba5d SHA512 2f77697a09c76fb2181f0bbfa7ef480a81c2968af4132562be424abd1fbe23b2761a32aa1a1c169f0f8a8252dd035c1ff345712e2ba1004a12f5f392bd519602 WHIRLPOOL 06461d8816f4b1adc7c4af556e40937eae9ce0e899bc209131f322d6fd87b65cdd71349ecbb05039137057b86177b087d0a5a7f0d5c62135c8d180d56f67f052
+EBUILD trove-3.0.2-r2.ebuild 799 SHA256 20be11c7a9d22cfc515ab18150b5bdeab3bff4821beb5c52fb6fbc99023502b6 SHA512 aa83f2088a03331e413cc571e6654257a599072347dc125831a78966b4539ba45b61456ec6be3ba6c1e4562f0d4a624f2f75db93591e7878971ef3c139e8eb20 WHIRLPOOL 25559fa76866054851e517feff8777a2289d2694c02fc5023534b559874924d3df6bddbdf57699316c9770fba48e985d1141a7be339e8122d9217b70df709256
+EBUILD trove-3.0.2.ebuild 758 SHA256 5d4fe74bc2cb75e5d22807efc0a252cc727e1bcf07b917a7b1a1fb23978403b0 SHA512 ed2fff18a76cca9930ef9f06c0d667959645d7ba74c27340ecf4edfa57c48fbc46eeda271f8dd01230358f74a66a45abd4c7b791f06c0f6f645d43440fbf2325 WHIRLPOOL 4c4e1abfebdf329b22f059d308831b6c1185caba4b82221a15b09696dc527841481885046dc6f785ac293e15412e7b1fa062d4abce60e7d2759b94cd830aaeb1
+MISC ChangeLog 2939 SHA256 f2e4f836b271b36cc5fa5a935c72b8d4cd5b51f4899bfeabc3e8c9f6f148508e SHA512 3434ec21c634406f8017f3d415de7d80df3d1f3039173edb07556df1b7bc7a73ae68b4538b40b78bc6419eb9fb2f35d8c9c19dd155ce0000fc0a37bbac55d009 WHIRLPOOL 4655ca81711e69eda5852e38f35b1a6e7edf05e37ede5345f1ba2342ae6f12c2ccd3d26814fb8717ffb763a9add8f16e384872db5f7e13db9390fbd6d8884ec6
+MISC ChangeLog-2015 3425 SHA256 84244a157f23300ccfb4b00374db5243791ec289892c6bbb81ec33206c982edc SHA512 884c66cc5e29540aaec30953474b4f4af34a4b2b07dd20086067e6b0f00adbb6842245f7479099689883f769becc73c8ae7a07df141caa93003d95d6973864cb WHIRLPOOL 92784be734bc89b2730e2017b4b1de16ba892950af7dec603f89fccd42ad21f9ff889fc215f56fcb1d89da818cc6297a571220cbf3d3028f0787c92e5decef26
+MISC metadata.xml 313 SHA256 78418986f89d0a3d15a539f0cd5e90dbb556a724d953412cbaa9d641e0ad2e80 SHA512 8d83dca7ca9717cd91fab6805a9ec4fdab65161643d583cfe2134fbcbaea07ceb236773e88365b137a6e2fb5215c821f54955dd641d0037025b826d29ec0d2de WHIRLPOOL f49bc5b894c9a4dc368dd7f336953e37b8b7b31c91d62d77d8a7124ab59ab6e6296fae2b87632b4d9dcf21804b43dd343465d3318d46ce5dd5e886eca954fa64
diff --git a/dev-java/trove/files/trove-3.0.2-java.io.tmpdir.patch b/dev-java/trove/files/trove-3.0.2-java.io.tmpdir.patch
new file mode 100644
index 000000000000..d5f88a426814
--- /dev/null
+++ b/dev-java/trove/files/trove-3.0.2-java.io.tmpdir.patch
@@ -0,0 +1,25 @@
+--- build.xml.orig	2015-06-30 21:07:56.621000000 +0000
++++ build.xml	2015-06-30 21:10:19.060000000 +0000
+@@ -99,6 +99,7 @@
+             <classpath>

+                 <pathelement path="${output.generator_classes}"/>

+             </classpath>

++            <sysproperty key="java.io.tmpdir" value="${output.tmp}" />

+         </java>

+     </target>

+     

+@@ -339,6 +340,7 @@
+         <mkdir dir="${output.generated}/gnu"/>

+         <mkdir dir="${output.generated}/gnu/trove"/>

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

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

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

+     </target>

+ 

+@@ -442,4 +444,4 @@
+             <format property="fullVersion" pattern="'build time' yyMMddHHmmss"/>

+         </tstamp>

+     </target>

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

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-2.1.0.ebuild b/dev-java/trove/trove-2.1.0.ebuild
new file mode 100644
index 000000000000..88a296a90443
--- /dev/null
+++ b/dev-java/trove/trove-2.1.0.ebuild
@@ -0,0 +1,29 @@
+# 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
+
+DESCRIPTION="GNU Trove: High performance collections for Java"
+SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
+HOMEPAGE="http://trove4j.sourceforge.net"
+LICENSE="LGPL-2.1"
+IUSE=""
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+java_prepare() {
+	rm -v lib/*.jar
+	rm -fr javadocs/*
+}
+
+src_install() {
+	java-pkg_newjar output/lib/*.jar
+	dodoc *.txt ChangeLog AUTHORS || die
+	use doc && java-pkg_dojavadoc output/javadocs
+	use source && java-pkg_dosrc src/* output/gen_src/*
+}
diff --git a/dev-java/trove/trove-3.0.2-r1.ebuild b/dev-java/trove/trove-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..9c134d5f852f
--- /dev/null
+++ b/dev-java/trove/trove-3.0.2-r1.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-ant-2
+
+DESCRIPTION="GNU Trove: High performance collections for Java"
+SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
+HOMEPAGE="http://trove4j.sourceforge.net"
+LICENSE="LGPL-2.1"
+IUSE=""
+SLOT="3"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+S="${WORKDIR}/${PV}"
+
+java_prepare() {
+	# See bug 553652
+	epatch "${FILESDIR}"/${P}-java.io.tmpdir.patch
+
+	rm -v lib/*.jar
+	rm -fr javadocs/*
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_newjar output/lib/*.jar
+	dodoc *.txt || die
+	use doc && java-pkg_dojavadoc output/javadocs
+	use source && java-pkg_dosrc src/* output/gen_src/*
+}
diff --git a/dev-java/trove/trove-3.0.2-r2.ebuild b/dev-java/trove/trove-3.0.2-r2.ebuild
new file mode 100644
index 000000000000..501b2f6b8f10
--- /dev/null
+++ b/dev-java/trove/trove-3.0.2-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 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-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PV}"
+
+RESTRICT="test"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	unzip -d "${P}" "${P}-src.jar" || die
+	cp -r "${P}"/* ./src || die
+	rm -rf "${P}" || die
+	find ./src \
+		-type f \
+		! -name "*.java" \
+		-exec rm -v {} \; || die
+	java-pkg_clean
+}
diff --git a/dev-java/trove/trove-3.0.2.ebuild b/dev-java/trove/trove-3.0.2.ebuild
new file mode 100644
index 000000000000..79fd976ca9be
--- /dev/null
+++ b/dev-java/trove/trove-3.0.2.ebuild
@@ -0,0 +1,30 @@
+# 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
+
+DESCRIPTION="GNU Trove: High performance collections for Java"
+SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
+HOMEPAGE="http://trove4j.sourceforge.net"
+LICENSE="LGPL-2.1"
+IUSE=""
+SLOT="3"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+S="${WORKDIR}/${PV}"
+
+java_prepare() {
+	rm -v lib/*.jar
+	rm -fr javadocs/*
+}
+
+src_install() {
+	java-pkg_newjar output/lib/*.jar
+	dodoc *.txt || die
+	use doc && java-pkg_dojavadoc output/javadocs
+	use source && java-pkg_dosrc src/* output/gen_src/*
+}
diff --git a/dev-java/txw2-runtime/Manifest b/dev-java/txw2-runtime/Manifest
new file mode 100644
index 000000000000..f67afad4e655
--- /dev/null
+++ b/dev-java/txw2-runtime/Manifest
@@ -0,0 +1,5 @@
+DIST txw2-20110809-sources.jar 96939 SHA256 39b43336285320e0d62757820c4d3294efbe1b9ed935743dd461fbf6ac55faef SHA512 1f0779b0c0f38a0a71f495a6167876fa7df1de7a38343717edcc50d54df45c98c47eeed30c692de68e9c9a7f217cde463288e73a6d274f732578550220c27fc8 WHIRLPOOL ec72494dfbd213a884ef4e2d864e449fb2380dd631507510bc829915a826b467180ba921a79ce9800015ac47717676baa095e1e3f2dadff48858d07c147f9816
+EBUILD txw2-runtime-20110809.ebuild 588 SHA256 2078ade17469870b3473aa9a3e1bbb23e6a9245ff7b4979dbbc784fd2d2c3761 SHA512 da8a3b1c60122a144c9b90383eaf9cd95f4893b83b722c7da1c3a51cc398722e8f48faa17795a2d37ea16f648c1ffabd0a8698a38254d32280a62ce1e40e57e4 WHIRLPOOL 4a990ebf994fab38c183e5efbf18c784b44d13a3fc767b2ace02be91b93186a4d769742b8d3999aee286ef4dc1f5a56ee6d3d929969c188733c60c50439fb355
+MISC ChangeLog 3583 SHA256 94c2ef57de22c92ecd4a3bc44507744b9c7702e4fa220fcb39a24650e0c006ac SHA512 5be61e87a1829ebf286201ae86804c6032df8f7dfc411464626cb0e5505d3660516ad3118aff0c46f26925af3c29156f1694b8c0a20e9588df70bceac5d0a666 WHIRLPOOL dbed3f2e7af9f4916f3af83d21f47605ac3d2c4c7fdf28bbfa8dc55d7180584109deb6eaa06a02c136212787138ccff68faefeb6edf25356fdf399d8b1229ac7
+MISC ChangeLog-2015 2315 SHA256 3126f6ddebd64926a43df656e16a7a866bc48e13af21fd725f0c5b3c5fa01b7e SHA512 e162650e4f1f88671a4bd568f70317f553f5900897495b00d904d38de91089f6c33f2f276657f30b5aad810413748cdaa432de92a81ac97500f570a6a9fa7437 WHIRLPOOL 9ff794dcc4854a27f63754b0a4f01c9c1fd5d2341db8e4741a0abd4e449c9df8f5c1e4eac41cca24a31460bbdb01a9cb89ad662a0cb15b52f8eeec151ffdd06d
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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..331a381bf865
--- /dev/null
+++ b/dev-java/txw2-runtime/txw2-runtime-20110809.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
+
+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 ~x86-fbsd"
+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/Manifest b/dev-java/typesafe-config/Manifest
new file mode 100644
index 000000000000..bf00152a14b1
--- /dev/null
+++ b/dev-java/typesafe-config/Manifest
@@ -0,0 +1,6 @@
+DIST typesafe-config-1.2.1.zip 287878 SHA256 b3d26a8959bc18b02f78d9ac94e691db7ca103020a700f4a1c9cbe45b254f44b SHA512 178f0df81f081b9355951debd3a5435c7d6aae25893f049917a25861015eba18a305d5370d914b89a7c46e55b5d9f3939ddd0656cfa9a4691bd16cf32c796502 WHIRLPOOL 591e2d61a477b681b842ef45166b1ecab6545d0002c78d3c13c57c0c6bb2a3ae5903cc0d095e2237aae3c284f7d71f2dbed7ca1889dc89a837a38cde06f5a039
+DIST typesafe-config-1.3.0.zip 363061 SHA256 b3af059bd13e597c5de466595f620cb686d21cfb7abd5bae1fec82d16be42999 SHA512 8b9821de442dc24b8b7be4c5ebc91d57214a32dceda8dc160cfaf801f70b34d2a2df6f8b2cbb744d18be3fbc887f1666f431b52882edcbde408d8adf3681fec4 WHIRLPOOL b2a61f17a269e1d8a533e6235ecdfd2968f452499e4adba61f17b667fe5aa2c07556587f9104d60e990fa268a3220b811f5860f6dd08c2ecd4cb5868833ac1e2
+EBUILD typesafe-config-1.2.1.ebuild 513 SHA256 3c0d890a9481f1d226a968354b3eed0a68a94b2ae2569f97b217d2dff5854530 SHA512 3325f637f60431c531ecdfdc8f865c83d11efc5c42a91fd36dcbbb6c42267381736cbdbc44cf4d9be97fbaad9dc32d24d986b06b6755713046a4946e275ce20c WHIRLPOOL 2dc93f4def4bdeb186afdb641e753512039593a513951a7a417866af39620efc616da64b4bc372fb8850cf0d13c9e7719e4538ada200ff0d1484d167781b904d
+EBUILD typesafe-config-1.3.0-r2.ebuild 509 SHA256 2096eeb547052782fd47f71f2c37bda328e8207505145fdef6a0bd0c87e3afec SHA512 1929afe71a44f7a2d1cc6907de131887c7adfd60b947dc5be85c66bb4e25888c03aef87faba5cbcb39f18bb5c20eca908da23c9a01d83b9e64b56eb3704ba531 WHIRLPOOL d6349c5fe3e5dc955cde85afc074cb674aea2f2bda2735d89648c878f5c1377f21ff2849f586ef2155ab88238d7801a543ea0b0e1a9078707e56afa307f6b7a1
+MISC ChangeLog 2891 SHA256 bc57026de33522d9cf5d67f2d7ab5b43a5fa765fbb0a8f390267c9d9bd6e7941 SHA512 517a6f13849a44b9d52eed2f400fe50b09311f0726cd5859e392e7384f3c779fa97846dc2c33f4be6f77b4b08cb6ace13220e4b75563d4f3da17e1d00ddacc58 WHIRLPOOL 487a18158fb72a17479619b40177044f27fa732e6e0b37f7916f0f605f8f181520ed32f1e2d9b710d4f5cb20fa7327214df37aea24dae5c11bf9e34a0263a8fd
+MISC metadata.xml 329 SHA256 4325fe83a18fef1293a786c8f3d4bbd549f110c64a4a4c88b49ca3cbc31dd9ae SHA512 3cd9eea5ad8ba9ff81a44829541064af00336c217a17cfdd95dc0384211de25884054d2b45af68f333655c5dd469fc44f27245a74d0d0aa136941b017fc8bc5a WHIRLPOOL bdecf59206e882fb895d28f75d2b641709e3422bde81e48d334bb8c996a567bc8ba155f5e1e71f62bdf8d3baa21e69af2306e7ff23ecc02965390646e7ec619b
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/Manifest b/dev-java/unkrig-nullanalysis/Manifest
new file mode 100644
index 000000000000..4d636900abc4
--- /dev/null
+++ b/dev-java/unkrig-nullanalysis/Manifest
@@ -0,0 +1,5 @@
+DIST unkrig-nullanalysis-0_pre1644.tar.bz2 2322 SHA256 ecbe44bad11afdac33d9ab6f1f75c70090fbee833b2a00e23c3a4b3931155d6b SHA512 6e4f069023043ac24f7e68f748ad4c6cfaf16312310abfd9c6d395b34491b68a7c3cca6b3a36b18c4dd656cc15f17755dbd4ce3e6379da06f82a2691453c3c03 WHIRLPOOL b16b22ff2b5f719c41568536b43c0fca777459b3d0861fe684de3771fe79117099656286dfc4ef4e5aab7b01734ef1d140b94f30f1c73a0baabba2fae02b297d
+EBUILD unkrig-nullanalysis-0_pre1644.ebuild 491 SHA256 78d61152dc670810c0716fb34420d923b6483f99a5572dd7c35baa56a0643c5e SHA512 3e04419c0b8ee9085de9ef6312b3ed2c262e8115173a5df4d3ad67b961e42c6f6c74ed8db7c9f7e0dd7ce3dadd9fd7434d1e28856ee7e12456068241e06636d3 WHIRLPOOL 3b9862b7ae93410f7dc00e0c010ec67d67c8a006f464413e716dd85a4176a7b56bd04f0f2562322fc4fcc68c84b6f7f40cec1f5c508bfdba6d0d8ddf90734585
+MISC ChangeLog 3114 SHA256 b668a3d849476df14622098844a5191d8d46ff0e3e93f22e8ee43381c1579e3c SHA512 ba23fcddebca7ee23b7fc0b12d19f7a62edb14fb2cbdac6c36955581991d894fb71114f375910dbb19f526a1e2cb9d3bb83fe60f8a56be196c948862802a00f9 WHIRLPOOL 9aef7120ec2318f408e6d48e0188960ea886417aacfcd2fcdb17d86a48313a8df273382dafdf2d49ffa922a548e3c4fedf5413ac81ab3ab96c27d26aac03f18e
+MISC ChangeLog-2015 458 SHA256 7fd05902cfcfd4cc607cb9c7494caa47db3013c3d1d7c3525ba00a96119f5646 SHA512 eca7f62d6dcb6d131238ef226d8cda22d5d6f0d582320594fa330dc3d5529a6d46585b7a0321f5932bc6edc36005bacb9d118a2abf751539791b04ed9e429c41 WHIRLPOOL 4ca58ca49e4f95cbbd1d2813d83bc1904738e5f4dab2292cf0ecb6bf22b71915511647e23ab19c49f2e2db0c3f06b08df1a905acd379134b28688217fd461dee
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/upnplib/Manifest
new file mode 100644
index 000000000000..bc3eafd863c2
--- /dev/null
+++ b/dev-java/upnplib/Manifest
@@ -0,0 +1,4 @@
+DIST upnplib-1.0.7.tar.gz 349943 SHA256 e037070708f31401a579b9f5fa27e51d76ae9e09dbcbdf0f07492f40485eb5b4 SHA512 b44d1f539ebf2ff3860f3d3fd664343148c81437a6e3fb69f2941c6dafcdf9a48a1f682d8ed250848edc656dc38858cf3a630dc026e9e3be340ef5b39fd7b8cd WHIRLPOOL 0daa1991997f853170777dfd6997a1991a196c14c7a882b5a87b7d2519a1ce8b99b52642a79b7bd404e911735851db7fc3e4ff715b3351e2a950efe2be1d1385
+EBUILD upnplib-1.0.7.ebuild 894 SHA256 ac1b234b90feb4880af20fc3f19059524f95fa3f33c036c228fc3c1ea7fbebf9 SHA512 e178fa93e7c923e7b002aa41ae1e740c2501bf7b4d4f6132e8b23f7557afb857c4885506b38e963cf443ac64a74890351722505c7c9827a7d9c1a0850977965a WHIRLPOOL 2ac0b9ee043d7b97d743d64452e3cfcbc2b131f4baedd1feb2601490b3c5d4bd8a1339e7642dadb375fd90ed5a2eebe863400b9ce6dc9106edde8e1e110a6f8c
+MISC ChangeLog 339 SHA256 64d1720e2ecefeb7c063fa0f2cff8041218f4d6b8f021e7a4ae505d642f49d57 SHA512 e7e102011aa082e64af628c4c5589a08103d0d511247488a6dab157234dd40a1fafec686069362133678eb47fa8fb443596a6e31004623aaa387d2beb828efcb WHIRLPOOL afc87e7393570aea14c3a4152987188a0febda3ad93955118b8ddde559f26b08e494e8e3b20b6d059175e863b6ac852092fbac5e3dcae0f8438bb88606a6ac71
+MISC metadata.xml 316 SHA256 609b6004a5dafad77fff2f92de750b380c49c367761f0c9a982c0a1d6815c30c SHA512 1397f2315f70f90e11ee43e9ed0b1dc243ed06329933a3adc2320e8423c33f478f2f7f9bc69b4e7429d85c861697feca37d500d3e1ec90bcfcc74240a22fea16 WHIRLPOOL 0c2520bb9c88fa6f8744b19bf2da0df4dc77c70ba82f1716b606efd96d46909567659065d929428274f362870d46a4a1f48631d259e646a51033580f1f06f03c
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/Manifest b/dev-java/validation-api/Manifest
new file mode 100644
index 000000000000..786f48dd2013
--- /dev/null
+++ b/dev-java/validation-api/Manifest
@@ -0,0 +1,5 @@
+DIST validation-api-1.1.0.jar 94671 SHA256 30c421ac184ae6204961304b60cd06db5fde3db5159e81430bcdcb386cf19470 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8 WHIRLPOOL 69b5a70aa4e358d85b43d60857413744a62bf0215473c1d97ca0307f98f3a0626a21b4643ab1cb73ba8746ed237e6db3787e86334bc5bef346f99ede3ef658a8
+EBUILD validation-api-1.1.0.ebuild 557 SHA256 0712bb5fa8ba9f38b559ed85ef974f8a11d6c8a8e9bf8f5b08b95cb10aeead77 SHA512 0145dad1a8a358d64a9f9e65c5dfca7da5a95bfb066027ef94b07cbfee1f4f59be7cfa3b1b0ac6163674ee84f2cc190a7e7903fac746d2b834e1043dcef0e85d WHIRLPOOL 9bf4c31a7700a459a18b66939cdbe40f1d25a6154eb2e0f5ce04186d787b3e785098bbcbd88e447cea4491da6d6d10fcc5a1cfc5d243740d279f0e7d9ada2978
+MISC ChangeLog 3355 SHA256 cd2285ecafc790163d8fee21b5286ed0f5fe44004e783d3a56530d6aca880728 SHA512 cb32bf2878f3871d9b04ce3e44964511123912a4835d17fd6f60a99109a48c2c0bdfedc573509453cd5ff6975aea6550ed51779bb515b86e924daeef8903fe01 WHIRLPOOL 14a524f12823e94b8d3ece52e53c56c8dfe2079723a21cebbb70a885ef57b623daa657e6c231b6650aa2cc1037a8bdd05ad78b001b9b4e4846ad10b3bafba0fb
+MISC ChangeLog-2015 745 SHA256 2e7c7c1dcb9882965f53578f2af8b8e0413328ee7a36850a9da816470d1ffb06 SHA512 0d4299c2d82dce4e67f46c609f1a05dab2375dca8c3ff260af19bc4ccd7b2dd79b1ba5dadf1c2abcd7a504520f5483d4d28fc932b19d4ac34cfa14f97a746507 WHIRLPOOL 11fafa98f52b91bf6bd5c4693a974fe798571cefa051330190a973186ac810c015810c6f737b881093612c7a82297799b891ff7d50de9d566a5773f3b16a1bf2
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/vecmath/Manifest
new file mode 100644
index 000000000000..4b9db2a62278
--- /dev/null
+++ b/dev-java/vecmath/Manifest
@@ -0,0 +1,4 @@
+DIST vecmath-1.6.0_pre12.tar.gz 121968 SHA256 640ebe15e9410a061130b787e0b502bcd75552ba23d785fc03adcb01e4f337dc SHA512 b885a83b91af7c3560e7f8e94d7a8da3b00ad7db4a0f2edef19c1525fe7ae48e897d865ef2bb64800bde197bc9c969517c9c526d6ed27d25cfe87815a64bc5d7 WHIRLPOOL 6926926c64aef513b95ad6b1c21ccbd3b869a809e94577f04d46ca466b5a106725068bbee495d1726eb6d1cd71a3eb74c0bd52f75a1183fb8563178c660ca6c1
+EBUILD vecmath-1.6.0_pre12.ebuild 804 SHA256 3c252410b83db5e2b6758ea354f54e3daeb47af6b70ac28f5e504b286ca03bdc SHA512 da7f20c953d40b1ee5920132823cbd657712e99cf814e017c685de5a48e6220b30ba81064738ecd84df67a2f5bc01c7af0a854879eff68a5021e303b63f92ee1 WHIRLPOOL f87aa30163ffd2ca22b6a95156fbdeca4289644f1b11280696edb62494f27172b53a1ae549f23a7d6baf0c0d8a9ec5fbf3899ced368e363bd24c4a2cc1dc2797
+MISC ChangeLog 2480 SHA256 7871f4bfe316697577ba3d1f208ea4d5038c483c52098720230cfd7b7e7d9bab SHA512 b1b657ff2b4874db2d34acd5037bb3be3380380f404e14baf918915ab3b0e8aaa47ca31f2715e89689c2e6eee9c06f47a5541295382567b337c72cd9c8307bd7 WHIRLPOOL 996d18b58a9245b226204d0238e969587639e8a0d9d1dd2bebcfcd493394257e8d34504f17aa10fb43dafbe138d85d50d28aa009f92be6c22365bd7d527c91f3
+MISC metadata.xml 405 SHA256 2a79ba9e83c69b8f82b721d8b95c5218139961467dda9b08490172199188afae SHA512 a133b08ff3f6125ba1f3b7bae14f62b9615f1588a54a9c9d44f4c6598616766d7e54610e616f0d2687aa3e6cb36ebaf924a6b3acc1f73c66aff5f7cb7c176ead WHIRLPOOL 64449956a1d1e191512d5ea186735991fbbf64d7cce8f97ed438c3669d1a048a633825266176dedd1eb713c6aaa9c73ad5d86460ab0f5f98fd202743b97be733
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-dvsl/Manifest b/dev-java/velocity-dvsl/Manifest
new file mode 100644
index 000000000000..dcdebf93d53c
--- /dev/null
+++ b/dev-java/velocity-dvsl/Manifest
@@ -0,0 +1,4 @@
+DIST velocity-dvsl-1.0.zip 91539 SHA256 f7b05089c38f4cd28700bb4e57c856a22c3a4700d2812c5a4c18a42bf0b78d2b SHA512 0f431347706143a76d93d58f44a534a566780e27ba3ec43e48e4268b88a5fc523850a693800b730bee3a26d1c03339b24603f7eacabf716d199a9974d95c1d01 WHIRLPOOL 9532e6b5d8737e98f67dff4023fbc0800666ff8fc616ff2233297ca506ea56661742830f663d15fee319bf5d2f06ff722cd498e5a926a1a644dd8023bbcde266
+EBUILD velocity-dvsl-1.0.ebuild 907 SHA256 0e9bc24638b9a32ff3b13f6afbb1c42cdf0403a92b565e6fa35d7ca642e453d4 SHA512 084301cf6bbae94261e0ca65ba69c3d4c6631cb98ff2ba93d912d349681a0e10609e80c736fb76307ac6d79abc36382742335ec5b5b97fa52b466f5e446aa686 WHIRLPOOL 4978128bde2e09392749078cd554a84ebf55cf31b18048ff921c5731ae78401b5ac1a1e26c1bc7077eab22bfeffe79775aa4464adc2084143eea0f2baec3bcf6
+MISC ChangeLog 900 SHA256 fe93b4d184547bd96391894e019f6ddc318f7b6aa0114c38477ef7e4ef2c84a7 SHA512 9dc1aceb2a1df2ea1cc213ff54ef3118d2cca2cf538e27290153af84de4bcb10c8633549108711367ba77536b255d3865917a21498c9b26bada2646027c9f30f WHIRLPOOL 22f1bd970d1b2a7a7cd37f42f9ba8634d04586882de65d8aa2fc96636b0d601e5e11cd5ea045a955954d24d6233486f6c313583207b14957dd957cb831c2fc6f
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..a1aea0f44ea3
--- /dev/null
+++ b/dev-java/velocity/Manifest
@@ -0,0 +1,5 @@
+DIST velocity-1.7.tar.gz 5882643 SHA256 6cabbc45ead01b32e9833db31b1726f2e34f5ff6a03346df9822e70909d06766 SHA512 542c9cc0efa118693bf1c952ac4b0c7c3d0229ef804afaa4f0f1c01ad40b0112055c21df7f800c302bf173d58461a864b29b9bc4b9174029d9748f88f2fcf9ab WHIRLPOOL 59e44fb361162be0f07917f2a137a01cb26551da64896a8b7f3a747e328e6ec72d7a32d620aefddce160617b36132047d932a253dcf8e2afd40ae6712f462be9
+EBUILD velocity-1.7-r2.ebuild 1158 SHA256 9ca9693bbcfa843d88d8b2626ab9bdecc0fd988017b0dfe8b277e9bf25b8ae1f SHA512 64a0917d557e3e9b8fb0621d853c72be3b5ec51cbc9694f32e69d322a313a31ee3492049c70e1f5b0ce61eff4262372f94b641371cf15a235567d4805f02483f WHIRLPOOL 3d7f039742f9b0c0991f16781545d38b66e64afcca4d25ec09f03d032287a3fd1bb88c60ca61fe911338983f9c4f532ede72355a2607ad2bf7c0cd81c243fc39
+MISC ChangeLog 3401 SHA256 4ba5f193bfa1977b63a6293a6a0af2dc6f526f0500ec730cc1a10473f90ba2a8 SHA512 89773a4f169af9236e53ed8f6bc027dcde099f85818d05d8f3a8fbc2911a885f08e4288ebe26eff9578fe321b8221bcb56df168d5f711dee59341a69b42b6c40 WHIRLPOOL 8458d3aebbb9c33a99a6d52872bcb5bea57f0c810c29fd81f8b0f2ce5af5796ed67b4ec59daf3bde6b86d9835b78c2990f0f220c0d05bbfc39ddc70921bdedde
+MISC ChangeLog-2015 6785 SHA256 beac69485685b418e29c091578ec439179b23c122386cb8a11c8f4dc1c5b83ee SHA512 56ace281f33014ecdcdc58b2f2b6a1937fb0eba9d76c7bd18a6357b83e44ad0cbb497e1f0d5ed0bcc6fe4bf35d7ed4c651d47fc217f1b1621abd9c59136c7103 WHIRLPOOL 7a7cecb47efa3f2ae930e150993261f8f5aa46f6ab4443de9c47953d964643c70fcd533432babd8ed3f9ae101416cfafdc47146294cb4da0288a02c90f350f11
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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/Manifest b/dev-java/vldocking/Manifest
new file mode 100644
index 000000000000..9a043bdd1e84
--- /dev/null
+++ b/dev-java/vldocking/Manifest
@@ -0,0 +1,4 @@
+DIST vldocking-3.0.5.zip 1734159 SHA256 a2c25fbe8ca1c2a8f3731e224096625d865eedae1843426624946851c58066f6 SHA512 a9943a767baa68b8cd8a75fad1e6e05e6f0083551c32c9af2b20258e2fe1fcc181a7700cc668b862e0cc2b04392a987ecfb92bf5203f273c72a8e2a2f4a72cd8 WHIRLPOOL 51f1fe5b9365d17e0f3349d1ad8872216dcfd3c643b12303b3b9b19d7a832a4fa643ab3a4071c40857a0a87f2ee563b4d68f2cfaff209d88981b452bd0ea81df
+EBUILD vldocking-3.0.5.ebuild 641 SHA256 272a8ab902dd07eaa98d010711894db192ed7d9aa5682441893bcbaafa08d6d1 SHA512 8f95ffb948230631b6eb638279722a129f0130217360d9b72bb28f08155429fa583db491be5536ee9ad9384de5ea800730f13f4d4a4f3be6e40e5297b5fb4b75 WHIRLPOOL d40204da16dd76e420a4288ca2b6b9d4a6a6b1cdc0b10fc8d81076f5997d25c3042af095df6d75acd3fb9151be16091d8774aff673474e3a94b2dde9eef40f44
+MISC ChangeLog 969 SHA256 5e56c5fb4a1a1e54be1475f406da3a63d7e709a64084444327b250e007b8ddce SHA512 1e7019842e5632d6391e65029cfa0af73818ab62f353468a6c0943d94ac61f1b33187528f3e14e508459b567a5eca44ee05024f9eb2265302c4d7b4e8210af02 WHIRLPOOL 10412496d0d4179790c4ad787d15f63313aa54c7be998165b958cdaddebe3c74864ed0554a780eaa351b8537357dc4f57035cad95e15a23184a3cd72ef1f6da3
+MISC metadata.xml 429 SHA256 fa10acb98b675907590619b6be49afd8797d5c2841056d7601889e5d362c62dd SHA512 3230ed1a84230d6967079c7bde82646fd7a5ec2f37bee6c2f2a75c365f5f2496a213072027959a59010b567f5a7e76e3edab20e753ef931823955cb5bf7bf85d WHIRLPOOL 490c27c4c6211ed4c9dbad7fef2c70c069b44858824a5c6748d4b4e96ab4bf220b7462934bd90ddde330da35d983e045e9474155661f87c31d7c5de3eaf23970
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/Manifest b/dev-java/werken-xpath/Manifest
new file mode 100644
index 000000000000..2be3da440a4c
--- /dev/null
+++ b/dev-java/werken-xpath/Manifest
@@ -0,0 +1,10 @@
+AUX werken-xpath-0.9.4_beta-gentoo.patch 1313 SHA256 588fef298eda7cddb53ec9a29bc996200e79887dd7024edbb72438a330fccea3 SHA512 bc1dea4402c1a4b4d99cdac96502ab7134613a9584f491c46abf194158c1524366037f086d250ca8cebb1972e298dd943a4af5919107af2b54863d4400e39bfe WHIRLPOOL 0bee1cabb67f676ce16b98dbb2b24b2eea80a1a8bca568a1c3eef1236062c62bd298977ac8faaae2c21aac32891c8b725b4456dc186c2c9d7a9e781faf7f1d8b
+AUX werken-xpath-0.9.4_beta-jdom-1.0.patch 2325 SHA256 c6f1f7ff2b866a2563ad10edf54a24abfee9793a2478750827dd8eb8bd12a387 SHA512 29c3d85870d0c49b36823ba633c9a3440a5c61f140c0827aee7b78c3a241a97f3cf5e285d43deed2f85487cb38b9682b4298d1dfd3934c038ca1be90dbb086bc WHIRLPOOL dc8fd009ab49f356a27ec7389cae499b8bbde9209c10a75fcc3bc47c3c063fdcd29f4fc07a51a61097fe53e520cdde970277a178f52646645467c1c65720d5b1
+AUX werken-xpath-0.9.4_beta-jpp-compile.patch 1189 SHA256 8ccdde529f4b236ecd6793f3baf80e99d057eec4fad97bb130c9ba1ab3444d0b SHA512 e7dbb75305a22463f7a3a975ca21002fb9aa19fcaff8cff07890a74cadcde292023d8e714c801019e1cd42c1f69270f7ae31c547feabfae2d4972dc99d5719a4 WHIRLPOOL ae468268e72ce63de8cb34d86009bcb59684ce4fe5b948131dcc3bacbfb13c17b2f96f393249bd8704db71710e5049db90097977a9c69ab423ed68981ccd24d7
+AUX werken-xpath-0.9.4_beta-jpp-jdom.patch 3606 SHA256 4c8301b7fa31a8c999b3021c46526045f12e178b8bad230fbcd3b00cc5cd98b7 SHA512 de979a742d7d8f7fbcc68613ba4697fc4a4dc7d146d86712d71ae09c4e0b6f09c27361bd80743534aa5f2e864def2c5b8a09bd1d6fa2e15a852b74b73ff616c6 WHIRLPOOL 8a61c1285e880ae603ed1ca645661163b4a036f6f18dbee54f40296f2b791bd2191119d6676fff708d874e984551aff901ce6d1b5d2e0f2cbd7cc2026f1b19d1
+AUX werken-xpath-0.9.4_beta-jpp-tests.patch 353 SHA256 79297e31ea4b45ecdaa67df4bb8816b8dd416bc577c1f5406008954cab5e327c SHA512 80adb52ad882970be6177cd1f8ea3ece8fbd3388b02b1c1766f3c5c869c42e358be9682fdd4a189225158d75d59b558ac0cfe55d8e9530de383ef86b654c99e4 WHIRLPOOL b3afbe5249463b395e4219d934114245a876739ec8421f16f9302f4a0c3d42bc7ba902056fd5d38fac495735208a2411f3a2a76d7ef7121f0f9a3156fdcf77ac
+DIST werken.xpath-0.9.4-beta-src.tar.gz 1652916 SHA256 e0d649230f3fa07f0860a355adde20e1ee08ba1a7809f00cb938b9b0dc3f76f3 SHA512 c58878ee0b6e88651335e2be60d0afcd65fc164864e826bb209ec660e97315233b25341733a4118ed3ee003f61998d84e480706bda5be4630c599efb616b845d WHIRLPOOL 2593fa630fcb50cbbeaf627c09682ee9822e938b845c53b6413600413a74b9b6b9417368273ebd258707ee3434a3ba8347a046ed27a0f94290687a246d38734e
+EBUILD werken-xpath-0.9.4_beta-r4.ebuild 1365 SHA256 74a158fb0053b699e9a2123b4351d0bca385652e7c7e6f9108750b3d31992b37 SHA512 6e9fc5e7fdcb64d6177e8ae57a836c2c0ae5f0379cfe9175dd898631d1f42c6abc5ab2fcd8462c2b3b286a3f90976eee473c9f1045da4415de9fcef65bc43792 WHIRLPOOL 4527324bab357607b2a07a5db63c0730653dd9195a2f74d0c64fb0a70d0dcf6da6a8dd04609e37fde000ff106e77f036d67a18e1c6488f3aeca828e7c559d897
+MISC ChangeLog 4374 SHA256 d405ad826e433c43a61406a35b3ebf8eb98eefc58e100f9a8925c7da704051b8 SHA512 ace40aaeb3653be50ecbaafadf70dc2895806ad758f587f58d1c57c5d2131df8f4813f31b48dd2ee158344b4c3b7e3446d03651fa7008d52c957af7881b4f144 WHIRLPOOL 869a6c9ff8b63301c0f7ccf6ea8df71485d528d8fbe420d6f7f34d2a6802f0bc463cec75f4dffd5a5d92543df9b4d7eab61ef40a4a1fb23b66396ded674e87d8
+MISC ChangeLog-2015 3281 SHA256 383a8c07b7f1e46ae544688c419eccc04e895e0f22bcc81dc0bb7f9bae611abf SHA512 1bd5de84ffcfba2d997e24a3cf4f4d7cfd9a4243e4e3f6bba7fcb45c3dfb3b8740a70d3f024ff2225a42dbb970d000c7c4a038ea883167164604af73fac19018 WHIRLPOOL 448d0e9e15b1810956c06ed858746c72c4b585b21b7a9900bce0a88a479023d7f4b3efb2a647ee74ebab7e7a44f870edb2ad76f98c030b82b9e5772b83057065
+MISC metadata.xml 318 SHA256 856fd8630a6bdbace27114f055e6d37efa5514b213c8cf44d6d5270006bb1f94 SHA512 64e77592f9351e55f3775ec892c2d0b6967ddd0f98cac9ae4b75f023cf24be1cc3df514062ccd5d247f8202d33b71965fb09878dee0c07edfc84734cdebe11b3 WHIRLPOOL 74cd15867440e8460c818db29326a524c5e2545cf45baf6191f08097ff3962b494b8813fdd8932431a75f0541ba8f4d97e077aa7159cac5e0f0a4966bf9f1d7b
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..cbba64656259
--- /dev/null
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.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 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 ~x86-fbsd"
+
+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/Manifest b/dev-java/ws-commons-util/Manifest
new file mode 100644
index 000000000000..b76e84a314ea
--- /dev/null
+++ b/dev-java/ws-commons-util/Manifest
@@ -0,0 +1,5 @@
+DIST ws-commons-util-1.0.1-src.tar.gz 24838 SHA256 cede9cc3136e09fedfe8ccdf61e3e963afb3c54ccc833262316ceb103b74df88 SHA512 4eefe61daf462105ca8cfb8ec42ef42ef414d1426b201da044fe9a72e9ab7d3fd34bd80d19d8f6220f1f91d9de7cab3d8d2dec4c267784ba3d3bbd69a1c62c4c WHIRLPOOL 545b790e44023d8f0a0fb81de587ea6846eb7ae7af9dbc31f6921d06268d1474ea055134b8485113e991fbe5bcd09ecffff7f48efe99434b5c41e50e0c715e31
+EBUILD ws-commons-util-1.0.1-r1.ebuild 610 SHA256 b64ab931b18f3004ef648ee4e420ec31930265c95d7b4dbb31f7ddfa0195c31e SHA512 456607419ceaff657a1d959e2a2c68783ab2ee7dc2c7918c2f14e0940278acf35fcc0cbb90aa2a03abb17f74d769c65e9c719b79174177e3cb17bf57d69c66fb WHIRLPOOL 7646b9a29bf02831f4b04b33af3ff3d8c89315b95a6d87d6d047684cd6a2c5c0ab065a38b1804bdc54a3cb0868a7ac1e25a11b682e1b9b4de933cd5a3f32e8db
+MISC ChangeLog 3620 SHA256 8ca0c7a6318cf7284a60b2b8ee661d2103de01cce78f7579456c2cfe5a2be274 SHA512 3aa00d07499400ec26aa86b2667d041a82a8e457802e99d1c461a3271b83e956dd261dc227fc823071a0e68e7bc405aa8281523c43140eaa539e94107c506d22 WHIRLPOOL 086f846701d9e4d37b476a4ddca5c7ca669a7351e98b661cd7dd6ca4a27cb563ae0e97e51b439f2d47c40e590ad91666c762ddea4c3383dd5d65e76f577a3236
+MISC ChangeLog-2015 742 SHA256 086ab774130690e497e57a05a089f2552b01b1ce82c84f8962e9bedda1ea42ef SHA512 5360437f9a165e772ad44a4269551e6af3782ee06feea8e8a8593311adee7de7732d2b034305639726e28a9883a889282df528454d4677d32a05e740821b2b9c WHIRLPOOL 896935dda1c80cf1b48d3c94eeaff11143be4478409b7ab9b01ce82ba5d86a20f2a79bd25e80ad6462810981898f274f1accf83e4928eb2192aabcf72722a83f
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/wsdl4j/Manifest
new file mode 100644
index 000000000000..58874858ca0a
--- /dev/null
+++ b/dev-java/wsdl4j/Manifest
@@ -0,0 +1,7 @@
+AUX 1.6.2-tests-sandbox.patch 548 SHA256 eb4ba587bb3d9125e2982ebbb02add25aacc84d8a795b33f21baae164860dbc3 SHA512 bed0bcf00856309d8f628d4a41774a112bd26c651e9fdfa00af3113d780f430e6b50213fe0f743b486aafb78f11cdd924c4dd8eef64300715a8e88c64c11368b WHIRLPOOL 891b539cc38a4142a71ee594ab214776c45c8b632130cf03ec7302c632f704b91922fd0c5f1708dabd2b22827f7dd89fbb2ea6e43cf942a7023efa7806401bf3
+DIST jwsdltck-bin-1.2.zip 599377 SHA256 e4bd4987a2b437d5d7b0a302165c882db2fe5eed80cbdb5329cb0eaea5b42abb SHA512 a8f86d9895c588d752d266413e77c2a8db241e9cf9c199909f2e9d1d1b3b1b03eaa6b5841c62b0e7a7c779089eb6721797fdb4f2db841789a6a19884bd48711b WHIRLPOOL 764d6adea86aa93b656a38bb8245f44ee21c78795f7828246f31cd9c4db13eff84e0883d2aaa248fddda6a9e170d7d851960eb4a129c837e26c3709704fb7b02
+DIST wsdl4j-src-1.6.2.zip 172400 SHA256 9fe77f4a71700d005b185049d90c6430d1de50f058485b1b45f0efd767b5fa25 SHA512 55d0b8eb6a08cecd4a48223a9f29fe6ed0e00ec4dca99f44a04882efdba448601bb7dadcaa347e32e3ff5bb9e3334503d6666ca2a6276c7bb48b80acea57b751 WHIRLPOOL ff0c6e51e0a880f26ba02b9647fe5c033d69a12baa26d4f211f3951b886431f5bfd06c9533c0a6b7e970cb7870a1607a23a51f57e1cb5c21f4798e10756cecad
+EBUILD wsdl4j-1.6.2.ebuild 1381 SHA256 5d6f4b2a836b37647b597ef9625d04bae2167dad96881fc1edf245e5d34ccf8d SHA512 b1f58c256f08867fcb121d87465b85360e1bf3df8b9b9a9a326dabbda3f37f084ebddf1f7d394199b9ed261221d9968221b1d95c9c05ae807022318d8725289b WHIRLPOOL d4800752b5d3a00804fa92c18cf25eb38584be384a04df9a12f827e79dce2b29bd2c087a9fb56ffbac0b72a3df777aff403c07de3c562e44a26dc7e40363374f
+MISC ChangeLog 2595 SHA256 fee5d31f61ae68471da592fef9e7ffc4224d07d6a5924295d465faec44acd9a5 SHA512 8bf9e1031f4c03d7b0d41ea34993bd0453c94e5daf3ce6427fddbb97284ca8dd86bb1f0e5151d13d4ee421a79f9a2cbbf5220ff230f2c942c838f1de3ab5de90 WHIRLPOOL 9ecaa8ee9cdef3d7eda2109d20979ecfaab17c5df786f943057f117f25c29601d782bb69dd7899e1f0645e7451b803b9c7a60bd94a1d447d926969874198409f
+MISC ChangeLog-2015 3249 SHA256 da8e27048742a80db43c0c2614192d6b2f03ef1fcc3574760eebb281ad254100 SHA512 5c038206876a3dcf19ce8eb2df0585f7bd28f6ac4f77442b415d4c83bf1b8146640a32149b21492331add10e1921b87d2ffd33bdc8038f5c68b6c1c6ad3d8181 WHIRLPOOL d50f4b0fd6e493ab192711ba18588325705a834fdd16fde507ef6e4709fa5d4752a8ce626ebbd85b5bf64d0eceff02a606fde2367ebc942640f7191f2c4051d9
+MISC metadata.xml 314 SHA256 b026ac1202bffd0308416d7b45e36dd2c00cb8acb19ba27c3389252a9e6ea7e0 SHA512 2d7d312851cbed77b5a2156bb5d157f8f8fe911ef9c4eb16b645ca4b17892a7d70a02a9d07f8c36fb92a285717c68718e798d37eb140f2391e4ab828a60110fa WHIRLPOOL bd3236e38e5bc68944801c34f984bbd3e5959f22920e6f28130e9e6b0a60828a7ec074891515588c7007609639f413ac905c9eb1153d08c12be72b1a05c16c0b
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..2f661e8a0a81
--- /dev/null
+++ b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86-fbsd"
+
+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/Manifest b/dev-java/wstx/Manifest
new file mode 100644
index 000000000000..f38413f6963d
--- /dev/null
+++ b/dev-java/wstx/Manifest
@@ -0,0 +1,6 @@
+AUX wstx-3.2.9-build.xml.patch 389 SHA256 ecd57e3042b3b930296b1f75da02a4192c9c009b54fd55a70d61e09ffc17303c SHA512 e9fb8f3c81957970b9b2fb73bdeb8d3b91d1fe30712829aa3dfa2efc3b0be5b97f0a3b668c99570d5d6ebd1893d0dfd11d8f1961af700a8ff4826ce3250ffcb5 WHIRLPOOL 332ecfb0861273b163c5688ac5b55537c64fa0fe9f0520bd140acebcb1902e3005a65f69542a01bd772e25bf629b87f40bed130105aef819a9393036f9d27650
+DIST wstx-src-3.2.9.zip 2218419 SHA256 b0f8489bbd1c5fdba8d39228686d75e18185e3052c887f7329bb9d313f9356c1 SHA512 316679a6586e453b85ffe4dd573a92019282b0d2028e931f33fafa8b0f3aef856c8326c72049ce42645e4b520bbd1bd91e74005f090dc22dc7ca7c76a0640117 WHIRLPOOL d1ee4b5eb3bb3de7e4ed3bd3cec72d0fe9cf068673d7c7702f28c61ab36d33e6ebe94e9e885a2530e50fd92d73c004339ad8a59bf0ac564d836af75225b05a79
+EBUILD wstx-3.2.9-r1.ebuild 1223 SHA256 f5ea5440b62c2c0767c8f96a881e54a9734ac10a8d939367b4344163bd24c487 SHA512 e2808aac94bf465fc0041189edd97fc61e9a4039046fe27efbcd4684d8003e50c4910e348123e0ae2fed403feb4220370b05c6f5c2751a8dd0398103a6a53c2f WHIRLPOOL e97fd4f1331075e78e186a33f87897a7fa0d9c1140126692b4cc5c9f720aab8e54a424b6585d1d921857ba9b146575018d9a2370f5f9b2d7fce2d71a78bf7ec1
+MISC ChangeLog 4110 SHA256 17bf5be112aefc9fbad9fd3a450b01e5596b510534de020f69af3e8163512152 SHA512 105014e6423de39104f772ff4d1a1fe7bdf33dbb8462c013440670887675fe4fd58f50736e1a343c233109103c00b5ed040e1aa7f22d90dbf347d4de288c5ae2 WHIRLPOOL 4ecae70c9a77fef37f5715e94c98ce1006c505da335afc47adb4d2d6cc3481a8c01902ac7cbf74b71e998c50f4204f48b4a5856a40444d85d540ecde733d171d
+MISC ChangeLog-2015 1435 SHA256 4d27f3e33a24cf982234574d84f53fe981c675c06f663decc587e59496a962a6 SHA512 872ee01c363d3ad73c9c54beedbfe74d56905986198ae5b9480bf01c97f4df6579df6cb27cb5a0df855fc01c889f2bb5c929c2711aaee263a3a419221ad1a956 WHIRLPOOL 2eb4e47f661f38afd03bcf3700c2778b1438bd4f79b4c2d5cd39b37c6d00e6bcebb0c1e7b68110882b446c931ef517b7b0d4d2fbf4e7860f6401a0c14f38ec71
+MISC metadata.xml 720 SHA256 3bbcc08a061c2fdaa5053b388d0c16c7c3c4603a307f669f6a9ff7071bdc4055 SHA512 2b344558dd286e45ab5950877dcd9cec180fb917cdd1b6d6e9e11a7f316e03f8891d18229816aaf1162e63c008eff16181239fd84a838299d22dee2b7cfabd55 WHIRLPOOL 365e686760e6c9c5a635623cd04b6eff77a7891cb399572f6b1733d7c12b74ff3c5c5c2035db984668b7a99e249f3feac6fd6612a806c3709ef7e6390febb752
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..7f5b37c18711
--- /dev/null
+++ b/dev-java/wstx/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="person">
+		<email>mike@weisso.com</email>
+		<name>Mike Weissman</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 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-serializer/Manifest b/dev-java/xalan-serializer/Manifest
new file mode 100644
index 000000000000..937fbdebd580
--- /dev/null
+++ b/dev-java/xalan-serializer/Manifest
@@ -0,0 +1,5 @@
+DIST xalan-j_2_7_2-src.tar.gz 8416261 SHA256 5c184ad2984973cc19783c7f9339c28a210cca724b25b0d706f1e310627adb98 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8 WHIRLPOOL 388545a97f230183c91896738bef3f9ae8bbf2beb24f02bece79a8e76351b8c2f16edf83fd6084896262cdfbc412a550695579c4b3b4a07d17714eb26a94fbb0
+EBUILD xalan-serializer-2.7.2.ebuild 1209 SHA256 e698c7473fcc9abf9fec4fa71b50ddd52fd9323295a9d52315a508e37fa02d65 SHA512 ff27eed7dfa82877cffa795a3fab8f36262bcbd5c8589fa61903fa639f9a5b2a78c113f63bfe278ebd3e512157185ecb95e0f78852947f9ebbc5dae822f228e5 WHIRLPOOL ef693e1619966762f574058f9c75bc54e190eec95edebbf73e0be305332593cc9a4135ebe9941448d6c7abae255b970d874448e26cb7ede9ded9f1146fa54765
+MISC ChangeLog 2603 SHA256 e75f54a7514e5c1e81f17f233ee516d63ac06476a3e1afee22b64a27d34fc517 SHA512 178768674a8fabf94183fb700ac500d071e5710a9f9b3f583478cd627696aff062bb8128c1d163f3d7f58fa9a6ed828057b153282dee579da05500f8e71be09a WHIRLPOOL 036e08199cd7e770bea7aa22d520a40897c1ca4319a499e58bf878c0fc77312d1e4421b5a7607c8d6ab260f1614d6ad6d2a77053f938277e45de2939e6267fe5
+MISC ChangeLog-2015 2976 SHA256 de3f5a50b8618f6b3f71a46b522af222a790064d13bcf8c845d530f1f1e0b2be SHA512 b3373fe2c412ab636a9c7d627e8c602f34d76a0b97262327a6ba8949f3b06793d8dd6e4b7c8b2d458fb5ce61f9de2042a9e7535b0f276023103a3e3063651391 WHIRLPOOL 80d8e89c04321dd468e4ae857be263c41e77756fd1a3ef6f9f34dac63a70943856350371562764cc95829c393a1f40640ab09943beca60f492b723e547091545
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..491f657f50a4
--- /dev/null
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.2.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"
+
+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-fbsd ~x86-fbsd ~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..771b0d3f9ddd
--- /dev/null
+++ b/dev-java/xalan/Manifest
@@ -0,0 +1,6 @@
+DIST xalan-j_2_7_2-bin.zip 17740075 SHA256 6d20d522c2a7f5ee8baa65d43934a47a4aaadd604b9020275c76030df171aae5 SHA512 ae2be0bfc5e794b159c2d16718275a6ce6e8f63d681e2d13875f233d334a37aba872206c6c1f70565698ceaf4c66261c7df6db6c524e6e8da5dafe2f17cefddf WHIRLPOOL 8a4265e305b49526eddb71e522f2b5d1a64580d44915f920bf8be29fa48fd436a518229c01339c2f34bb92f6e9076d9050809f04485ded16eafd69b8f7b93095
+DIST xalan-j_2_7_2-src.tar.gz 8416261 SHA256 5c184ad2984973cc19783c7f9339c28a210cca724b25b0d706f1e310627adb98 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8 WHIRLPOOL 388545a97f230183c91896738bef3f9ae8bbf2beb24f02bece79a8e76351b8c2f16edf83fd6084896262cdfbc412a550695579c4b3b4a07d17714eb26a94fbb0
+EBUILD xalan-2.7.2.ebuild 1855 SHA256 2dd519851e53d00a2d455d70a190184b64fa9cd9d42b219f06472de0515b4da5 SHA512 a8621bcad246f85f541b58264845a021feb075df74834c5be2baf6efeb59a03c671d96d5d6f31d527ffa2c1313212f181ee6005c60a2a3bdff86e3a9da2f056a WHIRLPOOL 80703dee386ba030fa8e5793f3bf0bc1cf00e84901bd8be0f7e6fd5893b41181cf0aeba73dfb9f9ec73fb213e610a0788068cba26d39c8a638e85830d268fa60
+MISC ChangeLog 2557 SHA256 91026962a2b8531b51531e68d0a04fab1135e71e35922677db00d12d6393adec SHA512 c3cb97a678ab532701e6caccc6253c400c64f67b61bdbf95bb2b2599374e34343a3ed5ee2cb044a3d2697021b40be31a91fbb3417a2e42a868c1972246866b10 WHIRLPOOL 013641f8b2773514d201bdf8ee1e9b424c8ebb24927a6c9326163228bd5d5fd0b797486b88ea3c7e735848a153ba192d32820c1841b534c75902208fac9ce375
+MISC ChangeLog-2015 13939 SHA256 ccd01de58d140853e157885d5c114227d815be64ac9b49d7e0a093ed26c5d9de SHA512 699576a4f08194ca8b8d352fe5904b35998348d0b2988589b83e20bf7e33bef27f6c89ffd375968c4b8dfc1254137fbdb829e3d6f922e15d1efba87d7e144d85 WHIRLPOOL 79cd90101da296a4a735b6009bf43e54c2e34653b7de48cc1d834eb4cf63e4ba5f89b126e297038cb39fad9a4fc932c358dfafdfda452936dd4d87a23d5f0c56
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..7bfef0809066
--- /dev/null
+++ b/dev-java/xalan/xalan-2.7.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/xerces/Manifest
new file mode 100644
index 000000000000..a81dabca42f9
--- /dev/null
+++ b/dev-java/xerces/Manifest
@@ -0,0 +1,7 @@
+AUX xerces-2.11.0-build.xml.patch 1685 SHA256 2e9232cb69a47c2f5cdf3220f0a04e554d22312c1eeab875e0467a63fa4ec45e SHA512 e0b1b195104d65e12a25fb6f6a39e8de5f91b1c258b8cca18fae781802e20fe0cdfe4049968ef7411a2f18aad3ac562f655dbb57b62b5b502ef8ee3a1f3f7db7 WHIRLPOOL 20683961c012fe72278a8e048d6308e631e394678ec579fe3453943f9d1ac87fc9ea1ee31390d8d6e2f472cd3ff985fa1d6b06ae5757766e5a4841411ec93fb9
+DIST Xerces-J-src.2.11.0.tar.gz 1792762 SHA256 f59a5ef7b51bd883f2e9bda37a9360692e6c5e439b98d9b6ac1953e1f98b0680 SHA512 de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411 WHIRLPOOL 891a1a04dd781c3dd4c01f295679b069dca9ae7126b3a4e3ab0e9da8ae6bd00e62e97b606acb233d3cd7b0da21012a6aa4f8339b42d26e251440d01057d24973
+EBUILD xerces-2.11.0-r1.ebuild 1528 SHA256 c355c6487c13da551819b57307b36d75221c9639207804a266d44c2beee2eaf8 SHA512 d5b7a351bc08e75185fca0f63298887906642b09e57172e41e7ddad0f001954ff8029c7366416b40a8a71d48d7e2e15324b276c0a2176e7db3eed33c7a158027 WHIRLPOOL ff58f8f97d2e1e3df39371bff9087861a1a7789c3f5a182e144959525c748e4ea660e3bb3c5670a3c71584528cc832bcb2026584408397a22642e03813408935
+EBUILD xerces-2.11.0.ebuild 1668 SHA256 704f39ec09fdeeee705ad55a5b80ffb2dcf0a403b3774af392d5c2b146984dc2 SHA512 0168c64bb8b9b6186f5e2ac45ca3c49c8ff774fad5f2bbed13ce37dd96cb30312eb967c83f9d635a52f18fb3a523999922e4599cc479a5fbb8ac08551697fd59 WHIRLPOOL 662c3dc6629f7ebd765f96ab543c61fde6409617b6f0412d3d1a363083d652d72bd0c2af6a820a7e0edcc3cdc421c50b5b598dba6385c670de2e8cad1335b103
+MISC ChangeLog 3568 SHA256 0a4a955b02fdb53affba0e0e7c4beb13cc5d8e2e9a0a8aba641c1d0ab8916388 SHA512 9399aaa6ef2ca28bd0f99c083b7e7f60219b93cf9419917c7edf492b2da690ef29ab3764821bd7fc7ba6808aab03f766d1b95c00bd4e6ec0fae7da3ef09bebb2 WHIRLPOOL c0ce17462230848cf9de2936b99dd013270d9795aea7e612e371d9bac8c64f04189cb1b3d7c78e93e446685a8deabbf379a795c6f36530aca5fd7685b2f4c179
+MISC ChangeLog-2015 18839 SHA256 eb7b7263b1febc86c4f37eab448bd369be07d8637cab9849638ee3438ae805a2 SHA512 4ce4804e4ba1b7b6c304245a22d2bc2b07ce5658ac280e5d20159c145e85c77d6de26ece26f690a38d6781e14f6a627fc844c136c2bef4ce7f5aa5a31547f0d0 WHIRLPOOL 9f810257be4e25df3bac74d9b60076a8efc765c5935113deed544cfcee3b8701c47344a57e8b6b13172399eb381588a1461b70014f30e80e86cf8e341876399d
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..005197c35e05
--- /dev/null
+++ b/dev-java/xerces/xerces-2.11.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/xerial-core/Manifest
new file mode 100644
index 000000000000..d14c121a1b09
--- /dev/null
+++ b/dev-java/xerial-core/Manifest
@@ -0,0 +1,6 @@
+AUX 2.0.1-build.xml 5674 SHA256 e1b0add0886ed01ff0223d4eb639adaf7e959dc88d41bfd10488e86d176ee530 SHA512 fe6cae55b06099f1718fe2d2b70f680b3549c20047884f879d4fcdc7f8765d4b18a5f8b80478b09913013958834f2602ded4e0b9580db96467d89b1bd5c23650 WHIRLPOOL e450d91abd978a4e76b846dc9fd7aba5cc62aa8892f6a47a0baae98ce729ea54e206eaecf2eef7b1b3235d050de04faf410834f2cf6944591f70c7122ccd0d4e
+DIST xerial-core-2.0.1.tar.bz2 519709 SHA256 18fc5948ef4007edeb8c373c4b28057f08aa20a3514ed257cf592ee8db7437a1 SHA512 39236e8a653301a6899ce80d3240d505e91f0cfc8878fa1a698113d06f3af3fd7adef540d72da1c0e1fb7101542c43e92fb9388243d95c3185a561532c18c6fb WHIRLPOOL 860729ac4badeff692f603cd6d0e31b21e3876833c9f6c9d4a31e0c9bd95e7ccef0c924477cf0fdf525877625ef24f66b3fe6183c484381d577bd4a56aa602e6
+EBUILD xerial-core-2.0.1.ebuild 924 SHA256 46bb832e0d2fd54730d861f385362ceac6aae86b301316084121f0590be281b5 SHA512 1d0e2abac6e6733e1992ea76d87788e489654af275849e4e78a5bfd5bf29fa9ea5f845b82684a39421b4ab4d9332f49140093fc5e7da89570bc42f94b7cf997f WHIRLPOOL 04d7a2c156e080f0610e49e233022e2b5ad436e130f06d40a20ba732327b253b6acbbac567d4da7962abf05eb65114e08580ce37ac2093ac36dca4a1f6c4739a
+MISC ChangeLog 3082 SHA256 ce69bfd36def9308d1299dbfb2c9fa5f817828a242863ea074933528d139b60b SHA512 3a3b46f61b70dbeac6cea731011a856ef9922c109dc29e78b692bfec9937f4b7c16c833eef03bc01e2afb42a7672418d5271782411360ab16ff593c1d669a67f WHIRLPOOL 394d97d6efeeef78fbee6737781120463e38f1146e3a719625ffc1d824db8488f08ff8756f394a37faec65aa24b42e1b710c633852297f0b42f654cab4f0831d
+MISC ChangeLog-2015 431 SHA256 efd213b4a10efd1553044c169095f6867a9ce0a5940fdd36b52e82bd6a9bd286 SHA512 996944e878b39b9058309ddb3647304e4274f6e929ad1015a7fcf0909dcacc211590887224c9ad5ed3fd5972bb57e98e0d03b4ae4cc8f2da6b864d2a4f54d6a1 WHIRLPOOL 821f0d5ea0cb3cde670af44cf53f34334247695194d6fe25fa8c1e2afa69d4c288b97770492f106246ead80063348571ce2741b6d3b1c57e4068b00340985a49
+MISC metadata.xml 312 SHA256 89af95a65d4a4110b0f2b8b84ff155ec80e2e8fe3b46e0fcac8c237722e7ade4 SHA512 d05fc7f764fdac881ed3354826a38146c9b9ab49a383a76045b1abfd415ea2973fbe37e450312db2822e020c744d8d5ad0281124db6b2d712ab01acb0dbbbd16 WHIRLPOOL a2b93debef64ade403b3e0d61160eddcd9cd8b4c2dc7f957b42a8a16451215e258f641efec854721656ee7a3ac28a6aa684eab30734bcba9cf783bd175d45d4f
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/Manifest b/dev-java/xjavac/Manifest
new file mode 100644
index 000000000000..658187437e79
--- /dev/null
+++ b/dev-java/xjavac/Manifest
@@ -0,0 +1,8 @@
+AUX xjavac-20041208-build.xml 1088 SHA256 efed4720ae40840e8c8715c6925dc9fe54100202e7a710fd3998062d81e4e81b SHA512 5ed5cfe711a4666d2db2dbe91ba8ac0d1dc9e95cf5be82891382632db6e4a250775aabbd38111134d82a09fa9d7d81efead52256e7511a726144689e1e389469 WHIRLPOOL 6ad03f8e32068438ad26333a67ee58023b2e2a4186873147244e58479f8eb899fb317e06e8aa78cacfa9962cabb059843b84d8c6690729495e1b6ec8a2797c5c
+DIST xjavac-2.4.0.tar.gz 2472 SHA256 82b0c4f59ab32d342c0011f443019dcc2a90797d2217e424a4eb5b5b264d0463 SHA512 6a12c605f6f455f20981214d1ce8ed752070ae2b268e9279692a3b05921c84857636055d9c4d7b1de92bafbaa4b528f36983dc2eca0ca883a7fa340320e503a0 WHIRLPOOL ef99442cb1687685260e4e0be68e849442ea55065a8ee8f9a342b46a81a6001eb4210454772df14fb9909f2b35b8c489bf50f8ac1a7cebc6facb5f4c88aed0fe
+DIST xjavac-20110814.tar.gz 2217 SHA256 b26f1bacb391cc5f38d6ec99113fba86eeda1c50d2e86bef165d979869af2275 SHA512 f4c5aa437d135a8495c926387df68df8f47878e206ea8f279a7c3e8e32561dbac5a8c8002f77a2bf03863f42475cad5068e3c1031121b64b32fb4d15242c3b3e WHIRLPOOL f75fbf242c629f3e1833ebbd41b073d5d93dc064ba3aba020cc8ac30fcdc015a4959fe46db94da896025f8b39cef6548a040f48f2421df15f18f72d9b7a356d6
+EBUILD xjavac-2.4.0.ebuild 687 SHA256 b027ad8c0b8f8fceefe5c3d80ce5d9b546b116e0db97cf8c0cd4bca9fd0ad6fc SHA512 6b52646e16234ee987ece0ca0e2aa84790fbba7749c2f45106ad4eea9cb3186ed32c6a1c34c1ad9c762829cdb844e582b570a7fc6de687263c98f618c14b1f34 WHIRLPOOL 536d753785148160615065eb08a259c157400d6392f347e4dbdeae866abb1a210248c6e488d3beeebd254420bdeb7457b6e59562dfeb1327c3883df3a68268fc
+EBUILD xjavac-20110814.ebuild 974 SHA256 d42da9466b2619f586a0371a2616f5cb38986e0cf79cf2a588dc94ced2210946 SHA512 2f944d2c21ae10a46e8d8780383d2e7dc5043dbd631aa0ef2b8c9d77df703ef71efa2978088ede40209744b6b2e2774df09de1d9b29e6d1091b1cd4ea267ec31 WHIRLPOOL ee5b819361da49c3203a34bdd903a4712bd0de604eeee760b36df3efdc0a1c7cb194af3738fbe79ae43a7aec6ba4cabcf20e82ddaf049c957dd243e9088a50cd
+MISC ChangeLog 2604 SHA256 32382fd2aaca6a85b655e23befe20be9b9036000c29dfbfbdab764438fba2a83 SHA512 478c4a87792324e68dac5af526d251b9c6b9420d54c6e0574bf47b1ae4cb8cb87d8db89ff14aa544de95e480534f0d4b41ccfdb46d7952761f88d004cfe95e00 WHIRLPOOL eb30af8dbff07b524787cff09ab40924da183825bc4ca284db2d2da9e35d40ed99408c4e0b6ef0d1260a4c5409cca21c2a93b9a7542f033f7aa2ac0b670a12f4
+MISC ChangeLog-2015 6296 SHA256 a0437cf39e0ab2710cdadc8674a9306a65a22195ad1e7335b23fcc34e11718d2 SHA512 acc07255200ac4cf472818fbd7de3adc39de67b3bbcd00d694f1ffb5cb4b74bec93515a84c531a1f784b9d9bfddfb681a8db2f31bb0a10a49495398c59cf3415 WHIRLPOOL 9768068e0ac434a9cf3e5abc6cb8087693fdcc882dc02fbe005b81061a03dc4373e46936bc8f3581181a1f7d2612d3b89445c4d5722958e532385c91edcd9db3
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..a2928dde6b81
--- /dev/null
+++ b/dev-java/xjavac/xjavac-2.4.0.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="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-fbsd ~x86-fbsd ~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..5a55a02f7b9d
--- /dev/null
+++ b/dev-java/xjavac/xjavac-20110814.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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-external/Manifest b/dev-java/xml-commons-external/Manifest
new file mode 100644
index 000000000000..425095479acb
--- /dev/null
+++ b/dev-java/xml-commons-external/Manifest
@@ -0,0 +1,9 @@
+DIST xml-commons-external-1.3.04.tar.bz2 659665 SHA256 4fde2dbe7707ebcec2b10f4d0214f6f30f608ab6c62b7833e183177ed6dd4dc8 SHA512 8bc71a0850e751ae4a5057833d57b2235734facbae43c733b0a9d86e5be99af016b737f12f5566c736f71374a709dee9954089db8fbeff4fb4cbb236a9fd6abb WHIRLPOOL df6004b449cae74d8e81c079c29bd2f9fed58df2ed65e488094c59c4cd687245a4b0bb6576874535ef61d7228c1e70e418518e0cf9387aa1e068584346751b3f
+DIST xml-commons-external-1.4.01.jar 656529 SHA256 5db8b94589e334283e01075458cfae920995e37ab997cb3b475fd0667b3158b2 SHA512 f00773eec613453d0e1b7b0857b01c51d1926079f38e172953c4ef0350f063439acc8b5967f947c8d15a73e5d53e8887c3bf30122d5f7c553bcef349e5a8cb9a WHIRLPOOL e6b2690218e5ed0dd8794acefe28b0b1b7f099725a65ccd01c36f06dd717ea2d5f3e6f35ae757060dce4974486fc75e9082cfc449ec7a44ff72705895743c5ce
+DIST xml-commons-external-1.4.01.tar.bz2 683486 SHA256 37adf00788ea7716062ef86c2bf61d46eed4dfb71f0f7e4be1117ab6d47bf305 SHA512 fe22afb25e17b69a5416025ea812348af83474c26dcf88613ebc7b5f1288af9a73428b3f70544907afae4ba9dacb2aa7b8e5e2375d0aa712fe9d4e672d2e02db WHIRLPOOL 3d15e8dab2b966521f01b40b7a34c638f27ec7a9c256bd52b8804376f1f33425c5d5994cbb332201f8e739bcdef6662f9decd26ce7d31e6655132598465b8589
+EBUILD xml-commons-external-1.3.04.ebuild 1166 SHA256 13fb507693d1c9da47aae1db85c588bfe606296e27fb08fc827377bd73072ce9 SHA512 f5e30b83901055987f0285b6f68afe230fa9d9b55cb79c6f0bb4d5ba3edf1eea40c774606e3330c37a519188a2fc018f56b6f913605d2a0063efb898431ba925 WHIRLPOOL 0743915986f71783d1b880f86dfad2f8bc68681a8ba9f9402addeae284224fc82c359d17f7a7dd5bfca5cb62458eced5e57045ebc3dcf68e5ab6e0f544e5a51e
+EBUILD xml-commons-external-1.4.01-r1.ebuild 785 SHA256 1ea65364d8fe05e2446956e06c6afcfb74a8df8398d3748e7c3100263f4474d3 SHA512 8bd2c3ca5961f7424f14f8e36a6b0ac947f9aa0a3413996454d80dd1b51361fa5daa7fcb6737590c8fe1e6d69ae8a4b07c9e69bc8d460758f5107fe2ca43cedb WHIRLPOOL 118f1b3ecd130d1acf9b54c3cc68f573cb13c289e02cc97522a2ec9d4d31225bfef11f21251e8f64867a818c5ef97fafebebf511c83283074664149227af4be0
+EBUILD xml-commons-external-1.4.01.ebuild 1200 SHA256 5830c45ce7a03beb81bfa4cc10432a3f6df9fd433e3f0fd5c479e811441e7fc0 SHA512 638edb9a0cbe856d47c5bae56e63f93bf586f0550c4e2f90c7f5f8a8c138aa986bfc4f70e86d2ec6c3656de2583331b812e285e4ff2c75209bd88d80603e0359 WHIRLPOOL f6345f786604326d4bc810152fb908f76233c65913afaa76d180c14dbc9fedc7ba617d2ae6ca9d58bbdc44c553ab226a365cdd2f0ad4f95fd7ab7d6e535b513b
+MISC ChangeLog 3191 SHA256 fc7c8fbd33478a17fe6406e8f8dc8f22ddaf0ef996099fad391e689e5162ad42 SHA512 6520a6a06e82e9e6b7cae025a6a4a097005e89645112862e96413d84da0de94a60c7911ae6329ef381f6d9a796095795605a5d6d9a6f96594dcbd6b34c37ac0b WHIRLPOOL 0a8cae47dbbbd3bf4a2e00a819feceff779d450505fb23437fc49efe3ad967e2de50af7b486506d76f483d6336352474e66442fd9eafb557b15279064cfa2d51
+MISC ChangeLog-2015 5671 SHA256 fc74eaec9bdd83fe02b6ae19e54058cf5be3aea3c9fb89c36e8cdb8e051314f7 SHA512 6b3445f89c5f7ff96069dd9582b7fd945d30e60b25b26a93ecb674c0a95a2ad2582d99c67af5429845a69a30bc86ef5ba1886efe3dc6bd4282ecffe47afbdeb4 WHIRLPOOL 6fdd14553553042fb915b7ad6674ea3316053d087cabf9aacf58353f1aa7c8e3bbc64d894d2d63676464ae91894ecd6a37961da5e8b9c19daa69510bd56e402f
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..fbfdc64ec8f0
--- /dev/null
+++ b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-fbsd ~x86-fbsd ~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..e8f2637a960f
--- /dev/null
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-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 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-fbsd ~x86-fbsd ~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-external/xml-commons-external-1.4.01.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
new file mode 100644
index 000000000000..5ac7fc5228ee
--- /dev/null
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01.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="Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP"
+HOMEPAGE="http://xml.apache.org/commons/"
+SRC_URI="https://dev.gentoo.org/~sera/distfiles/${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/xerces/xml-commons/tags/xml-commons-external-1_4_01/java/external xml-commons-external-1.4.01
+# tar cjf xml-commons-external-1.4.01.tar.bz2 xml-commons-external-1.4.01
+
+LICENSE="Apache-2.0"
+SLOT="1.4"
+KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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.*
+
+	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-resolver/Manifest b/dev-java/xml-commons-resolver/Manifest
new file mode 100644
index 000000000000..7c7689362430
--- /dev/null
+++ b/dev-java/xml-commons-resolver/Manifest
@@ -0,0 +1,5 @@
+DIST xml-commons-resolver-1.2.tar.gz 262701 SHA256 55dbe7bd56452c175320ce9a97b752252c5537427221323c72e9b9c1ac221efe SHA512 0c91057da3198fc488c7b2c20afb029aa4441ad979159c378d532b02caa294d27e730ae2f9857062af5e3815a603a6110c5441dd3fe6b36c342a78beac3c8a6f WHIRLPOOL 37308ea9d08a0bfa5fccd666283786e7bce78532b97b00964f8f994572ea38b7e60d91c9209dac8ce9c88e723905e8b305ca74e8b3b5aedfca9683c9583995f2
+EBUILD xml-commons-resolver-1.2-r1.ebuild 841 SHA256 350974a43bd248e56ae44c51d823f5ad73aa37d032a69929cc50f8e8db2821f1 SHA512 fa44d9f2324f1557e577d3a8fde1827e4c4cf413cbb24b7be8a040daa97f233fd5b2fbf8290761dc92b344667bea6b2c4ee849e181084a66a777818c23c16a74 WHIRLPOOL 8ca912326f412f331907f33c5aa4f31b8120171abc617f3237462c2d26afe8fb2bae53eecfb061932f86862867fb5d0fd6dfc6b40d4cc5c27a97cc2265e473f8
+MISC ChangeLog 2613 SHA256 c693acf414460e035da3687da54ae5b079a9c4410138760f6a246a1ee29ac61f SHA512 67cc2f7a37bc2e09866188b79bfef9dc2da773eb68f91d30fee1fa5ddf65ebc26308abe1d1217d9f18b424d07a16c5e6afa34c08785020a732c6862efde6fdbe WHIRLPOOL c00371184a6e5f0639c4f3fb8ccf98b5ae8452150f996cbeeb167d8129e019fe651945cc758011ac860ab27baa707d94d049bb05e6f3be91e4310d6b15552746
+MISC ChangeLog-2015 5372 SHA256 40e900bc7cb4d58686944b8df6512a9b7df4f39e920d32ffb408edd0f12d6a01 SHA512 1dccf0cc353ffee6974c1f12cd35bd1e3fb37770e2e8ff022e8b2991969334dd1c57ea441db9e5d21ea6ec6acaaf428b2007762080094777616bb9fbda49761c WHIRLPOOL 9f38a636937fa2249ad278cf6d96035f84876824957c7550d605aad2f89c3ce6b96842137b6c90629e29f0f7652b572afae4fb9e53696347e1db3c5bab97c422
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..37722277ad12
--- /dev/null
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-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="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-fbsd ~x86-fbsd ~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..ba7f85f40e0c
--- /dev/null
+++ b/dev-java/xml-commons/Manifest
@@ -0,0 +1,5 @@
+DIST xml-commons-1.4.01.tar.gz 358779 SHA256 d34bd88dc89c5c1ed2545ec5c61e4606fc28beb200a6fecf8c3ed17694181866 SHA512 9e8f77f7dc65a492548fa2313b49855ad0880fe663acdac865a1b235ea3bc0ba347c4fad3ca16f0c92a60df42a0a802a74525b56ea58dc575cd2d94013561868 WHIRLPOOL 58cd1152ad822562b15f3e1e62559137dbeabb13a1635c33eba0c162974c799384cf937859fea06f62ea9b7bfb102e6cbb71489269b4bdae0097c2783e920fc8
+EBUILD xml-commons-1.4.01.ebuild 591 SHA256 981d56b4576320f645bc3b5377385f8d5e1ec251bd582f13fa66e80aa3aacb94 SHA512 dacbcd0cfa5c10d4f178af51188281add62475e3bb02acd213f00bb346747eb83ef4392430b3846c9f1c51e261f37dce168b479252a37a43f3e14152955386fd WHIRLPOOL 678facc9691f77af285681e0d76055d8e6c044dfff871c2457ff268c47f3f92582d53753e94be040c7597a782524cb29884aa6830216782ce266afbe48a3b97a
+MISC ChangeLog 3833 SHA256 c37b9c7502116a921e2397681f639b577d4f349b8cb76fed75fa01013f8f3b7a SHA512 30737ddbf8a436e27ccb447cea12057ecbf73f2886a865c7d659a1f87ea9a2a3a16eb0366b6512b1bd4d49bef8acaf91e1d43451b35668560c56ffbbb13807c8 WHIRLPOOL 0b947af28da8cb8b73b345135f3edced8a2b39f49d30d285805a544fce239f324d3ac4abefa5ccd1cf5024df3ab7630d2b13be4a7461cb4c6900fb55874caaa2
+MISC ChangeLog-2015 3113 SHA256 d984ece49870f07f83290bb431924435d10fd88c0520c6c98f105964b3bccc37 SHA512 c68cf90c88c26370bc0fa8c451f9568d2332a247973d2927714b7f584b3ea4f507c1769fc12aa9563fb706c62f0e07629ace9a0d7d5bcab79d23bbb29fb83ec9 WHIRLPOOL 532e0474b4887945f67f90bf34d760c31ae62630c84d813d303c3d06bb20cab1ecb0efd0a226d8e3697cc49b4cc2d36e2f0c12246b3fa4354f709f97e3d79080
+MISC metadata.xml 649 SHA256 1cce2bdab6d10126df1d0888e9857bce89354f9801c3d2260ed2b2ca036671a4 SHA512 32e372bb6920a9b2a534f69962e4c27e67ec7ee6305474608223c26bfec5cb6df5dcb4d094816b1305772d1f8a80b583ee2a387a80eb3bd9ad5a5e1a9a552632 WHIRLPOOL d1528b95e4c7c81ebb91551ead7bb184b67880015c418cfa8e666b2e909124324241b1f024bc93cc1548521536b3d5a6d8ba7c1b317353b1b9ed0518ebd1639d
diff --git a/dev-java/xml-commons/metadata.xml b/dev-java/xml-commons/metadata.xml
new file mode 100644
index 000000000000..7931bd4ad40e
--- /dev/null
+++ b/dev-java/xml-commons/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>
+
+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/Manifest b/dev-java/xml-security/Manifest
new file mode 100644
index 000000000000..caeb37c29e31
--- /dev/null
+++ b/dev-java/xml-security/Manifest
@@ -0,0 +1,6 @@
+AUX 1.5.7-build.xml.patch 1124 SHA256 8bba6fdc933f53dfa32e862c4ac8cdfd1c14b78215a48400ca86d9513e1917c5 SHA512 9fd53bf8efde00c0602b007e5d54d00c923432357eb56c727f6f09845a43557b8b168704842e206ac5c78d6718bfd8f3629ee808b6e08e9f18e3097aa7f099e1 WHIRLPOOL 910d8ae3e232ff3cb4db93437550acc2cd50f471b16e4a8ac64164a1a2f51063413d432801990d21e6d0fec4a4be163abcc6a69eeeb44df03ab94fc21e8836db
+DIST xml-security-bin-1_5_7.zip 9164667 SHA256 37e31a3f80da74efddc5aabc9515366741aa68dfa3f71e903c0a870dec871011 SHA512 ae8e538fe7c90013a89d139358efc06d8921b1b0050a686dcacd123f5a8a8f100be163e88fef59998ea0ba27ebe9855f06d1f33b1ac92fa3f31acbce9934bd36 WHIRLPOOL faa1cd472b013a69ca38505806630aa423706a9a95f83a8bdd98813c8fc870875def6cf5c5157b1409280c362fb4070a8b9822c981bd8bc49b5a3688ccfd1b70
+EBUILD xml-security-1.5.7-r1.ebuild 1527 SHA256 627f3faba862fffcab2e61466c1b8dd2ac72ef7dcde45546e8a2c31f8bebcf14 SHA512 bcf0de359de308d8988e7c5911eb0975cb95eeb566c4803b4c1ffd45b35a3b92cf82168b41022feb76b42dbddc91fb5b1b45326f949a70063052c1d38433d33a WHIRLPOOL 564853a7a7289ee6ca3dafbaf648b75ffb820e45839406f1be30a640d6d68781cffbed63cb70aac26a43b0d43f96ac4df2640afdee73c4220dc98deb191ddb11
+MISC ChangeLog 3104 SHA256 8ecb643bd8e282b85016936cda1c25e457496b403a7dd9584f41cce31a87db2f SHA512 14f5ffff85b2ac22ea166890885dab738c320544ed21a174e741b87203026c0439787e6a04f7e8da0819e5271a6b02c7fd6e368370cb020eb88ea1decbb31a7f WHIRLPOOL f1403538b9994ec3bb99cad2b11e15ce90a3dc8ec2e0e977fbad6dd226d54c89efff459c4b28ba49323a80d9c0930486304ba59a61a90f11ca3508d6b5d66f82
+MISC ChangeLog-2015 426 SHA256 2d618d043f25b8b3bd59eb206ac5565f5da1bd529be21e12c84aae4e92504e82 SHA512 bd6f136cde9a27054acc9e5919b23395dc3fe9815a98c20aacce39180fb1ee9bc001e87fbc5ccc8972d64dac5b6852cd4e2335737a8824633cb2bd46e600e8e8 WHIRLPOOL f296d66e267d4cabdff8e5a425281347b1b1101754ce8247242af22f0bdc44dae18d9c19d3eca1e76de57311d1ad03788e06dea1e755272a55d0dad19f09c5f9
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/xml-writer/Manifest
new file mode 100644
index 000000000000..2979b67ccfdb
--- /dev/null
+++ b/dev-java/xml-writer/Manifest
@@ -0,0 +1,5 @@
+DIST xml-writer-0.2.zip 51666 SHA256 bbc839398d678b8ae7519c2525771b49920159720222e60afc4e3c8010426298 SHA512 6097d3515b0b6b06710c0913dbd378b2008a485d28000f7397151464747f0156f7e427efd33a8d0f43494b6c3d80470207fcbc742b338f3adec7d4d0f3a2b6d5 WHIRLPOOL add94d00872a7b5d30724eca5f94d437d36e71bc4f7280c81f4a4165657a2359e4ee5713218e6b83b20ef405450e93ed5de9c6656043ab49d67bb101b4f39b1d
+EBUILD xml-writer-0.2-r1.ebuild 652 SHA256 c2c78420cbd94402c7c0adfb5ba6e499ab5fadd9de2e3f90448590f8edafac8b SHA512 964df4000c73f96791d2eee136bf1cb19988651a774b72076e11008d005c9dbbc0854b6d9ccf2e26d3205ef0878791b94ebbb03861e7337ac5082b541f56ea79 WHIRLPOOL 4fd54e3ff403c7ee796564b2374ce900c2393baa538941cd86ed7482375a471a6b31581180c42c7d959e0574cf45c9183521ee1d47411e4fa679050e808677be
+MISC ChangeLog 3115 SHA256 e1107efe104226af3ae9878e9c3b779def94b4a0a773b526c92289fcff747de0 SHA512 c480dfbf947b86f56e64200113ea3778dc66fe4756e2ffa3cbfef4ee187577ba66458e889837299a3fa5852025216cd3fa17deaddea0c693aad9c22f22315d23 WHIRLPOOL 18998fe39a7b11cf21ecbd483cd9ea2997990b63ff4e24d99d416bc061557f5124cadc303d95fffb810b8915a332e24e19153e6be8c0c353a732c3ff437be0be
+MISC ChangeLog-2015 949 SHA256 97482f13d032ddd950f42867213b9d142b8e75a49e3626b2ce9672dc0ae7d8da SHA512 5fe5f876ad8678adaa130d1a863711667343cce06a4ba66d71cb6f1f9a302381bcf838617238e2808abd04c5c0f04cbd575136430c448c5705f2d6bd2c8a487d WHIRLPOOL 7b23b5df0798f251f5c4de828fe62dba1a245afc563138dab9127aa457745201bb6012e77464f7ed6dd8cf8a8e41c13e5e9c04ee5fd642350900c30d8bb4c6d3
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/xml-xmlbeans/Manifest
new file mode 100644
index 000000000000..e83beb0fb83f
--- /dev/null
+++ b/dev-java/xml-xmlbeans/Manifest
@@ -0,0 +1,9 @@
+AUX xml-xmlbeans-2.6.0-SchemaCompiler.java.patch 802 SHA256 520c834a6cb4a1f01954e0027d619ecb3b917f314056ccd49762ef563588d88b SHA512 24ff76b5c046ac1e1837e75f7a3becbb64acf5966f584215e99d1b0f47a3ac5465ae53746d97ad8246f352452db7722e6135e95b660fda1d02010c4ec87a88ea WHIRLPOOL 06d4d38d5eeff0d46ec0a4ac95b78edacfbca00acef9b1e7fdf3ba1aa8a2e39718cb9e2bb805b9c27402d6fbfbf2cebfeeb9065f3cc633137bacd60584c1c1dd
+AUX xml-xmlbeans-2.6.0-jam.patch 3594 SHA256 440288ae1446735835c8a86607854d8c0025ee369db8601360ca4107e4a8e2f8 SHA512 e105cbd5efa08f80685d506dc22a6e9a1ef29df78cd6ca64f3de1a70a7ea93dad4e51f93ee38fcf73a823f01fe50981c4693d619fdad67cdd481279f64ad4a5c WHIRLPOOL 19a7adfc0a4af24c483dd6ca40546ee7dc8ba1ea32dbd87682a90a811879ee8afc5eb88104e64a0eaf74d7d3b51feacd70866150f9cbc5971de489779515f20d
+AUX xml-xmlbeans-2.6.0-piccolo.patch 776 SHA256 059abe55f5503db3ce678915afcb160ad1a048ee22e93c3d2904151575388c64 SHA512 e32ac926cae60ff5d10e0647988c3dcfea986a9b0cab9667dd3c73bad6b49fb74585350022b43e24dbc30fef09d87823210e9dc38e830486145924904431e6be WHIRLPOOL 21b650ea7278414c07ffbc293c94129dd1ea570f0c7e3d774e940b4802ba596335f1a3f18e2774f73d408ebe51b82e5f4a80a2ab02b711421dcc65defc7838b0
+AUX xml-xmlbeans-2.6.0-remove-jamsupport.patch 1656 SHA256 35c4f2166821d92927609357e391c8fdd1b897a7ec2eb33988ea3d7f70f854f4 SHA512 54b570f2960340eecf4368caeaf5d7c84ece7e691bda7460532d5d778e78a6b41a7e776de02b53fa5d5385f66639353758d76d710c1c3e2332ceb2854b9c84fe WHIRLPOOL a67e0a8e0a3428e440ca71ba80632db14910e4580da3747c3063f22b2eda4dd29df7d473fd14f834efcb8ecfccd3d2a0cf6e57050879c9fd957c265e9b0e27ad
+DIST xmlbeans-2.6.0-src.zip 9005098 SHA256 3dff52b0854236adbbff9dc76722372415cd9a8f406f6133886a6c5228595390 SHA512 162dc3d283ebf9f7fae823a2ae8d835b708c2cbeed48349c85996e60b2b8dfe0e51b17bd37eb34327c6452b2c0fc7df8a4902816b145993e36ca614ceb43b2b7 WHIRLPOOL cd775fa268e56aa02d744be67012d807e1cebf978d453610b48a8ca865f8d1587f27ced161d622d5d6ae0badab80de80ee4b46b7bf3bb753f69242c20d1e03d5
+EBUILD xml-xmlbeans-2.6.0.ebuild 2339 SHA256 46ec5cdcc4ad16a2215f5d56c54e5d95cc8e7059b973e555cffc84615aac2d0b SHA512 4a8a0c89c1c537cd9b6a30bb526761f2b06c95d80442397293c05be145e37f8989ce57ce397757c13f780610e3a989ba0f44e7673f6586a34ce36051e83324a2 WHIRLPOOL b77da55b77072e2f4a934ad2a84cd55433e2f32148297f1ff4283ef5c4ae5d2c636e3291f1a70fc7acbfc044bf151fad9a234708be9f8428e853513558f38af3
+MISC ChangeLog 4517 SHA256 dfacc50aa931b8a311dd4a168d47ac6ab7d0a23a3974d9c0b169da5921e26294 SHA512 b7f4b9d0e2ef5edb4de84f9080e3447b3a5b94b8cd75d7395350ae64ec08f4e21719314d44e50fc807bfcd22d8356d3b3091dc78a5ff3715237c9097417f35ae WHIRLPOOL 220d4b7b7376f5f73edf7709325b166df10cdb945fa2928aaf1b3d4a1c70d487fdb6dc5e926b42bf2f839d0031730765f70ad8c1736868f89251c2da32b9cc11
+MISC ChangeLog-2015 5494 SHA256 00a56b968bb8c51ed1abf8e38a883b6557287b6193c86ef1e889f8ac4714f318 SHA512 a5fcf5daacd35ec34d8e4153e0db26b9c9ed24691208b942cddc01a167445cdc747a0d3bb25abfc972ef8135bf0b54a487e49311379a2b6c882f4a4036f70d08 WHIRLPOOL 33fa849feb73878927c7eee45cd5dc0cb41b34bd284ff23c61d29bf7b8e6cbcf16dec670ed171434b8645f648ac3cd2d3f0a587c6412e217486c1a34cd37e84d
+MISC metadata.xml 1185 SHA256 3d6bd9ddd12baf7f87ec65c8fdcbb3fcdcd9e82676a604eb234c20d0ad1afed7 SHA512 5f4554c860fb8b6b2bcf0b7cb8b0f8f147c187091cd64597aede3a3543570f586eb3c0fa4d69e2e2391bd5e839bb8ab089d05a05099554d206691c120c9321ff WHIRLPOOL 926af6cf1dadc2e735ad3b754bc4c4462add861834d6d4ecf1c2ca3752d4f8bc7e9c5a13d086ed76e0dfd829e4bf47f9541bd6d138a332f1db15e382b5035cb1
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/Manifest b/dev-java/xmldb/Manifest
new file mode 100644
index 000000000000..905ad3c067fe
--- /dev/null
+++ b/dev-java/xmldb/Manifest
@@ -0,0 +1,7 @@
+AUX xmldb-20011111-enum.patch 618 SHA256 69afc365d37ab93e66419d12cd4b4cb41458c041f96ddfba48530232133d0b9a SHA512 5c9649f72dfdcdc054f11fdfd055b46e1b0d84949cedb1c29a8beafd05056c3a0206a38e3f022dfa83262f9a4a85b0cded7e3c899e207f51b31dc47cd2f0246f WHIRLPOOL 3d7379f58c2ddbfa4c6156db81e545071bddf3029c4db809c422f3447a696c841cadbc48d4ce97cadb45b5c05a248925b10a0e6e398f710dc71611dee695a2ed
+AUX xmldb-20011111-unreachable.patch 301 SHA256 799a6caa3fa8288fd9360c678d30d0015a51815ea32353918ea92367366b4f32 SHA512 5cb8ee4323596b427fd15a1c0764ebdf377c7acc5a2111c17dc24b826965d61f4e576885dcceca600eb5dd850cee9a98c48f4b3fe5272f7f9d4558834e451786 WHIRLPOOL dd4b204b491841e2927f409c3f97b9ba06eba9df038f9caf1df6e7f15b9982eb2baac96582f9f8e5f4e61b9fc33c1c56241ca1a13fd059f07d3b29497e8c4c58
+DIST xmldb-api-11112001.tar.gz 36553 SHA256 9bf195503b6ce45d17e1953041c125602bc69e3f6812a031055d26ca558d1006 SHA512 20123801a57b5350ade4dc82aba5ba2492cfbbe2e0389aaba4b73cdd3a8d07981a895ec2318885358102e48644cdaa30a18996ab9315891e506506fbc25658a2 WHIRLPOOL b96742f2da55b3330c5554c103b9998a69138a71050e9b48b71926df2b41dc92c3449b9f75843e9ba03b16cd480d23b6d2db1d56b29ae39b55a062836047e014
+EBUILD xmldb-20011111-r2.ebuild 980 SHA256 cf1e4e69ede934eb2647f722e93468d9c91a3c157c26361e88ecf59f22d27029 SHA512 58eb339a42cd6e5ec413e4ffd826444862a54be859cd02fd5da816a8bfcfb85d93934a297ac25b7b5cb2fd3860912055ad17fbdd0fb49f855f23eaa69018cc42 WHIRLPOOL bda630dba4533e50a5cb0538ae0c412705f3d6b6d01695601c893b8f647f5450cc582376c605bb303e14a969c2a2eb3e6727468a079176a9f17abc756fae010d
+MISC ChangeLog 2761 SHA256 09f71611e994517f281185644b6442842b15cd5889080eef8932a7f788229e99 SHA512 0cf67060aa84aba538c46860d09a78de7a57d29c1d682c0a49683088507d369b9f316a2d96a78fed35c6ae0cd19f2169275e545349d7cc0f04d9d68c024a21e5 WHIRLPOOL e8b2a1acf7fcec8a255b6582d9cb4b7660c4f563945f1d19787c8f9f2eb6bf491dee33ca3f5e13baa63105058f7bb038d5db551fcb32ab0ad75e4a2d4707a85c
+MISC ChangeLog-2015 4569 SHA256 5c83d5a41f595cc3bff6541f67db486c15a5ecd36a7be249e3d07f29f09c8c08 SHA512 8771864adf1fe9461558c70d328bca70c25b333b8ac5d65b38c29318c3d11f29ff9effbdf4bf5a2f81a0c334d411363ba1f5b9a2c6b65e61057fb1e2e9670177 WHIRLPOOL 0da4610b4c14771f1d7fd76c24f7089db1370f33c00e284a2852ea2b6d6a073e2dff2fb609e0b0c34391fb01f8bbabb89678ed59f416cd847b4fdf1ff147fd16
+MISC metadata.xml 594 SHA256 6ba193f01c14e7bbdb6ca4edb67c2ddaa6b99a3d5482e70092080e2994a2e683 SHA512 7ef7cbbdfb0678d0cb201cf9d941ef1c539b7141b7378e9e3dbb80caddbfe27b04ec63c0e1b775760f1a46a6c66c606183d0c83eb9d6d5f086017c9ff9cd7bab WHIRLPOOL 8d92ee4581032c78269e8167b33d71b330c40af9318315b42b80d7e3d18f957ea9b3c037bb67bd1e2b3fb710a004a8b1ff2f1cc9cc821c44b7a5c967b12a4de0
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..23f0175616e3
--- /dev/null
+++ b/dev-java/xmldb/xmldb-20011111-r2.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-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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/xmlgraphics-commons/Manifest
new file mode 100644
index 000000000000..61659f4e09bb
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -0,0 +1,5 @@
+DIST xmlgraphics-commons-2.0.1-src.tar.gz 2716982 SHA256 41938d4b27cb80b0ef9a240164e2137e51708d2f481488e5ae8c4e43c8da311c SHA512 fca5c593ceec18b040a0a57b74ba5377d5e070030f48b7835285986382795b19072bdf6320fd7e37182e4127883b795249ee1cb4255bcdfb1b00da1cf6032018 WHIRLPOOL 81554e5eab606378af8a536a3a630bf3ba041609d16b8fa49a41361d701658aec3131a3947b53341b4f99145f6701a4125b8e38b1a802eca5a16c8bfd5984e36
+EBUILD xmlgraphics-commons-2.0.1.ebuild 1260 SHA256 fdcab937db25ab963a1d4384c0d786d8910a18b8b24099577a2a5159d211cc44 SHA512 1e8525b43fcb755c1a0aa7f7e4342f37611f4084c98bef6156d577a741b4256fad1d6c8e9a4ebe51ebccf791ca7c483825875f13dfab677764cac758a334668a WHIRLPOOL 23ec1a80577e7bb523e3e8736ba0e9df5280e24bb5a62f92f522788930e37939a7b8869a03eda60b744fcf9fcb5e29628db3866fb2eaa95414e1bb593a038bfd
+MISC ChangeLog 2615 SHA256 4ed0de47c2408f36278f8ea47eaad3d3dbb3d78d2bafcecdc84661fa3113bb72 SHA512 364b83ae28dc6f372e3b0f0c06e7f93aa5605bc783871f21a18ed17201bce41ae6495186d76ecb65a9a1d3721f128c85548c3d691b7cd8f619a281a0865b2b8d WHIRLPOOL 3c4d914484f636060c08fff045c08d4ac10f899589923cdeda3eb079ba754b01fc8d9e41948bcab17202698fa556733e0eb59f25ed3a265db894f5f66649a849
+MISC ChangeLog-2015 5491 SHA256 d8aa144526159228dfbc7b14e88d3c6d02d5c963b5bb251a227a9745f6eddf74 SHA512 1999edf7ee32dd0e3feea37b6d8f56f04bcbc3dbc0e5688216d79adf91f6aa242f44ae782732b426a30b0ca4c401666275abb35260d797037423833be661493c WHIRLPOOL d255dafe5466a3998de9c37228165439ad13123190f83ae2f98dfa50c3a483786b07ea44095073a809762651430304c595377819ff752e3ec2e64fdb7fb0b14a
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
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..aff11d2b9c04
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.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 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="http://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/Manifest b/dev-java/xmlrpc/Manifest
new file mode 100644
index 000000000000..feda482322ec
--- /dev/null
+++ b/dev-java/xmlrpc/Manifest
@@ -0,0 +1,6 @@
+DIST apache-xmlrpc-3.1.3-src.tar.bz2 134788 SHA256 648a4ea5a5228408ea32e3efe184261b4c07ebc10fc0a4533e3969c0543dd70f SHA512 6ace33922604b9ee48ce578a5988252ae288fe37c303f98757ab283854f97a8c21b01103fe87ca5eb21ce8c04ffcc5bbf2b0328726348bfb2d43cb29d7b5c5af WHIRLPOOL 017ae57d61faa358caf313cb1ee4dc14d71762f20cbe48048eedbbb2bfa7f99a492525756bc66c0b084142e170a27355079b5334a9fcff6472c7c7bfa9068918
+DIST xmlrpc-3.1.3-build.tar.gz 3133 SHA256 12343e33da90cc73c7536d146d58cfcf1f5247a6d12f9cab4ef0affc89930e83 SHA512 e1613c21a8145994f88ab68c3e64503f6217bb962249a08055f5c24257c0aa3adeb868710c65842c64e2a3e9e1d52dd614a30454be027eb1a939b6f0fc966b57 WHIRLPOOL 632c7f864df9edd9aa7ad55851c64e2f7e48ad2c2adb6e2d42b99d0c0da4b5a57675760389779e6898773f9cb4a38816fc063af28876476db63f68c2eb0a7b17
+EBUILD xmlrpc-3.1.3.ebuild 1603 SHA256 6f53dbf330fcc7b1a278a71cb31ec4131bdfe9834338d9b98f6fa4d3e6b29367 SHA512 7e0656bcb29436c558b25c08557c4074bce1e12fada529933b58335ae8d42980222e25967c20aa11095b9f864095312454bc50a7d4d8acc0c9e6131fc1c636ae WHIRLPOOL a739e046ec141650ba2229c0a0e1f09ef691b40a79a8bc3eabc54f25125f68fabeccd758cd78a2437e92e40adc2c74c6c9991bafaceafef0d0bd98f2ed7030a2
+MISC ChangeLog 2761 SHA256 d1a1edc2a7982a8e37f1cccc45dfe742728a58663a3f3f0d3cabc11ff36a0d2e SHA512 9b07dea3b5364f5600293e6c72509fe07e2e68b76acab9bbf3fc31d905d7afdb5c4d3e70e29496ebb26335caf7580ca2fbb42139316a6c859297480a400d08f9 WHIRLPOOL be37ab92a0275950ee9bca37015f759cd6a9d16437f524be1707b014d2cae22fb778005d113b53f8dca33062a8f731af5a635d147732eb3a7097405a3cb0d64a
+MISC ChangeLog-2015 3202 SHA256 4d42c36045409d9f31bf782852efec55f9561d0476e8f35acc9e232205edc202 SHA512 b9a5f25bd54980fa4fbc7c4f2fe67e5eba4a0a1f4cf757e7e89784f447a2dbc5598af7d4d3d78631165ea1f7233f21bdb2df3d6df2c8940703616bcd6ab93f45 WHIRLPOOL 2ac1a84894eee2c2efc9c197a1f0bdf960b738755b71d688005c6e7073e250e446a0b3d6c51cbcaa345e355d85182638b4226d14ac8d369b8ead1bc1cb3cae41
+MISC metadata.xml 443 SHA256 75d01fb623122150a145096a9e67110c1d4ad135d13f5be2fb91ce4267396871 SHA512 82f3e6900e581cf20196b589d8948c2204ba57d569709196f9e535b61a39342e7515f4fd36847b119c46d398d8c416697ed46ed9199a5549c2b22e9f51a2d368 WHIRLPOOL 6d3a1cf7c1381e01afbfc4fd84c8b578618359ad61cfd7907159d05ea4132dd788eb5d7fe953a70cdf1be1d2bac753b2c9ea01c9adb5c3769f39e936b934bfc3
diff --git a/dev-java/xmlrpc/metadata.xml b/dev-java/xmlrpc/metadata.xml
new file mode 100644
index 000000000000..0f98dc1259cc
--- /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/Manifest b/dev-java/xmlstreambuffer/Manifest
new file mode 100644
index 000000000000..2d2fe98f89c1
--- /dev/null
+++ b/dev-java/xmlstreambuffer/Manifest
@@ -0,0 +1,5 @@
+DIST streambuffer-1.5.3-sources.jar 63319 SHA256 c4f2363062517c3ffe008f238db93af8c17f67116aa570327c49c57cb0569edf SHA512 5f906af01bc2a796efb8f3221c60da3faf20c2a695d0d86afcc1439857ce55a90ecd9df6853b3717e28736c02524e05735770300eecbe83ba58c217c9da92740 WHIRLPOOL 097c95f81d23d7e5ac5ec27db6973c47747745124c35c6c6a7ebb3cb12249f3c87d4930b3ce3d8c1c912ca02d9de3ee24d959860b708ed4382d9070982e620a1
+EBUILD xmlstreambuffer-1.5.3.ebuild 658 SHA256 cb33c8ce84b0a2c1ec6f173b18c769f780f40fb8fffeabb76bdb2f52162d2bd4 SHA512 b6d39cc06677483d8df56cd587bfb0320f9fae1ed0cba66fff27a33c6ab854967fb91d089502e36eec9d9a3fdb662b4af9641f6f6eb6c7d49b27fba4d3657b97 WHIRLPOOL f7ea61ea9d3193591e162a825d3ad1de807c237a03dde6f4a45d648ea4421fb4ec0b3d13d0c933dfa69444555f862651527b277ec8345b68d8d74fe7d9d5d91f
+MISC ChangeLog 2599 SHA256 36e0f04db24efa7cc05a5c27fd87933a0f93d3cf21f1465742dc17da73e3dc2f SHA512 502b3fb24abcb522aed2ef3eeca2731e1ee4e0ad67791d12bdc9f26ea8a3f513326674b4da22f6b1463bd8bd443c74e83e20441d9898432dfa30d4c4bf3b696a WHIRLPOOL 67bbcb84badb961551a2f02405282429e1818bc70bfd6d97d5fcab9bae3661742a6324ed237cdea5225bb35f6ec069246696655eea1045689be49199ef25cfe2
+MISC ChangeLog-2015 2957 SHA256 9908c1a983bee615bb4af3fa349707b57113a9f25832588ded6cae0cb6e3c6d6 SHA512 f4f931174dc1895c5b975573f543d6431f3526bb27afeeaa476cf77b0623e014fac3f6dea55e3d73b2025ec3ae63766311a0efdb09048dc287eb09145a08fb0d WHIRLPOOL 501bc4dadc50ee94a58b3bd69d480a9e23c3e3ac1adc1511766fb73a6405f1a1a4d029bd43c33ed546814522ed7491efabd33bcabe0c9378fb62553aa4a830ae
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/xmlunit/Manifest
new file mode 100644
index 000000000000..80e8c70b0664
--- /dev/null
+++ b/dev-java/xmlunit/Manifest
@@ -0,0 +1,5 @@
+DIST xmlunit-1.6-src.zip 830899 SHA256 d3aeb0c9737c1184e7c70bb1f8eb986dc449c03f09f6d3c65406d51a7f879c8c SHA512 a7d15905d959ab5bfeb1807c80eab3e0aa58d501a2136335961da842b9571b95b4aab18189e9a21e59afac960ea83f9a2d32e3af398f63c0f839587b60b9f96b WHIRLPOOL 0cd507e5564e7d426385bcffb6cc0305a13fcf7e70699994789d23c5a91c0c0bb52c79b372eb5e07e37e08b791aa71b8cea1ccc801f2153d5af9793c1c3a8cec
+EBUILD xmlunit-1.6.ebuild 1107 SHA256 97a4b700432697d27b6ffac7a5a6f6a9aca4065b60b9d582354879878df63bc1 SHA512 4b64d565a8eb4315bc27b8d960e103488ee203c6518ad0662d96f963f1a5f5ae201a31a8e028e4026573c793e278553d20fda1d9cae74a4fe72948f6bbf20b2e WHIRLPOOL 98b5c923e68d156d7c0b4ff7cb14db185b679b39630c318f82e39b4a819078712e252c73b0056e73fad398bdf464b3dae8dbf14753b3cb0918feded20a927927
+MISC ChangeLog 2559 SHA256 980845fdf4bcb26f0913102c5bd85b8f28c65c11a2256225727bb58c9e92ec5a SHA512 dd310c6c3a412e7fbf5f4a0669288d6e539ac32eb56af037f0e08da28f803ac3ddaee952d4c090e8fc22357565409029b0661589917bc7cf59a5d579796401d0 WHIRLPOOL 3c1caffdd670031ef45df37bcb33bde3384d1fd431aa4d9f322001f3117f657f52f43206788c67166f90ffc125b07af85b8454938273aa35ccdac9649016678a
+MISC ChangeLog-2015 3921 SHA256 af12802953dc17bb7e5dab460ea63428eba37f766ecaec24b3c6ea23f7f1760d SHA512 30a89cea2a5b7b594f268589446cf6ac2d679ebc64abbfb47c80382f371bd03bb98c45508956af8903a9c60a08c55b78945e17ae462b0a1da16d62021bd2c50c WHIRLPOOL 224dff96551e3dd74704b65697efd3755341fe9e7e3379cc0cb6766949612ced737610d12ed493156f928ca55d47189ae1b3492214c5e3d1ede65fdf977fbe7b
+MISC metadata.xml 313 SHA256 43afbe91c30227ea22113723328342cc17cd4a47119272d643f8d78896f8fc6d SHA512 385494ac2513d58cfbbd905478df522a330e0b84afe4f35871d360c6ebcd099537c2a0fda301ea10dfed80bddcf57324325f3821442713dc85153de8b1e163c9 WHIRLPOOL 3c70ed9e21a332fba09b63a167f4b845ae1947544e378650a069f70db858e970bca07cd0fcf419129894f53dc4be84e4466f9e1b014341b949efcc5ceb73d30d
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..a42ae29d3a59
--- /dev/null
+++ b/dev-java/xmlunit/xmlunit-1.6.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 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-trax: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-trax"
+EANT_EXTRA_ARGS="-Ddb5.xsl=/usr/share/sgml/docbook/xsl-stylesheets"
+
+src_test() {
+	ANT_TASKS="ant-junit ant-trax" 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/Manifest b/dev-java/xmpcore/Manifest
new file mode 100644
index 000000000000..a2f9c0864022
--- /dev/null
+++ b/dev-java/xmpcore/Manifest
@@ -0,0 +1,4 @@
+DIST xmpcore-5.1.2-sources.jar 136918 SHA256 3f2f5dd6c983ac574f9bf721ae0eacf888bc26eb40a8650b231d06f29d05ee75 SHA512 ad4c78a68f1d32a358b79bfb4acacbcc56eaa294af5afbb29eb916a1a488dba547e72c4d94809222fae63fd7c66940d9ce7cb6c06598f9c7b8691d0feaabdad8 WHIRLPOOL c2d39305158f10476e9986bcf16f75ca36852c6654a1ce00aae7f273972801cd585bc604c7d7f0ae1404b700572ee10460e909ef6005302d9cbf70d89ecb3fb5
+EBUILD xmpcore-5.1.2.ebuild 498 SHA256 cc451a286ce8c328a74c9853426186c05ad761f9ac238c57f39e0d36d8830d76 SHA512 b37fd248eea48c4fef539d412a66b65775cbb590b2fa8b321440a0dfd24cb42a572f40f90ebbfbd0edd8d5f159f490ec51a003195bb1705c1a0cbaad80b12fd8 WHIRLPOOL 7628cd32fe88f547feb041f74807b0ad92bf2a26ca5dcf11c9774ec5bfb2a9e6af528f27930ad3f65765c729060b6a322475c45cdd98b11d617366aeb7e27e09
+MISC ChangeLog 558 SHA256 2e9a63606695622a355bbaa920663e1b72fd9b9dbc2a157ccef5fc89b9d981ac SHA512 27393bfafc41a92afd9434c1d87975c7edd016ffbeb5b20d82e29b2d0f5dfd2669c6402e62b8e376ecdc4e4c4e7c5a4a2281ae828b5b939224e5b245ad51e279 WHIRLPOOL 3c0370e7efebb3262df23236ae7b7fa1f409123fda71280beeb703a4b51f403bbcbe0804803cea5f864dfd656db32f8f0469dda95f42083b06adb2d74ef98c1f
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..91da69eb8ff0
--- /dev/null
+++ b/dev-java/xmpcore/xmpcore-5.1.2.ebuild
@@ -0,0 +1,18 @@
+# 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 based on the Adobe C++ XMPCore library with a similar API"
+HOMEPAGE="http://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/Manifest b/dev-java/xom/Manifest
new file mode 100644
index 000000000000..2ad52a46f342
--- /dev/null
+++ b/dev-java/xom/Manifest
@@ -0,0 +1,8 @@
+AUX xom-1.2.6.patch 2096 SHA256 d3fb76a36a60b4d364f82f0ea0b87e449379721b71056b91f134067b9c93ce03 SHA512 7d864f9178a5fd846572a17eb345a74510e7a3880c203054d7156849c10c678421ed688965d821daafcff91888be9a485c5409937055a56139066aaa6d32aca0 WHIRLPOOL 1e759bd820c3a520763682e4249b8a087801032727abe3bcf2dbea247b43444e3d5d6018c2b2abc2566f259ea122bfdd14ce42a9849ec2bed8139ca063deadeb
+AUX xom-strip-fallback-parser.patch 690 SHA256 152c505a672526452599e8fd825ef6b89e0eba8a967b64b112509c78e9496d13 SHA512 e61defbc5c8da65561709be6431b0b15069759ec94de2f1f356d518b8b9d90a7ab1ccfd6db6148a3dbcc999b19c9607cd7586ef4c30f70e627968e726e953830 WHIRLPOOL 6672a31c92b27c0a70b006dee6575a6f8ee471580f2bb9abef613ebd3018a1fd80bb6a69b5508fa66b0e5ec1aab0096b94e072948c39730324c15ee9edc38de5
+DIST jaxen-1.1.6-src.tar.gz 204211 SHA256 812754aaff83efbf0d822e0014ba668599f2b519ab46fd7d4e5078eb3cc3c887 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309 WHIRLPOOL d1ac6b7c8fb35d61accc12a97f9d92a29df909d6a29e4a5957bf695a63c73bc0e74362efd9aa31a3fdb7891cbd5411175106fe5815895327d3b1f854721361a0
+DIST xom-1.2.10.tar.gz 11717279 SHA256 d8d58d26cba76f6f9e1a65ab537f759f662d1f4441e9a94b6687e23fdb76f879 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680 WHIRLPOOL a7186e0a3c913c13d3b28d07f48bb31db929bf8e514ecb10ddac519e2ce3187c067d5aa928d3316d98f34e944571d1f95bec174fd461cded273ebb8937bc218b
+EBUILD xom-1.2.10.ebuild 2190 SHA256 0cccd9357dee499902fbf20083ae7b4398fae1c788ce16d788c2a45c61a14572 SHA512 8c3cfd3bb4f18867e9a84ee9ed77ce37a7f99e2477c8d98731fbc914caed8827791d3a42f47942c722b0b9041383286083b0e3502a7c52162fc6d67c8d60c98a WHIRLPOOL 5c979c603a0b8765c406deead97752c5a6dd29bedf5c9bad50893ae21ceeb62cd4120a6a2ab3e73bd62b73d9e1f570090ce0b7630db1e0738afe4cd677aefd39
+MISC ChangeLog 2616 SHA256 30fbeb7e1d9ee19537a23b899989c407deb0ec935f44bc1129a72f60633fb2d0 SHA512 b3197fa0a2992fe27096c968a004684fc4950a196b439364ffa97acdaab1f5c78c6407cd6cc96acc2098278a70500285a43ea8a5a2f7867b6d84f36fc6cbe7b9 WHIRLPOOL ccaad261290cd42a02796d591ab46f614db79cee6d4ea3bd526c5a0c99a36a0296b6d6fb5da09c4422054c61c68b65e360005f3d0cc835c632b92ca5dddfb18a
+MISC ChangeLog-2015 9611 SHA256 e80fa924285c6dcf589c648e89eef2140096609ac380b1ceb3d076e2fa565d24 SHA512 8217ed8678d072c367cd93226efef5036204fa0043f7deac03efdb28797787984b71fb4b504563f5e05a713f9064c63a2c6bbff331467658c85933139e5f0a2d WHIRLPOOL 0f80848675c41aeeb057a624a15381aa00f5268283f22a34560639993fdee63bd589e678f25dd749e46192d60339b9629fa32385450449a3ec161eda099fd951
+MISC metadata.xml 407 SHA256 e353e44bcb3e013faa7fda4a6803ea55dd2532826fe20f1174eb18a922db9ae5 SHA512 4ec08597d54cbea6121f240565ff7b7ee614c370357b551bebd18d31749c1863e30bc8b7935caa00051f9946cc927cd34c1bad02be07eca40c89d2c6e0e7b2f6 WHIRLPOOL e25e21ab589e6b5f85aa6e2f9337c033c16ce4fb6dca0aca36451a3a11aadcaa0d7c4377196b317d719973e92a37648bf40e892c0e8f1dfee1454e480bcaa6ac
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..9c6d566bbd20
--- /dev/null
+++ b/dev-java/xom/xom-1.2.10.ebuild
@@ -0,0 +1,79 @@
+# 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
+
+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 ~x86-fbsd ~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/Manifest b/dev-java/xp/Manifest
new file mode 100644
index 000000000000..67fdfbc8e189
--- /dev/null
+++ b/dev-java/xp/Manifest
@@ -0,0 +1,6 @@
+AUX xp-0.5-fix-jdk-1.7-enum.patch 1320 SHA256 0175fb1eb3b55b5c445a331a68c92ad326ccc6cf908939a265c4d7e83b0d2eaf SHA512 37f9b6969edb07d8b824aabcf07b182f77cd0cdac1bec2e84133526fe48fc2cc5fc15d050ee16e7ab46def72a9d1fcb627d426049b258d2bf063feed9928ca14 WHIRLPOOL b83f3c750dcf2b7b48f3563312a804ee4c53738d7df2551c8903441184af1eaf7f83343d00af38bbc32eb2c1cb03a683a4523fa08203087983e8b8e61b2ea701
+DIST xp-0.5.zip 281324 SHA256 38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6 WHIRLPOOL 677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5
+EBUILD xp-0.5-r3.ebuild 591 SHA256 5dfe9e406ea8c1247a5ad5e6a451e4e3fe65a13b9a6185c1f1093d958a1ce609 SHA512 f144d37b576906b7533037b0b0226387319128119cc647cdf7aab06f386c6ad2e435bee0bf917bd16958ed36d2644913ebfd6e8be7f92df74359bed96385eedc WHIRLPOOL 20cfe9456f802e2d2d491f2cd70216198bbd2bc467a7420410563769cc6f0e4610744f395464d4db0cc12e4f2cf6ef7352eb4b0a19736896aaf1d138bd22dc31
+MISC ChangeLog 3119 SHA256 5e63fc915dae4a9f020bb2631bdfae8ed1d47386bb3521d56e3ff67e7d323c69 SHA512 525bb8ecb0080ad084424a681bfa87a5c64a0539fba23ac650ab53313b71b353f0d2cffe031c47719f09ab09249a4441065b0c32b88a291372d51fee95df7d59 WHIRLPOOL 4553dd5e54f16d5bc89bb99672fb7ab3444e6d7de29411e24ed0068d528be6a2bc27d55954969c687c8bcc92ada84d711b08c587572abc4fb1ffdbb1333a5356
+MISC ChangeLog-2015 2102 SHA256 85c1e98c95f9466a989272bdee1d2f2b7c7a367531fbfbc114e48c75e57c37c7 SHA512 a808bfa29ccf76ba6549f8539ac98740b4b8675da0b9b51efa620d8f893966517f39abc6e8d5bda4fa5a1ec60652124e8c450a30f58076642b805bfe989c6ab5 WHIRLPOOL d8be9ca099b5c1c595bb9383c2e75844251cbc6fadb03c150c867c256fd8ee0b37522d52c1c62ce6a6a7d29758b4301f0214f6c24db0fb7bcf98bec55d2eeb14
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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-r3.ebuild b/dev-java/xp/xp-0.5-r3.ebuild
new file mode 100644
index 000000000000..93637e006ad9
--- /dev/null
+++ b/dev-java/xp/xp-0.5-r3.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="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"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.6"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
+)
+
+java_prepare() {
+	java-pkg_clean
+	epatch "${PATCHES[@]}"
+}
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
new file mode 100644
index 000000000000..42bd1347ad21
--- /dev/null
+++ b/dev-java/xpp2/Manifest
@@ -0,0 +1,5 @@
+DIST PullParser2.1.10.tgz 2310288 SHA256 ad82569b809e29c19b8223feaa12923f97bb4bbc942ff985857f9d853db489cf SHA512 87a091e415a31cde27ca1193735743b60f516feb336a9a3577792636e54ab8d671a22e74eb8aa41268f6251c688c68fe92a28f735ec78b96b919909f80c59590 WHIRLPOOL 983aa4f0b062b46d756857c60d3a3e4dab6c7914571d1c23cfb61be230cead82c89c3c41576390c3f6d1d7066059411cf06e2c1eaf6bd4d265033da90403ce0e
+EBUILD xpp2-2.1.10-r2.ebuild 1740 SHA256 e2aee47239a59a64bc3e878926da3db38450a612fd2ac0c7d4e26f3b781d5b52 SHA512 48156f6ecdc714aab9c8d6f81d638556a56c485a05682cbbec767d452be27403fef9ef85af784b1102b54e0b467fbc607dfd19473b7de34ff5198c4ef39af85a WHIRLPOOL 14c19662f0216e7d78d28c13e8c0dc7aedb60116cc41296aff29e2ff99cfe5cebaf7fde0103a6b1d5319d6ffff65777afb22b02eb24c166b76473c7104d125ea
+MISC ChangeLog 2886 SHA256 d09ef02afd2e150bc76cb83f3c1134ebc13edad96839b95e51fcb813df35ca93 SHA512 a29c0d67c10b7ff23be8e9aac258b71de0cd2ee8188d90cfd164fc521bf43321fe94609988ca45e23d89b3d37126148c1dd7f8ac663f2eca95b1ff8b394939f0 WHIRLPOOL 80040c3965c37906db875a077d72b653c859b11e363ef545641745b3042c7d9c88cc14494755acda36d737ddddb760f9a19c689a54d7f8633d63221de9f59710
+MISC ChangeLog-2015 3892 SHA256 7da7de7f6197d3d9479e2aae59b5944445ec6ce72f429e3d57d54f3461f55ffe SHA512 675dc814052a88a0a45a967b834ac99fd5ad5f2e1dbccc3e95b65ea7fa8fe81e9f6b76f9b934d9d1ee2259033b1141c7700480089d2102054263975e63351fb3 WHIRLPOOL 595ff32c8c3291602b6c59579a238c7ba5de827c618f22974849ba49719ae26f405103e3cf4c1ddce0f88885facdfc19c46048bd826fdd0ba3aa2a12685e4197
+MISC metadata.xml 458 SHA256 4e624184eb7d3330f425ee5fd3ccb77eb8e37a8f15424a4f006a801515371bc4 SHA512 9004485c7ad032ec1f11aa89e7bc286f52d45f3886cca36912d12891f409d6d70cff063cf3790b7e05f4e280e1a953987dab155feecea461d5a3ff5cea0a430a WHIRLPOOL be71759304017f26e45fbfdf0edb8c72f3ec7355b6c4780df5261d2b50d2ef24d3d91ce9dae490b5d7f486cac178802ae5ae9a14e4d9e113ab6ef353d1411e4f
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..e1e47ec2c0ce
--- /dev/null
+++ b/dev-java/xpp2/xpp2-2.1.10-r2.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"
+
+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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/xpp3/Manifest
new file mode 100644
index 000000000000..e06ee6ca7c40
--- /dev/null
+++ b/dev-java/xpp3/Manifest
@@ -0,0 +1,6 @@
+DIST xpp3-1.1.4c.jar 128334 SHA256 113c8174cda963aa8c9e46f59945838dbe1a094cc736e476d640453e07d9e9c6 SHA512 743d2a0b20d16e97b640d9ad3e20e56a7446cdaf4ca0ebba072bdbe3eed0ef90289c2829376b4a209b35e0960adee5e01f11e8f361798333d8b4eaf4f1038445 WHIRLPOOL 9ac4437b500387abb597e35d2e95acd0140ab9fc6b272776ffee97a43a290b6ef855ef9f3ea2875cba0e451b76987c7a14328f9effa3923555f2ebecf61a34c0
+EBUILD xpp3-1.1.4c-r3.ebuild 701 SHA256 9ca333a184ab5126009b83dd67d0ffb27f61edab06f6ff926012bf585ec85478 SHA512 ae99292f917eff4f0259df08dc42b984ceed8ce086650bface98182019fb692b696e0017d35fd11fa9184567763c794ad8c49763addb5823dfb4637576f784c3 WHIRLPOOL 2477e648f23203aa66dfe9c1356abffb1803a13e82f128b5be8e55a182b9ff562af1bf39ddd0ff0a98f042767096d516c16217878e747d05c7010273f8113ccd
+EBUILD xpp3-1.1.4c-r4.ebuild 660 SHA256 d4818ff65567880c7fea2ac02abdf0e31f9814e3ec31710d86d3f1895ff698c7 SHA512 8f8e2d7aa6bac15babfdbbb2042f2be8ec3f86edf12008e14a09197612c305858bb7421e149961d91f8302cf9b89eb633523cee07fccd815a68a4be69583088a WHIRLPOOL 0a2f261c8b5ac4271f8553ae4cf17983a59bcf8adb34338923d995046042c0fd6e81cfcce5b705b48cbc04f0b8454e59c23a24d3d8719fa1b276538e908bd154
+MISC ChangeLog 3277 SHA256 c72a0809fa2b8ff14aa0de137c609136753099aa7eb555b19118dbad86a58f81 SHA512 aa85028c8044699144eef5d7ae0aed40352826d03d361bd34bb383bf937a0f16786532ec41e42c760eebb902ac8c9b155ef48573958232695ec05b22a44a01e9 WHIRLPOOL 74e5a53ce1d7da6d65f0ff2a2ad81095c9a29c644c3a723da8f5315e79d3011b9f3da27820e86df1f300c7073f961b71785eb4ce9d673fa92ea7194798379b72
+MISC ChangeLog-2015 4390 SHA256 4fae8d75ae3c33469d47474a5c6df6df2ce654946617ae6985dc951f4ee245fa SHA512 de972fe5fbc9049aac8bb45f35db571f0b1cfa1c256d6db76f24f5a44ac11f8a97ab47edada7dce4ef5976c83140eedb7b276c720d4b46009b7eacd161ce9a24 WHIRLPOOL 726bfc1b6858c7990004dd7bff42ea8e4ea95c91e9ec344f90adcb045f02f71df4587ba0ebe26e2b2d18ab2f7041b4af9d83525f5a427c3af568e23c920af7de
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..d9b779025671
--- /dev/null
+++ b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
@@ -0,0 +1,23 @@
+# 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="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-fbsd ~x86-fbsd ~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..883f01c94225
--- /dev/null
+++ b/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
@@ -0,0 +1,20 @@
+# 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="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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/xsdlib/Manifest
new file mode 100644
index 000000000000..856b60200d56
--- /dev/null
+++ b/dev-java/xsdlib/Manifest
@@ -0,0 +1,5 @@
+DIST xsdlib.20090415.zip 914126 SHA256 6da506ce95cd52b850b85b4b46f087f97fbc581f8a9046f33e35953223adba2a SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2 WHIRLPOOL de1e1f50ca92fe7f1011543e602a1134d821f4140c21fe6a9e047743b209976cccf882046bec760bfff3379f59dbab97e237fb044650f96af35fcffe380fa251
+EBUILD xsdlib-20090415.ebuild 1155 SHA256 4a0698e3168d1b5c85adfede039ea6365f721ce32bedab8906faa6f87f3e59e6 SHA512 bb86e411de133fa767e4da6bf12608977d32ead6e62889b31014f1f47495996401c912bfc423139054ae7e99622df870f00f3a3f9c01a56e97abb17e1ce05527 WHIRLPOOL 47bffa41acbd57d23764e273f8681309e8bc5bb9dd881d4ef8d449770e66e133b117de766c515a29183da106bf4fa5f67a7d92829cb2093125bfb8d6e9a373b7
+MISC ChangeLog 2851 SHA256 eed4f5b682e633ec5cf6572aac3f5dabc2dbfcd9c1dce01a1c357bffe380ff1a SHA512 c9f4ab7e3aa3769498b557e8e0bcbc40406d7d6fc800b44e304b52dbf7a831953d9a03da7e1c8e01fd4d2106f632ecc65785d6831e60cda86642203d6bf1e33c WHIRLPOOL 4f2c5633967898978f941a0874b8336501fd2b9bf26a5fc2c3f8c23e11c44842d288fd0792a47968855ba2fa2018869cf623b8e4291be542dbe83373e90aba04
+MISC ChangeLog-2015 5470 SHA256 a86931c3d771edebabce9ef0e74c34d3016f79d4c076b84eb3a39da9324dd647 SHA512 8e906f6a1839ae879dd1f175efc65e4068b41f4dece9a0713ab4e9c32b23e789d436a4e203a7e232542b80709fbb727c93d33dbdec69fcd4e677630fa7bb3597 WHIRLPOOL b63d4a09391b82a43fc3b13c2a81924a2994e6e8d94ec4c3f82aa6935ffaf04904c219ba91919a5dc70e1610484b56d6af21bfd80afd5b4a3f9ffa014db3a38c
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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..57ff680aa0c4
--- /dev/null
+++ b/dev-java/xsdlib/xsdlib-20090415.ebuild
@@ -0,0 +1,52 @@
+# 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-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-fbsd ~x86-fbsd ~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/Manifest b/dev-java/xsom/Manifest
new file mode 100644
index 000000000000..6b94b8b35381
--- /dev/null
+++ b/dev-java/xsom/Manifest
@@ -0,0 +1,5 @@
+DIST xsom-20140925.jar 371238 SHA256 1f4273ee9620bfd20ba81fd53f29c72ffedf49b9ad5f0af8862fccf76c31f26c SHA512 a1e2a9879deb3c92ed94fa0a9ac4f59debd8914cefe94149d74cde844c1f0519e35e00e87bf523b761fab50c8a69585b72d23fe28f30bdbf1f074de903438ee7 WHIRLPOOL ceffa427428f60302e1f925e3e7de13847277d7f92095e82554955061e0092d1ec254e08556f59a432a25882909b10ecdc948f341c4dc57ac2a8a4c3be0a15b1
+EBUILD xsom-20140925.ebuild 622 SHA256 8a83ae01b7d28d2ed61929e21dd884a30fc21a7ee494be237f82153db275d651 SHA512 ac1220eb3a76b6f6f8ddd205ffe6540dd3c504d6263ce0e1aaef7f9a8572848a0314a2afab5efcbc80daeaa15fdc82f349e46b47d7374f5ffccd8028ea6ef87a WHIRLPOOL 94de38f74a1d98644c684fc925d5db129702bea6e0cd36d0015d46521986f3e22db36bcc7c54ac1eddd7e0e3072839ff1b68f4aef42c7ea8d993facd9972ccf8
+MISC ChangeLog 3211 SHA256 f5afd04953f57e8530d615539b973b1e0d81a97187cb71119c1703ffc6265c78 SHA512 5f4544322af0a0933fafa6a65fe694d66bfa9337da5ca8cb81c4cdd92be6e76f4b9dcd99ec40065c68542f00d021b20a6bb8bd13888fc163382995f6c241de11 WHIRLPOOL 67b7368109b0580c8c3e6c052a120916521ff6863fbf826d5134b8babc916d1f10d59ecd0b052e7ade1951f199cf695251d46e284cafa94c33bf825b33e2ed0d
+MISC ChangeLog-2015 1348 SHA256 b471c3ada2e5169bc4aaffae68764bb0e0b1ea9fd4db580af00a4e39e3172296 SHA512 e763ea2e5f14b3bfc0075d539535bb4e2644b01c428373f3f7c754528e6f980d8eb86b1e73e3530e5dce8882a92a9cc0d281117e245a36b6b4166aab719bb5fe WHIRLPOOL 09872c4b585d427be33e51b03296c85ad9dedeedb5b4dcf083e4d8bce22901b3e40353cf9cc94a06f6fb125f1db671546eb1474cce586ff86e624027c56b9757
+MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
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/Manifest b/dev-java/xstream/Manifest
new file mode 100644
index 000000000000..5659b50d3a7a
--- /dev/null
+++ b/dev-java/xstream/Manifest
@@ -0,0 +1,5 @@
+DIST xstream-1.4.8.jar 395464 SHA256 5d956e4527d27420f2d417cd77ffafedad85ee795a59857bbf2be9cc630eace0 SHA512 9fb9ebc6facdc07aecbcee3fbf40ef560bdd42cd8f7c7a3a8e2401be5c4e05ed3370beec653ef06d2fd3aa1acabf8f4ada8dddea27f239d180d66aec0bd905e6 WHIRLPOOL 10f9ad97300397000085e4850baa89a2560bd13431c1668b7e144fe53b0800f546ff56cb7bd373a53ea7ab1ff88bef80260e3d8543543c8df50fc5e56fdd8aa2
+EBUILD xstream-1.4.8-r2.ebuild 1253 SHA256 c713915a148086057052853ebcfa9ab49619c2279049ab608f00ceb3a40aeb21 SHA512 155ff713dee0dfd2e2e035e5a75976d34f548356337b81a81d4a9747b93ae29cf7cb6e62e78d00acfcd212a798df1951aa2b672a01af61febe3bc5e532f79954 WHIRLPOOL 57e2bd41a1de1e5a7014eca098095c4a01f9e6e90ec5a0a159fe0eba1fd1939c4fdf81acd193db583484a366ad1d61189a50b5d93f289171fcd9d444bc6549fc
+MISC ChangeLog 5032 SHA256 75e962e958ece614e38f83f2a50ba6ee31f558617e2137288f1fc8ca76aaa930 SHA512 ee812132b8e13e1255e7e1c6377922a02f7e77641529a3ab7f61287d1a407a4d32b3f358c37a8b9563ceee4734df1def786338e953ee7edb01363b97985280dd WHIRLPOOL b4b3f5556ee0a3a61e7f7bddcf2ddc0e5052fcbdccec6e6a68c907fa247c582e24958bcfa89a62f92c4ea1a76009125db19b1a954948250be1650e7fa3178730
+MISC ChangeLog-2015 5457 SHA256 d3601d25ebc519197de8abafaca5c252cffb4beefa878c86ffc62a70f84ede51 SHA512 e6bc9eb964c38f4b89990076709e8dc25743cf4b620fa5935736d129da8bc4c53cef968f8da2feefaa95a66a9c9fd23f9fee9496a0fb5851a857880079d43eea WHIRLPOOL f96cec624eaba59694a67acc05226bcc07f0075e918f942318c58076d5781c0d4ace3fd528b05ccd4d48c5a51c44526cf14985e6374ef2949f33701e4f8eadbc
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/xz-java/Manifest
new file mode 100644
index 000000000000..62eeb8d28476
--- /dev/null
+++ b/dev-java/xz-java/Manifest
@@ -0,0 +1,9 @@
+AUX xz-java-stop-fetching-external-files.patch 693 SHA256 109fc375e98c2eb181e2d7e6df5e5cfecbd0b6d4a0a248c36005c417bf8171c3 SHA512 048a21f8a99091f5e940f775b187eccbeda10c4b6c41e194dd5295f9be618676195ad0e256752ac1929989e90eafb272d10d93bfea5d85027dfc88d296c90125 WHIRLPOOL cd35d99799584c7a556d42419bb03759cafdfdaacb4b1ce97731a899c8d672bf5089447daee17f3783618d346aabea7cd53b76900196bb8cdff13ff854ecf037
+DIST xz-java-1.5.zip 131544 SHA256 0146e437b01ac77046d256a2e7537768b6922c49635c27fa40b3cf745bb2db74 SHA512 8f425b86b216927490c1ab7303ae9db7faf2c275777765ec7d10c4acd4717d2ecf76068afe9a81d099ea0941c05c517cd5e7fe1b4e8bfec804fd3355dd064f41 WHIRLPOOL 5bcaa40f44bd89592e3a4f4a74884551284379f6e5a7985abf0c3673d73bc48144b457f67502097a96a82d0496526f2d5ce9f7b64bef48bd84a00eea87927839
+DIST xz-java-1.6.zip 138434 SHA256 1da9c5534656da8197457feeea7ee6c7a2c908e94f01db6d3c80ee17620e77fc SHA512 a1a6a2da05d51695e58b8e91503106bae6030cb83853df32bc7b8a23db4189c4afef01544c21de91ee3df9ad11e065059c758f121c52e6b6a319b93b2136f666 WHIRLPOOL 8c1145e631be106323b7aeb7ec05fff5bb1eda1ab677490cae7af10711d2888829058f76fd44a125f37d164125302d016e82f4459dc8764ed561111babc6f109
+EBUILD xz-java-1.5.ebuild 762 SHA256 61d9ef99330ffbfc1c7adff3f62690e32a6a629e7d27660b4dbc4a23440bc866 SHA512 d7a04e6e5e367cbc8fa4a82b0b9a22495dc45469c16d3897e1ede684a99138e1b077643154d80cf153e1d3d9ab91d93be774573cec19a011a130d28aaf2f8b1a WHIRLPOOL 3d780c94dd4057287130f019973eff61bc40e4e3d504f4c8bb083652904f52a529095a24cdda336aa472751c0de3b331681ccc17abed931df411c432b7a37051
+EBUILD xz-java-1.6-r1.ebuild 649 SHA256 198df76d2da074ebd3ea59882738278ef92f0735cfa0a7b7ee575e688346ddb8 SHA512 ccb160bbf3f6700ab5d9edb99cd66dc128f4a126ddc3df83e5af227c6128c6ac72289da9a1872679ac3b3a17bfce003938d744bfe2d69414dbcff9fca93373fb WHIRLPOOL 5cf28e1cdd54801c29290d62bc07ce57264896d83fb64720d0846eb7371bf7906077db5b4ce13b322ca55958b038b6f6e3e7f318c7ff5f4132580d8a0f97b447
+EBUILD xz-java-1.6.ebuild 806 SHA256 1ccc4d423f462dda40a8c31a5e48ebf97fc59703d42cbd1e50d5bebf1bbae4eb SHA512 f572712652537cf48a93f640eec5cfa2a66b9dc889a1fbf20ed0452bcd9b81641d4152934e2c78427fe62a204d67403c44fca1f1a47361b3f1c8e22124dfde8f WHIRLPOOL 8c14efb9b15a6fdac36b6c8af2a1ca4502d5c4950cf799a222fdf393b5981c8b0b3e20af34476cda3638c233a5b36e86f171be986dbdbeddf1e0fb1963c3fc57
+MISC ChangeLog 3102 SHA256 e548445304603f4e83def6a98d7102e7ba3a27d305aae7ff5eaa4e1b0639c50b SHA512 f076936b662d93a25ba88bfe86bbfecfa16218dc31645c2ec7216cc4edf761e9ba60a7de37703e3454fbaca8b831a887a232a2689df5332637b5138382053ec2 WHIRLPOOL 2a8b5b5b7f5a7c304ec89ff233e430531bf03394ac3eb6b2a5b3693b664d91c48bbe9897c9e3450ca8858dcaa4866ada0750d3d93f1fca03cacbb39cde58c9c5
+MISC ChangeLog-2015 1470 SHA256 04e3d7e8a4c5d42a49d1272178a60562ca3d1f80ddf4b18e5321e15ece7e30bc SHA512 d662dd096a1b5dc6a8379858c99cac1812f8efa0c0de418e893f37eda070d077da258adfced0e2cadfa6f13ddeaf53170f5159c234f6c2acdff28d2b917368aa WHIRLPOOL fda1ba304e689b9ba6e876f6f1a006ebae588330bb617ad6492d25eee963a2e1ccd23d1ab5ebcaa858bff4aae40cd2bda6b653359385a97d159641976e9e18f4
+MISC metadata.xml 352 SHA256 8c0d6e0f8946242af2c5b2513ca0b18d3408d428e6c84f63a93ee2dffd857194 SHA512 a3c6ce3cd97b39644238700277dd416e1ee79df975184de3429810ca4d77f7160112adef6a9b56f77243a003187f6642798b278cf8501d55da766ccfbaa861cf WHIRLPOOL 8a92408c9175845d852584035d1f33f0f032c5457ce8809d5f6c88710577ae6c958d55d2ab412d703e680d168fff0b00a41236472f8a866418a6d05b99335d57
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..d04c979c7ead
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.5.ebuild
@@ -0,0 +1,34 @@
+# 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="Implementation of xz data compression in pure java"
+HOMEPAGE="http://tukaani.org/xz/java.html"
+SRC_URI="http://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..35d8ca163e73
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.6-r1.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 examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of xz data compression in pure java"
+HOMEPAGE="http://tukaani.org/xz/java.html"
+SRC_URI="http://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..1aeaf243f91a
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.6.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 examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Implementation of xz data compression in pure java"
+HOMEPAGE="http://tukaani.org/xz/java.html"
+SRC_URI="http://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/Manifest b/dev-java/yanfs/Manifest
new file mode 100644
index 000000000000..0b865c3f6d8d
--- /dev/null
+++ b/dev-java/yanfs/Manifest
@@ -0,0 +1,6 @@
+AUX 1.0-make.patch 2620 SHA256 fce4ab605ed809cc7547c92ad08b8b40b45e221849dd3f2ed5fb0cc4c4854081 SHA512 85ad4c443800a33ffb16fee52bd1a2fd89dc8d3de8f6adbc184ca72ad3ee8c877d4658b4c2c82ebdb54b333c16dd54534f47d193e9b808a16f92a97bfd5b427a WHIRLPOOL 95602bdef0687e50691f8742a3ff9225247ebe8651b5e15ac8bc9a84bf6dc597692642df5c60e2a830e3919dc4bf6a0049fd10df80f76ba0e98eb786c8df1599
+DIST yanfs-1.0.tar.bz2 107232 SHA256 b1332f97391cf91e544c2668e2a1d81e4d4c76d3bd84b348bbe448eb58a7b719 SHA512 e7031ba630360240de136f588c337a3a4b551320f5e121c1910fc58ba08c7b7c6fe95fb87b57263c19e00a3e44fe81c36d9e8e8971d4fdf910bb3797c0a1eeeb WHIRLPOOL 05ecf92100f3fa760ba694659e8f401e69adbbef8ba31e5dbf36bfd81b387afc1bfc2d335dfe6d0f321579813fd0f9a60ead5db7b7450b3e71e80579ddd89713
+EBUILD yanfs-1.0.ebuild 1030 SHA256 cebb6791857e01611981c75d82719a445c5cf66d97e1f39f6f946f3cc253ceba SHA512 28fcb33d53374eb1c94cbbe50f42b576ad09eb30f4b3c4fcac042c2da096a8d8b0d7e7b308a8413d38d3215d9e03eff482e22b4e16bb3ede6fe89f3b00eeeaa3 WHIRLPOOL 73488447f44f248a2aa3585f98797984323d53f8357175699e1b5bbe626afdbba6293b845ebd17a31132cb5372f2322fb00cf311d060e7dbb3aa100770f3fcac
+MISC ChangeLog 3039 SHA256 908757d9b7c29a982332a7b9b6cfa1d280df82352d16e8ba80f48bdb1ab83159 SHA512 68e32eccda9c34610e8d0511d4efe185ca402a25c3c5dd67d935c431e101f160daa1e5dce3bfa372c75263d25ca8a154880fb0962de547524b28808923a06827 WHIRLPOOL da51af888089a163a591db0d395e409b591af1d83c7a026721b9e55c6c7b48e44c7637a4dd674a2a5fc2c1705a0588b5291c8b01b4549baf9dfe4d3de87a0af4
+MISC ChangeLog-2015 373 SHA256 ddc5acedb9ebbe175a43361045d7f1bfab80cd5348f6b161bbb3975aa9fcccd2 SHA512 de50210a372c803d292f862c997b9ef98c908658fbcaac54f4f2713ac589e6b318551742ee86400325a9108ff2dea9388b3fefeeb62424ced9992418443c1360 WHIRLPOOL e9a72373a2a58874db5b87ca7609448d4a47bbf3b95701281adeb4a7f6f53500ef5d4c87a11611c2a8ed376a9d6a62490853b7ae682cb2d360407c432c38730b
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
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/Manifest b/dev-java/zemberek/Manifest
new file mode 100644
index 000000000000..400af2a87557
--- /dev/null
+++ b/dev-java/zemberek/Manifest
@@ -0,0 +1,6 @@
+AUX zemberek-2.1.1-classpathfix.patch 514 SHA256 a68aed859de64ae5f59cb4b4f31f4e89ed88ad895629b1e9feef9d1d1acc1687 SHA512 71ed0b82ff218fd8bc041fcf7d1fc669ad3fd3df890aaeedf2ea3f6ece5f6e484c1d4db709ecc5704d32aff934ae160285b64ef280be83849dc1fe8587c52178 WHIRLPOOL a3c37f404580e273b531061eefcec58b7abea3709309e697e63b6358c39625a8319c5eccbe024e34ba41e1f7c02a07fcca037df97a1fcd7ea749c3c9fe80ae8d
+DIST zemberek-2.1.1-nolibs-src.zip 1196289 SHA256 0a1a9a3bb2c76c9c40a96aea81e99abc0fab1baadc31fcc975bc5b235937cca3 SHA512 e97342271294504a0e9df7bbc60f68beed137311254f5cc6d7558befa106737b75b0dcb7a86033f506eda3783d98ba2788cf5da69497f18861dd8cd79bb27955 WHIRLPOOL 55a039caefcd0d4c36a2b977de424d62f8780aa4e37c24c55666b0088c6914756cc070792847a61d460b650617bf6df94b87671e9ef8fe300b38f9416d63a09f
+EBUILD zemberek-2.1.1.ebuild 1808 SHA256 eee0fa5d1e28dbfae12325eb4b0bb7f7f8fb6250a6f8467289ff190ee1d25021 SHA512 6db4da7035f148af0f629bda77910191bc65cf79b3bc769e41496fe2402024f05f6136267a24a8636f2b9173b0ebeec743bcde57cf02758da1f9bf0ce64d8d4b WHIRLPOOL 2b63adaa7847f566e5eb8a7a97cd457d168be39732b334fc2bd6503a1fc7b65a2b28bf6faaca64000c9e0a868b02011a5841e041cfa39ea4df6ec3410b2565aa
+MISC ChangeLog 3612 SHA256 860bf36fcd6fc45178d7b0ccfa670b817d27a4e30fb316c0b40f7a27d81dddd6 SHA512 09059db3624a8997bd696d6728c5e4a60e07faf671b65440dc13209e02b7cf88d98139d4819d80fb38ef907c99e06f3cff12021f4750cd2e3e4bc5bd2ffa80fd WHIRLPOOL 95f0fbaeaa746d857b64224367d9a89e0c14abff314528aedb650a1fea09007e57f599616cf4d30e525dc48d6c87478f18c0cd5c649d646c3108d5dbcfcb82ae
+MISC ChangeLog-2015 2470 SHA256 920f62543d62aa988b2864c50e83de52e1bfb138516c7efc237549e04b28129f SHA512 cbc7cb5bfd8ea623c8b7d0769d35bda46ed00cf4c1ef78dcb58cbc5980784658e54fb3034cc01b5ca1bc1b6fa2a9a7d72329e72ae127471149b7d1fc047f51a6 WHIRLPOOL f6270d5347c10c710c3def3a92279b5e35b7010bcb940e80768d898a07ea43198dac0c4e905d179f5e04922c91d78afd49fdd1c5d23cf0e0ed1eee0c7e988673
+MISC metadata.xml 354 SHA256 d28e36a060e2f92941771fa84bacc24c1642529af5c1a52305d7c2af64c7e674 SHA512 546242cb1f76ce63ff5fd1b6a67ad35f6f16aed97f01e886b980a868d3f6bec8c8af4c003389530c6ebe3b7dd35a72b2297c6de2167c47c81bb5be627a4a8709 WHIRLPOOL f1b398fb797e8401b9517a7cd9e7d919ae8c478e08d8c1e2c65d1f2326f19e08adc5dfc7d18637c0d9274d9ee005a5e09c779830ed024a41ce033c70cc306ddd
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..104b1c3c4742
--- /dev/null
+++ b/dev-java/zemberek/zemberek-2.1.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 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 ~x86-fbsd"
+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/Manifest b/dev-java/zeus-jscl/Manifest
new file mode 100644
index 000000000000..7c3c251b016f
--- /dev/null
+++ b/dev-java/zeus-jscl/Manifest
@@ -0,0 +1,5 @@
+DIST zeus-jscl_v1_64.zip 585558 SHA256 d76ddc5b76648b75b5ede5f02df6ed498db12d708413adec2900a67e1e0c4e9a SHA512 e756df28da39322121575041a949965f47eecea6106e7dd619a4f0764a239131e1ab8a9dcf7c6d461fc4861ea86acaceb19a5a51c8002c990999193050e03b10 WHIRLPOOL 832b7198472a8e0ed1ceeceb171b18fc66a3c9249c785e40430e2e01e75d21a3848a31afbe92ffb0f479e462357cf782e611b6e9f131d0fa9e0a5b3f6b59e3ad
+EBUILD zeus-jscl-1.64-r1.ebuild 650 SHA256 18767932978ea04233f3c155792a92d2d8ea0ed0162404ac160688ab45e19adf SHA512 585f0b2039d52c27e2eb24725061431cbe52d177133dd52d956cc2a79ee56fe9297bda3a762981bc9ee390e88a2e2aa3530099eb5f38d90b12a4dc3b0b99cbeb WHIRLPOOL 648213c19cdf8fecbd80232f9ba3a966f572b40447ea5a89c071efdab1e3764b92dbcf8de37f88bbdd24d746b4f19857d9e5cd004e98b5a40e4a5275b32411fc
+MISC ChangeLog 2985 SHA256 a9a0eb11b3085fae226a3db16a625ba037caa4290670b27c94a8581cb9391e97 SHA512 78b00ca6badbaf0400a480578d63d378537fdd46bc62119e9137fc051b4b09805cc96299126920481676d46b793ae94b2f6b3c4b80ad2588665eeea0686f6071 WHIRLPOOL e411b85ba00054b6a7e62cae91f39629e1843a5028131d54e65474fe1bf0ac7d7ba988610e8755311f96d6d5a3afaba222e41fdb480ba1ffb5684e0b342431eb
+MISC ChangeLog-2015 990 SHA256 7a28e1cc30385ffa1916218aaf7c04ed2acf062ca138806e041dafa7863232bd SHA512 53ffb71664bbede1bca2a78739c77dd656c4cc094ff1db757a347bc8a20013df3461eb1f788d89c5561d11aed5c70133a8714ab5096b5cc3e94e285aa8d427eb WHIRLPOOL 402f48279071954051bdebf5f071b2656fecb69ebbfbe94d8f5409d3e7447bf94b34c4d7b6f9779432a85c244780226defd8b3c26cc512e46e831bbb6ef0c869
+MISC metadata.xml 315 SHA256 05fe512492c11175a124faec59dddc54ae369c87792c7cc398c7ad437e3ffb27 SHA512 411cfa7471ea811aca7e961c1896af9ec7efc9b3fc042e7ef897039601e769d8ff3f7a7ae3290656cba4792394d9ff1af8fd9b598613fe6a36ee71de635010e0 WHIRLPOOL e161dbaf5e0a37f817e449a0472df3630664f49d71d905ae9b9cae12ec4c30f1dc92ae5ac579eb10367b45603c1fd1c966ae76d966b0c9de76b7e5bdf810caaa
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
+}